This commit was manufactured by cvs2svn to create tag 'v20100906'.
diff --git a/assembly/features/org.eclipse.jsf.assembly.feature/.cvsignore b/assembly/features/org.eclipse.jsf.assembly.feature/.cvsignore
deleted file mode 100644
index 49d8479..0000000
--- a/assembly/features/org.eclipse.jsf.assembly.feature/.cvsignore
+++ /dev/null
@@ -1,3 +0,0 @@
-*.bin.dist.zip
-build.xml
-feature.temp.folder
diff --git a/assembly/features/org.eclipse.jsf.assembly.feature/.project b/assembly/features/org.eclipse.jsf.assembly.feature/.project
deleted file mode 100644
index 5adb9e2..0000000
--- a/assembly/features/org.eclipse.jsf.assembly.feature/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.jsf.assembly.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/assembly/features/org.eclipse.jsf.assembly.feature/.settings/org.eclipse.core.resources.prefs b/assembly/features/org.eclipse.jsf.assembly.feature/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index fa491bf..0000000
--- a/assembly/features/org.eclipse.jsf.assembly.feature/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Sun May 27 16:00:47 EDT 2007
-eclipse.preferences.version=1
-encoding/<project>=ISO-8859-1
diff --git a/assembly/features/org.eclipse.jsf.assembly.feature/build.properties b/assembly/features/org.eclipse.jsf.assembly.feature/build.properties
deleted file mode 100644
index 8b13789..0000000
--- a/assembly/features/org.eclipse.jsf.assembly.feature/build.properties
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/assembly/features/org.eclipse.jsf.assembly.feature/eclipse_update_120.jpg b/assembly/features/org.eclipse.jsf.assembly.feature/eclipse_update_120.jpg
deleted file mode 100644
index bfdf708..0000000
--- a/assembly/features/org.eclipse.jsf.assembly.feature/eclipse_update_120.jpg
+++ /dev/null
Binary files differ
diff --git a/assembly/features/org.eclipse.jsf.assembly.feature/epl-v10.html b/assembly/features/org.eclipse.jsf.assembly.feature/epl-v10.html
deleted file mode 100644
index 022ad29..0000000
--- a/assembly/features/org.eclipse.jsf.assembly.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>
diff --git a/assembly/features/org.eclipse.jsf.assembly.feature/feature.properties b/assembly/features/org.eclipse.jsf.assembly.feature/feature.properties
deleted file mode 100644
index dca2899..0000000
--- a/assembly/features/org.eclipse.jsf.assembly.feature/feature.properties
+++ /dev/null
@@ -1,150 +0,0 @@
-###############################################################################
-# Copyright (c) 2005 Oracle 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:
-# Oracle Corporation - initial API and implementation
-###############################################################################
-name=JavaServer Faces Tools (JSF) Project
-provider=Eclipse Web Tools Platform
-description=WTP JavaServer Faces Tools (JSF) Project
-
-# "copyright" property - text of the "Feature Update Copyright"
-copyright=\
-Copyright (c) 2006 Oracle 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\
-\n\
-Contributors:\n\
- Oracle Corporation - initial API and implementation\n
-################ end of copyright property ####################################
-
-license=\
-Eclipse Foundation Software User Agreement\n\
-April 14, 2010\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the\n\
-Eclipse Foundation is provided to you under the terms and conditions of\n\
-the Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is\n\
-provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse Foundation source code\n\
-repository ("Repository") in software modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
- - Content may be structured and packaged into modules to facilitate delivering,\n\
- extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
- plug-in fragments ("Fragments"), and features ("Features").\n\
- - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\
- in a directory named "plugins".\n\
- - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
- Each Feature may be packaged as a sub-directory in a directory named "features".\n\
- Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
- numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
- - Features may also include other Features ("Included Features"). Within a Feature, files\n\
- named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
- - The top-level (root) directory\n\
- - Plug-in and Fragment directories\n\
- - Inside Plug-ins and Fragments packaged as JARs\n\
- - Sub-directories of the directory named "src" of certain Plug-ins\n\
- - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Provisioning Technology (as defined below), you must agree to a license ("Feature \n\
-Update License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties" found within a Feature.\n\
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the\n\
-terms and conditions (or references to such terms and conditions) that\n\
-govern your use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
- - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
- - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
- - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
- - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
- - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-\n\Use of Provisioning Technology\n\
-\n\
-The Eclipse Foundation makes available provisioning software, examples of which include,\n\
-but are not limited to, p2 and the Eclipse Update Manager ("Provisioning Technology") for\n\
-the purpose of allowing users to install software, documentation, information and/or\n\
-other materials (collectively "Installable Software"). This capability is provided with\n\
-the intent of allowing such users to install, extend and update Eclipse-based products.\n\
-Information about packaging Installable Software is available at\n\
-http://eclipse.org/equinox/p2/repository_packaging.html ("Specification").\n\
-\n\
-You may use Provisioning Technology to allow other parties to install Installable Software.\n\
-You shall be responsible for enabling the applicable license agreements relating to the\n\
-Installable Software to be presented to, and accepted by, the users of the Provisioning Technology\n\
-in accordance with the Specification. By using Provisioning Technology in such a manner and\n\
-making it available in accordance with the Specification, you further acknowledge your\n\
-agreement to, and the acquisition of all necessary rights to permit the following:\n\
-\n\
- 1. A series of actions may occur ("Provisioning Process") in which a user may execute\n\
- the Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\
- extending or updating the functionality of an Eclipse-based product.\n\
- 2. During the Provisioning Process, the Provisioning Technology may cause third party\n\
- Installable Software or a portion thereof to be accessed and copied to the Target Machine.\n\
- 3. Pursuant to the Specification, you will provide to the user the terms and conditions that\n\
- govern the use of the Installable Software ("Installable Software Agreement") and such\n\
- Installable Software Agreement shall be accessed from the Target Machine in accordance\n\
- with the Specification. Such Installable Software Agreement must inform the user of the\n\
- terms and conditions that govern the Installable Software and must solicit acceptance by\n\
- the end user in the manner prescribed in such Installable Software Agreement. Upon such\n\
- indication of agreement by the user, the provisioning Technology will complete installation\n\
- of the Installable Software.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use, and\n\
-re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.\n
-########### end of license property ##########################################
diff --git a/assembly/features/org.eclipse.jsf.assembly.feature/feature.xml b/assembly/features/org.eclipse.jsf.assembly.feature/feature.xml
deleted file mode 100644
index 36e87b1..0000000
--- a/assembly/features/org.eclipse.jsf.assembly.feature/feature.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
- id="org.eclipse.jsf.assembly.feature"
- label="%name"
- version="3.2.2.qualifier"
- provider-name="%provider"
- plugin="org.eclipse.jsf.branding">
-
- <description>
- %description
- </description>
-
- <copyright>
- %copyright
- </copyright>
-
- <license url="license.html">
- %license
- </license>
-
- <includes
- id="org.eclipse.jst.jsf.apache.trinidad.tagsupport.feature"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.jst.webpageeditor.feature"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.jsf.feature"
- version="0.0.0"/>
-
-</feature>
diff --git a/assembly/features/org.eclipse.jsf.assembly.feature/license.html b/assembly/features/org.eclipse.jsf.assembly.feature/license.html
deleted file mode 100644
index 14f2e99..0000000
--- a/assembly/features/org.eclipse.jsf.assembly.feature/license.html
+++ /dev/null
@@ -1,99 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3c.org/TR/1999/REC-html401-19991224/loose.dtd">
-<!-- saved from url=(0044)http://www.eclipse.org/legal/epl/notice.html -->
-<HTML><HEAD><TITLE>Eclipse.org Software User Agreement</TITLE>
-<META http-equiv=Content-Type content="text/html; charset=iso-8859-1">
-<META content="MSHTML 6.00.2800.1479" name=GENERATOR></HEAD>
-<BODY lang=EN-US vLink=purple link=blue>
-<H2>Eclipse Foundation Software User Agreement</H2>
-<P>June 06, 2007</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>
-<P>Content may be apportioned into plug-ins ("Plug-ins"), plug-in fragments
-("Fragments"), and features ("Features"). A Feature is a bundle of one or more
-Plug-ins and/or Fragments and associated material. Files named "feature.xml" may
-contain a list of the names and version numbers of the Plug-ins and/or Fragments
-associated with a Feature. Plug-ins and Fragments are located in directories
-named "plugins" and Features are located in directories named "features".</P>
-<P>Features may also include other Features ("Included Features"). Files named
-"feature.xml" may contain a list of the names and version numbers of Included
-Features.</P>
-<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>Plug-in and Fragment directories
- <LI>Subdirectories of the directory named "src" of certain Plug-ins
- <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". 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>Apache Software License 1.1 (available at <A
- href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</A>)
-
- <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>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>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>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>
-
- <LI>Common Development and Distribution License (CDDL) Version 1.0 (available at <A
- href="http://www.sun.com/cddl/cddl.html">http://www.sun.com/cddl/cddl.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></BODY></HTML>
-
diff --git a/assembly/features/org.eclipse.jsf_sdk.assembly.feature/.cvsignore b/assembly/features/org.eclipse.jsf_sdk.assembly.feature/.cvsignore
deleted file mode 100644
index bc2abf7..0000000
--- a/assembly/features/org.eclipse.jsf_sdk.assembly.feature/.cvsignore
+++ /dev/null
@@ -1,4 +0,0 @@
-*.bin.dist.zip
-build.xml
-features
-plugins
diff --git a/assembly/features/org.eclipse.jsf_sdk.assembly.feature/.project b/assembly/features/org.eclipse.jsf_sdk.assembly.feature/.project
deleted file mode 100644
index 8a30754..0000000
--- a/assembly/features/org.eclipse.jsf_sdk.assembly.feature/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.jsf_sdk.assembly.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/assembly/features/org.eclipse.jsf_sdk.assembly.feature/build.properties b/assembly/features/org.eclipse.jsf_sdk.assembly.feature/build.properties
deleted file mode 100644
index e69de29..0000000
--- a/assembly/features/org.eclipse.jsf_sdk.assembly.feature/build.properties
+++ /dev/null
diff --git a/assembly/features/org.eclipse.jsf_sdk.assembly.feature/eclipse_update_120.jpg b/assembly/features/org.eclipse.jsf_sdk.assembly.feature/eclipse_update_120.jpg
deleted file mode 100644
index bfdf708..0000000
--- a/assembly/features/org.eclipse.jsf_sdk.assembly.feature/eclipse_update_120.jpg
+++ /dev/null
Binary files differ
diff --git a/assembly/features/org.eclipse.jsf_sdk.assembly.feature/epl-v10.html b/assembly/features/org.eclipse.jsf_sdk.assembly.feature/epl-v10.html
deleted file mode 100644
index ed4b196..0000000
--- a/assembly/features/org.eclipse.jsf_sdk.assembly.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/assembly/features/org.eclipse.jsf_sdk.assembly.feature/feature.properties b/assembly/features/org.eclipse.jsf_sdk.assembly.feature/feature.properties
deleted file mode 100644
index 70bca85..0000000
--- a/assembly/features/org.eclipse.jsf_sdk.assembly.feature/feature.properties
+++ /dev/null
@@ -1,158 +0,0 @@
-###############################################################################
-# Copyright (c) 2006 Oracle.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# Oracle. - initial API and implementation
-###############################################################################
-name=JavaServer Faces Tools (JSF) Project SDK
-provider=Eclipse Web Tools Platform
-description=WTP JavaServer Faces Tools (JSF) Project SDK
-
-
-
-# "copyright" property - text of the "Feature Update Copyright"
-copyright=\
-Copyright (c) 2006 Oracle 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\
- Oracle - initial API and implementation\n
-################ end of copyright property ####################################
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=license.html
-
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=\
-Eclipse Foundation Software User Agreement\n\
-April 14, 2010\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the\n\
-Eclipse Foundation is provided to you under the terms and conditions of\n\
-the Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is\n\
-provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse Foundation source code\n\
-repository ("Repository") in software modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
- - Content may be structured and packaged into modules to facilitate delivering,\n\
- extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
- plug-in fragments ("Fragments"), and features ("Features").\n\
- - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\
- in a directory named "plugins".\n\
- - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
- Each Feature may be packaged as a sub-directory in a directory named "features".\n\
- Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
- numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
- - Features may also include other Features ("Included Features"). Within a Feature, files\n\
- named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
- - The top-level (root) directory\n\
- - Plug-in and Fragment directories\n\
- - Inside Plug-ins and Fragments packaged as JARs\n\
- - Sub-directories of the directory named "src" of certain Plug-ins\n\
- - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Provisioning Technology (as defined below), you must agree to a license ("Feature \n\
-Update License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties" found within a Feature.\n\
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the\n\
-terms and conditions (or references to such terms and conditions) that\n\
-govern your use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
- - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
- - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
- - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
- - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
- - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-\n\Use of Provisioning Technology\n\
-\n\
-The Eclipse Foundation makes available provisioning software, examples of which include,\n\
-but are not limited to, p2 and the Eclipse Update Manager ("Provisioning Technology") for\n\
-the purpose of allowing users to install software, documentation, information and/or\n\
-other materials (collectively "Installable Software"). This capability is provided with\n\
-the intent of allowing such users to install, extend and update Eclipse-based products.\n\
-Information about packaging Installable Software is available at\n\
-http://eclipse.org/equinox/p2/repository_packaging.html ("Specification").\n\
-\n\
-You may use Provisioning Technology to allow other parties to install Installable Software.\n\
-You shall be responsible for enabling the applicable license agreements relating to the\n\
-Installable Software to be presented to, and accepted by, the users of the Provisioning Technology\n\
-in accordance with the Specification. By using Provisioning Technology in such a manner and\n\
-making it available in accordance with the Specification, you further acknowledge your\n\
-agreement to, and the acquisition of all necessary rights to permit the following:\n\
-\n\
- 1. A series of actions may occur ("Provisioning Process") in which a user may execute\n\
- the Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\
- extending or updating the functionality of an Eclipse-based product.\n\
- 2. During the Provisioning Process, the Provisioning Technology may cause third party\n\
- Installable Software or a portion thereof to be accessed and copied to the Target Machine.\n\
- 3. Pursuant to the Specification, you will provide to the user the terms and conditions that\n\
- govern the use of the Installable Software ("Installable Software Agreement") and such\n\
- Installable Software Agreement shall be accessed from the Target Machine in accordance\n\
- with the Specification. Such Installable Software Agreement must inform the user of the\n\
- terms and conditions that govern the Installable Software and must solicit acceptance by\n\
- the end user in the manner prescribed in such Installable Software Agreement. Upon such\n\
- indication of agreement by the user, the provisioning Technology will complete installation\n\
- of the Installable Software.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use, and\n\
-re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.\n
-########### end of license property ##########################################
diff --git a/assembly/features/org.eclipse.jsf_sdk.assembly.feature/feature.xml b/assembly/features/org.eclipse.jsf_sdk.assembly.feature/feature.xml
deleted file mode 100644
index 2c3c408..0000000
--- a/assembly/features/org.eclipse.jsf_sdk.assembly.feature/feature.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
- id="org.eclipse.jsf_sdk.assembly.feature"
- label="%featureName"
- version="3.2.2.qualifier"
- provider-name="%providerName"
- image="eclipse_update_120.jpg">
-
- <description>
- %description
- </description>
-
- <copyright>
- %copyright
- </copyright>
-
- <license url="license.html">
- %license
- </license>
-
- <includes
- id="org.eclipse.jst.jsf.apache.trinidad.tagsupport_sdk.feature"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.jst.webpageeditor_sdk.feature"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.jsf_sdk.feature"
- version="0.0.0"/>
-
-</feature>
diff --git a/assembly/features/org.eclipse.jsf_sdk.assembly.feature/license.html b/assembly/features/org.eclipse.jsf_sdk.assembly.feature/license.html
deleted file mode 100644
index c184ca3..0000000
--- a/assembly/features/org.eclipse.jsf_sdk.assembly.feature/license.html
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<title>Eclipse Foundation Software User Agreement</title>
-</head>
-
-<body lang="EN-US">
-<h2>Eclipse Foundation Software User Agreement</h2>
-<p>April 14, 2010</p>
-
-<h3>Usage Of Content</h3>
-
-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
- (COLLECTIVELY "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 Foundation source code
- repository ("Repository") in software 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 Provisioning Technology (as defined below), 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>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
- <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
-</ul>
-
-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License is provided, please
-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
-
-
-<h3>Use of Provisioning Technology</h3>
-
-<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse
- Update Manager ("Provisioning Technology") for the purpose of allowing users to install software, documentation, information and/or
- other materials (collectively "Installable Software"). This capability is provided with the intent of allowing such users to
- install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a
- href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>
- ("Specification").</p>
-
-<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the
- applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology
- in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the
- Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>
-
-<ol>
- <li>A series of actions may occur ("Provisioning Process") in which a user may execute the Provisioning Technology
- on a machine ("Target Machine") with the intent of installing, extending or updating the functionality of an Eclipse-based
- product.</li>
- <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be
- accessed and copied to the Target Machine.</li>
- <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable
- Software ("Installable Software Agreement") and such Installable Software Agreement shall be accessed from the Target
- Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern
- the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such
- indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>
-</ol>
-
-<h3>Cryptography</h3>
-
-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
- another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
- possession, or use, and re-export of encryption software, to see if this is permitted.</p>
-
-<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>
-</body>
-</html>
diff --git a/assembly/plugins/org.eclipse.jsf.branding/.cvsignore b/assembly/plugins/org.eclipse.jsf.branding/.cvsignore
deleted file mode 100644
index 7033a79..0000000
--- a/assembly/plugins/org.eclipse.jsf.branding/.cvsignore
+++ /dev/null
@@ -1,4 +0,0 @@
-bin
-@dot*
-temp.folder
-build.xml
diff --git a/assembly/plugins/org.eclipse.jsf.branding/.project b/assembly/plugins/org.eclipse.jsf.branding/.project
deleted file mode 100644
index c1c23a4..0000000
--- a/assembly/plugins/org.eclipse.jsf.branding/.project
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.jsf.branding</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/assembly/plugins/org.eclipse.jsf.branding/META-INF/MANIFEST.MF b/assembly/plugins/org.eclipse.jsf.branding/META-INF/MANIFEST.MF
deleted file mode 100644
index b295675..0000000
--- a/assembly/plugins/org.eclipse.jsf.branding/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,7 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %plugin.Name
-Bundle-SymbolicName: org.eclipse.jsf.branding
-Bundle-Version: 3.2.0.qualifier
-Bundle-Localization: plugin
-Bundle-Vendor: %plugin.Provider
diff --git a/assembly/plugins/org.eclipse.jsf.branding/about.html b/assembly/plugins/org.eclipse.jsf.branding/about.html
deleted file mode 100644
index 7c80c6c..0000000
--- a/assembly/plugins/org.eclipse.jsf.branding/about.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
-
-<p>June 06, 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.</p>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/assembly/plugins/org.eclipse.jsf.branding/about.ini b/assembly/plugins/org.eclipse.jsf.branding/about.ini
deleted file mode 100644
index 0aac4fb..0000000
--- a/assembly/plugins/org.eclipse.jsf.branding/about.ini
+++ /dev/null
@@ -1,40 +0,0 @@
-###############################################################################
-# Copyright (c) 2006, 2009 Oracle.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# Oracle Corporation. - initial API and implementation
-###############################################################################
-
-# 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=%blurb
-
-# Property "windowImage" contains path to window icon (16x16)
-# needed for primary features only
-
-# Property "featureImage" contains path to feature image (32x32)
-featureImage=icons/WTP_icon_x32_v2.png
-
-# Property "aboutImage" contains path to product image (500x330 or 115x164)
-# needed for primary features only
-
-# Property "appName" contains name of the application (translated)
-# needed for primary features only
-
-# Property "welcomePage" contains path to welcome page (special XML-based format)
-# optional
-
-# Property "welcomePerspective" contains the id of the perspective in which the
-# welcome page is to be opened.
-# optional
-
-
diff --git a/assembly/plugins/org.eclipse.jsf.branding/about.mappings b/assembly/plugins/org.eclipse.jsf.branding/about.mappings
deleted file mode 100644
index bddaab4..0000000
--- a/assembly/plugins/org.eclipse.jsf.branding/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@
\ No newline at end of file
diff --git a/assembly/plugins/org.eclipse.jsf.branding/about.properties b/assembly/plugins/org.eclipse.jsf.branding/about.properties
deleted file mode 100644
index 9e7f778..0000000
--- a/assembly/plugins/org.eclipse.jsf.branding/about.properties
+++ /dev/null
@@ -1,24 +0,0 @@
-###############################################################################
-# Copyright (c) 2005 Oracle Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# Oracle Corporation - initial API and implementation
-###############################################################################
-
-# 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.
-
-blurb=JavaServer Faces Tools\n\
-\n\
-Version: {featureVersion}\n\
-Build id: {0}\n\
-\n\
-(c) Copyright Oracle contributors and others 2006, 2009. All rights reserved.\n\
-Visit http://www.eclipse.org/webtools
diff --git a/assembly/plugins/org.eclipse.jsf.branding/build.properties b/assembly/plugins/org.eclipse.jsf.branding/build.properties
deleted file mode 100644
index 094e1ae..0000000
--- a/assembly/plugins/org.eclipse.jsf.branding/build.properties
+++ /dev/null
@@ -1,20 +0,0 @@
-###############################################################################
-# Copyright (c) 2001, 2006 Oracle Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# Oracle Corporation - initial API and implementation
-###############################################################################
-bin.includes = META-INF/,\
- eclipse32.png,\
- eclipse32.gif,\
- about.properties,\
- about.mappings,\
- about.ini,\
- about.html,\
- plugin.properties,\
- icons/WTP_icon_x32_v2.png
-
diff --git a/assembly/plugins/org.eclipse.jsf.branding/eclipse32.gif b/assembly/plugins/org.eclipse.jsf.branding/eclipse32.gif
deleted file mode 100644
index e6ad7cc..0000000
--- a/assembly/plugins/org.eclipse.jsf.branding/eclipse32.gif
+++ /dev/null
Binary files differ
diff --git a/assembly/plugins/org.eclipse.jsf.branding/eclipse32.png b/assembly/plugins/org.eclipse.jsf.branding/eclipse32.png
deleted file mode 100644
index 568fac1..0000000
--- a/assembly/plugins/org.eclipse.jsf.branding/eclipse32.png
+++ /dev/null
Binary files differ
diff --git a/assembly/plugins/org.eclipse.jsf.branding/icons/WTP_icon_x32_v2.png b/assembly/plugins/org.eclipse.jsf.branding/icons/WTP_icon_x32_v2.png
deleted file mode 100644
index 6f09c2a..0000000
--- a/assembly/plugins/org.eclipse.jsf.branding/icons/WTP_icon_x32_v2.png
+++ /dev/null
Binary files differ
diff --git a/assembly/plugins/org.eclipse.jsf.branding/plugin.properties b/assembly/plugins/org.eclipse.jsf.branding/plugin.properties
deleted file mode 100644
index 2b7a864..0000000
--- a/assembly/plugins/org.eclipse.jsf.branding/plugin.properties
+++ /dev/null
@@ -1,13 +0,0 @@
-###############################################################################
-# Copyright (c) 2006 Oracle Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-
-plugin.Name=JavaServer Faces Tools
-plugin.Provider=Eclipse.org
\ No newline at end of file
diff --git a/jsf/features/org.eclipse.jsf.feature/.cvsignore b/jsf/features/org.eclipse.jsf.feature/.cvsignore
deleted file mode 100644
index dafb923..0000000
--- a/jsf/features/org.eclipse.jsf.feature/.cvsignore
+++ /dev/null
@@ -1,4 +0,0 @@
-build.xml
-*bin.dist.zip
-org.eclipse.jst.jsf.feature*.jar
-feature.temp.folder
diff --git a/jsf/features/org.eclipse.jsf.feature/.project b/jsf/features/org.eclipse.jsf.feature/.project
deleted file mode 100644
index dff7881..0000000
--- a/jsf/features/org.eclipse.jsf.feature/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.jsf.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/jsf/features/org.eclipse.jsf.feature/.settings/org.eclipse.core.resources.prefs b/jsf/features/org.eclipse.jsf.feature/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index 9a9e24d..0000000
--- a/jsf/features/org.eclipse.jsf.feature/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Sun May 27 16:03:41 EDT 2007
-eclipse.preferences.version=1
-encoding/<project>=ISO-8859-1
diff --git a/jsf/features/org.eclipse.jsf.feature/build.properties b/jsf/features/org.eclipse.jsf.feature/build.properties
deleted file mode 100644
index b19fffd..0000000
--- a/jsf/features/org.eclipse.jsf.feature/build.properties
+++ /dev/null
@@ -1,15 +0,0 @@
-###############################################################################
-# Copyright (c) 2005 Oracle 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:
-# Gerry Kessler - initial API and implementation
-###############################################################################
-bin.includes = feature.xml,\
- license.html,\
- feature.properties,\
- epl-v10.html,\
- eclipse_update_120.jpg
diff --git a/jsf/features/org.eclipse.jsf.feature/eclipse_update_120.jpg b/jsf/features/org.eclipse.jsf.feature/eclipse_update_120.jpg
deleted file mode 100644
index bfdf708..0000000
--- a/jsf/features/org.eclipse.jsf.feature/eclipse_update_120.jpg
+++ /dev/null
Binary files differ
diff --git a/jsf/features/org.eclipse.jsf.feature/epl-v10.html b/jsf/features/org.eclipse.jsf.feature/epl-v10.html
deleted file mode 100644
index 022ad29..0000000
--- a/jsf/features/org.eclipse.jsf.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>
diff --git a/jsf/features/org.eclipse.jsf.feature/feature.properties b/jsf/features/org.eclipse.jsf.feature/feature.properties
deleted file mode 100644
index 567597d..0000000
--- a/jsf/features/org.eclipse.jsf.feature/feature.properties
+++ /dev/null
@@ -1,151 +0,0 @@
-###############################################################################
-# Copyright (c) 2005, 2007 Oracle Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# Oracle Corporation - initial API and implementation
-###############################################################################
-name=JavaServer Faces Tools (JSF) Project
-provider=Eclipse Web Tools Platform
-description=WTP JavaServer Faces Tools (JSF) Project
-updateSiteName=The Eclipse Web Tools Platform (WTP) Project update site
-licenseURL=license.html
-# "copyright" property - text of the "Feature Update Copyright"
-copyright=\
-Copyright (c) 2006 Oracle 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\
-\n\
-Contributors:\n\
- Oracle Corporation - initial API and implementation\n
-################ end of copyright property ####################################
-
-license=\
-Eclipse Foundation Software User Agreement\n\
-April 14, 2010\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the\n\
-Eclipse Foundation is provided to you under the terms and conditions of\n\
-the Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is\n\
-provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse Foundation source code\n\
-repository ("Repository") in software modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
- - Content may be structured and packaged into modules to facilitate delivering,\n\
- extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
- plug-in fragments ("Fragments"), and features ("Features").\n\
- - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\
- in a directory named "plugins".\n\
- - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
- Each Feature may be packaged as a sub-directory in a directory named "features".\n\
- Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
- numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
- - Features may also include other Features ("Included Features"). Within a Feature, files\n\
- named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
- - The top-level (root) directory\n\
- - Plug-in and Fragment directories\n\
- - Inside Plug-ins and Fragments packaged as JARs\n\
- - Sub-directories of the directory named "src" of certain Plug-ins\n\
- - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Provisioning Technology (as defined below), you must agree to a license ("Feature \n\
-Update License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties" found within a Feature.\n\
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the\n\
-terms and conditions (or references to such terms and conditions) that\n\
-govern your use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
- - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
- - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
- - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
- - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
- - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-\n\Use of Provisioning Technology\n\
-\n\
-The Eclipse Foundation makes available provisioning software, examples of which include,\n\
-but are not limited to, p2 and the Eclipse Update Manager ("Provisioning Technology") for\n\
-the purpose of allowing users to install software, documentation, information and/or\n\
-other materials (collectively "Installable Software"). This capability is provided with\n\
-the intent of allowing such users to install, extend and update Eclipse-based products.\n\
-Information about packaging Installable Software is available at\n\
-http://eclipse.org/equinox/p2/repository_packaging.html ("Specification").\n\
-\n\
-You may use Provisioning Technology to allow other parties to install Installable Software.\n\
-You shall be responsible for enabling the applicable license agreements relating to the\n\
-Installable Software to be presented to, and accepted by, the users of the Provisioning Technology\n\
-in accordance with the Specification. By using Provisioning Technology in such a manner and\n\
-making it available in accordance with the Specification, you further acknowledge your\n\
-agreement to, and the acquisition of all necessary rights to permit the following:\n\
-\n\
- 1. A series of actions may occur ("Provisioning Process") in which a user may execute\n\
- the Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\
- extending or updating the functionality of an Eclipse-based product.\n\
- 2. During the Provisioning Process, the Provisioning Technology may cause third party\n\
- Installable Software or a portion thereof to be accessed and copied to the Target Machine.\n\
- 3. Pursuant to the Specification, you will provide to the user the terms and conditions that\n\
- govern the use of the Installable Software ("Installable Software Agreement") and such\n\
- Installable Software Agreement shall be accessed from the Target Machine in accordance\n\
- with the Specification. Such Installable Software Agreement must inform the user of the\n\
- terms and conditions that govern the Installable Software and must solicit acceptance by\n\
- the end user in the manner prescribed in such Installable Software Agreement. Upon such\n\
- indication of agreement by the user, the provisioning Technology will complete installation\n\
- of the Installable Software.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use, and\n\
-re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.\n
-########### end of license property ##########################################
diff --git a/jsf/features/org.eclipse.jsf.feature/feature.xml b/jsf/features/org.eclipse.jsf.feature/feature.xml
deleted file mode 100644
index e0b138d..0000000
--- a/jsf/features/org.eclipse.jsf.feature/feature.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
- id="org.eclipse.jsf.feature"
- label="%name"
- version="3.2.2.qualifier"
- provider-name="%provider"
- image="eclipse_update_120.jpg">
-
- <description>
- %description
- </description>
-
- <copyright>
- %copyright
- </copyright>
-
- <license url="license.html">
- %license
- </license>
-
- <plugin
- id="org.eclipse.jst.jsf.common"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.jst.jsf.common.runtime"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.jst.jsf.common.ui"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.jst.jsf.core"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.jst.jsf.facelet.core"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.jst.jsf.facelet.ui"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.jst.jsf.facesconfig"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.jst.jsf.facesconfig.ui"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.jst.jsf.ui"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.jst.jsf.standard.tagsupport"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.jsf.branding"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
-</feature>
diff --git a/jsf/features/org.eclipse.jsf.feature/license.html b/jsf/features/org.eclipse.jsf.feature/license.html
deleted file mode 100644
index a450af9..0000000
--- a/jsf/features/org.eclipse.jsf.feature/license.html
+++ /dev/null
@@ -1,97 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3c.org/TR/1999/REC-html401-19991224/loose.dtd">
-<!-- saved from url=(0044)http://www.eclipse.org/legal/epl/notice.html -->
-<HTML><HEAD><TITLE>Eclipse.org Software User Agreement</TITLE>
-<META http-equiv=Content-Type content="text/html; charset=iso-8859-1">
-<META content="MSHTML 6.00.2800.1479" name=GENERATOR></HEAD>
-<BODY lang=EN-US vLink=purple link=blue>
-<H2>Eclipse Foundation Software User Agreement</H2>
-
-<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>
-<P>Content may be apportioned into plug-ins ("Plug-ins"), plug-in fragments
-("Fragments"), and features ("Features"). A Feature is a bundle of one or more
-Plug-ins and/or Fragments and associated material. Files named "feature.xml" may
-contain a list of the names and version numbers of the Plug-ins and/or Fragments
-associated with a Feature. Plug-ins and Fragments are located in directories
-named "plugins" and Features are located in directories named "features".</P>
-<P>Features may also include other Features ("Included Features"). Files named
-"feature.xml" may contain a list of the names and version numbers of Included
-Features.</P>
-<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>Plug-in and Fragment directories
- <LI>Subdirectories of the directory named "src" of certain Plug-ins
- <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". 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>Apache Software License 1.1 (available at <A
- href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</A>)
-
- <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>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>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>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>Common Development and Distribution License (CDDL) Version 1.0 (available at <A
- href="http://www.sun.com/cddl/cddl.html">http://www.sun.com/cddl/cddl.html)</A>
- </LI>
- </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></BODY></HTML>
diff --git a/jsf/features/org.eclipse.jsf.feature/sourceTemplateBundle/about.html b/jsf/features/org.eclipse.jsf.feature/sourceTemplateBundle/about.html
deleted file mode 100644
index fe81d46..0000000
--- a/jsf/features/org.eclipse.jsf.feature/sourceTemplateBundle/about.html
+++ /dev/null
@@ -1,27 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
-
-<P>June, 2008</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.</p>
-
-<h3>Source Code</h3>
-<p>This plug-in contains source code zip files ("Source Zips") that correspond to binary content in other plug-ins. These Source Zips may be distributed under different license
-agreements and/or notices. Details about these license agreements and notices are contained in "about.html" files ("Abouts") located in sub-directories in the
-src/ directory of this plug-in. Such Abouts govern your use of the Source Zips in that directory, not the EPL.</p>
-
-</body>
-</html>
diff --git a/jsf/features/org.eclipse.jsf.feature/sourceTemplateBundle/about.ini b/jsf/features/org.eclipse.jsf.feature/sourceTemplateBundle/about.ini
deleted file mode 100644
index 2dee36a..0000000
--- a/jsf/features/org.eclipse.jsf.feature/sourceTemplateBundle/about.ini
+++ /dev/null
@@ -1,31 +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=%blurb
-
-# Property "windowImage" contains path to window icon (16x16)
-# needed for primary features only
-
-# Property "featureImage" contains path to feature image (32x32)
-featureImage=eclipse32.gif
-
-# Property "aboutImage" contains path to product image (500x330 or 115x164)
-# needed for primary features only
-
-# Property "appName" contains name of the application (not translated)
-# needed for primary features only
-
-# Property "welcomePage" contains path to welcome page (special XML-based format)
-# optional
-
-# Property "welcomePerspective" contains the id of the perspective in which the
-# welcome page is to be opened.
-# optional
-
-
-
-
diff --git a/jsf/features/org.eclipse.jsf.feature/sourceTemplateBundle/about.mappings b/jsf/features/org.eclipse.jsf.feature/sourceTemplateBundle/about.mappings
deleted file mode 100644
index a28390a..0000000
--- a/jsf/features/org.eclipse.jsf.feature/sourceTemplateBundle/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/jsf/features/org.eclipse.jsf.feature/sourceTemplateBundle/about.properties b/jsf/features/org.eclipse.jsf.feature/sourceTemplateBundle/about.properties
deleted file mode 100644
index 4e33f86..0000000
--- a/jsf/features/org.eclipse.jsf.feature/sourceTemplateBundle/about.properties
+++ /dev/null
@@ -1,26 +0,0 @@
-###############################################################################
-# Copyright (c) 2005, 2007 Oracle Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# Oracle Corporation - initial API and implementation
-###############################################################################
-# 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.
-#
-# Do not translate any values surrounded by {}
-
-blurb=JavaServer Faces Tools Source\n\
-\n\
-Version: {featureVersion}\n\
-Build id: {0}\n\
-\n\
-(c) Copyright Eclipse contributors and others 2005. All rights reserved.\n\
-Visit http://www.eclipse.org/webtools
-
diff --git a/jsf/features/org.eclipse.jsf.feature/sourceTemplateBundle/build.properties b/jsf/features/org.eclipse.jsf.feature/sourceTemplateBundle/build.properties
deleted file mode 100644
index 43309f0..0000000
--- a/jsf/features/org.eclipse.jsf.feature/sourceTemplateBundle/build.properties
+++ /dev/null
@@ -1,13 +0,0 @@
-###############################################################################
-# Copyright (c) 2001, 2007 Oracle Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# Oracle Corporation - initial API and implementation
-###############################################################################
-
-bin.includes = about.html, about.ini, about.mappings, about.properties, eclipse32.gif, plugin.properties, plugin.xml, src/**, META-INF/
-sourcePlugin = true
diff --git a/jsf/features/org.eclipse.jsf.feature/sourceTemplateBundle/eclipse32.gif b/jsf/features/org.eclipse.jsf.feature/sourceTemplateBundle/eclipse32.gif
deleted file mode 100644
index e6ad7cc..0000000
--- a/jsf/features/org.eclipse.jsf.feature/sourceTemplateBundle/eclipse32.gif
+++ /dev/null
Binary files differ
diff --git a/jsf/features/org.eclipse.jsf.feature/sourceTemplateBundle/eclipse32.png b/jsf/features/org.eclipse.jsf.feature/sourceTemplateBundle/eclipse32.png
deleted file mode 100644
index 50ae49d..0000000
--- a/jsf/features/org.eclipse.jsf.feature/sourceTemplateBundle/eclipse32.png
+++ /dev/null
Binary files differ
diff --git a/jsf/features/org.eclipse.jsf.feature/sourceTemplateBundle/eclipse_update_120.jpg b/jsf/features/org.eclipse.jsf.feature/sourceTemplateBundle/eclipse_update_120.jpg
deleted file mode 100644
index bfdf708..0000000
--- a/jsf/features/org.eclipse.jsf.feature/sourceTemplateBundle/eclipse_update_120.jpg
+++ /dev/null
Binary files differ
diff --git a/jsf/features/org.eclipse.jsf.feature/sourceTemplateBundle/epl-v10.html b/jsf/features/org.eclipse.jsf.feature/sourceTemplateBundle/epl-v10.html
deleted file mode 100644
index 022ad29..0000000
--- a/jsf/features/org.eclipse.jsf.feature/sourceTemplateBundle/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/jsf/features/org.eclipse.jsf.feature/sourceTemplateBundle/license.html b/jsf/features/org.eclipse.jsf.feature/sourceTemplateBundle/license.html
deleted file mode 100644
index 14b1d50..0000000
--- a/jsf/features/org.eclipse.jsf.feature/sourceTemplateBundle/license.html
+++ /dev/null
@@ -1,83 +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>June 06, 2007</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>
-
- <LI>Common Development and Distribution License (CDDL) Version 1.0 (available at <A
- href="http://www.sun.com/cddl/cddl.html">http://www.sun.com/cddl/cddl.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/jsf/features/org.eclipse.jsf.feature/sourceTemplateBundle/plugin.properties b/jsf/features/org.eclipse.jsf.feature/sourceTemplateBundle/plugin.properties
deleted file mode 100644
index 1c402d4..0000000
--- a/jsf/features/org.eclipse.jsf.feature/sourceTemplateBundle/plugin.properties
+++ /dev/null
@@ -1,12 +0,0 @@
-###############################################################################
-# Copyright (c) 2005, 2007 Oracle Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# Oracle Corporation - initial API and implementation
-###############################################################################
-pluginName=JavaServer Faces Tools - Source
-providerName=Eclipse.org
diff --git a/jsf/features/org.eclipse.jsf.feature/sourceTemplateFeature/build.properties b/jsf/features/org.eclipse.jsf.feature/sourceTemplateFeature/build.properties
deleted file mode 100644
index 963f71d..0000000
--- a/jsf/features/org.eclipse.jsf.feature/sourceTemplateFeature/build.properties
+++ /dev/null
@@ -1,16 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 2005 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# Oracle Corporation- initial API and implementation
-###############################################################################
-bin.includes =\
-epl-v10.html,\
-eclipse_update_120.jpg,\
-feature.xml,\
-feature.properties,\
-license.html
diff --git a/jsf/features/org.eclipse.jsf.feature/sourceTemplateFeature/eclipse_update_120.jpg b/jsf/features/org.eclipse.jsf.feature/sourceTemplateFeature/eclipse_update_120.jpg
deleted file mode 100644
index bfdf708..0000000
--- a/jsf/features/org.eclipse.jsf.feature/sourceTemplateFeature/eclipse_update_120.jpg
+++ /dev/null
Binary files differ
diff --git a/jsf/features/org.eclipse.jsf.feature/sourceTemplateFeature/epl-v10.html b/jsf/features/org.eclipse.jsf.feature/sourceTemplateFeature/epl-v10.html
deleted file mode 100644
index 022ad29..0000000
--- a/jsf/features/org.eclipse.jsf.feature/sourceTemplateFeature/epl-v10.html
+++ /dev/null
@@ -1,328 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
-<meta name=ProgId content=Word.Document>
-<meta name=Generator content="Microsoft Word 9">
-<meta name=Originator content="Microsoft Word 9">
-<link rel=File-List
-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
- <o:Revision>2</o:Revision>
- <o:TotalTime>3</o:TotalTime>
- <o:Created>2004-03-05T23:03:00Z</o:Created>
- <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
- <o:Pages>4</o:Pages>
- <o:Words>1626</o:Words>
- <o:Characters>9270</o:Characters>
- <o:Lines>77</o:Lines>
- <o:Paragraphs>18</o:Paragraphs>
- <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
- <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
- <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-<style>
-<!--
- /* Font Definitions */
-@font-face
- {font-family:Tahoma;
- panose-1:2 11 6 4 3 5 4 4 2 4;
- mso-font-charset:0;
- mso-generic-font-family:swiss;
- mso-font-pitch:variable;
- mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
- {mso-style-parent:"";
- margin:0in;
- margin-bottom:.0001pt;
- mso-pagination:widow-orphan;
- font-size:12.0pt;
- font-family:"Times New Roman";
- mso-fareast-font-family:"Times New Roman";}
-p
- {margin-right:0in;
- mso-margin-top-alt:auto;
- mso-margin-bottom-alt:auto;
- margin-left:0in;
- mso-pagination:widow-orphan;
- font-size:12.0pt;
- font-family:"Times New Roman";
- mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
- {mso-style-name:"Balloon Text";
- margin:0in;
- margin-bottom:.0001pt;
- mso-pagination:widow-orphan;
- font-size:8.0pt;
- font-family:Tahoma;
- mso-fareast-font-family:"Times New Roman";}
-@page Section1
- {size:8.5in 11.0in;
- margin:1.0in 1.25in 1.0in 1.25in;
- mso-header-margin:.5in;
- mso-footer-margin:.5in;
- mso-paper-source:0;}
-div.Section1
- {page:Section1;}
--->
-</style>
-</head>
-
-<body lang=EN-US style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("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/jsf/features/org.eclipse.jsf.feature/sourceTemplateFeature/feature.properties b/jsf/features/org.eclipse.jsf.feature/sourceTemplateFeature/feature.properties
deleted file mode 100644
index 60a119c..0000000
--- a/jsf/features/org.eclipse.jsf.feature/sourceTemplateFeature/feature.properties
+++ /dev/null
@@ -1,166 +0,0 @@
-###############################################################################
-# Copyright (c) 2006 Oracle Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# Oracle Corporation - initial API and implementation
-###############################################################################
-# feature.properties
-# contains externalized strings for feature.xml
-# "%foo" in feature.xml corresponds to the key "foo" in this file
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file should be translated.
-
-# "featureName" property - name of the feature
-name=JavaServer Faces Tools (JSF) Project
-# "providerName" property - name of the company that provides the feature
-provider=Eclipse Web Tools Platform
-# "description" property - description of the feature
-description=WTP JavaServer Faces Tools (JSF) Project
-
-# "copyright" property - text of the "Feature Update Copyright"
-copyright=\
-Copyright (c) 2006 Oracle 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\
-\n\
-Contributors:\n\
- Oracle Corporation - initial API and implementation\n
-################ end of copyright property ####################################
-
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=license.html
-
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=\
-Eclipse Foundation Software User Agreement\n\
-April 14, 2010\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the\n\
-Eclipse Foundation is provided to you under the terms and conditions of\n\
-the Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is\n\
-provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse Foundation source code\n\
-repository ("Repository") in software modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
- - Content may be structured and packaged into modules to facilitate delivering,\n\
- extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
- plug-in fragments ("Fragments"), and features ("Features").\n\
- - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\
- in a directory named "plugins".\n\
- - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
- Each Feature may be packaged as a sub-directory in a directory named "features".\n\
- Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
- numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
- - Features may also include other Features ("Included Features"). Within a Feature, files\n\
- named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
- - The top-level (root) directory\n\
- - Plug-in and Fragment directories\n\
- - Inside Plug-ins and Fragments packaged as JARs\n\
- - Sub-directories of the directory named "src" of certain Plug-ins\n\
- - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Provisioning Technology (as defined below), you must agree to a license ("Feature \n\
-Update License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties" found within a Feature.\n\
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the\n\
-terms and conditions (or references to such terms and conditions) that\n\
-govern your use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
- - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
- - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
- - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
- - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
- - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-\n\Use of Provisioning Technology\n\
-\n\
-The Eclipse Foundation makes available provisioning software, examples of which include,\n\
-but are not limited to, p2 and the Eclipse Update Manager ("Provisioning Technology") for\n\
-the purpose of allowing users to install software, documentation, information and/or\n\
-other materials (collectively "Installable Software"). This capability is provided with\n\
-the intent of allowing such users to install, extend and update Eclipse-based products.\n\
-Information about packaging Installable Software is available at\n\
-http://eclipse.org/equinox/p2/repository_packaging.html ("Specification").\n\
-\n\
-You may use Provisioning Technology to allow other parties to install Installable Software.\n\
-You shall be responsible for enabling the applicable license agreements relating to the\n\
-Installable Software to be presented to, and accepted by, the users of the Provisioning Technology\n\
-in accordance with the Specification. By using Provisioning Technology in such a manner and\n\
-making it available in accordance with the Specification, you further acknowledge your\n\
-agreement to, and the acquisition of all necessary rights to permit the following:\n\
-\n\
- 1. A series of actions may occur ("Provisioning Process") in which a user may execute\n\
- the Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\
- extending or updating the functionality of an Eclipse-based product.\n\
- 2. During the Provisioning Process, the Provisioning Technology may cause third party\n\
- Installable Software or a portion thereof to be accessed and copied to the Target Machine.\n\
- 3. Pursuant to the Specification, you will provide to the user the terms and conditions that\n\
- govern the use of the Installable Software ("Installable Software Agreement") and such\n\
- Installable Software Agreement shall be accessed from the Target Machine in accordance\n\
- with the Specification. Such Installable Software Agreement must inform the user of the\n\
- terms and conditions that govern the Installable Software and must solicit acceptance by\n\
- the end user in the manner prescribed in such Installable Software Agreement. Upon such\n\
- indication of agreement by the user, the provisioning Technology will complete installation\n\
- of the Installable Software.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use, and\n\
-re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.\n
-########### end of license property ##########################################
diff --git a/jsf/features/org.eclipse.jsf.feature/sourceTemplateFeature/license.html b/jsf/features/org.eclipse.jsf.feature/sourceTemplateFeature/license.html
deleted file mode 100644
index c184ca3..0000000
--- a/jsf/features/org.eclipse.jsf.feature/sourceTemplateFeature/license.html
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<title>Eclipse Foundation Software User Agreement</title>
-</head>
-
-<body lang="EN-US">
-<h2>Eclipse Foundation Software User Agreement</h2>
-<p>April 14, 2010</p>
-
-<h3>Usage Of Content</h3>
-
-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
- (COLLECTIVELY "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 Foundation source code
- repository ("Repository") in software 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 Provisioning Technology (as defined below), 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>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
- <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
-</ul>
-
-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License is provided, please
-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
-
-
-<h3>Use of Provisioning Technology</h3>
-
-<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse
- Update Manager ("Provisioning Technology") for the purpose of allowing users to install software, documentation, information and/or
- other materials (collectively "Installable Software"). This capability is provided with the intent of allowing such users to
- install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a
- href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>
- ("Specification").</p>
-
-<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the
- applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology
- in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the
- Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>
-
-<ol>
- <li>A series of actions may occur ("Provisioning Process") in which a user may execute the Provisioning Technology
- on a machine ("Target Machine") with the intent of installing, extending or updating the functionality of an Eclipse-based
- product.</li>
- <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be
- accessed and copied to the Target Machine.</li>
- <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable
- Software ("Installable Software Agreement") and such Installable Software Agreement shall be accessed from the Target
- Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern
- the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such
- indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>
-</ol>
-
-<h3>Cryptography</h3>
-
-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
- another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
- possession, or use, and re-export of encryption software, to see if this is permitted.</p>
-
-<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>
-</body>
-</html>
diff --git a/jsf/features/org.eclipse.jsf.feature/sourceTemplatePlugin/about.html b/jsf/features/org.eclipse.jsf.feature/sourceTemplatePlugin/about.html
deleted file mode 100644
index e991479..0000000
--- a/jsf/features/org.eclipse.jsf.feature/sourceTemplatePlugin/about.html
+++ /dev/null
@@ -1,27 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
-
-<p>June, 2008</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.</p>
-
-<h3>Source Code</h3>
-<p>This plug-in contains source code zip files ("Source Zips") that correspond to binary content in other plug-ins. These Source Zips may be distributed under different license
-agreements and/or notices. Details about these license agreements and notices are contained in "about.html" files ("Abouts") located in sub-directories in the
-src/ directory of this plug-in. Such Abouts govern your use of the Source Zips in that directory, not the EPL.</p>
-
-</body>
-</html>
diff --git a/jsf/features/org.eclipse.jsf.feature/sourceTemplatePlugin/about.ini b/jsf/features/org.eclipse.jsf.feature/sourceTemplatePlugin/about.ini
deleted file mode 100644
index 2dee36a..0000000
--- a/jsf/features/org.eclipse.jsf.feature/sourceTemplatePlugin/about.ini
+++ /dev/null
@@ -1,31 +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=%blurb
-
-# Property "windowImage" contains path to window icon (16x16)
-# needed for primary features only
-
-# Property "featureImage" contains path to feature image (32x32)
-featureImage=eclipse32.gif
-
-# Property "aboutImage" contains path to product image (500x330 or 115x164)
-# needed for primary features only
-
-# Property "appName" contains name of the application (not translated)
-# needed for primary features only
-
-# Property "welcomePage" contains path to welcome page (special XML-based format)
-# optional
-
-# Property "welcomePerspective" contains the id of the perspective in which the
-# welcome page is to be opened.
-# optional
-
-
-
-
diff --git a/jsf/features/org.eclipse.jsf.feature/sourceTemplatePlugin/about.mappings b/jsf/features/org.eclipse.jsf.feature/sourceTemplatePlugin/about.mappings
deleted file mode 100644
index a28390a..0000000
--- a/jsf/features/org.eclipse.jsf.feature/sourceTemplatePlugin/about.mappings
+++ /dev/null
@@ -1,6 +0,0 @@
-# about.mappings
-# contains fill-ins for about.properties
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file does not need to be translated.
-
-0=@build@
diff --git a/jsf/features/org.eclipse.jsf.feature/sourceTemplatePlugin/about.properties b/jsf/features/org.eclipse.jsf.feature/sourceTemplatePlugin/about.properties
deleted file mode 100644
index 4e33f86..0000000
--- a/jsf/features/org.eclipse.jsf.feature/sourceTemplatePlugin/about.properties
+++ /dev/null
@@ -1,26 +0,0 @@
-###############################################################################
-# Copyright (c) 2005, 2007 Oracle Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# Oracle Corporation - initial API and implementation
-###############################################################################
-# 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.
-#
-# Do not translate any values surrounded by {}
-
-blurb=JavaServer Faces Tools Source\n\
-\n\
-Version: {featureVersion}\n\
-Build id: {0}\n\
-\n\
-(c) Copyright Eclipse contributors and others 2005. All rights reserved.\n\
-Visit http://www.eclipse.org/webtools
-
diff --git a/jsf/features/org.eclipse.jsf.feature/sourceTemplatePlugin/build.properties b/jsf/features/org.eclipse.jsf.feature/sourceTemplatePlugin/build.properties
deleted file mode 100644
index 05582e3..0000000
--- a/jsf/features/org.eclipse.jsf.feature/sourceTemplatePlugin/build.properties
+++ /dev/null
@@ -1,12 +0,0 @@
-###############################################################################
-# Copyright (c) 2001, 2007 Oracle Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# Oracle Corporation - initial API and implementation
-###############################################################################
-bin.includes = about.html, about.ini, about.mappings, about.properties, eclipse32.gif, plugin.properties, plugin.xml, src/**, META-INF/
-sourcePlugin = true
diff --git a/jsf/features/org.eclipse.jsf.feature/sourceTemplatePlugin/eclipse32.gif b/jsf/features/org.eclipse.jsf.feature/sourceTemplatePlugin/eclipse32.gif
deleted file mode 100644
index e6ad7cc..0000000
--- a/jsf/features/org.eclipse.jsf.feature/sourceTemplatePlugin/eclipse32.gif
+++ /dev/null
Binary files differ
diff --git a/jsf/features/org.eclipse.jsf.feature/sourceTemplatePlugin/eclipse32.png b/jsf/features/org.eclipse.jsf.feature/sourceTemplatePlugin/eclipse32.png
deleted file mode 100644
index 50ae49d..0000000
--- a/jsf/features/org.eclipse.jsf.feature/sourceTemplatePlugin/eclipse32.png
+++ /dev/null
Binary files differ
diff --git a/jsf/features/org.eclipse.jsf.feature/sourceTemplatePlugin/eclipse_update_120.jpg b/jsf/features/org.eclipse.jsf.feature/sourceTemplatePlugin/eclipse_update_120.jpg
deleted file mode 100644
index bfdf708..0000000
--- a/jsf/features/org.eclipse.jsf.feature/sourceTemplatePlugin/eclipse_update_120.jpg
+++ /dev/null
Binary files differ
diff --git a/jsf/features/org.eclipse.jsf.feature/sourceTemplatePlugin/epl-v10.html b/jsf/features/org.eclipse.jsf.feature/sourceTemplatePlugin/epl-v10.html
deleted file mode 100644
index 022ad29..0000000
--- a/jsf/features/org.eclipse.jsf.feature/sourceTemplatePlugin/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/jsf/features/org.eclipse.jsf.feature/sourceTemplatePlugin/license.html b/jsf/features/org.eclipse.jsf.feature/sourceTemplatePlugin/license.html
deleted file mode 100644
index fec4a48..0000000
--- a/jsf/features/org.eclipse.jsf.feature/sourceTemplatePlugin/license.html
+++ /dev/null
@@ -1,82 +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>June 06, 2007</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>
- <LI>Common Development and Distribution License (CDDL) Version 1.0 (available at <A
- href="http://www.sun.com/cddl/cddl.html">http://www.sun.com/cddl/cddl.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/jsf/features/org.eclipse.jsf.feature/sourceTemplatePlugin/plugin.properties b/jsf/features/org.eclipse.jsf.feature/sourceTemplatePlugin/plugin.properties
deleted file mode 100644
index 1c402d4..0000000
--- a/jsf/features/org.eclipse.jsf.feature/sourceTemplatePlugin/plugin.properties
+++ /dev/null
@@ -1,12 +0,0 @@
-###############################################################################
-# Copyright (c) 2005, 2007 Oracle Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# Oracle Corporation - initial API and implementation
-###############################################################################
-pluginName=JavaServer Faces Tools - Source
-providerName=Eclipse.org
diff --git a/jsf/features/org.eclipse.jsf_sdk.feature/.project b/jsf/features/org.eclipse.jsf_sdk.feature/.project
deleted file mode 100644
index bf76782..0000000
--- a/jsf/features/org.eclipse.jsf_sdk.feature/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.jsf_sdk.feature</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.pde.FeatureBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.FeatureNature</nature>
- </natures>
-</projectDescription>
diff --git a/jsf/features/org.eclipse.jsf_sdk.feature/.settings/org.eclipse.core.resources.prefs b/jsf/features/org.eclipse.jsf_sdk.feature/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index fa491bf..0000000
--- a/jsf/features/org.eclipse.jsf_sdk.feature/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Sun May 27 16:00:47 EDT 2007
-eclipse.preferences.version=1
-encoding/<project>=ISO-8859-1
diff --git a/jsf/features/org.eclipse.jsf_sdk.feature/build.properties b/jsf/features/org.eclipse.jsf_sdk.feature/build.properties
deleted file mode 100644
index a0dbc1f..0000000
--- a/jsf/features/org.eclipse.jsf_sdk.feature/build.properties
+++ /dev/null
@@ -1,18 +0,0 @@
-###############################################################################
-# Copyright (c) 2001, 2007 Oracle Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# Oracle Corporation - initial API and implementation
-###############################################################################
-bin.includes = feature.xml,\
- license.html,\
- feature.properties,\
- epl-v10.html,\
- eclipse_update_120.jpg
-
-
-generate.feature@org.eclipse.jsf.feature.source=org.eclipse.jsf.feature
\ No newline at end of file
diff --git a/jsf/features/org.eclipse.jsf_sdk.feature/eclipse_update_120.jpg b/jsf/features/org.eclipse.jsf_sdk.feature/eclipse_update_120.jpg
deleted file mode 100644
index bfdf708..0000000
--- a/jsf/features/org.eclipse.jsf_sdk.feature/eclipse_update_120.jpg
+++ /dev/null
Binary files differ
diff --git a/jsf/features/org.eclipse.jsf_sdk.feature/epl-v10.html b/jsf/features/org.eclipse.jsf_sdk.feature/epl-v10.html
deleted file mode 100644
index ed4b196..0000000
--- a/jsf/features/org.eclipse.jsf_sdk.feature/epl-v10.html
+++ /dev/null
@@ -1,328 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
-<meta name=ProgId content=Word.Document>
-<meta name=Generator content="Microsoft Word 9">
-<meta name=Originator content="Microsoft Word 9">
-<link rel=File-List
-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
- <o:Revision>2</o:Revision>
- <o:TotalTime>3</o:TotalTime>
- <o:Created>2004-03-05T23:03:00Z</o:Created>
- <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
- <o:Pages>4</o:Pages>
- <o:Words>1626</o:Words>
- <o:Characters>9270</o:Characters>
- <o:Lines>77</o:Lines>
- <o:Paragraphs>18</o:Paragraphs>
- <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
- <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
- <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-<style>
-<!--
- /* Font Definitions */
-@font-face
- {font-family:Tahoma;
- panose-1:2 11 6 4 3 5 4 4 2 4;
- mso-font-charset:0;
- mso-generic-font-family:swiss;
- mso-font-pitch:variable;
- mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
- {mso-style-parent:"";
- margin:0in;
- margin-bottom:.0001pt;
- mso-pagination:widow-orphan;
- font-size:12.0pt;
- font-family:"Times New Roman";
- mso-fareast-font-family:"Times New Roman";}
-p
- {margin-right:0in;
- mso-margin-top-alt:auto;
- mso-margin-bottom-alt:auto;
- margin-left:0in;
- mso-pagination:widow-orphan;
- font-size:12.0pt;
- font-family:"Times New Roman";
- mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
- {mso-style-name:"Balloon Text";
- margin:0in;
- margin-bottom:.0001pt;
- mso-pagination:widow-orphan;
- font-size:8.0pt;
- font-family:Tahoma;
- mso-fareast-font-family:"Times New Roman";}
-@page Section1
- {size:8.5in 11.0in;
- margin:1.0in 1.25in 1.0in 1.25in;
- mso-header-margin:.5in;
- mso-footer-margin:.5in;
- mso-paper-source:0;}
-div.Section1
- {page:Section1;}
--->
-</style>
-</head>
-
-<body lang=EN-US style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("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/jsf/features/org.eclipse.jsf_sdk.feature/feature.properties b/jsf/features/org.eclipse.jsf_sdk.feature/feature.properties
deleted file mode 100644
index 6f8f9d4..0000000
--- a/jsf/features/org.eclipse.jsf_sdk.feature/feature.properties
+++ /dev/null
@@ -1,161 +0,0 @@
-###############################################################################
-# Copyright (c) 2005, 2007 Oracle Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# Oracle Corporation - initial API and implementation
-###############################################################################
-name=JavaServer Faces Tools (JSF) Project SDK
-provider=Eclipse Web Tools Platform
-description=WTP JavaServer Faces Tools (JSF) Project SDK
-
-# "updateSiteName" property - label for the update site
-updateSiteName=The Eclipse Web Tools Platform (WTP) Project update site
-
-# "description" property - description of the feature
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=license.html
-
-# "copyright" property - text of the "Feature Update Copyright"
-copyright=\
-Copyright (c) 2006 Oracle 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\
-\n\
-Contributors:\n\
- Oracle Corporation - initial API and implementation\n
-################ end of copyright property ####################################
-
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=\
-Eclipse Foundation Software User Agreement\n\
-April 14, 2010\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the\n\
-Eclipse Foundation is provided to you under the terms and conditions of\n\
-the Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is\n\
-provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse Foundation source code\n\
-repository ("Repository") in software modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
- - Content may be structured and packaged into modules to facilitate delivering,\n\
- extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
- plug-in fragments ("Fragments"), and features ("Features").\n\
- - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\
- in a directory named "plugins".\n\
- - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
- Each Feature may be packaged as a sub-directory in a directory named "features".\n\
- Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
- numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
- - Features may also include other Features ("Included Features"). Within a Feature, files\n\
- named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
- - The top-level (root) directory\n\
- - Plug-in and Fragment directories\n\
- - Inside Plug-ins and Fragments packaged as JARs\n\
- - Sub-directories of the directory named "src" of certain Plug-ins\n\
- - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Provisioning Technology (as defined below), you must agree to a license ("Feature \n\
-Update License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties" found within a Feature.\n\
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the\n\
-terms and conditions (or references to such terms and conditions) that\n\
-govern your use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
- - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
- - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
- - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
- - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
- - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-\n\Use of Provisioning Technology\n\
-\n\
-The Eclipse Foundation makes available provisioning software, examples of which include,\n\
-but are not limited to, p2 and the Eclipse Update Manager ("Provisioning Technology") for\n\
-the purpose of allowing users to install software, documentation, information and/or\n\
-other materials (collectively "Installable Software"). This capability is provided with\n\
-the intent of allowing such users to install, extend and update Eclipse-based products.\n\
-Information about packaging Installable Software is available at\n\
-http://eclipse.org/equinox/p2/repository_packaging.html ("Specification").\n\
-\n\
-You may use Provisioning Technology to allow other parties to install Installable Software.\n\
-You shall be responsible for enabling the applicable license agreements relating to the\n\
-Installable Software to be presented to, and accepted by, the users of the Provisioning Technology\n\
-in accordance with the Specification. By using Provisioning Technology in such a manner and\n\
-making it available in accordance with the Specification, you further acknowledge your\n\
-agreement to, and the acquisition of all necessary rights to permit the following:\n\
-\n\
- 1. A series of actions may occur ("Provisioning Process") in which a user may execute\n\
- the Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\
- extending or updating the functionality of an Eclipse-based product.\n\
- 2. During the Provisioning Process, the Provisioning Technology may cause third party\n\
- Installable Software or a portion thereof to be accessed and copied to the Target Machine.\n\
- 3. Pursuant to the Specification, you will provide to the user the terms and conditions that\n\
- govern the use of the Installable Software ("Installable Software Agreement") and such\n\
- Installable Software Agreement shall be accessed from the Target Machine in accordance\n\
- with the Specification. Such Installable Software Agreement must inform the user of the\n\
- terms and conditions that govern the Installable Software and must solicit acceptance by\n\
- the end user in the manner prescribed in such Installable Software Agreement. Upon such\n\
- indication of agreement by the user, the provisioning Technology will complete installation\n\
- of the Installable Software.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use, and\n\
-re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.\n
-########### end of license property ##########################################
diff --git a/jsf/features/org.eclipse.jsf_sdk.feature/feature.xml b/jsf/features/org.eclipse.jsf_sdk.feature/feature.xml
deleted file mode 100644
index 5f97fa2..0000000
--- a/jsf/features/org.eclipse.jsf_sdk.feature/feature.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
- id="org.eclipse.jsf_sdk.feature"
- label="%name"
- version="3.2.2.qualifier"
- provider-name="%provider"
- image="eclipse_update_120.jpg">
-
- <description>
- %description
- </description>
-
- <copyright>
- %copyright
- </copyright>
-
- <license url="license.html">
- %license
- </license>
-
- <includes
- id="org.eclipse.jsf.feature"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.jsf.feature.source"
- version="0.0.0"/>
-
-</feature>
diff --git a/jsf/features/org.eclipse.jsf_sdk.feature/license.html b/jsf/features/org.eclipse.jsf_sdk.feature/license.html
deleted file mode 100644
index 5644598..0000000
--- a/jsf/features/org.eclipse.jsf_sdk.feature/license.html
+++ /dev/null
@@ -1,98 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3c.org/TR/1999/REC-html401-19991224/loose.dtd">
-<!-- saved from url=(0044)http://www.eclipse.org/legal/epl/notice.html -->
-<HTML><HEAD><TITLE>Eclipse.org Software User Agreement</TITLE>
-<META http-equiv=Content-Type content="text/html; charset=iso-8859-1">
-<META content="MSHTML 6.00.2800.1479" name=GENERATOR></HEAD>
-<BODY lang=EN-US vLink=purple link=blue>
-<H2>Eclipse Foundation Software User Agreement</H2>
-<P>June 06, 2007</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>
-<P>Content may be apportioned into plug-ins ("Plug-ins"), plug-in fragments
-("Fragments"), and features ("Features"). A Feature is a bundle of one or more
-Plug-ins and/or Fragments and associated material. Files named "feature.xml" may
-contain a list of the names and version numbers of the Plug-ins and/or Fragments
-associated with a Feature. Plug-ins and Fragments are located in directories
-named "plugins" and Features are located in directories named "features".</P>
-<P>Features may also include other Features ("Included Features"). Files named
-"feature.xml" may contain a list of the names and version numbers of Included
-Features.</P>
-<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>Plug-in and Fragment directories
- <LI>Subdirectories of the directory named "src" of certain Plug-ins
- <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". 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>Apache Software License 1.1 (available at <A
- href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</A>)
-
- <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>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>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>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>
-
- <LI>Common Development and Distribution License (CDDL) Version 1.0 (available at <A
- href="http://www.sun.com/cddl/cddl.html">http://www.sun.com/cddl/cddl.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></BODY></HTML>
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/.classpath b/jsf/plugins/org.eclipse.jst.jsf.common.runtime/.classpath
deleted file mode 100644
index 64c5e31..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/.cvsignore b/jsf/plugins/org.eclipse.jst.jsf.common.runtime/.cvsignore
deleted file mode 100644
index a179f16..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/.cvsignore
+++ /dev/null
@@ -1,3 +0,0 @@
-@dot
-build.xml
-javaCompiler...args
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/.project b/jsf/plugins/org.eclipse.jst.jsf.common.runtime/.project
deleted file mode 100644
index 4fe172b..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.jst.jsf.common.runtime</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/jsf/plugins/org.eclipse.jst.jsf.common.runtime/.settings/org.eclipse.jdt.core.prefs b/jsf/plugins/org.eclipse.jst.jsf.common.runtime/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 0df408f..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,82 +0,0 @@
-#Tue Mar 02 08:23:18 PST 2010
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.doc.comment.support=enabled
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.autoboxing=warning
-org.eclipse.jdt.core.compiler.problem.deprecation=error
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=ignore
-org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
-org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled
-org.eclipse.jdt.core.compiler.problem.fieldHiding=warning
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=warning
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
-org.eclipse.jdt.core.compiler.problem.invalidJavadoc=error
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=enabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=disabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=disabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=protected
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=warning
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocComments=warning
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=protected
-org.eclipse.jdt.core.compiler.problem.missingJavadocTags=warning
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=protected
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=error
-org.eclipse.jdt.core.compiler.problem.nullReference=ignore
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
-org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=ignore
-org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
-org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=ignore
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=ignore
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=error
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=warning
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=error
-org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=error
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error
-org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.5
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/.settings/org.eclipse.pde.prefs b/jsf/plugins/org.eclipse.jst.jsf.common.runtime/.settings/org.eclipse.pde.prefs
deleted file mode 100644
index 997a930..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/.settings/org.eclipse.pde.prefs
+++ /dev/null
@@ -1,22 +0,0 @@
-#Fri May 30 11:44:25 PDT 2008
-compilers.f.unresolved-features=1
-compilers.f.unresolved-plugins=1
-compilers.incompatible-environment=1
-compilers.p.build=1
-compilers.p.deprecated=1
-compilers.p.discouraged-class=1
-compilers.p.internal=1
-compilers.p.missing-packages=0
-compilers.p.no-required-att=0
-compilers.p.not-externalized-att=0
-compilers.p.unknown-attribute=1
-compilers.p.unknown-class=1
-compilers.p.unknown-element=1
-compilers.p.unknown-identifier=1
-compilers.p.unknown-resource=1
-compilers.p.unresolved-ex-points=0
-compilers.p.unresolved-import=0
-compilers.s.create-docs=false
-compilers.s.doc-folder=doc
-compilers.s.open-tags=1
-eclipse.preferences.version=1
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/META-INF/MANIFEST.MF b/jsf/plugins/org.eclipse.jst.jsf.common.runtime/META-INF/MANIFEST.MF
deleted file mode 100644
index e04c87f..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,22 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Bundle-Name.0
-Bundle-SymbolicName: org.eclipse.jst.jsf.common.runtime
-Bundle-Version: 1.1.0.qualifier
-Bundle-Activator: org.eclipse.jst.jsf.common.runtime.internal.JSFCommonRuntimePlugin
-Require-Bundle: org.eclipse.core.runtime
-Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Export-Package: org.eclipse.jst.jsf.common.runtime.internal;x-internal:=true,
- org.eclipse.jst.jsf.common.runtime.internal.debug;x-friends:="org.eclipse.jst.jsf.common.runtime.tests",
- org.eclipse.jst.jsf.common.runtime.internal.model;x-friends:="org.eclipse.jst.jsf.common.runtime.tests",
- org.eclipse.jst.jsf.common.runtime.internal.model.bean;x-friends:="org.eclipse.jst.jsf.common.runtime.tests",
- org.eclipse.jst.jsf.common.runtime.internal.model.behavioural;x-friends:="org.eclipse.jst.jsf.common.runtime.tests",
- org.eclipse.jst.jsf.common.runtime.internal.model.component;x-friends:="org.eclipse.jst.jsf.common.runtime.tests",
- org.eclipse.jst.jsf.common.runtime.internal.model.datatypes;x-friends:="org.eclipse.jst.jsf.common.runtime.tests",
- org.eclipse.jst.jsf.common.runtime.internal.model.decorator;x-friends:="org.eclipse.jst.jsf.common.runtime.tests",
- org.eclipse.jst.jsf.common.runtime.internal.model.event;x-friends:="org.eclipse.jst.jsf.common.runtime.tests",
- org.eclipse.jst.jsf.common.runtime.internal.model.types;x-friends:="org.eclipse.jst.jsf.common.runtime.tests",
- org.eclipse.jst.jsf.common.runtime.internal.view.model.common;x-friends:="org.eclipse.jst.jsf.common.runtime.tests"
-Bundle-Vendor: %Bundle-Vendor.0
-Bundle-Localization: plugin
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/about.html b/jsf/plugins/org.eclipse.jst.jsf.common.runtime/about.html
deleted file mode 100644
index 8e56059..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/about.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
-
-<p>June, 2008</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.</p>
-
-</body>
-</html>
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/build.properties b/jsf/plugins/org.eclipse.jst.jsf.common.runtime/build.properties
deleted file mode 100644
index ce7a0fa..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/build.properties
+++ /dev/null
@@ -1,16 +0,0 @@
-###############################################################################
-# Copyright (c) 2001, 2008 Oracle Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# Oracle Corporation - initial API and implementation
-###############################################################################
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
- .,\
- plugin.properties,\
- about.html
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/instrumentation/WebContent/WEB-INF/faces-config.xml b/jsf/plugins/org.eclipse.jst.jsf.common.runtime/instrumentation/WebContent/WEB-INF/faces-config.xml
deleted file mode 100644
index 15eef3b..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/instrumentation/WebContent/WEB-INF/faces-config.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!DOCTYPE faces-config PUBLIC
- "-//Sun Microsystems, Inc.//DTD JavaServer Faces Config 1.1//EN"
- "http://java.sun.com/dtd/web-facesconfig_1_1.dtd">
-
-<faces-config>
- <lifecycle>
- <phase-listener>
- instrument.PhaseListener1</phase-listener>
- </lifecycle>
-</faces-config>
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/instrumentation/jar/jsfrt.jar b/jsf/plugins/org.eclipse.jst.jsf.common.runtime/instrumentation/jar/jsfrt.jar
deleted file mode 100644
index 5093673..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/instrumentation/jar/jsfrt.jar
+++ /dev/null
Binary files differ
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/instrumentation/src/instrument/MyMonitorMessageFactory.java b/jsf/plugins/org.eclipse.jst.jsf.common.runtime/instrumentation/src/instrument/MyMonitorMessageFactory.java
deleted file mode 100644
index 3f06d6d..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/instrumentation/src/instrument/MyMonitorMessageFactory.java
+++ /dev/null
@@ -1,132 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2008 Oracle Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Oracle Corporation - initial API and implementation
- *******************************************************************************/
-package instrument;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.ObjectInputStream;
-import java.util.Iterator;
-
-import javax.faces.component.UIComponent;
-import javax.faces.component.UIInput;
-import javax.faces.component.UIOutput;
-
-import org.eclipse.jst.jsf.common.runtime.internal.debug.JSFMonitorMessage;
-import org.eclipse.jst.jsf.common.runtime.internal.model.component.ComponentFactory;
-import org.eclipse.jst.jsf.common.runtime.internal.model.component.ComponentInfo;
-import org.eclipse.jst.jsf.common.runtime.internal.model.component.FacetInfo;
-import org.eclipse.jst.jsf.common.runtime.internal.model.component.UIInputInfo;
-import org.eclipse.jst.jsf.common.runtime.internal.model.component.UIOutputInfo;
-
-public class MyMonitorMessageFactory
-{
- public static JSFMonitorMessage createJSFMonitorMessage(InputStream inStream) throws IOException, ClassCastException, ClassNotFoundException
- {
- ObjectInputStream objectStream = new ObjectInputStream(inStream);
- Object nextObject = objectStream.readObject();
- return (JSFMonitorMessage) nextObject;
- }
-
- static ComponentInfo buildComponentTree(UIComponent component, boolean isFacet)
- {
- final ComponentInfo componentInfo = getComponentData(component, isFacet);
-
- for (Iterator it = component.getChildren().iterator(); it.hasNext();)
- {
- UIComponent child = (UIComponent) it.next();
- componentInfo.getChildren().add(buildComponentTree(child, false));
- }
-
- for (Iterator it = component.getFacets().values().iterator(); it.hasNext();)
- {
- UIComponent facet = (UIComponent) it.next();
- componentInfo.getChildren().add(buildComponentTree(facet, true));
- }
-
- return componentInfo;
- }
-
- private static ComponentInfo getComponentData(final UIComponent component, boolean isFacet)
- {
- if (isFacet)
- {
- return calculateFacetInfo(component);
- }
- else if (component instanceof UIInput)
- {
- return calculateUIInput((UIInput)component);
- }
- else if (component instanceof UIOutput)
- {
- return calculateUIOutput((UIOutput)component);
- }
-
- // default; just make a component
- return calculateComponentInfo(component);
- }
-
- private static ComponentInfo calculateComponentInfo(UIComponent component)
- {
- final String id = component.getId();
- final String parentId = component.getParent() == null ? null : component.getParent().getId();
- final String componentFamily = component.getFamily();
- final String renderFamily = component.getRendererType();
- final String componentType = null;
- final String componentClass = component.getClass().getCanonicalName();
-
- return ComponentFactory.createComponentInfo
- (id, parentId, componentFamily, renderFamily, componentType, componentClass);
- }
-
- private static FacetInfo calculateFacetInfo(UIComponent component)
- {
- final String id = component.getId();
- final String parentId = component.getParent() == null ? null : component.getParent().getId();
- final String componentFamily = component.getFamily();
- final String renderFamily = component.getRendererType();
- final String componentType = null;
- final String componentClass = component.getClass().getCanonicalName();
-
- return ComponentFactory.createFacetInfo
- (id, parentId, componentFamily, renderFamily, componentType, componentClass);
- }
-
- private static UIInputInfo calculateUIInput(UIInput uiInput)
- {
- final String id = uiInput.getId();
- final String parentId = uiInput.getParent() == null ? null : uiInput.getParent().getId();
- final String componentFamily = uiInput.getFamily();
- final String renderFamily = uiInput.getRendererType();
- final String componentType = null;
- final String componentClass = uiInput.getClass().getCanonicalName();
- final String isValid = Boolean.toString(uiInput.isValid());
- final String isImmediate = Boolean.toString(uiInput.isImmediate());
- final String isRequired = Boolean.toString(uiInput.isRequired());
- final String isRendered = Boolean.toString(uiInput.isRendered());
-
- return ComponentFactory.createUIInputInfo
- (id, parentId, componentFamily, renderFamily, isValid, isImmediate, isRequired, isRendered, componentType, componentClass);
- }
-
- private static UIOutputInfo calculateUIOutput(UIOutput uiOutput)
- {
- final String id = uiOutput.getId();
- final String parentId = uiOutput.getParent() == null ? null : uiOutput.getParent().getId();
- final String componentFamily = uiOutput.getFamily();
- final String renderFamily = uiOutput.getRendererType();
- final String componentType = null;
- final String componentClass = uiOutput.getClass().getCanonicalName();
- final String isRendered = Boolean.toString(uiOutput.isRendered());
-
- return ComponentFactory.createUIOutputInfo
- (id, parentId, componentFamily, renderFamily, isRendered, componentType, componentClass);
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/instrumentation/src/instrument/PhaseListener1.java b/jsf/plugins/org.eclipse.jst.jsf.common.runtime/instrumentation/src/instrument/PhaseListener1.java
deleted file mode 100644
index e93e028..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/instrumentation/src/instrument/PhaseListener1.java
+++ /dev/null
@@ -1,342 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2008 Oracle Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Oracle Corporation - initial API and implementation
- *******************************************************************************/
-package instrument;
-
-import java.io.IOException;
-import java.io.ObjectOutputStream;
-import java.io.Writer;
-import java.net.Socket;
-import java.net.UnknownHostException;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Stack;
-import java.util.concurrent.LinkedBlockingQueue;
-
-import javax.faces.FactoryFinder;
-import javax.faces.component.UIComponent;
-import javax.faces.component.UIViewRoot;
-import javax.faces.context.FacesContext;
-import javax.faces.context.ResponseWriter;
-import javax.faces.event.PhaseEvent;
-import javax.faces.event.PhaseId;
-import javax.faces.event.PhaseListener;
-import javax.faces.render.RenderKit;
-import javax.faces.render.RenderKitFactory;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-
-import org.eclipse.jst.jsf.common.runtime.internal.debug.ComponentTreeMessage;
-import org.eclipse.jst.jsf.common.runtime.internal.debug.JSFMonitorMessage;
-import org.eclipse.jst.jsf.common.runtime.internal.debug.MonitorMessageFactory;
-import org.eclipse.jst.jsf.common.runtime.internal.debug.RenderAttribute;
-import org.eclipse.jst.jsf.common.runtime.internal.debug.RenderNode;
-import org.eclipse.jst.jsf.common.runtime.internal.model.component.ComponentInfo;
-
-/**
- * @author cbateman
- *
- */
-public class PhaseListener1 implements PhaseListener
-{
- SocketClient _socketClient;
- ResponseWriter _savedRW;
- LoggingResponseWriter _injectRW;
-
- /**
- *
- */
- private static final long serialVersionUID = 6564874625827591775L;
-
- public PhaseListener1()
- {
- System.out.println("Initialized PhaseListener: "+this);
- _socketClient = new SocketClient(3702);
- Thread thread = new Thread(_socketClient);
- thread.start();
-
- }
-
- public void afterPhase(PhaseEvent event) {
- if(PhaseId.RENDER_RESPONSE.equals(event.getPhaseId()))
- {
- System.out.printf("afterPhase: %s, for view id: %s\n",event.getPhaseId(),event.getFacesContext().getViewRoot().getViewId());
- dumpComponentTree(event.getFacesContext());
-
- if (_savedRW != null)
- {
- event.getFacesContext().setResponseWriter(_savedRW);
- }
-
- if (_injectRW != null)
- {
- dumpNode(_injectRW._rootComponentNode, "");
- }
- }
- }
-
- private void dumpNode(RenderNode node, String prefix)
- {
- System.out.printf("%s%s for component %s\n", prefix, node.getRenderedNodeName(), node.getComponentId());
-
- for (final Iterator it = node.getChildren().iterator();it.hasNext();)
- {
- RenderNode child = (RenderNode) it.next();
- dumpNode(child, prefix+"\t");
- }
- }
-
- public void beforePhase(PhaseEvent event) {
- if (PhaseId.RENDER_RESPONSE.equals(event.getPhaseId()))
- {
- FacesContext facesContext = event.getFacesContext();
- RenderKitFactory renderFactory =
- (RenderKitFactory)FactoryFinder.getFactory(FactoryFinder.RENDER_KIT_FACTORY);
- RenderKit renderKit = renderFactory.getRenderKit(facesContext,
- facesContext.getViewRoot().getRenderKitId());
-
- _savedRW = facesContext.getResponseWriter();
-
- try
- {
- Writer writer = ((ServletResponse) facesContext.getExternalContext().getResponse()).getWriter();
- String charEncoding = ((ServletRequest)facesContext.getExternalContext().getRequest()).getCharacterEncoding();
- ResponseWriter responseWriter = renderKit.createResponseWriter
- (writer,
- null /*Default: get the allowed content-types from the accept-header*/,
- charEncoding);
- _injectRW = new LoggingResponseWriter(responseWriter);
- facesContext.setResponseWriter(_injectRW);
- }
- catch (IOException ioe)
- {
- ioe.printStackTrace();
- }
- }
-// System.out.printf("beforePhase: %s, for view id: %s\n",event.getPhaseId(),event.getFacesContext().getViewRoot().getViewId());
-// dumpComponentTree(event.getFacesContext());
- }
-
- public PhaseId getPhaseId() {
- return PhaseId.ANY_PHASE;
- }
-
- private void dumpComponentTree(final FacesContext facesContext)
- {
- final UIViewRoot root = facesContext.getViewRoot();
-
- if (root != null)
- {
- final String viewId = root.getViewId();
- final ComponentInfo rootComponent = MyMonitorMessageFactory.buildComponentTree(root,false);
- ComponentTreeMessage message =
- MonitorMessageFactory.createTreeMessage(viewId, rootComponent, _injectRW._rootComponentNode);
- _socketClient.put(message);
- }
- }
-
-
- private static class SocketClient implements Runnable
- {
- private final int _port;
-
- private LinkedBlockingQueue<JSFMonitorMessage> _queue =
- new LinkedBlockingQueue<JSFMonitorMessage>();
-
- SocketClient(final int port)
- {
- _port = port;
- }
-
- public void run()
- {
- JSFMonitorMessage buffer = null;
-
- try
- {
- while ((buffer = _queue.take()) != null)
- {
- Socket socket = null;
-
- try
- {
- socket = new Socket("127.0.0.1", _port);
- ObjectOutputStream stream = new ObjectOutputStream(socket.getOutputStream());
- stream.writeObject(buffer);
-// PrintWriter writer = new PrintWriter(socket.getOutputStream(), true);
-// writer.println(buffer);
-// writer.flush();
- } catch (UnknownHostException e) {
- e.printStackTrace();
- } catch (IOException e) {
- e.printStackTrace();
- }
- finally
- {
- if (socket != null && !socket.isClosed())
- {
- try {
- socket.close();
- } catch (IOException e) {
- e.printStackTrace();
- }
- }
- }
- }
- }
- catch (InterruptedException e)
- {
- e.printStackTrace();
- }
- }
-
- public void put(JSFMonitorMessage message)
- {
- _queue.add(message);
- }
- }
-
- private static class LoggingResponseWriter extends ResponseWriter
- {
- private final ResponseWriter _wrapWriter;
- private final Stack/*<RenderNode>*/ _parentStack;
- private RenderNode _curNode;
- private RenderNode _rootComponentNode;
-
- // map component id to the root rendernode rendered for it
- private Map _componentToHtml;
-
- LoggingResponseWriter(ResponseWriter wrapWriter)
- {
- _wrapWriter = wrapWriter;
- _parentStack = new Stack();
-
- _componentToHtml = new HashMap/*<String,RenderNode>*/();
- }
-
- public ResponseWriter cloneWithWriter(Writer writer) {
- return _wrapWriter.cloneWithWriter(writer);
- }
-
- public void endDocument() throws IOException {
- _wrapWriter.endDocument();
- }
-
- public void endElement(String element) throws IOException {
- _curNode = (RenderNode) _parentStack.pop();
- _wrapWriter.endElement(element);
- }
-
- public void flush() throws IOException {
- _wrapWriter.flush();
- }
-
- public String getCharacterEncoding() {
- return _wrapWriter.getCharacterEncoding();
- }
-
- public String getContentType() {
- return _wrapWriter.getContentType();
- }
-
- public void startDocument() throws IOException {
- _rootComponentNode = new RenderNode(null, null);
- _wrapWriter.startDocument();
- }
-
- public void startElement(String elementName, UIComponent component)
- throws IOException
- {
- String componentId = null;
-
- if (component != null)
- {
- componentId = component.getId();
- }
-
- RenderNode oldNode = _curNode;
- // push the curNode. Pushing null indicates the root of the document
- _parentStack.push(oldNode);
-
- _curNode = new RenderNode(componentId, elementName);
-
- // note that assumption here is that the first html element
- // we see corresponding to a component is the root of its
- // html tree. This may not be true if a component renders
- // more than one root element or if the output is generated
- // any thing but pre-order (parent first) tranversal of the
- // component tree. TODO: this algorithm needs refining
- if (!_componentToHtml.containsKey(componentId))
- {
- _componentToHtml.put(componentId, _curNode);
- }
-
- // if the current node isn't null, then append this new element
- if (oldNode != null)
- {
- oldNode.getChildren().add(_curNode);
- }
- // otherwise, we are at the doc root, so append there instead
- else
- {
- _rootComponentNode.getChildren().add(_curNode);
- }
-
-
- // do the normal write
- _wrapWriter.startElement(elementName, component);
- }
-
- public void writeAttribute(String name, Object value, String componentPropertyName)
- throws IOException {
-
- System.out.printf("%s: [%s,%s]\n", name, value.toString(), componentPropertyName);
- final RenderAttribute attribute =
- new RenderAttribute(name, value.toString(), componentPropertyName);
-
- if (_curNode != null)
- {
- _curNode.getRenderedAttributes().add(attribute);
- }
- _wrapWriter.writeAttribute(name, value, componentPropertyName);
- }
-
- public void writeComment(Object obj) throws IOException {
- _wrapWriter.writeComment(obj);
- }
-
- public void writeText(Object arg0, String arg1) throws IOException {
- _wrapWriter.writeText(arg0, arg1);
- }
-
- public void writeText(char[] arg0, int arg1, int arg2)
- throws IOException {
- _wrapWriter.writeText(arg0, arg1, arg2);
- }
-
- public void writeURIAttribute(String arg0, Object arg1, String arg2)
- throws IOException {
- _wrapWriter.writeURIAttribute(arg0, arg1, arg2);
- }
-
- public void close() throws IOException {
- _wrapWriter.close();
- }
-
- public void write(char[] cbuf, int off, int len) throws IOException {
- _wrapWriter.write(cbuf, off, len);
- }
-
- public ResponseWriter getWrapWriter() {
- return _wrapWriter;
- }
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/plugin.properties b/jsf/plugins/org.eclipse.jst.jsf.common.runtime/plugin.properties
deleted file mode 100644
index 2279dd9..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/plugin.properties
+++ /dev/null
@@ -1,11 +0,0 @@
-###############################################################################
-# Copyright (c) 2008 Oracle 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
-#
-###############################################################################
-#Properties file for org.eclipse.jst.jsf.common.runtime
-Bundle-Vendor.0 = Eclipse.org
-Bundle-Name.0 = JavaServer Faces Tools - Common Runtime
\ No newline at end of file
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/JSFCommonRuntimePlugin.java b/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/JSFCommonRuntimePlugin.java
deleted file mode 100644
index 6f9d5f1..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/JSFCommonRuntimePlugin.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2008 Oracle Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Oracle Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.common.runtime.internal;
-
-import org.eclipse.core.runtime.ILog;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Plugin;
-import org.eclipse.core.runtime.Status;
-import org.osgi.framework.BundleContext;
-
-/**
- * The activator class controls the plug-in life cycle
- */
-public class JSFCommonRuntimePlugin extends Plugin {
-
- /**
- * The plug-in ID
- */
- public static final String PLUGIN_ID = "CommonComponentPlugin"; //$NON-NLS-1$
-
- // The shared instance
- private static JSFCommonRuntimePlugin plugin;
-
- /**
- * The constructor
- */
- public JSFCommonRuntimePlugin() {
- // empty constructor
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
- */
- public void start(final BundleContext context) throws Exception {
- super.start(context);
- plugin = this;
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
- */
- public void stop(final BundleContext context) throws Exception {
- plugin = null;
- super.stop(context);
- }
-
- /**
- * Returns the shared instance
- *
- * @return the shared instance
- */
- public static JSFCommonRuntimePlugin getDefault() {
- return plugin;
- }
-
- /**
- * @param message
- * @param t
- */
- public static void log(final String message, final Throwable t)
- {
- final ILog log = getDefault().getLog();
- final IStatus status = new Status(IStatus.ERROR, PLUGIN_ID, message, t);
- log.log(status);
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/debug/ComponentTreeMessage.java b/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/debug/ComponentTreeMessage.java
deleted file mode 100644
index f6687f4..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/debug/ComponentTreeMessage.java
+++ /dev/null
@@ -1,246 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2008 Oracle Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Oracle Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.common.runtime.internal.debug;
-
-import org.eclipse.jst.jsf.common.runtime.internal.model.component.ComponentInfo;
-
-
-/**
- * Represents a component tree in message for that can be serialized.
- *
- * @author cbateman
- *
- */
-public class ComponentTreeMessage extends JSFMonitorMessage
-{
- /**
- *
- */
- private static final long serialVersionUID = -6282344329821994209L;
- private String _viewId;
- private ComponentInfo _treeRoot;
- private RenderNode _renderRoot;
- // private HashMap<String, ComponentInfo> _idIndex;
-
- /**
- * default constructor
- */
- public ComponentTreeMessage()
- {
- //_idIndex = new HashMap<String, ComponentInfo>();
- }
-
- /**
- * @return the view id
- */
- public final String getViewId() {
- return _viewId;
- }
-
- /**
- * @return the componentinfo at the root of the component tree
- */
- public final ComponentInfo getTreeRoot() {
- return _treeRoot;
- }
-
- /**
- * @return the rendered root node
- */
- public final RenderNode getRenderRoot() {
- return _renderRoot;
- }
-
- final void setRenderRoot(RenderNode renderRoot) {
- _renderRoot = renderRoot;
- }
-
- final void setTreeRoot(ComponentInfo treeRoot)
- {
- _treeRoot = treeRoot;
- }
-
- final void setViewId(final String viewId)
- {
- _viewId = viewId;
- }
-
-// @Override
-// protected void deserialize(InputStream inStream) throws IOException, ClassNotFoundException
-// {
-// ObjectInputStream objectInputStream = new ObjectInputStream(inStream);
-//
-// Object obj = objectInputStream.readObject();
-// int bytesRead = super.deserialize(inStream);
-//
-// // first line must be startView
-// final BufferedReader reader =
-// new BufferedReader(new InputStreamReader(inStream));
-//
-// String line = reader.readLine();
-//
-// if (line != null
-// && line.startsWith(START_VIEW))
-// {
-// _viewId = line.substring(START_VIEW.length()).trim();
-// bytesRead += line.length()+1;
-// }
-//
-// // loop until EOF
-// while ((line = reader.readLine())!=null)
-// {
-// bytesRead += line.length()+1;
-//
-// if (line.startsWith("component:"))
-// {
-// parseComponent(line.substring("component:".length()).trim());
-// }
-// else if (line.startsWith("facet:"))
-// {
-// parseFacet(line.substring("facet:".length()).trim());
-// }
-// else if (line.startsWith("uiInput:"))
-// {
-// parseUIInput(line.substring("uiInput:".length()).trim());
-// }
-// else if (line.startsWith("uiOutput:"))
-// {
-// parseUIOutput(line.substring("uiOutput:".length()).trim());
-// }
-// else if (line.startsWith("endView"))
-// {
-// //
-// }
-// }
-// return bytesRead;
-// }
-
-// private ComponentInfo parseComponent(final String line)
-// {
-// final String[] fields = line.split(",");
-// if (fields.length >= 4)
-// {
-// String parentId = "!".equals(fields[0]) ? null : fields[0];
-// String id = "!".equals(fields[1]) ? null : fields[1];
-// String componentFamily = fields[2];
-// String renderFamily = fields[3];
-//
-// ComponentInfo componentInfo =
-// ComponentFactory.createComponentInfo
-// (id, parentId, componentFamily, renderFamily);
-//
-// if (id == null)
-// {
-// _treeRoot = componentInfo;
-// _idIndex.put(null, componentInfo);
-// }
-// else
-// {
-// _idIndex.put(id, componentInfo);
-//
-// ComponentInfo parent =
-// (ComponentInfo)_idIndex.get(parentId);
-//
-// if (parent != null)
-// {
-// parent.getChildren().add(componentInfo);
-// }
-// else
-// {
-// _treeRoot.getChildren().add(componentInfo);
-// }
-// }
-// }
-// return null;
-// }
-//
-// private FacetInfo parseFacet(final String line)
-// {
-// final String[] fields = line.split(",");
-//
-// if (fields.length >= 4)
-// {
-// String parentId = "!".equals(fields[0]) ? null : fields[0];
-// String id = "!".equals(fields[1]) ? null : fields[1];
-// String componentFamily = fields[2];
-// String renderFamily = fields[3];
-//
-// FacetInfo facetInfo =
-// ComponentFactory.createFacetInfo(id, parentId, componentFamily, renderFamily);
-// ComponentInfo parent = _idIndex.get(parentId);
-//
-// if (parent != null)
-// {
-// parent.getChildren().add(facetInfo);
-// }
-//
-// return facetInfo;
-// }
-// return null;
-// }
-//
-// private UIInputInfo parseUIInput(final String line)
-// {
-// final String[] fields = line.split(",");
-//
-// if (fields.length >= 7)
-// {
-// String parentId = "!".equals(fields[0]) ? null : fields[0];
-// String id = "!".equals(fields[1]) ? null : fields[1];
-// String componentFamily = fields[2];
-// String renderFamily = fields[3];
-// String isValid = fields[4];
-// String isImmediate = fields[5];
-// String isRequired = fields[6];
-// String isRendered = fields[7];
-//
-// UIInputInfo uiInputInfo =
-// ComponentFactory.createUIInputInfo
-// (id, parentId, componentFamily, renderFamily, isValid, isImmediate, isRequired, isRendered);
-// ComponentInfo parent = _idIndex.get(parentId);
-//
-// if (parent != null)
-// {
-// parent.getChildren().add(uiInputInfo);
-// }
-//
-// return uiInputInfo;
-// }
-// return null;
-// }
-//
-// private UIOutputInfo parseUIOutput(final String line)
-// {
-// final String[] fields = line.split(",");
-//
-// if (fields.length >= 4)
-// {
-// String parentId = "!".equals(fields[0]) ? null : fields[0];
-// String id = "!".equals(fields[1]) ? null : fields[1];
-// String componentFamily = fields[2];
-// String renderFamily = fields[3];
-// String isRendered = fields[4];
-//
-// UIOutputInfo uiOutputInfo =
-// ComponentFactory.createUIOutputInfo(id, parentId, componentFamily, renderFamily, isRendered);
-//
-// ComponentInfo parent = _idIndex.get(parentId);
-//
-// if (parent != null)
-// {
-// parent.getChildren().add(uiOutputInfo);
-// }
-//
-// return uiOutputInfo;
-// }
-// return null;
-// }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/debug/JSFMonitorMessage.java b/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/debug/JSFMonitorMessage.java
deleted file mode 100644
index 4b2be53..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/debug/JSFMonitorMessage.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2008 Oracle Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Oracle Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.common.runtime.internal.debug;
-
-import java.io.Serializable;
-
-/**
- * Super of all messages that are sent by the JSF debug monitor
- * @author cbateman
- *
- */
-public abstract class JSFMonitorMessage implements Serializable
-{
- /**
- *
- */
- private static final long serialVersionUID = -5417558019077000040L;
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/debug/MonitorMessageFactory.java b/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/debug/MonitorMessageFactory.java
deleted file mode 100644
index eb57677..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/debug/MonitorMessageFactory.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2008 Oracle Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Oracle Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.common.runtime.internal.debug;
-
-import org.eclipse.jst.jsf.common.runtime.internal.model.component.ComponentInfo;
-
-/**
- * Creates JSF remote monitor messages.
- *
- * @author cbateman
- *
- */
-public class MonitorMessageFactory
-{
- /**
- * @param viewId
- * @param root
- * @param renderRoot
- * @return a new component tree message for the parameters
- */
- public static ComponentTreeMessage createTreeMessage(final String viewId, final ComponentInfo root, final RenderNode renderRoot)
- {
- ComponentTreeMessage message = new ComponentTreeMessage();
- message.setViewId(viewId);
- message.setTreeRoot(root);
- message.setRenderRoot(renderRoot);
- return message;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/debug/RenderAttribute.java b/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/debug/RenderAttribute.java
deleted file mode 100644
index e0c1b91..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/debug/RenderAttribute.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2008 Oracle Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Oracle Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.common.runtime.internal.debug;
-
-/**
- * Information about a rendered XML attribute
- *
- * @author cbateman
- *
- */
-public class RenderAttribute extends JSFMonitorMessage {
-
- /**
- *
- */
- private static final long serialVersionUID = -4601065346261130623L;
-
- private final String _name; // the name of the attribute. TODO: local vs. namespace?
- private final String _value; // the rendered value of the node
- private final String _propertyName; // the property name on the corresponding component
- // may be null
- /**
- * @param name
- * @param value
- * @param propertyName
- */
- public RenderAttribute(String name, String value, String propertyName) {
- super();
- _name = name;
- _propertyName = propertyName;
- _value = value;
- }
- /**
- * @return the name of the attribute
- */
- public final String getName() {
- return _name;
- }
- /**
- * @return the attribute's value
- */
- public final String getValue() {
- return _value;
- }
- /**
- * @return the name of the corresponding component property if any.
- */
- public final String getPropertyName() {
- return _propertyName;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/debug/RenderNode.java b/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/debug/RenderNode.java
deleted file mode 100644
index 2679c62..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/debug/RenderNode.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2008 Oracle Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Oracle Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.common.runtime.internal.debug;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-/**
- * A rendered XML node.
- *
- * @author cbateman
- *
- */
-public class RenderNode extends JSFMonitorMessage
-{
- /**
- *
- */
- private static final long serialVersionUID = -2843929405836710015L;
-
- private final String _componentId; // the id of the component id that caused the node to render
- private final String _renderedNodeName; // the node
- private final List/*<RenderedAttribute>*/ _renderedAttributes; // attributes
- private final List _children; // the rendered children of renderedNode based
- // on the output document hiearchy
- /**
- * @param componentId
- * @param renderedNodeName
- */
- public RenderNode(String componentId, String renderedNodeName) {
- super();
- _componentId = componentId;
- _renderedNodeName = renderedNodeName;
-
- _children = new ArrayList();
- _renderedAttributes = new ArrayList();
- }
- /**
- * @return the corresponding component's id
- */
- public final String getComponentId() {
- return _componentId;
- }
- /**
- * @return the node's children
- */
- public final List getChildren() {
- return _children;
- }
- /**
- * @return the name of the rendered node (element)
- */
- public final String getRenderedNodeName() {
- return _renderedNodeName;
- }
- /**
- * @return the attributes of this node as rendered.
- */
- public final List getRenderedAttributes() {
- return _renderedAttributes;
- }
- public String toString()
- {
- String toString = "Root node: "+_renderedNodeName+", attributes: ["; //$NON-NLS-1$ //$NON-NLS-2$
-
- for (Iterator it = _renderedAttributes.iterator(); it.hasNext();)
- {
- final RenderAttribute attribute = (RenderAttribute) it.next();
- toString+=attribute.getName() + "=" + attribute.getValue(); //$NON-NLS-1$
-
- toString+=it.hasNext() ? ", " : "]"; //$NON-NLS-1$ //$NON-NLS-2$
- }
-
- return toString;
- }
-}
\ No newline at end of file
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/IDesigntimeAdapter.java b/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/IDesigntimeAdapter.java
deleted file mode 100644
index bd427e6..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/IDesigntimeAdapter.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2008 Oracle Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Oracle Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.common.runtime.internal.model;
-
-/**
- * Implemented by design time adapters that represent runtime interfaces.
- *
- * @author cbateman
- *
- */
-public interface IDesigntimeAdapter
-{
- /**
- * @return the list of runtime interfaces that this runtime adapter
- * represents.
- */
- String[] getInterfaces();
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/ViewObject.java b/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/ViewObject.java
deleted file mode 100644
index 9c36f72..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/ViewObject.java
+++ /dev/null
@@ -1,542 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2008 Oracle Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Oracle Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.common.runtime.internal.model;
-
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.jst.jsf.common.runtime.internal.model.decorator.Decorator;
-
-/**
- * The base type of all objects that participate in the lifecycle of a view.
- * This may be used to hold either design time or runtime information.
- *
- * @author cbateman
- *
- */
-public abstract class ViewObject implements Serializable /* IAdaptable? */
-{
- private final ViewObjectData _data;
-
- /**
- *
- */
- private static final long serialVersionUID = 1592205691642453075L;
-
- /**
- *
- */
- protected ViewObject()
- {
- this(new ViewObjectData(false));
- }
-
- /**
- * @param delegate
- */
- protected ViewObject(final ViewObjectData delegate)
- {
- _data = delegate;
- _data.setOwner(this);
- }
-
- /**
- * @return the object containing all this view object's data
- */
- protected ViewObjectData getData()
- {
- return _data;
- }
-
- /**
- * IMPORTANT: if this method returns false, then calling a mutator method
- * (basically anything that is not a get/isX() will throw any
- * IllegalStateException).
- *
- * @return if the object can still be modified.
- */
- public final boolean isModifiable()
- {
- return !getData().isProtected();
- }
-
- /**
- * Calling this method sets the state to not modifiable
- */
- public final void setProtected()
- {
- getData().setLocked();
- }
-
- /**
- * This call may be create a new data structure and should be considered of
- * much higher cost than most calls.
- *
- * @return all decorators of this object. List should be assumed by clients
- * to be unmodifiable and may throw mutation exceptions
- */
- public List getAllDecorators()
- {
- final int size = getDecoratorMap().size();
-
- if (size == 0)
- {
- return Collections.EMPTY_LIST;
- }
-
- final List allDecorators = new ArrayList();
- for (final Iterator entryIt = getDecoratorMap().entrySet().iterator(); entryIt
- .hasNext();)
- {
- final Map.Entry entry = (Map.Entry) entryIt.next();
- final List decorators = (List) entry.getValue();
- allDecorators.addAll(decorators);
- }
-
- return Collections.unmodifiableList(allDecorators);
- }
-
- /**
- * @param decoratorType
- * @return all decorators of this object associated with the class type. The
- * returned list should be assumed to be unmodifiable. Returns an
- * empty list if no decorators are associated with decoratorType
- */
- public List getDecorators(final Class decoratorType)
- {
- final List decorators = (List) getDecoratorMap().get(decoratorType);
-
- if (decorators == null)
- {
- return Collections.EMPTY_LIST;
- }
- return Collections.unmodifiableList(decorators);
- }
-
- /**
- * Add the decorator using decorator.getClass to associate the type. Must be
- * equivalent to addDecorator(decorator, decorator.getClass());
- *
- * @param decorator
- * the decorator to add. <b>Must NOT be null.</b>
- * @throws IllegalArgumentException
- * if decorator is null.
- */
- public void addDecorator(final Decorator decorator)
- {
- _data.addDecorator(decorator);
- }
-
- /**
- * Add the decorator using the associatedType. Normally you should call
- * {@link #addDecorator(Decorator)} however in some cases you may wish to
- * associated a decorator with a class type other than its own. For example,
- * sub-classes of ValidatorDecorator will want to associated with
- * ValidatorDecorator.getClass() in most cases so that it is included in any
- * common examination of component validators.
- *
- * @param decorator
- * to add. <b>Must NOT be null.</b>
- * @param associatedType
- * the key to store decorator <b>Must NOT be null</b>
- * @throws IllegalArgumentException
- * if decorator or associatedType is null
- */
- public void addDecorator(final Decorator decorator,
- final Class associatedType)
- {
- _data.addDecorator(decorator, associatedType);
- }
-
- /**
- * Removes decorator if it is associated to associatedType on this view
- * object.
- *
- * @param decorator
- * @param associatedType
- * @return true if the decorator was found and removed.
- * @throws IllegalArgumentException
- * if decorator or associatedType is null
- */
- public boolean removeDecorator(final Decorator decorator,
- final Class associatedType)
- {
- return _data.removeDecorator(decorator, associatedType);
- }
-
- /**
- * <p>
- * Get the adapter associated the class key.
- * </p>
- *
- * <p>
- * If addAdapter has been called with adapterType, then this adapter object
- * should always be called. In the default implementation, if there is no
- * explicit adapter, "this" is returned if (this instanceof adapterType).
- *
- * @param adapterType
- * @return the interface adapter associated with the class key or null if
- * not found
- */
- public Object getAdapter(final Class adapterType)
- {
- if (adapterType == null)
- {
- return null;
- }
-
- Object adapter = getAdapterMap().get(adapterType);
-
- if (adapter == null)
- {
- if (adapterType.isInstance(this))
- {
- adapter = this;
- }
- }
-
- return adapter;
- }
-
- /**
- * Adds the interface adapter object under adapterType key. There can be at
- * most one adapter registered for each class key.
- *
- * It is an error (throws exception) to try to add an adapter for
- * adapterType which this is already instance. This restriction is necessary
- * because otherwise local getters/setters would need to be aware of the
- * adapter mechanism and verify inheritance hierarchies on every calls. This
- * mechanism is intended only for adding interfaces to view object impls
- * that don't already have them.
- *
- * @param adapterType
- * @param adapter
- * @throws IllegalArgumentException
- * if adapterType or adapter is null or if casting adapter to
- * adapterType would * cause a ClassCastException (i.e. if
- * !(adapter instanceof adapterType)) OR if this is already an
- * instance of adapterType.
- */
- public void addAdapter(final Class adapterType, final Object adapter)
- {
- _data.addAdapter(adapterType, adapter);
- }
-
- /**
- * Note that {@link #getAdapter(Class)} may still return non-null after this
- * is called if (this instanceof adapterType).
- *
- * @param adapterType
- * @return the adapter for adapterType that was just removed or null if not
- * found
- */
- public Object removeAdapter(final Class adapterType)
- {
- return getAdapterMap().remove(adapterType);
- }
-
- /**
- * Note that this only returns those adapters added using
- * {@link #addAdapter(Class, Object)}. It does not return any implicit
- * adapters resulting from (this instanceof type).
- *
- * @return the map of all adapters. Maps is immutable and may throw
- * exceptions on attempts to mutate.
- */
- public Map getAllAdapters()
- {
- if (getAdapterMap().size() == 0)
- {
- return Collections.EMPTY_MAP;
- }
- return Collections.unmodifiableMap(getAdapterMap());
- }
-
- /**
- * <p>
- * The contract for this method is that it must always return a usable Map
- * and that map must be the same on every call. Lazy construction may be
- * used (as it is by default). The default map size is 4 and load factor is
- * 3 meaning that there should be decent tradeoff between wasted table size
- * and overhead used to increase it should the number of decorators exceed
- * 3. <b>Must never return null.</b>
- * </p>
- *
- * <p>
- * Generally, the method should not need to be overridden, however it is
- * provided to allow sub-classes to change the way the decorators map is
- * constructed.
- * </p>
- *
- * @return the map containing lists of decorators keyed by class.
- *
- */
- protected Map getDecoratorMap()
- {
- return _data.getDecoratorMap();
- }
-
- /**
- * <p>
- * The contract for this method is that it must always return a usable Map
- * and that map must be the same on every call. Lazy construction may be
- * used (as it is by default). The default map size is 4 and load factor is
- * 3 meaning that there should be decent tradeoff between wasted table size
- * and overhead used to increase it should the number of decorators exceed
- * 3. <b>Must never return null.</b>
- * </p>
- *
- * <p>
- * Generally, the method should not need to be overridden, however it is
- * provided to allow sub-classes to change the way the decorators map is
- * constructed.
- * </p>
- *
- * @return the map containing lists of adapters keyed by class.
- *
- */
- protected Map getAdapterMap()
- {
- return _data.getAdapterMap();
- }
-
- // ALL ViewObject's must use reference equals
- public final boolean equals(final Object obj)
- {
- return super.equals(obj);
- }
-
- public final int hashCode()
- {
- return super.hashCode();
- }
-
- /**
- * The protectable view object data.
- *
- */
- public static class ViewObjectData extends ProtectedDataObject
- {
- /**
- *
- */
- private static final long serialVersionUID = -4216980607447926035L;
- private Map _decorators;
- private Map _adapters;
- private Object _owner;
-
- /**
- * @param isProtected
- */
- public ViewObjectData(final boolean isProtected)
- {
- super(isProtected);
- }
-
- private void setOwner(final ViewObject viewObject)
- {
- _owner = viewObject;
- }
-
- /**
- * For serialization only.
- */
- // public ViewObjectData()
- // {
- // // for serializability
- // super(false);
- // }
-
- /**
- * @param decorator
- * @param associatedType
- * @return true if the decorator was removed.
- */
- public boolean removeDecorator(final Decorator decorator, final Class associatedType)
- {
- enforceProtection();
-
- if (decorator == null || associatedType == null)
- {
- throw new IllegalArgumentException("Arguments must not be null"); //$NON-NLS-1$
- }
-
- final List decoratorsByType = (List) getDecoratorMap().get(
- associatedType);
-
- if (decoratorsByType != null)
- {
- return decoratorsByType.remove(decorator);
- }
-
- return false;
- }
-
- /**
- * @param adapterType
- * @param adapter
- */
- public void addAdapter(final Class adapterType, final Object adapter)
- {
- enforceProtection();
-
- if (adapterType == null || adapter == null)
- {
- throw new IllegalArgumentException("Arguments must not be null"); //$NON-NLS-1$
- }
-
- if (!adapterType.isInstance(adapter))
- {
- throw new IllegalArgumentException("adapter: " + adapter //$NON-NLS-1$
- + " must be cast compatible to class: " + adapterType); //$NON-NLS-1$
- }
- else if (adapterType.isInstance(_owner))
- {
- throw new IllegalArgumentException("this: " + _owner //$NON-NLS-1$
- + " must not already be an instance of class: " //$NON-NLS-1$
- + adapterType);
- }
- getAdapterMap().put(adapterType, adapter);
- }
-
- /**
- * @param decorator
- */
- public void addDecorator(final Decorator decorator)
- {
- enforceProtection();
-
- if (decorator == null)
- {
- throw new IllegalArgumentException("Arguments must not be null"); //$NON-NLS-1$
- }
- final Class associationType = decorator.getClass();
- addDecorator(decorator, associationType);
- }
-
- /**
- * @param decorator
- * @param associatedType
- */
- public void addDecorator(final Decorator decorator, final Class associatedType)
- {
- enforceProtection();
-
- if (decorator == null || associatedType == null)
- {
- throw new IllegalArgumentException("Arguments must not be null"); //$NON-NLS-1$
- }
-
- List decoratorsByType = (List) getDecoratorMap().get(associatedType);
-
- if (decoratorsByType == null)
- {
- decoratorsByType = new ArrayList(2);
- getDecoratorMap().put(associatedType, decoratorsByType);
- }
-
- decoratorsByType.add(decorator);
- }
-
- /**
- * @return the decorator map, creating it if necessary
- */
- protected synchronized Map getDecoratorMap()
- {
- if (_decorators == null)
- {
- if (isProtected())
- {
- _decorators = Collections.EMPTY_MAP;
- }
- _decorators = new HashMap(4);
- }
- return _decorators;
- }
-
- /**
- * @return the adapter map, creating if necessary.
- */
- protected synchronized Map getAdapterMap()
- {
- if (_adapters == null)
- {
- _adapters = new HashMap(4);
- }
-
- return _adapters;
- }
- }
-
- /**
- * An object that enforces that mutation can only happen up to point where
- * the object is designated protected at which point is it is forever
- * immutable.
- *
- */
- public static abstract class ProtectedDataObject implements Serializable
- {
- /**
- *
- */
- private static final long serialVersionUID = 4470279408370430399L;
- private boolean _isProtected;
-
- /**
- * @param isProtected
- */
- public ProtectedDataObject(final boolean isProtected)
- {
- _isProtected = isProtected;
- }
-
- /**
- * @throws UnsupportedOperationException
- */
- protected final synchronized void enforceProtection() throws UnsupportedOperationException
- {
- if (isProtected())
- {
- throw new UnsupportedOperationException("Object "+this.toString()+ " is locked for modification"); //$NON-NLS-1$ //$NON-NLS-2$
- }
- }
-
- /**
- * @return true if this object is protected and irrevocablly immutable.
- */
- public final synchronized boolean isProtected()
- {
- return _isProtected;
- }
-
- /**
- * Executed right before setProtected irrevocably sets the protection
- * flag. Does nothing by default
- */
- protected void doBeforeProtecting()
- {
- // do nothing by default
- }
- /**
- * Makes this object irrevocably immutable.
- */
- public final synchronized void setLocked()
- {
- doBeforeProtecting();
- _isProtected = true;
- }
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/bean/DataModelInfo.java b/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/bean/DataModelInfo.java
deleted file mode 100644
index e7c2e93..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/bean/DataModelInfo.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2008 Oracle Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Oracle Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.common.runtime.internal.model.bean;
-
-import java.io.Serializable;
-
-/**
- * Design time analog of runtime DataModel bean
- *
- * @author cbateman
- *
- */
-public class DataModelInfo implements Serializable
-{
- /**
- * serializable id
- */
- private static final long serialVersionUID = 6461056497382677871L;
-
- private final boolean _rowAvailable;
- private final int _rowCount;
- private final SerializableObject _rowData;
- private final int _rowIndex;
- private final SerializableObject _wrappedData;
-
- /**
- * @param rowAvailable
- * @param rowCount
- * @param rowData
- * @param rowIndex
- * @param wrappedData
- */
- public DataModelInfo(boolean rowAvailable, int rowCount, Object rowData,
- int rowIndex, Object wrappedData) {
- super();
- _rowAvailable = rowAvailable;
- _rowCount = rowCount;
- _rowData = new SerializableObject(rowData);
- _rowIndex = rowIndex;
- _wrappedData = new SerializableObject(wrappedData);
- }
-
- /**
- * @return true if the current row is available
- */
- public final boolean isRowAvailable() {
- return _rowAvailable;
- }
- /**
- * @return the row count of this model
- */
- public final int getRowCount() {
- return _rowCount;
- }
- /**
- * @return the row data
- */
- public final Object getRowData() {
- return _rowData.getMaybeSerializable();
- }
- /**
- * @return the row index
- */
- public final int getRowIndex() {
- return _rowIndex;
- }
- /**
- * @return the wrapped data. may be null if wrapped object was not
- * serializable.
- */
- public final Object getWrappedData() {
- return _wrappedData.getMaybeSerializable();
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/bean/SerializableObject.java b/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/bean/SerializableObject.java
deleted file mode 100644
index e3b066a..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/bean/SerializableObject.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2008 Oracle Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Oracle Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.common.runtime.internal.model.bean;
-
-import java.io.IOException;
-import java.io.NotSerializableException;
-import java.io.Serializable;
-
-/**
- * A special object used in place of Object to ensure that when an interface
- * requires a generic #{@link java.lang.Object}, it won't throw serialization
- * exception when a containing object is serialized.
- *
- * @author cbateman
- *
- */
-public class SerializableObject implements Serializable
-{
- /**
- *
- */
- private static final long serialVersionUID = 9133733048469500692L;
- private Object _maybeSerializable;
-
- /**
- * @param maybeSerializable
- */
- public SerializableObject(Object maybeSerializable)
- {
- _maybeSerializable = maybeSerializable;
- }
-
-
-// /**
-// * Provided to support serialization. Should not be used by sub-classes
-// * or clients except in this regard.
-// */
-// protected SerializableObject()
-// {
-// _maybeSerializable = null;
-// }
-
- /**
- * @return the actual value
- */
- public final Object getMaybeSerializable() {
- return _maybeSerializable;
- }
-
-
- private void writeObject(java.io.ObjectOutputStream out)
- throws IOException
- {
- try
- {
- out.writeObject(_maybeSerializable);
- }
- catch (NotSerializableException nse)
- {
- // do nothing, the object isn't guaranteed to be serializable,
- // but we don't want this be an error
- out.writeObject(null);
- }
- }
-
- private void readObject(java.io.ObjectInputStream in)
- throws IOException, ClassNotFoundException
- {
- _maybeSerializable = in.readObject();
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/behavioural/ActionSourceInfo.java b/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/behavioural/ActionSourceInfo.java
deleted file mode 100644
index 6e7348d..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/behavioural/ActionSourceInfo.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2008 Oracle Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Oracle Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.common.runtime.internal.model.behavioural;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.jst.jsf.common.runtime.internal.model.IDesigntimeAdapter;
-import org.eclipse.jst.jsf.common.runtime.internal.model.component.ComponentFactory;
-import org.eclipse.jst.jsf.common.runtime.internal.model.decorator.ActionListenerDecorator;
-
-/**
- * Implementation of the ActionSourceInfo.
- *
- * @author cbateman
- *
- */
-public class ActionSourceInfo implements IActionSourceInfo, IDesigntimeAdapter
-{
- /**
- * serializable id
- */
- private static final long serialVersionUID = 6531166406473466685L;
- private static final String[] INTERFACE = new String[]{ComponentFactory.INTERFACE_ACTIONSOURCE};
- private final String _action;
- private final String _actionListener;
- private final boolean _immediate;
- private List/*<ActionListenerDecorator>*/ _actionListeners;
-
- /**
- * @param action
- * @param actionListener
- * @param immediate
- */
- public ActionSourceInfo(final String action, final String actionListener,
- final boolean immediate)
- {
- super();
- _action = action;
- _actionListener = actionListener;
- _immediate = immediate;
- }
-
- public void addActionListener(final ActionListenerDecorator actionListener) {
- if (_actionListeners == null)
- {
- _actionListeners = new ArrayList(2);
- }
- _actionListeners.add(actionListener);
- }
-
- public String getAction() {
- return _action;
- }
-
- public String getActionListener() {
- return _actionListener;
- }
-
- public List getActionListeners() {
- if (_actionListeners == null)
- {
- return Collections.EMPTY_LIST;
- }
- return Collections.unmodifiableList(_actionListeners);
- }
-
- public boolean isImmediate() {
- return _immediate;
- }
-
- public String[] getInterfaces()
- {
- return INTERFACE;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/behavioural/ActionSourceInfo2.java b/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/behavioural/ActionSourceInfo2.java
deleted file mode 100644
index d36b95b..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/behavioural/ActionSourceInfo2.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2008 Oracle Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Oracle Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.common.runtime.internal.model.behavioural;
-
-import org.eclipse.jst.jsf.common.runtime.internal.model.IDesigntimeAdapter;
-import org.eclipse.jst.jsf.common.runtime.internal.model.component.ComponentFactory;
-
-/**
- * Implementation of the IActionSource2Info
- *
- * @author cbateman
- *
- */
-public class ActionSourceInfo2 extends ActionSourceInfo implements
- IActionSource2Info, IDesigntimeAdapter
-{
- /**
- * serializable id
- */
- private static final long serialVersionUID = 5811194815559772378L;
- private static final String[] INTERFACE = new String[]{ComponentFactory.INTERFACE_ACTIONSOURCE2};
-
- private final String _actionExpression;
-
- /**
- * @param action
- * @param actionListener
- * @param immediate
- * @param actionExpression
- */
- public ActionSourceInfo2(final String action, final String actionListener,
- final boolean immediate, final String actionExpression) {
- super(action, actionListener, immediate);
- _actionExpression = actionExpression;
- }
-
- public String getActionExpression() {
- return _actionExpression;
- }
-
- public String[] getInterfaces()
- {
- return INTERFACE;
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/behavioural/EditableValueHolderInfo.java b/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/behavioural/EditableValueHolderInfo.java
deleted file mode 100644
index 8b07c45..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/behavioural/EditableValueHolderInfo.java
+++ /dev/null
@@ -1,144 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2008 Oracle Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Oracle Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.common.runtime.internal.model.behavioural;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.jst.jsf.common.runtime.internal.model.IDesigntimeAdapter;
-import org.eclipse.jst.jsf.common.runtime.internal.model.component.ComponentFactory;
-import org.eclipse.jst.jsf.common.runtime.internal.model.decorator.ConverterDecorator;
-import org.eclipse.jst.jsf.common.runtime.internal.model.decorator.ValidatorDecorator;
-import org.eclipse.jst.jsf.common.runtime.internal.model.decorator.ValueChangeListenerDecorator;
-
-/**
- * Implementation of the IEditableValueHolderInfo
- *
- * @author cbateman
- *
- */
-public class EditableValueHolderInfo extends ValueHolderInfo implements
- IEditableValueHolderInfo, IDesigntimeAdapter
-{
- /**
- *
- */
- private static final long serialVersionUID = -2115990809157328451L;
- private static final String[] INTERFACE = new String[] {ComponentFactory.INTERFACE_EDITABLEVALUEHOLDER};
-
- private final boolean _localSetValue;
- private final Object _submittedValue;
- private final String _validator;
- private final String _valueChangeListener;
- private final boolean _isImmediate;
- private final boolean _isRequired;
- private final boolean _isValid;
- private List _validators;
- private List _valueChangeListeners;
-
- /**
- * @param converterDecorator
- * @param localValue
- * @param value
- * @param isImmediate
- * @param isRequired
- * @param isValid
- * @param localSetValue
- * @param submittedValue
- * @param validator
- * @param valueChangeListener
- */
- public EditableValueHolderInfo(final ConverterDecorator converterDecorator,
- final Object localValue, final Object value, final boolean isImmediate,
- final boolean isRequired, final boolean isValid, final boolean localSetValue,
- final Object submittedValue, final String validator, final String valueChangeListener)
- {
- super(converterDecorator, localValue, value);
- _isImmediate = isImmediate;
- _isRequired = isRequired;
- _isValid = isValid;
- _localSetValue = localSetValue;
- _submittedValue = submittedValue;
- _validator = validator;
- _valueChangeListener = valueChangeListener;
- }
-
- public final boolean isLocalSetValue() {
- return _localSetValue;
- }
-
- public final Object getSubmittedValue() {
- return _submittedValue;
- }
-
- public final String getValidator() {
- return _validator;
- }
-
- public final String getValueChangeListener() {
- return _valueChangeListener;
- }
-
- public final boolean isImmediate() {
- return _isImmediate;
- }
-
- public final boolean isRequired() {
- return _isRequired;
- }
-
- public final boolean isValid() {
- return _isValid;
- }
-
- public void addValidator(final ValidatorDecorator validator)
- {
- if (_validators == null)
- {
- _validators = new ArrayList(2);
- }
- _validators.add(validator);
- }
-
- public void addValueChangeListener(
- final ValueChangeListenerDecorator valueChangeListenerInfo)
- {
- if (_valueChangeListeners == null)
- {
- _valueChangeListeners = new ArrayList(2);
- }
- _valueChangeListeners.add(valueChangeListenerInfo);
- }
-
- public List getValidators() {
- if (_validators == null)
- {
- return Collections.EMPTY_LIST;
- }
-
- return Collections.unmodifiableList(_validators);
- }
-
- public List getValueChangeListeners() {
- if (_valueChangeListeners == null)
- {
- return Collections.EMPTY_LIST;
- }
-
- return Collections.unmodifiableList(_valueChangeListeners);
- }
-
- public String[] getInterfaces()
- {
- return INTERFACE;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/behavioural/IActionSource2Info.java b/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/behavioural/IActionSource2Info.java
deleted file mode 100644
index 21966e1..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/behavioural/IActionSource2Info.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2008 Oracle Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Oracle Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.common.runtime.internal.model.behavioural;
-
-/**
- * Design-time analog for the ActionSource2 interface.
- *
- * @author cbateman
- *
- */
-public interface IActionSource2Info extends IActionSourceInfo
-{
- /**
- * TODO: this method is similar to getAction on ActionSource from
- * our perspective since the actual string rep of the EL is basically
- * the same...
- *
- * @return an EL method expression that represents a call to
- * an action method.
- */
- String getActionExpression();
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/behavioural/IActionSourceInfo.java b/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/behavioural/IActionSourceInfo.java
deleted file mode 100644
index 3d2dd2e..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/behavioural/IActionSourceInfo.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2008 Oracle Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Oracle Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.common.runtime.internal.model.behavioural;
-
-import java.io.Serializable;
-import java.util.List;
-
-import org.eclipse.jst.jsf.common.runtime.internal.model.decorator.ActionListenerDecorator;
-
-/**
- * A design time analog for the runtime ActionSource interface.
- *
- * @author cbateman
- *
- */
-public interface IActionSourceInfo extends Serializable
-{
- /**
- * @return true if action listener associated with this action source
- * should be executed immediately after the apply request values phase.
- * Default is false.
- */
- boolean isImmediate();
-
-
- /**
- * Add the action listener to the list
- *
- * @param actionListener
- */
- void addActionListener(ActionListenerDecorator actionListener);
-
- /**
- * @return all action listeners registered. List should be considered
- * immutable and may throw exceptions if modified.
- */
- List/*<ActionListenerDecorator>*/ getActionListeners();
-
- /**
- * <b> NOTE: this method is deprecated in the runtime spec and exists for
- * backward compatibility with JSF 1.1. You should avoid using it except in
- * conjunction with JSF 1.1 tooling support. This method will be deprecated
- * once the runtime spec removes the underlying API</b>
-
- * @return a method binding expression describing an action handler
- */
- String getAction();
-
- /**
- * <b> NOTE: this method is deprecated in the runtime spec and exists for
- * backward compatibility with JSF 1.1. You should avoid using it except in
- * conjunction with JSF 1.1 tooling support. This method will be deprecated
- * once the runtime spec removes the underlying API</b>
- *
- * @return a method binding expression describing an action listener
- */
- String getActionListener();
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/behavioural/IEditableValueHolderInfo.java b/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/behavioural/IEditableValueHolderInfo.java
deleted file mode 100644
index 53403d1..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/behavioural/IEditableValueHolderInfo.java
+++ /dev/null
@@ -1,103 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2008 Oracle Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Oracle Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.common.runtime.internal.model.behavioural;
-
-import java.util.List;
-
-import org.eclipse.jst.jsf.common.runtime.internal.model.decorator.ValidatorDecorator;
-import org.eclipse.jst.jsf.common.runtime.internal.model.decorator.ValueChangeListenerDecorator;
-
-/**
- * A design time analog for the JSF runtime EditableValueHolder interface.
- *
- * @author cbateman
- *
- */
-public interface IEditableValueHolderInfo extends IValueHolderInfo {
- /**
- * @return the flag indicating whether the value of the value holder should
- * be evaluated in the apply request values phase instead of the
- * process validations phase
- */
- boolean isImmediate();
-
- /**
- * @return true if the value has been set
- */
- boolean isLocalSetValue();
-
- /**
- * @return true if validation should consider this field required (must be
- * non-empty).
- */
- boolean isRequired();
-
- /**
- * @return the submitted, unconverted value of the component.
- */
- Object getSubmittedValue();
-
- /**
- * @return false if validation has determined that the value property of
- * this component is not valid.
- */
- boolean isValid();
-
- /**
- * <b> NOTE: this method is deprecated in the runtime spec and exists for
- * backward compatibility with JSF 1.1. You should avoid using it except in
- * conjunction with JSF 1.1 tooling support. This method will be deprecated
- * once the runtime spec removes the underlying API</b>
- *
- * @return a method binding expression that refers to a validator method
- */
- String getValidator();
-
- /**
- * <b> NOTE: this method is deprecated in the runtime spec and exists for
- * backward compatibility with JSF 1.1. You should avoid using it except in
- * conjunction with JSF 1.1 tooling support. This method will be deprecated
- * once the runtime spec removes the underlying API</b>
- *
- * @return a method binding expression that refers to a value change
- * listener
- */
- String getValueChangeListener();
-
- /**
- * Add validator to the list of validators for this component. Should be
- * equivalent to
- * {@link org.eclipse.jst.jsf.common.runtime.internal.model.ViewObject#addDecorator(org.eclipse.jst.jsf.common.runtime.internal.model.decorator.Decorator, Class)}.
- *
- * @param validator
- */
- void addValidator(ValidatorDecorator validator);
-
- /**
- * @return the list of validators for this component. Should be considered
- * unmodifiable (may throw exception).
- */
- List/* <ValidatorDecorator> */getValidators();
-
- /**
- * Add the value change listener to this component.
- *
- * @param valueChangeListenerInfo
- */
- void addValueChangeListener(
- ValueChangeListenerDecorator valueChangeListenerInfo);
-
- /**
- * @return the list of value change listeners. Should be considered
- * unmodifiable (may throw exception).
- */
- List/* <ValueChangeListenerDecorator> */getValueChangeListeners();
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/behavioural/INamingContainerInfo.java b/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/behavioural/INamingContainerInfo.java
deleted file mode 100644
index aeb1e98..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/behavioural/INamingContainerInfo.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2008 Oracle Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Oracle Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.common.runtime.internal.model.behavioural;
-
-import java.io.Serializable;
-
-import org.eclipse.jst.jsf.common.runtime.internal.model.IDesigntimeAdapter;
-import org.eclipse.jst.jsf.common.runtime.internal.model.component.ComponentFactory;
-
-/**
- * Design time analog for the NamingContainer interface.
- *
- * @author cbateman
- *
- */
-public interface INamingContainerInfo extends Serializable
-{
- // tagging interface
-
- /**
- * Used as an adapter impl
- */
- public final static INamingContainerInfo ADAPTER = new NamingContainerInfo();
-
- /**
- * A default naming container info
- * @author cbateman
- *
- */
- public static class NamingContainerInfo implements INamingContainerInfo, IDesigntimeAdapter
- {
- /**
- *
- */
- private static final long serialVersionUID = 7214529928361444126L;
-
- public String[] getInterfaces()
- {
- return new String[] {ComponentFactory.INTERFACE_NAMINGCONTAINER};
- }
-
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/behavioural/IValueHolderInfo.java b/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/behavioural/IValueHolderInfo.java
deleted file mode 100644
index 661dd81..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/behavioural/IValueHolderInfo.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2008 Oracle Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Oracle Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.common.runtime.internal.model.behavioural;
-
-import java.io.Serializable;
-
-import org.eclipse.jst.jsf.common.runtime.internal.model.decorator.ConverterDecorator;
-
-/**
- * Represents design time information about the ValueHolder behavioural
- * interface.
- *
- * @author cbateman
- *
- */
-public interface IValueHolderInfo extends Serializable
-{
- /**
- * @return the value, may be null
- */
- Object getValue();
-
- /**
- * @return the raw value without expression value evaluation. Note that
- * {@link #getValue()} may return the same value in cases where this value
- * holder is derived at design time without EL expression evaluation. May be null.
- */
- Object getLocalValue();
-
- /**
- * @return the converter for this value holder or null if none.
- */
- ConverterDecorator getConverter();
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/behavioural/ValueHolderInfo.java b/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/behavioural/ValueHolderInfo.java
deleted file mode 100644
index 25c8e2e..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/behavioural/ValueHolderInfo.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2008 Oracle Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Oracle Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.common.runtime.internal.model.behavioural;
-
-import org.eclipse.jst.jsf.common.runtime.internal.model.IDesigntimeAdapter;
-import org.eclipse.jst.jsf.common.runtime.internal.model.component.ComponentFactory;
-import org.eclipse.jst.jsf.common.runtime.internal.model.decorator.ConverterDecorator;
-
-/**
- * Implementation of the IValueHolderInfo.
- *
- * @author cbateman
- *
- */
-public class ValueHolderInfo implements IValueHolderInfo, IDesigntimeAdapter
-{
- /**
- *
- */
- private static final long serialVersionUID = 5000699728360703727L;
-
- /**
- * the value (may include EL evaluation)
- */
- protected final Object _value;
- /**
- * the raw value before EL evaluation.
- */
- protected final Object _localValue;
- /**
- * the converter or null if none.
- */
- protected final ConverterDecorator _converterDecorator;
-
- /**
- * @param converterDecorator
- * @param localValue
- * @param value
- */
- public ValueHolderInfo(final ConverterDecorator converterDecorator,
- final Object localValue, final Object value) {
- super();
- _converterDecorator = converterDecorator;
- _localValue = localValue;
- _value = value;
- }
- public final Object getValue() {
- return _value;
- }
- public final Object getLocalValue() {
- return _localValue;
- }
- public final ConverterDecorator getConverter() {
- return _converterDecorator;
- }
- public String[] getInterfaces()
- {
- return new String[] {ComponentFactory.INTERFACE_VALUEHOLDER};
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/component/AbstractVisitor.java b/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/component/AbstractVisitor.java
deleted file mode 100644
index a18b04f..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/component/AbstractVisitor.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2008 Oracle Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Oracle Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.common.runtime.internal.model.component;
-
-/**
- * Implemented by visitors
- *
- * @author cbateman
- *
- */
-public abstract class AbstractVisitor
-{
- /**
- * A policy to control visitation
- */
- protected final VisitationPolicy _policy;
-
- /**
- * @param policy
- */
- protected AbstractVisitor(final VisitationPolicy policy)
- {
- super();
- _policy = policy;
- }
-
- /**
- * @param object
- */
- public abstract void visit(Object object);
-
- /**
- * @return the visitation policy
- */
- public VisitationPolicy getPolicy()
- {
- return _policy;
- }
-
- /**
- * A policy that allows a visitor to configure how it will visit a tree.
- *
- */
- public static final class VisitationPolicy
- {
- /**
- * indicates pre-order, parent first traversal (root visited first)
- */
- public static final int VISIT_PARENT_FIRST = 0; // pre-order
- // tree
- // visit
- /**
- * indicates post-order, children first traveral (root visited last)
- */
- public static final int VISIT_CHILDREN_FIRST = 1; // post-order
- // tree
- // visit
- /**
- * A default parent first policy
- */
- public final static VisitationPolicy ParentFirstPolicy = new VisitationPolicy(
- VISIT_PARENT_FIRST);
- /**
- * A default children first policy
- */
- public final static VisitationPolicy ChildrenFirstPolicy = new VisitationPolicy(
- VISIT_CHILDREN_FIRST);
-
- private final int _ordering;
-
- /**
- * @param ordering
- */
- public VisitationPolicy(final int ordering)
- {
- _ordering = ordering;
- }
-
- /**
- * @return the ordering
- */
- public final int getOrdering()
- {
- return _ordering;
- }
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/component/ComponentFactory.java b/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/component/ComponentFactory.java
deleted file mode 100644
index a3c3762..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/component/ComponentFactory.java
+++ /dev/null
@@ -1,399 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2008 Oracle Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Oracle Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.common.runtime.internal.model.component;
-
-import java.util.Map;
-
-import org.eclipse.jst.jsf.common.runtime.internal.model.bean.DataModelInfo;
-import org.eclipse.jst.jsf.common.runtime.internal.model.behavioural.IActionSource2Info;
-import org.eclipse.jst.jsf.common.runtime.internal.model.behavioural.IActionSourceInfo;
-import org.eclipse.jst.jsf.common.runtime.internal.model.behavioural.IEditableValueHolderInfo;
-import org.eclipse.jst.jsf.common.runtime.internal.model.behavioural.INamingContainerInfo;
-import org.eclipse.jst.jsf.common.runtime.internal.model.behavioural.IValueHolderInfo;
-import org.eclipse.jst.jsf.common.runtime.internal.model.decorator.ConverterDecorator;
-import org.eclipse.jst.jsf.common.runtime.internal.model.decorator.FacetDecorator;
-import org.eclipse.jst.jsf.common.runtime.internal.model.decorator.ValidatorDecorator;
-import org.eclipse.jst.jsf.common.runtime.internal.model.event.IActionListenerInfo;
-import org.eclipse.jst.jsf.common.runtime.internal.model.event.IValueChangeListenerInfo;
-
-/**
- * Factory for creating component related objects.
- *
- * @author cbateman
- *
- */
-public class ComponentFactory
-{
-
- /**
- * The key for the standard ValueHolder adapter interface
- */
- public final static Class VALUE_HOLDER = IValueHolderInfo.class;
- /**
- * The key for the standard EditableValueHolder adapter interface
- */
- public final static Class EDITABLE_VALUE_HOLDER = IEditableValueHolderInfo.class;
- /**
- * The key for the standard ActionSource adapter interface
- */
- public final static Class ACTION_SOURCE = IActionSourceInfo.class;
- /**
- * The key for the standard ActionSource2 adapter interface
- */
- public final static Class ACTION_SOURCE2 = IActionSource2Info.class;
- /**
- * The key for the standard NamingContainer adapter interface
- */
- public final static Class NAMING_CONTAINER = INamingContainerInfo.class;
-
- /**
- * The key for the standard Converter decorator
- */
- public final static Class CONVERTER = ConverterDecorator.class;
- /**
- * The key for the standard Facet decorator
- */
- public final static Class FACET = FacetDecorator.class;
- /**
- * The key for the standard Validator decorator
- */
- public final static Class VALIDATOR = ValidatorDecorator.class;
- /**
- * The key for the standard ValueChangeListener decorator
- */
- public final static Class VALUE_CHANGE_LISTENER = IValueChangeListenerInfo.class;
- /**
- * The key for the standard ActionListener decorator
- */
- public final static Class ACTION_LISTENER = IActionListenerInfo.class;
-
- /**
- * Base class name for UIInput's
- */
- public final static String BASE_CLASS_UIINPUT = "javax.faces.component.UIInput"; //$NON-NLS-1$
- /**
- * Base class name for UIOutput's
- */
- public final static String BASE_CLASS_UIOUTPUT = "javax.faces.component.UIOutput"; //$NON-NLS-1$
- /**
- * Base class name for UICommand's
- */
- public final static String BASE_CLASS_UICOMMAND = "javax.faces.component.UICommand"; //$NON-NLS-1$
- /**
- * Base class name for UIData's
- */
- public final static String BASE_CLASS_UIDATA = "javax.faces.component.UIData"; //$NON-NLS-1$
- /**
- * Base class name for UIForm's
- */
- public final static String BASE_CLASS_UIFORM = "javax.faces.component.UIForm"; //$NON-NLS-1$
-
- /**
- * Interface name for ValueHolder's
- */
- public final static String INTERFACE_VALUEHOLDER = "javax.faces.component.ValueHolder"; //$NON-NLS-1$
- /**
- * Interface name for EditableValueHolder's
- */
- public final static String INTERFACE_EDITABLEVALUEHOLDER = "javax.faces.component.EditableValueHolder"; //$NON-NLS-1$
- /**
- * Interface name for ActionSource's
- */
- public final static String INTERFACE_ACTIONSOURCE = "javax.faces.component.ActionSource"; //$NON-NLS-1$
- /**
- * Interface name for ActionSource2's
- */
- public final static String INTERFACE_ACTIONSOURCE2 = "javax.faces.component.ActionSource2"; //$NON-NLS-1$
- /**
- * Interface name for NamingContainer's
- */
- public final static String INTERFACE_NAMINGCONTAINER = "javax.faces.component.NamingContainer"; //$NON-NLS-1$
-
- /**
- * @param id
- * @param parent
- * @param typeInfo
- * @param isRendered
- * @return a new component info
- */
- public static ComponentInfo createComponentInfo(final String id,
- final ComponentInfo parent, final ComponentTypeInfo typeInfo,
- final boolean isRendered)
- {
- return new ComponentInfo(id, parent, typeInfo, isRendered);
- }
-
- /**
- * If the rendered attribute isn't set, defaults it.
- *
- * @param attributes
- */
- public static void maybeDefaultRendered(final Map attributes)
- {
- if (!(attributes.get("rendered") instanceof Boolean)) //$NON-NLS-1$
- {
- attributes.put("rendered", Boolean.TRUE); //$NON-NLS-1$
- }
- }
-
- /**
- * @param parent
- * @param componentTypeInfo
- * @param attributes
- * @return a new component info
- */
- public static ComponentInfo createComponentInfo(final ComponentInfo parent,
- final ComponentTypeInfo componentTypeInfo, final Map attributes)
- {
- maybeDefaultRendered(attributes);
- return new ComponentInfo(parent, componentTypeInfo, attributes);
- }
-
- /**
- * @param id
- * @param parent
- * @param typeInfo
- * @param editableValueHolder
- * @param isRendered
- * @return a new UIInputInfo
- */
- public static UIInputInfo createUIInputInfo(final String id,
- final ComponentInfo parent, final ComponentTypeInfo typeInfo,
- final IEditableValueHolderInfo editableValueHolder,
- final boolean isRendered)
- {
- return new UIInputInfo(id, parent, typeInfo, editableValueHolder,
- isRendered);
- }
-
- /**
- * @param parent
- * @param typeInfo
- * @param attributes
- * @return a new UIInputInfo
- */
- public static UIInputInfo createUIInputInfo(final ComponentInfo parent,
- final ComponentTypeInfo typeInfo, final Map attributes)
- {
- maybeDefaultRendered(attributes);
- return new UIInputInfo(parent, typeInfo, attributes);
- }
-
- /**
- * @param id
- * @param parent
- * @param typeInfo
- * @param valueHolderInfo
- * @param isRendered
- * @return a new UIOutputInfo
- */
- public static UIOutputInfo createUIOutputInfo(final String id,
- final ComponentInfo parent, final ComponentTypeInfo typeInfo,
- final IValueHolderInfo valueHolderInfo, final boolean isRendered)
- {
- return new UIOutputInfo(id, parent, typeInfo, valueHolderInfo,
- isRendered);
- }
-
- /**
- * @param parent
- * @param typeInfo
- * @param attributes
- * @return a new UIOutputInfo
- */
- public static UIOutputInfo createUIOutputInfo(final ComponentInfo parent,
- final ComponentTypeInfo typeInfo, final Map attributes)
- {
- maybeDefaultRendered(attributes);
- return new UIOutputInfo(parent, typeInfo, attributes);
- }
-
- /**
- * @param id
- * @param parent
- * @param typeInfo
- * @param actionSourceInfo
- * @param isRendered
- * @return a new UICommandInfo
- */
- public static UICommandInfo createUICommandInfo(final String id,
- final ComponentInfo parent, final ComponentTypeInfo typeInfo,
- final IActionSourceInfo actionSourceInfo, final boolean isRendered)
- {
- return new UICommandInfo(id, parent, typeInfo, isRendered,
- actionSourceInfo);
- }
-
- /**
- * @param parent
- * @param typeInfo
- * @param attributes
- * @return a new UICommandInfo
- */
- public static UICommandInfo createUICommandInfo(final ComponentInfo parent,
- final ComponentTypeInfo typeInfo, final Map attributes)
- {
- maybeDefaultRendered(attributes);
- return new UICommandInfo(parent, typeInfo, attributes);
- }
-
- /**
- * @param id
- * @param parent
- * @param typeInfo
- * @param isRendered
- * @param prependId
- * @param submitted
- * @return a new UIFormInfo
- */
- public static UIFormInfo createUIFormInfo(final String id,
- final ComponentInfo parent, final ComponentTypeInfo typeInfo,
- final boolean isRendered, final boolean prependId,
- final boolean submitted)
- {
- return new UIFormInfo(id, parent, typeInfo, isRendered, prependId,
- submitted);
- }
-
- /**
- * @param parent
- * @param typeInfo
- * @param attributes
- * @return a new UIFormInfo
- */
- public static UIFormInfo createUIFormInfo(final ComponentInfo parent,
- final ComponentTypeInfo typeInfo, final Map attributes)
- {
- maybeDefaultRendered(attributes);
- maybeDefaultPrependId(attributes);
- maybeDefaultSubmitted(attributes);
- return new UIFormInfo(parent, typeInfo, attributes);
- }
-
- private static void maybeDefaultSubmitted(Map attributes)
- {
- if (!(attributes.get("submitted") instanceof Boolean)) //$NON-NLS-1$
- {
- attributes.put("submitted", Boolean.FALSE); //$NON-NLS-1$
- }
- }
-
- private static void maybeDefaultPrependId(Map attributes)
- {
- if (!(attributes.get("prependId") instanceof Boolean)) //$NON-NLS-1$
- {
- attributes.put("prependId", Boolean.FALSE); //$NON-NLS-1$
- }
- }
-
- /**
- * @param id
- * @param parent
- * @param typeInfo
- * @param isRendered
- * @param dataModel
- * @param first
- * @param footer
- * @param header
- * @param rowCount
- * @param rowAvailable
- * @param rowData
- * @param rowIndex
- * @param rows
- * @param value
- * @param var
- * @return a new UIDataInfo
- */
- public static UIDataInfo createUIDataInfo(final String id,
- final ComponentInfo parent, final ComponentTypeInfo typeInfo,
- final boolean isRendered, final DataModelInfo dataModel,
- final int first, final ComponentInfo footer,
- final ComponentInfo header, final int rowCount,
- final boolean rowAvailable, final Object rowData,
- final int rowIndex, final int rows, final Object value,
- final String var)
- {
- return new UIDataInfo(id, parent, typeInfo, isRendered, dataModel,
- first, footer, header, rowCount, rowAvailable, rowData,
- rowIndex, rows, value, var);
- }
-
- /**
- * @param parent
- * @param typeInfo
- * @param attributes
- * @return the UIDataInfo
- */
- public static UIDataInfo createUIDataInfo(final ComponentInfo parent,
- final ComponentTypeInfo typeInfo, final Map attributes)
- {
- maybeDefaultRendered(attributes);
- maybeDefaultFirst(attributes);
- maybeDefaultRowCount(attributes);
- maybeDefaultRowAvailable(attributes);
- maybeDefaultRowIndex(attributes);
- maybeDefaultRows(attributes);
- maybeDefaultVar(attributes);
- return new UIDataInfo(parent, typeInfo, attributes);
- }
-
-
- private static final Integer ZERO = new Integer(0);
- private static final Integer MINUS_ONE = new Integer(-1);
-
- private static void maybeDefaultFirst(Map attributes)
- {
- if (!(attributes.get("first") instanceof Integer)) //$NON-NLS-1$
- {
- attributes.put("first", ZERO); //$NON-NLS-1$
- }
- }
-
- private static void maybeDefaultRowCount(Map attributes)
- {
- if (!(attributes.get("rowCount") instanceof Integer)) //$NON-NLS-1$
- {
- attributes.put("rowCount", MINUS_ONE); //$NON-NLS-1$
- }
- }
-
- private static void maybeDefaultRowAvailable(Map attributes)
- {
- if (! (attributes.get("rowAvailable") instanceof Boolean)) //$NON-NLS-1$
- {
- attributes.put("rowAvailable", Boolean.FALSE); //$NON-NLS-1$
- }
- }
-
- private static void maybeDefaultRowIndex(Map attributes)
- {
- if (! (attributes.get("rowIndex") instanceof Integer)) //$NON-NLS-1$
- {
- attributes.put("rowIndex", MINUS_ONE); //$NON-NLS-1$
- }
- }
-
- private static void maybeDefaultRows(Map attributes)
- {
- if (! (attributes.get("rows") instanceof Integer)) //$NON-NLS-1$
- {
- attributes.put("rows", ZERO); //$NON-NLS-1$
- }
- }
-
- private static void maybeDefaultVar(Map attributes)
- {
- if (! (attributes.get("var") instanceof String)) //$NON-NLS-1$
- {
- attributes.put("var", "** default variable **"); //$NON-NLS-1$ //$NON-NLS-2$
- }
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/component/ComponentInfo.java b/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/component/ComponentInfo.java
deleted file mode 100644
index 6bb4629..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/component/ComponentInfo.java
+++ /dev/null
@@ -1,930 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2008 Oracle Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Oracle Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.common.runtime.internal.model.component;
-
-import java.beans.BeanInfo;
-import java.beans.IntrospectionException;
-import java.beans.Introspector;
-import java.beans.PropertyDescriptor;
-import java.io.Serializable;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.Map.Entry;
-
-import org.eclipse.jst.jsf.common.runtime.internal.model.ViewObject;
-import org.eclipse.jst.jsf.common.runtime.internal.model.component.AbstractVisitor.VisitationPolicy;
-import org.eclipse.jst.jsf.common.runtime.internal.model.decorator.FacetDecorator;
-
-/**
- * Models a basic UI component instance
- *
- * TODO: should implement a visitor pattern to traverse component trees
- *
- * @author cbateman
- *
- */
-public class ComponentInfo extends ViewObject implements Serializable,
- IVisitable
-{
- /**
- * serializable id
- */
- private static final long serialVersionUID = 2517204356825585699L;
-
- private final static int DEFAULT_ARRAY_SIZE = 4;
-
- private transient BeanPropertyManager _beanPropertyManager;
- /**
- * Encapsulates all of the data for the view object
- */
- protected final ComponentInfoData _data;
-
- // initialized
- // by
- // getBeanProperties
-
- /**
- * @param id
- * @param parent
- * @param componentTypeInfo
- * @param isRendered
- */
- protected ComponentInfo(final String id, final ComponentInfo parent,
- final ComponentTypeInfo componentTypeInfo, final boolean isRendered)
- {
- super(new ComponentInfoData(id, parent, componentTypeInfo, isRendered));
- _data = (ComponentInfoData) super.getData();
-
- final Set propExclude = new HashSet();
- propExclude.add("attributeNames"); //$NON-NLS-1$
- propExclude.add("componentTypeInfo"); //$NON-NLS-1$
- propExclude.add("valueChangeListeners"); //$NON-NLS-1$
- propExclude.add("visitableChildren"); //$NON-NLS-1$
-
- _beanPropertyManager = new BeanPropertyManager(this, propExclude);
- }
-
- /**
- * @param data
- */
- protected ComponentInfo(final ComponentInfoData data)
- {
- super(data);
- _data = data;
- }
-
- /**
- * Construct a new component info using the attributes keyed by name in
- * attributes to set values. The names must match the corresponding bean
- * property names. Primitives should be wrapped in their corresponding
- * object types. Exceptions will be thrown if there is a type mismatch on an
- * expected type. Number will be used for all numeric primitive wrappers an
- * the corresponding "to" will be called.
- *
- * @param parent
- * @param componentTypeInfo
- * @param attributes
- * @throws ClassCastException
- * if an attribute's value doesn't match the expected type
- * @throws NullPointerException
- * if an attribute value is null for a value whose type is
- * expected to be primitive
- * @throws IllegalArgumentException
- * if attributes does not contain a required key.
- */
- protected ComponentInfo(final ComponentInfo parent,
- final ComponentTypeInfo componentTypeInfo, final Map attributes)
- {
- this(getStringProperty("id", attributes, false), parent, //$NON-NLS-1$
- componentTypeInfo, getBooleanProperty("rendered", attributes, false)); //$NON-NLS-1$
- }
-
- /**
- * @param key
- * @param attributes
- * @param mandatory
- * @return the value in attributes at location key, forcing a
- * ClassCastException if it turns out not to be a String.
- * @throws ClassCastException
- * if the attribute for key is not a String
- * @throws IllegalArgumentException
- * if the attribute for key is null but mandatory is true.
- */
- protected static String getStringProperty(final String key,
- final Map attributes, final boolean mandatory)
- {
- final Object value = attributes.get(key);
-
- if (mandatory && value == null)
- {
- throw new IllegalArgumentException(key
- + " is a mandatory attribute"); //$NON-NLS-1$
- }
- return (String) value;
- }
-
- /**
- * @param key
- * @param attributes
- * @param mandatory
- *
- * @return the value in attributes at location, forcing a ClassCastExceptio
- * if it is not a Boolean and mandatory. returns false if no value
- * and not mandatory
- * @throws IllegalArgumentException
- * if key is not found and value is mandatory
- */
- protected static boolean getBooleanProperty(final String key,
- final Map attributes, final boolean mandatory)
- {
- final Boolean value = (Boolean) attributes.get(key);
-
- if (value == null)
- {
- if (mandatory)
- {
- throw new IllegalArgumentException(key + "is mandatory"); //$NON-NLS-1$
- }
- return false;
- }
-
- return value.booleanValue();
- }
-
- /**
- * @param key
- * @param attributes
- * @return the integer property for key. Casts the value to Number and calls
- * Number.intValue(). 0 if no value.
- */
- protected static int getIntegerProperty(final String key,
- final Map attributes)
- {
- final Number value = (Number) attributes.get(key);
-
- if (value == null)
- {
- return 0;
- }
-
- return value.intValue();
- }
-
- /**
- * @param key
- * @param attributes
- * @return the component info value from attributes
- */
- protected static ComponentInfo getComponentProperty(final String key,
- final Map attributes)
- {
- return (ComponentInfo) attributes.get(key);
- }
-
- /**
- * @return the id
- */
- public final String getId()
- {
- return _data.getId();
- }
-
- /**
- * @return the component type info
- */
- public final ComponentTypeInfo getComponentTypeInfo()
- {
- return _data.getComponentTypeInfo();
- }
-
- /**
- * Pre-condition: isModifiable() == true Post-condition: getChildren() will
- * return an empty list.
- */
- protected final void clearChildren()
- {
- _data.getChildren().clear();
- }
-
- /**
- * @return the children. List is unmodifiable. List contains all children
- * including facets.
- */
- public final List/* <ComponentInfo> */getChildren()
- {
- if (_data.isProtected())
- {
- return _data.getChildren();
- }
- return Collections.unmodifiableList(_data.getChildren());
- }
-
- /**
- * Get the sub-set of {@link #getChildren()} that are facets. This is a
- * convenience method for {@link #getDecorators(Class)}
- *
- * @return all component children that are facets
- */
- public final List getFacets()
- {
- return getDecorators(ComponentFactory.FACET);
- }
-
- /**
- * @param childComponent
- */
- public final void addChild(final ComponentInfo childComponent)
- {
- if (childComponent == this)
- {
- throw new IllegalArgumentException(
- "A component cannot be its own child"); //$NON-NLS-1$
- }
- _data.addChild(childComponent);
- // we need to reset the child's parent to me
- childComponent.setParent(this);
- }
-
- /**
- * @param parent
- */
- public final void setParent(ComponentInfo parent)
- {
- _data.setParent(parent);
- }
-
- /**
- * @param name
- * @param facetComponent
- */
- public final void addFacet(final String name,
- final ComponentInfo facetComponent)
- {
- addChild(facetComponent);
- addDecorator(new FacetDecorator(name, facetComponent));
- }
-
- /**
- * @param component
- * @return if component corresponds to a facet of this component, returns
- * the name of that facet. Returns null if not found.
- */
- public final String getFacetName(final ComponentInfo component)
- {
- if (component == null)
- {
- return null;
- }
-
- final List facets = getDecorators(ComponentFactory.FACET);
-
- for (final Iterator it = facets.iterator(); it.hasNext();)
- {
- final FacetDecorator facet = (FacetDecorator) it.next();
- if (component == facet.getDecorates())
- {
- return facet.getName();
- }
- }
-
- // component is not a facet
- return null;
- }
-
- /**
- * @param name
- * @return if this has a facet called name, then returns it's single root
- * component.
- */
- public final ComponentInfo getFacet(final String name)
- {
- if (name == null)
- {
- return null;
- }
-
- final List facets = getDecorators(ComponentFactory.FACET);
-
- for (final Iterator it = facets.iterator(); it.hasNext();)
- {
- final FacetDecorator facet = (FacetDecorator) it.next();
- if (name.equals(facet.getName()))
- {
- return facet.getDecorates();
- }
- }
-
- // not found
- return null;
- }
-
- public String toString()
- {
- final String parentId = getParent() != null ? getParent().getId()
- : "null"; //$NON-NLS-1$
- String toString = getMostSpecificComponentName() + ": id=" //$NON-NLS-1$
- + _data.getId() + ", parentId: " + parentId + ", family=" //$NON-NLS-1$ //$NON-NLS-2$
- + getComponentTypeInfo().getComponentFamily() + ", render=" //$NON-NLS-1$
- + getComponentTypeInfo().getRenderFamily() + ", rendered=" //$NON-NLS-1$
- + isRendered();
-
- // use bean introspection to dump child properties
- if (this.getClass() != ComponentInfo.class)
- {
- toString += dumpProperties();
- }
-
- return toString;
- }
-
- private String dumpProperties()
- {
- String properties = ""; //$NON-NLS-1$
- try
- {
- final BeanInfo beanInfo = Introspector.getBeanInfo(this.getClass(),
- ComponentInfo.class);
-
- final PropertyDescriptor[] descriptors = beanInfo
- .getPropertyDescriptors();
- for (int i = 0; i < descriptors.length; i++)
- {
- final PropertyDescriptor desc = descriptors[i];
- final String name = desc.getName();
- final Object valueObj = desc.getValue(name);
- final String value = valueObj != null ? valueObj.toString()
- : "null"; //$NON-NLS-1$
- properties += ", " + name + "=" + value; //$NON-NLS-1$ //$NON-NLS-2$
- }
- }
- catch (final IntrospectionException e)
- {
- return "Error introspecting bean: " + e.getLocalizedMessage(); //$NON-NLS-1$
- }
-
- return properties;
- }
-
- /**
- * @return used for toString. Clients should not use.
- */
- protected String getMostSpecificComponentName()
- {
- return "UIComponent"; //$NON-NLS-1$
- }
-
- /**
- * @return the parent of this component or null.
- */
- public final ComponentInfo getParent()
- {
- return _data.getParent();
- }
-
- /**
- * @return the rendered flag
- */
- public final boolean isRendered()
- {
- return _data.isRendered();
- }
-
- public synchronized void addAdapter(final Class adapterType,
- final Object adapter)
- {
- super.addAdapter(adapterType, adapter);
-
- // force an update on the next call to getBeanProperties
- _beanPropertyManager.reset();
- }
-
- public synchronized Object removeAdapter(final Class adapterType)
- {
- final Object removed = super.removeAdapter(adapterType);
-
- _beanPropertyManager.reset();
-
- return removed;
- }
-
- /**
- * @return the set of all bean property names for this component. The set is
- * unmodifiable and will throw exceptions if modification is
- * attempted.
- */
- protected final Map/* <String, ComponentBeanProperty> */getBeanProperties()
- {
- return Collections.unmodifiableMap(_beanPropertyManager
- .getBeanProperties());
- }
-
- /**
- * @author cbateman
- *
- */
- public static class ComponentInfoData extends ViewObjectData
- {
- /**
- *
- */
- private static final long serialVersionUID = 5052732412917986062L;
- /**
- * the component id
- */
- private final String _id;
- /**
- * the component's parent or null if none
- */
- private ComponentInfo _parent;
-
- /**
- * the type info for this component
- */
- protected final ComponentTypeInfo _componentTypeInfo;
- /**
- * the rendered flage
- */
- protected final boolean _isRendered;
-
- private List /* <ComponentInfo> */_children = new ArrayList(
- DEFAULT_ARRAY_SIZE);
-
- /**
- * @param id
- * @param parent
- * @param componentTypeInfo
- * @param isRendered
- */
- public ComponentInfoData(final String id, ComponentInfo parent,
- ComponentTypeInfo componentTypeInfo, boolean isRendered)
- {
- super(false);
- _id = id;
- _parent = parent;
- _componentTypeInfo = componentTypeInfo;
- _isRendered = isRendered;
- }
-
- /**
- * @param childComponent
- */
- protected void addChild(ComponentInfo childComponent)
- {
- enforceProtection();
-
- getChildren().add(childComponent);
- }
-
- /**
- * @return the modifiable list of children
- */
- protected final List/* <ComponentInfo> */getChildren()
- {
- return _children;
- }
-
- protected void doBeforeProtecting()
- {
- super.doBeforeProtecting();
- // compact the children array list
- if (_children.size() > 0)
- {
- _children = Collections.unmodifiableList(_children);
- }
- else
- {
- _children = Collections.EMPTY_LIST;
- }
- }
-
- /**
- * @return the isRendered flag
- */
- protected final boolean isRendered()
- {
- return _isRendered;
- }
-
- /**
- * @return the component type info flag
- */
- protected final ComponentTypeInfo getComponentTypeInfo()
- {
- return _componentTypeInfo;
- }
-
- /**
- * @return the parent or null if no parent
- */
- protected final ComponentInfo getParent()
- {
- return _parent;
- }
-
- /**
- * @param parent
- */
- protected final void setParent(ComponentInfo parent)
- {
- enforceProtection();
- _parent = parent;
- }
-
- /**
- * @return the component id
- */
- protected final String getId()
- {
- return _id;
- }
- }
-
- /**
- * This is similar to the runtime getAttributes().get(name) call. The reason
- * we don't implement a Map of all attribute values is that the implicit
- * property structure can change at any time due to add/removeAdapter. To
- * get all attributes known for a component, instead use:
- *
- * The synchronized block is advised to protect against concurrent
- * modification exceptions on the keySet iterator.
- *
- * @param name
- *
- * @return the value of the attribute or null if none.
- *
- */
- public synchronized ComponentBeanProperty getAttribute(final String name)
- {
- return (ComponentBeanProperty) getBeanProperties().get(name);
- }
-
- /**
- * @return the set of valid attribute names. The Set is not modifiable.
- */
- public synchronized Set/* <String> */getAttributeNames()
- {
- return getBeanProperties().keySet();
- }
-
- /**
- * Stores a bean property descriptor along information about which
- * implementation class declares it and what key to pass to getAdapter() in
- * order to get it.
- *
- */
- public final static class ComponentBeanProperty
- {
- private final PropertyDescriptor _propertyDescriptor;
- private final Object _declaringImplementation;
- private final Class _adapterKeyClass;
-
- // only instantiable locally
- private ComponentBeanProperty(Class adapterKeyClass,
- Object declaringImplementationClass,
- PropertyDescriptor propertyDescriptor)
- {
- super();
- _adapterKeyClass = adapterKeyClass;
- _declaringImplementation = declaringImplementationClass;
- _propertyDescriptor = propertyDescriptor;
- }
-
- /**
- * @return the value of property
- */
- public final Object getValue()
- {
- final Method method = _propertyDescriptor.getReadMethod();
- if (method != null)
- {
- try
- {
- method.setAccessible(true);
- return method.invoke(_declaringImplementation,
- new Object[0]);
- }
- catch (IllegalArgumentException e)
- {
- e.printStackTrace();
- }
- catch (IllegalAccessException e)
- {
- e.printStackTrace();
- }
- catch (InvocationTargetException e)
- {
- e.printStackTrace();
- }
- }
- // if any step fails, return null
- return null;
- }
-
- /**
- * @return the property descriptor
- */
- public final PropertyDescriptor getPropertyDescriptor()
- {
- return _propertyDescriptor;
- }
-
- /**
- * @return the implemenation
- */
- public final Object getDeclaringImplementationClass()
- {
- return _declaringImplementation;
- }
-
- /**
- * @return the adapter class for the interface that the declaring
- * implementation is providing the impl for
- */
- public final Class getAdapterKeyClass()
- {
- return _adapterKeyClass;
- }
- }
-
- /**
- * Manages bean property information for a component
- *
- * @author cbateman
- *
- */
- protected final static class BeanPropertyManager
- {
- /**
- * a map of the bean property names exposed by this component including
- * all those added by addAdapter().
- *
- * this is synthetic based the class definition and installed adapters
- * so as long that info is available, no need to serialize.
- */
- protected transient Map /*
- * <String,
- * ComponentBeanProperty>
- */_beanProperties; // lazily
- private final transient ComponentInfo _component;
- private final transient Set _excludeNames;
-
- /**
- * @param component
- * @param excludeNames
- */
- protected BeanPropertyManager(final ComponentInfo component,
- final Set excludeNames)
- {
- _component = component;
- _excludeNames = excludeNames;
- }
-
- /**
- * Will throw exception of the calling thread already holds the "this"
- * monitor lock. This is to ensure that caller always acquires locks in
- * appropriate order to prevent deadlock.
- *
- * @return the internal set of bean properties. This Set may be modified
- * internally.
- */
- public Map getBeanProperties()
- {
- if (Thread.holdsLock(this))
- {
- throw new IllegalStateException(
- "Must not already own this lock"); //$NON-NLS-1$
- }
-
- // must always acquire component lock first to prevent deadlock
- synchronized (_component)
- {
- synchronized (this)
- {
- if (_beanProperties == null)
- {
- _beanProperties = calculateAllBeanPropNames(ViewObject.class);
- }
-
- return _beanProperties;
- }
- }
- }
-
- /**
- * Will throw exception if the calling thread already holds the "this"
- * monitor lock. This is to ensure that caller always acquires locks in
- * appropriate order to prevent deadlock.
- *
- * Clears the internal map and sets to null. This will force it to be
- * completely new built on the next call to getBeanProperties
- */
- public void reset()
- {
- if (Thread.holdsLock(this))
- {
- throw new IllegalStateException(
- "Must not already own this lock"); //$NON-NLS-1$
- }
-
- // must always acquire component lock first to prevent deadlock
- synchronized (_component)
- {
- synchronized (this)
- {
- if (_beanProperties != null)
- {
- _beanProperties.clear();
- _beanProperties = null;
- }
- }
- }
- }
-
- /**
- * @param stopClass
- * @return a synchronized map of all bean property names on this class
- * up to stopClass, as well as all adapter property names (as
- * though this really implemented them).
- */
- private Map calculateAllBeanPropNames(final Class stopClass)
- {
- // use a set to prevents the duplicates
- final Map allProperties = new HashMap();
-
- {
- final Class myClass = _component.getClass();
- final List myProperties = getOrCreateBeanProperties(myClass,
- stopClass);
-
- addToMap(myProperties, _component, myClass, allProperties, _excludeNames);
- }
-
- {
- for (final Iterator it = _component.getAdapterMap().entrySet()
- .iterator(); it.hasNext();)
- {
- Map.Entry entry = (Entry) it.next();
-
- final Class adapterClass = (Class) entry.getKey();
- final Object declaringClass = entry.getValue();
- // get all props, excluding the ones on Object.
- final List props = getOrCreateBeanProperties(adapterClass,
- null);
- addToMap(props, declaringClass, adapterClass, allProperties,
- _excludeNames);
- }
- }
-
- return Collections.synchronizedMap(allProperties);
- }
-
- private static void addToMap(
- final List/* <ComponentBeanProperty> */addThese,
- final Object declaringObject, final Class declaringAdapter,
- final Map toMe,
- Set excludeNames)
- {
- for (final Iterator it = addThese.iterator(); it.hasNext();)
- {
- final PropertyDescriptor desc = (PropertyDescriptor) it.next();
-
- if (!toMe.containsKey(desc.getName())
- && !excludeNames.contains(desc.getName()))
- {
- toMe.put(desc.getName(), new ComponentBeanProperty(
- declaringAdapter, declaringObject, desc));
- }
- }
- }
-
- /**
- * lazily loaded with the local properties (those not defined using
- * adapters)
- *
- * MUST INITIALIZE early so can synchronize on it
- */
- private transient static Map /* <Class, List<PropertyDescriptor> */PROPERTY_MAP = new HashMap();
-
- /**
- * @param startClass
- * @param stopClass
- * @return a unmodifiable list of properties starting from startClass.
- * stopClass is only used if an entry doesn't already exist in
- * PROPERTY_MAP for startClass. The method is synchronized on
- * the PROPERTY_MAP it updates.
- */
- protected static List/* <PropertyDescriptor */getOrCreateBeanProperties(
- final Class startClass, final Class stopClass)
- {
- synchronized (PROPERTY_MAP)
- {
- List localBeanProps = (List) PROPERTY_MAP.get(startClass);
-
- if (localBeanProps == null)
- {
- localBeanProps = calculateBeanProperties(startClass,
- stopClass);
- PROPERTY_MAP.put(startClass, Collections
- .unmodifiableList(localBeanProps));
- }
-
- return localBeanProps;
- }
- }
-
- /**
- * @param startClass
- * @param stopClass
- * @return a List<String> containing all of the bean names between
- * startClass and stopClass. Start class must be a descendant
- * (sub-class, sub-sub-class etc.) of stopClass. The properties
- * on stopClass are excluded from analysis.
- */
- private static List/* <PropertyDescriptor> */calculateBeanProperties(
- final Class startClass, final Class stopClass)
- {
- BeanInfo beanInfo;
- List names = new ArrayList();
-
- try
- {
- beanInfo = Introspector.getBeanInfo(startClass, stopClass);
- final PropertyDescriptor[] descriptors = beanInfo
- .getPropertyDescriptors();
-
- if (descriptors != null)
- {
- names = Arrays.asList(descriptors);
- }
- }
- catch (final IntrospectionException e)
- {
- e.printStackTrace();
- }
- return names;
- }
-
- }
-
- /**
- * Visits this node and it's entire tree and makes all nodes protected.
- */
- public final void setSubtreeProtected()
- {
- // lock children first
- final ComponentTreeVisitor protectionVisitor = new ComponentTreeVisitor(VisitationPolicy.ChildrenFirstPolicy)
- {
- public void visit(ComponentInfo component)
- {
- component.setProtected();
- }
- };
-
- accept(protectionVisitor);
- }
-
- public void accept(AbstractVisitor visitor)
- {
- // check policy ordering
- if (visitor.getPolicy().getOrdering() == VisitationPolicy.VISIT_PARENT_FIRST)
- {
- visitor.visit(this);
- visitChildren(visitor);
- }
- else
- {
- visitChildren(visitor);
- visitor.visit(this);
- }
- }
-
- private void visitChildren(AbstractVisitor visitor)
- {
- for (final Iterator it = getVisitableChildren(); it.hasNext();)
- {
- visitor.visit(it.next());
- }
- }
-
- public Iterator getVisitableChildren()
- {
- return getChildren().iterator();
- }
-}
\ No newline at end of file
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/component/ComponentTreeVisitor.java b/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/component/ComponentTreeVisitor.java
deleted file mode 100644
index 4bedc7c..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/component/ComponentTreeVisitor.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2008 Oracle Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Oracle Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.common.runtime.internal.model.component;
-
-/**
- * An abstract class sub-classed by objects that wish to apply a Visitor pattern
- * type visitation to a component tree.
- *
- * @author cbateman
- *
- */
-public abstract class ComponentTreeVisitor extends AbstractVisitor
-{
- /**
- * @param policy
- */
- public ComponentTreeVisitor(final VisitationPolicy policy)
- {
- super(policy);
- }
-
- /**
- * @param component
- */
- public abstract void visit(final ComponentInfo component);
-
- public final void visit(final Object object)
- {
- visit((ComponentInfo) object);
- }
-}
\ No newline at end of file
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/component/ComponentTypeInfo.java b/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/component/ComponentTypeInfo.java
deleted file mode 100644
index 74c7c9b..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/component/ComponentTypeInfo.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2008 Oracle Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Oracle Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.common.runtime.internal.model.component;
-
-import org.eclipse.jst.jsf.common.runtime.internal.model.types.ClassTypeInfo;
-
-/**
- * Type information about a UIComponent
- *
- * @author cbateman
- *
- */
-public class ComponentTypeInfo extends ClassTypeInfo
-{
- /**
- * serializable uid
- */
- private static final long serialVersionUID = -311156682935177206L;
- /**
- * the ComponentType (see JSF spec for definition)
- */
- protected final String _componentType; // may be null, since may not be
- // known at runtime
- /**
- * the component family (see JSF spec)
- */
- protected final String _componentFamily;
- /**
- * the render family (see JSF spec)
- */
- protected final String _renderFamily;
-
- /**
- * @param componentType
- * @param componentClass
- * @param componentFamily
- * @param renderFamily
- */
- public ComponentTypeInfo(final String componentType,
- final String componentClass, final String componentFamily,
- final String renderFamily)
- {
- super(componentClass, new String[0], new String[0]);
- _componentType = componentType;
- _componentFamily = componentFamily;
- _renderFamily = renderFamily;
- }
-
- /**
- * @param componentType
- * @param superClasses
- * @param interfaces
- * @param componentClass
- * @param componentFamily
- * @param renderFamily
- */
- public ComponentTypeInfo(final String componentType,
- final String componentClass,
- final String[] superClasses, final String[] interfaces,
- final String componentFamily,
- final String renderFamily)
- {
- super(componentClass, superClasses, interfaces);
- _componentType = componentType;
- _componentFamily = componentFamily;
- _renderFamily = renderFamily;
- }
-
- /**
- * @return the component type or null if unknown (may not be at runtime)
- */
- public final String getComponentType()
- {
- return _componentType;
- }
-
- /**
- * @return the component family
- */
- public final String getComponentFamily()
- {
- return _componentFamily;
- }
-
- /**
- * @return the render family
- */
- public final String getRenderFamily()
- {
- return _renderFamily;
- }
-
- public String toString()
- {
- return "Component Type Info: type = " + _componentType + " family=" + _componentFamily //$NON-NLS-1$ //$NON-NLS-2$
- + " renderer=" + _renderFamily + ", "+super.toString(); //$NON-NLS-1$ //$NON-NLS-2$
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/component/IVisitable.java b/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/component/IVisitable.java
deleted file mode 100644
index 6ddd83b..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/component/IVisitable.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2008 Oracle Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Oracle Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.common.runtime.internal.model.component;
-
-import java.util.Iterator;
-
-/**
- * Implemented by a class that can accept visitors
- *
- */
-interface IVisitable
-{
- /**
- * Called on a visitable to accept a visitor
- *
- * @param visitor
- */
- void accept(AbstractVisitor visitor);
-
- /**
- * @return an iterator that returns IVisitable children.
- */
- Iterator getVisitableChildren();
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/component/UICommandInfo.java b/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/component/UICommandInfo.java
deleted file mode 100644
index 9ff50f4..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/component/UICommandInfo.java
+++ /dev/null
@@ -1,117 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2008 Oracle Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Oracle Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.common.runtime.internal.model.component;
-
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.jst.jsf.common.runtime.internal.model.behavioural.IActionSource2Info;
-import org.eclipse.jst.jsf.common.runtime.internal.model.behavioural.IActionSourceInfo;
-import org.eclipse.jst.jsf.common.runtime.internal.model.decorator.ActionListenerDecorator;
-
-/**
- * An design time analog of the standard UICommand.
- * @author cbateman
- *
- */
-public class UICommandInfo extends ComponentInfo implements IActionSource2Info {
- private final String _actionExpression;
- private final String _actionListener;
- private final boolean _isImmediate;
-
- /**
- * serialization id
- */
- private static final long serialVersionUID = -9025172832535840949L;
-
- /**
- * @param id
- * @param parent
- * @param componentTypeInfo
- * @param isRendered
- * @param actionSourceInfo
- */
- protected UICommandInfo(final String id, final ComponentInfo parent,
- final ComponentTypeInfo componentTypeInfo,
- final boolean isRendered, final IActionSourceInfo actionSourceInfo) {
- super(id, parent, componentTypeInfo, isRendered);
-
- if (actionSourceInfo == null) {
- _actionExpression = null;
- _actionListener = null;
- _isImmediate = false;
- } else {
- // TODO: having action and actionExpression will come back to
- // to bite us.
- _actionExpression = actionSourceInfo.getAction();
- _actionListener = actionSourceInfo.getActionListener();
- _isImmediate = actionSourceInfo.isImmediate();
-
- for (final Iterator it = actionSourceInfo.getActionListeners()
- .iterator(); it.hasNext();) {
- final ActionListenerDecorator actionListener =
- (ActionListenerDecorator) it.next();
- addActionListener(actionListener);
- }
- }
- }
-
- /**
- * @param parent
- * @param componentTypeInfo
- * @param attributes
- */
- protected UICommandInfo(final ComponentInfo parent, final ComponentTypeInfo componentTypeInfo,
- Map attributes)
- {
- this(getStringProperty("id", attributes, true), //$NON-NLS-1$
- parent, componentTypeInfo,
- getBooleanProperty("rendered", attributes, false), //$NON-NLS-1$
- getActionSourceInfo("$actionSourceInfo", attributes) //$NON-NLS-1$
- );
- }
-
- private static IActionSourceInfo getActionSourceInfo(String key,
- Map attributes)
- {
- return (IActionSourceInfo) attributes.get(key);
- }
-
- public String getActionExpression() {
- return _actionExpression;
- }
-
- public final void addActionListener(final ActionListenerDecorator actionListener) {
- addDecorator(actionListener, ComponentFactory.ACTION_LISTENER);
- }
-
- public final String getAction() {
- return _actionExpression;
- }
-
- public final String getActionListener() {
- return _actionListener;
- }
-
- public final List getActionListeners() {
- return getDecorators(ComponentFactory.ACTION_LISTENER);
- }
-
- public final boolean isImmediate() {
- return _isImmediate;
- }
-
- protected String getMostSpecificComponentName()
- {
- return "UICommand"; //$NON-NLS-1$
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/component/UIDataInfo.java b/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/component/UIDataInfo.java
deleted file mode 100644
index 56981af..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/component/UIDataInfo.java
+++ /dev/null
@@ -1,219 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2008 Oracle Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Oracle Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.common.runtime.internal.model.component;
-
-import java.util.Map;
-
-import org.eclipse.jst.jsf.common.runtime.internal.model.bean.DataModelInfo;
-import org.eclipse.jst.jsf.common.runtime.internal.model.bean.SerializableObject;
-import org.eclipse.jst.jsf.common.runtime.internal.model.behavioural.INamingContainerInfo;
-
-/**
- * Design time analog to UIData.
- *
- * @author cbateman
- *
- */
-public class UIDataInfo extends ComponentInfo implements INamingContainerInfo
-{
- /**
- * the standard name for the footer facet
- */
- public final static String FACET_NAME_FOOTER = "footer"; //$NON-NLS-1$
- /**
- * the standard name for the header facet.
- */
- public final static String FACET_NAME_HEADER = "header"; //$NON-NLS-1$
- /**
- * serialization id
- */
- private static final long serialVersionUID = 3473288390914978784L;
-
- private final DataModelInfo _dataModel;
- private final int _first;
- private final int _rowCount;
- private final boolean _rowAvailable;
- private final SerializableObject _rowData;
- private final int _rowIndex;
- private final int _rows;
- private final SerializableObject _value;
- private final String _var;
-
- /**
- * @param id
- * @param parent
- * @param componentTypeInfo
- * @param isRendered
- * @param dataModel
- * @param first
- * @param footer
- * @param header
- * @param rowCount
- * @param rowAvailable
- * @param rowData
- * @param rowIndex
- * @param rows
- * @param value
- * @param var
- */
- public UIDataInfo(final String id, final ComponentInfo parent,
- final ComponentTypeInfo componentTypeInfo,
- final boolean isRendered, final DataModelInfo dataModel,
- final int first, final ComponentInfo footer,
- final ComponentInfo header, final int rowCount,
- final boolean rowAvailable, final Object rowData,
- final int rowIndex, final int rows, final Object value,
- final String var)
- {
- super(id, parent, componentTypeInfo, isRendered);
- _dataModel = dataModel;
- _first = first;
- _rowCount = rowCount;
- _rowAvailable = rowAvailable;
- _rowData = new SerializableObject(rowData);
- _rowIndex = rowIndex;
- _rows = rows;
- _value = new SerializableObject(value);
- _var = var;
-
- if (footer != null)
- {
- addFacet(FACET_NAME_FOOTER, footer);
- }
-
- if (header != null)
- {
- addFacet(FACET_NAME_HEADER, header);
- }
- }
-
- /**
- * @param parent
- * @param componentTypeInfo
- * @param attributes
- */
- public UIDataInfo(final ComponentInfo parent,
- final ComponentTypeInfo componentTypeInfo, Map attributes)
- {
- this(getStringProperty("id", attributes, true), parent, //$NON-NLS-1$
- componentTypeInfo,
- getBooleanProperty("rendered", attributes, false), //$NON-NLS-1$
- getDataModelInfo("$dataModel", attributes), //$NON-NLS-1$
- getIntegerProperty("first", attributes), //$NON-NLS-1$
- getComponentProperty("footer", attributes), //$NON-NLS-1$
- getComponentProperty("header", attributes), //$NON-NLS-1$
- getIntegerProperty("rowCount", attributes), //$NON-NLS-1$
- getBooleanProperty("rowAvailable", attributes, false), //$NON-NLS-1$
- attributes.get("rowData"), //$NON-NLS-1$
- getIntegerProperty("rowIndex", attributes), //$NON-NLS-1$
- getIntegerProperty("rows", attributes), //$NON-NLS-1$
- attributes.get("value"), //$NON-NLS-1$
- getStringProperty("var", attributes, false)); //$NON-NLS-1$
- }
-
- private static DataModelInfo getDataModelInfo(String key, Map attributes)
- {
- return (DataModelInfo) attributes.get(key);
- }
-
- /**
- * @return the data model
- */
- public final DataModelInfo getDataModel()
- {
- return _dataModel;
- }
-
- /**
- * @return the first row
- */
- public final int getFirst()
- {
- return _first;
- }
-
- /**
- * @return the row count
- */
- public final int getRowCount()
- {
- return _rowCount;
- }
-
- /**
- * @return true if the row is available
- */
- public final boolean isRowAvailable()
- {
- return _rowAvailable;
- }
-
- /**
- * @return the row data (may be null if not serialiable)
- */
- public final Object getRowData()
- {
- return _rowData.getMaybeSerializable();
- }
-
- /**
- * @return the row index
- */
- public final int getRowIndex()
- {
- return _rowIndex;
- }
-
- /**
- * @return the rows
- */
- public final int getRows()
- {
- return _rows;
- }
-
- /**
- * @return the value of the model (may be null if not serialiable)
- */
- public final Object getValue()
- {
- return _value.getMaybeSerializable();
- }
-
- /**
- * @return the name used to define the EL row variable
- */
- public final String getVar()
- {
- return _var;
- }
-
- /**
- * @return the header facet or null.
- */
- public final ComponentInfo getHeader()
- {
- return getFacet(FACET_NAME_HEADER);
- }
-
- /**
- * @return the footer facet or null.
- */
- public final ComponentInfo getFooter()
- {
- return getFacet(FACET_NAME_FOOTER);
- }
-
- protected String getMostSpecificComponentName()
- {
- return "UIData"; //$NON-NLS-1$
- }
-}
\ No newline at end of file
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/component/UIFormInfo.java b/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/component/UIFormInfo.java
deleted file mode 100644
index 2b82330..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/component/UIFormInfo.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2008 Oracle Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Oracle Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.common.runtime.internal.model.component;
-
-import java.util.Map;
-
-import org.eclipse.jst.jsf.common.runtime.internal.model.behavioural.INamingContainerInfo;
-
-/**
- * A design-time analog for the UIForm.
- *
- * @author cbateman
- */
-public class UIFormInfo extends ComponentInfo implements INamingContainerInfo
-{
- /**
- * serializable id
- */
- private static final long serialVersionUID = 6961034911873576644L;
-
- private final boolean _prependId;
- private final boolean _submitted;
-
- /**
- * @param id
- * @param parent
- * @param componentTypeInfo
- * @param isRendered
- * @param prependId
- * @param submitted
- */
- protected UIFormInfo(final String id, final ComponentInfo parent,
- final ComponentTypeInfo componentTypeInfo, final boolean isRendered
- , final boolean prependId, final boolean submitted) {
- super(id, parent, componentTypeInfo, isRendered);
- _prependId = prependId;
- _submitted = submitted;
- }
-
- /**
- * @param parent
- * @param componentTypeInfo
- * @param attributes
- */
- protected UIFormInfo(final ComponentInfo parent, ComponentTypeInfo componentTypeInfo,
- Map attributes)
- {
- this(getStringProperty("id", attributes, true), //$NON-NLS-1$
- parent,
- componentTypeInfo,
- getBooleanProperty("rendered", attributes, false), //$NON-NLS-1$
- getBooleanProperty("prependId", attributes, false), //$NON-NLS-1$
- getBooleanProperty("submitted", attributes, false)); //$NON-NLS-1$
- }
-
- /**
- * JSF 1.2 only
- *
- * @return true if the form allows its id to be prepended to its
- * descendent's ids.
- */
- public final boolean isPrependId()
- {
- return _prependId;
- }
-
- /**
- * @return true if the form is submitted.
- */
- public final boolean isSubmitted() {
- return _submitted;
- }
-
- protected String getMostSpecificComponentName()
- {
- return "UIForm"; //$NON-NLS-1$
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/component/UIInputInfo.java b/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/component/UIInputInfo.java
deleted file mode 100644
index 14a6131..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/component/UIInputInfo.java
+++ /dev/null
@@ -1,182 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2008 Oracle Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Oracle Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.common.runtime.internal.model.component;
-
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.jst.jsf.common.runtime.internal.model.behavioural.IEditableValueHolderInfo;
-import org.eclipse.jst.jsf.common.runtime.internal.model.decorator.ValidatorDecorator;
-import org.eclipse.jst.jsf.common.runtime.internal.model.decorator.ValueChangeListenerDecorator;
-
-/**
- * A design-time analog of the standard UIInput.
- *
- * @author cbateman
- *
- */
-public class UIInputInfo extends UIOutputInfo implements
- IEditableValueHolderInfo
-{
- /**
- * serializable uid
- */
- private static final long serialVersionUID = -6055473902554910848L;
- private final boolean _isValid;
- private final boolean _isImmediate;
- private final boolean _isRequired;
- private final Object _submittedValue;
- private final String _validator;
- private final String _valueChangeListener;
- private final boolean _localSetValue;
-
- /**
- * @param id
- * @param parent
- * @param typeInfo
- * @param editableValueHolderInfo
- * @param isRendered
- */
- protected UIInputInfo(final String id, final ComponentInfo parent,
- final ComponentTypeInfo typeInfo,
- final IEditableValueHolderInfo editableValueHolderInfo,
- final boolean isRendered)
- {
- super(id, parent, typeInfo, editableValueHolderInfo, isRendered);
-
- if (editableValueHolderInfo == null)
- {
- _isValid = true;
- _isImmediate = false;
- _isRequired = false;
- _localSetValue = false;
- _submittedValue = null;
- _validator = null;
- _valueChangeListener = null;
- }
- else
- {
- _isValid = editableValueHolderInfo.isValid();
- _isImmediate = editableValueHolderInfo.isImmediate();
- _isRequired = editableValueHolderInfo.isRequired();
- _localSetValue = editableValueHolderInfo.isLocalSetValue();
- _submittedValue = editableValueHolderInfo.getSubmittedValue();
- _validator = editableValueHolderInfo.getValidator();
- _valueChangeListener = editableValueHolderInfo
- .getValueChangeListener();
-
- for (final Iterator it = editableValueHolderInfo.getValidators()
- .iterator(); it.hasNext();)
- {
- final ValidatorDecorator validator = (ValidatorDecorator) it
- .next();
- addValidator(validator);
- }
-
- for (final Iterator it = editableValueHolderInfo
- .getValueChangeListeners().iterator(); it.hasNext();)
- {
- final ValueChangeListenerDecorator valueChangeListener = (ValueChangeListenerDecorator) it
- .next();
- addValueChangeListener(valueChangeListener);
- }
- }
- }
-
- /**
- * @param parent
- * @param typeInfo
- * @param attributes
- */
- protected UIInputInfo(final ComponentInfo parent,
- final ComponentTypeInfo typeInfo, Map attributes)
- {
- this(getStringProperty("id", attributes, true), parent, typeInfo, //$NON-NLS-1$
- getEditableValueHolderInfo("$editableValueHolderInfo", //$NON-NLS-1$
- attributes), getBooleanProperty("rendered", attributes, false)); //$NON-NLS-1$
- }
-
- private static IEditableValueHolderInfo getEditableValueHolderInfo(
- String key, Map attributes)
- {
- return (IEditableValueHolderInfo) attributes.get(key);
- }
-
- // public String toString() {
- // final String toString = super.toString();
- // return toString + ", isValid=" + _isValid + ", isImmediate="
- // + _isImmediate + ", isRequired=" + _isRequired;
- // }
-
- // @Override
- protected String getMostSpecificComponentName()
- {
- return "UIInput"; //$NON-NLS-1$
- }
-
- public final boolean isValid()
- {
- return _isValid;
- }
-
- public final boolean isImmediate()
- {
- return _isImmediate;
- }
-
- public final boolean isRequired()
- {
- return _isRequired;
- }
-
- public final Object getSubmittedValue()
- {
- return _submittedValue;
- }
-
- public final String getValidator()
- {
- return _validator;
- }
-
- public final String getValueChangeListener()
- {
- return _valueChangeListener;
- }
-
- public final boolean isLocalSetValue()
- {
- return _localSetValue;
- }
-
- public final void addValidator(final ValidatorDecorator validator)
- {
- addDecorator(validator, ComponentFactory.VALIDATOR);
- }
-
- public final void addValueChangeListener(
- final ValueChangeListenerDecorator valueChangeListenerInfo)
- {
- addDecorator(valueChangeListenerInfo,
- ComponentFactory.VALUE_CHANGE_LISTENER);
- }
-
- public final List getValidators()
- {
- return getDecorators(ComponentFactory.VALIDATOR);
- }
-
- public final List getValueChangeListeners()
- {
- return getDecorators(ComponentFactory.VALUE_CHANGE_LISTENER);
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/component/UIOutputInfo.java b/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/component/UIOutputInfo.java
deleted file mode 100644
index 990028a..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/component/UIOutputInfo.java
+++ /dev/null
@@ -1,132 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2008 Oracle Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Oracle Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.common.runtime.internal.model.component;
-
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.jst.jsf.common.runtime.internal.model.behavioural.IValueHolderInfo;
-import org.eclipse.jst.jsf.common.runtime.internal.model.behavioural.ValueHolderInfo;
-import org.eclipse.jst.jsf.common.runtime.internal.model.decorator.ConverterDecorator;
-
-/**
- * A design-time analog for the UIOutput
- *
- * @author cbateman
- *
- */
-public class UIOutputInfo extends ComponentInfo implements IValueHolderInfo {
- /**
- * serializable uid
- */
- private static final long serialVersionUID = 9096297578991706150L;
-
- /**
- * the value
- */
- protected final Object _value;
- /**
- * the value before any EL evaluation
- */
- protected final Object _localValue;
-
- /**
- * @param id
- * @param parent
- * @param typeInfo
- * @param valueHolderInfo
- * @param isRendered
- */
- protected UIOutputInfo(final String id, final ComponentInfo parent,
- final ComponentTypeInfo typeInfo,
- final IValueHolderInfo valueHolderInfo, final boolean isRendered) {
- super(id, parent, typeInfo, isRendered);
-
- if (valueHolderInfo == null) {
- _value = null;
- _localValue = null;
- } else {
- _value = valueHolderInfo.getValue();
- _localValue = valueHolderInfo.getLocalValue();
-
- final ConverterDecorator converter = valueHolderInfo.getConverter();
- if (converter != null) {
- addDecorator(converter, ComponentFactory.CONVERTER);
- }
- }
- }
-
- /**
- * @param parent
- * @param typeInfo
- * @param attributes
- */
- protected UIOutputInfo(final ComponentInfo parent, final ComponentTypeInfo typeInfo,
- final Map attributes)
- {
- this(getStringProperty("id", attributes, true), //$NON-NLS-1$
- parent,
- typeInfo,
- getValueHolderInfo("$valueHolderInfo", attributes), //$NON-NLS-1$
- getBooleanProperty("rendered", attributes, false)); //$NON-NLS-1$
- }
-
- /**
- * @param key
- * @param attributes
- * @return the non-standard value holder info that encapsulates the
- * ValueHolder properties. This is never mandatory.
- */
- protected static IValueHolderInfo getValueHolderInfo(String key, Map attributes)
- {
- IValueHolderInfo info = (IValueHolderInfo) attributes.get(key);
-
- if (info != null)
- {
- return info;
- }
- Object value = attributes.get("value"); //$NON-NLS-1$
- if (value != null)
- {
- Object converter = attributes.get("converter"); //$NON-NLS-1$
- Object localValue = attributes.get("localValue"); //$NON-NLS-1$
-
- return new ValueHolderInfo((ConverterDecorator) converter, localValue, value);
- }
- return null;
- }
-
- // @Override
- protected String getMostSpecificComponentName() {
- return "UIOutput"; //$NON-NLS-1$
- }
-
- public final ConverterDecorator getConverter() {
- // should only be a single converter decorator...
- // so on this interface we'll return the first one if present.
- // to do things like error checking, use the getDecorator
- final List converters = getDecorators(ComponentFactory.CONVERTER);
-
- if (converters.size() > 0) {
- return (ConverterDecorator) converters.get(0);
- }
-
- return null;
- }
-
- public final Object getLocalValue() {
- return _localValue;
- }
-
- public final Object getValue() {
- return _value;
- }
-}
\ No newline at end of file
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/datatypes/ELExpression.java b/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/datatypes/ELExpression.java
deleted file mode 100644
index b14f68d..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/datatypes/ELExpression.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2008 Oracle Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Oracle Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.common.runtime.internal.model.datatypes;
-
-/**
- * An abstraction for an EL expression.
- *
- * @author cbateman
- *
- */
-public abstract class ELExpression
-{
- /**
- * @return the original text of EL expression
- */
- public abstract String getText();
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/decorator/ActionListenerDecorator.java b/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/decorator/ActionListenerDecorator.java
deleted file mode 100644
index 6c7993e..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/decorator/ActionListenerDecorator.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2008 Oracle Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Oracle Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.common.runtime.internal.model.decorator;
-
-import org.eclipse.jst.jsf.common.runtime.internal.model.component.ComponentInfo;
-
-/**
- * Design time ActionListener decorator
- *
- * @author cbateman
- *
- */
-public class ActionListenerDecorator extends ComponentDecorator {
-
- /**
- *
- */
- private static final long serialVersionUID = 3806862878381550874L;
-
- /**
- * @param decorates
- */
- public ActionListenerDecorator(final ComponentInfo decorates) {
- super(decorates);
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/decorator/ComponentDecorator.java b/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/decorator/ComponentDecorator.java
deleted file mode 100644
index b700073..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/decorator/ComponentDecorator.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2008 Oracle Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Oracle Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.common.runtime.internal.model.decorator;
-
-import org.eclipse.jst.jsf.common.runtime.internal.model.component.ComponentInfo;
-
-/**
- * @author cbateman
- *
- */
-public abstract class ComponentDecorator extends Decorator
-{
- /**
- *
- */
- private static final long serialVersionUID = 4378142984217256364L;
-
- private final ComponentInfo _decorates;
-
- /**
- * @param decorates
- */
- public ComponentDecorator(final ComponentInfo decorates)
- {
- _decorates = decorates;
- }
-
- /**
- * @return the component that this decorator decorates.
- */
- public final ComponentInfo getDecorates() {
- return _decorates;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/decorator/ConverterDecorator.java b/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/decorator/ConverterDecorator.java
deleted file mode 100644
index 692ec3b..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/decorator/ConverterDecorator.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2008 Oracle Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Oracle Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.common.runtime.internal.model.decorator;
-
-import org.eclipse.jst.jsf.common.runtime.internal.model.component.ComponentInfo;
-
-/**
- * A converter decorator.
- *
- * @author cbateman
- *
- */
-public class ConverterDecorator extends ComponentDecorator {
-
- private final ConverterTypeInfo _typeInfo;
-
- /**
- * serializable id
- */
- private static final long serialVersionUID = 3838224353030247227L;
-
-
- /**
- * @param decorates
- * @param typeInfo
- */
- public ConverterDecorator(final ComponentInfo decorates, final ConverterTypeInfo typeInfo)
- {
- super(decorates);
- _typeInfo = typeInfo;
- }
-
- /**
- * @return the converter's type info.
- */
- public final ConverterTypeInfo getTypeInfo()
- {
- return _typeInfo;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/decorator/ConverterTypeInfo.java b/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/decorator/ConverterTypeInfo.java
deleted file mode 100644
index f013d3c..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/decorator/ConverterTypeInfo.java
+++ /dev/null
@@ -1,146 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2008 Oracle Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Oracle Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.common.runtime.internal.model.decorator;
-
-import org.eclipse.jst.jsf.common.runtime.internal.model.types.ClassTypeInfo;
-
-/**
- * Type information about a converter.
- *
- * @author cbateman
- *
- */
-public class ConverterTypeInfo extends ClassTypeInfo
-{
- /**
- * serializable id
- */
- private static final long serialVersionUID = -7238952424045449907L;
- private static final String[] NO_FOR_CLASS = new String[0];
- private final String _converterId;
- private final String[] _forClasses;
-
- /**
- * For unknown converters, use the UNKNOWN constant.
- *
- * @param className
- * @param converterId
- * @throws java.lang.IllegalArgumentException
- * if both className and converterId are null.
- *
- */
- public ConverterTypeInfo(String className, String converterId)
- {
- super(className, new String[0], new String[0]);
- if (className == null && converterId == null)
- {
- throw new IllegalArgumentException(
- "converterClass and converterId must not both be null. For unknown validator use the UNKNOWN constant"); //$NON-NLS-1$
- }
-
- _converterId = converterId;
- _forClasses = NO_FOR_CLASS;
- }
-
- /**
- * For unknown converters, use the UNKNOWN constant.
- *
- * @param className
- * @param superClasses
- * @param interfaces
- * @param converterId
- * @param forClass
- * @throws java.lang.IllegalArgumentException
- * if both className and converterId are null.
- *
- */
- public ConverterTypeInfo(String className, String[] superClasses,
- String[] interfaces, String converterId, String[] forClass)
- {
- super(className, superClasses, interfaces);
- if (className == null && converterId == null)
- {
- throw new IllegalArgumentException(
- "converterClass and converterId must not both be null. For unknown validator use the UNKNOWN constant"); //$NON-NLS-1$
- }
-
- _converterId = converterId;
- if (forClass == null)
- {
- _forClasses = NO_FOR_CLASS;
- }
- else
- {
- _forClasses = forClass;
- }
- }
-
- /**
- * Use when the converter's information unknown such as occurs when using
- * the f:converter tag.
- */
- public static final ConverterTypeInfo UNKNOWN = new ConverterTypeInfo(
- (Object) null);
-
- /**
- * A private constructor used to create the UNRESOLVED constant. We use an
- * Object arg here (which is discarded) rather than using the zero-arg
- * constructor so as not mess up anything like Serializable that may depend
- * on how zero-arg constructors are defined.
- *
- * @param unresolved
- */
- private ConverterTypeInfo(Object unresolved)
- {
- super(null, new String[0], new String[0]);
- _converterId = null;
- _forClasses = NO_FOR_CLASS;
- }
-
- /**
- * @return the converter's id.
- */
- public final String getConverterId()
- {
- return _converterId;
- }
-
- /**
- * @return a copy of the listof classes that this type converters to. May
- * be empty. Never null.
- */
- public final String[] getForClass()
- {
- final String[] returnArray = new String[_forClasses.length];
- System.arraycopy(_forClasses, 0, returnArray, 0, _forClasses.length);
- return returnArray;
- }
-
- public String toString()
- {
- String toString = ""; //$NON-NLS-1$
-
- if (_forClasses.length > 0)
- {
- toString = "For-Classes: ["; //$NON-NLS-1$
- for (int i = 0; i < _forClasses.length; i++)
- {
- toString += _forClasses[i];
- if (i < _forClasses.length-1)
- {
- toString += ", "; //$NON-NLS-1$
- }
- }
- toString += "], "; //$NON-NLS-1$
- }
- return toString + "Converter Type Info: type = " + _converterId + ", "+super.toString(); //$NON-NLS-1$ //$NON-NLS-2$
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/decorator/Decorator.java b/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/decorator/Decorator.java
deleted file mode 100644
index ceaae4e..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/decorator/Decorator.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2008 Oracle Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Oracle Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.common.runtime.internal.model.decorator;
-
-import java.io.Serializable;
-
-import org.eclipse.jst.jsf.common.runtime.internal.model.ViewObject;
-
-/**
- * The abstract super-class of all view object decorators.
- *
- * @author cbateman
- *
- */
-public abstract class Decorator extends ViewObject implements Serializable
-{
-
- /**
- * serializable id
- */
- private static final long serialVersionUID = -3138829736243154022L;
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/decorator/FacetDecorator.java b/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/decorator/FacetDecorator.java
deleted file mode 100644
index 32e7f0d..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/decorator/FacetDecorator.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2008 Oracle Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Oracle Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.common.runtime.internal.model.decorator;
-
-import org.eclipse.jst.jsf.common.runtime.internal.model.component.ComponentInfo;
-
-/**
- * Component decorator for facets.
- *
- * @author cbateman
- *
- */
-public class FacetDecorator extends ComponentDecorator
-{
- /**
- *
- */
- private static final long serialVersionUID = 94806944978127012L;
-
- private final String _name;
-
- /**
- * @param name
- * @param component
- */
- public FacetDecorator(final String name, final ComponentInfo component) {
- super(component);
- _name = name;
- }
-
- /**
- * @return the name of the facet.
- */
- public final String getName() {
- return _name;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/decorator/ValidatorDecorator.java b/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/decorator/ValidatorDecorator.java
deleted file mode 100644
index b7e33d0..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/decorator/ValidatorDecorator.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2008 Oracle Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Oracle Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.common.runtime.internal.model.decorator;
-
-import org.eclipse.jst.jsf.common.runtime.internal.model.component.ComponentInfo;
-
-/**
- * Validator decorator.
- *
- * @author cbateman
- *
- */
-public class ValidatorDecorator extends ComponentDecorator {
- /**
- *
- */
- private static final long serialVersionUID = -2898015711621314782L;
-
- private final ValidatorTypeInfo _typeInfo;
-
- /**
- * @param decorates
- * @param typeInfo
- */
- public ValidatorDecorator(final ComponentInfo decorates, final ValidatorTypeInfo typeInfo) {
- super(decorates);
- _typeInfo = typeInfo;
- }
-
- /**
- * @return the validator's type info
- */
- public final ValidatorTypeInfo getTypeInfo()
- {
- return _typeInfo;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/decorator/ValidatorTypeInfo.java b/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/decorator/ValidatorTypeInfo.java
deleted file mode 100644
index 7e4a6fc..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/decorator/ValidatorTypeInfo.java
+++ /dev/null
@@ -1,103 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2008 Oracle Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Oracle Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.common.runtime.internal.model.decorator;
-
-import org.eclipse.jst.jsf.common.runtime.internal.model.types.ClassTypeInfo;
-
-/**
- * Type information about validator decorator.
- * @author cbateman
- *
- */
-public class ValidatorTypeInfo extends ClassTypeInfo
-{
- /**
- *
- */
- private static final long serialVersionUID = 7512992316792276160L;
- private final String _validatorId;
-
- /**
- * For unknown validators, use the UNKNOWN constant.
- *
- * @param validatorClass
- * @param validatorId
- * @throws java.lang.IllegalArgumentException if both className and
- * converterId are null.
- *
- */
- public ValidatorTypeInfo(String validatorClass, String validatorId)
- {
- super(validatorClass, new String[0], new String[0]);
-
- if (validatorClass == null && validatorId == null)
- {
- throw new IllegalArgumentException("validatorClass and validatorId must not both be null. For unknown validator use the UNKNOWN constant"); //$NON-NLS-1$
- }
- _validatorId = validatorId;
- }
-
- /**
- * For unknown validators, use the UNKNOWN constant.
- *
- * @param validatorClass
- * @param superClasses
- * @param interfaces
- * @param validatorId
- * @throws java.lang.IllegalArgumentException if both className and
- * converterId are null.
- *
- */
- public ValidatorTypeInfo(String validatorClass, String[] superClasses, String[] interfaces, String validatorId)
- {
- super(validatorClass, superClasses, interfaces);
-
- if (validatorClass == null && validatorId == null)
- {
- throw new IllegalArgumentException("validatorClass and validatorId must not both be null. For unknown validator use the UNKNOWN constant"); //$NON-NLS-1$
- }
- _validatorId = validatorId;
- }
-
- /**
- * Use when a validator's type info information is unknown.
- */
- public static final ValidatorTypeInfo UNKNOWN =
- new ValidatorTypeInfo((Object)null);
-
- /**
- * A private constructor used to create the UNRESOLVED constant.
- * We use an Object arg here (which is discarded) rather than using
- * the zero-arg constructor so as not mess up anything like Serializable
- * that may depend on how zero-arg constructors are defined.
- *
- * @param unresolved
- */
- private ValidatorTypeInfo(Object unresolved)
- {
- super(null, new String[0], new String[0]);
- _validatorId = null;
- }
-
- /**
- * @return the validator id (may be null if unknown).
- */
- public final String getValidatorId()
- {
- return _validatorId;
- }
-
- public String toString()
- {
- return "Validator Type Info: type = " + _validatorId + ", "+super.toString(); //$NON-NLS-1$ //$NON-NLS-2$
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/decorator/ValueChangeListenerDecorator.java b/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/decorator/ValueChangeListenerDecorator.java
deleted file mode 100644
index e344c1e..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/decorator/ValueChangeListenerDecorator.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2008 Oracle Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Oracle Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.common.runtime.internal.model.decorator;
-
-import org.eclipse.jst.jsf.common.runtime.internal.model.component.ComponentInfo;
-import org.eclipse.jst.jsf.common.runtime.internal.model.event.IValueChangeListenerInfo;
-
-/**
- * ValueChangeListener component decorator.
- *
- * @author cbateman
- *
- */
-public class ValueChangeListenerDecorator extends ComponentDecorator implements
- IValueChangeListenerInfo
-{
- /**
- * serializable id
- */
- private static final long serialVersionUID = 9045831927898936727L;
-
- /**
- * @param decorates
- */
- public ValueChangeListenerDecorator(ComponentInfo decorates) {
- super(decorates);
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/event/IActionListenerInfo.java b/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/event/IActionListenerInfo.java
deleted file mode 100644
index a26b3a1..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/event/IActionListenerInfo.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2008 Oracle Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Oracle Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.common.runtime.internal.model.event;
-
-/**
- * A design time analog for the ActionListener
- * @author cbateman
- *
- */
-public interface IActionListenerInfo extends IFacesListenerInfo
-{
- // TODO:
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/event/IFacesListenerInfo.java b/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/event/IFacesListenerInfo.java
deleted file mode 100644
index b8996d4..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/event/IFacesListenerInfo.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2008 Oracle Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Oracle Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.common.runtime.internal.model.event;
-
-/**
- * A design-time analog for the runtime Faces Listener.
- * @author cbateman
- *
- */
-public interface IFacesListenerInfo
-{
- // no methods
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/event/IValueChangeListenerInfo.java b/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/event/IValueChangeListenerInfo.java
deleted file mode 100644
index 3d21a7a..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/event/IValueChangeListenerInfo.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2008 Oracle Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Oracle Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.common.runtime.internal.model.event;
-
-/**
- * A design time analog for the runtime ValueChangeListener interface.
- *
- * @author cbateman
- *
- */
-public interface IValueChangeListenerInfo extends IFacesListenerInfo {
- // TODO:
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/types/ClassTypeInfo.java b/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/types/ClassTypeInfo.java
deleted file mode 100644
index 4a39bc0..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/types/ClassTypeInfo.java
+++ /dev/null
@@ -1,137 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2008 Oracle Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Oracle Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.common.runtime.internal.model.types;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Set;
-
-/**
- * A type info that has class information.
- *
- * @author cbateman
- *
- */
-public abstract class ClassTypeInfo extends TypeInfo implements IClassTypeInfo
-{
- /**
- * serializable id
- */
- private static final long serialVersionUID = -5046230589012357680L;
-
- /**
- * the fully qualified class name of the implementation class for this
- * type.
- */
- protected final String _className;
-
- /**
- * known super classes of the component class
- */
- protected final String[] _superClasses;
-
- /**
- * known interfaces implemented by the component class
- */
- protected final String[] _interfaces;
-
- /**
- * used internally by isInstanceOf
- */
- private Set _superTypes; // may be lazily constructed
-
-
- /**
- * @param className
- * @param superClasses
- * @param interfaces
- */
- protected ClassTypeInfo(final String className, final String[] superClasses, final String[] interfaces)
- {
- _className = className;
- _superClasses = superClasses != null ? superClasses : new String[0];
- _interfaces = interfaces != null ? interfaces : new String[0];
-
- if (_superClasses.length + _interfaces.length == 0)
- {
- // there are no super-types known
- _superTypes = Collections.EMPTY_SET;
- }
- }
-
- public final String[] getInterfaces()
- {
- if (_interfaces.length > 0)
- {
- final String[] copy = new String[_interfaces.length];
- System.arraycopy(_interfaces, 0, copy, 0, _interfaces.length);
- return copy;
- }
- return new String[0];
- }
-
- public final String[] getSuperClasses()
- {
- if (_superClasses.length > 0)
- {
- final String[] copy = new String[_superClasses.length];
- System.arraycopy(_superClasses, 0, copy, 0, _superClasses.length);
- return copy;
- }
- return new String[0];
- }
-
- public final boolean isInstanceOf(String checkType)
- {
- if (_superTypes == null)
- {
- _superTypes = new HashSet();
- _superTypes.addAll(Arrays.asList(_superClasses));
- _superTypes.addAll(Arrays.asList(_interfaces));
- }
-
- return _superTypes.contains(checkType);
- }
-
- public final String getClassName()
- {
- return _className;
- }
-
- public String toString()
- {
- String supers = "["; //$NON-NLS-1$
-
- for (int i = 0; i < _superClasses.length; i++)
- {
- supers += _superClasses[i];
-
- if (i < _superClasses.length)
- {
- supers += ","; //$NON-NLS-1$
- }
- }
-
- for (int i = 0; i < _interfaces.length; i++)
- {
- supers += _interfaces[i];
-
- if (i < _interfaces.length-1)
- {
- supers += ","; //$NON-NLS-1$
- }
- }
- supers +="]"; //$NON-NLS-1$
-
- return "class= "+getClassName()+ ", supers="+ supers; //$NON-NLS-1$ //$NON-NLS-2$
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/types/IAttributeValueProxy.java b/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/types/IAttributeValueProxy.java
deleted file mode 100644
index 95b83db..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/types/IAttributeValueProxy.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2008 Oracle Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Oracle Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.common.runtime.internal.model.types;
-
-import java.io.Serializable;
-
-/**
- * Wraps
- * @author cbateman
- *
- */
-public interface IAttributeValueProxy extends Serializable
-{
-//
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/types/IClassTypeInfo.java b/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/types/IClassTypeInfo.java
deleted file mode 100644
index 7b43252..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/types/IClassTypeInfo.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2008 Oracle Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Oracle Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.common.runtime.internal.model.types;
-
-/**
- * A type info that has an associate Java class.
- * @author cbateman
- *
- */
-public interface IClassTypeInfo
-{
- /**
- * The fully qualified class name, i.e. java.lang.String
- *
- * @return the fully qualified class name in dot notation
- *
- */
- String getClassName();
-
- /**
- * Should never return null. Return empty array if none.
- *
- * @return the list of fully-qualified super class names. List is as
- * calculated at IClassTypeInfo construction and no guarantee is made
- * (although an implementer may do so) that it will be updated if the
- * definition of className changes.
- */
- String[] getSuperClasses();
-
- /**
- * Should never return null. Return empty array if none.
- *
- * @return the list of fully-qualified interface names. List is as
- * calculated at IClassTypeInfo construction and no guarantee is made
- * (although an implementer may do so) that it will be updated if the
- * definition of className changes.
- */
- String[] getInterfaces();
-
- /**
- * @param checkType
- * @return true if checkType is in the set comprised of getSuperClasses()+getInterfaces()
- */
- boolean isInstanceOf(final String checkType);
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/types/TypeInfo.java b/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/types/TypeInfo.java
deleted file mode 100644
index 4061f4a..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/types/TypeInfo.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2008 Oracle Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Oracle Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.common.runtime.internal.model.types;
-
-import java.io.Serializable;
-
-/**
- * Abstract super-class of all view object type information objects.
- *
- * @author cbateman
- *
- */
-public abstract class TypeInfo implements Serializable
-{
- /**
- * serializable id
- */
- private static final long serialVersionUID = -3653573923653759724L;
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/view/model/common/AbstractTagAttribute.java b/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/view/model/common/AbstractTagAttribute.java
deleted file mode 100644
index 696113a..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/view/model/common/AbstractTagAttribute.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package org.eclipse.jst.jsf.common.runtime.internal.view.model.common;
-
-/**
- * Super-class of all ITagAttribute concrete implementations.
- *
- * @author cbateman
- *
- */
-public abstract class AbstractTagAttribute implements ITagAttribute
-{
- /**
- *
- */
- private static final long serialVersionUID = 6364594863141579928L;
-
- public abstract String getName();
-
- public abstract String getTargetNamespace();
-
- public abstract String getDescription();
-
- public abstract String getDisplayName();
-
- public abstract boolean isRequired();
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/view/model/common/ComponentPropertyHandler.java b/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/view/model/common/ComponentPropertyHandler.java
deleted file mode 100644
index aa50545..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/view/model/common/ComponentPropertyHandler.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Oracle 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:
- * Cameron Bateman - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.common.runtime.internal.view.model.common;
-
-/**
- * Default implementation of IComponentPropertyHandler.
- *
- * @author cbateman
- *
- */
-public class ComponentPropertyHandler extends TagAttributeHandler implements
- IComponentPropertyHandler
-{
- /**
- *
- */
- private static final long serialVersionUID = 8614562842401106572L;
- private final String _propertyName;
-
- /**
- * @param customHandler
- * @param name
- * @param elAllowed
- * @param propertyName
- */
- public ComponentPropertyHandler(final String customHandler,
- final String name, final boolean elAllowed,
- final String propertyName)
- {
- super(customHandler, name, elAllowed);
- _propertyName = propertyName;
- }
-
- public String getPropertyName()
- {
- return _propertyName;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/view/model/common/IComponentPropertyHandler.java b/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/view/model/common/IComponentPropertyHandler.java
deleted file mode 100644
index dfcaf79..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/view/model/common/IComponentPropertyHandler.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*******************************************************************************
- * Copyright (c) ${year} Oracle 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:
- * Cameron Bateman - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.common.runtime.internal.view.model.common;
-
-/**
- * Maps tag attributes to component properties.
- *
- * @author cbateman
- *
- */
-public interface IComponentPropertyHandler extends ITagAttributeHandler
-{
- /**
- * @return the property name that this handler maps to.
- */
- String getPropertyName();
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/view/model/common/IComponentTagElement.java b/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/view/model/common/IComponentTagElement.java
deleted file mode 100644
index d34cb2f..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/view/model/common/IComponentTagElement.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2008 Oracle Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Oracle Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.common.runtime.internal.view.model.common;
-
-import org.eclipse.jst.jsf.common.runtime.internal.model.component.ComponentTypeInfo;
-
-/**
- * A JSF tag element that maps one-to-one to a JSF UIComponent
- *
- * @author cbateman
- *
- */
-public interface IComponentTagElement extends IJSFTagElement
-{
- /**
- * @return the comopnent's type info.
- */
- ComponentTypeInfo getComponent();
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/view/model/common/IConverterTagElement.java b/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/view/model/common/IConverterTagElement.java
deleted file mode 100644
index 63e43ad..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/view/model/common/IConverterTagElement.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2008 Oracle Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Oracle Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.common.runtime.internal.view.model.common;
-
-import org.eclipse.jst.jsf.common.runtime.internal.model.decorator.ConverterTypeInfo;
-
-/**
- * A tag element that causes the construction registration of a converter on
- * a parent object.
- *
- * @author cbateman
- *
- */
-public interface IConverterTagElement extends IJSFTagElement
-{
- /**
- * @return the type info for the converter represented by this
- * element
- */
- ConverterTypeInfo getConverter();
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/view/model/common/IHandlerTagElement.java b/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/view/model/common/IHandlerTagElement.java
deleted file mode 100644
index 43e6828..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/view/model/common/IHandlerTagElement.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2008 Oracle Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Oracle Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.common.runtime.internal.view.model.common;
-
-import java.io.Serializable;
-
-import org.eclipse.jst.jsf.common.runtime.internal.model.types.TypeInfo;
-
-/**
- * Generic tag handler that has effect when processed by the JSF ViewHandler.
- *
- * @author cbateman
- *
- */
-public interface IHandlerTagElement extends IJSFTagElement
-{
- /**
- * Enumerates known types of built-in tag handlers.
- *
- * @author cbateman
- *
- */
- static class TagHandlerType extends TypeInfo implements Serializable
- {
- /**
- * serializable id
- */
- private static final long serialVersionUID = 5062853948108253861L;
-
- private final static int HANDLER_TYPE_FACET = 0;
- private final static int HANDLER_TYPE_ACTIONLISTENER = 1;
- private final static int HANDLER_TYPE_VALUECHANGELISTENER = 2;
- private final static int HANDLER_TYPE_ATTRIBUTE = 3;
-
- private final static String[] strValues =
- {"facet", "actionListener", "valueChangeListener"}; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-
- private final int _intValue;
-
- public TagHandlerType(int intValue)
- {
- _intValue = intValue;
- }
-
- public String toString()
- {
- return strValues[_intValue];
- }
-
- protected final int intValue()
- {
- return _intValue;
- }
-
- public final static TagHandlerType FACET =
- new TagHandlerType(HANDLER_TYPE_FACET);
- public final static TagHandlerType ACTIONLISTENER =
- new TagHandlerType(HANDLER_TYPE_ACTIONLISTENER);
- public final static TagHandlerType VALUECHANGELISTENER =
- new TagHandlerType(HANDLER_TYPE_VALUECHANGELISTENER);
- public final static TagHandlerType ATTRIBUTE =
- new TagHandlerType(HANDLER_TYPE_ATTRIBUTE);
-
- }
-
- /**
- * @return the tag handler type as defined by standard known types of
- * tags that do not (necessarily) translate into standard objects at
- * runtime but may modify the view in some way.
- */
- TagHandlerType getTagHandlerType();
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/view/model/common/IJSFTagElement.java b/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/view/model/common/IJSFTagElement.java
deleted file mode 100644
index 435c08a..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/view/model/common/IJSFTagElement.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2008 Oracle Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Oracle Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.common.runtime.internal.view.model.common;
-
-import java.io.Serializable;
-
-/**
- * An abstraction of a tag element that maps to a JSF artifact (i.e. component, validator)
- *
- * @author cbateman
- *
- */
-public interface IJSFTagElement extends ITagElement
-{
- /**
- * An enumeration of different kinds of tags.
- *
- * @author cbateman
- *
- */
- static class TagType implements Serializable
- {
- /**
- * serializable id
- */
- private static final long serialVersionUID = -2845327764902349963L;
- private final static int TYPE_COMPONENT = 0;
- private final static int TYPE_CONVERTER = 1;
- private final static int TYPE_VALIDATOR = 2;
- private final static int TYPE_HANDLER = 3;
- //private final static int TYPE_UNKNOWN = 4;
-
- private final static String[] strValues =
- {"component", "converter", "validator", "handler"}; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
-
- private final int _intValue;
-
- public TagType(int intValue)
- {
- _intValue = intValue;
- }
-
- public String toString()
- {
- return strValues[_intValue];
- }
-
- protected final int intValue()
- {
- return _intValue;
- }
-
- public final static TagType COMPONENT =
- new TagType(TYPE_COMPONENT);
- public final static TagType CONVERTER =
- new TagType(TYPE_CONVERTER);
- public final static TagType VALIDATOR =
- new TagType(TYPE_VALIDATOR);
- public final static TagType HANDLER =
- new TagType(TYPE_HANDLER);
- }
-
- /**
- * @return the type of tag as distinguished by how it may affect the
- * view at runtime.
- */
- TagType getType();
-}
\ No newline at end of file
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/view/model/common/ITagAttribute.java b/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/view/model/common/ITagAttribute.java
deleted file mode 100644
index 52fd6c2..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/view/model/common/ITagAttribute.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package org.eclipse.jst.jsf.common.runtime.internal.view.model.common;
-
-import java.io.Serializable;
-
-/**
- * Information about a tags attribute
- * @author cbateman
- *
- */
-public interface ITagAttribute extends Serializable
-{
- /**
- * @return the name of the attribute. In XML this is the "local" name of
- * the attribute: that is, it's name without any namespace qualification.
- */
- String getName();
-
- /**
- * @return the unique namespace of the attribute or null if it is always the
- * same as it's owner (the typical case in JSF).
- */
- String getTargetNamespace();
-
- /**
- * @return a long-form piece of text, intended for end-user consumption,
- * that describes the attribute
- */
- String getDescription();
-
- /**
- * @return a short, user visible label text for the attribute.
- */
- String getDisplayName();
-
- /**
- * @return true if the attribute is required to be populated on the
- * element.
- */
- boolean isRequired();
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/view/model/common/ITagAttributeHandler.java b/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/view/model/common/ITagAttributeHandler.java
deleted file mode 100644
index f6d15c9..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/view/model/common/ITagAttributeHandler.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*******************************************************************************
- * Copyright (c) ${year} Oracle 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:
- * Cameron Bateman - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.common.runtime.internal.view.model.common;
-
-import java.io.Serializable;
-
-/**
- * Basic information on attributes.
- * TODO C.B: some question exists in my mind as to how/whether this should merge
- * with meta-data enabled type descriptors.
- *
- * @author cbateman
- *
- */
-public interface ITagAttributeHandler extends Serializable
-{
- /**
- * @return the name of the attribute
- */
- String getName();
- /**
- * @return the name of an extension point used to perform custom handling
- * of the attribute.
- */
- String getCustomHandler();
-
- /**
- * @return true if the property allows EL expressions
- */
- boolean isELAllowed();
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/view/model/common/ITagElement.java b/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/view/model/common/ITagElement.java
deleted file mode 100644
index e4d8298..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/view/model/common/ITagElement.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2008 Oracle Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Oracle Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.common.runtime.internal.view.model.common;
-
-import java.io.Serializable;
-import java.util.Map;
-
-/**
- * Super-interface of all JSF tag elements.
- *
- * @author cbateman
- *
- */
-public interface ITagElement extends Serializable
-{
-
- /**
- * @return the name of the tag
- */
- public abstract String getName();
-
- /**
- * @return the namespace uri for this tag
- */
- public abstract String getUri();
-
- /**
- * @return the fully qualified class name in dot separated format
- * (i.e. javax.faces.webapp.ConverterTag)
- */
- public abstract String getTagHandlerClassName();
-
- /**
- * @return an unmodifiable map, indexed by name, of all the attribute
- * handlers available for this tag element. Each value in the Map
- * must be a ITagAttributeHandler.
- */
- public abstract Map getAttributeHandlers();
-
- /**
- * @return the attributes for the tag.
- */
- public abstract Map<String, ? extends ITagAttribute> getAttributes();
- /**
- * Signals that the tag element should make any mutable data immutable
- * and throw exceptions if attempts are made to implement. Flag must
- * latch and become irrevocable.
- */
-// public abstract void setLocked();
-
- /**
- * @return true if setLocked has been called.
- */
-// public abstract boolean isLocked();
-}
\ No newline at end of file
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/view/model/common/IValidatorTagElement.java b/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/view/model/common/IValidatorTagElement.java
deleted file mode 100644
index 9474902..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/view/model/common/IValidatorTagElement.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2008 Oracle Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Oracle Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.common.runtime.internal.view.model.common;
-
-import org.eclipse.jst.jsf.common.runtime.internal.model.decorator.ValidatorTypeInfo;
-
-/**
- * Represents a tag element for a JSF validator.
- *
- * @author cbateman
- *
- */
-public interface IValidatorTagElement extends IJSFTagElement
-{
- /**
- * @return the type info about the validator.
- */
- ValidatorTypeInfo getValidator();
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/view/model/common/Namespace.java b/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/view/model/common/Namespace.java
deleted file mode 100644
index ee0259f..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/view/model/common/Namespace.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2008 Oracle Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Oracle Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.common.runtime.internal.view.model.common;
-
-import java.io.Serializable;
-import java.util.Collection;
-
-/**
- * Abstracts an xml namespace used to define a set of view tags
- *
- */
-public abstract class Namespace implements Serializable
-{
- /**
- *
- */
- private static final long serialVersionUID = 6386464282396970948L;
-
- /**
- * @return the namespace uri. MUST NOT BE NULL
- */
- public abstract String getNSUri();
-
- /**
- * This call may be long running. Call isInitialized to determine if all
- * information is already cached, or if calling this method is likely
- * to take a long time.
- *
- * @return the view elements in this namespace. May be empty but MUST NOT BE
- * NULL.
- */
- public abstract Collection<? extends ITagElement> getViewElements();
-
- /**
- * This method should be light weight if possible. Unlike calling
- * getViewElements().isEmpty, this call should not require that all
- * view element children of this namespace be analyzed and constructed in
- * order to succeed.
- *
- * @return true if this name space has view element children
- */
- public abstract boolean hasViewElements();
-
- /**
- * If calculating all view elements is expensive, a Namespace implementation
- * may defer calculation until a specific element is requested. A caller of
- * getViewElements (such as a UI that shows all tags), may wish to know if
- * the entire namespace has been initialized before calling it, since it may
- * be long running.
- *
- * @return true if the namespace's elements have been fully initialized. If this
- * method returns false, care should be taken in calling getViewElements() and
- * getViewElement() since they may be very long running.
- */
- public abstract boolean isInitialized();
-
- /**
- * @param name
- * @return the tag element called 'name' or null if none.
- */
- public abstract ITagElement getViewElement(final String name);
-
- /**
- * @return a user readable display name for this namespace or null if none.
- */
- public abstract String getDisplayName();
-
- public String toString()
- {
- return getNSUri();
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/view/model/common/TagAttributeHandler.java b/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/view/model/common/TagAttributeHandler.java
deleted file mode 100644
index b293495..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/view/model/common/TagAttributeHandler.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*******************************************************************************
- * Copyright (c) ${year} Oracle 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:
- * Cameron Bateman - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.common.runtime.internal.view.model.common;
-
-/**
- * Default implementation of ITagAttributeHandler.
- *
- * @author cbateman
- *
- */
-public class TagAttributeHandler implements ITagAttributeHandler
-{
- /**
- *
- */
- private static final long serialVersionUID = 8153903018703133004L;
- private final String _customHandler;
- private final String _name;
- private final boolean _elAllowed;
-
- /**
- * @param customHandler
- * @param name
- * @param elAllowed
- */
- public TagAttributeHandler(final String customHandler, final String name,
- final boolean elAllowed)
- {
- super();
- _customHandler = customHandler;
- _elAllowed = elAllowed;
- _name = name;
- }
-
- public String getCustomHandler()
- {
- return _customHandler;
- }
-
- public String getName()
- {
- return _name;
- }
-
- public boolean isELAllowed()
- {
- return _elAllowed;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/view/model/common/TagElement.java b/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/view/model/common/TagElement.java
deleted file mode 100644
index fb04e6f..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/view/model/common/TagElement.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2008 Oracle Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Oracle Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.common.runtime.internal.view.model.common;
-
-import java.util.Map;
-
-/**
- * Abstract a tag element used to construct a view element
- *
- * @author cbateman
- *
- */
-public abstract class TagElement implements ITagElement
-{
- /**
- *
- */
- private static final long serialVersionUID = 7885641652240047924L;
-
- /* (non-Javadoc)
- * @see viewhandlerprototype.model.ITagElement#getName()
- */
- public abstract String getName();
-
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.jsf.common.runtime.internal.view.model.common.ITagElement#getUri()
- */
- public abstract String getUri();
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.jsf.common.runtime.internal.view.model.common.ITagElement#getTagHandlerClassName()
- */
- public abstract String getTagHandlerClassName();
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.jsf.common.runtime.internal.view.model.common.ITagElement#getAttributeHandlers()
- */
- public abstract Map getAttributeHandlers();
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.ui/.classpath b/jsf/plugins/org.eclipse.jst.jsf.common.ui/.classpath
deleted file mode 100644
index 304e861..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.ui/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="con" path="org.eclipse.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/jsf/plugins/org.eclipse.jst.jsf.common.ui/.cvsignore b/jsf/plugins/org.eclipse.jst.jsf.common.ui/.cvsignore
deleted file mode 100644
index 2a89e4b..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.ui/.cvsignore
+++ /dev/null
@@ -1,4 +0,0 @@
-bin
-@dot
-build.xml
-javaCompiler...args
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.ui/.project b/jsf/plugins/org.eclipse.jst.jsf.common.ui/.project
deleted file mode 100644
index 9615dd9..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.ui/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.jst.jsf.common.ui</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.ui/.settings/org.eclipse.jdt.core.prefs b/jsf/plugins/org.eclipse.jst.jsf.common.ui/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 9334e13..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.ui/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,82 +0,0 @@
-#Mon Jun 30 15:55:16 PDT 2008
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.doc.comment.support=enabled
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.autoboxing=warning
-org.eclipse.jdt.core.compiler.problem.deprecation=error
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=ignore
-org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
-org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled
-org.eclipse.jdt.core.compiler.problem.fieldHiding=warning
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=warning
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
-org.eclipse.jdt.core.compiler.problem.invalidJavadoc=error
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=enabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=disabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=disabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=protected
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=warning
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocComments=warning
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=protected
-org.eclipse.jdt.core.compiler.problem.missingJavadocTags=warning
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=protected
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=error
-org.eclipse.jdt.core.compiler.problem.nullReference=ignore
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
-org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=ignore
-org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
-org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=ignore
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=ignore
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=error
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=warning
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=error
-org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=error
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error
-org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.5
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.ui/.settings/org.eclipse.jdt.ui.prefs b/jsf/plugins/org.eclipse.jst.jsf.common.ui/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index 82eb6c1..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.ui/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Fri Apr 06 18:25:15 PDT 2007
-eclipse.preferences.version=1
-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8"?><templates/>
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.ui/.settings/org.eclipse.pde.prefs b/jsf/plugins/org.eclipse.jst.jsf.common.ui/.settings/org.eclipse.pde.prefs
deleted file mode 100644
index d9b486b..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.ui/.settings/org.eclipse.pde.prefs
+++ /dev/null
@@ -1,22 +0,0 @@
-#Fri May 30 11:46:32 PDT 2008
-compilers.f.unresolved-features=1
-compilers.f.unresolved-plugins=1
-compilers.incompatible-environment=1
-compilers.p.build=1
-compilers.p.deprecated=1
-compilers.p.discouraged-class=1
-compilers.p.internal=1
-compilers.p.missing-packages=0
-compilers.p.no-required-att=0
-compilers.p.not-externalized-att=0
-compilers.p.unknown-attribute=1
-compilers.p.unknown-class=1
-compilers.p.unknown-element=1
-compilers.p.unknown-identifier=1
-compilers.p.unknown-resource=1
-compilers.p.unresolved-ex-points=0
-compilers.p.unresolved-import=0
-compilers.s.create-docs=false
-compilers.s.doc-folder=doc
-compilers.s.open-tags=1
-eclipse.preferences.version=1
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.ui/META-INF/MANIFEST.MF b/jsf/plugins/org.eclipse.jst.jsf.common.ui/META-INF/MANIFEST.MF
deleted file mode 100644
index 075c0da..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.ui/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,36 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.jst.jsf.common.ui;singleton:=true
-Bundle-Version: 1.2.0.qualifier
-Bundle-Activator: org.eclipse.jst.jsf.common.ui.JSFUICommonPlugin
-Bundle-Localization: plugin
-Require-Bundle: org.eclipse.ui;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.ui.cheatsheets;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.help;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.jdt.core;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.core.resources;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.ui.forms;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.jdt.ui;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.ui.ide;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.draw2d;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.jface.text;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.jst.j2ee;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.wst.common.emf;bundle-version="[1.1.103,2.0.0)",
- org.eclipse.wst.common.project.facet.core;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.emf;bundle-version="[2.2.0,3.0.0)",
- org.eclipse.emf.common;bundle-version="[2.2.0,3.0.0)",
- org.eclipse.jst.jsf.common;bundle-version="[1.0.1,2.0.0)"
-Export-Package: org.eclipse.jst.jsf.common.ui;x-friends:="org.eclipse.jst.pagedesigner,org.eclipse.jst.pagedesigner.jsf.ui",
- org.eclipse.jst.jsf.common.ui.internal.actions;x-friends:="org.eclipse.jst.jsf.facesconfig.ui",
- org.eclipse.jst.jsf.common.ui.internal.dialogfield;x-friends:="org.eclipse.jst.pagedesigner,org.eclipse.jst.pagedesigner.jsf.ui",
- org.eclipse.jst.jsf.common.ui.internal.dialogs;x-friends:="org.eclipse.jst.pagedesigner",
- org.eclipse.jst.jsf.common.ui.internal.form;x-internal=true,
- org.eclipse.jst.jsf.common.ui.internal.guiutils;x-friends:="org.eclipse.jst.pagedesigner",
- org.eclipse.jst.jsf.common.ui.internal.logging;x-friends:="org.eclipse.jst.pagedesigner,org.eclipse.jst.pagedesigner.jsf.ui",
- org.eclipse.jst.jsf.common.ui.internal.preferences;x-internal=true,
- org.eclipse.jst.jsf.common.ui.internal.utils;x-friends:="org.eclipse.jst.pagedesigner,org.eclipse.jst.jsf.facesconfig.ui,org.eclipse.jst.pagedesigner.jsf.ui"
-Bundle-ActivationPolicy: lazy
-Bundle-Vendor: %pluginProvider
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.ui/about.html b/jsf/plugins/org.eclipse.jst.jsf.common.ui/about.html
deleted file mode 100644
index 3b20a36..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.ui/about.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
-
-<p>June, 2008</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.</p>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.ui/about.ini b/jsf/plugins/org.eclipse.jst.jsf.common.ui/about.ini
deleted file mode 100644
index a21a3ec..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.ui/about.ini
+++ /dev/null
@@ -1,29 +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=%blurb
-
-# Property "windowImage" contains path to window icon (16x16)
-# needed for primary features only
-
-# Property "featureImage" contains path to feature image (32x32)
-featureImage=eclipse32.gif
-
-# Property "aboutImage" contains path to product image (500x330 or 115x164)
-# needed for primary features only
-
-# Property "appName" contains name of the application (translated)
-# needed for primary features only
-
-# Property "welcomePage" contains path to welcome page (special XML-based format)
-# optional
-
-# Property "welcomePerspective" contains the id of the perspective in which the
-# welcome page is to be opened.
-# optional
-
-
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.ui/about.mappings b/jsf/plugins/org.eclipse.jst.jsf.common.ui/about.mappings
deleted file mode 100644
index 29ddddb..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.ui/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=200509071822
\ No newline at end of file
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.ui/about.properties b/jsf/plugins/org.eclipse.jst.jsf.common.ui/about.properties
deleted file mode 100644
index d7849b8..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.ui/about.properties
+++ /dev/null
@@ -1,27 +0,0 @@
-###############################################################################
-# Copyright (c) 2004, 2005 Sybase, Inc. and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# Sybase, Inc. - initial API and implementation
-###############################################################################
-#
-#
-
-
-# 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.
-
-blurb=JSF Faces Config Editor \n\
-\n\
-Version: {featureVersion}\n\
-Build id: {0}\n\
-\n\
-(c) Copyright Eclipse contributors and others. 2000, 2004. All rights reserved.\n\
-Visit http://www.eclipse.org/webtools/jsf
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.ui/build.properties b/jsf/plugins/org.eclipse.jst.jsf.common.ui/build.properties
deleted file mode 100644
index 2524004..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.ui/build.properties
+++ /dev/null
@@ -1,28 +0,0 @@
-###############################################################################
-# Copyright (c) 2001, 2007 Oracle Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# Oracle Corporation - initial API and implementation
-###############################################################################
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
- .,\
- plugin.xml,\
- about.html,\
- about.ini,\
- about.mappings,\
- about.properties,\
- bin/,\
- build.properties,\
- default.properties,\
- eclipse32.gif,\
- icons/,\
- plugin.properties,\
- schema/
-javacSource=1.5
-javacTarget=1.5
\ No newline at end of file
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.ui/default.properties b/jsf/plugins/org.eclipse.jst.jsf.common.ui/default.properties
deleted file mode 100644
index 82c5358..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.ui/default.properties
+++ /dev/null
@@ -1,52 +0,0 @@
-###############################################################################
-# Copyright (c) 2001, 2007 Oracle Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# Oracle Corporation - initial API and implementation
-###############################################################################
-# This file contains all the Default Preference Settings
-
-####################################################
-# Logging Preference Settings
-####################################################
-
-# Enable/Disable console logging.
-# Valid values: TRUE, FALSE
-console.logging.on=true
-
-# Maximum log level of console logging.
-# Valid values: DEBUG, INFO, WARN, ERROR, FATAL
-console.logging.max.level=INFO
-
-# Enable/Disable eclipse logging.
-# Valid values: TRUE, FALSE
-eclipse.logging.on=true
-
-# Maximum log level of eclipse logging.
-# Valid values: DEBUG, INFO, WARN, ERROR, FATAL
-eclipse.logging.max.level=INFO
-
-eclipse.pattern=%m
-
-# Enable/Disable file logging.
-# Valid values: TRUE, FALSE
-file.logging.on=true
-
-# Maximum log level of file logging.
-# Valid values: DEBUG, INFO, WARN, ERROR, FATAL
-file.logging.max.level=DEBUG
-
-# Clear log file when eclipse restarts.
-# Valid values: TRUE, FALSE
-file.logging.startup.clear=true
-
-# Location of log file
-file.logging.path=facesconfigeditor.log
-
-# Rollover frequency of log file.
-# Valid values: DAILY, WEEKLY, MONTHLY
-file.logging.rollover.frequency=DAILY
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.ui/eclipse32.gif b/jsf/plugins/org.eclipse.jst.jsf.common.ui/eclipse32.gif
deleted file mode 100644
index e6ad7cc..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.ui/eclipse32.gif
+++ /dev/null
Binary files differ
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.ui/icons/Editor_Help.gif b/jsf/plugins/org.eclipse.jst.jsf.common.ui/icons/Editor_Help.gif
deleted file mode 100644
index 03f656f..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.ui/icons/Editor_Help.gif
+++ /dev/null
Binary files differ
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.ui/icons/FacesConfig_GotoEditor.gif b/jsf/plugins/org.eclipse.jst.jsf.common.ui/icons/FacesConfig_GotoEditor.gif
deleted file mode 100644
index 0e5bcf6..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.ui/icons/FacesConfig_GotoEditor.gif
+++ /dev/null
Binary files differ
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.ui/icons/FacesConfig_Introduction.gif b/jsf/plugins/org.eclipse.jst.jsf.common.ui/icons/FacesConfig_Introduction.gif
deleted file mode 100644
index 44cd044..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.ui/icons/FacesConfig_Introduction.gif
+++ /dev/null
Binary files differ
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.ui/icons/FacesConfig_Tutorial.gif b/jsf/plugins/org.eclipse.jst.jsf.common.ui/icons/FacesConfig_Tutorial.gif
deleted file mode 100644
index ad8e5b6..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.ui/icons/FacesConfig_Tutorial.gif
+++ /dev/null
Binary files differ
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.ui/icons/PD_Palette_Default.gif b/jsf/plugins/org.eclipse.jst.jsf.common.ui/icons/PD_Palette_Default.gif
deleted file mode 100644
index 5e7fb33..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.ui/icons/PD_Palette_Default.gif
+++ /dev/null
Binary files differ
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.ui/icons/back_nav_16.gif b/jsf/plugins/org.eclipse.jst.jsf.common.ui/icons/back_nav_16.gif
deleted file mode 100644
index 740419b..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.ui/icons/back_nav_16.gif
+++ /dev/null
Binary files differ
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.ui/icons/configs.gif b/jsf/plugins/org.eclipse.jst.jsf.common.ui/icons/configs.gif
deleted file mode 100644
index c984fba..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.ui/icons/configs.gif
+++ /dev/null
Binary files differ
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.ui/icons/form_banner.gif b/jsf/plugins/org.eclipse.jst.jsf.common.ui/icons/form_banner.gif
deleted file mode 100644
index aebc0b2..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.ui/icons/form_banner.gif
+++ /dev/null
Binary files differ
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.ui/icons/forward_nav_16.gif b/jsf/plugins/org.eclipse.jst.jsf.common.ui/icons/forward_nav_16.gif
deleted file mode 100644
index 7a1511d..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.ui/icons/forward_nav_16.gif
+++ /dev/null
Binary files differ
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.ui/icons/help.gif b/jsf/plugins/org.eclipse.jst.jsf.common.ui/icons/help.gif
deleted file mode 100644
index 9d70301..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.ui/icons/help.gif
+++ /dev/null
Binary files differ
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.ui/icons/jsf_converter.gif b/jsf/plugins/org.eclipse.jst.jsf.common.ui/icons/jsf_converter.gif
deleted file mode 100644
index 16466ed..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.ui/icons/jsf_converter.gif
+++ /dev/null
Binary files differ
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.ui/icons/jsf_validator.gif b/jsf/plugins/org.eclipse.jst.jsf.common.ui/icons/jsf_validator.gif
deleted file mode 100644
index 86196e9..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.ui/icons/jsf_validator.gif
+++ /dev/null
Binary files differ
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.ui/icons/jsf_view.gif b/jsf/plugins/org.eclipse.jst.jsf.common.ui/icons/jsf_view.gif
deleted file mode 100644
index c81630a..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.ui/icons/jsf_view.gif
+++ /dev/null
Binary files differ
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.ui/icons/object.gif b/jsf/plugins/org.eclipse.jst.jsf.common.ui/icons/object.gif
deleted file mode 100644
index 061161a..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.ui/icons/object.gif
+++ /dev/null
Binary files differ
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.ui/icons/overview_obj.gif b/jsf/plugins/org.eclipse.jst.jsf.common.ui/icons/overview_obj.gif
deleted file mode 100644
index 03f656f..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.ui/icons/overview_obj.gif
+++ /dev/null
Binary files differ
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.ui/icons/refresh_nav_16.gif b/jsf/plugins/org.eclipse.jst.jsf.common.ui/icons/refresh_nav_16.gif
deleted file mode 100644
index a063c23..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.ui/icons/refresh_nav_16.gif
+++ /dev/null
Binary files differ
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.ui/icons/reload_nav_16.gif b/jsf/plugins/org.eclipse.jst.jsf.common.ui/icons/reload_nav_16.gif
deleted file mode 100644
index d71dfff..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.ui/icons/reload_nav_16.gif
+++ /dev/null
Binary files differ
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.ui/icons/stop_nav_16.gif b/jsf/plugins/org.eclipse.jst.jsf.common.ui/icons/stop_nav_16.gif
deleted file mode 100644
index 4eb53ec..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.ui/icons/stop_nav_16.gif
+++ /dev/null
Binary files differ
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.ui/plugin.properties b/jsf/plugins/org.eclipse.jst.jsf.common.ui/plugin.properties
deleted file mode 100644
index 3549ea3..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.ui/plugin.properties
+++ /dev/null
@@ -1,16 +0,0 @@
-###############################################################################
-# Copyright (c) 2001, 2007 Oracle Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# Oracle Corporation - initial API and implementation
-###############################################################################
-
-pluginName=JavaServer Faces Tools - Common UI
-pluginProvider=Eclipse.org
-
-extension-point.name.0 = Introduction Page
-extension-point.name.1 = OverviewPage
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.ui/plugin.xml b/jsf/plugins/org.eclipse.jst.jsf.common.ui/plugin.xml
deleted file mode 100644
index 435be3a..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.ui/plugin.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.2"?>
-<plugin>
- <extension-point id="introductionPage" name="%extension-point.name.0" schema="schema/introductionPage.exsd"/>
- <extension-point id="overviewPage" name="%extension-point.name.1" schema="schema/overviewPage.exsd"/>
-</plugin>
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.ui/schema/introductionPage.exsd b/jsf/plugins/org.eclipse.jst.jsf.common.ui/schema/introductionPage.exsd
deleted file mode 100644
index d147b34..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.ui/schema/introductionPage.exsd
+++ /dev/null
@@ -1,213 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.jst.jsf.common.ui">
-<annotation>
- <appInfo>
- <meta.schema plugin="org.eclipse.jst.jsf.common.ui" id="introductionPage" name="Introduction Page"/>
- </appInfo>
- <documentation>
- The purpose of this extension point is to allow plug-ins to describe the contents and links on a introduction page of an editor.
- </documentation>
- </annotation>
-
- <element name="extension">
- <complexType>
- <sequence>
- <element ref="introductionpage"/>
- </sequence>
- <attribute name="point" type="string" use="required">
- <annotation>
- <documentation>
- a fully qualified identifier of the target extension point.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="id" type="string" use="required">
- <annotation>
- <documentation>
- identifier of the extension instance, this should be the same as the editor id.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="name" type="string">
- <annotation>
- <documentation>
- an optional name of the extension instance. Normally this is the editor name.
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <element name="introductionpage">
- <annotation>
- <documentation>
- The details for an introduction page for a specific plugins editor
- </documentation>
- </annotation>
- <complexType>
- <sequence>
- <element ref="introductionelement" minOccurs="1" maxOccurs="unbounded"/>
- </sequence>
- <attribute name="name" type="string" use="required">
- <annotation>
- <documentation>
- The name of the page.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="description" type="string">
- <annotation>
- <documentation>
- A description for the page.
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <element name="introductionelement">
- <annotation>
- <documentation>
- An element that make up a section of the page. Elements can contain Headers, Hyperlinks, Icons and text.
- </documentation>
- </annotation>
- <complexType>
- <attribute name="icon" type="string">
- <annotation>
- <documentation>
- An icon to display in the element. The icon should be 72x72 and will appear to the left of the headers, hyperlinks and text
- </documentation>
- <appInfo>
- <meta.attribute kind="resource"/>
- </appInfo>
- </annotation>
- </attribute>
- <attribute name="heading" type="string">
- <annotation>
- <documentation>
- A short heading for the element (optional)
- </documentation>
- </annotation>
- </attribute>
- <attribute name="text" type="string">
- <annotation>
- <documentation>
- The text description for the element
- </documentation>
- </annotation>
- </attribute>
- <attribute name="hyperlink" type="string">
- <annotation>
- <documentation>
- A hyperlink associated with the element. The hyperlink would normally execute the hyperlinkaction action
- </documentation>
- </annotation>
- </attribute>
- <attribute name="hyperlinkaction" type="string">
- <annotation>
- <documentation>
- The action associated with the hyperlink. This is an action that will be executed when the hyperlink is selected
- </documentation>
- <appInfo>
- <meta.attribute kind="java"/>
- </appInfo>
- </annotation>
- </attribute>
- <attribute name="actionparameters" type="string">
- <annotation>
- <documentation>
- Can be used to pass one or more parameters to the hyperlink action. Parameter must be space separated (optional)
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <annotation>
- <appInfo>
- <meta.section type="since"/>
- </appInfo>
- <documentation>
- 1.0.0
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="examples"/>
- </appInfo>
- <documentation>
- <extension
- id="org.eclipse.jst.jsf.facesconfig.ui.pageflow.PageflowEditor"
- name="%pageflow.editor.intro.name"
- point="org.eclipse.jst.jsf.facesconfig.ui.page.introductionPage">
- <introductionpage
- name="%pageflow.editor.intro.name"
- description="%port.editor.intro.description">
- <introductionelement
- icon="icons/pageflow_72.gif"
- heading="%pageflow.editor.intro.heading"
- text="%pageflow.editor.intro.description">
- </introductionelement>
- <introductionelement
- actionparameters="Pageflow.designerCheatSheet"
- icon="icons/tutorials_72.gif"
- hyperlinkaction="org.eclipse.jst.jsf.common.ui.actions.LoadCheatSheetAction"
- text="%pageflow.editor.intro.cheatsheets.text"
- hyperlink="%pageflow.editor.intro.cheatsheets.link">
- </introductionelement>
- <introductionelement
- actionparameters="http://www.eclipse.org"
- icon="icons/overview_72.gif"
- hyperlinkaction="org.eclipse.jst.jsf.common.ui.actions.LoadHelpAction"
- text="%pageflow.editor.intro.help.text"
- hyperlink="%pageflow.editor.intro.help.link">
- </introductionelement>
- <introductionelement
- actionparameters="overview"
- icon="icons/gotoeditor_72.gif"
- hyperlinkaction="org.eclipse.jst.jsf.common.ui.actions.OpenPageAction"
- text="%pageflow.editor.intro.start.text"
- hyperlink="%pageflow.editor.intro.start.link">
- </introductionelement>
- </introductionpage>
- </extension>
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="apiInfo"/>
- </appInfo>
- <documentation>
-
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="implementation"/>
- </appInfo>
- <documentation>
-
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="copyright"/>
- </appInfo>
- <documentation>
- Copyright (c) 2004, 2006 Sybase, Inc. and others. <br>
- All rights reserved. This program and the accompanying materials <br>
- are made available under the terms of the Eclipse Public License v1.0 <br>
- which accompanies this distribution, and is available at <br>
- http://www.eclipse.org/legal/epl-v10.html <br>
-
- Contributors: <br>
- Sybase, Inc. - initial API and implementation <br>
- </documentation>
- </annotation>
-
-</schema>
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.ui/schema/overviewPage.exsd b/jsf/plugins/org.eclipse.jst.jsf.common.ui/schema/overviewPage.exsd
deleted file mode 100644
index c55436b..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.ui/schema/overviewPage.exsd
+++ /dev/null
@@ -1,213 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.jst.jsf.common.ui">
-<annotation>
- <appInfo>
- <meta.schema plugin="org.eclipse.jst.jsf.common.ui" id="overviewPage" name="Overview Page"/>
- </appInfo>
- <documentation>
- The purpose of this extension point is to allow plug-ins to describe the contents and links on a overview page of an editor.
- </documentation>
- </annotation>
-
- <element name="extension">
- <complexType>
- <sequence>
- <element ref="overviewpage"/>
- </sequence>
- <attribute name="point" type="string" use="required">
- <annotation>
- <documentation>
- a fully qualified identifier of the target extension point.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="id" type="string" use="required">
- <annotation>
- <documentation>
- identifier of the extension instance, this should be the same as the editor id.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="name" type="string">
- <annotation>
- <documentation>
- an optional name of the extension instance. Normally this is the editor name.
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <element name="overviewpage">
- <annotation>
- <documentation>
- The details for an overview page for a specific plugins editor
- </documentation>
- </annotation>
- <complexType>
- <sequence>
- <element ref="overviewelement" minOccurs="1" maxOccurs="unbounded"/>
- </sequence>
- <attribute name="name" type="string" use="required">
- <annotation>
- <documentation>
- The name of the page.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="description" type="string">
- <annotation>
- <documentation>
- A description for the page.
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <element name="overviewelement">
- <annotation>
- <documentation>
- An element that make up a section of the page. Elements can contain Headers, Hyperlinks, Icons and text.
- </documentation>
- </annotation>
- <complexType>
- <attribute name="icon" type="string">
- <annotation>
- <documentation>
- An icon to display in the element. The icon should be 72x72 and will appear to the left of the headers, hyperlinks and text
- </documentation>
- <appInfo>
- <meta.attribute kind="resource"/>
- </appInfo>
- </annotation>
- </attribute>
- <attribute name="heading" type="string">
- <annotation>
- <documentation>
- A short heading for the element (optional)
- </documentation>
- </annotation>
- </attribute>
- <attribute name="text" type="string">
- <annotation>
- <documentation>
- The text description for the element
- </documentation>
- </annotation>
- </attribute>
- <attribute name="hyperlink" type="string">
- <annotation>
- <documentation>
- A hyperlink associated with the element. The hyperlink would normally execute the hyperlinkaction action
- </documentation>
- </annotation>
- </attribute>
- <attribute name="hyperlinkaction" type="string">
- <annotation>
- <documentation>
- The action associated with the hyperlink. This is an action that will be executed when the hyperlink is selected
- </documentation>
- <appInfo>
- <meta.attribute kind="java"/>
- </appInfo>
- </annotation>
- </attribute>
- <attribute name="actionparameters" type="string">
- <annotation>
- <documentation>
- Can be used to pass one or more parameters to the hyperlink action. Parameter must be space separated (optional)
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <annotation>
- <appInfo>
- <meta.section type="since"/>
- </appInfo>
- <documentation>
- 1.0.0
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="examples"/>
- </appInfo>
- <documentation>
- <extension
- id="org.eclipse.jst.jsf.facesconfig.ui.pageflow.PageflowEditor"
- name="%pageflow.editor.intro.name"
- point="org.eclipse.jst.jsf.facesconfig.ui.page.overviewPage">
- <overviewpage
- name="%pageflow.editor.intro.name"
- description="%port.editor.intro.description">
- <overviewelement
- icon="icons/pageflow_72.gif"
- heading="%pageflow.editor.intro.heading"
- text="%pageflow.editor.intro.description">
- </overviewelement>
- <overviewelement
- actionparameters="Pageflow.designerCheatSheet"
- icon="icons/tutorials_72.gif"
- hyperlinkaction="org.eclipse.jst.jsf.common.ui.actions.LoadCheatSheetAction"
- text="%pageflow.editor.intro.cheatsheets.text"
- hyperlink="%pageflow.editor.intro.cheatsheets.link">
- </overviewelement>
- <overviewelement
- actionparameters="http://www.eclipse.org"
- icon="icons/overview_72.gif"
- hyperlinkaction="org.eclipse.jst.jsf.common.ui.actions.LoadHelpAction"
- text="%pageflow.editor.intro.help.text"
- hyperlink="%pageflow.editor.intro.help.link">
- </overviewelement>
- <overviewelement
- actionparameters="overview"
- icon="icons/gotoeditor_72.gif"
- hyperlinkaction="org.eclipse.jst.jsf.common.ui.actions.OpenPageAction"
- text="%pageflow.editor.intro.start.text"
- hyperlink="%pageflow.editor.intro.start.link">
- </overviewelement>
- </overviewpage>
- </extension>
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="apiInfo"/>
- </appInfo>
- <documentation>
-
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="implementation"/>
- </appInfo>
- <documentation>
-
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="copyright"/>
- </appInfo>
- <documentation>
- Copyright (c) 2004, 2006 Sybase, Inc. and others. <br>
- All rights reserved. This program and the accompanying materials <br>
- are made available under the terms of the Eclipse Public License v1.0 <br>
- which accompanies this distribution, and is available at <br>
- http://www.eclipse.org/legal/epl-v10.html <br>
-
- Contributors: <br>
- Sybase, Inc. - initial API and implementation <br>
- </documentation>
- </annotation>
-
-</schema>
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/CommonResources.properties b/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/CommonResources.properties
deleted file mode 100644
index b9527d1..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/CommonResources.properties
+++ /dev/null
@@ -1,113 +0,0 @@
-###############################################################################
-# Copyright (c) 2001, 2007 Oracle Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# Oracle Corporation - initial API and implementation
-###############################################################################
-####################################################
-# Generic Strings for UI
-####################################################
-
-pluginName=Web Application Development Common
-button.save=&Save
-button.remove=&Remove
-
-####################################################
-# Resource message for Logging
-####################################################
-
-log.msg={0}
-
-log.ResourceUtils=Missing Resource Bundle "{0}".
-log.CommonPlugin=Web Application Development Common Plugin initialized on eclipse version {0}.
-log.FavoriteConfigurations.save.error=Failed to save {0} favorites. File={1}
-log.FavoriteConfigurations.read.error=Failed to read {0} favorites. File={1}
-log.CommonPlugin.image.error=Image {0} not found.
-
-log.IntroductionSection.action.error = Failed to launch the link {0}
-
-####################################################
-# Resource message for Alerts
-####################################################
-
-alert.msg={0}
-
-####################################################
-# Resource messages for FavoriteSection
-####################################################
-favorites.group.label=Favorite Configurations
-favorites.label=&Name:
-favorites.tooltip=Construct common setting favorites for this page.
-favorites.save.tooltip=Save the current options on this page as the favorites.
-favorites.remove.tooltip=Remove the current favorite.
-favorites.default=default
-
-####################################################
-# Resource messages for Preference Pages
-####################################################
-JMTPreferencePage.Description=Expand the tree to edit Web Application preferences.
-
-LoggingPreferencePage.Log.Level.label=Log Level:
-LoggingPreferencePage.Log.Level.tooltip=Select the logging level to output to the selected source.
-LoggingPreferencePage.Log.Level.debug=Debug
-LoggingPreferencePage.Log.Level.info=Info
-LoggingPreferencePage.Log.Level.warn=Warn
-LoggingPreferencePage.Log.Level.error=Error
-LoggingPreferencePage.Log.Level.fatal=Fatal
-LoggingPreferencePage.Console.Group.label=Console
-LoggingPreferencePage.Console.Logging.label=Enable &Console Logging
-LoggingPreferencePage.Console.Logging.tooltip=Receive log message in the Eclipse Console view.
-LoggingPreferencePage.Eclipse.Group.label=Eclipse
-LoggingPreferencePage.Eclipse.Logging.label=Enable &Eclipse Logging
-LoggingPreferencePage.Eclipse.Logging.tooltip=Receive log message in the Eclipse Error Log view.
-LoggingPreferencePage.File.Group.label=File
-LoggingPreferencePage.File.Logging.label=Enable &File Logging
-LoggingPreferencePage.File.Logging.tooltip=Write log message to an external file.
-LoggingPreferencePage.File.clearing.label=Clear log file on &startup
-LoggingPreferencePage.File.clearing.tooltip=Each time Eclipse starts, clear the log file.
-LoggingPreferencePage.File.path.label=&Log file:
-LoggingPreferencePage.File.path.tooltip=Where should the log file go? Partial paths are \n based from: /workspace/.metadata/.plugins/org.eclipse.jst.jsf.common.ui.internal/.
-LoggingPreferencePage.File.button.label=B&rowse
-LoggingPreferencePage.File.button.tooltip=Select a location and file name for file logging.
-LoggingPreferencePage.File.select.label=Select a log file
-LoggingPreferencePage.File.Rollover.Frequency.label=Rollover Fre&quency:
-LoggingPreferencePage.File.Rollover.Frequency.tooltip=Select the frequency of how often to generate a new log file. \n The original log file is appended with a timestamp.
-LoggingPreferencePage.File.Rollover.Frequency.daily=Daily
-LoggingPreferencePage.File.Rollover.Frequency.weekly=Weekly
-LoggingPreferencePage.File.Rollover.Frequency.monthly=Monthly
-
-####################################################
-# Resource messages for BrowserWindow
-####################################################
-BrowserWindow.back.tooltip=Navigate back in the browser
-BrowserWindow.forward.tooltip=Navigate forward in the browser
-BrowserWindow.stop.tooltip=Stop browser navigation
-BrowserWindow.refresh.tooltip=Refresh the browser
-BrowserWindow.reload.tooltip=Reload the browser
-
-####################################################
-# Resource messages for Commmon DialogField
-####################################################
-DialogField.JavaClassWizard.NewClass=New Java Class
-DialogField.ClassButton.SelectType=Select Type
-DialogField.Browse=Browse...
-DialogField.ResourceButton.SelectFile=Select File
-
-####################################################
-# Resource messages for Commmon Dialog
-####################################################
-Dialog.ResourceOnClasspathDialog.StatusMessage=Select a properties file
-Dialog.CommonResourceDialog.StatusMessage0=Select
-Dialog.TreeViewerSelectionDialog.DefaultTitle=Select a File
-
-Wizards.NewPage.Error.InvalidProject=Invalid Web project.
-Error.FileFilter.title=File selection
-Error.ImgFileFilter.error=File selection error:
-Error.ProjectFileDialogContentProvider=Project file dialog error: {0}
-Error.RefreshingLocal=Refreshing local
-
-Service.NoResourceError=Unable to determine Service Model file.
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/IFileFolderConstants.java b/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/IFileFolderConstants.java
deleted file mode 100644
index e74e90a..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/IFileFolderConstants.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.common.ui;
-
-/**
- * @author mengbo
- * @version 1.5
- */
-public interface IFileFolderConstants {
-
- /**
- * the dot character
- */
- public static final String DOT = "."; //$NON-NLS-1$
-
- /**
- * the path separator
- */
- public static final String PATH_SEPARATOR = "/"; //$NON-NLS-1$
-
- /** file extensions */
- /**
- * class file extension
- */
- public static final String EXT_CLASS = "class"; //$NON-NLS-1$
-
- /**
- * jar file extension
- */
- public static final String EXT_JAR = "jar"; //$NON-NLS-1$
-
- /**
- * java file extension
- */
- public static final String EXT_JAVA = "java"; //$NON-NLS-1$
-
-
- /**
- * jsp file extension
- */
- public static final String EXT_JSP = "jsp"; //$NON-NLS-1$
-
- /**
- * properties file extension
- */
- public static final String EXT_PROPERTIES = "properties"; //$NON-NLS-1$
-
- /**
- * taglib file extension
- */
- public static final String EXT_TAGLIB = "tld"; //$NON-NLS-1$
-
- /**
- * standard web.xml file name
- */
- public static final String FILE_WEB_XML = "web.xml"; //$NON-NLS-1$
-
- /** folders */
-
- /**
- * classes folder name
- */
- public static final String FOLDER_CLASS = "classes"; //$NON-NLS-1$
-
- /**
- * icons folder name
- */
- public static final String FOLDER_ICONS = "icons"; //$NON-NLS-1$
-
- /**
- * the meta-inf folder name
- */
- public static final String FOLDER_METAINF = "META-INF"; //$NON-NLS-1$
-
- /**
- * the src folder name
- */
- public static final String FOLDER_SOURCE = "src"; //$NON-NLS-1$
-
- /**
- * the web-inf folder name
- */
- public static final String FOLDER_WEBINF = "WEB-INF"; //$NON-NLS-1$
-
- /** the webroot folder depth relative to the project */
- public static final int WEBROOT_FOLDER_DEPTH = 2;
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/JSFUICommonPlugin.java b/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/JSFUICommonPlugin.java
deleted file mode 100644
index b4a1f00..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/JSFUICommonPlugin.java
+++ /dev/null
@@ -1,418 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.common.ui;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.MissingResourceException;
-import java.util.Properties;
-import java.util.ResourceBundle;
-
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.resource.ImageRegistry;
-import org.eclipse.jst.jsf.common.ui.internal.guiutils.Alerts;
-import org.eclipse.jst.jsf.common.ui.internal.logging.Logger;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.Version;
-
-/**
- * The main plugin class to be used in the desktop.
- */
-public class JSFUICommonPlugin extends AbstractUIPlugin {
- // Properties contains general properties and defaults to preferences.
- private static final String PROPERTIES = "default.properties"; //$NON-NLS-1$
- // preferences will
- // contain this string
- // in the key.
-
- private static final String P_CONSOLE_LOGGING = "console.logging.on"; //$NON-NLS-1$
-
- private static final String P_CONSOLE_LOG_LEVEL = "console.logging.max.level"; //$NON-NLS-1$
-
- private static final String P_ECLIPSE_LOGGING = "eclipse.logging.on"; //$NON-NLS-1$
-
- private static final String P_ECLIPSE_LOG_LEVEL = "eclipse.logging.max.level"; //$NON-NLS-1$
-
- private static final String P_FILE_LOGGING = "file.logging.on"; //$NON-NLS-1$
-
- private static final String P_FILE_LOG_LEVEL = "file.logging.max.level"; //$NON-NLS-1$
-
- private static final String P_FILE_PATH = "file.logging.path"; //$NON-NLS-1$
-
- private static final String P_FILE_CLEAR = "file.logging.startup.clear"; //$NON-NLS-1$
-
- private static final String P_FILE_ROLLOVER_FREQUENCY = "file.logging.rollover.frequency"; //$NON-NLS-1$
-
- private static final int DEBUG_LEVEL = 0;
-
- private static final int INFO_LEVEL = 1;
-
- private static final int WARN_LEVEL = 2;
-
- private static final int ERROR_LEVEL = 3;
-
- private static final int FATAL_LEVEL = 4;
-
- // What version of the platform are we on.
- private static boolean TWO_DOT_ONE;
-
- private static boolean THREE_DOT;
-
- private static String _version;
-
- // The shared instance.
- private static JSFUICommonPlugin _plugin;
-
- private Logger _log;
-
- private ResourceBundle _resourceBundle;
-
- private Properties _properties;
-
- private URL _pluginBase;
-
- private static Alerts _alerts;
-
- /**
- * The constructor.
- */
- public JSFUICommonPlugin() {
- super();
- _plugin = this;
- versionCheck();
- }
-
- private void versionCheck() {
- String version = (String) ResourcesPlugin.getPlugin().getBundle()
- .getHeaders().get(org.osgi.framework.Constants.BUNDLE_VERSION);
- Version identifier = new Version(version);
-
- TWO_DOT_ONE = ((identifier.getMajor() == 2) && (identifier
- .getMinor() == 1));
- THREE_DOT = (identifier.getMajor() == 3);
- _version = identifier.toString();
- }
-
- /**
- * This method is called upon plug-in activation
- */
- public void start(BundleContext context) throws Exception {
- super.start(context);
-
- // This plugin is for 3.0 only, do a version check.
- if (isThreeDot() == false) {
- throw new CoreException(new Status(IStatus.ERROR, getBundle()
- .getSymbolicName(), IStatus.OK,
- "Requires eclipse version 3.x", null)); //$NON-NLS-1$
- }
-
- try {
- // get resource bundle.
- _resourceBundle = ResourceBundle
- .getBundle("org.eclipse.jst.jsf.common.ui.CommonResources"); //$NON-NLS-1$
- _alerts = new Alerts(this, _resourceBundle);
-
- // get properties.
- _properties = new Properties();
- InputStream input = null;
- _pluginBase = getBundle().getEntry("/"); //$NON-NLS-1$
- try {
- input = (new URL(_pluginBase, PROPERTIES)).openStream();
- _properties.load(input);
- } finally {
- try {
- input.close();
- } catch (IOException ee)// NOPMD
- {
- // nothing to do when IOException throwed in closing files.
- }
- }
-
- // set up logging for this plugin and everthing under it.
- _log = new Logger(this.getBundle(), _resourceBundle);
-
- // NOTE: add in any other plugin code statup HERE!!!!
-
- // log.CommonPlugin=Web Application Development Common Plugin
- // initialized on eclipse version {0}.
-
- // log.info("log.CommonPlugin", version);
-
- } catch (Exception ee) {
- // only log if the logger was configured correctly.
- if (_log != null) {
- _log
- .error(
- "log.msg", //$NON-NLS-1$
- "Problems starting plug-in Web Application Development Common.", //$NON-NLS-1$
- ee);
- }
-
- throw new CoreException(
- new Status(
- IStatus.ERROR,
- getBundle().getSymbolicName(),
- IStatus.OK,
- "Problems starting plug-in Web Application Development Common", //$NON-NLS-1$
- ee));
- }
- }
-
- /**
- * Returns the shared instance.
- * @return the plugin instance
- */
- public static JSFUICommonPlugin getDefault() {
- return _plugin;
- }
-
- /**
- * get the alerts objects associated with this plugin for alerting the user.
- *
- * @return the alerts object
- */
- public static Alerts getAlerts() {
- return _alerts;
- }
-
- /**
- * Returns a logger for the new class using this plugin for reference.
- * @param theClass
- * @return the logger
- */
- // TODO: theClass is never used!!
- public static Logger getLogger(Class theClass) {
- return getDefault().getRootLogger();
- }
-
- /**
- * Returns the plugin's root logger
- * @return the root logger
- */
- public Logger getRootLogger() {
- return _log;
- }
-
- /**
- * Returns this plugin's unique identifier
- *
- * @return this plugin's unique identifier
- *
- */
- public static String getPluginId() {
- return getDefault().getBundle().getSymbolicName();
- }
-
- /**
- * Returns the plugin's resource bundle,
- * @return the resource bundle
- */
- public ResourceBundle getResourceBundle() {
- return _resourceBundle;
- }
-
- /**
- * Returns the string from the plugin's resource bundle, or 'key' if not
- * found.
- * @param key
- * @return the resource string
- */
- public static String getResourceString(String key) {
- ResourceBundle bundle = JSFUICommonPlugin.getDefault().getResourceBundle();
- try {
- return (bundle != null) ? bundle.getString(key) : key;
- } catch (MissingResourceException e) {
- return key;
- }
- }
-
- /**
- * Returns the plugin's descriptor's resource bundle,
- * @return the bundle
- */
- public ResourceBundle getPluginDecriptorBundle() {
- return Platform.getResourceBundle(getDefault().getBundle());
- }
-
- /**
- * Returns the plugin's default properties. These are normally used for
- * default preferences.
- * @return the properties
- */
- public Properties getProperties() {
- return _properties;
- }
-
- /**
- * Returns a shared image for the given name
- * <p>
- * Note: Images returned from this method will be automitically disposed of
- * when this plug-in shuts down. Callers must not dispose of these images
- * themselves.
- * </p>
- *
- * @param name
- * the image name found in /icons (with extension)
- * @return the image, null on error or not found.
- */
- public Image getImage(String name) {
- if (name == null) {
- return null;
- }
-
- ImageRegistry images = getImageRegistry();
- Image image = images.get(name);
- if (image == null) {
- try {
- ImageDescriptor id = ImageDescriptor.createFromURL(new URL(
- _pluginBase, "icons/" + name)); //$NON-NLS-1$
- images.put(name, id);
-
- image = images.get(name);
- } catch (MalformedURLException ee) {
- // log.CommonPlugin.image.error=Image {0} not found.
- _log.error("log.msg", "log.CommonPlugin.image.error", name, ee); //$NON-NLS-1$ //$NON-NLS-2$
- }
- }
- return image;
- }
-
- /**
- * Returns a shared ImageDescriptor for the given name
- * <p>
- * Note: ImageDescriptor returned from this method will be automitically
- * disposed of when this plug-in shuts down. Callers must not dispose of
- * these ImageDescriptor themselves.
- * </p>
- *
- * @param name
- * the ImageDescriptor name found in /icons (with extension)
- * @return the ImageDescriptor, null on error or not found.
- */
- public ImageDescriptor getImageDescriptor(String name) {
- if (name == null) {
- return null;
- }
-
- ImageRegistry images = getImageRegistry();
- ImageDescriptor id = images.getDescriptor(name);
- if (id == null) {
- try {
- id = ImageDescriptor.createFromURL(new URL(_pluginBase,
- "icons/" + name)); //$NON-NLS-1$
- images.put(name, id);
- } catch (MalformedURLException ee) {
- // log.CommonPlugin.image.error=Image {0} not found.
- _log.error("log.msg", "log.CommonPlugin.image.error", name, ee); //$NON-NLS-1$ //$NON-NLS-2$
- }
- }
- return id;
- }
-
- /**
- * Is this eclipse version 2.1
- *
- * @return true if version is 2.1
- */
- public static boolean isTwoDotOne() {
- return TWO_DOT_ONE;
- }
-
- /**
- * Is this eclipse version 3.x
- *
- * @return true if version is 3.x
- */
- public static boolean isThreeDot() {
- return THREE_DOT;
- }
-
- /**
- * get the eclipse version
- *
- * @return version string.
- */
- public static String getVersion() {
- return _version;
- }
-
-
-
- /**
- * Initializes the preference controls to the default values. These values
- * are used the first time the preference page is displayed or when the user
- * presses the Defaults button in the preferences page.
- */
- protected void initializeDefaultPreferences(IPreferenceStore store) {
- // NOTE: no logging can happen here since we haven't initialized logging
- // yet because it
- // depends on preferences!!!!
-
- store.setDefault(P_CONSOLE_LOGGING, _properties.getProperty(
- P_CONSOLE_LOGGING, Boolean.TRUE.toString()));
- store.setDefault(P_CONSOLE_LOG_LEVEL, strToIntLogLevel(_properties
- .getProperty(P_CONSOLE_LOG_LEVEL, "ERROR"))); //$NON-NLS-1$
-
- store.setDefault(P_ECLIPSE_LOGGING, _properties.getProperty(
- P_ECLIPSE_LOGGING, Boolean.TRUE.toString()));
- store.setDefault(P_ECLIPSE_LOG_LEVEL, strToIntLogLevel(_properties
- .getProperty(P_ECLIPSE_LOG_LEVEL, "ERROR"))); //$NON-NLS-1$
-
- store.setDefault(P_FILE_LOGGING, _properties.getProperty(
- P_FILE_LOGGING, Boolean.FALSE.toString()));
- store.setDefault(P_FILE_LOG_LEVEL, strToIntLogLevel(_properties
- .getProperty(P_FILE_LOG_LEVEL, "ERROR"))); //$NON-NLS-1$
- store.setDefault(P_FILE_PATH, _properties.getProperty(P_FILE_PATH, "")); //$NON-NLS-1$
- store.setDefault(P_FILE_CLEAR, _properties.getProperty(P_FILE_CLEAR,
- Boolean.TRUE.toString()));
- store.setDefault(P_FILE_ROLLOVER_FREQUENCY, _properties.getProperty(
- P_FILE_ROLLOVER_FREQUENCY, "DAILY")); //$NON-NLS-1$
- }
-
- /**
- * Converts the log level from string to int. The level defaults to
- * ERROR_LEVEL.
- *
- * @param str
- * String representation of log level
- * @return integer representation of log level
- */
- private int strToIntLogLevel(String str) {
- if (str == null) {
- return ERROR_LEVEL;
- }
- if (str.equalsIgnoreCase("DEBUG")) { //$NON-NLS-1$
- return DEBUG_LEVEL;
- }
- if (str.equalsIgnoreCase("INFO")) { //$NON-NLS-1$
- return INFO_LEVEL;
- }
- if (str.equalsIgnoreCase("WARN")) { //$NON-NLS-1$
- return WARN_LEVEL;
- }
- if (str.equalsIgnoreCase("FATAL")) { //$NON-NLS-1$
- return FATAL_LEVEL;
- }
- return ERROR_LEVEL;
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/actions/IOpenPage.java b/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/actions/IOpenPage.java
deleted file mode 100644
index 8456083..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/actions/IOpenPage.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.common.ui.internal.actions;
-
-/**
- * Editors should implement this if they can handle reseting to a page based on
- * the class defined for that page.
- *
- * @author collinsc,jchoi
- */
-public interface IOpenPage {
- /**
- * Sets the currently active page from the id of the page.
- *
- * @param pageID
- */
- public void setActiveEditorPage(String pageID);
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/actions/LoadCheatSheetAction.java b/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/actions/LoadCheatSheetAction.java
deleted file mode 100644
index de7406f..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/actions/LoadCheatSheetAction.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.common.ui.internal.actions;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExecutableExtension;
-import org.eclipse.jface.action.Action;
-import org.eclipse.ui.cheatsheets.OpenCheatSheetAction;
-
-/**
- * This class is used to open the cheat sheet based on the configuration
- * parameter.
- *
- * @author mengbo
- */
-public class LoadCheatSheetAction extends Action implements
- IExecutableExtension {
- private String _cheatSheetName = null;
-
- /**
- *
- */
- public LoadCheatSheetAction() {
- super();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.action.IAction#run()
- */
- public void run() {
- if (_cheatSheetName != null) {
- OpenCheatSheetAction action = new OpenCheatSheetAction(
- _cheatSheetName);
- action.run();
- }
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.core.runtime.IExecutableExtension#setInitializationData(org.eclipse.core.runtime.IConfigurationElement,
- * java.lang.String, java.lang.Object)
- */
- public void setInitializationData(IConfigurationElement config,
- String propertyName, Object data) throws CoreException {
- _cheatSheetName = config.getAttribute("actionparameters"); //$NON-NLS-1$
- }
-
- /**
- * set the cheatSheetName name to open.
- *
- * @param cheatSheetName
- */
- public void setCheatSheetName(String cheatSheetName) {
- _cheatSheetName = cheatSheetName;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/actions/LoadHelpAction.java b/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/actions/LoadHelpAction.java
deleted file mode 100644
index 18b927d..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/actions/LoadHelpAction.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.common.ui.internal.actions;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExecutableExtension;
-import org.eclipse.help.HelpSystem;
-import org.eclipse.help.IContext;
-import org.eclipse.help.IHelpResource;
-import org.eclipse.jface.action.Action;
-import org.eclipse.ui.PlatformUI;
-
-/**
- * This class is used to open the help page for a configuration param.
- *
- * @author mengbo
- */
-public class LoadHelpAction extends Action implements IExecutableExtension {
- private String _helpContextId = null;
-
- /**
- *
- */
- public LoadHelpAction() {
- super();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.action.IAction#run()
- */
- public void run() {
- IContext context = HelpSystem.getContext(_helpContextId);
- if (context != null) {
- IHelpResource[] topics = context.getRelatedTopics();
- if (topics != null && topics.length == 1) {
- PlatformUI.getWorkbench().getHelpSystem().displayHelpResource(
- topics[0].getHref());
- } else {
- PlatformUI.getWorkbench().getHelpSystem().displayHelp(
- _helpContextId);
- }
- }
-
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.core.runtime.IExecutableExtension#setInitializationData(org.eclipse.core.runtime.IConfigurationElement,
- * java.lang.String, java.lang.Object)
- */
- public void setInitializationData(IConfigurationElement config,
- String propertyName, Object data) throws CoreException {
- _helpContextId = config.getAttribute("actionparameters"); //$NON-NLS-1$
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/actions/OpenPageAction.java b/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/actions/OpenPageAction.java
deleted file mode 100644
index 252e44c..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/actions/OpenPageAction.java
+++ /dev/null
@@ -1,118 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.common.ui.internal.actions;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExecutableExtension;
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionProvider;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.forms.editor.FormEditor;
-
-/**
- * This class is used to open a page in the editor based on the configuration
- * parameter.
- *
- * @author collinsc,jchoi
- */
-public class OpenPageAction extends Action implements IExecutableExtension {
- private String pageID = null;
-
- private ISelection selection;
-
- /**
- *
- */
- public OpenPageAction() {
- super();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.action.IAction#run()
- */
- public void run() {
- if (pageID != null) {
- // get the active editor
- IEditorPart editor = getActiveEditor();
- IOpenPage openPage = (IOpenPage)editor.getAdapter(IOpenPage.class);
- if(openPage != null){
- openPage.setActiveEditorPage(pageID);
- if (selection != null && editor instanceof FormEditor) {
- IEditorPart activePage = ((FormEditor) editor)
- .getActiveEditor();
- if (activePage instanceof ISelectionProvider) {
- ((ISelectionProvider) activePage)
- .setSelection(selection);
- }
- }
- }
- }
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.core.runtime.IExecutableExtension#setInitializationData(org.eclipse.core.runtime.IConfigurationElement,
- * java.lang.String, java.lang.Object)
- */
- public void setInitializationData(IConfigurationElement config,
- String propertyName, Object data) throws CoreException {
- pageID = config.getAttribute("actionparameters"); //$NON-NLS-1$
- }
-
- /**
- * set the class name to open.
- * @param className
- */
- public void setPageName(String className) {
- this.pageID = className;
- }
-
- /**
- * get the current active editor
- *
- * @return the active editor part
- */
- public static IEditorPart getActiveEditor() {
- IEditorPart editor = null;
- IWorkbenchWindow win = PlatformUI.getWorkbench()
- .getActiveWorkbenchWindow();
- if (win != null) {
- IWorkbenchPage page = win.getActivePage();
- if (page != null) {
- editor = page.getActiveEditor();
- }
- }
- return editor;
- }
-
- /**
- * @return stored selection
- */
- public ISelection getSelection() {
- return selection;
- }
-
- /**
- * @param selection
- */
- public void setSelection(ISelection selection) {
- this.selection = selection;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/AbstractClassButtonDialogField.java b/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/AbstractClassButtonDialogField.java
deleted file mode 100644
index 165846a..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/AbstractClassButtonDialogField.java
+++ /dev/null
@@ -1,238 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.common.ui.internal.dialogfield;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.ResourceBundle;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.search.IJavaSearchScope;
-import org.eclipse.jdt.ui.IJavaElementSearchConstants;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.wizard.WizardDialog;
-import org.eclipse.jst.jsf.common.ui.JSFUICommonPlugin;
-import org.eclipse.jst.jsf.common.ui.internal.guiutils.Alerts;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.dialogs.SelectionDialog;
-import org.eclipse.ui.forms.events.HyperlinkAdapter;
-import org.eclipse.ui.forms.events.HyperlinkEvent;
-
-/**
- * @author mengbo
- * @version 1.5
- */
-/*package*/ abstract class AbstractClassButtonDialogField extends
- StringButtonDialogField {
- private IProject _project;
-
- private String _superClass;
-
- private List _interfacesList;
-
- private IType _type;
-
- private int _typeFlag = IJavaElementSearchConstants.CONSIDER_ALL_TYPES;
-
- private boolean _autoOpenResource = true;
-
- /**
- * @param autoOpenResource
- */
- public void setAutoOpenResource(boolean autoOpenResource) {
- _autoOpenResource = autoOpenResource;
- }
-
- /**
- * @param project
- */
- public AbstractClassButtonDialogField(IProject project) {
- super(null);
- this._project = project;
-
- setHyperLink(new HyperlinkAdapter() {
- public void linkActivated(HyperlinkEvent e) {
- activeLink();
- }
- });
-
- setStringButtonAdapter(new IStringButtonAdapter() {
- public void changeControlPressed(DialogField field) {
- browseButtonPressed();
- }
- });
- }
-
- private void activeLink() {
- String className = getText();
- className = trimNonAlphaChars(className);
- if (className.length() > 0
- && JavaUIHelper.doesClassExist(_project, className)) {
- JavaUIHelper.doOpenClass(_project, className);
- } else {
- try {
- if (_project == null || !_project.hasNature(JavaCore.NATURE_ID)) {
- ResourceBundle rb = ResourceBundle
- .getBundle("org.eclipse.jst.jsf.common.ui.internal.dialogfield.DialogFieldResources"); //$NON-NLS-1$
- Alerts alerts = new Alerts(JSFUICommonPlugin.getDefault(), rb);
- alerts.error("ClassButtonDialogField.Alert.Title", //$NON-NLS-1$
- "ClassButtonDialogField.Alert.Msg"); //$NON-NLS-1$
- return;
- }
- } catch (CoreException e) {
- e.printStackTrace();
- return;
- }
- JavaClassWizard wizard = new JavaClassWizard(_project, className,
- _superClass, getImplementInterfaces());
- wizard.setAutoOpenResource(_autoOpenResource);
- WizardDialog dialog = new WizardDialog(getShell(), wizard);
- dialog.create();
-
- setDialogSize(dialog, 400, 500);
- if (dialog.open() == WizardDialog.OK) {
- String newValue = wizard.getClassNameWithArgs();
- if (!newValue.equals(className)) {
- setText(newValue);
- }
- }
- }
- }
-
- /**
- * @return the interfaces
- * TODO: the contract seems inconsistent
- * as whether to return null or empty list when none
- */
- protected abstract List getImplementInterfaces();
-
- /**
- * @return the java search scope to be used. Must not be null
- */
- protected abstract IJavaSearchScope getJavaSearchScope();
-
- private void browseButtonPressed() {
- Shell shell = getShell();
- SelectionDialog dialog = JavaUIHelper.openSelectionDialog(shell,
- getJavaSearchScope(), _typeFlag);
- dialog.setTitle(JSFUICommonPlugin
- .getResourceString("DialogField.ClassButton.SelectType"));//$NON-NLS-1$
-
- if (dialog.open() == SelectionDialog.OK) {
- String oldClassName = getText();
- if (dialog.getResult() != null) {
- _type = (IType) dialog.getResult()[0];
- String newClassName = _type.getFullyQualifiedName();
- if (!oldClassName.equals(newClassName)) {
- setText(newClassName);
- }
- }
- }
- }
-
- private void setDialogSize(Dialog dialog, int width, int height) {
- Point computedSize = dialog.getShell().computeSize(SWT.DEFAULT,
- SWT.DEFAULT);
- width = Math.max(computedSize.x, width);
- height = Math.max(computedSize.y, height);
- dialog.getShell().setSize(width, height);
- }
-
- private String trimNonAlphaChars(String className) {
- className = className.trim();
- while (className.length() > 0
- && !Character.isLetter(className.charAt(0))) {
- className = className.substring(1, className.length());
- }
- int loc = className.indexOf(":"); //$NON-NLS-1$
- if (loc != -1 && loc > 0) {
- className = className.substring(0, loc);
- } else if (loc == 0) {
- className = ""; //$NON-NLS-1$
- }
- return className;
- }
-
- /**
- * @return Returns the project.
- */
- public IProject getProject() {
- return _project;
- }
-
- /**
- * @param project
- * The project to set.
- */
- public void setProject(IProject project) {
- this._project = project;
- }
-
- /**
- * @return Returns the superClassName.
- */
- public String getSuperClassName() {
- return _superClass;
- }
-
- /**
- * @param superClassName
- * The superClassName to set.
- */
- public void setSuperClassName(String superClassName) {
- this._superClass = superClassName;
- }
-
- /**
- * @return Returns the interfacesList.
- */
- protected List getInterfacesList() {
- return _interfacesList;
- }
-
- /**
- * Sets (replaces) the interface list
- * TODO: this list can have at most one element
- * @param interfaceName
- */
- public void setInterface(String interfaceName) {
- _interfacesList = new ArrayList();
- _interfacesList.add(interfaceName);
- }
-
- /**
- * @return Returns the _type.
- */
- public IType getType() {
- return _type;
- }
-
- /**
- * @return Returns the typeFalg.
- */
- public int getTypeFlag() {
- return _typeFlag;
- }
-
- /**
- * @param typeFalg
- * The typeFalg to set.
- */
- public void setTypeFlag(int typeFalg) {
- this._typeFlag = typeFalg;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/ClassButtonDialogField.java b/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/ClassButtonDialogField.java
deleted file mode 100644
index baed42b..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/ClassButtonDialogField.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.common.ui.internal.dialogfield;
-
-import java.util.List;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.search.IJavaSearchScope;
-import org.eclipse.jdt.core.search.SearchEngine;
-
-/**
- * @author mengbo
- */
-public class ClassButtonDialogField extends AbstractClassButtonDialogField {
- /**
- * @param project
- */
- public ClassButtonDialogField(IProject project) {
- super(project);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.jsf.common.ui.internal.dialogfield.AbstractClassButtonDialogField#getImplementInterfaces()
- */
- protected List getImplementInterfaces() {
- return getInterfacesList();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.jsf.common.ui.internal.dialogfield.AbstractClassButtonDialogField#getJavaSearchScope()
- */
- protected IJavaSearchScope getJavaSearchScope() {
- IJavaSearchScope scope;
- String superType = getSuperClassName();
- List interfaceList = getInterfacesList();
- if (superType == null && interfaceList != null
- && interfaceList.size() > 0) {
- superType = interfaceList.get(0).toString();
- }
- if (getSuperClassName() != null && interfaceList != null
- && interfaceList.size() > 0) {
- superType = null;
- }
- if (superType == null) {
- scope = SearchEngine
- .createJavaSearchScope(new IJavaProject[] { JavaCore
- .create(getProject()) });
- } else {
- scope = JavaUIHelper.findSearchScope(getProject(), superType);
- }
- return scope;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/ColorButtonDialogField.java b/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/ColorButtonDialogField.java
deleted file mode 100644
index 8228414..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/ColorButtonDialogField.java
+++ /dev/null
@@ -1,339 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.common.ui.internal.dialogfield;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.jst.jsf.common.ui.internal.utils.StyleCombo;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.DisposeEvent;
-import org.eclipse.swt.events.DisposeListener;
-import org.eclipse.swt.events.FocusAdapter;
-import org.eclipse.swt.events.FocusEvent;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.Font;
-import org.eclipse.swt.graphics.GC;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.graphics.ImageData;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.graphics.RGB;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.ColorDialog;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-
-/**
- * This class provides a common color choice DialogFiled.
- *
- * @author mengbo
- */
-public class ColorButtonDialogField extends StyleComboDialogField {
- // color selection button
- private Button _button;
-
- // the button enable flag
- private boolean _buttonEnabled;
-
- // the current color
- private Color _color;
-
- // the current color RGB
- private RGB _colorValue;
-
- // the combo control
- private StyleCombo _combo;
-
- // when no color is set or selected, using the empty image
- private Image _emptyImage;
-
- // size of color image
- private Point _extent;
-
- // the color image
- private Image _image;
-
- private ColorPalette _colorPalette;
-
- /**
- * @param flags
- * @param colorPalette
- */
- public ColorButtonDialogField(int flags, ColorPalette colorPalette) {
- super(flags);
- _buttonEnabled = true;
- _colorPalette = colorPalette;
- }
-
- private void buttonPressed() {
- ColorDialog colorDialog = new ColorDialog(_button.getShell());
- colorDialog.setRGB(_colorValue);
- RGB newColor = colorDialog.open();
- if (newColor != null && !newColor.equals(_colorValue)) {
- _colorValue = newColor;
- setText(ColorPalette.getStringColor(newColor));
- updateColorImage();
- }
- }
-
- /**
- * Compute the size of the image to be displayed.
- *
- * @param window -
- * the window used to calculate
- * @return <code>Point</code>
- */
- private Point computeImageSize(Control window) {
- GC gc = new GC(window);
- Font f = _button.getFont();
- gc.setFont(f);
- int height = gc.getFontMetrics().getHeight();
-
- Point p = new Point(height * 3 - 6, height - 2);
- gc.dispose();
- return p;
- }
-
- private void disposeResources() {
- if (_image != null) {
- _image.dispose();
- _image = null;
- }
- if (_emptyImage != null) {
- _emptyImage.dispose();
- _emptyImage = null;
- }
- if (_color != null) {
- _color.dispose();
- _color = null;
- }
-
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.jsf.common.ui.internal.dialogfield.DialogField#doFillIntoGrid(org.eclipse.ui.forms.widgets.FormToolkit,
- * org.eclipse.swt.widgets.Composite, int)
- */
- public Control[] doFillIntoGrid(FormToolkit toolkit, Composite parent,
- int nColumns) {
- assertEnoughColumns(nColumns);
-
- Control requiredLabel = getRequiredLabelControl(toolkit, parent);
- requiredLabel.setLayoutData(gridDataForLabel(1));
-
- Control label = getLabelControl(toolkit, parent);
- label.setLayoutData(gridDataForLabel(1));
-
- StyleCombo combo = getComboControl(toolkit, parent);
- combo.setLayoutData(gridDataForCombo(nColumns - 3));
-
- _button = getChangeControl(toolkit, parent);
- _button.setLayoutData(gridDataForButton(1));
-
- return new Control[] { requiredLabel, label, combo, _button };
- }
-
- /**
- * Sets the enable state of the button.
- * @param enable
- */
- public void enableButton(boolean enable) {
- if (isOkToUse(_button)) {
- _button.setEnabled(isEnabled() && enable);
- }
- _buttonEnabled = enable;
- }
-
- /**
- * Creates or returns the created buttom widget.
- * @param toolkit
- *
- * @param parent
- * The parent composite or <code>null</code> if the widget has
- * already been created.
- * @return the button widget
- */
- public Button getChangeControl(FormToolkit toolkit, Composite parent) {
- if (_button == null) {
- assertCompositeNotNull(parent);
- if (toolkit != null) {
- _button = toolkit.createButton(parent, "", SWT.PUSH); //$NON-NLS-1$
- } else {
- _button = new Button(parent, SWT.PUSH);
- }
- _button.setEnabled(isEnabled() && _buttonEnabled);
-
- _button.addSelectionListener(new SelectionListener() {
- public void widgetDefaultSelected(SelectionEvent e) {
- buttonPressed();
- }
-
- public void widgetSelected(SelectionEvent e) {
- buttonPressed();
- }
- });
-
- _button.addDisposeListener(new DisposeListener() {
- public void widgetDisposed(DisposeEvent event) {
- disposeResources();
- }
- });
-
- _extent = computeImageSize(parent);
- _image = new Image(parent.getDisplay(), _extent.x, _extent.y);
- _emptyImage = new Image(parent.getDisplay(), _extent.x, _extent.y);
- initEmptyImage(_button);
- updateColorImage();
- }
-
- return _button;
- }
-
- private String[] getColorList() {
- Map map = _colorPalette.getExtendedColorMap();
- List list = new ArrayList(map.keySet());
- Collections.sort(list);
- return (String[]) list.toArray(new String[list.size()]);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.jsf.common.ui.internal.dialogfield.StringDialogField#getTextControl(org.eclipse.ui.forms.widgets.FormToolkit,
- * org.eclipse.swt.widgets.Composite)
- */
- public StyleCombo getComboControl(FormToolkit toolkit, Composite parent) {
-
- if (_combo == null) {
- _combo = super.getComboControl(toolkit, parent);
-
- _combo.addSelectionListener(new SelectionListener() {
-
- public void widgetDefaultSelected(SelectionEvent e) {
- updateImageAfterChanged();
- }
-
- public void widgetSelected(SelectionEvent e) {
- updateImageAfterChanged();
- }
- });
- _combo.addFocusListener(new FocusAdapter() {
- public void focusLost(FocusEvent e) {
- updateImageAfterChanged();
- }
- });
- _combo.setItems(getColorList());
- }
- return _combo;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.jsf.common.ui.internal.dialogfield.DialogField#getNumberOfControls()
- */
- public int getNumberOfControls() {
- return 4;
- }
- private GridData gridDataForButton(int span) {
- GridData gd = new GridData();
- gd.horizontalAlignment = GridData.FILL;
- gd.grabExcessHorizontalSpace = false;
- gd.horizontalSpan = span;
- gd.widthHint = LayoutUtil.getButtonWidthHint(_button);
- gd.heightHint = _combo.computeSize(SWT.DEFAULT, SWT.DEFAULT).y;
- return gd;
- }
-
- private void initEmptyImage(Control parent) {
- Color transparentColor = parent.getForeground();
- ImageData imageData = _emptyImage.getImageData();
- imageData.transparentPixel = 0;
- GC gc = new GC(_emptyImage);
- gc.setBackground(transparentColor);
- gc.fillRectangle(0, 0, _emptyImage.getBounds().width, _emptyImage
- .getBounds().height);
- }
-
- /**
- * Set the current color value and update the control.
- *
- * @param rgb
- * The new color.
- */
- public void setColorValue(RGB rgb) {
- _colorValue = rgb;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.jsf.common.ui.internal.dialogfield.ComboDialogField#setTextWithoutUpdate(java.lang.String)
- */
- public void setTextWithoutUpdate(String text) {
- super.setTextWithoutUpdate(text);
- updateImageAfterChanged();
- }
-
- /**
- * Update the image being displayed on the button using the current color
- * setting.
- */
- protected void updateColorImage() {
- if (_button.isDisposed()) {
- return;
- }
-
- if (_colorValue == null) {
- _button.setImage(_emptyImage);
- return;
- }
-
- Display display = _button.getDisplay();
- GC gc = new GC(_image);
- gc.setForeground(display.getSystemColor(SWT.COLOR_BLACK));
- gc.drawRectangle(0, 0, _extent.x - 1, _extent.y - 1);
- if (_color != null) {
- _color.dispose();
- }
- _color = new Color(display, _colorValue);
- gc.setBackground(_color);
- gc.fillRectangle(1, 1, _extent.x - 2, _extent.y - 2);
- gc.dispose();
- _button.setImage(_image);
- }
-
- /*
- * @see DialogField#updateEnableState
- */
- protected void updateEnableState() {
- super.updateEnableState();
- if (isOkToUse(_button)) {
- _button.setEnabled(isEnabled() && _buttonEnabled);
- }
- }
-
- private void updateImageAfterChanged() {
- String newColor = getText().trim();
- setColorValue(_colorPalette.getExtendedColorRGB(newColor));
- updateColorImage();
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/ColorPalette.java b/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/ColorPalette.java
deleted file mode 100644
index 454a4c0..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/ColorPalette.java
+++ /dev/null
@@ -1,125 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2007 Oracle Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Oracle Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.common.ui.internal.dialogfield;
-
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Set;
-
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.RGB;
-
-/**
- * Defines a two sets: one of basic and one of extended colors. Clients extending
- * this class must provide the two maps
- *
- * @author cbateman
- *
- */
-public abstract class ColorPalette
-{
- /**
- * @param cssText
- * @return the basic color matching the cssText key or null if color doesn't exist
- */
- public final Color getBasicColor(String cssText) {
- return (Color) getBasicColorMap().get(cssText.toLowerCase());
- }
-
- /**
- * @param cssText
- * @return the extended color matching the cssText key or null if color doesn't exist
- */
- public final Color getExtendedColor(String cssText) {
- Set keys = getExtendedColorMap().keySet();
- for (Iterator iterator = keys.iterator(); iterator.hasNext();) {
- String key = (String) iterator.next();
- if (key.equalsIgnoreCase(cssText)) {
- return (Color) getExtendedColorMap().get(key);
- }
- }
- return null;
- }
-
- /**
- * @return the map of basic colors where the key is the color name (a string)
- * and the value is an RGB object
- */
- public abstract Map getBasicColorMap();
-
- /**
- * @return the map of extended colors where the key is the color name (a string)
- * and the value is an Color object
- */
- public abstract Map getExtendedColorMap();
-
- /**
- * @param textColor
- * @return same as getExtendedColor but returns value as an RGB object
- */
- public final RGB getExtendedColorRGB(String textColor) {
- if (textColor == null || textColor.length() == 0) {
- return null;
- }
-
- Color color = getExtendedColor(textColor);
- if (color != null) {
- return color.getRGB();
- }
-
- if (textColor.charAt(0) == '#' && textColor.length() == 4) {
- char[] rgbChars = textColor.toCharArray();
- char[] fullChars = { rgbChars[0], rgbChars[1], rgbChars[1],
- rgbChars[2], rgbChars[2], rgbChars[3], rgbChars[3] };
-
- textColor = String.valueOf(fullChars);
- }
-
- if (textColor.charAt(0) == '#' && textColor.length() == 7) {
- try {
- int intColor = Integer.decode(textColor).intValue();
-
- if (intColor > 0xFFFFFF || intColor < 0) {
- return null;
- }
- int r = intColor >> 16;
- int g = (intColor >> 8) & 0xFF;
- int b = intColor & 0xFF;
- return new RGB(r, g, b);
-
- } catch (NumberFormatException e) {
- return null;
- }
- }
- return null;
- }
-
- /**
- * @param rgb
- * @return the hex string for equivalent of the rgb color
- */
- public static String getStringColor(RGB rgb) {
- if (rgb == null) {
- return ""; //$NON-NLS-1$
- }
-
- StringBuffer buffer = new StringBuffer("#"); //$NON-NLS-1$
- int[] intRGBs = new int[] { rgb.red, rgb.green, rgb.blue };
- for (int i = 0; i < 3; i++) {
- if (intRGBs[i] < 16) {
- buffer.append("0"); //$NON-NLS-1$
- }
- buffer.append(Integer.toHexString(intRGBs[i]).toUpperCase());
- }
- return buffer.toString();
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/ComboDialogField.java b/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/ComboDialogField.java
deleted file mode 100644
index 582634e..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/ComboDialogField.java
+++ /dev/null
@@ -1,320 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.common.ui.internal.dialogfield;
-
-import java.util.Map;
-import java.util.Map.Entry;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.CCombo;
-import org.eclipse.swt.events.FocusAdapter;
-import org.eclipse.swt.events.FocusEvent;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-
-/**
- * Dialog field containing a label and a combo control.
- *
- * If the combo control is editable, then when user type in the field, will only
- * fire dialogFieldChanged, without dialogFieldApplied just as text control. But
- * when user change selection using the drop down, will fire both
- * dialogFieldChanged and dialogFieldApplied
- *
- * @author mengbo
- */
-public class ComboDialogField extends DialogFieldBase implements
- ISupportTextValue {
- final static private int WIDTH_HINT = 10;
-
- private String _text;
-
- private int _selectionIndex;
-
- private String[] _items;
-
- private CCombo _comboControl;
-
- private ModifyListener _modifyListener;
-
- private int _flags;
-
- private boolean _pending = false;
-
- private Map _entryMap;
-
- /**
- * @param flags
- */
- public ComboDialogField(int flags) {
- super();
- _text = ""; //$NON-NLS-1$
- _items = new String[0];
- _flags = flags;
- _selectionIndex = -1;
- }
-
- // ------- layout helpers
-
- /*
- * @see DialogField#doFillIntoGrid
- */
- public Control[] doFillIntoGrid(FormToolkit toolkit, Composite parent,
- int nColumns) {
- assertEnoughColumns(nColumns);
-
- Control requiredLabel = getRequiredLabelControl(toolkit, parent);
- requiredLabel.setLayoutData(gridDataForLabel(1));
-
- Control label = getLabelControl(toolkit, parent);
- label.setLayoutData(gridDataForLabel(1));
-
- CCombo combo = getComboControl(toolkit, parent);
- combo.setLayoutData(gridDataForCombo(nColumns - 2));
-
- return new Control[] { requiredLabel, label, combo };
- }
-
- /*
- * @see DialogField#getNumberOfControls
- */
- public int getNumberOfControls() {
- return 3;
- }
-
- private static GridData gridDataForCombo(int span) {
- GridData gd = new GridData();
- gd.horizontalAlignment = GridData.FILL;
- gd.grabExcessHorizontalSpace = false;
- gd.horizontalSpan = span;
- gd.widthHint = WIDTH_HINT;
- return gd;
- }
-
- // ------- focus methods
-
- /*
- * @see DialogField#setFocus
- */
- public boolean setFocus() {
- if (isOkToUse(_comboControl)) {
- _comboControl.setFocus();
- }
- return true;
- }
-
- // ------- ui creation
-
- /**
- * Creates or returns the created combo control.
- * @param toolkit
- *
- * @param parent
- * The parent composite or <code>null</code> when the widget
- * has already been created.
- * @return the custom combo control
- */
- public CCombo getComboControl(FormToolkit toolkit, Composite parent) {
- if (_comboControl == null || _comboControl.isDisposed()) {
- assertCompositeNotNull(parent);
- _modifyListener = new ModifyListener() {
- public void modifyText(ModifyEvent e) {
- doModifyText(e);
- }
- };
- SelectionListener selectionListener = new SelectionListener() {
- public void widgetSelected(SelectionEvent e) {
- doSelectionChanged(e);
- }
-
- public void widgetDefaultSelected(SelectionEvent e) {
- handleDefaultSelection(e);
- }
- };
-
- if (toolkit != null) {
- _comboControl = new CCombo(parent, _flags);
- toolkit.adapt(_comboControl);
- } else {
- _comboControl = new CCombo(parent, _flags | SWT.BORDER);
- _comboControl.setBackground(Display.getCurrent()
- .getSystemColor(SWT.COLOR_LIST_BACKGROUND));
- }
-
- // moved up due to 1GEUNW2
- _comboControl.setItems(_items);
- if (_selectionIndex != -1) {
- _comboControl.select(_selectionIndex);
- } else {
- _comboControl.setText(_text);
- }
- _comboControl.setFont(parent.getFont());
- _comboControl.addModifyListener(_modifyListener);
- _comboControl.addSelectionListener(selectionListener);
- _comboControl.addFocusListener(new FocusAdapter() {
- public void focusLost(FocusEvent e) {
- doFocusLost(e);
- }
- });
- _comboControl.setEnabled(isEnabled());
- _comboControl.setToolTipText(getToolTip());
- }
- return _comboControl;
- }
-
- private void handleDefaultSelection(SelectionEvent e) {
- // commit value
- if (_pending) {
- _pending = false;
- dialogFieldApplied();
- }
- }
-
- private void doFocusLost(FocusEvent e) {
- if (_pending) {
- _pending = false;
- dialogFieldApplied();
- }
- }
-
- private void doModifyText(ModifyEvent e) {
- if (isOkToUse(_comboControl)) {
- _text = getEntryKey(_comboControl.getText());
- _selectionIndex = _comboControl.getSelectionIndex();
- }
- _pending = true;
- dialogFieldChanged();
- }
-
- private void doSelectionChanged(SelectionEvent e) {
- if (isOkToUse(_comboControl)) {
- _items = _comboControl.getItems();
- _text = getEntryKey(_comboControl.getText());
- _selectionIndex = _comboControl.getSelectionIndex();
- }
- _pending = false;
- dialogFieldChangedAndApplied();
- }
-
- // ------ enable / disable management
-
- /*
- * @see DialogField#updateEnableState
- */
- protected void updateEnableState() {
- super.updateEnableState();
- if (isOkToUse(_comboControl)) {
- _comboControl.setEnabled(isEnabled());
- }
- }
-
- // ------ text access
-
-
- /**
- * Sets the combo items. Triggers a dialog-changed event.
- * @param items
- */
- public void setItems(String[] items) {
- _items = items;
- if (isOkToUse(_comboControl)) {
- _comboControl.setItems(items);
- }
- _pending = false;
- // dialogFieldChangedAndApplied();
- }
-
- /**
- * Gets the text.
- */
- public String getText() {
- return _text;
- }
-
- /**
- * Sets the text. Triggers a dialog-changed event.
- */
- public void setText(String text) {
- setTextWithoutUpdate(text);
- _pending = false;
- dialogFieldChangedAndApplied();
- }
-
- /**
- * Selects an item.
- * @param index
- */
- public void selectItem(int index) {
- if (isOkToUse(_comboControl)) {
- _comboControl.select(index);
- } else {
- if (index >= 0 && index < _items.length) {
- _text = getEntryKey(_items[index]);
- _selectionIndex = index;
- }
- }
- dialogFieldChangedAndApplied();
- }
-
- /**
- * Sets the text without triggering a dialog-changed event.
- */
- public void setTextWithoutUpdate(String text) {
- _pending = false;
- if (text == null) {
- text = "";//$NON-NLS-1$
- }
- _text = text;
- if (isOkToUse(_comboControl)) {
- _comboControl.removeModifyListener(_modifyListener);
- _comboControl.setText(getEntryValue(text));
- _comboControl.addModifyListener(_modifyListener);
- }
- }
-
- private String getEntryValue(String key) {
- if (_entryMap == null || !_entryMap.containsKey(key)) {
- return key;
- }
- return _entryMap.get(key).toString();
- }
-
- private String getEntryKey(String value) {
- if (_entryMap == null || !_entryMap.containsValue(value)) {
- return value;
- }
-
- Entry[] entries = (Entry[]) _entryMap.entrySet().toArray(new Entry[0]);
- for (int i = 0; i < entries.length; i++) {
- if (entries[i].getValue() == value
- || (value != null && value.equals(entries[i].getValue()))) {
- return entries[i].getKey().toString();
- }
- }
- return value;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.jsf.common.ui.internal.dialogfield.DialogField#handleGrabHorizontal()
- */
- public void handleGrabHorizontal() {
- LayoutUtil.setGrabHorizontal(_comboControl, true);
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/DialogField.java b/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/DialogField.java
deleted file mode 100644
index 0ff86f7..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/DialogField.java
+++ /dev/null
@@ -1,149 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.common.ui.internal.dialogfield;
-
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.forms.events.IHyperlinkListener;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-
-/**
- * @author mengbo
- * @version 1.5
- */
-public interface DialogField {
- /**
- * this method must be called directly after constructor, in this case,
- * system will create a hyper link label, and when the hyper link is
- * clicked, the corresponding method on the listener will be called. A
- * RuntimeException will throw out if this method is called after the label
- * has been created.
- *
- * @param listener
- * can't be null
- */
- public abstract void setHyperLink(IHyperlinkListener listener);
-
- /**
- * Sets the label of the dialog field.
- * @param labeltext
- */
- public abstract void setLabelText(String labeltext);
-
- // ------ change listener
- /**
- * Listener that is notified on a field change
- * @param listener
- */
- public abstract void setDialogFieldChangeListener(
- IDialogFieldChangeListener listener);
-
- /**
- * Listener that is notified on a field apply
- * @param listener
- */
- public abstract void setDialogFieldApplyListener(
- IDialogFieldApplyListener listener);
-
- // ------- focus management
- /**
- * Tries to set the focus to the dialog field. Returns <code>true</code>
- * if the dialog field can take focus. To be re-implemented by dialog field
- * implementors.
- * @return true if dialog field can take focus
- */
- public abstract boolean setFocus();
-
- /**
- * Creates all controls of the dialog field and fills it to a composite. The
- * composite is assumed to have <code>MGridLayout</code> as layout. The
- * dialog field will adjust its controls' spans to the number of columns
- * given. To be reimplemented by dialog field implementors.
- * @param toolkit
- * @param parent
- * @param nColumns
- * @return the controls
- */
- public abstract Control[] doFillIntoGrid(FormToolkit toolkit,
- Composite parent, int nColumns);
-
- /**
- * Returns the number of columns of the dialog field. To be reimplemented by
- * dialog field implementors.
- * @return the number of columns
- */
- public abstract int getNumberOfControls();
-
- // ------- ui creation
- /**
- * @param _formToolkit
- * @param parent
- * @return the label control
- */
- public abstract Control getLabelControl(FormToolkit _formToolkit,
- Composite parent);
-
- // --------- enable / disable management
- /**
- * @param enabled
- */
- public abstract void setEnabled(boolean enabled);
-
- /**
- * Gets the enable state of the dialog field.
- * @return true if enabled is set
- */
- public abstract boolean isEnabled();
-
- /**
- * Get attached data by key.
- *
- * @param key
- * @return the attached data object for key
- */
- public abstract Object getAttachedData(Object key);
-
- /**
- * You can attach any data to the DialogField, and get it using the
- * <code>getAttachedData</code> method.
- *
- * @param key
- * @param value
- */
- public abstract void putAttachedData(Object key, Object value);
-
- /**
- * this method give the DialogField a chance to set the correct column to
- * grab horizontal space. In the implementation of this method, should only
- * change the GridData of control, should not do anything else.
- *
- * The caller is responsible to make sure the controls for the dialog field
- * has been created before calling this method.
- */
- public abstract void handleGrabHorizontal();
-
- /**
- * @return true if is required field
- */
- public abstract boolean isRequired();
-
- /**
- * @param toolTip
- */
- public abstract void setToolTip(String toolTip);
-
- /**
- * @return the field's enclosing shell or null if none
- */
- public Shell getShell();
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/DialogFieldBase.java b/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/DialogFieldBase.java
deleted file mode 100644
index 7d61f49..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/DialogFieldBase.java
+++ /dev/null
@@ -1,559 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.common.ui.internal.dialogfield;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.core.runtime.Assert;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.MouseEvent;
-import org.eclipse.swt.events.MouseTrackAdapter;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.FontMetrics;
-import org.eclipse.swt.graphics.GC;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.forms.events.IHyperlinkListener;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-import org.eclipse.ui.forms.widgets.Hyperlink;
-
-/**
- * Base class of all Dialog fields. Dialog fields manage controls together with
- * the model, independed from the creation time of the widgets. - support for
- * automated layouting. - enable / disable, set focus a concept of the base
- * class. DialogField have a label.
- *
- * DialogField may be used in two different context:
- * <ol>
- * <li> In side dialog. In this case, whenever there is anything change in the
- * dialog field, such as user type anything, the dialog should listen to the
- * dialogFieldChanged() events and do things like validation. When user press
- * the "OK" button, dialog should call getXXX to get the value from the dialog
- * field and apply them.
- * <li> In side form based editor or properties view. In this case, whenever
- * there is anything change in the dialog field, such as user type anything, the
- * editor/view should listen to the dialogFieldChanged() events and do things
- * like validation. When user press "Enter" or move the focus out of the control
- * (finish editing), the dialog field will fire out dialogFieldApplied() events,
- * and the editor/view should listen to this event and apply the value to the
- * underlying model.
- * </ol>
- *
- * The basic idea of the DialogField framework is comming from
- * <code>org.eclipse.jface.preference.FieldEditor</code> and
- * <code>org.eclipse.jdt.internal.ui.wizards.dialogfields.DialogField</code>
- *
- * @author mengbo
- */
-public class DialogFieldBase implements DialogField {
- private Label _label;
-
- private Label _requiredLabel;
-
- private String _labelText;
-
- private IDialogFieldChangeListener _dialogFieldChangeListener;
-
- private IDialogFieldApplyListener _dialogFieldApplyListener;
-
- private boolean _enabled;
-
- private FontMetrics _fontMetrics;
-
- private IHyperlinkListener _listener;
-
- private Hyperlink _hyperlink;
-
- private Map _attachedData;
-
- private boolean _isRequired;
-
- private String toolTip;
-
- /**
- * default constructor
- */
- public DialogFieldBase() {
- _enabled = true;
- _label = null;
- _requiredLabel = null;
- _hyperlink = null;
- _labelText = ""; //$NON-NLS-1$
- }
-
- /**
- * this method must be called directly after constructor, in this case,
- * system will create a hyper link label, and when the hyper link is
- * clicked, the corresponding method on the listene will be called. A
- * RuntimeException will throw out if this method is called after the label
- * has been created.
- *
- * @param listener
- * can't be null
- */
- public void setHyperLink(IHyperlinkListener listener) {
- if (_label != null) {
- throw new RuntimeException(
- "The Label instance does not support the listener"); //$NON-NLS-1$
- }
- this._listener = listener;
- }
-
- /**
- * Sets the label of the dialog field.
- */
- public void setLabelText(String labeltext) {
- _labelText = labeltext == null ? "" : labeltext; //$NON-NLS-1$
- // if (_isRequired)
- // {
- // _labelText = "* " + _labelText;
- // }
- // else
- // {
- // _labelText = " " + _labelText;
- // }
- if (_label != null && !_label.isDisposed()) {
- _label.setText(_labelText);
- } else if (_hyperlink != null && !_hyperlink.isDisposed()) {
- _hyperlink.setText(_labelText);
- }
- }
-
- /**
- * @return return the enclosing Shell or null if one cannot be determined
- */
- public Shell getShell() {
- if (_label != null && !_label.isDisposed()) {
- return _label.getShell();
- } else if (_hyperlink != null && !_hyperlink.isDisposed()) {
- return _hyperlink.getShell();
- }
- return null;
- }
-
- // ------ change listener
-
- /**
- * Defines the listener for this dialog field.
- */
- public final void setDialogFieldChangeListener(
- IDialogFieldChangeListener listener) {
- _dialogFieldChangeListener = listener;
- }
-
- public final void setDialogFieldApplyListener(
- IDialogFieldApplyListener listener) {
- _dialogFieldApplyListener = listener;
- }
-
- /**
- * fire both dialogFieldChanged and dialogFieldApplied events.
- */
- public void dialogFieldChangedAndApplied() {
- if (_dialogFieldChangeListener != null) {
- _dialogFieldChangeListener.dialogFieldChanged(this);
- }
- if (_dialogFieldApplyListener != null) {
- _dialogFieldApplyListener.dialogFieldApplied(this);
- }
- }
-
- /**
- * fire dialogFieldChanged event.
- *
- */
- public void dialogFieldChanged() {
- if (_dialogFieldChangeListener != null) {
- _dialogFieldChangeListener.dialogFieldChanged(this);
- }
- }
-
- /**
- * fire dialogFieldApplied event.
- *
- */
- public void dialogFieldApplied() {
- if (_dialogFieldApplyListener != null) {
- _dialogFieldApplyListener.dialogFieldApplied(this);
- }
- }
-
- // ------- focus management
-
-
- public boolean setFocus() {
- return false;
- }
-
- //
- // /**
- // * Posts <code>setFocus</code> to the display event queue.
- // */
- // public void postSetFocusOnDialogField(Display display)
- // {
- // if (display != null)
- // {
- // display.asyncExec(new Runnable()
- // {
- // public void run()
- // {
- // setFocus();
- // }
- // }
- // );
- // }
- // }
-
- // ------- layout helpers
-
- public Control[] doFillIntoGrid(FormToolkit toolkit, Composite parent,
- int nColumns) {
- assertEnoughColumns(nColumns);
-
- Control label = getLabelControl(toolkit, parent);
- label.setLayoutData(gridDataForLabel(nColumns));
-
- return new Control[] { label };
- }
-
- /**
- * Initializes the computation of horizontal and vertical dialog units based
- * on the size of current font.
- * <p>
- * This method must be called before any of the dialog unit based conversion
- * methods are called.
- * </p>
- *
- * @param control
- * a control from which to obtain the current font
- * @return the font metrics for control
- */
- protected FontMetrics getDialogUnits(Control control) {
- if (_fontMetrics == null) {
- // Compute and store a font metric
- GC gc = new GC(control);
- gc.setFont(control.getFont());
- _fontMetrics = gc.getFontMetrics();
- gc.dispose();
- }
- return _fontMetrics;
- }
-
- /**
- * Returns the number of columns of the dialog field. To be reimplemented by
- * dialog field implementors.
- */
- public int getNumberOfControls() {
- return 1;
- }
-
- /**
- * @param span
- * @return a new GridData for the horizontal 'span' value
- */
- protected static GridData gridDataForLabel(int span) {
- GridData gd = new GridData(GridData.HORIZONTAL_ALIGN_FILL);
- gd.horizontalSpan = span;
- return gd;
- }
-
- // ------- ui creation
-
- /**
- * Creates or returns the created label widget.
- *
- * @param parent
- * The parent composite or <code>null</code> if the widget has
- * already been created.
- */
- public Control getLabelControl(FormToolkit _formToolkit, Composite parent) {
- Control control = null;
- if ((_label == null || _label.isDisposed()) && (_hyperlink == null || _hyperlink.isDisposed())) {
- assertCompositeNotNull(parent);
-
- String label = null;
- if (_labelText != null && !"".equals(_labelText)) { //$NON-NLS-1$
- //$NON-NLS-1$
- label = _labelText;
- } else {
- label = "."; //$NON-NLS-1$
- }
-
- if (_listener == null) {
- control = createLabel(_formToolkit, parent, label);
- } else {
- control = createHyperlink(_formToolkit, parent, label);
- }
- /**
- * if(isRequired) { FontData[] fontData =
- * parent.getFont().getFontData(); FontData[] newFontData = new
- * FontData[fontData.length]; for(int i=0; i<fontData.length; i++) {
- * newFontData[i] = new FontData(fontData[i].getName(),
- * fontData[i].getHeight(), fontData[i].getStyle() | SWT.BOLD); }
- * final Font font = new Font(control.getDisplay(),newFontData);
- * control.setFont(font); control.addDisposeListener(new
- * DisposeListener() {
- *
- * public void widgetDisposed(DisposeEvent e) { font.dispose(); }
- * }); } else { control.setFont(parent.getFont()); }
- */
- control.setFont(parent.getFont());
- control.setEnabled(_enabled);
- } else {
- if (_label != null) {
- control = _label;
- } else {
- control = _hyperlink;
- }
- }
- return control;
- }
-
- /**
- * @param _formToolkit
- * @param parent
- * @return get the Label control for required
- */
- public Control getRequiredLabelControl(FormToolkit _formToolkit,
- Composite parent) {
- if (_requiredLabel == null || _requiredLabel.isDisposed()) {
- if (_formToolkit == null) {
- _requiredLabel = new Label(parent, SWT.LEFT | SWT.WRAP);
- } else {
- _requiredLabel = _formToolkit.createLabel(parent, "", SWT.LEFT //$NON-NLS-1$
- | SWT.WRAP);
- _requiredLabel.setForeground(getLabelColor());
- }
- if (_isRequired) {
- _requiredLabel.setText(DialogFieldResources.getInstance()
- .getString("DialogFieldBase.Label.RequiredSymbol")); //$NON-NLS-1$
- }
- }
- return _requiredLabel;
- }
-
- private Control createLabel(FormToolkit _formToolkit, Composite parent,
- String labelString) {
- if (_formToolkit == null) {
- _label = new Label(parent, SWT.LEFT | SWT.WRAP);
- _label.setText(labelString);
- } else {
- _label = _formToolkit.createLabel(parent, labelString, SWT.LEFT
- | SWT.WRAP);
- _label.setForeground(getLabelColor());
- }
- return _label;
- }
-
- /**
- * get color for label
- */
- private Color getLabelColor() {
- String osname = System.getProperty("os.name").toLowerCase(); //$NON-NLS-1$
- if (osname.startsWith("mac os")) { //$NON-NLS-1$
- return Display.getCurrent().getSystemColor(
- SWT.COLOR_LIST_FOREGROUND);
- }
- return Display.getCurrent()
- .getSystemColor(SWT.COLOR_LIST_SELECTION);
- }
-
- private Control createHyperlink(FormToolkit _formToolkit, Composite parent,
- String label) {
- if (_formToolkit == null) {
- _hyperlink = new Hyperlink(parent, SWT.LEFT | SWT.WRAP);
- _hyperlink.setForeground(getLabelColor());
- _hyperlink.setUnderlined(true);
- _hyperlink.addMouseTrackListener(new MouseTrackAdapter() {
-
- public void mouseEnter(MouseEvent e) {
- _hyperlink.setForeground(Display.getCurrent()
- .getSystemColor(SWT.COLOR_BLUE));
- }
-
- public void mouseExit(MouseEvent e) {
- _hyperlink.setForeground(getLabelColor());
- }
- });
- _hyperlink.setText(label);
- } else {
- _hyperlink = _formToolkit.createHyperlink(parent, label, SWT.LEFT
- | SWT.WRAP);
- }
- _hyperlink.addHyperlinkListener(_listener);
- return _hyperlink;
- }
-
- /**
- * Creates a spacer control.
- * @param toolkit
- *
- * @param parent
- * The parent composite
- * @return a spacer control
- */
- public Control createEmptySpace(FormToolkit toolkit, Composite parent) {
- return createEmptySpace(toolkit, parent, 1);
- }
-
- /**
- * Creates a spacer control with the given span. The composite is assumed to
- * have <code>MGridLayout</code> as layout.
- * @param toolkit
- *
- * @param parent
- * The parent composite
- * @param span
- * @return a label that creates empty space
- */
- public Control createEmptySpace(FormToolkit toolkit, Composite parent,
- int span) {
- Label label;
- if (toolkit != null) {
- label = toolkit.createLabel(parent, ""); //$NON-NLS-1$
- } else {
- label = new Label(parent, SWT.LEFT);
- }
- GridData gd = new GridData();
- gd.horizontalAlignment = GridData.BEGINNING;
- gd.grabExcessHorizontalSpace = false;
- gd.horizontalSpan = span;
- gd.horizontalIndent = 0;
- gd.widthHint = 0;
- gd.heightHint = 0;
- label.setLayoutData(gd);
- return label;
- }
-
- /**
- * Tests is the control is not <code>null</code> and not disposed.
- * @param control
- * @return true if the control is valid for use
- */
- protected final boolean isOkToUse(Control control) {
- return (control != null) && !(control.isDisposed());
- }
-
- // --------- enable / disable management
-
- /**
- * Sets the enable state of the dialog field.
- */
- public final void setEnabled(boolean enabled) {
- if (enabled != _enabled) {
- _enabled = enabled;
- updateEnableState();
- }
- }
-
- /**
- * Called when the enable state changed. To be extended by dialog field
- * implementors.
- */
- protected void updateEnableState() {
- if (_label != null && !_label.isDisposed()) {
- _label.setEnabled(_enabled);
- }
- if (_hyperlink != null && !_hyperlink.isDisposed()) {
- _hyperlink.setEnabled(_enabled);
- }
- }
-
- /**
- * Gets the enable state of the dialog field.
- */
- public final boolean isEnabled() {
- return _enabled;
- }
-
- /**
- * @param comp
- */
- protected final void assertCompositeNotNull(Composite comp) {
- Assert.isNotNull(comp,
- "uncreated control requested with composite null"); //$NON-NLS-1$
- }
-
- /**
- * @param nColumns
- */
- protected final void assertEnoughColumns(int nColumns) {
- Assert.isTrue(nColumns >= getNumberOfControls(),
- "given number of columns is too small"); //$NON-NLS-1$
- }
-
- /**
- * Get attached data by key.
- *
- * @param key
- * @return the attached data object for key
- */
- public Object getAttachedData(Object key) {
- if (_attachedData != null) {
- return _attachedData.get(key);
- }
- return null;
- }
-
- /**
- * You can attach any data to the DialogField, and get it using the
- * <code>getAttachedData</code> method.
- *
- * @param key
- * @param value
- */
- public void putAttachedData(Object key, Object value) {
- if (_attachedData == null) {
- _attachedData = new HashMap();
- }
- _attachedData.put(key, value);
- }
-
- /**
- * this method give the DialogField a chance to set the correct column to
- * grab horizontal space. In the implementation of this method, should only
- * change the GridData of control, should not do anything else.
- *
- * The caller is responsible to make sure the controls for the dialog field
- * has been created before calling this method.
- */
- public void handleGrabHorizontal() {
- // do nothing.
- }
-
- public boolean isRequired() {
- return _isRequired;
- }
-
- /**
- * @param isRequired
- */
- public void setRequired(boolean isRequired) {
- this._isRequired = isRequired;
- }
-
- /**
- * @return gthe tool tip text
- */
- protected String getToolTip() {
- return toolTip;
- }
-
- public void setToolTip(String toolTip) {
- this.toolTip = toolTip;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/DialogFieldGroup.java b/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/DialogFieldGroup.java
deleted file mode 100644
index 0ed7b3a..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/DialogFieldGroup.java
+++ /dev/null
@@ -1,113 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.common.ui.internal.dialogfield;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-
-/**
- * This class represents a group of dialog fields, following the normal dialog
- * field's lifecycle.
- *
- * The design of this class is to make a section could be reused in both dialog
- * environment and form based editor environment.
- *
- * @author mengbo
- */
-public abstract class DialogFieldGroup {
- private IDialogFieldChangeListener _defaultChangeListener;
-
- private IDialogFieldApplyListener _defaultApplyListener;
-
- /**
- * set default handler, should be called before <code>initialize()</code>
- * @param changelistener
- *
- */
- public void setDefaultChangeListener(
- IDialogFieldChangeListener changelistener) {
- _defaultChangeListener = changelistener;
- }
-
- /**
- * Normally, the client should call this method in <code>initialize()</code>
- * for those field that wants to use the default event handler.
- *
- * @return could be null
- */
- public IDialogFieldChangeListener getDefaultChangeListener() {
- return _defaultChangeListener;
- }
-
- /**
- * set default handler, should be called before <code>initialize()</code>
- *
- * @param applylistener
- */
- public void setDefaultApplyListener(IDialogFieldApplyListener applylistener) {
- _defaultApplyListener = applylistener;
- }
-
- /**
- * Normally, the client should call this method in <code>initialize()</code>
- * for those field that wants to use the default event handler.
- *
- * @return could be null
- */
- public IDialogFieldApplyListener getDefaultApplyListener() {
- return _defaultApplyListener;
- }
-
- /**
- * it is supposed to create all dialog fields and setup event listeners in
- * this method.
- *
- * Normally client will create DialogFieldSection first, then
- * setDefaultChangeListener()/setDefaultApplyListener(), then call
- * initialize().
- */
- public abstract void initialize();
-
- /**
- * reload data from underlying model and set them into the dialog fields.
- *
- */
- public abstract void refreshData();
-
- /**
- * layout the dialog fields.
- *
- * @param toolkit
- * could be null
- * @param parent
- *
- */
- public abstract void layoutDialogFields(FormToolkit toolkit,
- Composite parent);
-
- /**
- * validate whether the values in the dialog fields are valid. This method
- * should also enable/disable dialog fields based on their current value and
- * relationship
- *
- * @return could return null. or an array containing null elements.
- */
- public abstract IStatus[] validateDialogFields();
-
- /**
- * Intended to allow subclasses to recreate controls. Default implementation does nothing.
- */
- public void reset(){
- //do nothing by default
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/DialogFieldGroupPage.java b/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/DialogFieldGroupPage.java
deleted file mode 100644
index 2e10f45..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/DialogFieldGroupPage.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.common.ui.internal.dialogfield;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jface.wizard.WizardPage;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.Composite;
-
-/**
- * @author mengbo
- */
-public class DialogFieldGroupPage extends WizardPage {
- private DialogFieldGroup _group;
-
- private IDialogFieldChangeListener _defaultChangeListener = new IDialogFieldChangeListener() {
- public void dialogFieldChanged(DialogField field) {
- validate();
- }
- };
-
- /**
- * @param pageName
- * @param section
- */
- public DialogFieldGroupPage(String pageName, DialogFieldGroup section) {
- super(pageName);
- _group = section;
- initializeGroup(_group);
- }
-
- /**
- * child class could override this method.
- *
- * @param group
- */
- protected void initializeGroup(DialogFieldGroup group) {
- group.setDefaultChangeListener(_defaultChangeListener);
- group.initialize();
- }
-
- public void createControl(Composite parent) {
- Composite container = new Composite(parent, SWT.NONE);
- _group.layoutDialogFields(null, container);
- _group.refreshData();
- validate();
- this.setControl(container);
- }
-
- /**
- * @return the dialog field group
- */
- public DialogFieldGroup getDialogFieldGroup() {
- return _group;
- }
-
- /**
- * validate all the dialog fields. Updates
- * status line and sets page completion if there are no errors
- */
- private void validate() {
- IStatus[] statuses = _group.validateDialogFields();
- IStatus status = StatusUtil.getMostSevere(statuses);
- StatusUtil.applyToStatusLine(this, status);
- setPageComplete(status == null || status.getSeverity() != IStatus.ERROR);
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/DialogFieldResources.java b/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/DialogFieldResources.java
deleted file mode 100644
index 30828e6..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/DialogFieldResources.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.common.ui.internal.dialogfield;
-
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-import org.eclipse.jst.jsf.common.ui.JSFUICommonPlugin;
-import org.eclipse.jst.jsf.common.ui.internal.logging.Logger;
-import org.eclipse.jst.jsf.common.ui.internal.utils.ResourceUtils;
-
-/**
- * Resource bundle class for datastore wizard and it's pages
- *
- * @author mengbo
- */
-/*package*/ class DialogFieldResources extends ResourceUtils {
- /** Create the logger for this class */
- private static Logger _log = JSFUICommonPlugin
- .getLogger(DialogFieldResources.class);
-
- private static DialogFieldResources _resource; // singleton
-
- private static final String BUNDLE = DialogFieldResources.class.getName();
-
- /**
- * Empty Constructor.
- *
- * @return WizardsResources
- */
-
- public static DialogFieldResources getInstance() {
- if (_resource == null) {
- _resource = new DialogFieldResources();
- }
- return _resource;
- }
-
- /**
- * The constructor create a resource bundle
- */
- protected DialogFieldResources() {
- try {
- _resources = ResourceBundle.getBundle(BUNDLE);
- // NOTE: this throws a runtime "MissingResourceException".
- } catch (MissingResourceException ee) {
- // Wizards.WizardResource.Error.ResourceNotFound = Unable to locate
- // resource.
- _log.error("Wizards.WizardResource.Error.ResourceNotFound", ee); //$NON-NLS-1$
- }
- setBundle(_resources, BUNDLE);
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/DialogFieldResources.properties b/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/DialogFieldResources.properties
deleted file mode 100644
index ad34404..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/DialogFieldResources.properties
+++ /dev/null
@@ -1,48 +0,0 @@
-###############################################################################
-# Copyright (c) 2001, 2007 Oracle Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# Oracle Corporation - initial API and implementation
-###############################################################################
-##################################################################
-# Resource message for SourceFolderButtonDialogField.
-##################################################################
-SourceFolderButtonDialogField.container.label = Source Folder:
-SourceFolderButtonDialogField.container.button = Browse...
-
-SourceFolderButtonDialogField.ChooseSourceContainerDialog.Title = Folder Selection
-SourceFolderButtonDialogField.ChooseSourceContainerDialog.Description = Choose a folder:
-
-SourceFolderButtonDialogField.error.EnterContainerName = Folder name is empty.
-SourceFolderButtonDialogField.error.NotSameProject = The project should be \''{0}\''.
-SourceFolderButtonDialogField.error.ContainerIsBinary=''{0}'' is a JAR archive.
-SourceFolderButtonDialogField.error.ContainerDoesNotExist=Folder ''{0}'' does not exist.
-SourceFolderButtonDialogField.error.NotAFolder=''{0}'' must be a project or folder.
-SourceFolderButtonDialogField.error.ProjectClosed=Project ''{0}'' must be accessible.
-SourceFolderButtonDialogField.warning.NotAJavaProject=Folder ''{0}'' is not a Java project.
-SourceFolderButtonDialogField.warning.NotInAJavaProject=Folder ''{0}'' is not in a Java project.
-SourceFolderButtonDialogField.warning.NotOnClassPath=Folder ''{0}'' is not on the Java build class path.
-
-
-##################################################################
-# Resource message for PackageButtonDialogField.
-##################################################################
-PackageButtonDialogField.package.label=Pac&kage:
-PackageButtonDialogField.package.button=Bro&wse...
-
-PackageButtonDialogField.error.InvalidPackageName=Package name ''{0}'' is not valid.
-PackageButtonDialogField.error.ClashOutputLocation=Package clashes with project output folder.
-PackageButtonDialogField.warning.DiscouragedPackageName=This package name ''{0}'' is discouraged.
-PackageButtonDialogField.warning.DefaultPackageDiscouraged=The use of the default package is discouraged.
-
-PackageButtonDialogField.ChoosePackageDialog.title=Package Selection
-PackageButtonDialogField.ChoosePackageDialog.description=&Choose a folder:
-PackageButtonDialogField.ChoosePackageDialog.empty=Cannot find packages to select.
-
-ClassButtonDialogField.Alert.Title=Error Open Type
-ClassButtonDialogField.Alert.Msg=The project does not have Java Nature.
-DialogFieldBase.Label.RequiredSymbol=*
\ No newline at end of file
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/IDialogFieldApplyListener.java b/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/IDialogFieldApplyListener.java
deleted file mode 100644
index e8be7b8..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/IDialogFieldApplyListener.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.common.ui.internal.dialogfield;
-
-
-/**
- * @author mengbo
- */
-public interface IDialogFieldApplyListener {
- /**
- * when the DialogField believe it should apply its value in UI, will fire
- * this event.
- *
- * Normally, for text input, when user is typing, will only fire
- * dialogFieldChanged(), when lose focus will fire dialogFieldApplied().
- *
- * For other control, such as readonly combo box, whenever user change
- * selection, will fire both dialogFieldChanged() and dialogFieldApplied()
- *
- * @param field
- */
- void dialogFieldApplied(DialogField field);
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/IDialogFieldChangeListener.java b/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/IDialogFieldChangeListener.java
deleted file mode 100644
index b5ead67..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/IDialogFieldChangeListener.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.common.ui.internal.dialogfield;
-
-
-/**
- * Change listener used by <code>DialogField</code>
- *
- * @author mengbo
- */
-public interface IDialogFieldChangeListener {
-
- /**
- * The dialog field has changed.
- * @param field
- */
- void dialogFieldChanged(DialogField field);
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/IStringButtonAdapter.java b/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/IStringButtonAdapter.java
deleted file mode 100644
index 466e355..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/IStringButtonAdapter.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.common.ui.internal.dialogfield;
-
-
-/**
- * Change listener used by <code>StringButtonDialogField</code>
- */
-public interface IStringButtonAdapter {
-
- /**
- * @param field
- */
- void changeControlPressed(DialogField field);
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/ISupportTextValue.java b/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/ISupportTextValue.java
deleted file mode 100644
index 014752d..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/ISupportTextValue.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.common.ui.internal.dialogfield;
-
-/**
- * DialogField can choose to also implement this interface. The purpose of this
- * interface is to make DialogFields to be more easily used to edit element
- * attributes, since attributes are all of string type.
- *
- * @author mengbo
- * @version 1.5
- */
-public interface ISupportTextValue {
- /**
- * @param value
- */
- public void setTextWithoutUpdate(String value);
-
- /**
- * @return the text
- */
- public String getText();
-
- /**
- * @param value
- */
- public void setText(String value);
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/JavaClassWizard.java b/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/JavaClassWizard.java
deleted file mode 100644
index 7458740..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/JavaClassWizard.java
+++ /dev/null
@@ -1,186 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.common.ui.internal.dialogfield;
-
-import java.lang.reflect.InvocationTargetException;
-import java.util.List;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.ui.JavaUI;
-import org.eclipse.jface.dialogs.IDialogSettings;
-import org.eclipse.jface.operation.IRunnableWithProgress;
-import org.eclipse.jface.wizard.Wizard;
-import org.eclipse.jst.jsf.common.ui.JSFUICommonPlugin;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.actions.WorkspaceModifyOperation;
-import org.eclipse.ui.ide.IDE;
-import org.eclipse.ui.wizards.newresource.BasicNewResourceWizard;
-
-/**
- * @author mengbo
- */
-/*package*/ class JavaClassWizard extends Wizard {
- private static String STORE_SECTION = "JavaClassWizard"; //$NON-NLS-1$
-
- private JavaClassWizardPage _mainPage;
-
- private String _className, _classArgs;
-
- private IProject _project;
-
- private String _superClass;
-
- private List _interfaceList;
-
- private boolean _autoOpenResource = true;
-
- /**
- * @param autoOpenResource
- */
- public void setAutoOpenResource(boolean autoOpenResource) {
- _autoOpenResource = autoOpenResource;
- }
-
- /**
- * @param project
- * @param className
- */
- public JavaClassWizard(IProject project, String className) {
- this(project, className, null, null);
- }
-
- /**
- * @param project
- * @param className
- * @param superClass
- * @param superInterfaces
- */
- public JavaClassWizard(IProject project, String className,
- String superClass, List superInterfaces) {
- this._project = project;
- this._className = className;
- this._superClass = superClass;
- this._interfaceList = superInterfaces;
- IDialogSettings masterSettings = JSFUICommonPlugin.getDefault()
- .getDialogSettings();
- setDialogSettings(getSettingsSection(masterSettings));
- setWindowTitle(JSFUICommonPlugin
- .getResourceString("DialogField.JavaClassWizard.NewClass"));//$NON-NLS-1$
- setNeedsProgressMonitor(true);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.wizard.IWizard#addPages()
- */
- public void addPages() {
- _mainPage = new JavaClassWizardPage(_project, _className, _superClass,
- _interfaceList);
- addPage(_mainPage);
- _mainPage.init();
- }
-
- private IDialogSettings getSettingsSection(IDialogSettings master) {
- IDialogSettings setting = master.getSection(STORE_SECTION);
- if (setting == null) {
- setting = master.addNewSection(STORE_SECTION);
- }
- return setting;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.wizard.IWizard#performFinish()
- */
- public boolean performFinish() {
- if (_mainPage.getPackageText() != null
- && _mainPage.getPackageText().length() > 0) {
- StringBuffer buffer = new StringBuffer(_mainPage.getPackageText());
- buffer.append(".");//$NON-NLS-1$
- buffer.append(_mainPage.getTypeName());
- _className = buffer.toString();
- } else {
- _className = _mainPage.getTypeName();
- }
- _classArgs = _mainPage.getClassArgs();
- IRunnableWithProgress op = new WorkspaceModifyOperation() {
- protected void execute(IProgressMonitor monitor)
- throws CoreException, InvocationTargetException,
- InterruptedException {
- _mainPage.createType(monitor);
- IResource resource = _mainPage.getModifiedResource();
- if (resource != null && _autoOpenResource) {
- selectAndReveal(resource);
- if (_project.hasNature(JavaCore.NATURE_ID)) {
- IJavaProject jProject = JavaCore.create(_project);
- IJavaElement jElement = jProject.findElement(resource
- .getProjectRelativePath()
- .removeFirstSegments(1));
- if (jElement != null) {
- JavaUI.openInEditor(jElement);
- }
- } else if (resource instanceof IFile) {
- IWorkbenchPage page = PlatformUI.getWorkbench()
- .getActiveWorkbenchWindow().getActivePage();
- IDE.openEditor(page, (IFile) resource, true);
- }
- }
- }
-
- };
- try {
- getContainer().run(false, true, op);
- } catch (InvocationTargetException e) {
- e.printStackTrace(); // PDEPlugin.logException(e);
- } catch (InterruptedException e) {
- e.printStackTrace();// PDEPlugin.logException(e);
- }
- return true;
- }
-
- private void selectAndReveal(IResource newResource) {
- BasicNewResourceWizard.selectAndReveal(newResource,
- getWorkbenchWindow());
- }
-
- private IWorkbenchWindow getWorkbenchWindow() {
- return PlatformUI.getWorkbench().getActiveWorkbenchWindow();
- }
-
- private String getClassName() {
- return _className;
- }
-
- /**
- * @return the class name including args
- */
- public String getClassNameWithArgs() {
- if (_classArgs != null && _classArgs.length() > 0) {
- StringBuffer buffer = new StringBuffer(_className);
- buffer.append(":");//$NON-NLS-1$
- buffer.append(_classArgs);
- return buffer.toString();
- }
- return getClassName();
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/JavaClassWizardPage.java b/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/JavaClassWizardPage.java
deleted file mode 100644
index b445c60..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/JavaClassWizardPage.java
+++ /dev/null
@@ -1,249 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.common.ui.internal.dialogfield;
-
-import java.util.List;
-
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IPackageFragment;
-import org.eclipse.jdt.core.IPackageFragmentRoot;
-import org.eclipse.jdt.core.JavaConventions;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.ui.wizards.NewClassWizardPage;
-
-/**
- * @author mengbo
- */
-/*package*/ class JavaClassWizardPage extends NewClassWizardPage {
- private String _className;
-
- private final IProject _project;
-
- private final InitialClassProperties _initialValues;
-
- private IJavaProject _javaProject;
-
- private IStatus _fClassNameStatus, _fPackageNameStatus;
-
- private final static String SOURCE_COMPLIANCE_1_3 = JavaCore.VERSION_1_3;
-
- static class InitialClassProperties {
- // populate new wizard page
- private String superClassName;
-
- private List interfacesName;
-
- private String className;
-
- private String classArgs;
-
- private String packageName;
-
- private IPackageFragmentRoot packageFragmentRoot;
-
- private IPackageFragment packageFragment;
-
- InitialClassProperties() {
- this.superClassName = ""; //$NON-NLS-1$
- this.interfacesName = null;
- this.className = null;
- this.classArgs = null;
- this.packageName = null;
- this.packageFragment = null;
- this.packageFragmentRoot = null;
- }
- }
-
- /**
- * @param project
- * @param className
- * @param superClassName
- * @param interfacesName
- */
- public JavaClassWizardPage(IProject project, String className,
- String superClassName, List interfacesName) {
- super();
- this._className = className;
- this._project = project;
- try {
- if (project != null && project.hasNature(JavaCore.NATURE_ID)) {
- this._javaProject = JavaCore.create(project);
- } else {
- this._javaProject = null;
- }
- } catch (CoreException e) {
- e.printStackTrace();// PDEPlugin.logException(e);
- }
- _initialValues = new InitialClassProperties();
- _initialValues.className = className;
- _initialValues.superClassName = superClassName;
- _initialValues.interfacesName = interfacesName;
- }
-
- /**
- * @param project
- * @param className
- */
- public JavaClassWizardPage(IProject project, String className) {
- this(project, className, null, null);
- }
-
- /**
- * Call when page is added to wizard to initialize
- */
- public void init() {
- initializeExpectedValues();
- initializeWizardPage();
- }
-
- private void initializeExpectedValues() {
- // source folder name, package name, class name
- int loc = _className.indexOf(":"); //$NON-NLS-1$
- if (loc != -1) {
- if (loc < _className.length()) {
- _initialValues.classArgs = _className.substring(loc + 1,
- _className.length());
- _className = _className.substring(0, loc);
- }
- if (loc > 0) {
- _initialValues.className = _className.substring(0, loc);
- } else if (loc == 0) {
- _initialValues.className = ""; //$NON-NLS-1$
- }
- }
- _fClassNameStatus = JavaConventions
- .validateJavaTypeName(_initialValues.className, SOURCE_COMPLIANCE_1_3,SOURCE_COMPLIANCE_1_3);
-
- loc = _className.lastIndexOf('.');
- if (loc != -1) {
- _initialValues.packageName = _className.substring(0, loc);
- _initialValues.className = _className.substring(loc + 1);
- _fPackageNameStatus = JavaConventions
- .validateJavaTypeName(_initialValues.packageName, SOURCE_COMPLIANCE_1_3,SOURCE_COMPLIANCE_1_3);
- _fClassNameStatus = JavaConventions
- .validateJavaTypeName(_initialValues.className, SOURCE_COMPLIANCE_1_3,SOURCE_COMPLIANCE_1_3);
- }
- if (_javaProject == null) {
- return;
- }
- try {
- if (_initialValues.packageFragmentRoot == null) {
- IPackageFragmentRoot srcEntryDft = null;
- IPackageFragmentRoot[] roots = _javaProject
- .getPackageFragmentRoots();
- for (int i = 0; i < roots.length; i++) {
- if (roots[i].getKind() == IPackageFragmentRoot.K_SOURCE) {
- srcEntryDft = roots[i];
- break;
- }
- }
- if (srcEntryDft != null) {
- _initialValues.packageFragmentRoot = srcEntryDft;
- } else {
- _initialValues.packageFragmentRoot = _javaProject
- .getPackageFragmentRoot(_javaProject.getResource());
- }
- if (_initialValues.packageFragment == null
- && _initialValues.packageFragmentRoot != null
- && _initialValues.packageName != null
- && _initialValues.packageName.length() > 0) {
- IFolder packageFolder = _project
- .getFolder(_initialValues.packageName);
- _initialValues.packageFragment = _initialValues.packageFragmentRoot
- .getPackageFragment(packageFolder
- .getProjectRelativePath().toOSString());
- }
- }
- // superclass and interface
- if (_initialValues.superClassName == null) {
- _initialValues.superClassName = "java.lang.Object"; //$NON-NLS-1$
- }
-// _initialValues.superClassType = findTypeForName(_initialValues.superClassName);
- } catch (JavaModelException e) {
- e.printStackTrace();// PDEPlugin.logException(e);
- }
- }
-
- /**
- * initialize the wizard page
- */
- protected void initializeWizardPage() {
- setPackageFragmentRoot(_initialValues.packageFragmentRoot, true);
- setPackageFragment(_initialValues.packageFragment, true);
- setEnclosingType(null, true);
- setEnclosingTypeSelection(false, true);
- setTypeName(_initialValues.className, true);
- setSuperClass(_initialValues.superClassName, true);
- if (_initialValues.interfacesName != null) {
- setSuperInterfaces(_initialValues.interfacesName, true);
- }
- boolean hasSuperClass = _initialValues.superClassName != null
- && _initialValues.superClassName.length() > 0;
- boolean hasInterface = _initialValues.interfacesName != null
- && _initialValues.interfacesName.size() > 0;
- setMethodStubSelection(false, hasSuperClass, hasInterface
- || hasSuperClass, true);
- }
-
-// private IType findTypeForName(String typeName) throws JavaModelException {
-// if (typeName == null || typeName.length() == 0) {
-// return null;
-// }
-// IType type = null;
-// String fileName = typeName.replace('.', '/') + ".java"; //$NON-NLS-1$
-// IJavaElement element = _javaProject.findElement(new Path(fileName));
-// if (element == null) {
-// return null;
-// }
-// if (element instanceof IClassFile) {
-// type = ((IClassFile) element).getType();
-// } else if (element instanceof ICompilationUnit) {
-// IType[] types = ((ICompilationUnit) element).getTypes();
-// type = types[0];
-// }
-// return type;
-// }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jdt.ui.wizards.NewClassWizardPage#setVisible(boolean)
- */
- public void setVisible(boolean visible) {
- super.setVisible(visible);
- // policy: wizards are not allowed to come up with an error message;
- // in this wizard, some fields may need initial validation and thus,
- // potentially start with an error message.
- if (_fClassNameStatus != null && !_fClassNameStatus.isOK()) {
- updateStatus(_fClassNameStatus);
- }
- if (_fPackageNameStatus != null && !_fPackageNameStatus.isOK()) {
- updateStatus(_fPackageNameStatus);
- }
- }
-
- /**
- * @return the class arguments or "" if not set
- */
- public String getClassArgs() {
- if (_initialValues.classArgs == null) {
- return ""; //$NON-NLS-1$
- }
- return _initialValues.classArgs;
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/JavaSearchScope.java b/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/JavaSearchScope.java
deleted file mode 100644
index 8ac5807..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/JavaSearchScope.java
+++ /dev/null
@@ -1,221 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.common.ui.internal.dialogfield;
-
-import java.util.ArrayList;
-import java.util.HashSet;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.ITypeHierarchy;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.core.search.IJavaSearchScope;
-import org.eclipse.jst.jsf.common.ui.IFileFolderConstants;
-
-/**
- * @author mengbo
- */
-/*package*/ class JavaSearchScope implements IJavaSearchScope {
- private final IProject _project;
-
- private final String _superType;
-
- private HashSet _allowedTypeSet;
-
- private IPath[] _enclosingProjectsAndJars;
-
- private IProject[] _relativeProjects;
-
- /**
- * @param project
- * @param superType
- */
- public JavaSearchScope(IProject project, String superType) {
- this._project = project;
- this._superType = superType;
- computeRelativeProjects();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jdt.core.search.IJavaSearchScope#enclosingProjectsAndJars()
- */
- public IPath[] enclosingProjectsAndJars() {
- if (_enclosingProjectsAndJars == null) {
- ArrayList list = new ArrayList();
- for (int i = 0; i < _relativeProjects.length; i++) {
- try {
- if (_relativeProjects[i].hasNature(JavaCore.NATURE_ID)) {
- IJavaProject javaProject = JavaCore
- .create(_relativeProjects[i]);
- IClasspathEntry[] classpath = javaProject
- .getResolvedClasspath(true);
- for (int j = 0; j < classpath.length; j++) {
- list.add(classpath[j].getPath());
- }
- list.add(javaProject.getPath());
- }
- } catch (CoreException e)// NOPMD
- {
- // skip the project.
- }
- }
- _enclosingProjectsAndJars = (IPath[]) list.toArray(new IPath[(list
- .size())]);
- }
- return _enclosingProjectsAndJars;
- }
-
- private void computeRelativeProjects() {
- try {
- IProject[] referencedProjects = _project.getReferencedProjects();
- _relativeProjects = new IProject[referencedProjects.length + 1];
- System.arraycopy(referencedProjects, 0, _relativeProjects, 1,
- referencedProjects.length);
- _relativeProjects[0] = _project;
- } catch (CoreException e) {
- _relativeProjects = new IProject[] { _project };
- }
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jdt.core.search.IJavaSearchScope#encloses(java.lang.String)
- */
- public boolean encloses(String resourcePath) {
- if (_allowedTypeSet == null) {
- try {
- _allowedTypeSet = findAllowedTypes(_superType);
- } catch (CoreException e) {
- e.printStackTrace();
- }
- }
- if (_allowedTypeSet == null) {
- _allowedTypeSet = new HashSet();
- }
- int separatorIndex = resourcePath.indexOf(JAR_FILE_ENTRY_SEPARATOR);
- if (separatorIndex != -1) {
- String className = resourcePath.substring(separatorIndex + 1,
- resourcePath.length() - 6).replace('/', '.');
- if (_allowedTypeSet.contains(className)) {
- return true;
- }
- } else if (_allowedTypeSet.contains(resourcePath)) {
- return true;
- }
- return false;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jdt.core.search.IJavaSearchScope#encloses(org.eclipse.jdt.core.IJavaElement)
- */
- public boolean encloses(IJavaElement element) {
- return encloses(element.getPath().toString());
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jdt.core.search.IJavaSearchScope#includesBinaries()
- */
- public boolean includesBinaries() {
- return true;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jdt.core.search.IJavaSearchScope#includesClasspaths()
- */
- public boolean includesClasspaths() {
- return true;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jdt.core.search.IJavaSearchScope#setIncludesBinaries(boolean)
- */
- public void setIncludesBinaries(boolean includesBinaries) {
- // do nothing, includeBinaries always true
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jdt.core.search.IJavaSearchScope#setIncludesClasspaths(boolean)
- */
- public void setIncludesClasspaths(boolean includesClasspaths) {
- // do nothing, includeClasspaths always trues
- }
-
- private HashSet findAllowedTypes(String superType) throws CoreException {
- HashSet set = new HashSet();
-
- IProject[] projects = _relativeProjects;
-
- for (int i = 0; i < projects.length; i++) {
- IType type = null;
- if (projects[i].hasNature(JavaCore.NATURE_ID)) {
- IJavaProject javaProject = JavaCore.create(projects[i]);
- if (superType != null) {
- try {
- type = javaProject.findType(superType);
- if (type != null) {
- ITypeHierarchy typeHierarchy = type
- .newTypeHierarchy(javaProject, null);
- IType[] subtypes = typeHierarchy
- .getAllSubtypes(type);
- for (int j = 0; j < subtypes.length; j++) {
- if (!subtypes[j].isBinary()) {
- set.add(subtypes[j].getPath().toString());
- } else {
- String path = subtypes[j].getPath()
- .toString();
- if (path != null
- && path
- .endsWith(IFileFolderConstants.DOT
- + IFileFolderConstants.EXT_JAR)) {
- set.add(subtypes[j]
- .getFullyQualifiedName());
- } else {
- set.add(path);
- }
- }
- }
- }
- } catch (JavaModelException e) {
- e.printStackTrace();
- }
- }
- }
- }
- return set;
- }
-
- /**
- * @return Returns the superType.
- */
- public String getSuperType() {
- return _superType;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/JavaSearchScopeDecorator.java b/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/JavaSearchScopeDecorator.java
deleted file mode 100644
index 94cd55c..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/JavaSearchScopeDecorator.java
+++ /dev/null
@@ -1,139 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.common.ui.internal.dialogfield;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.search.IJavaSearchScope;
-
-/**
- * @author mengbo
- * @version 1.5
- */
-/*package*/ class JavaSearchScopeDecorator implements IJavaSearchScope {
- JavaSearchScope[] _scopes = new JavaSearchScope[0];
-
- /**
- * @param project
- * @param superTypes
- */
- public JavaSearchScopeDecorator(IProject project, List superTypes) {
- List scopeList = new ArrayList();
- if (superTypes != null) {
- for (int i = 0; i < superTypes.size(); i++) {
- scopeList.add(new JavaSearchScope(project, superTypes.get(i)
- .toString()));
- }
- }
- _scopes = (JavaSearchScope[]) scopeList
- .toArray(new JavaSearchScope[scopeList.size()]);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jdt.core.search.IJavaSearchScope#encloses(java.lang.String)
- */
- public boolean encloses(String resourcePath) {
- for (int i = 0; i < _scopes.length; i++) {
- if (_scopes[i].encloses(resourcePath) == true) {
- return true;
- }
- }
- return false;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jdt.core.search.IJavaSearchScope#encloses(org.eclipse.jdt.core.IJavaElement)
- */
- public boolean encloses(IJavaElement element) {
- for (int i = 0; i < _scopes.length; i++) {
- if (_scopes[i].encloses(element) == true) {
- return true;
- }
- }
- return false;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jdt.core.search.IJavaSearchScope#enclosingProjectsAndJars()
- */
- public IPath[] enclosingProjectsAndJars() {
- Set set = new HashSet();
- for (int i = 0; i < _scopes.length; i++) {
- set.addAll(Arrays.asList(_scopes[i].enclosingProjectsAndJars()));
- }
- return (IPath[]) set.toArray(new IPath[set.size()]);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jdt.core.search.IJavaSearchScope#includesBinaries()
- */
- public boolean includesBinaries() {
- for (int i = 0; i < _scopes.length; i++) {
- if (_scopes[i].includesBinaries() == true) {
- return true;
- }
- }
- return false;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jdt.core.search.IJavaSearchScope#includesClasspaths()
- */
- public boolean includesClasspaths() {
- for (int i = 0; i < _scopes.length; i++) {
- if (_scopes[i].includesClasspaths() == true) {
- return true;
- }
- }
- return false;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jdt.core.search.IJavaSearchScope#setIncludesBinaries(boolean)
- */
- public void setIncludesBinaries(boolean includesBinaries) {
- for (int i = 0; i < _scopes.length; i++) {
- _scopes[i].setIncludesBinaries(includesBinaries);
- }
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jdt.core.search.IJavaSearchScope#setIncludesClasspaths(boolean)
- */
- public void setIncludesClasspaths(boolean includesClasspaths) {
- for (int i = 0; i < _scopes.length; i++) {
- _scopes[i].setIncludesClasspaths(includesClasspaths);
- }
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/JavaUIHelper.java b/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/JavaUIHelper.java
deleted file mode 100644
index 8bee860..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/JavaUIHelper.java
+++ /dev/null
@@ -1,140 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.common.ui.internal.dialogfield;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.core.search.IJavaSearchScope;
-import org.eclipse.jdt.core.search.SearchEngine;
-import org.eclipse.jdt.ui.JavaUI;
-import org.eclipse.jface.dialogs.ProgressMonitorDialog;
-import org.eclipse.jst.jsf.common.ui.JSFUICommonPlugin;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.dialogs.SelectionDialog;
-import org.eclipse.ui.ide.IDE;
-
-/**
- * @author mengbo
- */
-public final class JavaUIHelper {
- /**
- * @param project
- * @param className
- */
- static void doOpenClass(IProject project, String className) {
- String path = className.replace('.', '/') + ".java"; //$NON-NLS-1$
- try {
- if (project.hasNature(JavaCore.NATURE_ID)) {
- IJavaProject javaProject = JavaCore.create(project);
- IJavaElement result = javaProject.findElement(new Path(path));
- JavaUI.openInEditor(result);
- } else {
- IResource resource = project.findMember(new Path(path));
- if (resource instanceof IFile) {
- IWorkbenchPage page = PlatformUI.getWorkbench()
- .getActiveWorkbenchWindow().getActivePage();
- IDE.openEditor(page, (IFile) resource, true);
- }
- }
- } catch (PartInitException e) {
- e.printStackTrace();// PDEPlugin.logException(e);
- } catch (JavaModelException e) {
- e.printStackTrace();// Display.getCurrent().beep();
- } catch (CoreException e) {
- e.printStackTrace();// PDEPlugin.logException(e);
- }
- }
-
- /**
- * @param project
- * @param className
- * @return true if the class exists in project
- */
- static boolean doesClassExist(IProject project, String className) {
- String path = className.replace('.', '/') + ".java"; //$NON-NLS-1$
- try {
- if (project.hasNature(JavaCore.NATURE_ID)) {
- IJavaProject javaProject = JavaCore.create(project);
-
- IJavaElement result = javaProject.findElement(new Path(path));
- return result != null;
- }
- IResource resource = project.findMember(new Path(path));
- return resource != null;
- } catch (JavaModelException e) {
- return false;
- } catch (CoreException e) {
- return false;
- }
- }
-
- /**
- * @param shell
- * @param searchScope
- * @param typeFlag
- * @return the selection dialog
- */
- static SelectionDialog openSelectionDialog(Shell shell,
- IJavaSearchScope searchScope, int typeFlag) {
- try {
- return JavaUI.createTypeDialog(shell, new ProgressMonitorDialog(
- shell), searchScope, typeFlag, false);
- } catch (JavaModelException e) {
- JSFUICommonPlugin.getLogger(JavaUIHelper.class).error(e);
- return null;
- }
- }
-
- /**
- * @param shell
- * @param project
- * @param superType
- * @param typeFlag
- * @return the selection dialog
- */
- public static SelectionDialog openSelectionDialog(Shell shell,
- IProject project, String superType, int typeFlag) {
- IJavaSearchScope searchScope = findSearchScope(project, superType);
- return openSelectionDialog(shell, searchScope, typeFlag);
- }
-
- /**
- * @param project
- * @param superType
- * @return the search scope
- */
- static IJavaSearchScope findSearchScope(IProject project,
- String superType) {
- if (project != null) {
- if (superType == null || "".equals(superType)) { //$NON-NLS-1$
- superType = "java.lang.Object";//$NON-NLS-1$
- }
- return new JavaSearchScope(project, superType);
- }
- return SearchEngine.createWorkspaceScope();
- }
-
- private JavaUIHelper()
- {
- // static helper, no instantiation
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/LayoutUtil.java b/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/LayoutUtil.java
deleted file mode 100644
index 2457cd1..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/LayoutUtil.java
+++ /dev/null
@@ -1,116 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.common.ui.internal.dialogfield;
-
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.resource.JFaceResources;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.FontMetrics;
-import org.eclipse.swt.graphics.GC;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-
-/**
- * A layout utility class
- *
- */
-public final class LayoutUtil {
- // The Text control looks higher then Button control when they have the same
- // height,
- // Increasing the height of 5 pixels will make them looks the same height.
- private final static int BUTTON_HEIGHT_ADJUSTMENT = 5;
-
-
- /**
- * @param control
- * @param grab
- */
- public static void setGrabHorizontal(Control control, boolean grab) {
- Object ld = control.getLayoutData();
- if (ld instanceof GridData) {
- ((GridData) ld).grabExcessHorizontalSpace = grab;
- }
- }
-
- /**
- * Sets the width hint of a control. Assumes that GridData is used.
- * @param control
- * @param widthHint
- */
- public static void setWidthHint(Control control, int widthHint) {
- Object ld = control.getLayoutData();
- if (ld instanceof GridData) {
- ((GridData) ld).widthHint = widthHint;
- }
- }
-
-
- /**
- * Sets the horizontal indent of a control. Assumes that GridData is used.
- * @param control
- * @param horizontalIndent
- */
- static void setHorizontalIndent(Control control, int horizontalIndent) {
- Object ld = control.getLayoutData();
- if (ld instanceof GridData) {
- ((GridData) ld).horizontalIndent = horizontalIndent;
- }
- }
-
- /**
- * Sets the horizontal indent of a control. Assumes that GridData is used.
- * @param control
- */
- public static void setHorizontalGrabbing(Control control) {
- Object ld = control.getLayoutData();
- if (ld instanceof GridData) {
- ((GridData) ld).grabExcessHorizontalSpace = true;
- }
- }
-
- /**
- * Returns a width hint for a button control.
- * @param button
- * @return the hint value
- */
- static int getButtonWidthHint(Button button) {
- if (button.getFont().equals(JFaceResources.getDefaultFont()))
- button.setFont(JFaceResources.getDialogFont());
-
- GC gc = new GC(button);
- gc.setFont(button.getFont());
- FontMetrics fontMetrics = gc.getFontMetrics();
- gc.dispose();
-
- int length = button.getText().length();
- int widthHint = Dialog.convertWidthInCharsToPixels(fontMetrics,
- length < 2 ? 2 : length);
- return Math.max(widthHint, button.computeSize(SWT.DEFAULT, SWT.DEFAULT,
- true).x);
- }
-
- static int getButtonHeightHint(FormToolkit toolkit, Text text) {
- if (toolkit != null) {
- return text.computeSize(SWT.DEFAULT, SWT.DEFAULT, true).y
- + BUTTON_HEIGHT_ADJUSTMENT;
- }
- return text.computeSize(SWT.DEFAULT, SWT.DEFAULT, true).y;
- }
-
- private LayoutUtil()
- {
- // static utility class; no instantiation
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/RadiosDialogField.java b/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/RadiosDialogField.java
deleted file mode 100644
index 7db537b..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/RadiosDialogField.java
+++ /dev/null
@@ -1,233 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.common.ui.internal.dialogfield;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.RowLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-
-/**
- * This will display a labal and a group of radio buttons. The group of radio
- * buttons will be layed out horizontally use a RowLayout, and them as a group
- * will use one cell in the GridLayout.
- *
- * Whenever the radios selection change will fire both dialogFieldChanged() and
- * dialogFieldApplied() event.
- *
- * @author mengbo
- */
-public class RadiosDialogField extends DialogFieldBase {
- final static private String INDEXKEY = "INDEX"; //$NON-NLS-1$
-
- private Composite _group;
-
- private String[] _items;
-
- private Button[] _button;
-
- private int _selectIndex = -1;
-
- private boolean _fireEvent = true;
-
- /**
- * Default constructor
- */
- public RadiosDialogField() {
- super();
- }
-
- /**
- * this method must be called before create control
- *
- * @param items
- */
- public void setItems(String[] items) {
- _items = items;
- _button = new Button[_items.length];
- }
-
- // ------- layout helpers
-
- /*
- * @see DialogField#doFillIntoGrid
- */
- public Control[] doFillIntoGrid(FormToolkit toolkit, Composite parent,
- int nColumns) {
- assertEnoughColumns(nColumns);
-
- Control requiredLabel = getRequiredLabelControl(toolkit, parent);
- requiredLabel.setLayoutData(gridDataForLabel(1));
-
- Control label = getLabelControl(toolkit, parent);
- label.setLayoutData(gridDataForLabel(1));
-
- _group = getGroup(toolkit, parent);
- _group.setLayoutData(gridDataForGroup(nColumns - 2));
-
- return new Control[] { requiredLabel, label, _group };
- }
-
- /*
- * @see DialogField#getNumberOfControls
- */
- public int getNumberOfControls() {
- return 3;
- }
-
- /**
- * @param span
- * @return the grid data
- */
- protected static GridData gridDataForGroup(int span) {
- GridData gd = new GridData();
- gd.horizontalAlignment = GridData.FILL;
- gd.grabExcessHorizontalSpace = false;
- gd.horizontalSpan = span;
- return gd;
- }
-
- // ------- focus methods
-
- /*
- * @see DialogField#setFocus
- */
- public boolean setFocus() {
- if (isOkToUse(_group)) {
- _group.setFocus();
- }
- return true;
- }
-
- // ------- ui creation
-
- /**
- * @param toolkit
- * @param parent
- * @return the group composite
- */
- public Composite getGroup(FormToolkit toolkit, Composite parent) {
- if (_group == null || _group.isDisposed()) {
- assertCompositeNotNull(parent);
- if (toolkit != null) {
- _group = toolkit.createComposite(parent);
- } else {
- _group = new Composite(parent, SWT.NONE);
- }
- RowLayout layout = new RowLayout();
- layout.marginBottom = 0;
- _group.setLayout(layout);
- for (int i = 0; i < _items.length; i++) {
- if (toolkit != null) {
- _button[i] = toolkit.createButton(_group, _items[i],
- SWT.RADIO);
- } else {
- _button[i] = new Button(_group, SWT.RADIO);
- _button[i].setText(_items[i]);
- }
- _button[i].setData(INDEXKEY, new Integer(i));
- _button[i].addSelectionListener(new SelectionAdapter() {
- public void widgetSelected(SelectionEvent e) {
- if (_fireEvent) {
- _selectIndex = ((Integer) e.widget
- .getData(INDEXKEY)).intValue();
- // FIXME: seemed will fire widgetSelected twice, one
- // for the deselect one,
- // one for the newly selected one. Need investigate.
- if (((Button) e.widget).getSelection()) {
- dialogFieldChangedAndApplied();
- }
- }
- }
-
- });
- }
- }
- return _group;
- }
-
- // ------ enable / disable management
-
- /*
- * @see DialogField#updateEnableState
- */
- protected void updateEnableState() {
- super.updateEnableState();
- if (isOkToUse(_group)) {
- _group.setEnabled(isEnabled());
- }
- }
-
- // ------ text access
-
- /**
- * Sets the text. Triggers a dialog-changed event.
- * @param index
- */
- public void setSelectedIndex(int index) {
- _selectIndex = index;
- if (isOkToUse(_group)) {
- if (_selectIndex >= 0 && _selectIndex < _items.length) {
- _button[_selectIndex].setSelection(true);
- } else {
- for (int i = 0; i < _items.length; i++) {
- if (_button[i].getSelection()) {
- _button[i].setSelection(false);
- }
- }
- }
- }
- dialogFieldChangedAndApplied();
- }
-
- /**
- * Sets the text without triggering a dialog-changed event.
- * @param index
- */
- public void setSelectedIndexWithoutUpdate(int index) {
- _selectIndex = index;
- if (isOkToUse(_group)) {
- _fireEvent = false;
- if (_selectIndex >= 0 && _selectIndex < _items.length) {
- _button[_selectIndex].setSelection(true);
- } else {
- for (int i = 0; i < _items.length; i++) {
- if (_button[i].getSelection()) {
- _button[i].setSelection(false);
- }
- }
- }
- _fireEvent = true;
- }
- }
-
- /**
- * @return the index selected
- */
- public int getSelectedIndex() {
- return _selectIndex;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.jsf.common.ui.internal.dialogfield.DialogField#handleGrabHorizontal()
- */
- public void handleGrabHorizontal() {
- LayoutUtil.setGrabHorizontal(this._group, true);
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/ResourceButtonDialogField.java b/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/ResourceButtonDialogField.java
deleted file mode 100644
index 8ab30f0..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/ResourceButtonDialogField.java
+++ /dev/null
@@ -1,231 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.common.ui.internal.dialogfield;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.jface.window.Window;
-import org.eclipse.jst.jsf.common.ui.JSFUICommonPlugin;
-import org.eclipse.jst.jsf.common.ui.internal.dialogs.CommonResourceDialog;
-import org.eclipse.jst.jsf.common.ui.internal.utils.PathUtil;
-import org.eclipse.jst.jsf.common.ui.internal.utils.WebrootUtil;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.Shell;
-
-/**
- * This class provides a common resource choice DialogFiled. You must set a
- * no-null IProject instance to enable it working. You should give it a suffix
- * list if you want to choose files ended with specific file extensions. The
- * selection result will be a relative path based on the _referredFile's value
- * if it is set, or else based on the _project path.
- *
- * The usage: Shell shell = new Shell(); IProject project = getProject();
- * ResourceButtonDialogField localeField = new
- * ResourceButtonDialogField(project);
- * localeField.setResourceDescription("image"); localeField.setSuffixs(new
- * String[]{"bmp","jpg","gif"});
- * localeField.setReferredFile(StructuredModelUtil.getFileFor(_element.getModel()));
- *
- * @author mengbo
- */
-public class ResourceButtonDialogField extends StringButtonDialogField {
- private IProject _project;
-
- private String[] _suffixs;
-
- private String _resourceDescription;
-
- private IFile _referredFile;
-
- private boolean _isWebPath = false;
-
- private IFolder _folder;
-
- private String _separator = ""; //$NON-NLS-1$
-
- /**
- * @param project
- */
- public ResourceButtonDialogField(IProject project) {
- this(null, project);
- setStringButtonAdapter(new IStringButtonAdapter() {
- public void changeControlPressed(DialogField field) {
- String oldValue = getText();
- String newValue = browseButtonPressed();
- if (newValue != null && !newValue.equals(oldValue)) {
- setText(newValue);
- }
- }
- });
- }
-
- /**
- * @param adapter
- * @param project
- */
- public ResourceButtonDialogField(IStringButtonAdapter adapter,
- IProject project) {
- super(adapter);
- this._project = project;
- }
-
- /**
- * @return the string
- */
- protected String browseButtonPressed() {
- Shell shell = getShell();
- CommonResourceDialog dialog = null;
- int style = "".equals(_separator) ? SWT.NONE : SWT.MULTI | SWT.H_SCROLL //$NON-NLS-1$
- | SWT.V_SCROLL;
- if (_folder != null) {
- dialog = new CommonResourceDialog(shell, _folder.getProject(), style);
- } else {
- dialog = new CommonResourceDialog(shell, _project, style);
- }
- dialog.setTitle(JSFUICommonPlugin
- .getResourceString("DialogField.ResourceButton.SelectFile"));//$NON-NLS-1$
- dialog.setSuffixs(_suffixs);
- dialog.setResourceDescription(_resourceDescription);
-
- if (dialog.open() == Window.OK) {
- Object[] result = dialog.getResult();
- StringBuffer buffer = new StringBuffer();
- for (int i = 0; i < result.length; i++) {
- String newValue = null;
- IPath path = ((IFile) result[i]).getLocation();
-
- IPath referredPath = null;
- if (_referredFile != null) {
- referredPath = _referredFile.getLocation();
- } else {
- referredPath = _project.getLocation();
- }
- if (this._isWebPath) {
- IFile selectedFile = ((IFile) result[i]);
- newValue = WebrootUtil.getWebPath(selectedFile
- .getFullPath());
- } else {
- newValue = PathUtil.convertToRelativePath(path.toString(),
- referredPath.toString());
- }
- buffer.append(newValue);
- buffer.append(_separator);
- }
- if (buffer.length() > 0) {
- return buffer.substring(0, buffer.length()
- - _separator.length());
- }
-
- }
- return null;
- }
-
- /**
- * @return Returns the project.
- */
- public IProject getProject() {
- return _project;
- }
-
- /**
- * @param project
- * The project to set.
- */
- public void setProject(IProject project) {
- this._project = project;
- }
-
- /**
- * @return Returns the relative folder.
- */
- public IFolder getFolder() {
- return _folder;
- }
-
- /**
- * @param folder
- * The relative folder to set.
- */
- public void setFolder(IFolder folder) {
- this._folder = folder;
- }
-
- /**
- * @return Returns the referredFile.
- */
- public IFile getReferredFile() {
- return _referredFile;
- }
-
- /**
- * @param referredFile
- * The referredFile to set.
- */
- public void setReferredFile(IFile referredFile) {
- this._referredFile = referredFile;
- }
-
- /**
- * @return Returns the resourceDescription.
- */
- public String getResourceDescription() {
- return _resourceDescription;
- }
-
- /**
- * @param resourceDescription
- * The resourceDescription to set.
- */
- public void setResourceDescription(String resourceDescription) {
- this._resourceDescription = resourceDescription;
- }
-
- /**
- * @return Returns the suffixs.
- */
- public String[] getSuffixs() {
- return _suffixs;
- }
-
- /**
- * @param suffixs
- * The suffixs to set.
- */
- public void setSuffixs(String[] suffixs) {
- this._suffixs = suffixs;
- }
-
- /**
- * set some special path to web path instead of relative path
- *
- * @param isWebPath
- */
- public void setWebPath(boolean isWebPath) {
- this._isWebPath = isWebPath;
- }
-
- /**
- * @return the separator string
- */
- public String getSeparator() {
- return _separator;
- }
-
- /**
- * @param separator
- */
- public void setSeparator(String separator) {
- this._separator = separator;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/Separator.java b/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/Separator.java
deleted file mode 100644
index f54722a..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/Separator.java
+++ /dev/null
@@ -1,128 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.common.ui.internal.dialogfield;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-
-/**
- * Dialog field describing a separator.
- */
-public class Separator extends DialogFieldBase {
-
- private Label _separator;
-
- private int _style;
-
- /**
- * Default constructor
- */
- public Separator() {
- this(SWT.NONE);
- }
-
- /**
- * @param style
- * of the separator. See <code>Label</code> for possible
- * styles.
- */
- public Separator(int style) {
- _style = style;
- }
-
- // ------- layout helpers
-
- /**
- * Creates the separator and fills it in a MGridLayout.
- * @param toolkit
- * @param parent
- * @param nColumns
- *
- * @param height
- * The heigth of the separator
- * @return the controls or empty array
- */
- public Control[] doFillIntoGrid(FormToolkit toolkit, Composite parent,
- int nColumns, int height) {
- assertEnoughColumns(nColumns);
-
- Control separator = getSeparator(toolkit, parent);
- separator.setLayoutData(gridDataForSeperator(nColumns, height));
-
- return new Control[] { separator };
- }
-
- /*
- * @see DialogField#doFillIntoGrid
- */
- public Control[] doFillIntoGrid(FormToolkit toolkit, Composite parent,
- int nColumns) {
- return doFillIntoGrid(toolkit, parent, nColumns, 4);
- }
-
- /*
- * @see DialogField#getNumberOfControls
- */
- public int getNumberOfControls() {
- return 1;
- }
-
- /**
- * @param span
- * @param height
- * @return the grid data
- */
- protected static GridData gridDataForSeperator(int span, int height) {
- GridData gd = new GridData();
- gd.horizontalAlignment = GridData.FILL;
- gd.verticalAlignment = GridData.BEGINNING;
- gd.heightHint = height;
- gd.horizontalSpan = span;
- return gd;
- }
-
- // ------- ui creation
-
- /**
- * Creates or returns the created separator.
- * @param toolkit
- *
- * @param parent
- * The parent composite or <code>null</code> if the widget has
- * already been created.
- * @return the separator
- */
- private Control getSeparator(FormToolkit toolkit, Composite parent) {
- if (_separator == null || _separator.isDisposed()) {
- assertCompositeNotNull(parent);
- if (toolkit != null) {
- _separator = toolkit.createSeparator(parent, _style);
- } else {
- _separator = new Label(parent, _style);
- }
- }
- return _separator;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.jsf.common.ui.internal.dialogfield.DialogField#handleGrabHorizontal()
- */
- public void handleGrabHorizontal() {
- // do nothing.
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/SourceFolderButtonDialogField.java b/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/SourceFolderButtonDialogField.java
deleted file mode 100644
index 420a950..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/SourceFolderButtonDialogField.java
+++ /dev/null
@@ -1,340 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.common.ui.internal.dialogfield;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IJavaModel;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IPackageFragmentRoot;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.ui.JavaElementComparator;
-import org.eclipse.jdt.ui.JavaElementLabelProvider;
-import org.eclipse.jdt.ui.StandardJavaElementContentProvider;
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerFilter;
-import org.eclipse.jface.window.Window;
-import org.eclipse.jst.jsf.common.ui.JSFUICommonPlugin;
-import org.eclipse.jst.jsf.common.ui.internal.logging.Logger;
-import org.eclipse.ui.dialogs.ElementTreeSelectionDialog;
-
-/**
- * This class provides a source folder selection DialogFiled. There are two
- * conditions: 1. If you set the IProject instance, the source folder selection
- * will only be limited in the specified project 2. If you set null, the source
- * folder selection is allowed in all workspaces
- *
- *
- * @author mengbo
- * @version 1.5
- */
-public class SourceFolderButtonDialogField extends StringButtonDialogField {
- /** Create the logger for this class */
- private static Logger _log = JSFUICommonPlugin
- .getLogger(SourceFolderButtonDialogField.class);
-
- /**
- * package fragment root corresponding to the input type (can be null)
- */
- private IPackageFragmentRoot _fCurrRoot;
-
- private IProject _project;
-
- /**
- * @param project
- */
- public SourceFolderButtonDialogField(IProject project) {
- super(null);
-
- _project = project;
-
- setLabelText(DialogFieldResources.getInstance().getString(
- "SourceFolderButtonDialogField.container.label")); //$NON-NLS-1$
-
- setButtonLabel(DialogFieldResources.getInstance().getString(
- "SourceFolderButtonDialogField.container.button")); //$NON-NLS-1$
-
- setStringButtonAdapter(new IStringButtonAdapter() {
- public void changeControlPressed(DialogField field) {
- containerChangeControlPressed(field);
- }
-
- });
- }
-
- /**
- * @return Returns the project.
- */
- public IProject getProject() {
- return _project;
- }
-
- /**
- * @param project
- * The project to set.
- */
- public void setProject(IProject project) {
- this._project = project;
- }
-
- /**
- * @param field
- */
- protected void containerChangeControlPressed(DialogField field) {
- // take the current jproject as init element of the dialog
- IPackageFragmentRoot root = getPackageFragmentRoot();
- root = chooseSourceContainer(root);
- if (root != null) {
- setPackageFragmentRoot(root, true);
- }
- }
-
- /**
- * Sets the current source folder (model and text field) to the given
- * package fragment root.
- *
- * @param root
- * The new root.
- * @param canBeModified
- * if <code>false</code> the source folder field can not be
- * changed by the user. If <code>true</code> the field is
- * editable
- */
- public void setPackageFragmentRoot(IPackageFragmentRoot root,
- boolean canBeModified) {
- _fCurrRoot = root;
- String str = (root == null) ? "" : root.getPath().makeRelative().toString(); //$NON-NLS-1$
- setText(str);
- setEnabled(canBeModified);
- }
-
- /**
- * Returns the <code>IPackageFragmentRoot</code> that corresponds to the
- * current value of the source folder field.
- *
- * @return the IPackageFragmentRoot or <code>null</code> if the current
- * source folder value is not a valid package fragment root
- *
- */
- public IPackageFragmentRoot getPackageFragmentRoot() {
- return _fCurrRoot;
- }
-
- /**
- * Returns the current text of source folder text field.
- *
- * @return the text of the source folder text field
- */
- public String getPackageFragmentRootText() {
- return getText();
- }
-
- /**
- * choose source container dialog
- *
- * @param initElement
- * @return
- */
- private IPackageFragmentRoot chooseSourceContainer(IJavaElement initElement) {
- Class[] acceptedClasses = new Class[] { IPackageFragmentRoot.class,
- IJavaProject.class, };
-
- TypedElementSelectionValidator validator = new TypedElementSelectionValidator(
- acceptedClasses, false) {
- // TODO: never used
-// public boolean isSelectedValid(Object element) {
-// try {
-// if (element instanceof IJavaProject) {
-// IJavaProject jproject = (IJavaProject) element;
-// IPath path = jproject.getProject().getFullPath();
-// return (jproject.findPackageFragmentRoot(path) != null);
-// } else if (element instanceof IPackageFragmentRoot) {
-// return (((IPackageFragmentRoot) element).getKind() == IPackageFragmentRoot.K_SOURCE);
-// }
-// return true;
-// } catch (JavaModelException e) {
-// _log.error("JavaModelException"); // just log, no ui in
-// // validation
-// }
-// return false;
-// }
- };
-
- acceptedClasses = new Class[] { IJavaModel.class,
- IPackageFragmentRoot.class, IJavaProject.class, };
- ViewerFilter filter = new TypedViewerFilter(acceptedClasses) {
- public boolean select(Viewer viewer, Object parent, Object element) {
- if (element instanceof IPackageFragmentRoot) {
- try {
- return (((IPackageFragmentRoot) element).getKind() == IPackageFragmentRoot.K_SOURCE);
- } catch (JavaModelException e) {
- _log.error(e); // just log, no ui
- // in validation
- return false;
- }
- }
- return super.select(viewer, parent, element);
- }
- };
-
- StandardJavaElementContentProvider provider = new StandardJavaElementContentProvider();
- ILabelProvider labelProvider = new JavaElementLabelProvider(
- JavaElementLabelProvider.SHOW_DEFAULT);
- ElementTreeSelectionDialog dialog = new ElementTreeSelectionDialog(
- getShell(), labelProvider, provider);
- dialog.setValidator(validator);
- dialog.setComparator(new JavaElementComparator());
- // HibernateWizardPage.ChooseSourceContainerDialog.Title = Folder
- // Selection
- dialog
- .setTitle(DialogFieldResources
- .getInstance()
- .getString(
- "SourceFolderButtonDialogField.ChooseSourceContainerDialog.Title")); //$NON-NLS-1$
- // HibernateWizardPage.ChooseSourceContainerDialog.Description = Choose
- // a folder:
- dialog
- .setMessage(DialogFieldResources
- .getInstance()
- .getString(
- "SourceFolderButtonDialogField.ChooseSourceContainerDialog.Description")); //$NON-NLS-1$
- dialog.addFilter(filter);
- if (_project != null) {
- dialog.setInput(JavaCore.create(_project));
- } else {
- dialog.setInput(JavaCore.create(ResourcesPlugin.getWorkspace()
- .getRoot()));
- }
- dialog.setInitialSelection(initElement);
-
- if (dialog.open() == Window.OK) {
- Object element = dialog.getFirstResult();
- if (element instanceof IJavaProject) {
- IJavaProject jproject = (IJavaProject) element;
- return jproject.getPackageFragmentRoot(jproject.getProject());
- } else if (element instanceof IPackageFragmentRoot) {
- return (IPackageFragmentRoot) element;
- }
- return null;
- }
- return null;
- }
-
- /**
- * This method updates the model and returns an error status. The underlying
- * model is only valid if the returned status is OK.
- *
- * @return the model's error status
- */
- public IStatus getChangedStatus() {
- StatusInfo status = new StatusInfo();
-
- _fCurrRoot = null;
- String str = getPackageFragmentRootText();
- if (str.length() == 0) {
- // SourceFolderButtonDialogField.error.EnterContainerName = Folder
- // name is empty.
- status.setError(DialogFieldResources.getInstance().getString(
- "SourceFolderButtonDialogField.error.EnterContainerName")); //$NON-NLS-1$
- return status;
- }
- IPath path = new Path(str);
- IResource res = ResourcesPlugin.getWorkspace().getRoot().findMember(
- path);
- if (res != null) {
- int resType = res.getType();
- if (resType == IResource.PROJECT || resType == IResource.FOLDER) {
- IProject proj = res.getProject();
- if (!proj.isOpen()) {
- status
- .setError(DialogFieldResources
- .getInstance()
- .getString(
- "SourceFolderButtonDialogField.error.ProjectClosed", proj.getFullPath().toString())); //$NON-NLS-1$
- return status;
- }
- if (_project != null && proj != _project) {
- // HibernateWizardPage.error.NotSameProject = The project
- // should be \''{0}\''.
- status
- .setError(DialogFieldResources
- .getInstance()
- .getString(
- "SourceFolderButtonDialogField.error.NotSameProject", _project.getName())); //$NON-NLS-1$
- return status;
- }
- IJavaProject jproject = JavaCore.create(proj);
- _fCurrRoot = jproject.getPackageFragmentRoot(res);
- if (res.exists()) {
- try {
- if (!proj.hasNature(JavaCore.NATURE_ID)) {
- if (resType == IResource.PROJECT) {
- status
- .setError(DialogFieldResources
- .getInstance()
- .getString(
- "SourceFolderButtonDialogField.warning.NotAJavaProject", proj.getName())); //$NON-NLS-1$
- } else {
- status
- .setWarning(DialogFieldResources
- .getInstance()
- .getString(
- "SourceFolderButtonDialogField.warning.NotInAJavaProject", proj.getName())); //$NON-NLS-1$
- }
- return status;
- }
- } catch (CoreException e) {
- status
- .setWarning(DialogFieldResources
- .getInstance()
- .getString(
- "SourceFolderButtonDialogField.warning.NotAJavaProject", proj.getName())); //$NON-NLS-1$
- }
- if (!jproject.isOnClasspath(_fCurrRoot)) {
- status
- .setWarning(DialogFieldResources
- .getInstance()
- .getString(
- "SourceFolderButtonDialogField.warning.NotOnClassPath", str)); //$NON-NLS-1$
- }
- if (_fCurrRoot.isArchive()) {
- status
- .setError(DialogFieldResources
- .getInstance()
- .getString(
- "SourceFolderButtonDialogField.error.ContainerIsBinary", str)); //$NON-NLS-1$
- return status;
- }
- }
- return status;
- }
- status.setError(DialogFieldResources.getInstance().getString(
- "SourceFolderButtonDialogField.error.NotAFolder", str)); //$NON-NLS-1$
- return status;
- }
- status
- .setError(DialogFieldResources
- .getInstance()
- .getString(
- "SourceFolderButtonDialogField.error.ContainerDoesNotExist", str)); //$NON-NLS-1$
- return status;
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/StatusInfo.java b/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/StatusInfo.java
deleted file mode 100644
index 8a8c9b7..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/StatusInfo.java
+++ /dev/null
@@ -1,198 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.common.ui.internal.dialogfield;
-
-import org.eclipse.core.runtime.Assert;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jst.jsf.common.ui.JSFUICommonPlugin;
-
-/**
- * A settable IStatus. Can be an error, warning, info or ok. For error, info and
- * warning states, a message describes the problem.
- *
- * TODO: couldn't have sub-classed Status?
- *
- * @author mengbo
- * @version 1.5
- */
-/*package*/ class StatusInfo implements IStatus {
-
- /**
- * a default status info for IStatus.OK
- */
- public static final IStatus OK_STATUS = new StatusInfo();
-
- private String fStatusMessage;
-
- private int fSeverity;
-
- /**
- * Creates a status set to OK (no message)
- */
- public StatusInfo() {
- this(OK, null);
- }
-
- /**
- * Creates a status .
- *
- * @param severity
- * The status severity: ERROR, WARNING, INFO and OK.
- * @param message
- * The message of the status. Applies only for ERROR, WARNING and
- * INFO.
- */
- public StatusInfo(int severity, String message) {
- fStatusMessage = message;
- fSeverity = severity;
- }
-
- /**
- * Returns if the status' severity is OK.
- */
- public boolean isOK() {
- return fSeverity == IStatus.OK;
- }
-
- /**
- * Returns if the status' severity is WARNING.
- * @return true if severity is IStatus.WARNING
- */
- public boolean isWarning() {
- return fSeverity == IStatus.WARNING;
- }
-
- /**
- * Returns if the status' severity is INFO.
- * @return true if severity is INFO
- */
- public boolean isInfo() {
- return fSeverity == IStatus.INFO;
- }
-
- /**
- * Returns if the status' severity is ERROR.
- * @return true if severity is error
- */
- public boolean isError() {
- return fSeverity == IStatus.ERROR;
- }
-
- /**
- * @see IStatus#getMessage
- */
- public String getMessage() {
- return fStatusMessage;
- }
-
- /**
- * Sets the status to ERROR.
- *
- * @param errorMessage
- * The error message (can be empty, but not null)
- */
- public void setError(String errorMessage) {
- Assert.isNotNull(errorMessage);
- fStatusMessage = errorMessage;
- fSeverity = IStatus.ERROR;
- }
-
- /**
- * Sets the status to WARNING.
- *
- * @param warningMessage
- * The warning message (can be empty, but not null)
- */
- public void setWarning(String warningMessage) {
- Assert.isNotNull(warningMessage);
- fStatusMessage = warningMessage;
- fSeverity = IStatus.WARNING;
- }
-
- /**
- * Sets the status to INFO.
- *
- * @param infoMessage
- * The info message (can be empty, but not null)
- */
- public void setInfo(String infoMessage) {
- Assert.isNotNull(infoMessage);
- fStatusMessage = infoMessage;
- fSeverity = IStatus.INFO;
- }
-
- /**
- * Sets the status to OK.
- */
- public void setOK() {
- fStatusMessage = null;
- fSeverity = IStatus.OK;
- }
-
- /*
- * @see IStatus#matches(int)
- */
- public boolean matches(int severityMask) {
- return (fSeverity & severityMask) != 0;
- }
-
- /**
- * Returns always <code>false</code>.
- *
- * @see IStatus#isMultiStatus()
- */
- public boolean isMultiStatus() {
- return false;
- }
-
- /*
- * @see IStatus#getSeverity()
- */
- public int getSeverity() {
- return fSeverity;
- }
-
- /*
- * @see IStatus#getPlugin()
- */
- public String getPlugin() {
- return JSFUICommonPlugin.getPluginId();
- }
-
- /**
- * Returns always <code>null</code>.
- *
- * @see IStatus#getException()
- */
- public Throwable getException() {
- return null;
- }
-
- /**
- * Returns always the error severity.
- *
- * @see IStatus#getCode()
- */
- public int getCode() {
- return fSeverity;
- }
-
- /**
- * Returns always <code>null</code>.
- *
- * @see IStatus#getChildren()
- */
- public IStatus[] getChildren() {
- return new IStatus[0];
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/StatusUtil.java b/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/StatusUtil.java
deleted file mode 100644
index 22fe6d8..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/StatusUtil.java
+++ /dev/null
@@ -1,114 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.common.ui.internal.dialogfield;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jface.dialogs.DialogPage;
-
-/**
- * copied from org.eclipse.jdt.internal.dialogs. Enhanced to support null status
- * as parameter
- *
- * A utility class to work with IStatus.
- */
-public class StatusUtil {
-
- /**
- * Compares two instances of <code>IStatus</code>. The more severe is
- * returned: An error is more severe than a warning, and a warning is more
- * severe than ok. If the two stati have the same severity, the second is
- * returned.
- * @param s1
- * @param s2
- *
- * @return Could be null.
- */
- public static IStatus getMoreSevere(IStatus s1, IStatus s2) {
- if (s1 == null && s2 == null) {
- return null;
- } else if (s1 == null) {
- return s2;
- } else if (s2 == null) {
- return s1;
- } else if (s1.getSeverity() > s2.getSeverity()) {
- return s1;
- } else {
- return s2;
- }
- }
-
- /**
- * Finds the most severe status from a array of stati. An error is more
- * severe than a warning, and a warning is more severe than ok.
- * @param status
- *
- * @return could be null
- */
- public static IStatus getMostSevere(IStatus[] status) {
- if (status == null)
- return null;
- IStatus max = null;
- for (int i = 0; i < status.length; i++) {
- IStatus curr = status[i];
- if (curr == null)
- continue;
-
- if (curr.matches(IStatus.ERROR)) {
- return curr;
- }
- if (max == null || curr.getSeverity() > max.getSeverity()) {
- max = curr;
- }
- }
- if (max != null)
- {
- return max;
- }
-
- return null;
- }
-
- /**
- * Applies the status to the status line of a dialog page.
- * @param page
- * @param status
- */
- public static void applyToStatusLine(DialogPage page, IStatus status) {
- if (status == null) {
- page.setMessage(null);
- page.setErrorMessage(null);
- } else {
- String message = status.getMessage();
- switch (status.getSeverity()) {
- case IStatus.OK:
- page.setMessage(message, DialogPage.NONE);
- page.setErrorMessage(null);
- break;
- case IStatus.WARNING:
- page.setMessage(message, DialogPage.WARNING);
- page.setErrorMessage(null);
- break;
- case IStatus.INFO:
- page.setMessage(message, DialogPage.INFORMATION);
- page.setErrorMessage(null);
- break;
- default:
- if (message.length() == 0) {
- message = null;
- }
- page.setMessage(null);
- page.setErrorMessage(message);
- break;
- }
- }
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/StringButtonDialogField.java b/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/StringButtonDialogField.java
deleted file mode 100644
index eebc9e5..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/StringButtonDialogField.java
+++ /dev/null
@@ -1,186 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.common.ui.internal.dialogfield;
-
-import org.eclipse.jst.jsf.common.ui.JSFUICommonPlugin;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-
-/**
- * Dialog field containing a label, text control and a button control.
- */
-public class StringButtonDialogField extends StringDialogField {
- private Button _browseButton;
-
- private String _browseButtonLabel;
-
- private IStringButtonAdapter _stringButtonAdapter;
-
- private boolean _buttonEnabled;
-
- /**
- * @param adapter
- */
- public StringButtonDialogField(IStringButtonAdapter adapter) {
- _stringButtonAdapter = adapter;
- _browseButtonLabel = JSFUICommonPlugin
- .getResourceString("DialogField.Browse"); //$NON-NLS-1$
- _buttonEnabled = true;
- }
-
- /**
- * Sets the label of the button.
- * @param label
- */
- public void setButtonLabel(String label) {
- _browseButtonLabel = label;
- }
-
- // ------ adapter communication
-
- /**
- * Programmatical pressing of the button
- */
- public void changeControlPressed() {
- _stringButtonAdapter.changeControlPressed(this);
- }
-
- // ------- layout helpers
-
- /*
- * @see DialogField#doFillIntoGrid
- */
- public Control[] doFillIntoGrid(FormToolkit toolkit, Composite parent,
- int nColumns) {
- assertEnoughColumns(nColumns);
-
- Control requiredLabel = getRequiredLabelControl(toolkit, parent);
- requiredLabel.setLayoutData(gridDataForLabel(1));
-
- Control label = getLabelControl(toolkit, parent);
- label.setLayoutData(gridDataForLabel(1));
-
- Text text = getTextControl(toolkit, parent);
- text.setLayoutData(gridDataForText(nColumns - 3));
- Button button = getChangeControl(toolkit, parent);
- button.setLayoutData(gridDataForButton(toolkit, button, text, 1));
-
- return new Control[] { requiredLabel, label, text, button };
- }
-
- /*
- * @see DialogField#getNumberOfControls
- */
- public int getNumberOfControls() {
- return 4;
- }
-
- /**
- * @param toolkit
- * @param button
- * @param text
- * @param span
- * @return the grid data for the button
- */
- protected static GridData gridDataForButton(FormToolkit toolkit,
- Button button, Text text, int span) {
- GridData gd = new GridData();
- gd.horizontalAlignment = GridData.FILL;
- gd.grabExcessHorizontalSpace = false;
- gd.horizontalSpan = span;
- // gd.heightHint = SWTUtil.getButtonHeightHint(button);
- gd.widthHint = LayoutUtil.getButtonWidthHint(button);
- gd.heightHint = LayoutUtil.getButtonHeightHint(toolkit, text);
- return gd;
- }
-
- // ------- ui creation
-
- /**
- * Creates or returns the created buttom widget.
- * @param toolkit
- *
- * @param parent
- * The parent composite or <code>null</code> if the widget has
- * already been created.
- * @return the button
- */
- public Button getChangeControl(FormToolkit toolkit, Composite parent) {
- if (_browseButton == null || _browseButton.isDisposed()) {
- assertCompositeNotNull(parent);
- if (toolkit != null) {
- _browseButton = toolkit.createButton(parent,
- _browseButtonLabel, SWT.PUSH);
- } else {
- _browseButton = new Button(parent, SWT.PUSH);
- _browseButton.setText(_browseButtonLabel);
- }
- _browseButton.setEnabled(isEnabled() && _buttonEnabled);
- _browseButton.addSelectionListener(new SelectionListener() {
- public void widgetDefaultSelected(SelectionEvent e) {
- changeControlPressed();
- }
-
- public void widgetSelected(SelectionEvent e) {
- changeControlPressed();
- }
- });
-
- }
- return _browseButton;
- }
-
- // ------ enable / disable management
-
- /**
- * Sets the enable state of the button.
- * @param enable
- */
- public void enableButton(boolean enable) {
- if (isOkToUse(_browseButton)) {
- _browseButton.setEnabled(isEnabled() && enable);
- }
- _buttonEnabled = enable;
- }
-
- /*
- * @see DialogField#updateEnableState
- */
- protected void updateEnableState() {
- super.updateEnableState();
- if (isOkToUse(_browseButton)) {
- _browseButton.setEnabled(isEnabled() && _buttonEnabled);
- }
- }
-
- /**
- * @return Returns the _stringButtonAdapter.
- */
- public IStringButtonAdapter getStringButtonAdapter() {
- return _stringButtonAdapter;
- }
-
- /**
- * @param buttonAdapter
- * The _stringButtonAdapter to set.
- */
- public void setStringButtonAdapter(IStringButtonAdapter buttonAdapter) {
- _stringButtonAdapter = buttonAdapter;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/StringDialogField.java b/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/StringDialogField.java
deleted file mode 100644
index bf334a5..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/StringDialogField.java
+++ /dev/null
@@ -1,291 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.common.ui.internal.dialogfield;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.FocusAdapter;
-import org.eclipse.swt.events.FocusEvent;
-import org.eclipse.swt.events.KeyAdapter;
-import org.eclipse.swt.events.KeyEvent;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-
-/**
- * Dialog field containing a label and a text control.
- */
-public class StringDialogField extends DialogFieldBase implements
- ISupportTextValue {
- final static private int TEXT_WIDTH_HINT = 10;
-
- private String _text;
-
- private Text _textControl;
-
- private ModifyListener _modifyListener;
-
- private int _numRows;
-
- /**
- * whether there is change in the UI but not fire applied event yet.
- */
- private boolean _pending = false;
-
- /**
- * default constructor
- * numRows == 1
- */
- public StringDialogField() {
- this(1);
- _text = ""; //$NON-NLS-1$
- }
-
- /**
- * @param numRows
- */
- public StringDialogField(int numRows) {
- super();
- _text = ""; //$NON-NLS-1$
- _numRows = numRows;
- }
-
- // ------- layout helpers
-
- /*
- * @see DialogField#doFillIntoGrid
- */
- public Control[] doFillIntoGrid(FormToolkit kit, Composite parent,
- int nColumns) {
- assertEnoughColumns(nColumns);
-
- Control requiredLabel = getRequiredLabelControl(kit, parent);
- requiredLabel.setLayoutData(gridDataForLabel(1));
-
- Control label = getLabelControl(kit, parent);
- label.setLayoutData(gridDataForLabel(1));
-
- Text text = getTextControl(kit, parent);
- int heightHint = -1;
- if (_numRows > 1) {
- heightHint = getDialogUnits(parent).getHeight() * _numRows;
- }
- text.setLayoutData(gridDataForText(nColumns - 2, heightHint));
-
- return new Control[] { requiredLabel, label, text };
- }
-
- /*
- * @see DialogField#getNumberOfControls
- */
- public int getNumberOfControls() {
- return 3;
- }
-
- protected static GridData gridDataForLabel(int span) {
- GridData gd = new GridData(GridData.HORIZONTAL_ALIGN_FILL);
- gd.horizontalSpan = span;
- return gd;
- }
-
- /**
- * @param span
- * @param heightHint
- * @return the grid data for text
- */
- protected static GridData gridDataForText(int span, int heightHint) {
- GridData gd = new GridData();
- gd.horizontalAlignment = GridData.FILL;
- gd.grabExcessHorizontalSpace = false;
- gd.heightHint = heightHint;
- gd.horizontalSpan = span;
- gd.widthHint = TEXT_WIDTH_HINT;
- return gd;
- }
-
- /**
- * @param span
- * @return the grid data for text
- */
- protected static GridData gridDataForText(int span) {
- GridData gd = gridDataForText(span, -1);
- return gd;
- }
-
- // ------- focus methods
-
- /*
- * @see DialogField#setFocus
- */
- public boolean setFocus() {
- if (isOkToUse(_textControl)) {
- _textControl.setFocus();
- _textControl.setSelection(0, _textControl.getText().length());
- }
- return true;
- }
-
- // ------- ui creation
-
- /**
- * Creates or returns the created text control.
- * @param toolkit
- *
- * @param parent
- * The parent composite or <code>null</code> when the widget
- * has already been created.
- * @return the text control
- */
- public Text getTextControl(FormToolkit toolkit, Composite parent) {
- if (_textControl == null || _textControl.isDisposed()) {
- assertCompositeNotNull(parent);
- _modifyListener = new ModifyListener() {
- public void modifyText(ModifyEvent e) {
- doModifyText(e);
- }
- };
-
- if (toolkit != null) {
- if (_numRows <= 1) {
- _textControl = toolkit.createText(parent, ""); //$NON-NLS-1$
- } else {
- _textControl = toolkit.createText(parent, "", SWT.V_SCROLL); //$NON-NLS-1$
- }
- } else {
- if (_numRows <= 1) {
-
- _textControl = new Text(parent, SWT.SINGLE | SWT.BORDER);
- } else {
- _textControl = new Text(parent, SWT.V_SCROLL | SWT.WRAP
- | SWT.BORDER);
- }
- }
-
- _textControl.setText(_text);
- _textControl.setFont(parent.getFont());
- _textControl.addModifyListener(_modifyListener);
- _textControl.addFocusListener(new FocusAdapter() {
-
- public void focusLost(FocusEvent e) {
- doFocusLost(e);
- }
-
- });
- _textControl.addKeyListener(new KeyAdapter() {
- public void keyReleased(KeyEvent e) {
- doKeyReleased(e);
- }
- });
-
- _textControl.setEnabled(isEnabled());
-
- _textControl.setToolTipText(getToolTip());
- }
- return _textControl;
- }
-
- /**
- * @param e
- */
- protected void doKeyReleased(KeyEvent e) {
- if (e.character == '\r') {
- // commit value
- if (_pending) {
- _pending = false;
- dialogFieldApplied();
- }
- }
- }
-
- /**
- * @param e
- */
- protected void doFocusLost(FocusEvent e) {
- if (_pending) {
- _pending = false;
- dialogFieldApplied();
- }
- }
-
- /**
- * some get changed in the Text. As in <code>setText</code> and
- * <code>setTextWithoutUpdate</code> we removed the listener, so this must
- * be user typing in the text field.
- *
- * @param e
- */
- private void doModifyText(ModifyEvent e) {
- if (isOkToUse(_textControl)) {
- _text = _textControl.getText();
- }
- _pending = true;
- dialogFieldChanged();
- }
-
- // ------ enable / disable management
-
- /*
- * @see DialogField#updateEnableState
- */
- protected void updateEnableState() {
- super.updateEnableState();
- if (isOkToUse(_textControl)) {
- _textControl.setEnabled(isEnabled());
- }
- }
-
- // ------ text access
-
- /**
- * Gets the text. Can not be <code>null</code>
- */
- public String getText() {
- return _text;
- }
-
- /**
- * Sets the text. Triggers a dialog-changed event.
- */
- public void setText(String text) {
- setTextWithoutUpdate(text);
- dialogFieldChangedAndApplied();
- }
-
- /**
- * Sets the text without triggering a dialog-changed event.
- */
- public void setTextWithoutUpdate(String text) {
- // reset _pending state.
- _pending = false;
-
- if (text == null)
- text = ""; //$NON-NLS-1$
- _text = text;
- if (isOkToUse(_textControl)) {
- _textControl.removeModifyListener(_modifyListener);
- _textControl.setText(text);
- _textControl.addModifyListener(_modifyListener);
- }
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.jsf.common.ui.internal.dialogfield.DialogField#handleGrabHorizontal()
- */
- public void handleGrabHorizontal() {
- LayoutUtil.setGrabHorizontal(_textControl, true);
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/StyleComboDialogField.java b/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/StyleComboDialogField.java
deleted file mode 100644
index 93c9332..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/StyleComboDialogField.java
+++ /dev/null
@@ -1,398 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.common.ui.internal.dialogfield;
-
-import java.util.Map;
-import java.util.TreeMap;
-import java.util.Map.Entry;
-
-import org.eclipse.jst.jsf.common.ui.internal.utils.StyleCombo;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.DisposeEvent;
-import org.eclipse.swt.events.DisposeListener;
-import org.eclipse.swt.events.FocusAdapter;
-import org.eclipse.swt.events.FocusEvent;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.events.PaintEvent;
-import org.eclipse.swt.events.PaintListener;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.graphics.GC;
-import org.eclipse.swt.graphics.Rectangle;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.forms.FormColors;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-
-/**
- * A dialog field for style combos
- *
- */
-public class StyleComboDialogField extends DialogFieldBase implements
- ISupportTextValue {
- final static private int WIDTH_HINT = 10;
-
- private String _text;
-
- private int _selectionIndex;
-
- private String[] _items;
-
- private StyleCombo _comboControl;
-
- private ModifyListener _modifyListener;
-
- private int _flags;
-
- private boolean _pending = false;
-
- private Map _entryMap;
-
- private String _defaultValue;
-
-
- /**
- * @param defaultValue
- */
- public void setDefaultValue(String defaultValue) {
- this._defaultValue = defaultValue;
- if (_comboControl != null && ! _comboControl.isDisposed())
- _comboControl.setDefaultValue(_defaultValue);
- }
-
- /**
- * @param flags
- */
- public StyleComboDialogField(int flags) {
- super();
- _text = ""; //$NON-NLS-1$
- _items = new String[0];
- _flags = flags;
- _selectionIndex = -1;
- }
-
- // ------- layout helpers
-
-
- /*
- * @see DialogField#doFillIntoGrid
- */
- public Control[] doFillIntoGrid(FormToolkit toolkit, Composite parent,
- int nColumns) {
- assertEnoughColumns(nColumns);
-
- Control requiredLabel = getRequiredLabelControl(toolkit, parent);
- requiredLabel.setLayoutData(gridDataForLabel(1));
-
- Control label = getLabelControl(toolkit, parent);
- label.setLayoutData(gridDataForLabel(1));
-
- StyleCombo combo = getComboControl(toolkit, parent);
- combo.setLayoutData(gridDataForCombo(nColumns - 2));
-
- return new Control[] { requiredLabel, label, combo };
- }
-
- /*
- * @see DialogField#getNumberOfControls
- */
- public int getNumberOfControls() {
- return 3;
- }
-
- /**
- * @param span
- * @return the grid data for the combo
- */
- protected static GridData gridDataForCombo(int span) {
- GridData gd = new GridData();
- gd.horizontalAlignment = GridData.FILL;
- gd.grabExcessHorizontalSpace = false;
- gd.horizontalSpan = span;
- gd.widthHint = WIDTH_HINT;
- return gd;
- }
-
- // ------- focus methods
-
- /*
- * @see DialogField#setFocus
- */
- public boolean setFocus() {
- if (isOkToUse(_comboControl)) {
- _comboControl.setFocus();
- }
- return true;
- }
-
- // ------- ui creation
-
- /**
- * Creates or returns the created combo control.
- * @param toolkit
- *
- * @param parent
- * The parent composite or <code>null</code> when the widget
- * has already been created.
- * @return the combo control
- */
- public StyleCombo getComboControl(FormToolkit toolkit,
- final Composite parent) {
- if (_comboControl == null || _comboControl.isDisposed()) {
- assertCompositeNotNull(parent);
- _modifyListener = new ModifyListener() {
- public void modifyText(ModifyEvent e) {
- doModifyText(e);
- }
- };
- SelectionListener selectionListener = new SelectionListener() {
- public void widgetSelected(SelectionEvent e) {
- doSelectionChanged(e);
- }
-
- public void widgetDefaultSelected(SelectionEvent e) {
- handleDefaultSelection(e);
- }
- };
-
- if (toolkit != null) {
- _comboControl = new StyleCombo(parent, _flags);
- final FormColors colors = new FormColors(parent.getDisplay());
- parent.addPaintListener(new PaintListener() {
-
- public void paintControl(PaintEvent event) {
- Composite composite = (Composite) event.widget;
- Control[] children = composite.getChildren();
- for (int i = 0; i < children.length; i++) {
- Control c = children[i];
- if (!(c instanceof StyleCombo) || !c.isVisible()) {
- continue;
- }
- Rectangle b = c.getBounds();
- GC gc = event.gc;
- gc.setForeground(colors.getBorderColor());
- gc.drawRectangle(b.x - 1, b.y - 1, b.width + 1,
- b.height + 1);
- }
- }
- });
-
- // when the parent is disposed, the colors should no
- // no longer be needed.
- parent.addDisposeListener(new DisposeListener()
- {
- public void widgetDisposed(DisposeEvent e) {
- colors.dispose();
- }
- }
- );
- toolkit.adapt(_comboControl);
- } else {
- _comboControl = new StyleCombo(parent, _flags | SWT.BORDER);
- _comboControl.setBackground(Display.getCurrent()
- .getSystemColor(SWT.COLOR_LIST_BACKGROUND));
- }
-
- // moved up due to 1GEUNW2
- _comboControl.setItems(_items);
- _comboControl.setDefaultValue(_defaultValue);
- if (_selectionIndex != -1) {
- _comboControl.select(_selectionIndex);
- } else {
- _comboControl.setText(_text);
- }
- _comboControl.setFont(parent.getFont());
- _comboControl.addModifyListener(_modifyListener);
- _comboControl.addSelectionListener(selectionListener);
- _comboControl.addFocusListener(new FocusAdapter() {
- public void focusLost(FocusEvent e) {
- doFocusLost(e);
- }
- });
- _comboControl.setEnabled(isEnabled());
- _comboControl.setToolTipText(getToolTip());
- }
- return _comboControl;
- }
-
- /**
- * @param e
- */
- protected void handleDefaultSelection(SelectionEvent e) {
- // commit value
- if (_pending) {
- _pending = false;
- dialogFieldApplied();
- }
- }
-
- /**
- * @param e
- */
- protected void doFocusLost(FocusEvent e) {
- if (_pending) {
- _pending = false;
- dialogFieldApplied();
- }
- }
-
- private void doModifyText(ModifyEvent e) {
- if (isOkToUse(_comboControl)) {
- _text = getEntryKey(_comboControl.getText());
- _selectionIndex = _comboControl.getSelectionIndex();
- }
- _pending = true;
- dialogFieldChanged();
- }
-
- private void doSelectionChanged(SelectionEvent e) {
- if (isOkToUse(_comboControl)) {
- _items = _comboControl.getItems();
- _text = getEntryKey(_comboControl.getText());
- _selectionIndex = _comboControl.getSelectionIndex();
- }
- _pending = false;
- dialogFieldChangedAndApplied();
- }
-
- // ------ enable / disable management
-
- /*
- * @see DialogField#updateEnableState
- */
- protected void updateEnableState() {
- super.updateEnableState();
- if (isOkToUse(_comboControl)) {
- _comboControl.setEnabled(isEnabled());
- }
- }
-
- // ------ text access
-
- /**
- * Sets the combo items. Triggers a dialog-changed event.
- * @param items
- */
- public void setItems(String[] items) {
- _items = items;
- if (isOkToUse(_comboControl)) {
- _comboControl.setItems(items);
- }
- _pending = false;
- // dialogFieldChangedAndApplied();
- }
-
- /**
- * @param map
- */
- public void setEntryMap(Map map) {
- this._entryMap = map;
- if (_entryMap == null) {
- _entryMap = new TreeMap();
- }
- Entry[] entries = (Entry[]) _entryMap.entrySet().toArray(new Entry[0]);
- String[] items = new String[entries.length];
- for (int i = 0; i < entries.length; i++) {
- items[i] = entries[i].getValue().toString();
- }
- setItems(items);
- }
-
- /**
- * Gets the text.
- */
- public String getText() {
- return _text;
- }
-
- /**
- * Sets the text. Triggers a dialog-changed event.
- */
- public void setText(String text) {
- setTextWithoutUpdate(text);
- _pending = false;
- dialogFieldChangedAndApplied();
- }
-
- /**
- * Selects an item.
- * @param index
- */
- public void selectItem(int index) {
- if (isOkToUse(_comboControl)) {
- _comboControl.select(index);
- } else {
- if (index >= 0 && index < _items.length) {
- _text = getEntryKey(_items[index]);
- _selectionIndex = index;
- }
- }
- dialogFieldChangedAndApplied();
- }
-
- /**
- * @return the selection index
- */
- public int getSelectionIndex() {
- return _selectionIndex;
- }
-
- /**
- * Sets the text without triggering a dialog-changed event.
- */
- public void setTextWithoutUpdate(String text) {
- _pending = false;
- if (text == null) {
- text = "";//$NON-NLS-1$
- }
- _text = text;
- if (isOkToUse(_comboControl)) {
- _comboControl.removeModifyListener(_modifyListener);
- _comboControl.setText(getEntryValue(text));
- _comboControl.addModifyListener(_modifyListener);
- }
- }
-
- private String getEntryValue(String key) {
- if (_entryMap == null || !_entryMap.containsKey(key)) {
- return key;
- }
- return _entryMap.get(key).toString();
- }
-
- private String getEntryKey(String value) {
- if (_entryMap == null || !_entryMap.containsValue(value)) {
- return value;
- }
-
- Entry[] entries = (Entry[]) _entryMap.entrySet().toArray(new Entry[0]);
- for (int i = 0; i < entries.length; i++) {
- if (entries[i].getValue() == value
- || (value != null && value.equals(entries[i].getValue()))) {
- return entries[i].getKey().toString();
- }
- }
- return value;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.jsf.common.ui.internal.dialogfield.DialogField#handleGrabHorizontal()
- */
- public void handleGrabHorizontal() {
- LayoutUtil.setGrabHorizontal(_comboControl, true);
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/TypedElementSelectionValidator.java b/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/TypedElementSelectionValidator.java
deleted file mode 100644
index 8d0e091..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/TypedElementSelectionValidator.java
+++ /dev/null
@@ -1,110 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.common.ui.internal.dialogfield;
-
-import java.util.Collection;
-
-import org.eclipse.core.runtime.Assert;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.ui.dialogs.ISelectionStatusValidator;
-
-/**
- * Implementation of a <code>ISelectionValidator</code> to validate the type
- * of an element. Empty selections are not accepted.
- *
- * @author mengbo
- * @version 1.5
- */
-/*package*/ class TypedElementSelectionValidator implements
- ISelectionStatusValidator {
-
- private IStatus _fgErrorStatus = new StatusInfo(IStatus.ERROR, ""); //$NON-NLS-1$
-
- private IStatus _fgOKStatus = new StatusInfo();
-
- private Class[] _fAcceptedTypes;
-
- private boolean _fAllowMultipleSelection;
-
- private Collection _fRejectedElements;
-
- /**
- * @param acceptedTypes
- * The types accepted by the validator
- * @param allowMultipleSelection
- * If set to <code>true</code>, the validator allows multiple
- * selection.
- */
- public TypedElementSelectionValidator(Class[] acceptedTypes,
- boolean allowMultipleSelection) {
- this(acceptedTypes, allowMultipleSelection, null);
- }
-
- /**
- * @param acceptedTypes
- * The types accepted by the validator
- * @param allowMultipleSelection
- * If set to <code>true</code>, the validator allows multiple
- * selection.
- * @param rejectedElements
- * A list of elements that are not accepted
- */
- public TypedElementSelectionValidator(Class[] acceptedTypes,
- boolean allowMultipleSelection, Collection rejectedElements) {
- Assert.isNotNull(acceptedTypes);
- _fAcceptedTypes = acceptedTypes;
- _fAllowMultipleSelection = allowMultipleSelection;
- _fRejectedElements = rejectedElements;
- }
-
- /*
- * @see org.eclipse.ui.dialogs.ISelectionValidator#isValid(java.lang.Object)
- */
- public IStatus validate(Object[] elements) {
- if (isValid(elements)) {
- return _fgOKStatus;
- }
- return _fgErrorStatus;
- }
-
- private boolean isOfAcceptedType(Object o) {
- for (int i = 0; i < _fAcceptedTypes.length; i++) {
- if (_fAcceptedTypes[i].isInstance(o)) {
- return true;
- }
- }
- return false;
- }
-
- private boolean isRejectedElement(Object elem) {
- return (_fRejectedElements != null)
- && _fRejectedElements.contains(elem);
- }
-
- private boolean isValid(Object[] selection) {
- if (selection.length == 0) {
- return false;
- }
-
- if (!_fAllowMultipleSelection && selection.length != 1) {
- return false;
- }
-
- for (int i = 0; i < selection.length; i++) {
- Object o = selection[i];
- if (!isOfAcceptedType(o) || isRejectedElement(o)) {
- return false;
- }
- }
- return true;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/TypedViewerFilter.java b/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/TypedViewerFilter.java
deleted file mode 100644
index 52ecb6a..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogfield/TypedViewerFilter.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.common.ui.internal.dialogfield;
-
-
-import org.eclipse.core.runtime.Assert;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerFilter;
-
-/**
- * Viewer filter used in selection dialogs.
- *
- * @author mengbo
- * @version 1.5
- */
-/*package*/ class TypedViewerFilter extends ViewerFilter {
-
- private Class[] _fAcceptedTypes;
-
- private Object[] _fRejectedElements;
-
- /**
- * Creates a filter that only allows elements of gives types.
- *
- * @param acceptedTypes
- * The types of accepted elements
- */
- public TypedViewerFilter(Class[] acceptedTypes) {
- this(acceptedTypes, null);
- }
-
- /**
- * Creates a filter that only allows elements of gives types, but not from a
- * list of rejected elements.
- *
- * @param acceptedTypes
- * Accepted elements must be of this types
- * @param rejectedElements
- * Element equals to the rejected elements are filtered out
- */
- public TypedViewerFilter(Class[] acceptedTypes, Object[] rejectedElements) {
- Assert.isNotNull(acceptedTypes);
- _fAcceptedTypes = acceptedTypes;
- _fRejectedElements = rejectedElements;
- }
-
- /**
- * @see ViewerFilter#select(org.eclipse.jface.viewers.Viewer,
- * java.lang.Object, java.lang.Object)
- */
- public boolean select(Viewer viewer, Object parentElement, Object element) {
- if (_fRejectedElements != null) {
- for (int i = 0; i < _fRejectedElements.length; i++) {
- if (element.equals(_fRejectedElements[i])) {
- return false;
- }
- }
- }
- for (int i = 0; i < _fAcceptedTypes.length; i++) {
- if (_fAcceptedTypes[i].isInstance(element)) {
- return true;
- }
- }
- return false;
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogs/CommonResourceDialog.java b/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogs/CommonResourceDialog.java
deleted file mode 100644
index debc2f9..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogs/CommonResourceDialog.java
+++ /dev/null
@@ -1,368 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.common.ui.internal.dialogs;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jface.viewers.ITreeContentProvider;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerFilter;
-import org.eclipse.jst.jsf.common.ui.JSFUICommonPlugin;
-import org.eclipse.jst.jsf.common.ui.internal.logging.Logger;
-import org.eclipse.jst.jsf.common.ui.internal.utils.WebrootUtil;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.model.WorkbenchLabelProvider;
-import org.eclipse.ui.views.navigator.ResourceComparator;
-
-/**
- * This dialog shows IFile type resources within a IProject domain for
- * selection. The client can prvide the suffixs of files to filter when
- * candidates are shown on the tree.
- *
- * The usage: Shell shell = new Shell(); IProject project = getProject();
- * CommonResourceDialog dlg = new CommonResourceDialog(shell, project);
- * dlg.setResourceDescription("image"); dlg.setSuffixs(new
- * String[]{"bmp","jpg","gif"}); if(dlg.open() == Window.OK) { IFile
- * selectedFile = (IFile)dlg.getResult()[0]; }
- *
- * Note: In code above, what you get is an absolute resource path. You can use
- * <code>org.eclipse.wst.sse.core.util.PathHelper.convertToRelative(String input, String base)</code>
- * to convert a absolute resource path to a relative path based on one path.
- *
- * @author mengbo
- */
-public class CommonResourceDialog extends TreeViewerSelectionDialog {
- private static Logger _log = JSFUICommonPlugin
- .getLogger(CommonResourceDialog.class);
-
- // private static final String STATUS_MESSAGE_0 = CommonPlugin
- // .getResourceString("Dialog.CommonResourceDialog.StatusMessage0");
- // //$NON-NLS-1$
-
- private IProject _project = null;
-
- private String _suffixs[] = null;
-
- private CommonResourceFilter _filter = null;
-
- // The resource type resourceDescription, such as "image", "jsp", "java
- // class" etc.
- private String _resourceDescription = null;
-
- private IFolder _folder;
-
- // The content provider
- class ProjectFileDialogContentProvider implements ITreeContentProvider {
- /**
- * The visual part that is using this content provider is about to be
- * disposed. Deallocate all allocated SWT resources.
- */
- public void dispose() {
- // nothing to dispose
- }
-
- /**
- * @see ITreeContentProvider#getChildren
- */
- public Object[] getChildren(Object element) {
- if (element instanceof Object[]) {
- return (Object[]) element;
- } else if (element instanceof IContainer) {
- IContainer container = (IContainer) element;
- if (container.isAccessible()) {
- try {
- return container.members();
- } catch (CoreException e) {
- _log.error(
- "Error.ProjectFileDialogContentProvider.0", e); //$NON-NLS-1$
- }
- }
-
- }
- return new Object[0];
- }
-
- /**
- * @see org.eclipse.jface.viewers.IStructuredContentProvider#getElements(Object)
- */
- public Object[] getElements(Object element) {
- return getChildren(element);
- }
-
- /**
- * @see ITreeContentProvider#getParent
- */
- public Object getParent(Object element) {
- if (element instanceof IResource) {
- return ((IResource) element).getParent();
- }
- return null;
- }
-
- /**
- * @see ITreeContentProvider#hasChildren
- */
- public boolean hasChildren(Object element) {
- return getChildren(element).length > 0;
- }
-
- /**
- * @see org.eclipse.jface.viewers.IContentProvider#inputChanged(Viewer, Object, Object)
- */
- public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
- // no viewer change support required
- }
-
- }
-
- // The default resource filter
- class CommonResourceFilter extends ViewerFilter {
- private String _filterSuffixs[] = null;
-
- /**
- * @return Returns the _suffixs.
- */
- public String[] getSuffixs() {
- return _filterSuffixs;
- }
-
- /**
- * @param _suffixs
- * The _suffixs to set.
- */
- public void setSuffixs(String[] _suffixs) {
- this._filterSuffixs = _suffixs;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.ViewerFilter#select(org.eclipse.jface.viewers.Viewer,
- * java.lang.Object, java.lang.Object)
- */
- public boolean select(Viewer viewer, Object parentElement,
- Object element) {
- if (element instanceof IFile) {
- IFile file = (IFile) element;
- if (!WebrootUtil.isUnderWebContentFolder(file)) {
- return false;
- }
- if (isSuffixBlank()) {
- return true;
- }
- if (file.getFileExtension() != null) {
- if (Arrays.asList(_filterSuffixs).contains(
- file.getFileExtension().toLowerCase())) {
- return true;
- }
- }
- } else if (element instanceof IContainer) {
- if (!((IContainer) element).isAccessible()) {
- return false;
- }
- if (element instanceof IProject) {
- return true;
- } else if (element instanceof IFolder) {
- IContainer container = (IContainer) element;
- try {
- IResource[] members = container.members();
- for (int i = 0; i < members.length; i++) {
- if (select(viewer, members[i].getParent(),
- members[i])) {
- return true;
- }
- }
- } catch (CoreException e) {
- _log.error(
- "Error.ProjectFileDialogContentProvider.0", e); //$NON-NLS-1$
- return false;
- }
- }
- }
- return false;
- }
-
- }
-
- /**
- * This is a dialog for common resource selection, the resouce supported
- * include IFolder, IProject, IFile, user can provide
- *
- * @param parentShell
- * @param project
- * @param style
- */
- public CommonResourceDialog(Shell parentShell, IProject project, int style) {
- super(parentShell, "", style); //$NON-NLS-1$
- if (project == null) {
- throw new IllegalArgumentException(
- "Argument(project) cannot be null"); //$NON-NLS-1$
- }
- _project = project;
- setContentProvider(new ProjectFileDialogContentProvider());
- setLabelProvider(WorkbenchLabelProvider
- .getDecoratingWorkbenchLabelProvider());
- _filter = new CommonResourceFilter();
- setFilter(_filter);
- setViewerComparator(new ResourceComparator(ResourceComparator.TYPE));
- _project = project;
- setStatusMessage(getStatusMessage());
- }
-
- /**
- * Same as CommonResourceDialog(parentShell, project, SWT.NONE)
- *
- * @param parentShell
- * @param project
- */
- public CommonResourceDialog(Shell parentShell, IProject project) {
- this(parentShell, project, SWT.NONE);
- }
-
- private String getStatusMessage() {
- if (_resourceDescription == null) {
- return ""; //$NON-NLS-1$
- }
- return _resourceDescription;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.pagedesigner.ui.common.SelectionTreeViewerDialog#findInputElement()
- */
- protected Object findInputElement() {
- if (_folder != null) {
- return new Object[] { _folder, };
- }
- return new Object[] { _project, };
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.pagedesigner.ui.common.SelectionTreeViewerDialog#isValidSelection(java.lang.Object)
- */
- protected boolean isValidSelection(Object selection) {
- if (selection instanceof Object[]) {
- for (int i = 0, n = ((Object[]) selection).length; i < n; i++) {
- if (isValidElement(((Object[]) selection)[i]) == true) {
- return true;
- }
- }
- return false;
- }
- return isValidElement(selection);
- }
-
- private boolean isValidElement(Object selection) {
- if ((selection instanceof IFile)) {
- // Null means no filter is set
- if (isSuffixBlank()) {
- return true;
- }
- // The extension is supported?
- else if (_suffixs != null
- && Arrays.asList(_suffixs).contains(
- ((IFile) selection).getFileExtension()
- .toLowerCase())) {
- return true;
- }
- }
- // None of above conditions, invalid.
- return false;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.ui.dialogs.SelectionDialog#getResult()
- */
- public Object[] getResult() {
- Object[] objects = super.getResult();
- if (objects == null || objects.length == 0) {
- return null;
- }
- List list = new ArrayList();
- for (int i = 0; i < objects.length; i++) {
- if (objects[i] instanceof IFile) {
- list.add(objects[i]);
- }
- }
- return list.toArray();
- }
-
- /**
- * @param suffixs
- * The suffixs to set.
- */
- public void setSuffixs(String[] suffixs) {
- this._suffixs = convertTolowercase(suffixs);
- _filter.setSuffixs(_suffixs);
- setStatusMessage(getStatusMessage());
- }
-
- private String[] convertTolowercase(String[] suffixs) {
- if (suffixs != null) {
- String[] newSuffixs = new String[suffixs.length];
- for (int i = 0; i < suffixs.length; i++) {
- newSuffixs[i] = suffixs[i].toLowerCase();
- }
- return newSuffixs;
- }
- return null;
- }
-
- /**
- * @return Returns the sourceDescription.
- */
- public String getResourceDescription() {
- return _resourceDescription;
- }
-
- /**
- * @param sourceDescription
- * The sourceDescription to set.
- */
- public void setResourceDescription(String sourceDescription) {
- this._resourceDescription = sourceDescription;
- setStatusMessage(getStatusMessage());
- }
-
- private boolean isSuffixBlank() {
- boolean isSuffixBlank = false;
- if (_suffixs == null) {
- isSuffixBlank = true;
- } else {
- int count = 0;
- for (int i = 0, size = _suffixs.length; i < size; i++) {
- if (_suffixs[i] != null && !"".equals(_suffixs[i])) { //$NON-NLS-1$
- count++;
- break;
- }
- }
- if (count == 0) {
- isSuffixBlank = true;
- }
- }
- return isSuffixBlank;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogs/CommonWizardDialog.java b/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogs/CommonWizardDialog.java
deleted file mode 100644
index 3fd719c..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogs/CommonWizardDialog.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.common.ui.internal.dialogs;
-
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.jface.wizard.IWizard;
-import org.eclipse.jface.wizard.WizardDialog;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Shell;
-
-/**
- * Wizard Dialog with a Finish set to OK if no previous
- * or next buttons are needed
- *
- */
-public class CommonWizardDialog extends WizardDialog {
-
- /**
- * @param parentShell
- * @param newWizard
- */
- public CommonWizardDialog(Shell parentShell, IWizard newWizard) {
- super(parentShell, newWizard);
- }
-
- protected void createButtonsForButtonBar(Composite parent) {
- super.createButtonsForButtonBar(parent);
-
- IWizard wizard = getWizard();
- if (!wizard.needsPreviousAndNextButtons()) {
- getButton(IDialogConstants.FINISH_ID).setText(
- IDialogConstants.OK_LABEL);
- }
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogs/ResourceOnClasspathDialog.java b/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogs/ResourceOnClasspathDialog.java
deleted file mode 100644
index 934957d..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogs/ResourceOnClasspathDialog.java
+++ /dev/null
@@ -1,254 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.common.ui.internal.dialogs;
-
-import java.io.File;
-import java.util.Arrays;
-
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.jdt.core.IJarEntryResource;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.ui.JavaElementLabelProvider;
-import org.eclipse.jdt.ui.StandardJavaElementContentProvider;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerFilter;
-import org.eclipse.jst.jsf.common.ui.IFileFolderConstants;
-import org.eclipse.jst.jsf.common.ui.JSFUICommonPlugin;
-import org.eclipse.jst.jsf.common.ui.internal.utils.PathUtil;
-import org.eclipse.swt.widgets.Shell;
-
-/**
- * This dialog will let client to select resources that located on a
- * IJavaProject classpath, the client can provide a list of files suffixs to
- * filter.
- *
- * @author mengbo
- */
-// TODO: Since many jar files might do nothing to do with client's selection, we
-// may need to provides more filter choice
-// to clients to exclude unnecessary jar files, such as that are located in JDK
-// dir.
-public class ResourceOnClasspathDialog extends TreeViewerSelectionDialog {
- // ResourcesOnClasspathDialog.statusMessage = Please select a property file
- private static final String STATUS_MESSAGE = JSFUICommonPlugin
- .getResourceString("Dialog.ResourceOnClasspathDialog.StatusMessage"); //$NON-NLS-1$
-
- private IJavaProject _javaProject;
-
- // the suffixs of files that can be selected
- private String _suffixs[];
-
- // IJMTConstants.DEFAULT_SUFFIX;
-
- private ResourceOnClasspathFilter _filter;
-
- // Client doesn't need to know it.
- class ResourceOnClasspathFilter extends ViewerFilter {
- StandardJavaElementContentProvider _javaContentProvider;
-
- /**
- * @param contentProvider
- */
- public ResourceOnClasspathFilter(
- StandardJavaElementContentProvider contentProvider) {
- _javaContentProvider = contentProvider;
- }
-
- /**
- * Set the suffixs of files need to be selected.
- *
- * @param suffixs
- */
- public void setSuffixs(String suffixs[]) {
- _suffixs = suffixs;
- }
-
- /**
- * @param contentProvider
- * The _javaContentProvider to set.
- */
- public void setJavaContentProvider(
- StandardJavaElementContentProvider contentProvider) {
- _javaContentProvider = contentProvider;
- }
-
- /**
- * @param project
- * The _javaProject to set.
- */
- public void setJavaProject(IJavaProject project) {
- _javaProject = project;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.ViewerFilter#select(org.eclipse.jface.viewers.Viewer,
- * java.lang.Object, java.lang.Object)
- */
- public boolean select(Viewer viewer, Object parentElement,
- Object element) {
- // TODO: This logic can be improved by add caching mechanism
- if (element instanceof IJavaProject) {
- String currentProjectName = ((IJavaProject) element)
- .getProject().getFullPath().toString().trim();
- String projectName = _javaProject.getProject().getFullPath()
- .toString().trim();
- if (projectName.equalsIgnoreCase(currentProjectName)) {
- return true;
- }
- return false;
- } else if (element instanceof IResource) {
- if (((_javaProject != null) && !_javaProject
- .isOnClasspath((IResource) element))) {
- return false;
- }
- if (element instanceof IFile) {
- if (Arrays.asList(_suffixs).contains(
- ((IFile) element).getFileExtension())) {
- return true;
- }
- }
- return false;
- }
-
- if (element instanceof IJarEntryResource) {
- String ext = ((IJarEntryResource) element).getFullPath()
- .getFileExtension();
- if (ext != null && Arrays.asList(_suffixs).contains(ext)) {
- return true;
- }
- return false;
- }
- if (!(element instanceof IJavaElement)) {
- return false;
- }
- if (((_javaProject != null) && !_javaProject
- .isOnClasspath((IJavaElement) element))) {
- return false;
- }
- IJavaElement javaElement = (IJavaElement) element;
- Object[] children = null;
- switch (javaElement.getElementType()) {
- case IJavaElement.PACKAGE_FRAGMENT_ROOT:
- children = _javaContentProvider.getChildren(javaElement);
- break;
- case IJavaElement.IMPORT_CONTAINER:
- return true;
- case IJavaElement.PACKAGE_FRAGMENT:
- children = _javaContentProvider.getChildren(javaElement);
- break;
- case IJavaElement.CLASS_FILE:
- if (Arrays.asList(_suffixs).contains(
- IFileFolderConstants.EXT_CLASS)) {
- return true;
- }
- return false;
- case IJavaElement.COMPILATION_UNIT:
- String ext = javaElement.getPath().getFileExtension();
- if (ext != null && Arrays.asList(_suffixs).contains(ext)) {
- return true;
- }
- return false;
- default:
- return false;
- }
-
- for (int i = 0; i < children.length; i++) {
- if (select(viewer, javaElement, children[i])) {
- return true;
- }
- }
- // Either the resouce or its children are not for displaying.
- return false;
- }
- }
-
- /**
- * Set the suffixs of files need to be selected.
- *
- * @param suffixs
- */
- public void setSuffixs(String suffixs[]) {
- _suffixs = suffixs;
- _filter.setSuffixs(suffixs);
- }
-
- /**
- * @param parentShell
- * @param project
- */
- public ResourceOnClasspathDialog(Shell parentShell, IJavaProject project) {
- super(parentShell, STATUS_MESSAGE);
- // set provider and filter
- StandardJavaElementContentProvider contentProvider = new StandardJavaElementContentProvider();
- setContentProvider(contentProvider);
- setLabelProvider(new JavaElementLabelProvider());
- _filter = new ResourceOnClasspathFilter(contentProvider);
- setFilter(_filter);
- // store the project
- _javaProject = project;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.ui.dialogs.SelectionDialog#getResult()
- */
- public Object[] getResult() {
- Object[] objects = super.getResult();
- if (objects == null || objects.length == 0) {
- return null;
- }
- IPath path = PathUtil.getPathOnClasspath(_javaProject, objects[0]);
- String result = null;
- if (path.segmentCount() == 0) {
- return new Object[] { "" }; //$NON-NLS-1$
- }
- path = path.removeFileExtension();
- result = path.toOSString();
- result = result.replace(File.separatorChar, '.');
- return new Object[] { result };
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.pagedesigner.ui.common.SelectionTreeViewerDialog#isValidSelection()
- */
- protected boolean isValidSelection(Object selection) {
- String extension = PathUtil.getPathOnClasspath(_javaProject, selection)
- .getFileExtension();
- return (extension != null && Arrays.asList(_suffixs).contains(extension));
- }
-
- protected Object findInputElement() {
- Object input = ResourcesPlugin.getWorkspace();
- if (input instanceof IWorkspace) {
- return JavaCore.create(((IWorkspace) input).getRoot());
- } else if (input instanceof IContainer) {
- IJavaElement element = JavaCore.create((IContainer) input);
- if (element != null && element.exists()) {
- return element;
- }
- return input;
- }
- return JavaCore.create(ResourcesPlugin.getWorkspace().getRoot());
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogs/TreeViewerSelectionDialog.java b/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogs/TreeViewerSelectionDialog.java
deleted file mode 100644
index 3214dbd..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/dialogs/TreeViewerSelectionDialog.java
+++ /dev/null
@@ -1,393 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.common.ui.internal.dialogs;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.resource.JFaceResources;
-import org.eclipse.jface.viewers.DoubleClickEvent;
-import org.eclipse.jface.viewers.IDoubleClickListener;
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.ITreeContentProvider;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.viewers.TreeViewer;
-import org.eclipse.jface.viewers.ViewerComparator;
-import org.eclipse.jface.viewers.ViewerFilter;
-import org.eclipse.jface.viewers.ViewerSorter;
-import org.eclipse.jst.jsf.common.ui.JSFUICommonPlugin;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.dialogs.SelectionDialog;
-import org.eclipse.ui.part.DrillDownComposite;
-
-/**
- * This is a base dialog that uses TreeViewer to show selections, subclass needs
- * to provide IContentProvider, ILabelProvider and ViewerFilter for the
- * TreeViewer. Subclass needs to implement isValidSelection(), which valids the
- * selection, and findInputElement() which provides the root element of the
- * tree. Besides, subclass might need to implement getResult() to return a
- * customized result.
- *
- * @author mengbo
- *
- */
-public abstract class TreeViewerSelectionDialog extends SelectionDialog {
- private static final String DEFAULT_TITLE = JSFUICommonPlugin
- .getResourceString("Dialog.TreeViewerSelectionDialog.DefaultTitle"); //$NON-NLS-1$
-
- /** Used to tag the image type */
- public static final int STYLE_NONE = 0;
-
- private static final int STYLE_INFORMATION = 1;
-
- private static final int STYLE_ERROR = 2;
-
- private static final int STYLE_WARNING = 3;
-
- /** Sizi of the TreeViewer composite */
- private static final int SIZING_SELECTION_PANE_HEIGHT = 300;
-
- private static final int SIZING_SELECTION_PANE_WIDTH = 320;
-
- private String _title = DEFAULT_TITLE;
-
- // the seleciton on the treeviewer.
- private static Object[] _selection;
-
- // providers
- private ITreeContentProvider _contentProvider;
-
- private ILabelProvider _labelProvider;
-
- private ViewerFilter _filter;
-
- /** The validation image */
- private Label _statusImage;
-
- /** The validation message */
- private Label _statusLabel;
-
- private String _statusMessage;
-
- /** The selection tree */
- private TreeViewer _treeViewer;
-
- private int _style;
-
- private ViewerSorter _viewerSorter = null;
- private ViewerComparator _viewerComparator = null;
- /**
- * @param parentShell
- * @param statusMessage
- * @param style
- */
- public TreeViewerSelectionDialog(Shell parentShell, String statusMessage,
- int style) {
- super(parentShell);
- _statusMessage = statusMessage;
- _style = style;
- setShellStyle(SWT.CLOSE | SWT.TITLE | SWT.BORDER
- | SWT.APPLICATION_MODAL | SWT.RESIZE);
- }
-
- /**
- * Convenience for TreeViewerSelectionDialog(parentShell, statusMessage, SWT.NONE)
- *
- * @param parentShell
- * @param statusMessage
- */
- public TreeViewerSelectionDialog(Shell parentShell, String statusMessage) {
- this(parentShell, statusMessage, SWT.NONE);
- }
-
- public void setTitle(String title) {
- super.setTitle(title);
- _title = title;
- }
-
- /**
- * Returns a new drill down viewer for this dialog.
- * @param parent
- */
- protected void createTreeViewer(Composite parent) {
- // Create drill down
- DrillDownComposite drillDown = new DrillDownComposite(parent,
- SWT.BORDER);
- GridData spec = new GridData(GridData.FILL_BOTH);
- spec.widthHint = SIZING_SELECTION_PANE_WIDTH;
- spec.heightHint = SIZING_SELECTION_PANE_HEIGHT;
- drillDown.setLayoutData(spec);
- _treeViewer = new TreeViewer(drillDown, _style);
- drillDown.setChildTree(_treeViewer);
- }
-
- private void setTreeViewerProviders() {
- _treeViewer.setContentProvider(_contentProvider);
- _treeViewer.setLabelProvider(_labelProvider);
- if (_viewerSorter == null) {
- _viewerSorter = new ViewerSorter();
- }
- _treeViewer.setSorter(_viewerSorter);
-
- // override if not null.. setSorter is discouraged.
- if (_viewerComparator != null)
- {
- _treeViewer.setComparator(_viewerComparator);
- }
- _treeViewer.addSelectionChangedListener(new ISelectionChangedListener() {
- public void selectionChanged(SelectionChangedEvent event) {
- _selection = getSelectedElements((IStructuredSelection) event
- .getSelection());
- updateStatus();
- }
- });
- _treeViewer.addDoubleClickListener(new IDoubleClickListener() {
- public void doubleClick(DoubleClickEvent event) {
- ISelection selection = event.getSelection();
- if (selection instanceof IStructuredSelection) {
- Object item = ((IStructuredSelection) selection)
- .getFirstElement();
- if (item instanceof IFile) {
- okPressed();
- } else if (_treeViewer.getExpandedState(item)) {
- _treeViewer.collapseToLevel(item, 1);
- } else {
- _treeViewer.expandToLevel(item, 1);
- }
- }
- }
- });
- _treeViewer.setInput(findInputElement());
-
- if (_filter != null) {
- _treeViewer.addFilter(_filter);
- }
- }
-
- /**
- * Creates the contents of the composite.
- * @param parent
- */
- protected void createTreeViewerComposite(Composite parent) {
- Composite treeViewerComposite = new Composite(parent, SWT.NONE);
- GridLayout layout = new GridLayout();
- layout.marginWidth = 0;
- treeViewerComposite.setLayout(layout);
-
- GridData gridData = new GridData(GridData.FILL_HORIZONTAL);
- gridData.horizontalSpan = 2;
- treeViewerComposite.setLayoutData(gridData);
- Label label = new Label(treeViewerComposite, SWT.WRAP);
- label.setText(_title);
- label.setFont(treeViewerComposite.getFont());
- createTreeViewer(treeViewerComposite);
- Dialog.applyDialogFont(treeViewerComposite);
- }
-
- /**
- * Sets the selected existing container.
- * @param selection
- */
- public void setSelectedElement(Object[] selection) {
- // Expand to and select the specified container
- if (selection == null) {
- return;
- }
-
- for (int i = 0; i < selection.length; i++) {
- if (_selection[i] != null) {
- _treeViewer.expandToLevel(_selection[i], 1);
-
- }
- }
- _treeViewer.setSelection(new StructuredSelection(selection), true);
- }
-
- /*
- * (non-Javadoc) Method declared on Dialog.
- */
- protected Control createDialogArea(Composite parent) {
- Composite area = (Composite) super.createDialogArea(parent);
- GridLayout gridLayout = new GridLayout();
- gridLayout.numColumns = 2;
- area.setLayout(gridLayout);
-
- // Container treeviewer composite
- createTreeViewerComposite(area);
-
- _statusImage = createLabel(area);
- _statusImage.setImage(getMessageImage(STYLE_ERROR));
- _statusLabel = createLabel(area);
- // Link to model
- setTreeViewerProviders();
-
- return dialogArea;
- }
-
- private Label createLabel(Composite parent) {
- Label label = new Label(parent, SWT.LEFT);
- GridData data = new GridData();
- data.horizontalSpan = 1;
- data.horizontalAlignment = GridData.FILL;
- label.setLayoutData(data);
- label.setText(_statusMessage == null ? "" : _statusMessage); //$NON-NLS-1$
- return label;
- }
-
- private Object[] getSelectedElements(IStructuredSelection selection) {
- return selection.toArray();
- }
-
- /**
- * @param provider
- * The _contentProvider to set.
- */
- public void setContentProvider(ITreeContentProvider provider) {
- _contentProvider = provider;
- }
-
- /**
- * @param provider
- * The _labelProvider to set.
- */
- public void setLabelProvider(ILabelProvider provider) {
- _labelProvider = provider;
- }
-
- /**
- * @param filter
- * The _filter to set.
- */
- public void setFilter(ViewerFilter filter) {
- this._filter = filter;
- }
-
- /**
- * @param sorter
- * The _viewerSorter to set.
- */
- public void setViewerSorter(ViewerSorter sorter) {
- _viewerSorter = sorter;
- }
-
- /**
- * Set the viewer comparator. If not null, it's set after after the
- * viewer sorter and thus overrides it.
- *
- * @param viewerComparator
- */
- public void setViewerComparator(ViewerComparator viewerComparator)
- {
- _viewerComparator = viewerComparator;
- }
-
- /**
- * @param message
- */
- public void setStatusMessage(String message) {
- _statusMessage = message;
- }
-
- /**
- * Update the status message
- */
- private void updateStatus() {
- Object selection = _selection;
- if (_selection != null && _selection.length == 1) {
- selection = _selection[0];
- }
- if (isValidSelection(selection)) {
- _statusImage.setVisible(false);
- _statusLabel.setText(""); //$NON-NLS-1$
- getOkButton().setEnabled(true);
- } else {
- _statusImage.setVisible(true);
- _statusImage.setImage(getMessageImage(STYLE_ERROR));
- _statusImage.redraw();
- _statusLabel.setText(_statusMessage);
- getOkButton().setEnabled(false);
- }
-
- }
-
- /**
- * Get the different message according the message type.
- * @param imageType
- *
- * @return Image - the message image
- */
- protected Image getMessageImage(int imageType) {
- switch (imageType) {
- case STYLE_ERROR:
- return JFaceResources.getImage(Dialog.DLG_IMG_MESSAGE_ERROR);
- case STYLE_WARNING:
- return JFaceResources.getImage(Dialog.DLG_IMG_MESSAGE_WARNING);
- case STYLE_INFORMATION:
- return JFaceResources.getImage(Dialog.DLG_IMG_MESSAGE_INFO);
- default:
- return null;
- }
- }
-
- /**
- * The <code>ContainerSelectionDialog</code> implementation of this
- * <code>Dialog</code> method builds a list of the selected resource
- * containers for later retrieval by the client and closes this dialog.
- */
- protected void okPressed() {
- List chosenContainerPathList = new ArrayList();
- if (_selection != null) {
- chosenContainerPathList.addAll(Arrays.asList(_selection));
- }
- setResult(chosenContainerPathList);
- super.okPressed();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.window.Window#createContents(org.eclipse.swt.widgets.Composite)
- */
- protected Control createContents(Composite parent) {
- Control control = super.createContents(parent);
- if (_selection != null) {
- this.setSelectedElement(_selection);
- }
- return control;
- }
-
- /**
- * @param selection
- * @return true if selection is valid
- */
- protected abstract boolean isValidSelection(Object selection);
-
- /**
- * Used to set the input element on the tree viewer
- * @return the input element
- */
- protected abstract Object findInputElement();
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/form/AbstractDetailsForm.java b/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/form/AbstractDetailsForm.java
deleted file mode 100644
index 887d57f..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/form/AbstractDetailsForm.java
+++ /dev/null
@@ -1,147 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2008 Oracle Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Oracle Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.common.ui.internal.form;
-
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-
-/**
- * The parent of all detail forms.
- *
- * @author cbateman
- *
- */
-public abstract class AbstractDetailsForm
-{
- private FormToolkit _toolkit;
-
- /**
- *
- */
- protected AbstractDetailsForm()
- {
- super();
- }
-
- /**
- * Called to refresh model if stale
- */
- public void refresh()
- {
- // do nothing by default
- }
-
- /**
- * Called before createContents.
- *
- * @param toolkit
- */
- public final void initialize(final FormToolkit toolkit)
- {
- _toolkit = toolkit;
- doInitialize();
- }
-
- /**
- * Override to customize initialization. getToolkit() is safe to call
- * from this method. You should not make other state assumptions.
- */
- protected void doInitialize()
- {
- // do nothing by default;
- }
-
- /**
- * Callled by MasterDetailBlock during it's dispose
- */
- public abstract void dispose();
-
- /**
- * @param onSave
- */
- public abstract void commit(boolean onSave);
-
- /**
- * Called on this details form before it is shown, when it becomes active
- * due to a matching selection change in the master form. Implementer
- * should use newSelection as the new instance of their model and
- * reinitialize UI as appropriate.
- * @param newSelection
- */
- protected abstract void doUpdateSelection(final Object newSelection);
-
- /**
- * @return the contents control. Must not be called before createContents.
- */
- public abstract Control getControl();
-
- /**
- * Fired to indicate that this detail form is now selected based on the
- * master form selected.
- *
- * @param selection
- */
- public void selectionChanged(final ISelection selection)
- {
- // by default, get the first element of the selection if there is
- // one and call doUpdateSelection on it. Sub-classes may change
- // this behaviour
- if (selection instanceof IStructuredSelection)
- {
- final Object selectionObj = ((IStructuredSelection) selection)
- .getFirstElement();
- doUpdateSelection(selectionObj);
- }
- }
-
- /**
- * Create the contents of the detail form using 'parent'. Should not be
- * called before initialize.
- *
- * @param parent
- */
- public abstract void createContents(Composite parent);
-
- /**
- * @return the form toolkit in use. Should not be called before
- * initialize.
- */
- protected final FormToolkit getToolkit()
- {
- return _toolkit;
- }
-
- /**
- * @return true if the form is dirty
- */
- public boolean isDirty()
- {
- // never dirty by default
- return false;
- }
-
- /**
- * @return true if form is stale
- */
- public boolean isStale()
- {
- // always stale by default
- return true;
- }
-
- /**
- * Called to set focus on the detail form's control
- */
- public abstract void setFocus();
-}
\ No newline at end of file
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/form/AbstractMasterDetailBlock.java b/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/form/AbstractMasterDetailBlock.java
deleted file mode 100644
index 7141dcb..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/form/AbstractMasterDetailBlock.java
+++ /dev/null
@@ -1,206 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2008 Oracle Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Oracle Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.common.ui.internal.form;
-
-import java.util.List;
-
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.custom.SashForm;
-import org.eclipse.swt.custom.StackLayout;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.forms.widgets.Form;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-
-/**
- * An alternative to MasterDetailBlock that doesn't use the ScrolledForm
- * that causes problems as described here:
- *
- * http://dev.eclipse.org/newslists/news.eclipse.platform/msg73145.html
-
- * @author cbateman
- *
- */
-public abstract class AbstractMasterDetailBlock implements
- ISelectionChangedListener
-{
- private AbstractMasterForm _masterForm;
- private Composite _detailsPanel;
- private AbstractDetailsForm _curPage;
- private FormToolkit _toolkit;
- private StackLayout _detailLayout;
- private List<AbstractDetailsForm> _detailForms;
- private BlankDetailsForm _blankDetails;
-
- /**
- *
- */
- protected AbstractMasterDetailBlock()
- {
- super();
- }
-
- /**
- * Disposes the master detail form
- */
- public final void dispose()
- {
- _masterForm.dispose();
-
- for (final AbstractDetailsForm detailsForm : _detailForms)
- {
- detailsForm.dispose();
- }
-
- doDispose();
- }
-
- /**
- * Override to get custom dispose logic. Do not use this to dispose of
- * master or details forms. This is done automatically for you before
- * doDispose is called.
- */
- protected void doDispose()
- {
- // do nothing by default
- }
-
- /**
- * @param toolkit
- * @param form
- */
- public final void createContent(final FormToolkit toolkit, final Form form)
- {
- _toolkit = toolkit;
-
- final GridLayout layout = new GridLayout();
- layout.marginWidth = 5;
- layout.marginHeight = 5;
- form.getBody().setLayout(layout);
- final SashForm sashForm = new SashForm(form.getBody(), SWT.NULL);
- // sashForm.setData("form", managedForm); //$NON-NLS-1$
- _toolkit.adapt(sashForm, false, false);
- sashForm.setMenu(form.getBody().getMenu());
- sashForm.setLayoutData(new GridData(GridData.FILL_BOTH));
- initializeMasterPart(_toolkit, sashForm);
- createDetailsPart(sashForm);
-
- _masterForm.createHead(form);
- createToolBarActions(form);
- form.updateToolBar();
- }
-
- /**
- * @param toolkit
- * @return the master form.
- */
- protected abstract AbstractMasterForm createMasterPart(
- final FormToolkit toolkit);
-
- private void initializeMasterPart(final FormToolkit toolkit,
- final Composite parent)
- {
- _masterForm = createMasterPart(toolkit);
- _masterForm.initialize(this);
- _masterForm.createClientArea(parent);
- }
-
- private void createToolBarActions(final Form form)
- {
- _masterForm.contributeActions(form.getToolBarManager());
- }
-
- private void createDetailsPart(final Composite parent)
- {
- _detailsPanel = new Composite(parent, SWT.NONE);
- _detailLayout = new StackLayout();
- _detailsPanel.setLayout(_detailLayout);
-
- _detailForms = createDetailPages();
-
- for (final AbstractDetailsForm detailForm : _detailForms)
- {
- detailForm.initialize(_toolkit);
- detailForm.createContents(_detailsPanel);
- }
-
- // create default blank page
- _blankDetails = new BlankDetailsForm();
- _blankDetails.initialize(_toolkit);
- _blankDetails.createContents(_detailsPanel);
-
- _curPage = _blankDetails;
- _detailLayout.topControl = _curPage.getControl();
- _detailsPanel.layout();
- }
-
- public final void selectionChanged(final SelectionChangedEvent event)
- {
- final Object selectedObj = ((IStructuredSelection) event.getSelection())
- .getFirstElement();
- final AbstractDetailsForm page = selectPage(selectedObj);
- if (page != null)
- {
- final AbstractDetailsForm fpage = page;
- BusyIndicator.showWhile(_detailsPanel.getDisplay(), new Runnable()
- {
- public void run()
- {
- final AbstractDetailsForm oldPage = _curPage;
- _curPage = fpage;
- // commit the current page
- if (oldPage != null && oldPage.isDirty())
- {
- oldPage.commit(false);
- }
- // refresh the new page
- if (fpage.isStale())
- {
- fpage.refresh();
- }
- _curPage.selectionChanged(event.getSelection());
- // _pageBook.showPage(_curPage.getTextSection().getControl());
- _detailLayout.topControl = _curPage.getControl();
- _detailsPanel.layout();
- }
- });
- }
- }
-
- /**
- * @return a list of detail forms
- */
- protected abstract List<AbstractDetailsForm> createDetailPages();
-
- /**
- * @param forModel
- * @return the details form for 'forModel'. If implementer returns null,
- * then a blank page will be provided
- */
- protected abstract AbstractDetailsForm doSelectPage(final Object forModel);
-
- private AbstractDetailsForm selectPage(final Object forModel)
- {
- final AbstractDetailsForm clientForm = doSelectPage(forModel);
-
- if (clientForm != null)
- {
- return clientForm;
- }
- return _blankDetails;
- }
-
-}
\ No newline at end of file
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/form/AbstractMasterForm.java b/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/form/AbstractMasterForm.java
deleted file mode 100644
index 46ec864..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/form/AbstractMasterForm.java
+++ /dev/null
@@ -1,165 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2008 Oracle Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Oracle Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.common.ui.internal.form;
-
-import org.eclipse.jface.action.IToolBarManager;
-import org.eclipse.jface.action.ToolBarManager;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.DisposeEvent;
-import org.eclipse.swt.events.DisposeListener;
-import org.eclipse.swt.layout.RowLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.ToolBar;
-import org.eclipse.ui.forms.widgets.Form;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-
-/**
- *
- * @author cbateman
- *
- */
-public abstract class AbstractMasterForm
-{
-
- private final FormToolkit _toolkit;
- private ISelectionChangedListener _listener;
- private ToolBarManager _toolBarManager;
-
- /**
- * @param toolkit
- */
- protected AbstractMasterForm(FormToolkit toolkit)
- {
- super();
- _toolkit = toolkit;
- }
-
- /**
- * @param listener
- * the selection listener that is signalled to indicate the
- * selection in the master has changed and the detail should be
- * updated.
- */
- public final void initialize(final ISelectionChangedListener listener)
- {
- _listener = listener;
- doInitialize();
- }
-
- /**
- * It is safe to call getListener() and get getToolkit() in this method. All
- * other methods should be considered unavailable.
- */
- protected void doInitialize()
- {
- // do nothing by default; override to do customize init
- }
-
- /**
- * @param parent
- * @return the client area for the master form, using parent is the parent
- * control.
- */
- public abstract Control createClientArea(final Composite parent);
-
- /**
- * @param form
- */
- public final void createHead(final Form form)
- {
- final Composite head = form.getHead();
- final Composite container = getToolkit().createComposite(head);
- container.setLayout(new RowLayout());
-
- // sub-class contribution
- contributeToHeadArea(getToolkit(), container);
-
- _toolBarManager = new ToolBarManager(SWT.FLAT);
- ToolBar toolbar = _toolBarManager.createControl(container);
- // _toolkit.adapt(toolbar, false, false);
-
- toolbar.setBackground(form.getHead().getBackground());
- toolbar.setForeground(form.getHead().getForeground());
- //toolbar.setCursor(FormsResources.getHandCursor());
- container.addDisposeListener(new DisposeListener()
- {
- public void widgetDisposed(DisposeEvent e)
- {
- if (_toolBarManager != null)
- {
- _toolBarManager.dispose();
- _toolBarManager = null;
- }
- }
- });
-
- form.setHeadClient(container);
-
- }
-
- /**
- * Override to add client area before the toolbar.
- *
- * @param toolkit
- * @param container
- */
- protected void contributeToHeadArea(FormToolkit toolkit, Composite container)
- {
- // do nothing by default
- }
-
- /**
- * @param formManager
- */
- public final void contributeActions(final IToolBarManager formManager)
- {
- contributeActions(formManager, _toolBarManager);
- }
-
- /**
- * @param formManager
- * adds to the toolkit's toolbar
- * @param localManager
- * adds to AbstractMasterForm's toolbar.
- */
- protected void contributeActions(final IToolBarManager formManager,
- final IToolBarManager localManager)
- {
- // do nothing by default. Override to add actions.
- }
-
- /**
- * Should be called at any time after initialize and createContents when the
- * owner is finished with the master-detail form block.
- */
- public void dispose()
- {
- // do nothing by default;
- }
-
- /**
- * @return the tool kit in use.
- */
- protected final FormToolkit getToolkit()
- {
- return _toolkit;
- }
-
- /**
- * @return the selection listener
- */
- protected final ISelectionChangedListener getListener()
- {
- return _listener;
- }
-}
\ No newline at end of file
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/form/AbstractXMLSectionsDetailsForm.java b/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/form/AbstractXMLSectionsDetailsForm.java
deleted file mode 100644
index 902ec7e..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/form/AbstractXMLSectionsDetailsForm.java
+++ /dev/null
@@ -1,186 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2008 Oracle Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Oracle Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.common.ui.internal.form;
-
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Set;
-
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.RowData;
-import org.eclipse.swt.layout.RowLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.ui.forms.widgets.ExpandableComposite;
-import org.eclipse.ui.forms.widgets.FormText;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-import org.eclipse.ui.forms.widgets.Section;
-
-/**
- * A detail form that uses XML text sections.
- *
- * @author cbateman
- *
- */
-public abstract class AbstractXMLSectionsDetailsForm extends
- AbstractDetailsForm
-{
- private Map<Object, XMLTextSection> _textSections;
- private Composite _detailFormComposite;
-
- /**
- * @param parent
- */
- @Override
- public final void createContents(final Composite parent)
- {
- _detailFormComposite = getToolkit().createComposite(parent, SWT.NONE);
- final RowLayout rowLayout = new RowLayout(SWT.VERTICAL);
- rowLayout.fill = true;
- _detailFormComposite.setLayout(rowLayout);
- // take a copy of what's returned so the sub-class can't control
- // the map reference
- _textSections = Collections
- .unmodifiableMap(new HashMap<Object, XMLTextSection>(
- createXMLTextSections(_detailFormComposite)));
-
- final Set<XMLTextSection> expandedSections = getInitiallyExpanded(_textSections);
- for (final Map.Entry<? extends Object, XMLTextSection> entry : _textSections
- .entrySet())
- {
- final XMLTextSection section = entry.getValue();
- if (expandedSections.contains(section))
- {
- section._section.setExpanded(true);
- }
- }
- }
-
- /**
- * @param parent
- * the parent that should be used for all XMLTextSections
- * @return a map keyed by an object type understood by the sub-class
- * containing as values the XMLTextSections
- */
- protected abstract Map<? extends Object, XMLTextSection> createXMLTextSections(
- final Composite parent);
-
- /**
- * @param sections
- * @return the subset of XMLTextSections in the provided map that are to be
- * expanded. NOTE: all elements in the returned set must be in
- * sections.getValues.
- */
- protected abstract Set<XMLTextSection> getInitiallyExpanded(
- final Map<Object, XMLTextSection> sections);
-
- /**
- * @return the control for this form
- */
- @Override
- public Control getControl()
- {
- return _detailFormComposite;
- }
-
- /**
- * @param selection
- */
- public final void selectionChanged(final ISelection selection)
- {
- if (selection instanceof IStructuredSelection)
- {
- final Object selectionObj = ((IStructuredSelection) selection)
- .getFirstElement();
- doUpdateSelection(selectionObj);
- }
- }
-
- @Override
- public void commit(final boolean onSave)
- {
- // do nothing
- }
-
- @Override
- public void dispose()
- {
- // do nothing
- }
-
- @Override
- public void setFocus()
- {
- // do nothing; sub-classes should override to pick an XMLTextSection
- // where they want focus.
- }
-
- /**
- * An XML text section
- *
- */
- protected final static class XMLTextSection
- {
- private final Section _section;
- private FormText _formText;
-
- /**
- * @param toolkit
- * @param parent
- * @param title
- */
- public XMLTextSection(final FormToolkit toolkit,
- final Composite parent, final String title)
- {
- _section = toolkit.createSection(parent,
- ExpandableComposite.TREE_NODE
- | ExpandableComposite.CLIENT_INDENT);
- _section.setLayoutData(new RowData());
- _section.setText(title);
-
- _formText = toolkit.createFormText(_section, true);
- _formText.setText("", false, false); //$NON-NLS-1$
-
- _section.setClient(_formText);
- }
-
- /**
- * @param text
- * @param parseTags
- * @param expandURLs
- */
- public void setText(final String text, final boolean parseTags,
- final boolean expandURLs)
- {
- _formText.setText(text, parseTags, expandURLs);
- }
-
- /**
- * @return the parent control.
- */
- public Control getControl()
- {
- return _section;
- }
-
- /**
- * Force a visual relayout and update.
- */
- public void refresh()
- {
- _section.getParent().layout(true, true);
- }
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/form/BlankDetailsForm.java b/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/form/BlankDetailsForm.java
deleted file mode 100644
index 7678b03..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/form/BlankDetailsForm.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2008 Oracle Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Oracle Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.common.ui.internal.form;
-
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-
-/**
- * A blank details form.
- *
- * @author cbateman
- *
- */
-public final class BlankDetailsForm extends AbstractDetailsForm
-{
- private Composite _emptyPanel;
-
- @Override
- public void createContents(Composite parent)
- {
- _emptyPanel = getToolkit().createComposite(parent);
- }
-
- @Override
- public Control getControl()
- {
- return _emptyPanel;
- }
-
- @Override
- protected void doUpdateSelection(Object newSelection)
- {
- // do nothing
- }
-
- @Override
- public void commit(boolean onSave)
- {
- // nothing to commit
- }
-
- @Override
- public void dispose()
- {
- // nothing to dispose
- }
-
- @Override
- public void setFocus()
- {
- // don't bother changing focus
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/guiutils/Alerts.java b/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/guiutils/Alerts.java
deleted file mode 100644
index 54c3a27..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/guiutils/Alerts.java
+++ /dev/null
@@ -1,837 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.common.ui.internal.guiutils;
-
-import java.lang.reflect.InvocationTargetException;
-import java.text.MessageFormat;
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.MultiStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jface.dialogs.ErrorDialog;
-import org.eclipse.jface.dialogs.IInputValidator;
-import org.eclipse.jface.dialogs.InputDialog;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-
-/**
- * This class will provide UI alert dialogs to the user. These will
- * automatically get the message from the plugin's resource bundle.
- *
- * NOTE: there are some generic exception methods included in this file. They
- * need resource bundles also, and they make the alerts bettern when the
- * exception is caught at a later stage.
- *
- * @author mengbo
- */
-public class Alerts {
- // this is used for junit testing to turn off all alerts and return the
- // default on yes/no dialogs.
- private static boolean _noAlerts = false;
-
- private ResourceBundle _rb;
-
- private String _pluginId;
-
- /**
- * Construct a alerts with the provided attributes. This constructor should
- * be used from the root plugin that has access to the resource bundle for
- * this plugin.
- *
- * @param plugin
- * @param rb
- * the resource bundle to use.
- */
- public Alerts(AbstractUIPlugin plugin, ResourceBundle rb) {
- _rb = rb;
- if (_rb == null) {
- throw new NullPointerException(
- "No resource bundle was provided to the Alerts."); //$NON-NLS-1$
- }
- if (plugin == null) {
- throw new NullPointerException(
- "No plugin was provided to the Alerts."); //$NON-NLS-1$
- }
- _pluginId = plugin.getBundle().getSymbolicName();
- }
-
- /**
- * Returns the text entered by a user in a simple request dialog.
- *
- * @param titleKey -
- * the title resource bundle key for the message
- * @param msgKey -
- * message resource bundle key for the message displayed to the
- * user
- * @param initialValue -
- * initial value in the text area.
- * @param validator -
- * something that checks for validity on the name.
- * @return null is returned if the user hits cancel, otherwise it is the
- * text they entered.
- */
- public String getInput(String titleKey, String msgKey, String initialValue,
- IInputValidator validator) {
- if (_noAlerts) {
- return null;
- }
-
- InputDialog inDialog = new InputDialog(PlatformUI.getWorkbench()
- .getActiveWorkbenchWindow().getShell(),
- getResourceString(titleKey), getResourceString(msgKey),
- initialValue, validator);
- inDialog.open();
- return inDialog.getValue();
- }
-
- /**
- * Displays an Error message to the user.
- *
- * @param titleKey -
- * the title resource bundle key for the message
- * @param msgKey -
- * message resource bundle key for the message displayed to the
- * user
- */
- public void error(String titleKey, String msgKey) {
- if (_noAlerts) {
- return;
- }
-
- MessageDialog.openError(PlatformUI.getWorkbench()
- .getActiveWorkbenchWindow().getShell(),
- getResourceString(titleKey), getResourceString(msgKey));
- }
-
- /**
- * Displays an Error message to the user.
- *
- * @param titleKey -
- * the title resource bundle key for the message
- * @param msgKey -
- * message resource bundle key for the message displayed to the
- * user
- * @param arg0 -
- * arg to place into the resource bundle message.
- */
- public void error(String titleKey, String msgKey, Object arg0) {
- if (_noAlerts) {
- return;
- }
-
- Object[] args = new Object[1];
- args[0] = arg0;
-
- MessageFormat formatter = new MessageFormat(getResourceString(msgKey));
-
- MessageDialog.openError(PlatformUI.getWorkbench()
- .getActiveWorkbenchWindow().getShell(),
- getResourceString(titleKey), formatter.format(args));
- }
-
- /**
- * Displays an Error message to the user.
- *
- * @param titleKey -
- * the title resource bundle key for the message
- * @param msgKey -
- * message resource bundle key for the message displayed to the
- * user
- * @param arg0 -
- * arg to place into the resource bundle message.
- * @param arg1 -
- * arg to place into the resource bundle message.
- */
- public void error(String titleKey, String msgKey, Object arg0, Object arg1) {
- if (_noAlerts) {
- return;
- }
-
- Object[] args = new Object[2];
- args[0] = arg0;
- args[1] = arg1;
-
- MessageFormat formatter = new MessageFormat(getResourceString(msgKey));
-
- MessageDialog.openError(PlatformUI.getWorkbench()
- .getActiveWorkbenchWindow().getShell(),
- getResourceString(titleKey), formatter.format(args));
- }
-
- /**
- * Displays an Error message to the user.
- *
- * @param titleKey -
- * the title resource bundle key for the message
- * @param msgKey -
- * message resource bundle key for the message displayed to the
- * user
- * @param arg0 -
- * arg to place into the resource bundle message.
- * @param arg1 -
- * arg to place into the resource bundle message.
- * @param arg2 -
- * arg to place into the resource bundle message.
- */
- public void error(String titleKey, String msgKey, Object arg0, Object arg1,
- Object arg2) {
- if (_noAlerts) {
- return;
- }
-
- Object[] args = new Object[3];
- args[0] = arg0;
- args[1] = arg1;
- args[2] = arg2;
-
- MessageFormat formatter = new MessageFormat(getResourceString(msgKey));
-
- MessageDialog.openError(PlatformUI.getWorkbench()
- .getActiveWorkbenchWindow().getShell(),
- getResourceString(titleKey), formatter.format(args));
- }
-
- /**
- * Displays an Error message to the user.
- *
- * @param titleKey -
- * the title resource bundle key for the message
- * @param msgKey -
- * message resource bundle key for the message displayed to the
- * user
- * @param arg0 -
- * arg to place into the resource bundle message.
- * @param arg1 -
- * arg to place into the resource bundle message.
- * @param arg2 -
- * arg to place into the resource bundle message.
- * @param arg3 -
- * arg to place into the resource bundle message.
- */
- public void error(String titleKey, String msgKey, Object arg0, Object arg1,
- Object arg2, Object arg3) {
- if (_noAlerts) {
- return;
- }
-
- Object[] args = new Object[4];
- args[0] = arg0;
- args[1] = arg1;
- args[2] = arg2;
- args[3] = arg3;
-
- MessageFormat formatter = new MessageFormat(getResourceString(msgKey));
-
- MessageDialog.openError(PlatformUI.getWorkbench()
- .getActiveWorkbenchWindow().getShell(),
- getResourceString(titleKey), formatter.format(args));
- }
-
- /**
- * Displays an Error message to the user.
- *
- * @param shell -
- * the shell for the error dialog
- * @param titleKey -
- * the title resource bundle key for the message
- * @param msgKey -
- * message resource bundle key for the message displayed to the
- * user
- */
- public void error(Shell shell, String titleKey, String msgKey) {
- if (_noAlerts) {
- return;
- }
-
- MessageDialog.openError(shell, getResourceString(titleKey),
- getResourceString(msgKey));
- }
-
- /**
- * Displays an Error message to the user with a status using the Display
- * background thread.
- *
- * @param titleKey -
- * the title resource bundle key for the message
- * @param msgKey -
- * message resource bundle key for the message displayed to the
- * user
- */
- public void detailError(String titleKey, String msgKey) {
- if (_noAlerts) {
- return;
- }
-
- final IStatus fstatus = new Status(IStatus.ERROR, _pluginId,
- IStatus.OK, getResourceString(msgKey), null);
- final String ftitle = getResourceString(titleKey);
-
- Display display = getStandardDisplay();
- display.asyncExec(new Runnable() {
- public void run() {
- ErrorDialog.openError(null, ftitle, null, fstatus);
- }
- });
- }
-
- /**
- * Displays an Error message to the user with a status using the Display
- * background thread. This will give the details button.
- *
- * @param titleKey -
- * the title resource bundle key for the message
- * @param msgKey -
- * message resource bundle key for the message displayed to the
- * user
- * @param tt -
- * exception to place in the details.
- */
- public void detailError(String titleKey, String msgKey, Throwable tt) {
- if (_noAlerts) {
- return;
- }
-
- internalDetailError(getResourceString(titleKey),
- getResourceString(msgKey), tt);
- }
-
- /**
- * Displays an Error message to the user with a status using the Display
- * background thread. This will give the details button.
- *
- * @param titleKey -
- * the title resource bundle key for the message
- * @param msgKey -
- * message resource bundle key for the message displayed to the
- * user
- * @param arg0 -
- * arg to place into the resource bundle message.
- * @param tt -
- * exception to place in the details.
- */
- public void detailError(String titleKey, String msgKey, Object arg0,
- Throwable tt) {
- if (_noAlerts) {
- return;
- }
-
- Object[] args = new Object[1];
- args[0] = arg0;
-
- MessageFormat formatter = new MessageFormat(getResourceString(msgKey));
-
- internalDetailError(getResourceString(titleKey),
- formatter.format(args), tt);
- }
-
- /**
- * Displays an Error message to the user with a status using the Display
- * background thread. This will give the details button.
- *
- * @param titleKey -
- * the title resource bundle key for the message
- * @param msgKey -
- * message resource bundle key for the message displayed to the
- * user
- * @param arg0 -
- * arg to place into the resource bundle message.
- * @param arg1 -
- * arg to place into the resource bundle message.
- * @param tt -
- * exception to place in the details.
- */
- public void detailError(String titleKey, String msgKey, Object arg0,
- Object arg1, Throwable tt) {
- if (_noAlerts) {
- return;
- }
-
- Object[] args = new Object[1];
- args[0] = arg0;
- args[1] = arg1;
-
- MessageFormat formatter = new MessageFormat(getResourceString(msgKey));
-
- internalDetailError(getResourceString(titleKey),
- formatter.format(args), tt);
- }
-
- /**
- * Displays an Error message to the user with a status using the Display
- * background thread. This will give the details button.
- *
- * @param title -
- * the title message
- * @param message -
- * message displayed to the user
- */
- private void internalDetailError(String title, String msg, Throwable tt) {
- if (_noAlerts) {
- return;
- }
-
- if (tt instanceof InvocationTargetException) {
- tt = ((InvocationTargetException) tt).getTargetException();
- }
-
- IStatus status = null;
- if (tt instanceof CoreException) {
- status = ((CoreException) tt).getStatus();
-
- if ((status instanceof MultiStatus) == false) {
- // convert to a multistatus to show the exception details.
-
- Throwable th = status.getException();
- if (th == null) {
- th = tt;
- }
-
- status = buildStackTraceStatus(IStatus.ERROR, status
- .getPlugin(), status.getMessage(), th);
- }
- } else {
- status = buildStackTraceStatus(IStatus.ERROR, _pluginId, tt
- .getMessage(), tt);
- }
-
- final String ftitle = title;
- final IStatus fstatus = status;
- final String fmsg = msg;
- Display display = getStandardDisplay();
- display.asyncExec(new Runnable() {
- public void run() {
- ErrorDialog.openError(null, ftitle, fmsg, fstatus);
- }
- });
- }
-
- /**
- * Builds a multistatus, so that the stack trace shows up in the alery
- * message for detailed alerts.
- *
- * @param code
- * @param pluginId
- * @param message
- * @param tt
- * @return the result of the operation
- */
- public IStatus buildStackTraceStatus(int code, String pluginId,
- String message, Throwable tt) {
- if (tt == null) {
- return new Status(code, pluginId, IStatus.OK, message, tt);
- }
-
- MultiStatus mstat = new MultiStatus(pluginId, code, message, tt);
-
- StackTraceElement[] trace = tt.getStackTrace();
-
- mstat.add(new Status(code, pluginId, IStatus.OK, tt.toString(), null));
- for (int ii = 0; ii < trace.length; ii++) {
- mstat.add(new Status(code, pluginId, IStatus.OK, trace[ii]
- .toString(), null));
- }
- return mstat;
- }
-
- /**
- * Displays an Error message to the user with a status using the Display
- * background thread. This will give the details button.
- *
- * @param status -
- * the status
- * @param title -
- * the title of the message
- */
- public void detailError(String title, IStatus status) {
- if (_noAlerts) {
- return;
- }
-
- final IStatus fstatus = status;
- final String ftitle = title;
- Display display = getStandardDisplay();
- display.asyncExec(new Runnable() {
- public void run() {
- ErrorDialog.openError(null, ftitle, null, fstatus);
- }
- });
- }
-
- /**
- * Displays an information message to the user.
- *
- * @param titleKey -
- * the title resource bundle key for the message
- * @param msgKey -
- * message resource bundle key for the message displayed to the
- * user
- */
- public void info(String titleKey, String msgKey) {
- if (_noAlerts) {
- return;
- }
-
- MessageDialog.openInformation(PlatformUI.getWorkbench()
- .getActiveWorkbenchWindow().getShell(),
- getResourceString(titleKey), getResourceString(msgKey));
- }
-
- /**
- * Displays an information message to the user.
- *
- * @param titleKey -
- * the title resource bundle key for the message
- * @param msgKey -
- * message resource bundle key for the message displayed to the
- * user
- * @param arg0 -
- * arg to place into the resource bundle message.
- */
- public void info(String titleKey, String msgKey, Object arg0) {
- if (_noAlerts) {
- return;
- }
-
- Object[] args = new Object[1];
- args[0] = arg0;
-
- MessageFormat formatter = new MessageFormat(getResourceString(msgKey));
-
- MessageDialog.openInformation(PlatformUI.getWorkbench()
- .getActiveWorkbenchWindow().getShell(),
- getResourceString(titleKey), formatter.format(args));
- }
-
- /**
- * Displays an confirmation message to the user.
- *
- * @param titleKey -
- * the title resource bundle key for the message
- * @param msgKey -
- * message resource bundle key for the message displayed to the
- * user
- * @return true if the user presses the OK button, false otherwise
- */
- public boolean confirm(String titleKey, String msgKey) {
- if (_noAlerts) {
- return true;
- }
-
- return MessageDialog.openConfirm(PlatformUI.getWorkbench()
- .getActiveWorkbenchWindow().getShell(),
- getResourceString(titleKey), getResourceString(msgKey));
- }
-
- /**
- * Displays an confirmation message to the user.
- *
- * @param titleKey -
- * the title resource bundle key for the message
- * @param msgKey -
- * message resource bundle key for the message displayed to the
- * user
- * @param arg0 -
- * arg to place into the resource bundle message.
- * @return true if the user presses the OK button, false otherwise
- */
- public boolean confirm(String titleKey, String msgKey, Object arg0) {
- if (_noAlerts) {
- return true;
- }
-
- Object[] args = new Object[1];
- args[0] = arg0;
-
- MessageFormat formatter = new MessageFormat(getResourceString(msgKey));
-
- return MessageDialog.openConfirm(PlatformUI.getWorkbench()
- .getActiveWorkbenchWindow().getShell(),
- getResourceString(titleKey), formatter.format(args));
- }
-
- /**
- * Displays an question message to the user.
- *
- * @param titleKey -
- * the title resource bundle key for the message
- * @param msgKey -
- * message resource bundle key for the message displayed to the
- * user
- * @return true if the user presses the "yes" button, false otherwise
- */
- public boolean question(String titleKey, String msgKey) {
- if (_noAlerts) {
- return true;
- }
-
- return MessageDialog.openQuestion(PlatformUI.getWorkbench()
- .getActiveWorkbenchWindow().getShell(),
- getResourceString(titleKey), getResourceString(msgKey));
- }
-
- /**
- * Displays an question message to the user.
- *
- * @param titleKey -
- * the title resource bundle key for the message
- * @param msgKey -
- * message resource bundle key for the message displayed to the
- * user
- * @param arg0 -
- * arg to place into the resource bundle message.
- * @return true if the user presses the "yes" button, false otherwise
- */
- public boolean question(String titleKey, String msgKey, Object arg0) {
- if (_noAlerts) {
- return true;
- }
-
- Object[] args = new Object[1];
- args[0] = arg0;
-
- MessageFormat formatter = new MessageFormat(getResourceString(msgKey));
-
- return MessageDialog.openQuestion(PlatformUI.getWorkbench()
- .getActiveWorkbenchWindow().getShell(),
- getResourceString(titleKey), formatter.format(args));
- }
-
- /**
- * Displays an warning message to the user.
- *
- * @param titleKey -
- * the title resource bundle key for the message
- * @param msgKey -
- * message resource bundle key for the message displayed to the
- * user
- */
- public void warning(String titleKey, String msgKey) {
- if (_noAlerts) {
- return;
- }
-
- MessageDialog.openWarning(PlatformUI.getWorkbench()
- .getActiveWorkbenchWindow().getShell(),
- getResourceString(titleKey), getResourceString(msgKey));
- }
-
- /**
- * Displays an warning message to the user.
- *
- * @param titleKey -
- * the title resource bundle key for the message
- * @param msgKey -
- * message resource bundle key for the message displayed to the
- * user
- * @param arg0 -
- * arg to place into the resource bundle message.
- */
- public void warning(String titleKey, String msgKey, Object arg0) {
- if (_noAlerts) {
- return;
- }
-
- Object[] args = new Object[1];
- args[0] = arg0;
-
- MessageFormat formatter = new MessageFormat(getResourceString(msgKey));
-
- MessageDialog.openWarning(PlatformUI.getWorkbench()
- .getActiveWorkbenchWindow().getShell(),
- getResourceString(titleKey), formatter.format(args));
- }
-
- /**
- * Returns the standard display to be used. The method first checks, if the
- * thread calling this method has an associated dispaly. If so, this display
- * is returned. Otherwise the method returns the default display.
- *
- * TODO: should probably use the workbench display
- */
- private Display getStandardDisplay() {
- Display display = Display.getCurrent();
- if (display == null) {
- display = Display.getDefault();
- }
- return display;
- }
-
- /**
- * Returns the string from the resource bundle, or 'key' if not found.
- */
- private String getResourceString(String key) {
- if (key == null) {
- return null;
- }
-
- try {
- return _rb.getString(key);
- } catch (MissingResourceException ee) {
- return key;
- }
- }
-
- /**
- * Throw a core exception built around the message with the correct plugin
- * id and resource bundle string.
- *
- * @param msgKey -
- * message resource bundle key for the message displayed to the
- * user
- * @throws CoreException
- */
- public void throwCoreException(String msgKey) throws CoreException {
- IStatus status = new Status(IStatus.ERROR, _pluginId, IStatus.OK,
- getResourceString(msgKey), null);
- throw new CoreException(status);
- }
-
- /**
- * Throw a core exception built around the message with the correct plugin
- * id and resource bundle string.
- *
- * @param ee -
- * the real exception.
- * @throws CoreException
- */
- public void throwCoreException(Throwable ee) throws CoreException {
- IStatus status = new Status(IStatus.ERROR, _pluginId, IStatus.OK, ee
- .getMessage(), ee);
- throw new CoreException(status);
- }
-
- /**
- * Throw a core exception built around the message with the correct plugin
- * id and resource bundle string.
- *
- * @param msgKey -
- * message resource bundle key for the message displayed to the
- * user
- * @param ee -
- * the real exception.
- * @throws CoreException
- */
- public void throwCoreException(String msgKey, Throwable ee)
- throws CoreException {
- IStatus status = new Status(IStatus.ERROR, _pluginId, IStatus.OK,
- getResourceString(msgKey), ee);
- throw new CoreException(status);
- }
-
- /**
- * Throw a core exception built around the message with the correct plugin
- * id and resource bundle string.
- *
- * @param msgKey -
- * message resource bundle key for the message displayed to the
- * user
- * @param arg0 -
- * arg to place into the resource bundle message.
- * @throws CoreException
- */
- public void throwCoreException(String msgKey, Object arg0)
- throws CoreException {
- Object[] args = new Object[1];
- args[0] = arg0;
-
- MessageFormat formatter = new MessageFormat(getResourceString(msgKey));
-
- IStatus status = new Status(IStatus.ERROR, _pluginId, IStatus.OK,
- formatter.format(args), null);
- throw new CoreException(status);
- }
-
- /**
- * Throw a core exception built around the message with the correct plugin
- * id and resource bundle string.
- *
- * @param msgKey -
- * message resource bundle key for the message displayed to the
- * user
- * @param arg0 -
- * arg to place into the resource bundle message.
- * @param ee -
- * the real exception.
- * @throws CoreException
- */
- public void throwCoreException(String msgKey, Object arg0, Throwable ee)
- throws CoreException {
- Object[] args = new Object[1];
- args[0] = arg0;
-
- MessageFormat formatter = new MessageFormat(getResourceString(msgKey));
-
- IStatus status = new Status(IStatus.ERROR, _pluginId, IStatus.OK,
- formatter.format(args), ee);
- throw new CoreException(status);
- }
-
- /**
- * Throw a core exception built around the message with the correct plugin
- * id and resource bundle string.
- *
- * @param msgKey -
- * message resource bundle key for the message displayed to the
- * user
- * @param arg0 -
- * arg to place into the resource bundle message.
- * @param arg1 -
- * arg to place into the resource bundle message.
- * @throws CoreException
- */
- public void throwCoreException(String msgKey, Object arg0, Object arg1)
- throws CoreException {
- Object[] args = new Object[2];
- args[0] = arg0;
- args[1] = arg1;
-
- MessageFormat formatter = new MessageFormat(getResourceString(msgKey));
-
- IStatus status = new Status(IStatus.ERROR, _pluginId, IStatus.OK,
- formatter.format(args), null);
- throw new CoreException(status);
- }
-
- /**
- * Throw a core exception built around the message with the correct plugin
- * id and resource bundle string.
- *
- * @param msgKey -
- * message resource bundle key for the message displayed to the
- * user
- * @param arg0 -
- * arg to place into the resource bundle message.
- * @param arg1 -
- * arg to place into the resource bundle message.
- * @param ee -
- * the real exception.
- * @throws CoreException
- */
- public void throwCoreException(String msgKey, Object arg0, Object arg1,
- Throwable ee) throws CoreException {
- Object[] args = new Object[2];
- args[0] = arg0;
- args[1] = arg1;
-
- MessageFormat formatter = new MessageFormat(getResourceString(msgKey));
-
- IStatus status = new Status(IStatus.ERROR, _pluginId, IStatus.OK,
- formatter.format(args), ee);
- throw new CoreException(status);
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/guiutils/BrowserWindow.java b/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/guiutils/BrowserWindow.java
deleted file mode 100644
index 33ce9fa..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/guiutils/BrowserWindow.java
+++ /dev/null
@@ -1,391 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.common.ui.internal.guiutils;
-
-import org.eclipse.jface.window.ApplicationWindow;
-import org.eclipse.jst.jsf.common.ui.JSFUICommonPlugin;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.browser.Browser;
-import org.eclipse.swt.browser.LocationAdapter;
-import org.eclipse.swt.browser.LocationEvent;
-import org.eclipse.swt.browser.OpenWindowListener;
-import org.eclipse.swt.browser.StatusTextEvent;
-import org.eclipse.swt.browser.StatusTextListener;
-import org.eclipse.swt.browser.WindowEvent;
-import org.eclipse.swt.custom.ScrolledComposite;
-import org.eclipse.swt.events.ControlAdapter;
-import org.eclipse.swt.events.ControlEvent;
-import org.eclipse.swt.events.ControlListener;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.graphics.Rectangle;
-import org.eclipse.swt.layout.FillLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.ToolBar;
-import org.eclipse.swt.widgets.ToolItem;
-
-/**
- * Brings up a browser into a separate window.
- *
- * @author mengbo.
- *
- * Unused???
- */
-public class BrowserWindow extends ApplicationWindow {
-
- private static final String RELOAD_ITEM_IMAGE_FILE = "reload_nav_16.gif"; //$NON-NLS-1$
-
- private static final String REFRESH_ITEM_IMAGE_FILE = "refresh_nav_16.gif"; //$NON-NLS-1$
-
- private static final String STOP_ITEM_IMAGE_FILE = "stop_nav_16.gif"; //$NON-NLS-1$
-
- private static final String FORWARD_ITEM_IMAGE_FILE = "forward_nav_16.gif"; //$NON-NLS-1$
-
- private static final String BACK_ITEM_IMAGE_FILE = "back_nav_16.gif"; //$NON-NLS-1$
-
-
- /**
- * Command to send to the browser.
- */
- private static final int BROWSER_CMD_BACK = 1;
-
- private static final int BROWSER_CMD_FORWARD = 2;
-
- private static final int BROWSER_CMD_STOP = 3;
-
- private static final int BROWSER_CMD_REFRESH = 4;
-
- private static final int BROWSER_CMD_RELOAD = 5;
-
- private boolean _bIncludeToolbar;
-
- private boolean _bPopups;
-
- private String _title;
-
- private ScrolledComposite _scomp;
-
- private Composite _browserComposite;
-
- private Browser _browser;
-
- private String _startLocation;
-
- private String _startContent;
-
- // these items are browser context sensitive.
- private ToolItem _backItem;
-
- private ToolItem _forwardItem;
-
- /**
- * @param parentShell
- * owner of this window.
- */
- public BrowserWindow(Shell parentShell) {
- this(parentShell, false, null, false);
- }
-
- /**
- * @param parentShell
- * owner of this window.
- * @param bPopups
- * allow popup windows?
- * @param title
- * Tittle on window.
- */
- public BrowserWindow(Shell parentShell, boolean bPopups, String title) {
- this(parentShell, bPopups, title, false);
- }
-
- /**
- * @param parentShell
- * owner of this window.
- * @param bPopups
- * allow popup windows?
- * @param title
- * Tittle on window.
- * @param bModal
- * pretend to a be a dialog?
- */
- public BrowserWindow(Shell parentShell, boolean bPopups, String title,
- boolean bModal) {
- super(parentShell);
- addStatusLine();
- _bPopups = bPopups;
- _title = title;
- includeToolbar(true);
-
- if (bModal && (parentShell != null)) {
- // APPLICATION_MODAL, MODELESS, PRIMARY_MODAL, SYSTEM_MODAL
- setShellStyle(getShellStyle() | SWT.APPLICATION_MODAL);
- setBlockOnOpen(true);
- }
- }
-
- /**
- * Default is true, set whether to include the toolbar at the top. This must
- * be called before the window is opened.
- *
- * @param bIncludeToolbar
- */
- public void includeToolbar(boolean bIncludeToolbar) {
- _bIncludeToolbar = bIncludeToolbar;
- }
-
- /**
- * @param title
- */
- public void setTitle(String title) {
- if ((title != null) && (super.getShell() != null)) {
- super.getShell().setText(title);
- }
- }
-
- /**
- * @param startLocation
- */
- /**
- * @param startLocation
- */
- public void setStartLocation(String startLocation) {
- _startLocation = startLocation;
- }
-
- /**
- * @param startContent
- */
- public void setStartContent(String startContent) {
- _startContent = startContent;
- }
-
- /**
- * @return the browser object
- */
- public Browser getBrowser() {
- return _browser;
- }
-
- protected Control createContents(Composite parent) {
- // Create the scroll composite as the one inside the parent.
- _scomp = new ScrolledComposite(parent, SWT.V_SCROLL | SWT.H_SCROLL);
-
- // Create the composite that goes inside the scroller. We will use this
- // for
- // everything else from here.
- Composite innerComposite = SWTUtils.createComposite(_scomp, 1, 10, -1);
- _scomp.setContent(innerComposite);
- ControlListener listener = new ControlAdapter() {
- // this will handle resizing the browser when the window is resized.
- public void controlResized(ControlEvent e) {
- Point pt = _scomp.getParent().getSize();
- Rectangle rect = _browserComposite.getBounds();
-
- pt.x -= rect.x;
- pt.y -= rect.y;
-
- // spacing offsets in the composites.
- pt.x -= 10;
- pt.y -= 60; // need status bar at bottom...30 more than normal.
-
- // do the sanity check here since it prevents further checks.
- if ((pt.x <= 0) || (pt.y <= 0)) {
- return;
- }
-
- Rectangle innerRect = _scomp.getContent().getBounds();
- Rectangle outerRect = _scomp.getBounds();
-
- // substract if the scroll bars are visible.
- if (innerRect.width > outerRect.width) {
- pt.y -= _scomp.getHorizontalBar().getSize().y;
- }
- if (innerRect.height > outerRect.height) {
- pt.x -= _scomp.getVerticalBar().getSize().x;
- }
-
- _browserComposite.setSize(pt);
- _browserComposite.getParent().layout(true);
- }
- };
- _scomp.addControlListener(listener);
-
- if (_bIncludeToolbar) {
- // ////////////////////////////////////////
- // toobar
- // ////////////////////////////////////////
- ToolBar tb = new ToolBar(innerComposite, SWT.HORIZONTAL | SWT.FLAT);
- fillToolbar(tb);
- }
-
- // ////////////////////////////////////////
- // browser
- // ////////////////////////////////////////
- _browserComposite = new Composite(innerComposite, SWT.NULL);
- _browserComposite.setLayout(new FillLayout());
-
- _browser = new Browser(_browserComposite, SWT.NULL);
-
- if (_startLocation != null) {
- _browser.setUrl(_startLocation);
- } else if (_startContent != null) {
- _browser.setText(_startContent);
- } else {
- _browser.setText(Messages.BrowserWindow_loading);
- }
-
- // send the browser status messages to eclipse.
- _browser.addStatusTextListener(new StatusTextListener() {
- public void changed(StatusTextEvent event) {
- setStatus(event.text);
- }
- });
-
- if (_bIncludeToolbar) {
- // check for change in location so we can enable the back/forward
- // buttons.
- _browser.addLocationListener(new LocationAdapter() {
- public void changed(LocationEvent event) {
- // check if there is something in the forward or back queue.
- _backItem.setEnabled(_browser.isBackEnabled());
- _forwardItem.setEnabled(_browser.isForwardEnabled());
- }
- });
- }
-
- // check is we need to open a new window.
- _browser.addOpenWindowListener(new OpenWindowListener() {
- public void open(WindowEvent event) {
- if (_bPopups) {
- BrowserWindow window = new BrowserWindow(getShell());
- window.open();
- event.browser = window.getBrowser();
- } else {
- event.browser = getBrowser();
- }
- }
- });
-
- setTitle(_title);
- SWTUtils.computeScrollArea(_scomp, innerComposite);
- return _scomp;
- }
-
- /**
- * Fill the toolbar for this window. This method can be overwritten to place
- * other toolbar controls in the bar.
- *
- * @param tb
- */
- protected void fillToolbar(ToolBar tb) {
- // Back browser
- _backItem = new ToolItem(tb, SWT.PUSH);
- _backItem.setImage(JSFUICommonPlugin.getDefault()
- .getImage(BACK_ITEM_IMAGE_FILE));
- _backItem.setToolTipText(JSFUICommonPlugin
- .getResourceString("BrowserWindow.back.tooltip")); //$NON-NLS-1$
- SelectionListener backSelectionListener = new SelectionAdapter() {
- public void widgetSelected(SelectionEvent event) {
- browserCmd(BROWSER_CMD_BACK);
- }
- };
- _backItem.addSelectionListener(backSelectionListener);
-
- // Forward Browser
- _forwardItem = new ToolItem(tb, SWT.PUSH);
- _forwardItem.setImage(JSFUICommonPlugin.getDefault().getImage(
- FORWARD_ITEM_IMAGE_FILE));
- _forwardItem.setToolTipText(JSFUICommonPlugin
- .getResourceString("BrowserWindow.forward.tooltip")); //$NON-NLS-1$
- SelectionListener forwardSelectionListener = new SelectionAdapter() {
- public void widgetSelected(SelectionEvent event) {
- browserCmd(BROWSER_CMD_FORWARD);
- }
- };
- _forwardItem.addSelectionListener(forwardSelectionListener);
-
- // Stop Browser
- ToolItem stopItem = new ToolItem(tb, SWT.PUSH);
- stopItem
- .setImage(JSFUICommonPlugin.getDefault().getImage(STOP_ITEM_IMAGE_FILE));
- stopItem.setToolTipText(JSFUICommonPlugin
- .getResourceString("BrowserWindow.stop.tooltip")); //$NON-NLS-1$
- SelectionListener stopSelectionListener = new SelectionAdapter() {
- public void widgetSelected(SelectionEvent event) {
- browserCmd(BROWSER_CMD_STOP);
- }
- };
- stopItem.addSelectionListener(stopSelectionListener);
-
- // Refresh Browser
- ToolItem refreshItem = new ToolItem(tb, SWT.PUSH);
- refreshItem.setImage(JSFUICommonPlugin.getDefault().getImage(
- REFRESH_ITEM_IMAGE_FILE));
- refreshItem.setToolTipText(JSFUICommonPlugin
- .getResourceString("BrowserWindow.refresh.tooltip")); //$NON-NLS-1$
- SelectionListener refreshServiceSelectionListener = new SelectionAdapter() {
- public void widgetSelected(SelectionEvent event) {
- browserCmd(BROWSER_CMD_REFRESH);
- }
- };
- refreshItem.addSelectionListener(refreshServiceSelectionListener);
-
- if ((_startLocation != null) || (_startContent != null)) {
- // Reload Browser.
- ToolItem reloadItem = new ToolItem(tb, SWT.PUSH);
- reloadItem.setImage(JSFUICommonPlugin.getDefault().getImage(
- RELOAD_ITEM_IMAGE_FILE));
- reloadItem.setToolTipText(JSFUICommonPlugin
- .getResourceString("BrowserWindow.reload.tooltip")); //$NON-NLS-1$
- SelectionListener reloadSelectionListener = new SelectionAdapter() {
- public void widgetSelected(SelectionEvent event) {
- browserCmd(BROWSER_CMD_RELOAD);
- }
- };
- reloadItem.addSelectionListener(reloadSelectionListener);
- }
- }
-
- /**
- * send the browser widget a command as defined by the cmd constant defines.
- * @param cmd
- *
- * @return true if the command was successful.
- */
- public boolean browserCmd(int cmd) {
- switch (cmd) {
- case BROWSER_CMD_BACK:
- return _browser.back();
- case BROWSER_CMD_FORWARD:
- return _browser.forward();
- case BROWSER_CMD_STOP:
- _browser.stop();
- return true;
- case BROWSER_CMD_REFRESH:
- _browser.refresh();
- return true;
- case BROWSER_CMD_RELOAD:
- if (_startLocation != null) {
- _browser.setUrl(_startLocation);
- } else if (_startContent != null) {
- _browser.setText(_startContent);
- }
- return true;
-
- }
- return false;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/guiutils/CollapsableSection.java b/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/guiutils/CollapsableSection.java
deleted file mode 100644
index f787c22..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/guiutils/CollapsableSection.java
+++ /dev/null
@@ -1,148 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.common.ui.internal.guiutils;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.ScrolledComposite;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.ui.forms.events.ExpansionAdapter;
-import org.eclipse.ui.forms.events.ExpansionEvent;
-import org.eclipse.ui.forms.widgets.ExpandableComposite;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-import org.eclipse.ui.forms.widgets.Section;
-
-/**
- * Creates a class to be used to build a control for a collapseable area inside
- * a scrollable composite. This will take care of scrollbar resize.
- *
- * Example use:
- *
- * CollapsableSection cs = new CollapsableSection(toolkit, scomp, "General",
- * true) { public void setCollapsableContent(Composite composite) { // place
- * your content on this composite.... } }); cs.createControl(composite,
- * horizontalSpan);
- *
- * @author mengbo
- *
- */
-public abstract class CollapsableSection {
- // internal fields needed for doing the section and computing the scrollbar
- // on a collapse.
- private FormToolkit _toolkit;
-
- private Section _section;
-
- private ScrolledComposite _scomp;
-
- private String _title;
-
- private int _expansionStyle;
-
- /**
- * Creates a class to be used to build the control for a collapseable area.
- *
- * @param toolkit
- *
- * @param scomp
- * the scrollable composite used inside the container. This is
- * used to force resizing of the bars on dinking the control.
- * @param title
- * the string to place next to the collapsable icon.
- * @param bCollapsed
- * should this area start collapsed?
- */
- public CollapsableSection(FormToolkit toolkit, ScrolledComposite scomp,
- String title, boolean bCollapsed) {
- _toolkit = toolkit;
- _scomp = scomp;
- _title = title;
- _expansionStyle = ExpandableComposite.TWISTIE
- | ExpandableComposite.FOCUS_TITLE;
- if (bCollapsed) {
- _expansionStyle |= ExpandableComposite.COMPACT;
- } else {
- _expansionStyle |= ExpandableComposite.EXPANDED;
- }
- }
-
- /**
- * Build the GUI parts of the Collapsable area into the given composite.
- * NOTE: you must set the layout on this composite before adding swt
- * widgets.
- *
- * @param composite
- */
- abstract public void setCollapsableContent(Composite composite);
-
- /**
- * A convient way to build the widget into a control and place it on the
- * page. NOTE: this method will build the Section and call
- * setCollapsableContent with a composite to fill in the inner area.
- *
- * @param parent
- * @param horizontalSpan
- * how many columns should this control span.
- * @return Control that was added to the composite.
- */
- public Control createControl(Composite parent, int horizontalSpan) {
- _section = _toolkit.createSection(parent, _expansionStyle);
- _section.clientVerticalSpacing = 5; // space between the dink and the
- // controls in when opened.
- // _section.marginHeight = 5; // indents the entire section.
- // _section.marginWidth = 5; // indents the entire section.
- _section.setText(_title);
- _toolkit.createCompositeSeparator(_section);
- _section.addExpansionListener(new ExpansionAdapter() {
- public void expansionStateChanged(ExpansionEvent event) {
- SWTUtils.computeScrollArea(_scomp, (Composite) _scomp
- .getContent());
- }
- });
-
- Composite content = new Composite(_section, SWT.NULL);
- setCollapsableContent(content);
-
- _section.setClient(content);
- GridData gd = new GridData(GridData.FILL_HORIZONTAL);
- gd.horizontalSpan = horizontalSpan;
- _section.setLayoutData(gd);
-
- return _section;
- }
-
- /**
- * Programmatically changes expanded state.
- *
- * @param expanded
- * the new expanded state
- */
- public void setExpanded(boolean expanded) {
- if (_section != null) {
- _section.setExpanded(expanded);
-
- // NOTE: internal calling of expanding doesn't fire
- // the event to resize. We do it here.
- SWTUtils.computeScrollArea(_scomp, (Composite) _scomp.getContent());
- }
- }
-
- /**
- * Return the internal Section control for more advanced things.
- *
- * @return Section
- */
- public Section getSection() {
- return _section;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/guiutils/FavoriteSection.java b/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/guiutils/FavoriteSection.java
deleted file mode 100644
index be9882c..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/guiutils/FavoriteSection.java
+++ /dev/null
@@ -1,152 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.common.ui.internal.guiutils;
-
-import java.util.Properties;
-
-import org.eclipse.jst.jsf.common.ui.JSFUICommonPlugin;
-import org.eclipse.jst.jsf.common.ui.internal.utils.FavoriteConfigurations;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-
-/**
- * Builds a favorites with the given name in the plugins resources. This build a
- * generic looking favorites section.
- *
- * @author mengbo
- */
-public abstract class FavoriteSection {
- private FavoriteConfigurations _favorites;
-
- private Combo _favoriteCombo;
-
- /**
- * @param plugin
- * @param favoriteName
- */
- public FavoriteSection(AbstractUIPlugin plugin, String favoriteName) {
- _favorites = new FavoriteConfigurations(plugin, favoriteName);
- }
-
- /**
- * @param parent
- * @param horizontalSpan
- * @param comboMinWidth
- * @return the combo
- */
- public Combo createFavoriteGroup(Composite parent, int horizontalSpan,
- int comboMinWidth) {
- Group favGroup = SWTUtils.createGroup(parent, JSFUICommonPlugin
- .getResourceString("favorites.group.label"), 4, horizontalSpan, //$NON-NLS-1$
- GridData.BEGINNING | GridData.CENTER);
-
- // Add favorite text field
- SWTUtils.createLabel(favGroup, JSFUICommonPlugin
- .getResourceString("favorites.label"), 1); //$NON-NLS-1$
- _favoriteCombo = SWTUtils.createCombo(favGroup, _favorites
- .getFavoritesList(), 1, comboMinWidth, true);
- _favoriteCombo.setToolTipText(JSFUICommonPlugin
- .getResourceString("favorites.tooltip")); //$NON-NLS-1$
- _favoriteCombo.addSelectionListener(new SelectionAdapter() {
- public void widgetSelected(SelectionEvent event) {
- String favName = _favoriteCombo.getText().trim();
- if (favName.length() > 0) {
- Properties favProp = _favorites.getFavorite(_favoriteCombo
- .getText().trim());
- if (favProp != null) {
- setFavorites(favProp);
- }
- }
- }
- });
-
- // Add Save button
- Button saveButton = SWTUtils.createPushButton(favGroup, JSFUICommonPlugin
- .getResourceString("button.save")); //$NON-NLS-1$
- saveButton.setToolTipText(JSFUICommonPlugin
- .getResourceString("favorites.save.tooltip")); //$NON-NLS-1$
- saveButton.addSelectionListener(new SelectionAdapter() {
- public void widgetSelected(SelectionEvent event) {
- String favName = _favoriteCombo.getText().trim();
- if (favName.length() == 0) {
- favName = JSFUICommonPlugin
- .getResourceString("favorites.default"); //$NON-NLS-1$
- }
- Properties favProp = new Properties();
- saveFavorites(favProp);
-
- _favorites.addFavorite(favName, favProp);
- _favorites.saveFavorites();
-
- _favoriteCombo.removeAll();
- String[] names = _favorites.getFavoritesList();
-
- _favoriteCombo.setItems(names);
- _favoriteCombo.setText(favName);
- }
- });
-
- // Add Remove button
- Button removeButton = SWTUtils.createPushButton(favGroup, JSFUICommonPlugin
- .getResourceString("button.remove")); //$NON-NLS-1$
- removeButton.setToolTipText(JSFUICommonPlugin
- .getResourceString("favorites.remove.tooltip")); //$NON-NLS-1$
- removeButton.addSelectionListener(new SelectionAdapter() {
- public void widgetSelected(SelectionEvent event) {
- String favName = _favoriteCombo.getText().trim();
- if (favName.length() > 0) {
- _favorites.removeFavorite(favName);
- _favorites.saveFavorites();
-
- removeFavorites();
-
- _favoriteCombo.removeAll();
- String[] names = _favorites.getFavoritesList();
- _favoriteCombo.setItems(names);
- }
- }
- });
-
- return _favoriteCombo;
- }
-
- /**
- * This method will be called when a new favorite is set. This allows the
- * caller to set their values from the properties supplied.
- *
- * @param prop
- */
- public abstract void setFavorites(Properties prop);
-
- /**
- * This method will be called when a new favorite is saved. This allows the
- * caller to save their values into the properties supplied.
- *
- * @param prop
- */
- public abstract void saveFavorites(Properties prop);
-
- /**
- * This method will be called when the active favorite is removed. It allows
- * for clearing fields.
- */
- public void removeFavorites() {
- // do nothing.
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/guiutils/ImageContainer.java b/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/guiutils/ImageContainer.java
deleted file mode 100644
index 8f697d1..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/guiutils/ImageContainer.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.common.ui.internal.guiutils;
-
-
-import org.eclipse.draw2d.ColorConstants;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ControlAdapter;
-import org.eclipse.swt.events.ControlEvent;
-import org.eclipse.swt.events.DisposeEvent;
-import org.eclipse.swt.events.DisposeListener;
-import org.eclipse.swt.events.PaintEvent;
-import org.eclipse.swt.events.PaintListener;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Composite;
-
-/**
- * A general purpose class for displying an image in a composite. There is no
- * eclipse tool for doing this other than CLabl which is bulkly.
- *
- * This was original written by Karl Reti.
- *
- * @author mengbo
- */
-public class ImageContainer extends Composite {
- private Image _image = null;
-
- private boolean _bCleanupImage;
-
- /**
- * @param parent
- */
- public ImageContainer(Composite parent) {
- super(parent, SWT.NONE);// SWT.NO_BACKGROUND );//|
- // SWT.NO_REDRAW_RESIZE);
- setBackground(ColorConstants.white);
- // paint the image
- addPaintListener(new PaintListener() {
- public void paintControl(PaintEvent e) {
- if (_image != null) {
- e.gc.drawImage(_image, 0, 0);
- }
- }
-
- });
-
- addControlListener(new ControlAdapter() {
- public void controlResized(ControlEvent e) {
- setSize(_image.getBounds().width, _image.getBounds().height);
- }
- });
-
- // tidy up
- addDisposeListener(new DisposeListener() {
- public void widgetDisposed(DisposeEvent e) {
- if (_bCleanupImage && _image != null && !_image.isDisposed()) {
- _image.dispose();
- }
- }
- });
- }
-
- /**
- * @return Returns the image.
- */
- public Image getImage() {
- return _image;
- }
-
- /**
- * @return should the image be disposed of on cleanup. Set false if the
- * image is cached.
- */
- public boolean isCleanupImage() {
- return _bCleanupImage;
- }
-
- /**
- * @param image
- * The image to set.
- */
- public void setImage(Image image) {
- setImage(image, false);
- }
-
- /**
- * @param image
- * The image to set.
- * @param bCleanupImage
- */
- public void setImage(Image image, boolean bCleanupImage) {
- _image = image;
- _bCleanupImage = bCleanupImage;
- setSize(image.getBounds().width, image.getBounds().height);
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/guiutils/IntroductionSection.java b/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/guiutils/IntroductionSection.java
deleted file mode 100644
index a022c1b..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/guiutils/IntroductionSection.java
+++ /dev/null
@@ -1,351 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.jsf.common.ui.internal.guiutils;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.help.HelpSystem;
-import org.eclipse.help.IContext;
-import org.eclipse.help.IHelpResource;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.resource.ImageRegistry;
-import org.eclipse.jface.resource.JFaceResources;
-import org.eclipse.jst.jsf.common.ui.JSFUICommonPlugin;
-import org.eclipse.jst.jsf.common.ui.internal.logging.Logger;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.layout.RowLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.forms.IManagedForm;
-import org.eclipse.ui.forms.SectionPart;
-import org.eclipse.ui.forms.events.HyperlinkAdapter;
-import org.eclipse.ui.forms.events.HyperlinkEvent;
-import org.eclipse.ui.forms.widgets.ExpandableComposite;
-import org.eclipse.ui.forms.widgets.FormText;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-import org.eclipse.ui.forms.widgets.Hyperlink;
-import org.eclipse.ui.forms.widgets.ImageHyperlink;
-import org.eclipse.ui.forms.widgets.Section;
-import org.eclipse.ui.forms.widgets.TableWrapData;
-import org.eclipse.ui.forms.widgets.TableWrapLayout;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-
-/**
- * Provides a standard looking introduction section for a intro page for the
- * editors. This was taken and is suppose to look like the standard Sybase
- * workspace service editors intro page.
- *
- * this was original written by Collinsc
- *
- * TODO: Should this be moved into the facesconfig ui plugin since it is only
- * really used there?
- *
- * @author collinsc,jchoi
- */
-public class IntroductionSection extends SectionPart {
-
- private static final String HELP_IMAGE_FILE = "help.gif"; //$NON-NLS-1$
-
- private static Logger _log = JSFUICommonPlugin
- .getLogger(IntroductionSection.class);
-
- private String _editorId;
-
- private FormToolkit _toolkit;
-
- // private ImageHyperlink _helpImage;
- private Composite _textClient;
-
- private String _helpContextId;
-
- private String _helpTooltip;
-
- /**
- * Basic constructor - no help with this one.
- *
- * @param editorId
- * id of the editor this page is for.
- * @param managedForm
- * @param toolkit
- */
- public IntroductionSection(String editorId, IManagedForm managedForm,
- FormToolkit toolkit) {
- this(editorId, managedForm, toolkit, null, null);
- }
-
- /**
- * Constructor with help option.
- *
- * @param editorId
- * id of the editor this page is for.
- * @param managedForm
- * @param toolkit
- * @param contextId
- * @param helpTooltip
- */
- public IntroductionSection(String editorId, IManagedForm managedForm,
- FormToolkit toolkit, final String contextId, String helpTooltip) {
- super(managedForm.getForm().getBody(), toolkit,
- ExpandableComposite.TITLE_BAR | Section.DESCRIPTION);
- super.initialize(managedForm);
- this._editorId = editorId;
- this._toolkit = toolkit;
- this._helpContextId = contextId;
- this._helpTooltip = helpTooltip;
-
- this._textClient = this._toolkit.createComposite(getSection(), SWT.NONE);
- this._textClient.setSize(32, 16);
-
- RowLayout rowLayout = new RowLayout();
- rowLayout.wrap = false;
- rowLayout.pack = false;
- rowLayout.justify = true;
- rowLayout.type = SWT.HORIZONTAL;
- rowLayout.marginLeft = 0;
- rowLayout.marginTop = 0;
- rowLayout.marginRight = 0;
- rowLayout.marginBottom = 0;
- rowLayout.spacing = 0;
- this._textClient.setLayout(rowLayout);
-
- this._toolkit.adapt(this._textClient, true, true);
- getSection().setTextClient(this._textClient);
-
- if (this._helpContextId != null) {
- // setup the help image.
- ImageHyperlink helpImage = new ImageHyperlink(this._textClient,
- SWT.NONE);
- this._toolkit.adapt(helpImage, true, true);
- helpImage.setImage(JSFUICommonPlugin.getDefault().getImage(HELP_IMAGE_FILE));
- if (this._helpTooltip != null) {
- helpImage.setToolTipText(this._helpTooltip);
- }
- helpImage.setBackground(getSection()
- .getTitleBarGradientBackground());
- helpImage.addHyperlinkListener(new HyperlinkAdapter() {
- public void linkActivated(HyperlinkEvent e) {
- IContext context = HelpSystem.getContext(_helpContextId);
- if (context != null) {
- IHelpResource[] topics = context.getRelatedTopics();
- if (topics != null && topics.length == 1) {
- PlatformUI.getWorkbench().getHelpSystem().displayHelpResource(topics[0]
- .getHref());
- } else {
- PlatformUI.getWorkbench().getHelpSystem().displayHelp(_helpContextId);
- }
- }
- }
- });
- }
-
- Composite client = this._toolkit.createComposite(getSection());
- createClient(client, this._toolkit);
- getSection().setClient(client);
- }
-
- private Composite createClient(Composite container, FormToolkit factory) {
- TableWrapLayout layout = new TableWrapLayout();
- layout.numColumns = 2;
- layout.makeColumnsEqualWidth = false;
- layout.horizontalSpacing = 20;
- layout.verticalSpacing = 20;
- container.setLayout(layout);
-
- IConfigurationElement element = getExtensions();
-
- if (element != null) {
- setPageDetails(element);
-
- IConfigurationElement[] children = element.getChildren();
- for (int ii = 0; ii < children.length; ii++) {
- processItems(container, factory, children[ii]);
- }
- } else {
- setText(Messages.IntroductionSection_noIntroTitle);
-
- setDescription(Messages.IntroductionSection_noIntroDescription);
- }
-
- factory.paintBordersFor(container);
- PlatformUI.getWorkbench().getHelpSystem().setHelp(container, _helpContextId);
- return container;
- }
-
- /**
- * set the page details from the extensionpoint
- *
- * @param element
- */
- private void setPageDetails(IConfigurationElement element) {
- setText(element.getAttribute("name")); //$NON-NLS-1$
- setDescription(element.getAttribute("description")); //$NON-NLS-1$
- }
-
- /**
- * add the extension elements to the page
- *
- * @param parent
- * @param toolkit_
- * @param element
- */
- private void processItems(Composite parent, FormToolkit toolkit_,
- IConfigurationElement element) {
- String hyperlink = element.getAttribute("hyperlink"); //$NON-NLS-1$
- String iconPath = element.getAttribute("icon"); //$NON-NLS-1$
- String text = element.getAttribute("text"); //$NON-NLS-1$
- String heading = element.getAttribute("heading"); //$NON-NLS-1$
- String action = element.getAttribute("hyperlinkaction"); //$NON-NLS-1$
- //String actionparameters = element.getAttribute("actionparameters"); //$NON-NLS-1$
-
- if (iconPath != null && iconPath.length() > 0) {
- // add an icon to the page
- String iconName;
- if (iconPath.indexOf(IPath.SEPARATOR) != -1) {
- iconName = new Path(iconPath).lastSegment();
- } else {
- iconName = iconPath;
- }
-
- ImageDescriptor imageDescriptor = AbstractUIPlugin
- .imageDescriptorFromPlugin(
- element.getDeclaringExtension()
- .getContributor().getName(), iconPath);
-
- if (imageDescriptor != null)
- {
- ImageRegistry imageRegistry =
- JSFUICommonPlugin.getDefault().getImageRegistry();
-
-
- Image image = imageRegistry.get(iconName);
-
- if (image == null)
- {
- image = imageDescriptor.createImage();
-
- if (image != null)
- {
- imageRegistry.put(iconName, image);
- }
- else
- {
- image = ImageDescriptor.getMissingImageDescriptor().createImage();
- }
- }
-
- if (image != null)
- {
- ImageContainer img = new ImageContainer(parent);
- img.setImage(image);
- TableWrapData td = new TableWrapData();
- td.rowspan = 2;
- img.setLayoutData(td);
- }
- else
- {
- JSFUICommonPlugin.getLogger(this.getClass()).error(new Throwable("Image not created for "+element)); //$NON-NLS-1$
- }
- }
- else
- {
- JSFUICommonPlugin.getLogger(this.getClass()).error(new Throwable("Image Descriptor not found for "+element)); //$NON-NLS-1$
- }
- }
-
- if (heading != null && heading.length() > 0) {
- // add a header
- Label lbl = toolkit_.createLabel(parent, heading);
- lbl.setFont(JFaceResources.getHeaderFont());
- }
-
- if (hyperlink != null && hyperlink.length() > 0) {
- Hyperlink hypr = toolkit_.createHyperlink(parent, hyperlink,
- SWT.NONE);
- if (action != null && action.length() > 0) {
- try {
- final IAction thisAction = (IAction) element
- .createExecutableExtension("hyperlinkaction"); //$NON-NLS-1$
- hypr.addHyperlinkListener(new HyperlinkAdapter() {
- public void linkActivated(HyperlinkEvent e) {
- thisAction.run();
- }
- });
- } catch (Exception ee) {
- // log.IntroductionSection.action.error=Failed to launch the
- // link {0}.
- _log.error("log.IntroductionSection.action.error", //$NON-NLS-1$
- hyperlink, ee);
- JSFUICommonPlugin.getAlerts().detailError(hyperlink,
- "log.IntroductionSection.action.error", hyperlink, //$NON-NLS-1$
- ee);
- }
- }
- }
-
- if (text != null && text.length() > 0) {
- FormText form = toolkit_.createFormText(parent, false);
- form.setText(text, false, false);
- }
- }
-
- /**
- * Get the extension elements for the Introduction pages
- */
- private IConfigurationElement getExtensions() {
- // find all service editor page extensions
- IConfigurationElement element = null;
-
- // find all service editor parameter dialog extensions
- IConfigurationElement[] elements = Platform
- .getExtensionRegistry()
- .getConfigurationElementsFor(
- "org.eclipse.jst.jsf.common.ui.introductionPage"); //$NON-NLS-1$
- if (elements.length > 0) {
- for (int ii = 0; ii < elements.length; ii++) {
- // get extensions for this dialog
- // String extPluginId =
- // elements[ii].getDeclaringExtension().getNamespace();
- String editorId1 = elements[ii].getDeclaringExtension()
- .getSimpleIdentifier();
-
- // see if we have any contributuins of dialogs
- if (this._editorId.equals(editorId1)) {
- element = elements[ii];
- break;
- }
- }
- }
- return element;
- }
-
- private void setText(String text) {
- getSection().setText(text);
- }
-
- private void setDescription(String text) {
- getSection().setDescription(text);
- }
-
- /**
- * Set this section's layout data
- * @param layoutData
- */
- public void setLayoutData(Object layoutData) {
- getSection().setLayoutData(layoutData);
- }
-}
\ No newline at end of file
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/guiutils/Messages.java b/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/guiutils/Messages.java
deleted file mode 100644
index b877236..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/guiutils/Messages.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package org.eclipse.jst.jsf.common.ui.internal.guiutils;
-
-import org.eclipse.osgi.util.NLS;
-
-/**
- * String resource handler.
- *
- * @author Debajit Adhikary - Oracle
- */
-
-public class Messages extends NLS {
-
- private static final String BUNDLE_NAME = "org.eclipse.jst.jsf.common.ui.internal.guiutils.messages"; //$NON-NLS-1$
-
- /**
- * See messages.properties.
- */
- public static String IntroductionSection_noIntroDescription;
-
- /**
- * See messages.properties.
- */
- public static String IntroductionSection_noIntroTitle;
-
- /**
- * See messages.properties.
- */
- public static String BrowserWindow_loading;
-
-
- static {
- // initialize resource bundle
- NLS.initializeMessages(BUNDLE_NAME, Messages.class);
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/guiutils/OverviewSection.java b/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/guiutils/OverviewSection.java
deleted file mode 100644
index 4654c40..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/guiutils/OverviewSection.java
+++ /dev/null
@@ -1,287 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.common.ui.internal.guiutils;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.help.HelpSystem;
-import org.eclipse.help.IContext;
-import org.eclipse.help.IHelpResource;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jst.jsf.common.ui.JSFUICommonPlugin;
-import org.eclipse.jst.jsf.common.ui.internal.logging.Logger;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.RowLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.forms.IManagedForm;
-import org.eclipse.ui.forms.SectionPart;
-import org.eclipse.ui.forms.editor.FormEditor;
-import org.eclipse.ui.forms.events.HyperlinkAdapter;
-import org.eclipse.ui.forms.events.HyperlinkEvent;
-import org.eclipse.ui.forms.widgets.ExpandableComposite;
-import org.eclipse.ui.forms.widgets.FormText;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-import org.eclipse.ui.forms.widgets.Hyperlink;
-import org.eclipse.ui.forms.widgets.ImageHyperlink;
-import org.eclipse.ui.forms.widgets.Section;
-
-
-/**
- * @author jchoi
- * @version
- */
-public class OverviewSection extends SectionPart {
-
- private static final String HELP_IMAGE_FILE = "help.gif"; //$NON-NLS-1$
-
- private static Logger log = JSFUICommonPlugin.getLogger(OverviewSection.class);
-
- private String editorId;
-
- private FormToolkit toolkit;
-
- private ImageHyperlink helpImage;
-
- private Composite textClient;
-
- private String helpContextId;
-
- private String helpTooltip;
-
- /**
- * @param editorId
- * @param managedForm
- * @param toolkit
- */
- public OverviewSection(String editorId, IManagedForm managedForm,
- FormToolkit toolkit) {
- this(editorId, managedForm, toolkit, null, null);
-
- }
-
- /**
- * Constructor with help option.
- *
- * @param editorId
- * id of the editor this page is for.
- * @param managedForm
- * @param toolkit
- * @param helpContextId
- * @param helpTooltip
- */
- public OverviewSection(String editorId, IManagedForm managedForm,
- FormToolkit toolkit, String helpContextId, String helpTooltip) {
- super(managedForm.getForm().getBody(), toolkit,
- ExpandableComposite.TITLE_BAR | Section.DESCRIPTION);
- super.initialize(managedForm);
- this.editorId = editorId;
- this.toolkit = toolkit;
- this.helpContextId = helpContextId;
- this.helpTooltip = helpTooltip;
-
- this.textClient = this.toolkit.createComposite(getSection(), SWT.NONE);
- this.textClient.setSize(32, 16);
-
- init();
-
- Composite client = this.toolkit.createComposite(getSection());
- //createClient(client, this.toolkit);
- getSection().setClient(client);
- }
-
- /**
- * @param editor
- * @param managedForm
- * @param toolkit
- * @param style
- */
- public OverviewSection(FormEditor editor, IManagedForm managedForm,
- FormToolkit toolkit, int style) {
- super(managedForm.getForm().getBody(), toolkit,
- ExpandableComposite.TITLE_BAR | style);
- super.initialize(managedForm);
- this.toolkit = toolkit;
-
- this.textClient = this.toolkit.createComposite(getSection(), SWT.NONE);
- this.textClient.setSize(32, 16);
-
- init();
- }
-
- /**
- * @param editor
- * @param managedForm
- * @param toolkit
- * @param style
- * @param helpContextId
- * @param helpTooltip
- */
- public OverviewSection(FormEditor editor, IManagedForm managedForm,
- FormToolkit toolkit, int style, String helpContextId,
- String helpTooltip) {
- super(managedForm.getForm().getBody(), toolkit,
- ExpandableComposite.TITLE_BAR | style);
- super.initialize(managedForm);
- this.toolkit = toolkit;
-
- this.textClient = toolkit.createComposite(getSection(), SWT.NONE);
- this.textClient.setSize(32, 16);
- this.helpContextId = helpContextId;
- this.helpTooltip = helpTooltip;
- init();
- }
-
- /**
- *
- */
- public void initialize() {
- Composite client = toolkit.createComposite(getSection());
- //createClient(client, toolkit);
- getSection().setClient(client);
- }
-
- private void init() {
- RowLayout rowLayout = new RowLayout();
- rowLayout.wrap = false;
- rowLayout.pack = false;
- rowLayout.justify = true;
- rowLayout.type = SWT.HORIZONTAL;
- rowLayout.marginLeft = 0;
- rowLayout.marginTop = 0;
- rowLayout.marginRight = 0;
- rowLayout.marginBottom = 0;
- rowLayout.spacing = 0;
- textClient.setLayout(rowLayout);
-
- helpImage = new ImageHyperlink(textClient, SWT.NONE);
- toolkit.adapt(helpImage, true, true);
- toolkit.adapt(textClient, true, true);
- helpImage.setImage(JSFUICommonPlugin.getDefault().getImage(HELP_IMAGE_FILE));
- getSection().setTextClient(textClient);
- if (helpTooltip != null) {
- helpImage.setToolTipText(helpTooltip);
- }
- helpImage.setBackground(getSection().getTitleBarGradientBackground());
- helpImage.addHyperlinkListener(new HyperlinkAdapter() {
- public void linkActivated(HyperlinkEvent e) {
- IContext context = HelpSystem.getContext(helpContextId);
- if (context != null) {
- IHelpResource[] topics = context.getRelatedTopics();
- if (topics != null && topics.length == 1) {
- PlatformUI.getWorkbench().getHelpSystem().displayHelpResource(topics[0].getHref());
- } else {
- PlatformUI.getWorkbench().getHelpSystem().displayHelp(helpContextId);
- }
- }
- }
- });
-
- /*
- * Composite client = _toolkit.createComposite(getSection());
- * createClient(client, _toolkit); getSection().setClient(client);
- */
- }
-
- /**
- * set the page details from the extensionpoint
- *
- * @param element
- */
- protected void setPageDetails(IConfigurationElement element) {
- setText(element.getAttribute("name")); //$NON-NLS-1$
- setDescription(element.getAttribute("description")); //$NON-NLS-1$
- }
-
- /**
- * add the extension elements to the page
- *
- * @param parent
- * @param toolkit_
- * @param element
- */
- public void processItems(Composite parent, FormToolkit toolkit_,
- IConfigurationElement element) {
- String hyperlink = element.getAttribute("hyperlink"); //$NON-NLS-1$
- String text = element.getAttribute("text"); //$NON-NLS-1$
- String action = element.getAttribute("hyperlinkaction"); //$NON-NLS-1$
- //String actionparameters = element.getAttribute("actionparameters"); //$NON-NLS-1$
-
- if (hyperlink != null && hyperlink.length() > 0) {
- Hyperlink hypr = toolkit_.createHyperlink(parent, hyperlink,
- SWT.NONE);
- if (action != null && action.length() > 0) {
- try {
- final IAction thisAction = (IAction) element
- .createExecutableExtension("hyperlinkaction"); //$NON-NLS-1$
- hypr.addHyperlinkListener(new HyperlinkAdapter() {
- public void linkActivated(HyperlinkEvent e) {
- thisAction.run();
- }
- });
- } catch (Exception ee) {
- // log.IntroductionSection.action.error=Failed to launch the
- // link {0}.
- log
- .error("log.OverviewSection.action.error", //$NON-NLS-1$
- hyperlink, ee);
- JSFUICommonPlugin.getAlerts().detailError(hyperlink,
- "log.OverviewSection.action.error", hyperlink, ee); //$NON-NLS-1$
- }
- }
- }
-
- if (text != null && text.length() > 0) {
- FormText form = toolkit_.createFormText(parent, false);
- form.setText(text, false, false);
- }
- }
-
- /**
- * Get the extension elements for the Introduction pages
- * @param extensionPoint
- * @return the configuration element
- */
- public IConfigurationElement getExtensions(String extensionPoint) {
- // find all service editor page extensions
- IConfigurationElement element = null;
-
- // find all service editor parameter dialog extensions
- IConfigurationElement[] elements = Platform.getExtensionRegistry()
- .getConfigurationElementsFor(extensionPoint);
- if (elements.length > 0) {
- for (int ii = 0; ii < elements.length; ii++) {
- // get extensions for this dialog
- // String extPluginId =
- // elements[ii].getDeclaringExtension().getNamespace();
- String anEditorId = elements[ii].getDeclaringExtension()
- .getSimpleIdentifier();
-
- // see if we have any contributuins of dialogs
- if (this.editorId.equals(anEditorId)) {
- element = elements[ii];
- break;
- }
- }
- }
- return element;
- }
-
- private void setText(String text) {
- getSection().setText(text);
- }
-
- private void setDescription(String text) {
- getSection().setDescription(text);
-
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/guiutils/SWTUtils.java b/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/guiutils/SWTUtils.java
deleted file mode 100644
index 862b26b..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/guiutils/SWTUtils.java
+++ /dev/null
@@ -1,1032 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.common.ui.internal.guiutils;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.ScrolledComposite;
-import org.eclipse.swt.events.ControlEvent;
-import org.eclipse.swt.events.ControlListener;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.List;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.TableColumn;
-import org.eclipse.swt.widgets.Text;
-
-/**
- * This utility class provides convenience methods in creating controls on
- * preference pages.
- *
- * @author mengbo
- */
-public class SWTUtils {
- // Defaults of controls
- private static final int DEFAULT_BUTTON_WIDTH = 70;
-
- private static final int DEFAULT_COMBO_WIDTH = 100;
-
- private static final int DEFAULT_TEXTBOX_WIDTH = 100;
-
- private static final int DEFAULT_RADIO_FILL = GridData.HORIZONTAL_ALIGN_BEGINNING
- | GridData.VERTICAL_ALIGN_CENTER;
-
- /**
- * Creates a new checkbox and sets the default layout data.
- *
- * @param parent
- * the composite in which to create the checkbox
- * @return the new checkbox
- */
- public static Button createCheckBox(Composite parent) {
- return createCheckBox(parent, null, 1, 0);
- }
-
- /**
- * Creates a new checkbox and sets the default layout data.
- *
- * @param parent
- * the composite in which to create the checkbox
- * @param label
- * the string to set into the checkbox
- * @param numColumns
- * the number of columns the new checkbox is to occupy
- * @return the new checkbox
- */
- public static Button createCheckBox(Composite parent, String label,
- int numColumns) {
- return createCheckBox(parent, label, numColumns, 0);
- }
-
- /**
- * Creates a new checkbox and sets the default layout data.
- *
- * @param parent
- * the composite in which to create the checkbox
- * @param label
- * the string to set into the checkbox
- * @param numColumns
- * the number of columns the new checkbox is to occupy
- * @param indent
- * the number of pixels to indent from the left
- * @return the new checkbox
- */
- public static Button createCheckBox(Composite parent, String label,
- int numColumns, int indent) {
- Button button = new Button(parent, SWT.CHECK | SWT.LEFT);
- if (label == null) {
- button.setAlignment(SWT.CENTER);
- }
- GridData data = new GridData(GridData.FILL);
- data.horizontalSpan = numColumns;
- data.horizontalIndent = indent;
- button.setLayoutData(data);
- if (label != null) {
- button.setText(label);
- }
- return button;
- }
-
- /**
- * Creates a combo box and sets the default layout data.
- *
- * @param parent
- * the composite in which to create the combo
- * @param items
- * the items in the combo
- * @param numColumns
- * the number of columns the new combo is to occupy
- * @return the new combo box
- */
- public static Combo createCombo(Composite parent, String[] items,
- int numColumns) {
- return createCombo(parent, items, numColumns, DEFAULT_COMBO_WIDTH);
- }
-
- /**
- * Creates a combo box and sets the default layout data.
- *
- * @param parent
- * the composite in which to create the combo
- * @param tokenString
- * a tokenized string that will be split into the fields.
- * @param numColumns
- * the number of columns the new combo is to occupy
- * @return the new combo box
- */
- public static Combo createCombo(Composite parent, String tokenString,
- int numColumns) {
- return createCombo(parent, getTokenNames(tokenString), numColumns,
- DEFAULT_COMBO_WIDTH);
- }
-
- /**
- * Creates a combo box and sets the default layout data.
- *
- * @param parent
- * the composite in which to create the combo
- * @param tokenString
- * a tokenized string that will be split into the fields.
- * @param numColumns
- * the number of columns the new combo is to occupy
- * @param minWidth
- * minimum width of combo box in pixels
- * @return the new combo box
- */
- public static Combo createCombo(Composite parent, String tokenString,
- int numColumns, int minWidth) {
- return createCombo(parent, getTokenNames(tokenString), numColumns,
- minWidth);
- }
-
- /**
- * Creates a combo box and sets the default layout data.
- *
- * @param parent
- * the composite in which to create the combo
- * @param items
- * the items in the combo
- * @param numColumns
- * the number of columns the new combo is to occupy
- * @param minWidth
- * minimum width of combo box in pixels
- * @return the new combo box
- */
- public static Combo createCombo(Composite parent, String[] items,
- int numColumns, int minWidth) {
- return createCombo(parent, items, numColumns, minWidth, false);
- }
-
- /**
- * Creates a combo box and sets the default layout data.
- *
- * @param parent
- * the composite in which to create the combo
- * @param tokenString
- * @param numColumns
- * the number of columns the new combo is to occupy
- * @param minWidth
- * minimum width of combo box in pixels
- * @param editable
- * whether the items in the combo is editable
- * @return the new combo box
- */
- public static Combo createCombo(Composite parent, String tokenString,
- int numColumns, int minWidth, boolean editable) {
- return createCombo(parent, getTokenNames(tokenString), numColumns,
- minWidth, editable);
- }
-
- /**
- * Creates a combo box and sets the default layout data.
- *
- * @param parent
- * the composite in which to create the combo
- * @param items
- * the items in the combo
- * @param numColumns
- * the number of columns the new combo is to occupy
- * @param minWidth
- * minimum width of combo box in pixels
- * @param editable
- * whether the items in the combo is editable
- * @return the new combo box
- */
- public static Combo createCombo(Composite parent, String[] items,
- int numColumns, int minWidth, boolean editable) {
- Combo combo;
- GridData data;
- if (editable) {
- combo = new Combo(parent, SWT.DROP_DOWN);
- data = new GridData(GridData.FILL_HORIZONTAL);
- } else {
- combo = new Combo(parent, SWT.DROP_DOWN | SWT.READ_ONLY);
- data = new GridData(GridData.FILL);
- }
- data.horizontalSpan = numColumns;
- data.widthHint = minWidth;
- combo.setLayoutData(data);
- combo.setItems(items);
- return combo;
- }
-
- /**
- * Creates composite control and sets the default layout data.
- *
- * @param parent
- * the parent of the new composite
- * @param numColumns
- * the number of columns for the new composite
- * @return the newly-created coposite
- */
- public static Composite createComposite(Composite parent, int numColumns) {
- return createComposite(parent, numColumns, -1, -1,
- GridData.FILL_HORIZONTAL, -1, -1, -1);
- }
-
- /**
- * Creates composite control and sets the default layout data.
- *
- * @param parent
- * the parent of the new composite
- * @param numColumns
- * the number of columns for the new composite
- * @param verticalSpacing
- * the spacing between rows.
- * @param horizontalSpan
- * the span for this new composite over the original composite.
- * @return the newly-created coposite
- */
- public static Composite createComposite(Composite parent, int numColumns,
- int verticalSpacing, int horizontalSpan) {
- return createComposite(parent, numColumns, verticalSpacing,
- horizontalSpan, GridData.FILL_HORIZONTAL, -1, -1, -1);
- }
-
- /**
- * Creates composite control and sets the default layout data.
- *
- * @param parent
- * the parent of the new composite
- * @param numColumns
- * the number of columns for the new composite
- * @param verticalSpacing
- * the spacing between rows.
- * @param horizontalSpan
- * the span for this new composite over the original composite.
- * @param gridDataFill
- * the fill to use for this composite.
- * @return the newly-created coposite
- */
- public static Composite createComposite(Composite parent, int numColumns,
- int verticalSpacing, int horizontalSpan, int gridDataFill) {
- return createComposite(parent, numColumns, verticalSpacing,
- horizontalSpan, gridDataFill, -1, -1, -1);
- }
-
- /**
- * Creates composite control and sets the default layout data.
- *
- * @param parent
- * the parent of the new composite
- * @param numColumns
- * the number of columns for the new composite
- * @param verticalSpacing
- * the spacing between rows.
- * @param horizontalSpan
- * the span for this new composite over the original composite.
- * @param gridDataFill
- * the fill to use for this composite.
- * @param horizontalSpacing
- * the spacing between objects.
- * @param marginWidth
- * the spacing at start and end of composite.
- * @param marginHeight
- * the spacing above and below composite.
- * @return the newly-created coposite
- */
- public static Composite createComposite(Composite parent, int numColumns,
- int verticalSpacing, int horizontalSpan, int gridDataFill,
- int horizontalSpacing, int marginWidth, int marginHeight) {
- Composite composite = new Composite(parent, SWT.NULL);
- GridLayout layout = new GridLayout();
- layout.numColumns = numColumns;
- if (verticalSpacing >= 0) {
- layout.verticalSpacing = verticalSpacing;
- }
- if (horizontalSpacing >= 0) {
- layout.horizontalSpacing = horizontalSpacing;
- }
- if (marginWidth >= 0) {
- layout.marginWidth = marginWidth;
- }
- if (marginHeight >= 0) {
- layout.marginHeight = marginHeight;
- }
- composite.setLayout(layout);
- GridData gd = new GridData(gridDataFill);
- if (horizontalSpan > 0) {
- gd.horizontalSpan = horizontalSpan;
- }
- composite.setLayoutData(gd);
-
- return composite;
- }
-
- /**
- * Utility method that creates a group and sets the default layout data.
- *
- * @param parent
- * the parent for the new group
- * @param title
- * the label for the new group
- * @param numColumns
- * the number of columns for the new group
- * @return the newly created group
- */
- public static Group createGroup(Composite parent, String title,
- int numColumns) {
- return createGroup(parent, title, numColumns, -1,
- GridData.FILL_HORIZONTAL);
- }
-
- /**
- * Utility method that creates a group and sets the default layout data.
- *
- * @param parent
- * the parent for the new group
- * @param title
- * the label for the new group
- * @param numColumns
- * the number of columns for the new group
- * @param horizontalSpan
- * the number of columns this group should span on the parent
- * composite.
- * @param gridDataFill
- * the fill style of the new group -- set to for filling just
- * around the object: GridData.BEGINNING | GridData.CENTER
- * @return the newly created group
- */
- public static Group createGroup(Composite parent, String title,
- int numColumns, int horizontalSpan, int gridDataFill) {
- Group group = new Group(parent, SWT.SHADOW_ETCHED_IN);
- GridLayout layout = new GridLayout();
- layout.numColumns = numColumns;
- group.setLayout(layout);
- GridData data = new GridData(gridDataFill);
-
- if (horizontalSpan > 0) {
- data.horizontalSpan = horizontalSpan;
- }
- group.setLayoutData(data);
- group.setText(title);
- return group;
- }
-
- /**
- * Utility method that creates a label instance and sets the default layout
- * data.
- *
- * @param parent
- * the parent for the new label
- * @param text
- * the text for the new label
- * @param numColumns
- * the number of columns for the new composite
- * @return the new label
- */
- public static Label createLabel(Composite parent, String text,
- int numColumns) {
- return createLabel(parent, text, numColumns, 0);
- }
-
- /**
- * Utility method that creates a label instance and sets the default layout
- * data.
- *
- * @param parent
- * the parent for the new label
- * @param text
- * the text for the new label
- * @param numColumns
- * the number of columns for the new composite
- * @param indent
- * number of pixels to indent from the left
- * @return the new label
- */
- public static Label createLabel(Composite parent, String text,
- int numColumns, int indent) {
- Label label = new Label(parent, SWT.LEFT);
- GridData data = new GridData();
- data.horizontalSpan = numColumns;
- data.horizontalAlignment = GridData.FILL;
- data.horizontalIndent = indent;
- label.setLayoutData(data);
- label.setText(text);
- return label;
- }
-
- /**
- * Create a image label for sticking in a composite. The backgroud color is
- * optional. Because images can have "transparent" natures, you might want
- * to say the background is something other than the defaults composites
- * background.
- *
- * NOTE: the caller is responsible for cleanup of the image and color
- * objects.
- *
- * @param parent
- * the parent for the new label
- * @param theImage
- * the image for the new label
- * @param numColumns
- * the number of columns for the new composite
- * @param background
- * pass null to use the composites background.
- * @return the new label
- */
- public static Label createLabelImage(Composite parent, Image theImage,
- int numColumns, Color background) {
- Label label = new Label(parent, SWT.LEFT);
- GridData data = new GridData();
- data.horizontalSpan = numColumns;
- data.horizontalAlignment = GridData.FILL;
- label.setLayoutData(data);
- if (background != null) {
- label.setBackground(background);
- }
- label.setImage(theImage);
- return label;
- }
-
- /**
- * Utility method that creates a push button instance and sets the default
- * layout data.
- *
- * @param parent
- * the parent for the new button
- * @param label
- * the label for the new button
- * @return the newly-created button
- */
- public static Button createPushButton(Composite parent, String label) {
- return createPushButton(parent, label, DEFAULT_BUTTON_WIDTH);
- }
-
- /**
- * Utility method that creates a push button instance and sets the default
- * layout data.
- *
- * @param parent
- * the parent for the new button
- * @param label
- * the label for the new button
- * @param widthHint
- * use this width for the button.
- * @return the newly-created button
- */
- public static Button createPushButton(Composite parent, String label,
- int widthHint) {
- Button button = new Button(parent, SWT.PUSH);
- GridData data = new GridData();
- data.horizontalAlignment = GridData.FILL_HORIZONTAL;
- data.widthHint = widthHint;
- button.setLayoutData(data);
- button.setText(label);
- return button;
- }
-
- /**
- * Utility method that creates a push button instance and sets the default
- * layout data.
- *
- * @param parent
- * the parent for the new button
- * @param theImage
- * the label for the new button
- * @param widthHint
- * use this width for the button.
- * @return the newly-created button
- */
- public static Button createPushButton(Composite parent, Image theImage,
- int widthHint) {
- Button button = new Button(parent, SWT.PUSH);
- GridData data = new GridData();
- data.horizontalAlignment = GridData.FILL_HORIZONTAL;
- data.widthHint = widthHint;
- button.setLayoutData(data);
- button.setImage(theImage);
- button.setAlignment(SWT.CENTER);
- return button;
- }
-
- /**
- * Utility method that creates a radio button instance and sets the default
- * layout data.
- *
- * @param parent
- * the parent for the new button
- * @param label
- * the label for the new button
- * @return the newly-created button
- */
- public static Button createRadioButton(Composite parent, String label) {
- return createRadioButton(parent, label, DEFAULT_RADIO_FILL);
- }
-
- /**
- * Utility method that creates a radio button instance and sets the default
- * layout data.
- *
- * @param parent
- * the parent for the new button
- * @param label
- * the label for the new button
- * @param gridDataFill
- * @return the newly-created button
- */
- public static Button createRadioButton(Composite parent, String label,
- int gridDataFill) {
- return createRadioButton(parent, label, gridDataFill, 1);
- }
-
- /**
- * Utility method that creates a radio button instance and sets the default
- * layout data.
- *
- * @param parent
- * the parent for the new button
- * @param label
- * the label for the new button
- * @param gridDataFill
- * @param horizontalSpan
- * number of columns occupied by button
- * @return the newly-created button
- */
- public static Button createRadioButton(Composite parent, String label,
- int gridDataFill, int horizontalSpan) {
- Button button = new Button(parent, SWT.RADIO | SWT.LEFT);
- GridData data = new GridData(gridDataFill);
- data.horizontalSpan = horizontalSpan;
- button.setLayoutData(data);
- button.setText(label);
- return button;
- }
-
- /**
- * Utility method that creates an empty line
- *
- * @param parent
- * the parent for the new label
- * @param numColumns
- * the number of columns for the new composite
- */
- public static void createSpacer(Composite parent, int numColumns) {
- createSpacer(parent, numColumns, 0);
- }
-
- /**
- * Utility method that creates an empty line
- *
- * @param parent
- * the parent for the new label
- * @param numColumns
- * the number of columns for the new composite
- * @param minWidth
- * minimum width of spacer
- */
- public static void createSpacer(Composite parent, int numColumns,
- int minWidth) {
- Label label = new Label(parent, SWT.NONE);
- GridData data = new GridData();
- data.horizontalSpan = numColumns;
- data.widthHint = minWidth;
- label.setLayoutData(data);
- }
-
- /**
- * Create a separator that goes across the entire page
- *
- * @param parent
- * the parent for the new label
- * @param numColumns
- * the number of columns for the new composite
- */
- public static void createSeparator(Composite parent, int numColumns) {
- Label separator = new Label(parent, SWT.SEPARATOR | SWT.HORIZONTAL);
- GridData data = new GridData();
- data.horizontalSpan = numColumns;
- data.horizontalAlignment = GridData.FILL;
- data.grabExcessHorizontalSpace = true;
- separator.setLayoutData(data);
- }
-
- /**
- * Create a table from a Composite object
- *
- * @param composite
- * the Composite this table is to be created from
- * @param tokenString
- * A string containing names of the columns in the order that
- * they should be displayed in the table with each column
- * separated by a comma(',') or null if no columns need to be
- * created.
- * @param tablewidth
- * the minimum width for the table
- * @param tableHeight
- * @return the new table
- */
- public static Table createTable(Composite composite, String tokenString,
- int tablewidth, int tableHeight) {
- // SINGLE, MULTI, CHECK, FULL_SELECTION, HIDE_SELECTION
- int style = SWT.V_SCROLL | SWT.H_SCROLL | SWT.SINGLE | SWT.BORDER
- | SWT.FULL_SELECTION;
- Table table = new Table(composite, style);
- GridData gridData = new GridData(GridData.FILL_BOTH);
- if (tablewidth > 0) {
- gridData.widthHint = tablewidth;
- }
- if (tableHeight > 0) {
- gridData.heightHint = tableHeight;
- }
- table.setLayoutData(gridData);
- table.setHeaderVisible(true);
- table.setLinesVisible(true);
-
- if (tokenString != null) {
- String[] columns = getTokenNames(tokenString);
-
- int columnSize = 50;
- if (tablewidth > 0) {
- columnSize = tablewidth / columns.length;
- }
- for (int ii = 0; ii < columns.length; ii++) {
- /*(void)*/ createTableColumn(table, columns[ii], ii,
- columnSize);
- }
- }
-
- return table;
- }
-
- /**
- * Create a table from a Composite object
- *
- * @param composite
- * the Composite this table is to be created from
- * @param columns
- * A string array containing names of the columns in the order
- * that they should be displayed in the table, or null if no
- * columns need to be created.
- * @param tablewidth
- * the minimum width for the table
- * @return the new table
- */
- public static Table createTable(Composite composite, String[] columns,
- int tablewidth) {
- int style = SWT.BORDER | SWT.FULL_SELECTION;
- Table table = new Table(composite, style);
- GridData gridData = new GridData(GridData.FILL_BOTH);
- gridData.widthHint = tablewidth;
- table.setLayoutData(gridData);
- table.setHeaderVisible(true);
- table.setLinesVisible(true);
-
- if (columns != null) {
- for (int i = 0; i < columns.length; i++) {
- /*(void)*/ createTableColumn(table, columns[i], i);
- }
- }
-
- return table;
- }
-
- /**
- * Create a table column
- *
- * @param parent
- * the table that contains this column
- * @param name
- * name of this column
- * @param index
- * the column within the parent composite
- * @return the new table column
- */
- public static TableColumn createTableColumn(Table parent, String name,
- int index) {
- TableColumn column = new TableColumn(parent, SWT.LEFT, index);
- column.setText(name);
- return column;
- }
-
- /**
- * Create a table column with the image and the width of the column is set
- * to the image width.
- *
- * @param parent
- * the table that contains this column
- * @param image
- * iamge for this column
- * @param index
- * @return the new table column
- */
- public static TableColumn createTableColumn(Table parent, Image image,
- int index) {
- TableColumn column = new TableColumn(parent, SWT.LEFT, index);
- column.setImage(image);
- column.setWidth(image.getBounds().width);
- column.setResizable(false);
- return column;
- }
-
- /**
- * Create a table column
- *
- * @param parent
- * the table that contains this column
- * @param name
- * name of this column
- * @param index
- * the column within the parent composite
- * @param tablewidth
- * the width for the column
- * @return the new table column
- */
- public static TableColumn createTableColumn(Table parent, String name,
- int index, int tablewidth) {
- TableColumn column = new TableColumn(parent, SWT.LEFT, index);
- column.setText(name);
- column.setWidth(tablewidth);
- return column;
- }
-
- /**
- * Create a text field
- *
- * @param parent
- * the parent of the new text field
- * @return the new text field
- */
- public static Text createTextBox(Composite parent) {
- return createTextBox(parent, 1, DEFAULT_TEXTBOX_WIDTH);
- }
-
- /**
- * Create a text field
- *
- * @param parent
- * the parent of the new text field
- * @param text
- * @return the new text field
- */
- public static Text createTextBox(Composite parent, String text) {
- Text textbox = createTextBox(parent, 1);
- textbox.setText(text);
- return textbox;
- }
-
- /**
- * Create a text field
- *
- * @param parent
- * the parent of the new text field
- * @param numColumns
- * number of columns the text box is to occupy
- * @return the new text field
- */
- public static Text createTextBox(Composite parent, int numColumns) {
- return createTextBox(parent, numColumns, DEFAULT_TEXTBOX_WIDTH);
- }
-
- /**
- * Create a text field
- *
- * @param parent
- * the parent of the new text field
- * @param numColumns
- * number of columns the text box is to occupy
- * @param minWidth
- * minimum width of text field
- * @return the new text field
- */
- public static Text createTextBox(Composite parent, int numColumns,
- int minWidth) {
- return createTextBox(parent, numColumns, minWidth, SWT.DEFAULT);
- }
-
- /**
- * Create a text field
- *
- * @param parent
- * the parent of the new text field
- * @param numColumns
- * number of columns the text box is to occupy
- * @param minWidth
- * minimum width of text field
- * @param minHeight
- * @return the new text field
- */
- public static Text createTextBox(Composite parent, int numColumns,
- int minWidth, int minHeight) {
- Text text = new Text(parent, SWT.SINGLE | SWT.BORDER);
- GridData data = new GridData(GridData.FILL);
- data.horizontalSpan = numColumns;
- data.widthHint = minWidth;
- data.heightHint = minHeight;
- text.setLayoutData(data);
- return text;
- }
-
- /**
- * Create a text field that is scrollable.
- *
- * @param parent
- * the parent of the new text field
- * @param numColumns
- * number of columns the text box is to occupy
- * @param minWidth
- * minimum width of text field
- * @param minHeight
- * minimum height of text field
- * @return the new text field
- */
- public static Text createTextBoxScrollable(Composite parent,
- int numColumns, int minWidth, int minHeight) {
- Text text = new Text(parent, SWT.BORDER | SWT.V_SCROLL | SWT.WRAP);
- GridData data = new GridData((minWidth > 0) ? GridData.FILL
- : GridData.FILL_HORIZONTAL);
- data.horizontalSpan = numColumns;
- if (minWidth > 0) {
- data.widthHint = minWidth;
- }
- data.heightHint = minHeight;
-
- text.setLayoutData(data);
- return text;
- }
-
- /**
- * Create a list with the items listed in it.
- *
- * @param parent
- * the parent of the new text field
- * @param numColumns
- * number of columns the text box is to occupy
- * @param minWidth
- * minimum width of text field
- * @param minHeight
- * minimum height of text field
- * @param items
- * the items in the list
- * @return the new list
- */
- public static List createList(Composite parent, int numColumns,
- int minWidth, int minHeight, String[] items) {
- return createList(parent, numColumns, minWidth, minHeight, items, true);
- }
-
- /**
- * Create a list with the items listed in it.
- *
- * @param parent
- * the parent of the new list box
- * @param numColumns
- * number of columns the list box is to occupy
- * @param minWidth
- * minimum width of list box
- * @param minHeight
- * minimum height of list box
- * @param items
- * the items in the list
- * @param bmulti
- * whether multiple item selection is allowed
- * @return the new list
- */
- public static List createList(Composite parent, int numColumns,
- int minWidth, int minHeight, String[] items, boolean bmulti) {
- return createList(parent, numColumns, minWidth, minHeight, items,
- bmulti, 1);
- }
-
- /**
- * Create a list with the items listed in it.
- *
- * @param parent
- * the parent of the new list box
- * @param numColumns
- * number of columns the list box is to occupy
- * @param minWidth
- * minimum width of list box
- * @param minHeight
- * minimum height of list box
- * @param items
- * the items in the list
- * @param bmulti
- * whether multiple item selection is allowed
- * @param verticalSpan
- * the number of rows the list box is to occupy
- * @return the new list
- */
- public static List createList(Composite parent, int numColumns,
- int minWidth, int minHeight, String[] items, boolean bmulti,
- int verticalSpan) {
- List theList;
- if (bmulti)
- theList = new List(parent, SWT.V_SCROLL | SWT.H_SCROLL | SWT.MULTI
- | SWT.BORDER);
- else
- theList = new List(parent, SWT.V_SCROLL | SWT.H_SCROLL | SWT.SINGLE
- | SWT.BORDER);
- GridData data = new GridData(GridData.FILL_HORIZONTAL
- | GridData.VERTICAL_ALIGN_BEGINNING | GridData.FILL_VERTICAL);
- data.horizontalSpan = numColumns;
- data.widthHint = minWidth;
- data.heightHint = minHeight;
- data.verticalSpan = verticalSpan;
- theList.setLayoutData(data);
- if (items != null) {
- theList.setItems(items);
- }
-
- return theList;
- }
-
- /**
- * Computes the size of the composite inside the scroll area so that scroll
- * bars show up correctly.
- *
- * @param parentComposite
- * @param childComposite
- */
- public static void computeScrollArea(ScrolledComposite parentComposite,
- Composite childComposite) {
- // Point pt = childComposite.computeSize(SWT.DEFAULT, SWT.DEFAULT);
- // childComposite.setSize(pt);
-
- Point pt = childComposite.computeSize(SWT.DEFAULT, SWT.DEFAULT);
- parentComposite.setExpandHorizontal(true);
- parentComposite.setExpandVertical(true);
- parentComposite.setMinWidth(pt.x);
- parentComposite.setMinHeight(pt.y);
- }
-
- /**
- * Builds an array of strings from a token list string. The token separator
- * is a comma (',').
- *
- * @param tokenString
- * @return String[]
- */
- public static String[] getTokenNames(String tokenString) {
- if (tokenString == null) {
- return new String[0];
- }
-
- return tokenString.split(","); //$NON-NLS-1$
- }
-
- /**
- * Enable/Disable the widget and all its children.
- *
- * @param widget
- * The widget to be enabled/disabled.
- * @param state
- * Enable widget if true. Disable otherwise.
- */
- public static void setWidgetState(Control widget, boolean state) {
- if (widget instanceof Composite) {
- Control widgets[] = ((Composite) widget).getChildren();
- for (int i = 0; i < widgets.length; i++) {
- setWidgetState(widgets[i], state);
- }
- }
- widget.setEnabled(state);
- }
-
- // ---------------------------------------------------------------------------
- // following is for workaround eclipse problem
- // https://bugs.eclipse.org/bugs/show_bug.cgi?id=40281
- static ControlListener _listener = new ControlListener() {
- public void controlResized(ControlEvent e) {
- final Composite c = (Composite) e.widget;
- c.getDisplay().asyncExec(new Runnable() {
- public void run() {
- if (!c.isDisposed()) {
- // XXX: in 3.0, should use c.layout(true)
- // in 3.1, should use c.layout(true, true)
- c.layout(true);
- c.redraw();
- }
- }
- });
- }
-
- public void controlMoved(ControlEvent e) {
- // nothing for move
- }
- };
-
- /**
- * @param composite
- */
- public static void workaroundResize(Composite composite) {
- composite.addControlListener(_listener);
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/guiutils/TextWindow.java b/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/guiutils/TextWindow.java
deleted file mode 100644
index b829cd2..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/guiutils/TextWindow.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.common.ui.internal.guiutils;
-
-import org.eclipse.jface.text.Document;
-import org.eclipse.jface.text.TextViewer;
-import org.eclipse.jface.window.ApplicationWindow;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Shell;
-
-/**
- * Brings up a simple text window.
- *
- * @author mengbo
- */
-public class TextWindow extends ApplicationWindow {
- private String _content;
-
- private Point _size = new Point(600, 600);
-
- /**
- * empty for passing from events.
- * @param parentShell
- * @param content
- */
- public TextWindow(Shell parentShell, String content) {
- super(parentShell);
- // addStatusLine();
- _content = content;
- // addCoolBar(SWT.BORDER);
- // addMenuBar();
- // addToolBar(SWT.BORDER);
- }
-
- protected Control createContents(Composite parent) {
- // _text = new Text(parent, SWT.BORDER | SWT.V_SCROLL | SWT.H_SCROLL);
- // _text.setText(_content);
- // return _text;
-
- TextViewer tview = new TextViewer(parent, SWT.BORDER | SWT.V_SCROLL
- | SWT.H_SCROLL);
- tview.setDocument(new Document(_content));
-
- return tview.getControl();
- }
-
-
- protected Point getInitialSize() {
- return _size;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/guiutils/messages.properties b/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/guiutils/messages.properties
deleted file mode 100644
index 6291ec0..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/guiutils/messages.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-IntroductionSection_noIntroDescription=No Introduction page configuration found in the plugin.xml
-IntroductionSection_noIntroTitle=No Introduction
-BrowserWindow_loading=<b>Loading...</b>
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/logging/Logger.java b/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/logging/Logger.java
deleted file mode 100644
index 3b71b83..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/logging/Logger.java
+++ /dev/null
@@ -1,215 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.common.ui.internal.logging;
-
-import java.text.MessageFormat;
-import java.util.ResourceBundle;
-
-import org.eclipse.core.runtime.ILog;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Status;
-import org.osgi.framework.Bundle;
-
-/**
- * A resource bundle driven logger
- *
- */
-public class Logger {
- private ResourceBundle resourceBundle;
-
- private ILog log;
-
- private String bundleId;
-
- /**
- * @param bundle
- * @param resourceBundle
- */
- public Logger(Bundle bundle, ResourceBundle resourceBundle) {
- log = Platform.getLog(bundle);
- this.resourceBundle = resourceBundle;
- bundleId = bundle.getSymbolicName();
- if (resourceBundle == null) {
- IStatus status = new Status(IStatus.ERROR, bundleId, IStatus.OK,
- "The resource Bundle for logger could not be null!", null); //$NON-NLS-1$
- log.log(status);
- }
- }
- /**
- * @param key
- * @param arg0
- */
- public void info(String key, String arg0) {
- Object[] args = new Object[1];
- args[0] = arg0;
-
- MessageFormat formatter = new MessageFormat(getString(key));
- String message = formatter.format(args);
- IStatus status = new Status(IStatus.INFO, bundleId, IStatus.OK,
- message, null);
- log.log(status);
- }
-
- /**
- * @param message
- */
- public void info(String message) {
- IStatus status = new Status(IStatus.INFO, bundleId, IStatus.OK,
- message, null);
- log.log(status);
- }
-
- /**
- * @param key
- * @param e
- */
- public void info(String key, Throwable e) {
- String message = getString(key);
- IStatus status = new Status(IStatus.INFO, bundleId, IStatus.OK,
- message, e);
- log.log(status);
- }
-
- /**
- * @param key
- * @param arg0
- * @param e
- */
- public void info(String key, String arg0, Throwable e) {
- Object[] args = new Object[1];
- args[0] = arg0;
-
- MessageFormat formatter = new MessageFormat(getString(key));
- String message = formatter.format(args);
- IStatus status = new Status(IStatus.INFO, bundleId, IStatus.OK,
- message, null);
- log.log(status);
- }
-
- /**
- * @param key
- * @param arg0
- * @param arg1
- * @param e
- */
- public void info(String key, String arg0, String arg1, Throwable e) {
- Object[] args = new Object[1];
- args[0] = arg0;
- args[1] = arg1;
-
- MessageFormat formatter = new MessageFormat(getString(key));
- String message = formatter.format(args);
- IStatus status = new Status(IStatus.INFO, bundleId, IStatus.OK,
- message, e);
- log.log(status);
- }
-
- /**
- * @param key
- */
- public void error(String key) {
-
- String message = getString(key);
- IStatus status = new Status(IStatus.ERROR, bundleId, IStatus.OK,
- message, null);
- log.log(status);
- }
-
- /**
- * @param e
- */
- public void error(Throwable e) {
- IStatus status = new Status(IStatus.ERROR, bundleId, IStatus.OK, "", e); //$NON-NLS-1$
- log.log(status);
- }
-
- /**
- * @param key
- * @param e
- */
- public void error(String key, Throwable e) {
- String message = getString(key);
- IStatus status = new Status(IStatus.ERROR, bundleId, IStatus.OK,
- message, e);
- log.log(status);
- }
-
- /**
- * @param key
- * @param arg0
- */
- public void error(String key, String arg0) {
- Object[] args = new Object[1];
- args[0] = arg0;
-
- MessageFormat formatter = new MessageFormat(getString(key));
- String message = formatter.format(args);
- IStatus status = new Status(IStatus.ERROR, bundleId, IStatus.OK,
- message, null);
- log.log(status);
- }
-
- /**
- * @param key
- * @param arg
- * @param e
- */
- public void error(String key, String arg, Throwable e) {
- Object[] args = new Object[1];
- args[0] = arg;
-
- MessageFormat formatter = new MessageFormat(getString(key));
- String message = formatter.format(args);
- IStatus status = new Status(IStatus.ERROR, bundleId, IStatus.OK,
- message, e);
- log.log(status);
- }
-
- /**
- * @param key
- * @param arg0
- * @param arg1
- * @param e
- */
- public void error(String key, String arg0, String arg1, Throwable e) {
- Object[] args = new Object[1];
- args[0] = arg0;
- args[1] = arg1;
-
- MessageFormat formatter = new MessageFormat(getString(key));
- String message = formatter.format(args);
- IStatus status = new Status(IStatus.ERROR, bundleId, IStatus.OK,
- message, e);
- log.log(status);
- }
-
- /**
- * @param key
- * @return the resource for the key, or an error message if
- * resourceBundle.getString(key) throws an Exception
- */
- private String getString(String key)
- {
- try
- {
- return resourceBundle.getString(key);
- }
- // suppress non-error exceptions so that the logging operation
- // itself (usually called in response to an exception) does not
- // throw a new exception
- catch(Exception e)
- {
- return "!!missing resource: " + key + "!!"; //$NON-NLS-1$ //$NON-NLS-2$
- }
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/preferences/OrderingMessages.java b/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/preferences/OrderingMessages.java
deleted file mode 100644
index 8202245..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/preferences/OrderingMessages.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2008 Oracle Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Oracle Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.common.ui.internal.preferences;
-
-import org.eclipse.osgi.util.NLS;
-
-/**
- * @author cbateman
- *
- */
-public class OrderingMessages extends NLS
-{
- private static final String BUNDLE_NAME= "org.eclipse.jst.jsf.common.ui.internal.preferences.OrderingMessages";//$NON-NLS-1$
-
- private OrderingMessages() {
- // Do not instantiate
- }
-
- /**
- * see OrderMessages.properties
- */
- public static String Ordering_Up;
- /**
- * see OrderMessages.properties
- */
- public static String Ordering_Down;
-
- static {
- NLS.initializeMessages(BUNDLE_NAME, OrderingMessages.class);
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/preferences/OrderingMessages.properties b/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/preferences/OrderingMessages.properties
deleted file mode 100644
index 282ee23..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/preferences/OrderingMessages.properties
+++ /dev/null
@@ -1,12 +0,0 @@
-###############################################################################
-# Copyright (c) 2001, 2008 Oracle Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# Oracle Corporation - initial API and implementation
-###############################################################################
-Ordering_Up=Up
-Ordering_Down=Down
\ No newline at end of file
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/preferences/StrategyOrderingPanel.java b/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/preferences/StrategyOrderingPanel.java
deleted file mode 100644
index c438b96..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/preferences/StrategyOrderingPanel.java
+++ /dev/null
@@ -1,322 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2008 Oracle Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Oracle Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.common.ui.internal.preferences;
-
-import org.eclipse.core.runtime.Assert;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.jface.resource.JFaceResources;
-import org.eclipse.jface.viewers.CheckStateChangedEvent;
-import org.eclipse.jface.viewers.CheckboxTableViewer;
-import org.eclipse.jface.viewers.ICheckStateListener;
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.ITableLabelProvider;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jst.jsf.common.internal.policy.OrderedListProvider;
-import org.eclipse.jst.jsf.common.internal.policy.OrderedListProvider.OrderableObject;
-import org.eclipse.jst.jsf.common.ui.internal.utils.PixelConverter;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.graphics.GC;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.TableColumn;
-
-/**
- * Creates a composite with a checked table viewer and up/down buttons that
- * allow ordering and enablement of a list of items in the table.
- *
- * Largely derived from
- * org.eclipse.jdt.internal.ui.preferences.CodeAssistAdvancedConfigurationBlock
- *
- * @author cbateman
- *
- */
-public class StrategyOrderingPanel
-{
- private CheckboxTableViewer _viewer;
- private Button fUpButton;
- private Button fDownButton;
-
- private final OrderedListProvider _provider;
- private final ITableLabelProvider _labelProvider;
- private final String _title;
-
- /**
- * @param provider
- * @param labelProvider
- * @param title
- */
- public StrategyOrderingPanel(final OrderedListProvider provider,
- final ITableLabelProvider labelProvider, final String title)
- {
- _provider = provider;
- _labelProvider = labelProvider;
- _title = title;
- }
-
- /**
- * @param parent
- * @return the control
- */
- public Control createContents(final Composite parent)
- {
- final Composite panel = new Composite(parent, SWT.NONE);
- final GridLayout layout = new GridLayout(2, false);
- layout.marginWidth = 0;
- layout.marginHeight = 0;
- panel.setLayout(layout);
-
- final Label titleLabel = new Label(panel, SWT.NONE);
- titleLabel.setText(_title);
- final GridData gridData = new GridData(GridData.FILL,
- GridData.BEGINNING, true, false, 2, 1);
- titleLabel.setLayoutData(gridData);
-
- createTableViewer(panel);
- createButtonList(panel);
-
- return panel;
- }
-
- /**
- * Refresh the UI from model. Must not be called before createContents
- */
- public void refresh()
- {
- _provider.resetOrderedObjects();
- _viewer.refresh();
- for (final OrderableObject object : _provider.getOrderedObjects())
- {
- _viewer.setChecked(object, object.isEnabled());
- }
- }
-
- private void createTableViewer(final Composite parent)
- {
- _viewer = CheckboxTableViewer.newCheckList(parent, SWT.SINGLE
- | SWT.BORDER);
- final Table table = _viewer.getTable();
- table.setHeaderVisible(false);
- table.setLinesVisible(false);
- table.setLayoutData(new GridData(GridData.FILL, GridData.BEGINNING,
- true, false, 1, 1));
-
- final TableColumn nameColumn = new TableColumn(table, SWT.NONE);
- // nameColumn
- // .setText(PreferencesMessages.CodeAssistAdvancedConfigurationBlock_separate_table_category_column_title);
- nameColumn.setResizable(false);
-
- _viewer.setContentProvider(new ContentProvider());
-
- _viewer.setLabelProvider(_labelProvider);
- _viewer.setInput(_provider);
-
- final int ICON_AND_CHECKBOX_WITH = 50;
- final int HEADER_MARGIN = 20;
- int minNameWidth = computeWidth(table, nameColumn.getText())
- + HEADER_MARGIN;
- for (int i = 0; i < _provider.getOrderedObjects().size(); i++)
- {
- minNameWidth = Math.max(minNameWidth, computeWidth(table,
- _labelProvider.getColumnText(_provider.getOrderedObjects()
- .get(i), 0))
- + ICON_AND_CHECKBOX_WITH);
- }
-
- nameColumn.setWidth(minNameWidth);
-
- _viewer.addCheckStateListener(new ICheckStateListener()
- {
- public void checkStateChanged(final CheckStateChangedEvent event)
- {
- final boolean checked = event.getChecked();
- final OrderableObject element = (OrderableObject) event
- .getElement();
- element.setEnabled(checked);
- }
- });
-
- table.addSelectionListener(new SelectionAdapter()
- {
- @Override
- public void widgetSelected(final SelectionEvent e)
- {
- handleTableSelection();
- }
- });
-
- }
-
- private void createButtonList(final Composite parent)
- {
- final Composite composite = new Composite(parent, SWT.NONE);
- composite.setLayoutData(new GridData(SWT.BEGINNING, SWT.BEGINNING,
- false, false));
-
- final GridLayout layout = new GridLayout();
- layout.marginWidth = 0;
- layout.marginHeight = 0;
- composite.setLayout(layout);
-
- fUpButton = new Button(composite, SWT.PUSH | SWT.CENTER);
- fUpButton.setText(OrderingMessages.Ordering_Up);
- fUpButton.addSelectionListener(new SelectionAdapter()
- {
- @Override
- public void widgetSelected(final SelectionEvent e)
- {
- final int index = getSelectionIndex();
- if (index != -1)
- {
- final OrderableObject object = _provider
- .getOrderedObjects().get(index);
- _provider.moveUp(object);
- _viewer.refresh();
- handleTableSelection();
- }
- }
- });
- fUpButton.setLayoutData(new GridData());
- setButtonDimensionHint(fUpButton);
-
- fDownButton = new Button(composite, SWT.PUSH | SWT.CENTER);
- fDownButton.setText(OrderingMessages.Ordering_Down);
- fDownButton.addSelectionListener(new SelectionAdapter()
- {
- @Override
- public void widgetSelected(final SelectionEvent e)
- {
- final int index = getSelectionIndex();
- if (index != -1)
- {
- final OrderableObject object = _provider
- .getOrderedObjects().get(index);
- _provider.moveDown(object);
- _viewer.refresh();
- handleTableSelection();
- }
- }
- });
- fDownButton.setLayoutData(new GridData());
- setButtonDimensionHint(fDownButton);
- }
-
- private int computeWidth(final Control control, final String name)
- {
- if (name == null)
- {
- return 0;
- }
- final GC gc = new GC(control);
- try
- {
- gc.setFont(JFaceResources.getDialogFont());
- return gc.stringExtent(name).x + 10;
- }
- finally
- {
- gc.dispose();
- }
- }
-
- private void handleTableSelection()
- {
- final OrderableObject item = getSelectedItem();
- if (item != null)
- {
- final int index = getSelectionIndex();
- fUpButton.setEnabled(index > 0);
- fDownButton
- .setEnabled(index < _provider.getOrderedObjects().size() - 1);
- }
- else
- {
- fUpButton.setEnabled(false);
- fDownButton.setEnabled(false);
- }
- }
-
- private OrderableObject getSelectedItem()
- {
- return (OrderableObject) ((IStructuredSelection) _viewer.getSelection())
- .getFirstElement();
- }
-
- private int getSelectionIndex()
- {
- return _viewer.getTable().getSelectionIndex();
- }
-
- /**
- * Returns a width hint for a button control.
- */
- private static int getButtonWidthHint(final Button button)
- {
- button.setFont(JFaceResources.getDialogFont());
- PixelConverter converter = new PixelConverter(button);
- final int widthHint = converter
- .convertHorizontalDLUsToPixels(IDialogConstants.BUTTON_WIDTH);
- return Math.max(widthHint, button.computeSize(SWT.DEFAULT, SWT.DEFAULT,
- true).x);
- }
-
- /**
- * Sets width and height hint for the button control. <b>Note:</b> This is
- * a NOP if the button's layout data is not an instance of
- * <code>GridData</code>.
- *
- * @param button
- * the button for which to set the dimension hint
- */
- private static void setButtonDimensionHint(final Button button)
- {
- Assert.isNotNull(button);
- final Object gd = button.getLayoutData();
- if (gd instanceof GridData)
- {
- ((GridData) gd).widthHint = getButtonWidthHint(button);
- ((GridData) gd).horizontalAlignment = GridData.FILL;
- }
- }
-
- private static class ContentProvider implements IStructuredContentProvider
- {
-
- public Object[] getElements(final Object inputElement)
- {
- if (inputElement instanceof OrderedListProvider)
- {
- return ((OrderedListProvider) inputElement).getOrderedObjects()
- .toArray();
- }
- return new Object[0];
- }
-
- public void dispose()
- {
- // do nothing
- }
-
- public void inputChanged(final Viewer viewer, final Object oldInput,
- final Object newInput)
- {
- // do nothing
- }
-
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/utils/FavoriteConfigurations.java b/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/utils/FavoriteConfigurations.java
deleted file mode 100644
index aa7744b..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/utils/FavoriteConfigurations.java
+++ /dev/null
@@ -1,257 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.common.ui.internal.utils;
-
-import java.io.FileNotFoundException;
-import java.io.FileReader;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Properties;
-
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.jst.jsf.common.ui.JSFUICommonPlugin;
-import org.eclipse.jst.jsf.common.ui.internal.logging.Logger;
-import org.eclipse.ui.IMemento;
-import org.eclipse.ui.XMLMemento;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-
-/**
- * This provides a means to store common properties for pages.
- *
- * Holds a <code>List</code> of <code>Properties</code> which can be
- * manipulated by the user.
- *
- * @author mengbo
- */
-public class FavoriteConfigurations {
- private static Logger _log = JSFUICommonPlugin
- .getLogger(FavoriteConfigurations.class);
-
- private final static String FAV_EXTENSIONS = ".xml"; //$NON-NLS-1$
-
- private final static String ELEMENT_ROOT = "favorite"; //$NON-NLS-1$
-
- private final static String ELEMENT_CONFIG = "config"; //$NON-NLS-1$
-
- private final static String ELEMENT_NAME = "name"; //$NON-NLS-1$
-
- private final static String ELEMENT_PROPERTY = "property"; //$NON-NLS-1$
-
- private final static String ELEMENT_VALUE = "value"; //$NON-NLS-1$
-
- private Map _favorites;
-
- private IPath _favoriteFile;
-
- private String _favoriteName;
-
- /**
- * Constructor
- *
- * @param plugin
- * used for location of favorite file.
- * @param favoriteName
- * used for name of file and for mapping the properties of this
- * favorite.
- */
- public FavoriteConfigurations(AbstractUIPlugin plugin, String favoriteName) {
- super();
- _favoriteFile = plugin.getStateLocation().append(
- scanFileName(favoriteName) + FAV_EXTENSIONS);
- readFavorites();
- }
-
- /**
- * Returns the favorite entry that is mapped under the given name.
- *
- * @param name
- * the favorite
- * @return <code>Properties</code> config entry for the favorite.
- */
- public Properties getFavorite(String name) {
- return (Properties) _favorites.get(name);
- }
-
- /**
- * Stores the Favorites into the plugin directory.
- */
- public void saveFavorites() {
- FileWriter fw = null;
- try {
- XMLMemento memento = XMLMemento.createWriteRoot(ELEMENT_ROOT);
- for (Iterator it = _favorites.keySet().iterator(); it.hasNext();) {
- String favName = (String) it.next();
- Map props = new HashMap((Properties) _favorites.get(favName));
-
- IMemento config = memento.createChild(ELEMENT_CONFIG);
- config.putString(ELEMENT_NAME, favName);
-
- for (Iterator it1 = props.keySet().iterator(); it1.hasNext();) {
- IMemento entry = config.createChild(ELEMENT_PROPERTY);
- String name = (String) it1.next();
- entry.putString(ELEMENT_NAME, name);
- entry.putString(ELEMENT_VALUE, (String) props.get(name));
- }
- }
- fw = new FileWriter(_favoriteFile.toFile());
- memento.save(fw);
- } catch (Exception ee) {
- // log.FavoriteConfigurations.save.error=Failed to save {0}
- // favorites. File={1}
- _log.info("log.FavoriteConfigurations.save.error", _favoriteName, //$NON-NLS-1$
- _favoriteFile.toOSString(), ee);
- } finally {
- if (fw != null) {
- try {
- fw.close();
- } catch (IOException ee)// NOPMD
- {
- // nothing to do when IOException throwed in closing files.
- }
- }
- }
- }
-
- /**
- * Add the favorite into the internal structure but don't save until
- * saveFavorites() is called.
- *
- * @param name
- * @param config
- */
- public void addFavorite(String name, Properties config) {
- _favorites.put(name, config);
- }
-
- /**
- * Removes the Favorite that is mapped under the given name.
- *
- * @param name
- * the name of the configuration
- */
- public void removeFavorite(String name) {
- _favorites.remove(name);
- }
-
- /**
- * Read the favorites from the disk into the memory structure.
- */
- protected void readFavorites() {
- _favorites = new HashMap();
- FileReader fr = null;
- try {
- try {
- fr = new FileReader(_favoriteFile.toFile());
- } catch (FileNotFoundException ee)// NOPMD
- {
- // no error here since they don't have to have a favorites...
- }
- if (fr != null) {
- XMLMemento memento = XMLMemento.createReadRoot(fr);
- IMemento[] children = memento.getChildren(ELEMENT_CONFIG);
- for (int ii = 0; ii < children.length; ii++) {
- Properties props = new Properties();
- IMemento config = children[ii];
- String name = config.getString(ELEMENT_NAME);
-
- IMemento[] configProperties = config
- .getChildren(ELEMENT_PROPERTY);
- for (int jj = 0; jj < configProperties.length; jj++) {
- IMemento entry = configProperties[jj];
- setProperty(props, entry.getString(ELEMENT_NAME), entry
- .getString(ELEMENT_VALUE));
- }
- _favorites.put(name, props);
- }
- }
- } catch (Exception ee) {
- // log.FavoriteConfigurations.read.error=Failed to save {0}
- // favorites. File={1}
- _log.error("log.FavoriteConfigurations.read.error", _favoriteName, //$NON-NLS-1$
- _favoriteFile.toOSString(), ee);
- } finally {
- if (fr != null) {
- try {
- fr.close();
- } catch (IOException ee)// NOPMD
- {
- // nothing to do when IOException throwed in closing files.
- }
- }
- }
- }
-
- /**
- * Set the value in the properties object.
- *
- * @param props
- * @param name
- * @param value
- */
- private void setProperty(Properties props, String name, String value) {
- if (name != null && value != null) {
- props.setProperty(name, value);
- }
- }
-
- /**
- * Get a list of all the favorites stored in this file.
- *
- * @return list of favorites
- */
- public String[] getFavoritesList() {
- Object[] objs = _favorites.keySet().toArray();
- String[] names = new String[objs.length];
-
- for (int ii = 0; ii < objs.length; ii++) {
- names[ii] = (String) objs[ii];
- }
- Arrays.sort(names);
-
- return names;
- }
-
- /**
- * scan the file name for any bad character that would fail when trying to
- * create the file. We replace bad characters with '_'
- */
- private static String scanFileName(String filename) {
- StringBuffer strBuf = new StringBuffer();
- char[] chars = filename.toCharArray();
-
- for (int ii = 0; ii < chars.length; ii++) {
- switch (chars[ii]) {
- case '&':
- case '\\':
- case '/':
- case ' ':
- case '\t':
- case ':':
- case '.':
- case '\"':
- case '\'':
- case '@':
- strBuf.append('_');
- break;
- default:
- strBuf.append(chars[ii]);
- break;
- }
- }
-
- return strBuf.toString();
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/utils/JSFSharedImages.java b/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/utils/JSFSharedImages.java
deleted file mode 100644
index 2b67a67..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/utils/JSFSharedImages.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2008 Oracle Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Oracle Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.common.ui.internal.utils;
-
-/**
- * Constants that can be passed to JSFUICommonPlugin.getImageDescriptor and
- * getImage to obtain common images.
- *
- * @author cbateman
- *
- */
-public interface JSFSharedImages
-{
- /**
- * The icon use for default/unknown tags. Consists of blue open/close
- * angled braces on a neutral background.
- *
- * Size: 16x16
- */
- public final static String DEFAULT_PALETTE_TAG_IMG = "PD_Palette_Default.gif"; //$NON-NLS-1$
-
- /**
- * A yellow cube on a white background. Suitable for representing
- * generic objects and components.
- *
- * Size: 16x16
- */
- public final static String GENERIC_OBJECT_IMG = "object.gif"; //$NON-NLS-1$
-
- /**
- * A generic image suitable for representing JSF validators. Consists of
- * a white box with a blue check mark.
- *
- * Size: 16x16
- */
- public final static String GENERIC_VALIDATOR_IMG = "jsf_validator.gif"; //$NON-NLS-1$
-
- /**
- * A generic image suitable for representing JSF converter. Consists of
- * yellow blob being "converted".
- *
- * Size: 16x16
- */
- public final static String GENERIC_CONVERTER_IMG = "jsf_converter.gif"; //$NON-NLS-1$
-
- /**
- * A generic image suitable for representing a view root. Same as the
- * default image generally associated with f:view.
- *
- * Size: 16x16.
- */
- public static final String GENERIC_VIEWROOT_IMG = "jsf_view.gif"; //$NON-NLS-1$
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/utils/JavaModelUtil.java b/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/utils/JavaModelUtil.java
deleted file mode 100644
index c4086ed..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/utils/JavaModelUtil.java
+++ /dev/null
@@ -1,1032 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.common.ui.internal.utils;
-
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.Set;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jdt.core.ClasspathContainerInitializer;
-import org.eclipse.jdt.core.Flags;
-import org.eclipse.jdt.core.IClasspathContainer;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IField;
-import org.eclipse.jdt.core.IImportDeclaration;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IMember;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.IPackageFragment;
-import org.eclipse.jdt.core.IPackageFragmentRoot;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.ITypeHierarchy;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.core.Signature;
-import org.eclipse.jdt.core.compiler.CharOperation;
-
-/**
- * Original code is from JDT Utility methods for the Java Model.
- */
-public final class JavaModelUtil {
-
- /**
- * Finds a type by its qualified type name (dot separated).
- *
- * @param jproject
- * The java project to search in
- * @param fullyQualifiedName
- * The fully qualified name (type name with enclosing type names
- * and package (all separated by dots))
- * @return The type found, or null if not existing
- * @throws JavaModelException
- */
- public static IType findType(IJavaProject jproject,
- String fullyQualifiedName) throws JavaModelException {
- // workaround for bug 22883
- IType type = jproject.findType(fullyQualifiedName);
- if (type != null) {
- return type;
- }
- IPackageFragmentRoot[] roots = jproject.getPackageFragmentRoots();
- for (int i = 0; i < roots.length; i++) {
- IPackageFragmentRoot root = roots[i];
- type = findType(root, fullyQualifiedName);
- if (type != null && type.exists()) {
- return type;
- }
- }
- return null;
- }
-
- /**
- * Returns <code>true</code> if the given package fragment root is
- * referenced. This means it is own by a different project but is referenced
- * by the root's parent. Returns <code>false</code> if the given root
- * doesn't have an underlying resource.
- * @param root
- * @return true if root is referenced
- */
- public static boolean isReferenced(IPackageFragmentRoot root) {
- IResource resource = root.getResource();
- if (resource != null) {
- IProject jarProject = resource.getProject();
- IProject container = root.getJavaProject().getProject();
- return !container.equals(jarProject);
- }
- return false;
- }
-
- private static IType findType(IPackageFragmentRoot root,
- String fullyQualifiedName) throws JavaModelException {
- IJavaElement[] children = root.getChildren();
- for (int i = 0; i < children.length; i++) {
- IJavaElement element = children[i];
- if (element.getElementType() == IJavaElement.PACKAGE_FRAGMENT) {
- IPackageFragment pack = (IPackageFragment) element;
- if (!fullyQualifiedName.startsWith(pack.getElementName())) {
- continue;
- }
- IType type = findType(pack, fullyQualifiedName);
- if (type != null && type.exists()) {
- return type;
- }
- }
- }
- return null;
- }
-
- private static IType findType(IPackageFragment pack,
- String fullyQualifiedName) throws JavaModelException {
- ICompilationUnit[] cus = pack.getCompilationUnits();
- for (int i = 0; i < cus.length; i++) {
- ICompilationUnit unit = cus[i];
- IType type = findType(unit, fullyQualifiedName);
- if (type != null && type.exists()) {
- return type;
- }
- }
- return null;
- }
-
- private static IType findType(ICompilationUnit cu, String fullyQualifiedName)
- throws JavaModelException {
- IType[] types = cu.getAllTypes();
- for (int i = 0; i < types.length; i++) {
- IType type = types[i];
- if (getFullyQualifiedName(type).equals(fullyQualifiedName)) {
- return type;
- }
- }
- return null;
- }
-
- /**
- * Finds a type by package and type name.
- *
- * @param jproject
- * the java project to search in
- * @param pack
- * The package name
- * @param typeQualifiedName
- * the type qualified name (type name with enclosing type names
- * (separated by dots))
- * @return the type found, or null if not existing
- * @throws JavaModelException
- * @deprecated Use IJavaProject.findType(String, String) instead
- */
- public static IType findType(IJavaProject jproject, String pack,
- String typeQualifiedName) throws JavaModelException {
- return jproject.findType(pack, typeQualifiedName);
- }
-
- /**
- * Finds a type container by container name. The returned element will be of
- * type <code>IType</code> or a <code>IPackageFragment</code>.
- * <code>null</code> is returned if the type container could not be found.
- *
- * @param jproject
- * The Java project defining the context to search
- * @param typeContainerName
- * A dot separarted name of the type container
- * @return the java element
- * @throws JavaModelException
- * @see #getTypeContainerName(IType)
- */
- public static IJavaElement findTypeContainer(IJavaProject jproject,
- String typeContainerName) throws JavaModelException {
- // try to find it as type
- IJavaElement result = jproject.findType(typeContainerName);
- if (result == null) {
- // find it as package
- IPath path = new Path(typeContainerName.replace('.', '/'));
- result = jproject.findElement(path);
- if (!(result instanceof IPackageFragment)) {
- result = null;
- }
-
- }
- return result;
- }
-
- /**
- * Finds a type in a compilation unit. Typical usage is to find the
- * corresponding type in a working copy.
- *
- * @param cu
- * the compilation unit to search in
- * @param typeQualifiedName
- * the type qualified name (type name with enclosing type names
- * (separated by dots))
- * @return the type found, or null if not existing
- * @throws JavaModelException
- */
- public static IType findTypeInCompilationUnit(ICompilationUnit cu,
- String typeQualifiedName) throws JavaModelException {
- IType[] types = cu.getAllTypes();
- for (int i = 0; i < types.length; i++) {
- String currName = getTypeQualifiedName(types[i]);
- if (typeQualifiedName.equals(currName)) {
- return types[i];
- }
- }
- return null;
- }
-
- /**
- * Finds a a member in a compilation unit. Typical usage is to find the
- * corresponding member in a working copy.
- *
- * @param cu
- * the compilation unit (eg. working copy) to search in
- * @param member
- * the member (eg. from the original)
- * @return the member found, or null if not existing
- */
- public static IMember findMemberInCompilationUnit(ICompilationUnit cu,
- IMember member) {
- IJavaElement[] elements = cu.findElements(member);
- if (elements != null && elements.length > 0) {
- return (IMember) elements[0];
- }
- return null;
- }
-
- /**
- * Returns the element of the given compilation unit which is "equal" to the
- * given element. Note that the given element usually has a parent different
- * from the given compilation unit.
- *
- * @param cu
- * the cu to search in
- * @param element
- * the element to look for
- * @return an element of the given cu "equal" to the given element
- */
- public static IJavaElement findInCompilationUnit(ICompilationUnit cu,
- IJavaElement element) {
- IJavaElement[] elements = cu.findElements(element);
- if (elements != null && elements.length > 0) {
- return elements[0];
- }
- return null;
- }
-
- /**
- * Returns the qualified type name of the given type using '.' as
- * separators. This is a replace for IType.getTypeQualifiedName() which uses
- * '$' as separators. As '$' is also a valid character in an id this is
- * ambiguous. JavaCore PR: 1GCFUNT
- * @param type
- * @return the type qualified name
- */
- public static String getTypeQualifiedName(IType type) {
- return type.getTypeQualifiedName('.');
- }
-
- /**
- * Returns the fully qualified name of the given type using '.' as
- * separators. This is a replace for IType.getFullyQualifiedTypeName which
- * uses '$' as separators. As '$' is also a valid character in an id this is
- * ambiguous. JavaCore PR: 1GCFUNT
- * @param type
- * @return the fully qualified name using . as the separator
- */
- public static String getFullyQualifiedName(IType type) {
- return type.getFullyQualifiedName('.');
- }
-
- /**
- * Returns the fully qualified name of a type's container. (package name or
- * enclosing type name)
- * @param type
- * @return the container name
- */
- public static String getTypeContainerName(IType type) {
- IType outerType = type.getDeclaringType();
- if (outerType != null) {
- return outerType.getFullyQualifiedName('.');
- }
- return type.getPackageFragment().getElementName();
- }
-
- /**
- * Concatenates two names. Uses a dot for separation. Both strings can be
- * empty or <code>null</code>.
- * @param name1
- * @param name2
- * @return name1 + name2
- */
- public static String concatenateName(String name1, String name2) {
- StringBuffer buf = new StringBuffer();
- if (name1 != null && name1.length() > 0) {
- buf.append(name1);
- }
- if (name2 != null && name2.length() > 0) {
- if (buf.length() > 0) {
- buf.append('.');
- }
- buf.append(name2);
- }
- return buf.toString();
- }
-
- /**
- * Concatenates two names. Uses a dot for separation. Both strings can be
- * empty or <code>null</code>.
- * @param name1
- * @param name2
- * @return name1 + name2
- */
- public static String concatenateName(char[] name1, char[] name2) {
- StringBuffer buf = new StringBuffer();
- if (name1 != null && name1.length > 0) {
- buf.append(name1);
- }
- if (name2 != null && name2.length > 0) {
- if (buf.length() > 0) {
- buf.append('.');
- }
- buf.append(name2);
- }
- return buf.toString();
- }
-
- /**
- * Evaluates if a member (possible from another package) is visible from
- * elements in a package.
- *
- * @param member
- * The member to test the visibility for
- * @param pack
- * The package in focus
- * @return true if visible
- * @throws JavaModelException
- */
- public static boolean isVisible(IMember member, IPackageFragment pack)
- throws JavaModelException {
-
- int type = member.getElementType();
- if (type == IJavaElement.INITIALIZER
- || (type == IJavaElement.METHOD && member.getElementName()
- .startsWith("<"))) { //$NON-NLS-1$
- //$NON-NLS-1$
- return false;
- }
-
- int otherflags = member.getFlags();
- IType declaringType = member.getDeclaringType();
- if (Flags.isPublic(otherflags)
- || (declaringType != null && declaringType.isInterface())) {
- return true;
- } else if (Flags.isPrivate(otherflags)) {
- return false;
- }
-
- IPackageFragment otherpack = (IPackageFragment) findParentOfKind(
- member, IJavaElement.PACKAGE_FRAGMENT);
- return (pack != null && otherpack != null && isSamePackage(pack,
- otherpack));
- }
-
- /**
- * Evaluates if a member in the focus' element hierarchy is visible from
- * elements in a package.
- *
- * @param member
- * The member to test the visibility for
- * @param pack
- * The package of the focus element focus
- * @return true if is visible in hiearchy
- * @throws JavaModelException
- */
- public static boolean isVisibleInHierarchy(IMember member,
- IPackageFragment pack) throws JavaModelException {
- int type = member.getElementType();
- if (type == IJavaElement.INITIALIZER
- || (type == IJavaElement.METHOD && member.getElementName()
- .startsWith("<"))) { //$NON-NLS-1$
- //$NON-NLS-1$
- return false;
- }
-
- int otherflags = member.getFlags();
-
- IType declaringType = member.getDeclaringType();
- if (Flags.isPublic(otherflags) || Flags.isProtected(otherflags)
- || (declaringType != null && declaringType.isInterface())) {
- return true;
- } else if (Flags.isPrivate(otherflags)) {
- return false;
- }
-
- IPackageFragment otherpack = (IPackageFragment) findParentOfKind(
- member, IJavaElement.PACKAGE_FRAGMENT);
- return (pack != null && pack.equals(otherpack));
- }
-
- /**
- * Returns the package fragment root of <code>IJavaElement</code>. If the
- * given element is already a package fragment root, the element itself is
- * returned.
- * @param element
- * @return the package fragment root
- */
- public static IPackageFragmentRoot getPackageFragmentRoot(
- IJavaElement element) {
- return (IPackageFragmentRoot) element
- .getAncestor(IJavaElement.PACKAGE_FRAGMENT_ROOT);
- }
-
- /**
- * Returns the parent of the supplied java element that conforms to the
- * given parent type or <code>null</code>, if such a parent doesn't exit.
- *
- * @deprecated Use element.getParent().getAncestor(kind);
- */
- private static IJavaElement findParentOfKind(IJavaElement element, int kind) {
- if (element != null && element.getParent() != null) {
- return element.getParent().getAncestor(kind);
- }
- return null;
- }
-
- /**
- * Finds a method in a type. This searches for a method with the same name
- * and signature. Parameter types are only compared by the simple name, no
- * resolving for the fully qualified type name is done. Constructors are
- * only compared by parameters, not the name.
- *
- * @param name
- * The name of the method to find
- * @param paramTypes
- * The type signatures of the parameters e.g.
- * <code>{"QString;","I"}</code>
- * @param isConstructor
- * If the method is a constructor
- * @param type
- * @return The first found method or <code>null</code>, if nothing found
- * @throws JavaModelException
- */
- public static IMethod findMethod(String name, String[] paramTypes,
- boolean isConstructor, IType type) throws JavaModelException {
- return findMethod(name, paramTypes, isConstructor, type.getMethods());
- }
-
- /**
- * Finds a method by name. This searches for a method with a name and
- * signature. Parameter types are only compared by the simple name, no
- * resolving for the fully qualified type name is done. Constructors are
- * only compared by parameters, not the name.
- *
- * @param name
- * The name of the method to find
- * @param paramTypes
- * The type signatures of the parameters e.g.
- * <code>{"QString;","I"}</code>
- * @param isConstructor
- * If the method is a constructor
- * @param methods
- * The methods to search in
- * @return The found method or <code>null</code>, if nothing found
- * @throws JavaModelException
- */
- public static IMethod findMethod(String name, String[] paramTypes,
- boolean isConstructor, IMethod[] methods) throws JavaModelException {
- for (int i = methods.length - 1; i >= 0; i--) {
- if (isSameMethodSignature(name, paramTypes, isConstructor,
- methods[i])) {
- return methods[i];
- }
- }
- return null;
- }
-
- /**
- * Finds a method declararion in a type's hierarchy. The search is top down,
- * so this returns the first declaration of the method in the hierarchy.
- * This searches for a method with a name and signature. Parameter types are
- * only compared by the simple name, no resolving for the fully qualified
- * type name is done. Constructors are only compared by parameters, not the
- * name.
- * @param hierarchy
- *
- * @param type
- * Searches in this type's supertypes.
- * @param name
- * The name of the method to find
- * @param paramTypes
- * The type signatures of the parameters e.g.
- * <code>{"QString;","I"}</code>
- * @param isConstructor
- * If the method is a constructor
- * @return The first method found or null, if nothing found
- * @throws JavaModelException
- */
- public static IMethod findMethodDeclarationInHierarchy(
- ITypeHierarchy hierarchy, IType type, String name,
- String[] paramTypes, boolean isConstructor)
- throws JavaModelException {
- IType[] superTypes = hierarchy.getAllSupertypes(type);
- for (int i = superTypes.length - 1; i >= 0; i--) {
- IMethod first = findMethod(name, paramTypes, isConstructor,
- superTypes[i]);
- if (first != null && !Flags.isPrivate(first.getFlags())) {
- // the order getAllSupertypes does make assumptions of the order
- // of inner elements -> search recursivly
- IMethod res = findMethodDeclarationInHierarchy(hierarchy, first
- .getDeclaringType(), name, paramTypes, isConstructor);
- if (res != null) {
- return res;
- }
- return first;
- }
- }
- return null;
- }
-
- /**
- * Finds a method implementation in a type's classhierarchy. The search is
- * bottom-up, so this returns the nearest overridden method. Does not find
- * methods in interfaces or abstract methods. This searches for a method
- * with a name and signature. Parameter types are only compared by the
- * simple name, no resolving for the fully qualified type name is done.
- * Constructors are only compared by parameters, not the name.
- * @param hierarchy
- *
- * @param type
- * Type to search the superclasses
- * @param name
- * The name of the method to find
- * @param paramTypes
- * The type signatures of the parameters e.g.
- * <code>{"QString;","I"}</code>
- * @param isConstructor
- * If the method is a constructor
- * @return The first method found or null, if nothing found
- * @throws JavaModelException
- */
- public static IMethod findMethodImplementationInHierarchy(
- ITypeHierarchy hierarchy, IType type, String name,
- String[] paramTypes, boolean isConstructor)
- throws JavaModelException {
- IType[] superTypes = hierarchy.getAllSuperclasses(type);
- for (int i = 0; i < superTypes.length; i++) {
- IMethod found = findMethod(name, paramTypes, isConstructor,
- superTypes[i]);
- if (found != null) {
- if (Flags.isAbstract(found.getFlags())) {
- return null;
- }
- return found;
- }
- }
- return null;
- }
-
- private static IMethod findMethodInHierarchy(ITypeHierarchy hierarchy,
- IType type, String name, String[] paramTypes, boolean isConstructor)
- throws JavaModelException {
- IMethod method = findMethod(name, paramTypes, isConstructor, type);
- if (method != null) {
- return method;
- }
- IType superClass = hierarchy.getSuperclass(type);
- if (superClass != null) {
- IMethod res = findMethodInHierarchy(hierarchy, superClass, name,
- paramTypes, isConstructor);
- if (res != null) {
- return res;
- }
- }
- if (!isConstructor) {
- IType[] superInterfaces = hierarchy.getSuperInterfaces(type);
- for (int i = 0; i < superInterfaces.length; i++) {
- IMethod res = findMethodInHierarchy(hierarchy,
- superInterfaces[i], name, paramTypes, false);
- if (res != null) {
- return res;
- }
- }
- }
- return method;
- }
-
- /**
- * Finds the method that is defines/declares the given method. The search is
- * bottom-up, so this returns the nearest defining/declaring method.
- * @param typeHierarchy
- * @param type
- * @param methodName
- * @param paramTypes
- * @param isConstructor
- *
- * @param testVisibility
- * If true the result is tested on visibility. Null is returned
- * if the method is not visible.
- * @return the method or null
- * @throws JavaModelException
- */
- public static IMethod findMethodDefininition(ITypeHierarchy typeHierarchy,
- IType type, String methodName, String[] paramTypes,
- boolean isConstructor, boolean testVisibility)
- throws JavaModelException {
- IType superClass = typeHierarchy.getSuperclass(type);
- if (superClass != null) {
- IMethod res = findMethodInHierarchy(typeHierarchy, superClass,
- methodName, paramTypes, isConstructor);
- if (res != null && !Flags.isPrivate(res.getFlags())) {
- if (!testVisibility
- || isVisibleInHierarchy(res, type.getPackageFragment())) {
- return res;
- }
- }
- }
- if (!isConstructor) {
- IType[] interfaces = typeHierarchy.getSuperInterfaces(type);
- for (int i = 0; i < interfaces.length; i++) {
- IMethod res = findMethodInHierarchy(typeHierarchy,
- interfaces[i], methodName, paramTypes, false);
- if (res != null) {
- return res; // methods from interfaces are always public and
- // therefore visible
- }
- }
- }
- return null;
- }
-
- /**
- * Tests if a method equals to the given signature. Parameter types are only
- * compared by the simple name, no resolving for the fully qualified type
- * name is done. Constructors are only compared by parameters, not the name.
- *
- * @param name
- * Name of the method
- * @param paramTypes
- * The type signatures of the parameters e.g.
- * <code>{"QString;","I"}</code>
- * @param isConstructor
- * Specifies if the method is a constructor
- * @param curr
- * @return Returns <code>true</code> if the method has the given name and
- * parameter types and constructor state.
- * @throws JavaModelException
- */
- public static boolean isSameMethodSignature(String name,
- String[] paramTypes, boolean isConstructor, IMethod curr)
- throws JavaModelException {
- if (isConstructor || name.equals(curr.getElementName())) {
- if (isConstructor == curr.isConstructor()) {
- String[] currParamTypes = curr.getParameterTypes();
- if (paramTypes.length == currParamTypes.length) {
- for (int i = 0; i < paramTypes.length; i++) {
- String t1 = Signature.getSimpleName(Signature
- .toString(paramTypes[i]));
- String t2 = Signature.getSimpleName(Signature
- .toString(currParamTypes[i]));
- if (!t1.equals(t2)) {
- return false;
- }
- }
- return true;
- }
- }
- }
- return false;
- }
-
- /**
- * Tests if two <code>IPackageFragment</code>s represent the same logical
- * java package.
- * @param pack1
- * @param pack2
- *
- * @return <code>true</code> if the package fragments' names are equal.
- */
- public static boolean isSamePackage(IPackageFragment pack1,
- IPackageFragment pack2) {
- return pack1.getElementName().equals(pack2.getElementName());
- }
-
- /**
- * Checks whether the given type has a valid main method or not.
- * @param type
- * @return true if type has a main method
- * @throws JavaModelException
- */
- public static boolean hasMainMethod(IType type) throws JavaModelException {
- IMethod[] methods = type.getMethods();
- for (int i = 0; i < methods.length; i++) {
- if (methods[i].isMainMethod()) {
- return true;
- }
- }
- return false;
- }
-
- /**
- * Checks if the field is boolean.
- * @param field
- * @return true if the file is of primitive boolean type
- * @throws JavaModelException
- */
- public static boolean isBoolean(IField field) throws JavaModelException {
- return field.getTypeSignature().equals(Signature.SIG_BOOLEAN);
- }
-
- /**
- * Tests if the given element is on the class path of its containing
- * project. Handles the case that the containing project isn't a Java
- * project.
- * @param element
- * @return true if element in on the class path?
- */
- public static boolean isOnClasspath(IJavaElement element) {
- IJavaProject project = element.getJavaProject();
- if (!project.exists())
- return false;
- return project.isOnClasspath(element);
- }
-
- /**
- * Resolves a type name in the context of the declaring type.
- *
- * @param refTypeSig
- * the type name in signature notation (for example 'QVector')
- * this can also be an array type, but dimensions will be
- * ignored.
- * @param declaringType
- * the context for resolving (type where the reference was made
- * in)
- * @return returns the fully qualified type name or build-in-type name. if a
- * unresoved type couldn't be resolved null is returned
- * @throws JavaModelException
- */
- public static String getResolvedTypeName(String refTypeSig,
- IType declaringType) throws JavaModelException {
- int arrayCount = Signature.getArrayCount(refTypeSig);
- char type = refTypeSig.charAt(arrayCount);
- if (type == Signature.C_UNRESOLVED) {
- int semi = refTypeSig
- .indexOf(Signature.C_SEMICOLON, arrayCount + 1);
- if (semi == -1) {
- throw new IllegalArgumentException();
- }
- String name = refTypeSig.substring(arrayCount + 1, semi);
-
- String[][] resolvedNames = declaringType.resolveType(name);
- if (resolvedNames != null && resolvedNames.length > 0) {
- return JavaModelUtil.concatenateName(resolvedNames[0][0],
- resolvedNames[0][1]);
- }
- return null;
- }
- return Signature.toString(refTypeSig.substring(arrayCount));
- }
-
- /**
- * Returns if a CU can be edited.
- * @param cu
- * @return true if cu is editable
- */
- public static boolean isEditable(ICompilationUnit cu) {
- IResource resource = toOriginal(cu).getResource();
- return (resource.exists() && !resource.getResourceAttributes()
- .isReadOnly());
- }
-
- /**
- * Finds a qualified import for a type name.
- * @param cu
- * @param simpleName
- * @return the import declaration or null
- * @throws JavaModelException
- */
- public static IImportDeclaration findImport(ICompilationUnit cu,
- String simpleName) throws JavaModelException {
- IImportDeclaration[] existing = cu.getImports();
- for (int i = 0; i < existing.length; i++) {
- String curr = existing[i].getElementName();
- if (curr.endsWith(simpleName)) {
- int dotPos = curr.length() - simpleName.length() - 1;
- if ((dotPos == -1)
- || (dotPos > 0 && curr.charAt(dotPos) == '.')) {
- return existing[i];
- }
- }
- }
- return null;
- }
-
- /**
- * Returns the original if the given member. If the member is already an
- * original the input is returned. The returned member might not exist
- * @param member
- * @return the original IMember
- */
- public static IMember toOriginal(IMember member) {
- if (member instanceof IMethod) {
- return toOriginalMethod((IMethod) member);
- }
-
- return (IMember) member.getPrimaryElement();
- /*
- * ICompilationUnit cu= member.getCompilationUnit(); if (cu != null &&
- * cu.isWorkingCopy()) return (IMember)cu.getOriginal(member); return
- * member;
- */
- }
-
- /*
- * XXX workaround for bug 18568
- * http://bugs.eclipse.org/bugs/show_bug.cgi?id=18568 to be removed once the
- * bug is fixed
- */
- private static IMethod toOriginalMethod(IMethod method) {
- ICompilationUnit cu = method.getCompilationUnit();
- if (cu == null || isPrimary(cu)) {
- return method;
- }
- try {
- // use the workaround only if needed
- if (!method.getElementName().equals(
- method.getDeclaringType().getElementName()))
- return (IMethod) method.getPrimaryElement();
-
- IType originalType = (IType) toOriginal(method.getDeclaringType());
- IMethod[] methods = originalType.findMethods(method);
- boolean isConstructor = method.isConstructor();
- for (int i = 0; i < methods.length; i++) {
- if (methods[i].isConstructor() == isConstructor)
- return methods[i];
- }
- return null;
- } catch (JavaModelException e) {
- return null;
- }
- }
-
- // private static boolean PRIMARY_ONLY = false;
-
- /**
- * Returns the original cu if the given cu is a working copy. If the cu is
- * already an original the input cu is returned. The returned cu might not
- * exist
- * @param cu
- * @return the original compiliation unit
- */
- public static ICompilationUnit toOriginal(ICompilationUnit cu) {
- // To stay compatible with old version returned null
- // if cu is null
- if (cu == null)
- return cu;
- return cu.getPrimary();
- }
-
- /**
- * Returns the original element if the given element is a working copy. If
- * the cu is already an original the input element is returned. The returned
- * element might not exist
- * @param element
- * @return element's primary element
- */
- public static IJavaElement toOriginal(IJavaElement element) {
- return element.getPrimaryElement();
- }
-
- /**
- * Returns true if a cu is a primary cu (original or shared working copy)
- * @param cu
- * @return true if cu is primary
- */
- public static boolean isPrimary(ICompilationUnit cu) {
- return cu.getOwner() == null;
- }
-
- /**
- * http://bugs.eclipse.org/bugs/show_bug.cgi?id=19253
- *
- * Reconciling happens in a separate thread. This can cause a situation
- * where the Java element gets disposed after an exists test has been done.
- * So we should not log not present exceptions when they happen in working
- * copies.
- * @param exception
- * @return true if filter not present
- */
- public static boolean filterNotPresentException(CoreException exception) {
- if (!(exception instanceof JavaModelException)) {
- return true;
- }
- JavaModelException je = (JavaModelException) exception;
- if (!je.isDoesNotExist()) {
- return true;
- }
- IJavaElement[] elements = je.getJavaModelStatus().getElements();
- for (int i = 0; i < elements.length; i++) {
- IJavaElement element = elements[i];
- ICompilationUnit unit = (ICompilationUnit) element
- .getAncestor(IJavaElement.COMPILATION_UNIT);
- if (unit == null) {
- return true;
- }
- if (!unit.isWorkingCopy()) {
- return true;
- }
- }
- return false;
- }
-
- /**
- * @param type
- * @param pm
- * @return all supertypes of type
- * @throws JavaModelException
- */
- public static IType[] getAllSuperTypes(IType type, IProgressMonitor pm)
- throws JavaModelException {
- // workaround for 23656
- Set types = new HashSet(Arrays.asList(type.newSupertypeHierarchy(pm)
- .getAllSupertypes(type)));
- IType objekt = type.getJavaProject().findType("java.lang.Object");//$NON-NLS-1$
- if (objekt != null) {
- types.add(objekt);
- }
- return (IType[]) types.toArray(new IType[types.size()]);
- }
-
- /**
- * @param resourcePath
- * @param exclusionPatterns
- * @return true if resourcePath is excluded by exclusion patterns
- */
- public static boolean isExcludedPath(IPath resourcePath,
- IPath[] exclusionPatterns) {
- char[] path = resourcePath.toString().toCharArray();
- for (int i = 0, length = exclusionPatterns.length; i < length; i++) {
- char[] pattern = exclusionPatterns[i].toString().toCharArray();
- if (CharOperation.pathMatch(pattern, path, true, '/')) {
- return true;
- }
- }
- return false;
- }
-
- /*
-
- * @see IClasspathEntry#getExclusionPatterns
- */
- /**
- * Returns whether the given resource path matches one of the exclusion
- * patterns.
- *
- * @param resourcePath
- * @param exclusionPatterns
- * @return true if resourcePath is excluded
- */
- public static boolean isExcluded(IPath resourcePath,
- char[][] exclusionPatterns) {
- if (exclusionPatterns == null) {
- return false;
- }
- char[] path = resourcePath.toString().toCharArray();
- for (int i = 0, length = exclusionPatterns.length; i < length; i++) {
- if (CharOperation.pathMatch(exclusionPatterns[i], path, true, '/')) {
- return true;
- }
- }
- return false;
- }
-
- private static Boolean fgIsJDTCore_1_5 = null;
-
- /**
- * @return true if JRE 1.5 in enabled.
- */
- public static boolean isJDTCore_1_5() {
- if (fgIsJDTCore_1_5 == null) {
- fgIsJDTCore_1_5 = JavaCore
- .getDefaultOptions()
- .containsKey(
- "org.eclipse.jdt.core.compiler.problem.unsafeTypeOperation") ? Boolean.TRUE //$NON-NLS-1$
- : Boolean.FALSE;
- }
- return fgIsJDTCore_1_5.booleanValue();
- }
-
- /**
- * Helper method that tests if an classpath entry can be found in a
- * container. <code>null</code> is returned if the entry can not be found
- * or if the container does not allows the configuration of source
- * attachments
- *
- * @param jproject
- * The container's parent project
- * @param containerPath
- * The path of the container
- * @param libPath
- * The path of the library to be found
- * @return IClasspathEntry A classpath entry from the container of
- * <code>null</code> if the container can not be modified.
- * @throws JavaModelException
- */
- public static IClasspathEntry getClasspathEntryToEdit(
- IJavaProject jproject, IPath containerPath, IPath libPath)
- throws JavaModelException {
- IClasspathContainer container = JavaCore.getClasspathContainer(
- containerPath, jproject);
- ClasspathContainerInitializer initializer = JavaCore
- .getClasspathContainerInitializer(containerPath.segment(0));
- if (container != null
- && initializer != null
- && initializer.canUpdateClasspathContainer(containerPath,
- jproject)) {
- IClasspathEntry[] entries = container.getClasspathEntries();
- for (int i = 0; i < entries.length; i++) {
- IClasspathEntry curr = entries[i];
- IClasspathEntry resolved = JavaCore
- .getResolvedClasspathEntry(curr);
- if (resolved != null && libPath.equals(resolved.getPath())) {
- return curr; // return the real entry
- }
- }
- }
- return null; // attachment not possible
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/utils/PathUtil.java b/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/utils/PathUtil.java
deleted file mode 100644
index 8eebe90..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/utils/PathUtil.java
+++ /dev/null
@@ -1,307 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.common.ui.internal.utils;
-
-import java.io.File;
-import java.util.StringTokenizer;
-
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.core.IJarEntryResource;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jst.jsf.common.ui.IFileFolderConstants;
-import org.eclipse.ui.IFileEditorInput;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.PlatformUI;
-
-/**
- * Collection of helper methods to manage and convert links Originally part of
- * the LinksManager (com.ibm.iwt.parser.util)
- */
-public final class PathUtil {
- private static final String FORWARD_SLASH = "/"; //$NON-NLS-1$
-
- private static final String RELATIVE_PATH_SIGNAL = IFileFolderConstants.DOT
- + IFileFolderConstants.DOT + IFileFolderConstants.PATH_SEPARATOR;
-
- /**
- * adjust relative path isside the absolute path
- * @param path
- * @return the adjusted path
- */
- public static String adjustPath(String path) {
- int i = 0;
- while ((i = path.indexOf(RELATIVE_PATH_SIGNAL)) > 0) {
- // split the string into two
- String part1 = path.substring(0, i - 1);
- String part2 = path
- .substring(i + RELATIVE_PATH_SIGNAL.length() - 1);
- // strip one path seg from part1
- int j = part1.lastIndexOf(FORWARD_SLASH);
- if (j == -1) {
- return "";//$NON-NLS-1$
- }
- part1 = part1.substring(0, j);
- path = part1 + part2;
- }
- return path;
- }
-
- /**
- * Append trailing url slash if needed
- * @param input
- * @return the string
- */
- public static String appendTrailingURLSlash(String input) {
- // check to see already a slash
- if (!input.endsWith(FORWARD_SLASH)) {
- input += FORWARD_SLASH;
- }
- return input;
- }
-
- /**
- * Convert to relative url based on base
- * @param input
- * @param base
- * @return the string
- */
- public static String convertToRelativePath(String input, String base) {
- // tokenize the strings
- StringTokenizer inputTokenizer = new StringTokenizer(input,
- FORWARD_SLASH);
- StringTokenizer baseTokenizer = new StringTokenizer(base, FORWARD_SLASH);
- String token1 = "", token2 = "";//$NON-NLS-2$//$NON-NLS-1$
- //
- // Go through until equls
- while (true) {
- if (!inputTokenizer.hasMoreTokens()
- || !baseTokenizer.hasMoreTokens()) {
- break;
- }
- token1 = baseTokenizer.nextToken();
- token2 = inputTokenizer.nextToken();
- if (!token1.equals(token2)) {
- break;
- }
- }
- // now generate the backs
- String output = "";//$NON-NLS-1$
- while (baseTokenizer.hasMoreTokens()) {
- baseTokenizer.nextToken();
- output += RELATIVE_PATH_SIGNAL;
- }
- output += token2;
- // generate the rest
- while (inputTokenizer.hasMoreTokens()) {
- output = output + FORWARD_SLASH + inputTokenizer.nextToken();
- }
- return output;
- }
-
- /**
- * @param projectName
- * @param path
- * @return the path in the project converted to a path relative to the
- * web folder
- */
- public static String convertToWebPath(String projectName, String path) {
- String name = ""; //$NON-NLS-1$
- IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(
- projectName);
- String webrootName = WebrootUtil.getWebContentFolder(project).getName();
-
- if (path.indexOf(webrootName) != -1) {
- name = projectName + IFileFolderConstants.PATH_SEPARATOR
- + webrootName;
- } else {
- name = projectName;
- }
- int index = path.indexOf(projectName);
-
- return path.substring(index + name.length());
- }
-
- /**
- * convert path relative to current active file to absolute path in
- * filesystem
- *
- * @param uri
- * the relative path
- * @param curFile
- * @return absolute path in file system
- */
- public static String convertToAbsolutePath(String uri, IFile curFile) {
- if (uri == null || uri.trim().equals("")) { //$NON-NLS-1$
- return uri;
- }
- String webroot = ""; //$NON-NLS-1$
- IFile jsp = curFile;
- try {
- if (jsp == null) {
- jsp = ((IFileEditorInput) getActivePage()
- .getActiveEditor().getEditorInput()).getFile();
- }
- if (jsp != null) {
- String webrootName = WebrootUtil.getWebContentFolder(
- jsp.getProject()).getName();
- webroot = jsp.getProject().getFolder(webrootName).getLocation()
- .toString();
- }
- } catch (NullPointerException e) {
- return uri;
- }
- if (uri.startsWith(IFileFolderConstants.PATH_SEPARATOR))
- {
- return webroot + uri;
- }
- if (jsp != null) {
- IContainer con = jsp.getParent();
- if (con != null) {
- IPath path = con.getLocation();
- if (path != null) {
- String aPath = path.toString() + File.separator + uri;
- aPath = aPath.replace('/', File.separatorChar);
- aPath = aPath.replace('\\', File.separatorChar);
- if (aPath.endsWith(File.separator)) {
- aPath += IFileFolderConstants.PATH_SEPARATOR;
- }
- File file = new File(aPath);
- if (file.exists() && file.isFile()) {
- return file.getAbsolutePath();
- }
- return uri;
- }
- }
- }
- return uri;
- }
-
- /**
- * Returns the active workbench window.
- *
- * @return the active workbench window. this can be null but I've never seen
- * it.
- */
- private static IWorkbenchWindow getActiveWorkbenchWindow() {
- if (PlatformUI.getWorkbench() == null) {
- return null;
- }
- return PlatformUI.getWorkbench().getActiveWorkbenchWindow();
- }
-
- /**
- * Returns the active workbench page. Note that the active page may not be
- * the one that the user perceives as active in some situations so this
- * method of obtaining the activate page should only be used if no other
- * method is available.
- *
- * @return the active workbench page
- */
- private static IWorkbenchPage getActivePage() {
- IWorkbenchWindow window = getActiveWorkbenchWindow();
- if (window == null) {
- return null;
- }
- return window.getActivePage();
- }
- /**
- * @param javaProject
- * @param parent
- * @return the IPath for a a classpath object (?)
- */
- public static IPath getPathOnClasspath(IJavaProject javaProject,
- Object parent) {
- IPath result = null;
- if (javaProject == null || parent == null) {
- return new Path(""); //$NON-NLS-1$
- }
- IClasspathEntry[] entries = javaProject.readRawClasspath();
- IPath classPath = null;
- if (parent instanceof IResource) {
- if (((javaProject != null) && !javaProject
- .isOnClasspath((IResource) parent))) {
- return new Path(""); //$NON-NLS-1$
- }
- if (parent instanceof IFile) {
- IPath elementPath = ((IFile) parent).getFullPath();
- if (((IFile) parent).getFileExtension().equalsIgnoreCase(
- IFileFolderConstants.EXT_PROPERTIES)) {
- int machings = 0;
- try {
- for (int i = 0; i < entries.length; i++) {
- // Determine whether on this classentry's path
- int n = entries[i].getPath().matchingFirstSegments(
- elementPath);
- if (n > machings) {
- // Get package name
- machings = n;
- classPath = elementPath.removeFirstSegments(
- machings).removeLastSegments(1);
- }
- }
-
- // Not on the classpath?
- if (classPath == null) {
- return null;
- } else if (classPath.segmentCount() > 0) {
- IJavaElement element = javaProject
- .findElement(classPath);
- if (element != null) {
- IPath path = element.getPath();
- if (path != null) {
- IPath path1 = path
- .removeFirstSegments(machings);
-
- String fileName = ((IFile) parent)
- .getName();
- if (fileName != null) {
- result = path1.append(fileName);
- }
- }
- }
-
- } else {
- result = ((IFile) parent).getFullPath()
- .removeFirstSegments(machings);
- }
- } catch (Exception e) {
- return null;
- }
- }
- }
- } else if (parent instanceof IJarEntryResource) {
- IPath elementPath = ((IJarEntryResource) parent).getFullPath();
- if (elementPath.getFileExtension().equalsIgnoreCase(
- IFileFolderConstants.EXT_PROPERTIES)) {
- result = elementPath;
- }
- }
- if (result != null) {
- return result;
- }
- return new Path(""); //$NON-NLS-1$
- }
-
- private PathUtil()
- {
- // utility class, no instantiation
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/utils/PixelConverter.java b/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/utils/PixelConverter.java
deleted file mode 100644
index 48d5b37..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/utils/PixelConverter.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- * Oracle -- copied into common ui codebase for JSF use
- *******************************************************************************/
-package org.eclipse.jst.jsf.common.ui.internal.utils;
-
-import org.eclipse.swt.graphics.Font;
-import org.eclipse.swt.graphics.FontMetrics;
-import org.eclipse.swt.graphics.GC;
-import org.eclipse.swt.widgets.Control;
-
-import org.eclipse.jface.dialogs.Dialog;
-
-/**
- * @author cbateman
- *
- */
-public class PixelConverter {
-
- private final FontMetrics fFontMetrics;
-
- /**
- * @param control
- */
- public PixelConverter(Control control) {
- this(control.getFont());
- }
-
- /**
- * @param font
- */
- public PixelConverter(Font font) {
- GC gc = new GC(font.getDevice());
- gc.setFont(font);
- fFontMetrics= gc.getFontMetrics();
- gc.dispose();
- }
-
-
- /**
- * @param chars
- * @return the convert height in pixels
- */
- public int convertHeightInCharsToPixels(int chars) {
- return Dialog.convertHeightInCharsToPixels(fFontMetrics, chars);
- }
-
- /**
- * @param dlus
- * @return the pixel
- */
- public int convertHorizontalDLUsToPixels(int dlus) {
- return Dialog.convertHorizontalDLUsToPixels(fFontMetrics, dlus);
- }
-
- /**
- * @param dlus
- * @return the vertical pixels
- */
- public int convertVerticalDLUsToPixels(int dlus) {
- return Dialog.convertVerticalDLUsToPixels(fFontMetrics, dlus);
- }
-
-
- /**
- * @param chars
- * @return the pixel value
- */
- public int convertWidthInCharsToPixels(int chars) {
- return Dialog.convertWidthInCharsToPixels(fFontMetrics, chars);
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/utils/PluginImageHelper.java b/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/utils/PluginImageHelper.java
deleted file mode 100644
index 8ebcd03..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/utils/PluginImageHelper.java
+++ /dev/null
@@ -1,213 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.common.ui.internal.utils;
-
-import java.util.HashMap;
-
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.resource.ImageRegistry;
-import org.eclipse.jface.resource.JFaceResources;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-
-/**
- * @author mengbo
- */
-public class PluginImageHelper {
- private static PluginImageHelper _instance = null;
-
- /**
- * Gets the instance.
- *
- * @return Returns a TaglibPluginImageHelper
- */
- public synchronized static PluginImageHelper getInstance() {
- if (_instance == null) {
- _instance = new PluginImageHelper();
- }
- return _instance;
- }
-
- // save a descriptor for each image
- private HashMap _imageDescRegistry = null;
-
- private final String PLUGIN_SEPARATOR = "^"; //$NON-NLS-1$
-
- /**
- * Creates an image from the given resource and adds the image to the image
- * registry.
- *
- * @param resource
- * @param pluginId
- * @return Image
- */
- private Image createImage(String resource, String pluginId) {
- ImageDescriptor desc = getImageDescriptor(resource, pluginId);
- Image image = null;
-
- if (desc != null) {
- image = desc.createImage();
-
- // dont add the missing image descriptor image to the image
- // registry
- if (!desc.equals(ImageDescriptor.getMissingImageDescriptor())) {
- String thePluginId = pluginId;
- if (thePluginId == null) {
- return null;
- }
- String key = thePluginId + PLUGIN_SEPARATOR + resource;
- getImageRegistry().put(key, image);
- }
- }
- return image;
- }
-
- /**
- * Creates an image descriptor from the given imageFilePath in the given
- * pluginId and adds the image descriptor to the image descriptor registry.
- * If an image descriptor could not be created, the default "missing" image
- * descriptor is returned but not added to the image descriptor registry.
- *
- * @param imageFilePath
- * @param pluginId
- * if null, look in this plugin
- * @return ImageDescriptor image descriptor for imageFilePath or default
- * "missing" image descriptor if resource could not be found
- */
- private ImageDescriptor createImageDescriptor(String imageFilePath,
- String pluginId) {
- String thePluginId = pluginId;
- if (thePluginId == null) {
- return null;
- }
-
- ImageDescriptor imageDescriptor = AbstractUIPlugin
- .imageDescriptorFromPlugin(thePluginId, imageFilePath);
- if (imageDescriptor != null) {
- String key = thePluginId + PLUGIN_SEPARATOR + imageFilePath;
- getImageDescriptorRegistry().put(key, imageDescriptor);
- } else {
- imageDescriptor = ImageDescriptor.getMissingImageDescriptor();
- }
-
- return imageDescriptor;
- }
-
- /**
- * Retrieves the image associated with resource from the image registry. If
- * the image cannot be retrieved, attempt to find and load the image at the
- * location specified in resource.
- *
- * @param resource
- * the image to retrieve
- * @return Image the image associated with resource or null if one could not
- * be found
- */
- public Image getImage(String resource) {
- return getImage(resource, null);
- }
-
- /**
- * Retrieves the image associated with resource from the image registry. If
- * the image cannot be retrieved, attempt to find and load the image at the
- * location specified in resource.
- *
- * @param resource
- * the image to retrieve
- * @param pluginId
- * @return Image the image associated with resource or null if one could not
- * be found
- */
- public Image getImage(String resource, String pluginId) {
- String thePluginId = pluginId;
- if (thePluginId == null) {
- return null;
- }
-
- String key = thePluginId + PLUGIN_SEPARATOR + resource;
-
- Image image = getImageRegistry().get(key);
- if (image == null) {
- // create an image
- image = createImage(resource, pluginId);
- }
- return image;
- }
-
- /**
- * Retrieves the image descriptor associated with resource from the image
- * descriptor registry. If the image descriptor cannot be retrieved, attempt
- * to find and load the image descriptor at the location specified in
- * resource.
- *
- * @param resource
- * the image descriptor to retrieve
- * @return ImageDescriptor the image descriptor assocated with resource or
- * the default "missing" image descriptor if one could not be found
- */
- public ImageDescriptor getImageDescriptor(String resource) {
- return getImageDescriptor(resource, null);
- }
-
- /**
- * Retrieves the image descriptor associated with resource in pluginId from
- * the image descriptor registry. If the image descriptor cannot be
- * retrieved, attempt to find and load the image descriptor at the location
- * specified in resource in pluginId.
- *
- * @param resource
- * the image descriptor to retrieve
- * @param pluginId
- * the plugin the resource is located. if null, use look in this
- * plugin
- * @return ImageDescriptor the image descriptor assocated with resource or
- * the default "missing" image descriptor if one could not be found
- */
- public ImageDescriptor getImageDescriptor(String resource, String pluginId) {
- ImageDescriptor imageDescriptor = null;
- String thePluginId = pluginId;
- if (thePluginId == null) {
- return null;
- }
-
- String key = thePluginId + PLUGIN_SEPARATOR + resource;
- Object o = getImageDescriptorRegistry().get(key);
- if (o == null) {
- // create a descriptor
- imageDescriptor = createImageDescriptor(resource, pluginId);
- } else {
- imageDescriptor = (ImageDescriptor) o;
- }
- return imageDescriptor;
- }
-
- /**
- * Returns the image descriptor registry for this plugin.
- *
- * @return HashMap - image descriptor registry for this plugin
- */
- private HashMap getImageDescriptorRegistry() {
- if (_imageDescRegistry == null) {
- _imageDescRegistry = new HashMap();
- }
- return _imageDescRegistry;
- }
-
- /**
- * Returns the image registry for this plugin.
- *
- * @return ImageRegistry - image registry for this plugin
- */
- private ImageRegistry getImageRegistry() {
- return JFaceResources.getImageRegistry();
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/utils/PropertyUtils.java b/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/utils/PropertyUtils.java
deleted file mode 100644
index 47bded0..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/utils/PropertyUtils.java
+++ /dev/null
@@ -1,789 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.common.ui.internal.utils;
-
-import java.awt.Component;
-import java.awt.Dimension;
-import java.awt.Point;
-import java.awt.Rectangle;
-import java.awt.Toolkit;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.MissingResourceException;
-import java.util.Properties;
-import java.util.ResourceBundle;
-import java.util.StringTokenizer;
-
-import org.eclipse.jst.jsf.common.ui.JSFUICommonPlugin;
-
-/**
- * The main purpose of this class is to give better access methods for property
- * and resource bundle access.
- *
- * @author mengbo
- */
-public final class PropertyUtils {
-
- private static final String ENCODED_CHAR_PERCENT = "%25"; //$NON-NLS-1$
- private static final String ENCODED_CHAR_CARRIAGE_RETURN = "%0d"; //$NON-NLS-1$
- private static final String ENCODED_CHAR_TAB = "%09"; //$NON-NLS-1$
- private static final String ENCODED_CHAR_NEWLINE = "%0a"; //$NON-NLS-1$
- private static final String ENCODED_CHAR_SPACE = "%20"; //$NON-NLS-1$
- private static final String ENCODED_CHAR_COLON = "%3a"; //$NON-NLS-1$
- private static final String ENCODED_CHAR_EQUALS = "%3d"; //$NON-NLS-1$
-
-
- // WARNING: There can be NO static logging line here since the logger uses
- // this class to figure out the preferences
- // for the logging system. "Logging" an error here would be useless since
- // you might be setting up the logging system
- // via a call to PropertyUtils.getServerProperty() instead it uses
- // "System.err.println".
-
- // This is the name for the properties file.
- // The prop-name will be prepended to this string....
- private static final String NAME_PROPERTIES = ".props"; //$NON-NLS-1$
-
- private static final String STR_BOUNDS_END = ".bounds"; // assumes the //$NON-NLS-1$
-
- // window name or
- // name list is
- // prepended
-
- // //////////////////////////////////////////////////////////////////////////
- // Property get methods.
- // //////////////////////////////////////////////////////////////////////////
- /**
- * @param props
- * @param key
- * @param theDefault
- * @return the property
- */
- public static String getProperty(Properties props, String key,
- String theDefault) {
- try {
- String value = props.getProperty(key, theDefault);
- if ((value != null) && (value.length() == 0)) {
- value = null;
- }
- // check again for null, since some versions of the jdk ignore the
- // default
- // if an empty property exists.
- if (value == null) {
- value = theDefault;
- }
- return value;
- } catch (Exception ee) {
- return theDefault;
- }
- }
-
- /**
- * @param props
- * @param key
- * @return the value for key in props, may return null
- */
- public static String getProperty(Properties props, String key) {
- try {
- String value = props.getProperty(key);
- if ((value != null) && (value.length() == 0)) {
- value = null;
- }
- return value;
- } catch (Exception ee) {
- return null;
- }
- }
-
- /**
- * @param props
- * @param key
- * @param defaultValue
- * @param minimumValue
- * @return the integer property value for key, or defaultValue
- * if none. Enforces minimumValue in all cases
- */
- public static int getPropertyValue(Properties props, String key,
- int defaultValue, int minimumValue) {
- int theValue = getPropertyValue(props, key, defaultValue);
-
- if (theValue < minimumValue) {
- theValue = minimumValue;
- }
- return theValue;
- }
-
- /**
- * @param props
- * @param key
- * @param defaultValue
- * @return the integer value for key in props or defaultValue if none
- */
- public static int getPropertyValue(Properties props, String key,
- int defaultValue) {
- String stringValue = getProperty(props, key);
- if (stringValue != null) {
- try {
- return Integer.parseInt(stringValue);
- } catch (NumberFormatException ee)// NOPMD
- {
- // the property value maybe an invalid value, the editor should
- // show these to user.
- }
- }
- return defaultValue;
- }
-
- /**
- * @param props
- * @param key
- * @param defaultValue
- * @return the long value for key props or defaultValue if none
- */
- public static long getPropertyLongValue(Properties props, String key,
- long defaultValue) {
- String stringValue = getProperty(props, key);
- if (stringValue != null) {
- try {
- return Long.parseLong(stringValue);
- } catch (NumberFormatException ee)// NOPMD
- {
- // the property value maybe an invalid value, the editor should
- // show these to user.
- }
- }
- return defaultValue;
- }
-
- /**
- * @param props
- * @param key
- * @param bDefault
- * @return true if props has a value for key
- */
- public static boolean isProperty(Properties props, String key,
- boolean bDefault) {
- return getProperty(props, key, "" + bDefault).equals("" + true); //$NON-NLS-1$ //$NON-NLS-2$
- }
-
- /**
- * @param props
- * @param key
- * @return the string values in props for key tokenized from
- * a comma-separated string
- */
- public static String[] getPropertyStrings(Properties props, String key) {
- String tokenString = getProperty(props, key);
-
- if (tokenString == null) {
- return new String[0];
- }
- StringTokenizer tokenizer = new StringTokenizer(tokenString, ","); //$NON-NLS-1$
- String[] pNames = new String[tokenizer.countTokens()];
-
- for (int ii = 0; ii < pNames.length; ii++) {
- pNames[ii] = ((String) tokenizer.nextElement()).trim();
- }
- return pNames;
- }
-
- // //////////////////////////////////////////////////////////////////////////
- // Resource bundle get methods.
- // //////////////////////////////////////////////////////////////////////////
- /**
- * @param bundle
- * @param key
- * @param theDefault
- * @return the string value from bundle for key or default if none
- */
- public static String getResourceProperty(ResourceBundle bundle, String key,
- String theDefault) {
- try {
- String value = bundle.getString(key);
- if ((value == null) || (value.length() == 0)) {
- value = theDefault;
- }
- return value;
- }
- catch(NullPointerException npe)
- {
- return theDefault;
- }
- catch (MissingResourceException mre)
- {
- return theDefault;
- }
- catch (ClassCastException cce)
- {
- return theDefault;
- }
- }
-
- /**
- * @param bundle
- * @param key
- * @return the value for key in bundle or null if none
- */
- public static String getResourceProperty(ResourceBundle bundle, String key) {
- try
- {
- String value = bundle.getString(key);
- if ((value != null) && (value.length() == 0))
- {
- value = null;
- }
- return value;
- }
- catch(NullPointerException npe)
- {
- return null;
- }
- catch (MissingResourceException mre)
- {
- return null;
- }
- catch (ClassCastException cce)
- {
- return null;
- }
- }
-
- /**
- * @param bundle
- * @param key
- * @param defaultValue
- * @param minimumValue
- * @return the integer value for key in bundle or defaultValue if none
- * Enforces minimum value in all cases
- */
- public static int getResourcePropertyValue(ResourceBundle bundle,
- String key, int defaultValue, int minimumValue) {
- int theValue = getResourcePropertyValue(bundle, key, defaultValue);
-
- if (theValue < minimumValue) {
- theValue = minimumValue;
- }
- return theValue;
- }
-
- /**
- * @param bundle
- * @param key
- * @param defaultValue
- * @return the integer value for key in bundle or defaultValue if none
- */
- public static int getResourcePropertyValue(ResourceBundle bundle,
- String key, int defaultValue) {
- String stringValue = getResourceProperty(bundle, key);
- if (stringValue != null) {
- try {
- return Integer.parseInt(stringValue);
- } catch (NumberFormatException ee)// NOPMD
- {
- // the property value maybe an invalid value, the editor should
- // show these to user.
- }
- }
- return defaultValue;
- }
-
- /**
- * @param bundle
- * @param key
- * @param defaultValue
- * @return the long value for key in bundle or default value if none
- */
- public static long getResourcePropertyLongValue(ResourceBundle bundle,
- String key, long defaultValue) {
- String stringValue = getResourceProperty(bundle, key);
- if (stringValue != null) {
- try {
- return Long.parseLong(stringValue);
- } catch (NumberFormatException ee)// NOPMD
- {
- // the property value maybe an invalid value, the editor should
- // show these to user.
- }
- }
- return defaultValue;
- }
-
- /**
- * @param bundle
- * @param key
- * @param bDefault
- * @return true if bundle has a value for key
- */
- public static boolean isResourceProperty(ResourceBundle bundle, String key,
- boolean bDefault) {
- return getResourceProperty(bundle, key, "" + bDefault) //$NON-NLS-1$
- .equals("" + true); //$NON-NLS-1$
- }
-
- // ///////////////////////////////////////////////////////////////////////
- // Property misc routines
- // ///////////////////////////////////////////////////////////////////////
- /**
- * @param theName
- * @return the encoded name
- */
- public static String encodeName(String theName) {
- int theSize = theName.length();
- StringBuffer encoded = new StringBuffer(theSize);
- char ch;
-
- for (int ii = 0; ii < theSize; ii++) {
- ch = theName.charAt(ii);
- switch (ch) {
- // these are the set of illegal characters in a Property name
- case '=': // %3d
- encoded.append(ENCODED_CHAR_EQUALS);
- break;
- case ':': // %3a
- encoded.append(ENCODED_CHAR_COLON);
- break;
- case ' ': // %20
- encoded.append(ENCODED_CHAR_SPACE);
- break;
- case '\n': // %0a
- encoded.append(ENCODED_CHAR_NEWLINE);
- break;
- case '\t': // %09
- encoded.append(ENCODED_CHAR_TAB);
- break;
- case '\r': // %0d
- encoded.append(ENCODED_CHAR_CARRIAGE_RETURN);
- break;
- case '%': // %25
- // added because its our encoding flag
- encoded.append(ENCODED_CHAR_PERCENT);
- break;
- default:
- encoded.append(ch);
- break;
- }
- }
-
- return encoded.toString();
- }
-
- /**
- * @param theName
- * @return the decoded name
- */
- public static String decodeName(String theName) {
- int theSize = theName.length();
- int kk;
- StringBuffer decoded = new StringBuffer(theSize);
- char ch;
-
- for (int ii = 0; ii < theSize; ii++) {
- ch = theName.charAt(ii);
- if (ch == '%') {
- ch = theName.charAt(++ii);
- kk = Character.digit(ch, 16);
- kk *= 16;
- ch = theName.charAt(++ii);
- kk += Character.digit(ch, 16);
- decoded.append((char) kk);
- } else {
- decoded.append(ch);
- }
- }
-
- return decoded.toString();
- }
-
- /**
- * @param propName
- * @return the properties
- * @throws IOException
- * @throws FileNotFoundException
- */
- public static Properties openProperties(String propName)
- throws IOException, FileNotFoundException {
- return openProperties(propName, null, true);
- }
-
- /**
- * @param propName
- * @param propDefaults
- * @return the properties
- * @throws IOException
- * @throws FileNotFoundException
- */
- public static Properties openProperties(String propName,
- Properties propDefaults) throws IOException, FileNotFoundException {
- return openProperties(propName, propDefaults, true);
- }
-
- /**
- * @param propName
- * @param propDefaults
- * @param bCreatePropertiesPathname
- * @return the properties
- * @throws IOException
- * @throws FileNotFoundException
- */
- public static Properties openProperties(String propName,
- Properties propDefaults, boolean bCreatePropertiesPathname)
- throws IOException, FileNotFoundException {
- Properties theProperties = new Properties(propDefaults);
-
- try {
- String propertiesFilename = bCreatePropertiesPathname ? getPropertiesPathname(propName)
- : propName;
- InputStream theStream = new FileInputStream(propertiesFilename);
- theProperties.load(theStream);
- theStream.close();
- } catch (FileNotFoundException ee) {
- if (propDefaults == null) {
- throw ee;
- }
- } catch (IOException ee) {
- if (propDefaults == null) {
- throw ee;
- }
- }
-
- return theProperties;
- }
-
- /**
- * Combines two properties objects, with the second one as the default
- * properties
- *
- * @param localProperties
- * @param defaultProperties
- * @return the combined properties
- * @throws IOException
- */
- public static Properties combineProperties(Properties localProperties,
- Properties defaultProperties) throws IOException {
- Properties theNewProperties = new Properties();
-
- ByteArrayOutputStream os = new ByteArrayOutputStream();
- defaultProperties.store(os, ""); //$NON-NLS-1$
- localProperties.store(os, ""); //$NON-NLS-1$
- byte[] theData = os.toByteArray();
- ByteArrayInputStream is = new ByteArrayInputStream(theData);
- theNewProperties.load(is);
-
- return theNewProperties;
- }
-
- /**
- * @param theFilename
- * @return the encoded file name
- */
- public static String encodeFilename(String theFilename) {
- // make theFilename legal on the local system....
- String theSeparator = System.getProperty("file.separator"); //$NON-NLS-1$
- // replace all occurrances of the file separator with a ' '
- for (int ii = 0; ii < theSeparator.length(); ii++) {
- char theChar = theSeparator.charAt(ii);
- theFilename = theFilename.replace(theChar, ' ');
- }
-
- return theFilename;
- }
-
- /**
- * @param baseName
- * @return the properties path
- */
- public static String getPropertiesPathname(String baseName) {
- if (baseName.endsWith(NAME_PROPERTIES)) {
- return System.getProperty("user.dir") //$NON-NLS-1$
- + System.getProperty("file.separator") //$NON-NLS-1$
- + encodeFilename(baseName);
- }
- return System.getProperty("user.dir") //$NON-NLS-1$
- + System.getProperty("file.separator") //$NON-NLS-1$
- + encodeFilename(baseName) + NAME_PROPERTIES;
- }
-
- // /////////////////////////////////////////////////////////////////////////
- // These are generic routines that are used to get/set/save window bounds
-
- private static final int INSET = 40;
-
- /**
- * Set the initial bounds (size & location) of a component. This will get
- * the location from the preferences file based on the values of the "names"
- * parameter. These values will be encoded to make a legal properties name,
- * joined togther with ".", and the value STR_BOUNDS_END will be appended.
- * The resulting name will be used to obtain the intial bounds value from
- * the properties file, which will be decoded and the specified component
- * will then be set to that value.
- * @param props
- * @param theComponent
- * @param names
- * @param defaultValue
- */
- public static void setComponentBounds(Properties props,
- Component theComponent, String names[], String defaultValue) {
- setComponentBounds(props, theComponent, names, defaultValue, false);
- }
-
- /**
- * @param props
- * @param theComponent
- * @param names
- * @param defaultValue
- * @param bEnsureDesktopVisibility
- */
- public static void setComponentBounds(Properties props,
- Component theComponent, String names[], String defaultValue,
- boolean bEnsureDesktopVisibility) {
- String tmpString = getComponentPropertyName(names, STR_BOUNDS_END);
- setComponentBounds(props, theComponent, tmpString, defaultValue,
- bEnsureDesktopVisibility);
- }
-
- /**
- * @param props
- * @param theComponent
- * @param thePropertyName
- * @param defaultValue
- */
- public static void setComponentBounds(Properties props,
- Component theComponent, String thePropertyName, String defaultValue) {
- setComponentBounds(props, theComponent, thePropertyName, defaultValue,
- false);
- }
-
- /**
- * @param props
- * @param theComponent
- * @param thePropertyName
- * @param defaultValue
- * @param bEnsureDesktopVisibility
- */
- public static void setComponentBounds(Properties props,
- Component theComponent, String thePropertyName,
- String defaultValue, boolean bEnsureDesktopVisibility) {
- String tmpString = props.getProperty(thePropertyName, defaultValue);
- Rectangle theValue = decodeBounds(tmpString);
- theComponent.setBounds(theValue);
- if (bEnsureDesktopVisibility) {
- // make sure that this component is visible on the desktop...
- // verify that this window is visible...
- Point theLoc = theComponent.getLocation();
- // get width/height of desktop....
- Dimension portSize = new Dimension(Toolkit.getDefaultToolkit()
- .getScreenSize());
- if (theLoc.x > portSize.width) // move it to top
- theLoc.x = INSET;
- if (theLoc.y > portSize.height) // move it to left
- theLoc.y = INSET;
- theComponent.setLocation(theLoc);
- }
- }
-
- /**
- * @param props
- * @param theComponent
- * @param names
- */
- public static void saveComponentBounds(Properties props,
- Component theComponent, String names[]) {
- String tmpString = getComponentPropertyName(names, STR_BOUNDS_END);
- saveComponentBounds(props, theComponent, tmpString);
- }
-
- /**
- * @param props
- * @param theComponent
- * @param thePropertyName
- */
- public static void saveComponentBounds(Properties props,
- Component theComponent, String thePropertyName) {
- Rectangle theBounds = theComponent.getBounds();
- String theValue = encodeBounds(theBounds);
- props.put(thePropertyName, theValue);
- }
-
- /**
- * @param names
- * @param subsystemName
- * @return the component property name or ""
- */
- public static String getComponentPropertyName(String names[],
- String subsystemName) {
- String tmpString = ""; //$NON-NLS-1$
-
- for (int ii = 0; ii < names.length; ii++) {
- tmpString = tmpString + (ii > 0 ? "." : "") //$NON-NLS-1$ //$NON-NLS-2$
- + PropertyUtils.encodeName(names[ii]);
- }
- if (subsystemName.startsWith(".") == false) //$NON-NLS-1$
- tmpString += "."; //$NON-NLS-1$
- tmpString = tmpString + subsystemName;
- return tmpString;
- }
-
- /**
- * Decode the comma separated values stored in sBounds. This method is
- * normally called to decode the location/size of a component which has been
- * saved into a Properties object. See encodeBounds(); Order of items in the
- * string is (x, y, w, h)
- * @param sBounds
- * @return the rectangle
- */
- public static Rectangle decodeBounds(String sBounds) {
- int index;
- int ii;
- int theValue[] = new int[4];
- String tmpString;
- String restString = sBounds;
-
- for (ii = 0; ii < 4; ii++) {
- theValue[ii] = 0;
- }
- try {
- for (ii = 0; ii < 4; ii++) {
- index = restString.indexOf(","); //$NON-NLS-1$
- if (index > 0) {
- tmpString = restString.substring(0, index);
- restString = restString.substring(index + 1);
- } else {
- tmpString = restString; // should only happen on the last
- // one....
- restString = null; // will cause an exception if not last
- // one...
- }
- theValue[ii] = Integer.valueOf(tmpString).intValue();
- }
- } catch (Exception ee)// NOPMD
- {
- // the property value maybe an invalid value, the editor should show
- // these to user.
- }
-
- return new Rectangle(theValue[0], theValue[1], theValue[2], theValue[3]);
- }
-
- /**
- * * Encode the bounds of a component into a comma separated list * that is
- * appropriate for storing in a Properties object. * See decodeBounds();
- * @param rBounds
- * @return the encoded bounds
- */
- public static String encodeBounds(Rectangle rBounds) {
- return "" + rBounds.x + "," + rBounds.y + "," + rBounds.width + "," //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
- + rBounds.height;
- }
-
- /**
- * Methods for creating Properties objects from strings.
- *
- * Then "Encoded" versions are used on values that are stored into a
- * properties file (think of them as sub-properties). They do the encoding
- * necessary to turn a properties object into a string that has legal
- * "value" syntax (they actually do more than they need to, but its all
- * non-destructive).
- * @param thePropertyString
- * @return the properties from the string
- * @throws IOException
- */
- public static Properties getPropertiesFromString(String thePropertyString)
- throws IOException {
- if (thePropertyString == null)
- return null;
- ByteArrayInputStream in = new ByteArrayInputStream(thePropertyString
- .getBytes());
-
- Properties props = new Properties();
- props.load(in); // throws IOException
- in = null;
- return props;
- }
-
- /**
- * @param theEncodedPropertyString
- * @return the properties
- * @throws IOException
- */
- public static Properties getPropertiesFromEncodedString(
- String theEncodedPropertyString) throws IOException {
- if (theEncodedPropertyString == null)
- return null;
- return (getPropertiesFromString(decodeName(theEncodedPropertyString)));
- }
-
- /**
- * @param theEncodedPropertyString
- * @return the properties
- */
- public static Properties encodedStringToProperties(
- String theEncodedPropertyString) {
- try {
- return getPropertiesFromEncodedString(theEncodedPropertyString);
- } catch (IOException ee) {
- return null;
- }
- }
-
- /**
- * @param props
- * @param comment
- * @return the string
- * @throws IOException
- */
- public static String savePropertiesToString(Properties props, String comment)
- throws IOException {
- if (props == null)
- return null;
- ByteArrayOutputStream out = new ByteArrayOutputStream();
- props.store(out, comment);
- String tmpString = out.toString();
- out = null;
- return tmpString;
- }
-
- /**
- * @param props
- * @param comment
- * @return the encoded string
- * @throws IOException
- */
- public static String savePropertiesToEncodedString(Properties props,
- String comment) throws IOException {
- if (props == null)
- return null;
- return encodeName(savePropertiesToString(props, comment));
- }
-
- /**
- * @param props
- * @return the encoded string
- */
- public static String propertiesToEncodedString(Properties props) {
- try {
- return savePropertiesToEncodedString(props, ""); //$NON-NLS-1$
- } catch (IOException ee)// NOPMD
- {
- JSFUICommonPlugin.getLogger(PropertyUtils.class).error("saving properties", ee); //$NON-NLS-1$
- }
- return null;
- }
-
- private PropertyUtils()
- {
- // no instantiation
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/utils/ResourceUtils.java b/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/utils/ResourceUtils.java
deleted file mode 100644
index e35ee83..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/utils/ResourceUtils.java
+++ /dev/null
@@ -1,286 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.common.ui.internal.utils;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.text.MessageFormat;
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-import org.eclipse.jst.jsf.common.ui.JSFUICommonPlugin;
-import org.eclipse.jst.jsf.common.ui.internal.logging.Logger;
-
-/**
- * Give easy access to a resource bundle.
- *
- * @author mengbo
- */
-public abstract class ResourceUtils {
- private static final String LOG_RESOURCE_UTILS_MSG_KEY = "log.ResourceUtils"; //$NON-NLS-1$
- private static Logger _log = JSFUICommonPlugin.getLogger(ResourceUtils.class);
- /**
- * the resource bundle accessible by all children
- */
- protected ResourceBundle _resources;
-
- /**
- * Empty Constructor.
- */
- protected ResourceUtils() {
- // restrict instantiation
- }
-
- /**
- * Easy way to set the bundle and get a fatal log messages and an alert if
- * the resource bundle is not found.
- *
- * @param resource
- * @param bundleLocation
- */
- protected void setBundle(ResourceBundle resource, String bundleLocation) {
- _resources = resource;
- if (_resources == null) {
- // log.ResourceUtils=Missing Resource Bundle "{0}".
- _log.error(LOG_RESOURCE_UTILS_MSG_KEY, bundleLocation);
- // pluginName=Web Application Development Common
- JSFUICommonPlugin.getAlerts().error("pluginName", LOG_RESOURCE_UTILS_MSG_KEY, //$NON-NLS-1$
- bundleLocation);
- }
- }
-
- /**
- * Get the property defined in the resource bundle for the given key. This
- * property should be an integer. If none is defined
- * (MissingResourceException), return the default.
- *
- * @param key
- * the key in the resource bundle.
- * @param defaultValue
- * default int to return if no value is found for the key.
- * @return the integer value for key or defaultValue if none
- */
- public int getValue(String key, int defaultValue) {
- String stringValue = getString(key);
- if (stringValue != null) {
- try {
- return Integer.parseInt(stringValue);
- } catch (NumberFormatException ee)// NOPMD
- {
- // the property value maybe an invalid value, the editor should
- // show these to user.
- }
- }
- return defaultValue;
- }
-
- /**
- * Get the property defined in the resource bundle for the given key. This
- * property should be an long. If none is defined
- * (MissingResourceException), return the default.
- *
- * @param key
- * the key in the resource bundle.
- * @param defaultValue
- * default long to return if no value is found for the key.
- * @return the long value for key or defaultValue if none
- */
- public long getValue(String key, long defaultValue) {
- String stringValue = getString(key);
- if (stringValue != null) {
- try {
- return Long.parseLong(stringValue);
- } catch (NumberFormatException ee)// NOPMD
- {
- // the property value maybe an invalid value, the editor should
- // show these to user.
- }
- }
- return defaultValue;
- }
-
- /**
- * Get the property defined in the resource bundle for the given key. This
- * property should be boolean ("true" of "false"). If none is defined
- * (MissingResourceException), return the default.
- *
- * @param key
- * the key in the resource bundle.
- * @return true if there is a resource corresponding to key
- */
- public boolean isResource(String key) {
- return getString(key).equals("" + true); //$NON-NLS-1$
- }
-
- /**
- * Get the property defined in the resource bundle for the given key. If
- * none is defined (MissingResourceException), return null.
- *
- * @param key
- * the key in the resource bundle.
- * @return the string value for key or key if not found
- */
- public String getString(String key) {
- try {
- return _resources.getString(key);
- } catch (MissingResourceException ee) {
- return key;
- }
- }
-
- /**
- * Build a formated string from the resource bundle.
- *
- * @param key
- * the key into the resource bundle that has the formated string.
- * @param arg0
- * the first argument.
- * @return the formated string with the argument inline.
- */
- public String getString(String key, Object arg0) {
- Object[] args = new Object[1];
- args[0] = arg0;
-
- MessageFormat formatter = new MessageFormat(getString(key));
- return formatter.format(args);
- }
-
- /**
- * Build a formated string from the resource bundle.
- *
- * @param key
- * the key into the resource bundle that has the formated string.
- * @param arg0
- * the first argument.
- * @param arg1
- * the second argument.
- * @return the formated string with the argument inline.
- */
- public String getString(String key, Object arg0, Object arg1) {
- Object[] args = new Object[2];
- args[0] = arg0;
- args[1] = arg1;
-
- MessageFormat formatter = new MessageFormat(getString(key));
- return formatter.format(args);
- }
-
- /**
- * Build a formated string from the resource bundle.
- *
- * @param key
- * the key into the resource bundle that has the formated string.
- * @param arg0
- * the first argument.
- * @param arg1
- * the second argument.
- * @param arg2
- * the third argument.
- * @return the formated string with the argument inline.
- */
- public String getString(String key, Object arg0, Object arg1, Object arg2) {
- Object[] args = new Object[3];
- args[0] = arg0;
- args[1] = arg1;
- args[2] = arg2;
-
- MessageFormat formatter = new MessageFormat(getString(key));
- return formatter.format(args);
- }
-
- /**
- * Build a formated string from the resource bundle.
- *
- * @param key
- * the key into the resource bundle that has the formated string.
- * @param arg0
- * the first argument.
- * @param arg1
- * the second argument.
- * @param arg2
- * the third argument.
- * @param arg3
- * the forth argument.
- * @return the formated string with the argument inline.
- */
- public String getString(String key, Object arg0, Object arg1, Object arg2,
- Object arg3) {
- Object[] args = new Object[4];
- args[0] = arg0;
- args[1] = arg1;
- args[2] = arg2;
- args[3] = arg3;
-
- MessageFormat formatter = new MessageFormat(getString(key));
- return formatter.format(args);
- }
-
- /**
- * Build a formated string from the resource bundle.
- *
- * @param key
- * the key into the resource bundle that has the formated string.
- * @param arg0
- * the first argument.
- * @param arg1
- * the second argument.
- * @param arg2
- * the third argument.
- * @param arg3
- * the forth argument.
- * @param arg4
- * the forth argument.
- * @return the formated string with the argument inline.
- */
- public String getString(String key, Object arg0, Object arg1, Object arg2,
- Object arg3, Object arg4) {
- Object[] args = new Object[5];
- args[0] = arg0;
- args[1] = arg1;
- args[2] = arg2;
- args[3] = arg3;
- args[4] = arg4;
-
- MessageFormat formatter = new MessageFormat(getString(key));
- return formatter.format(args);
- }
-
- /**
- * Build a formated string from the resource bundle.
- *
- * @param key
- * the key into the resource bundle that has the formated string.
- * @param args
- * an array of arguments
- * @return the formated string with the argument inline.
- */
- public String getString(String key, Object[] args) {
- MessageFormat formatter = new MessageFormat(getString(key));
- return formatter.format(args);
- }
-
- /**
- * Use in the try-finally idiom for inputStream to ensure close
- * and suppress exceptions on close
- * @param inputStream
- */
- public static void ensureClosed(InputStream inputStream) {
- if (inputStream != null) {
- try {
- inputStream.close();
- } catch (IOException e) {
- // Ignore
- }
- }
-
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/utils/StringUtil.java b/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/utils/StringUtil.java
deleted file mode 100644
index e914b60..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/utils/StringUtil.java
+++ /dev/null
@@ -1,157 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.common.ui.internal.utils;
-
-import java.util.regex.Pattern;
-
-/**
- * This is tool class for String processing.
- *
- * @author mengbo
- */
-public class StringUtil {
-
- // pattern to find all end-of-paragraph and end-of-line html tags
- // so they can be converted to newlines
- final private static Pattern htmlToNewline = Pattern.compile("</p>|<br>"); //$NON-NLS-1$
-
- // pattern to strip all <x> and </x> HTML tags
- final private static Pattern removeHTMLTags = Pattern.compile("<[/?\\w\\s=\"\\.\\#]+>"); //$NON-NLS-1$
-
- // pattern to find all runs of spaces longer than one
- final private static Pattern trimInteriorWhitespace = Pattern.compile("[ ]+"); //$NON-NLS-1$
-
- /**
- * Split a java variable name into words For example, "_aJavaVariable" will
- * split to "A Java Variable", "_aWTPPackageImplementation" will be "A WTP
- * Package Implementation"
- *
- * @param variable
- * @return String
- */
- public static String splitVariable(String variable) {
- StringBuffer output = new StringBuffer(""); //$NON-NLS-1$
- boolean isCapitalLeading = false;
- boolean isLastSpace = false;
-
- for (int i = 0, n = variable.length(); i < n; i++) {
- char letter = variable.charAt(i);
-
- if (letter == '_' || letter == '$') {
- output.append(" "); //$NON-NLS-1$
- isCapitalLeading = false;
- isLastSpace = true;
- continue;
- }
-
- if (Character.isLowerCase(letter)) {
- int nextIndex = i + 1;
- if (nextIndex < n) {
- char nextLetter = variable.charAt(nextIndex);
- if (Character.isUpperCase(nextLetter)) {
- if (isCapitalLeading) {
- output.append(letter);
- isLastSpace = false;
- } else {
- output.append(Character.toUpperCase(letter));
- isLastSpace = false;
- }
- if (!isLastSpace) {
- output.append(' ');
- isLastSpace = true;
- }
- isCapitalLeading = false;
- continue;
- }
- }
- }
- if (Character.isUpperCase(letter)) {
- int nextIndex = i + 1;
- if (nextIndex < n) {
- char nextLetter = variable.charAt(nextIndex);
- if (Character.isLowerCase(nextLetter)) {
- if (!isLastSpace) {
- output.append(' ');
- isLastSpace = true;
- }
- output.append(letter);
- isCapitalLeading = true;
- isLastSpace = false;
- continue;
- }
- }
- }
- if (isCapitalLeading) {
- output.append(letter);
- isLastSpace = false;
- } else {
- output.append(Character.toUpperCase(letter));
- isCapitalLeading = true;
- isLastSpace = false;
- }
- }
-
- return output.toString().trim();
- }
-
- /**
- * @param str1
- * @param str2
- * @return boolean
- *
- * Check if two strings match or not if str1=null and str2=null, it will
- * return true
- */
- public static boolean isSameString(String str1, String str2) {
- if (str1 == null) {
- return str2 == null;
- }
- return str1.equals(str2);
- }
-
- /**
- *
- * @param text
- * @return String Filter and convert a string, or normalize a string For
- * example,
- * <p>
- * test
- * </p>
- * test1<a/> will be converted to: test\ntest1
- *
- */
- public static String filterConvertString(String text) {
- if (text == null) {
- return ""; //$NON-NLS-1$
- }
-
- String result = htmlToNewline.matcher(text).replaceAll("\n"); //$NON-NLS-1$
- result = removeHTMLTags.matcher(result).replaceAll(""); //$NON-NLS-1$
- result = trimInteriorWhitespace.matcher(result).replaceAll(" "); //$NON-NLS-1$
-
- return result;
- }
-
- /**
- * Determine whether a string is empty or not Example: null string -> return
- * true; Example: "" string -> return true; Otherwise, will return false;
- * @param str
- *
- * @return true if str is null or empty
- */
- public static boolean isEmptyString(String str) {
- if (str == null || str.length() == 0) {
- return true;
- }
- return false;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/utils/StyleCombo.java b/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/utils/StyleCombo.java
deleted file mode 100644
index 4eccfa6..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/utils/StyleCombo.java
+++ /dev/null
@@ -1,1877 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.common.ui.internal.utils;
-
-import java.util.Arrays;
-
-import org.eclipse.jface.resource.JFaceResources;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.accessibility.ACC;
-import org.eclipse.swt.accessibility.AccessibleAdapter;
-import org.eclipse.swt.accessibility.AccessibleControlAdapter;
-import org.eclipse.swt.accessibility.AccessibleControlEvent;
-import org.eclipse.swt.accessibility.AccessibleEvent;
-import org.eclipse.swt.accessibility.AccessibleTextAdapter;
-import org.eclipse.swt.accessibility.AccessibleTextEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.Font;
-import org.eclipse.swt.graphics.GC;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.graphics.Rectangle;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Layout;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.TableColumn;
-import org.eclipse.swt.widgets.TableItem;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.swt.widgets.TypedListener;
-
-/**
- * The CCombo class represents a selectable user interface object that combines
- * a text field and a list and issues notification when an item is selected from
- * the list.
- * <p>
- * Note that although this class is a subclass of <code>Composite</code>, it
- * does not make sense to add children to it, or set a layout on it.
- * </p>
- * <dl>
- * <dt><b>Styles:</b>
- * <dd>BORDER, READ_ONLY, FLAT</dd>
- * <dt><b>Events:</b>
- * <dd>Selection</dd>
- * </dl>
- */
-public final class StyleCombo extends Composite {
-
- Text text;
-
- Table table;
-
- int visibleItemCount = 4;
-
- Shell popup;
-
- Button arrow;
-
- boolean hasFocus;
-
- Listener listener, filter;
-
- Color foreground, background;
-
- Font font;
-
- String defaultValue;
-
- /**
- * Constructs a new instance of this class given its parent and a style
- * value describing its behavior and appearance.
- * <p>
- * The style value is either one of the style constants defined in class
- * <code>SWT</code> which is applicable to instances of this class, or
- * must be built by <em>bitwise OR</em>'ing together (that is, using the
- * <code>int</code> "|" operator) two or more of those <code>SWT</code>
- * style constants. The class description lists the style constants that are
- * applicable to the class. Style bits are also inherited from superclasses.
- * </p>
- *
- * @param parent
- * a widget which will be the parent of the new instance (cannot
- * be null)
- * @param style
- * the style of widget to construct
- *
- * @exception IllegalArgumentException
- * <ul>
- * <li>ERROR_NULL_ARGUMENT - if the parent is null</li>
- * </ul>
- * @exception org.eclipse.swt.SWTException
- * <ul>
- * <li>ERROR_THREAD_INVALID_ACCESS - if not called from the
- * thread that created the parent</li>
- * </ul>
- *
- * @see SWT#BORDER
- * @see SWT#READ_ONLY
- * @see SWT#FLAT
- */
- public StyleCombo(Composite parent, int style) {
- super(parent, style = checkStyle(style));
-
- listener = new Listener() {
- public void handleEvent(Event event) {
- if (popup == event.widget) {
- popupEvent(event);
- return;
- }
- if (text == event.widget) {
- textEvent(event);
- return;
- }
- if (table == event.widget) {
- tableEvent(event);
- return;
- }
- if (arrow == event.widget) {
- arrowEvent(event);
- return;
- }
- if (StyleCombo.this == event.widget) {
- comboEvent(event);
- return;
- }
- if (getShell() == event.widget) {
- handleFocus(SWT.FocusOut);
- }
- }
- };
-
- filter = new Listener() {
- public void handleEvent(Event event) {
- Shell shell = ((Control) event.widget).getShell();
- if (shell == StyleCombo.this.getShell()) {
- handleFocus(SWT.FocusOut);
- }
- }
- };
-
- int[] comboEvents = { SWT.Dispose, SWT.Move, SWT.Resize };
- for (int i = 0; i < comboEvents.length; i++)
- this.addListener(comboEvents[i], listener);
-
- createText(style);
- createArrow(style);
-
- createPopup(null, -1);
- initAccessible();
- }
-
- /**
- * @param style
- */
- private void createArrow(int style) {
- int arrowStyle = SWT.ARROW | SWT.DOWN;
- if ((style & SWT.FLAT) != 0) {
- arrowStyle |= SWT.FLAT;
- }
- arrow = new Button(this, arrowStyle);
- int[] arrowEvents = { SWT.Selection, SWT.FocusIn };
- for (int i = 0; i < arrowEvents.length; i++) {
- arrow.addListener(arrowEvents[i], listener);
- }
- }
-
- /**
- * @param style
- */
- private void createText(int style) {
- int textStyle = SWT.SINGLE;
- if ((style & SWT.READ_ONLY) != 0) {
- textStyle |= SWT.READ_ONLY;
- }
- if ((style & SWT.FLAT) != 0) {
- textStyle |= SWT.FLAT;
- }
- text = new Text(this, textStyle);
- int[] textEvents = { SWT.KeyDown, SWT.KeyUp, SWT.Modify, SWT.MouseDown,
- SWT.MouseUp, SWT.Traverse, SWT.FocusIn };
- for (int i = 0; i < textEvents.length; i++) {
- text.addListener(textEvents[i], listener);
- }
- }
-
- static int checkStyle(int style) {
- int mask = SWT.BORDER | SWT.READ_ONLY | SWT.FLAT | SWT.LEFT_TO_RIGHT
- | SWT.RIGHT_TO_LEFT;
- return style & mask;
- }
-
- /**
- * Adds the argument to the end of the receiver's list.
- *
- * @param string
- * the new item
- *
- * @exception IllegalArgumentException
- * <ul>
- * <li>ERROR_NULL_ARGUMENT - if the string is null</li>
- * </ul>
- * @exception org.eclipse.swt.SWTException
- * <ul>
- * <li>ERROR_WIDGET_DISPOSED - if the receiver has been
- * disposed</li>
- * <li>ERROR_THREAD_INVALID_ACCESS - if not called from the
- * thread that created the receiver</li>
- * </ul>
- *
- * @see #add(String,int)
- */
- public void add(String string) {
- checkWidget();
- if (string == null) {
- SWT.error(SWT.ERROR_NULL_ARGUMENT);
- }
- TableItem item = new TableItem(table, SWT.NONE);
- item.setText(0, string);
- }
-
- /**
- * Adds the argument to the receiver's list at the given zero-relative
- * index.
- * <p>
- * Note: To add an item at the end of the list, use the result of calling
- * <code>getItemCount()</code> as the index or use
- * <code>add(String)</code>.
- * </p>
- *
- * @param string
- * the new item
- * @param index
- * the index for the item
- *
- * @exception IllegalArgumentException
- * <ul>
- * <li>ERROR_NULL_ARGUMENT - if the string is null</li>
- * <li>ERROR_INVALID_RANGE - if the index is not between 0
- * and the number of elements in the list (inclusive)</li>
- * </ul>
- * @exception org.eclipse.swt.SWTException
- * <ul>
- * <li>ERROR_WIDGET_DISPOSED - if the receiver has been
- * disposed</li>
- * <li>ERROR_THREAD_INVALID_ACCESS - if not called from the
- * thread that created the receiver</li>
- * </ul>
- *
- * @see #add(String)
- */
- public void add(String string, int index) {
- checkWidget();
- if (string == null) {
- SWT.error(SWT.ERROR_NULL_ARGUMENT);
- }
- TableItem item = new TableItem(table, SWT.NONE, index);
- item.setText(0, string);
- }
-
- /**
- * Adds the listener to the collection of listeners who will be notified
- * when the receiver's text is modified, by sending it one of the messages
- * defined in the <code>ModifyListener</code> interface.
- *
- * @param listener1
- * the listener which should be notified
- *
- * @exception IllegalArgumentException
- * <ul>
- * <li>ERROR_NULL_ARGUMENT - if the listener is null</li>
- * </ul>
- * @exception org.eclipse.swt.SWTException
- * <ul>
- * <li>ERROR_WIDGET_DISPOSED - if the receiver has been
- * disposed</li>
- * <li>ERROR_THREAD_INVALID_ACCESS - if not called from the
- * thread that created the receiver</li>
- * </ul>
- *
- * @see ModifyListener
- * @see #removeModifyListener
- */
- public void addModifyListener(ModifyListener listener1) {
- checkWidget();
- if (listener1 == null) {
- SWT.error(SWT.ERROR_NULL_ARGUMENT);
- }
- TypedListener typedListener = new TypedListener(listener1);
- addListener(SWT.Modify, typedListener);
- }
-
- /**
- * Adds the listener to the collection of listeners who will be notified
- * when the receiver's selection changes, by sending it one of the messages
- * defined in the <code>SelectionListener</code> interface.
- * <p>
- * <code>widgetSelected</code> is called when the combo's list selection
- * changes. <code>widgetDefaultSelected</code> is typically called when
- * ENTER is pressed the combo's text area.
- * </p>
- *
- * @param listener1
- * the listener which should be notified
- *
- * @exception IllegalArgumentException
- * <ul>
- * <li>ERROR_NULL_ARGUMENT - if the listener is null</li>
- * </ul>
- * @exception org.eclipse.swt.SWTException
- * <ul>
- * <li>ERROR_WIDGET_DISPOSED - if the receiver has been
- * disposed</li>
- * <li>ERROR_THREAD_INVALID_ACCESS - if not called from the
- * thread that created the receiver</li>
- * </ul>
- *
- * @see SelectionListener
- * @see #removeSelectionListener
- */
- public void addSelectionListener(SelectionListener listener1) {
- checkWidget();
- if (listener1 == null) {
- SWT.error(SWT.ERROR_NULL_ARGUMENT);
- }
- TypedListener typedListener = new TypedListener(listener1);
- addListener(SWT.Selection, typedListener);
- addListener(SWT.DefaultSelection, typedListener);
- }
-
- void arrowEvent(Event event) {
- switch (event.type) {
- case SWT.FocusIn: {
- handleFocus(SWT.FocusIn);
- break;
- }
- case SWT.Selection: {
- dropDown(!isDropped());
- break;
- }
- }
- }
-
- /**
- * Sets the selection in the receiver's text field to an empty selection
- * starting just before the first character. If the text field is editable,
- * this has the effect of placing the i-beam at the start of the text.
- * <p>
- * Note: To clear the selected items in the receiver's list, use
- * <code>deselectAll()</code>.
- * </p>
- *
- * @exception org.eclipse.swt.SWTException
- * <ul>
- * <li>ERROR_WIDGET_DISPOSED - if the receiver has been
- * disposed</li>
- * <li>ERROR_THREAD_INVALID_ACCESS - if not called from the
- * thread that created the receiver</li>
- * </ul>
- *
- * @see #deselectAll
- */
- public void clearSelection() {
- checkWidget();
- text.clearSelection();
- table.deselectAll();
- }
-
- void comboEvent(Event event) {
- switch (event.type) {
- case SWT.Dispose:
- if (popup != null && !popup.isDisposed()) {
- table.removeListener(SWT.Dispose, listener);
- popup.dispose();
- }
- Shell shell = getShell();
- shell.removeListener(SWT.Deactivate, listener);
- Display display = getDisplay();
- display.removeFilter(SWT.FocusIn, filter);
- popup = null;
- text = null;
- table = null;
- arrow = null;
- break;
- case SWT.Move:
- dropDown(false);
- break;
- case SWT.Resize:
- internalLayout(false);
- break;
- }
- }
-
- private String[] getTableItems() {
- TableItem[] items = table.getItems();
- String[] values = new String[items.length];
- for (int i = 0; i < items.length; i++) {
- values[i] = items[i].getText(0);
- }
- return values;
- }
-
- public Point computeSize(int wHint, int hHint, boolean changed) {
- checkWidget();
- int width = 0, height = 0;
- String[] items = getTableItems();
- int textWidth = 0;
- GC gc = new GC(text);
- int spacer = gc.stringExtent(" ").x; //$NON-NLS-1$
- for (int i = 0; i < items.length; i++) {
- textWidth = Math.max(gc.stringExtent(items[i]).x, textWidth);
- }
- gc.dispose();
- Point textSize = text.computeSize(SWT.DEFAULT, SWT.DEFAULT, changed);
- Point arrowSize = arrow.computeSize(SWT.DEFAULT, SWT.DEFAULT, changed);
- Point listSize = table.computeSize(wHint, SWT.DEFAULT, changed);
- int borderWidth = getBorderWidth();
-
- height = Math.max(hHint, Math.max(textSize.y, arrowSize.y) + 2
- * borderWidth);
- width = Math.max(wHint, Math.max(textWidth + 2 * spacer + arrowSize.x
- + 2 * borderWidth, listSize.x));
- return new Point(width, height);
- }
-
- void createPopup(String[] items, int selectionIndex) {
- // create shell and list
- popup = new Shell(getShell(), SWT.NO_TRIM | SWT.ON_TOP);
- table = new Table(popup, SWT.SINGLE | SWT.V_SCROLL | SWT.FULL_SELECTION);
- new TableColumn(table, SWT.LEFT);
- if (font != null) {
- table.setFont(font);
- }
- if (foreground != null) {
- table.setForeground(foreground);
- }
- if (background != null) {
- table.setBackground(background);
- }
-
- int[] popupEvents = { SWT.Close, SWT.Paint, SWT.Deactivate };
- for (int i = 0; i < popupEvents.length; i++) {
- popup.addListener(popupEvents[i], listener);
- }
- int[] listEvents = { SWT.MouseUp, SWT.Selection, SWT.Traverse,
- SWT.KeyDown, SWT.KeyUp, SWT.FocusIn, SWT.FocusOut, SWT.Dispose };
- for (int i = 0; i < listEvents.length; i++) {
- table.addListener(listEvents[i], listener);
- }
- if (items != null) {
- setItems(items);
- }
- if (selectionIndex != -1) {
- select(selectionIndex);
- }
- }
-
- /**
- * Deselects the item at the given zero-relative index in the receiver's
- * list. If the item at the index was already deselected, it remains
- * deselected. Indices that are out of range are ignored.
- *
- * @param index
- * the index of the item to deselect
- *
- * @exception org.eclipse.swt.SWTException
- * <ul>
- * <li>ERROR_WIDGET_DISPOSED - if the receiver has been
- * disposed</li>
- * <li>ERROR_THREAD_INVALID_ACCESS - if not called from the
- * thread that created the receiver</li>
- * </ul>
- */
- public void deselect(int index) {
- checkWidget();
- table.deselect(index);
- }
-
- /**
- * Deselects all selected items in the receiver's list.
- * <p>
- * Note: To clear the selection in the receiver's text field, use
- * <code>clearSelection()</code>.
- * </p>
- *
- * @exception org.eclipse.swt.SWTException
- * <ul>
- * <li>ERROR_WIDGET_DISPOSED - if the receiver has been
- * disposed</li>
- * <li>ERROR_THREAD_INVALID_ACCESS - if not called from the
- * thread that created the receiver</li>
- * </ul>
- *
- * @see #clearSelection
- */
- public void deselectAll() {
- checkWidget();
- table.deselectAll();
- }
-
- void dropDown(boolean drop) {
- if (drop == isDropped()) {
- return;
- }
- if (!drop) {
- popup.setVisible(false);
- table.getColumns()[0].setWidth(0);
- if (!isDisposed() && arrow.isFocusControl()) {
- text.setFocus();
- }
- return;
- }
-
- if (getShell() != popup.getParent()) {
- String[] items = getTableItems();
- int selectionIndex = table.getSelectionIndex();
- table.removeListener(SWT.Dispose, listener);
- popup.dispose();
- popup = null;
- table = null;
- createPopup(items, selectionIndex);
- }
-
- Point size = getSize();
- int itemCount = table.getItemCount();
- itemCount = (itemCount == 0) ? visibleItemCount : Math.min(
- visibleItemCount, itemCount);
- int itemHeight = table.getItemHeight() * itemCount;
- Point tableSize = table.computeSize(SWT.DEFAULT, itemHeight, false);
- // int tableWidth = this.getClientArea()
- table.setBounds(1, 1, Math.max(size.x - 2, tableSize.x), tableSize.y
- - table.getHorizontalBar().getSize().y + 2);
-
- int index = table.getSelectionIndex();
- if (index != -1) {
- table.setTopIndex(index);
- }
- Display display = getDisplay();
- Rectangle tableRect = table.getBounds();
- Rectangle parentRect = display.map(getParent(), null, getBounds());
- Point comboSize = getSize();
- Rectangle displayRect = getMonitor().getClientArea();
- int width = Math.max(comboSize.x, tableRect.width + 2);
- int height = tableRect.height + 2;
- int x = parentRect.x;
- int y = parentRect.y + comboSize.y;
- if (y + height > displayRect.y + displayRect.height) {
- y = parentRect.y - height;
- }
- popup.setBounds(x, y, width, height);
- popup.setVisible(true);
-
- if (table.getItemCount() > visibleItemCount) {
- table.getColumns()[0].setWidth(text.getSize().x - 2);
- } else {
- table.getColumns()[0].setWidth(table.getClientArea().width);
- }
- table.setFocus();
- }
-
- /*
- * Return the Label immediately preceding the receiver in the z-order, or
- * null if none.
- */
- Label getAssociatedLabel() {
- Control[] siblings = getParent().getChildren();
- for (int i = 0; i < siblings.length; i++) {
- if (siblings[i] == StyleCombo.this) {
- if (i > 0 && siblings[i - 1] instanceof Label) {
- return (Label) siblings[i - 1];
- }
- }
- }
- return null;
- }
-
- public Control[] getChildren() {
- checkWidget();
- return new Control[0];
- }
-
- /**
- * Gets the editable state.
- *
- * @return whether or not the reciever is editable
- *
- * @exception org.eclipse.swt.SWTException
- * <ul>
- * <li>ERROR_WIDGET_DISPOSED - if the receiver has been
- * disposed</li>
- * <li>ERROR_THREAD_INVALID_ACCESS - if not called from the
- * thread that created the receiver</li>
- * </ul>
- *
- * @since 3.0
- */
- public boolean getEditable() {
- checkWidget();
- return text.getEditable();
- }
-
- /**
- * Returns the item at the given, zero-relative index in the receiver's
- * list. Throws an exception if the index is out of range.
- *
- * @param index
- * the index of the item to return
- * @return the item at the given index
- *
- * @exception IllegalArgumentException
- * <ul>
- * <li>ERROR_INVALID_RANGE - if the index is not between 0
- * and the number of elements in the list minus 1 (inclusive)</li>
- * </ul>
- * @exception org.eclipse.swt.SWTException
- * <ul>
- * <li>ERROR_WIDGET_DISPOSED - if the receiver has been
- * disposed</li>
- * <li>ERROR_THREAD_INVALID_ACCESS - if not called from the
- * thread that created the receiver</li>
- * </ul>
- */
- public String getItem(int index) {
- checkWidget();
- return table.getItem(index).getText(0);
- }
-
- /**
- * Returns the number of items contained in the receiver's list.
- *
- * @return the number of items
- *
- * @exception org.eclipse.swt.SWTException
- * <ul>
- * <li>ERROR_WIDGET_DISPOSED - if the receiver has been
- * disposed</li>
- * <li>ERROR_THREAD_INVALID_ACCESS - if not called from the
- * thread that created the receiver</li>
- * </ul>
- */
- public int getItemCount() {
- checkWidget();
- return table.getItemCount();
- }
-
- /**
- * Returns the height of the area which would be used to display
- * <em>one</em> of the items in the receiver's list.
- *
- * @return the height of one item
- *
- * @exception org.eclipse.swt.SWTException
- * <ul>
- * <li>ERROR_WIDGET_DISPOSED - if the receiver has been
- * disposed</li>
- * <li>ERROR_THREAD_INVALID_ACCESS - if not called from the
- * thread that created the receiver</li>
- * </ul>
- */
- public int getItemHeight() {
- checkWidget();
- return table.getItemHeight();
- }
-
- /**
- * Returns an array of <code>String</code>s which are the items in the
- * receiver's list.
- * <p>
- * Note: This is not the actual structure used by the receiver to maintain
- * its list of items, so modifying the array will not affect the receiver.
- * </p>
- *
- * @return the items in the receiver's list
- *
- * @exception org.eclipse.swt.SWTException
- * <ul>
- * <li>ERROR_WIDGET_DISPOSED - if the receiver has been
- * disposed</li>
- * <li>ERROR_THREAD_INVALID_ACCESS - if not called from the
- * thread that created the receiver</li>
- * </ul>
- */
- public String[] getItems() {
- checkWidget();
- return getTableItems();
- }
-
- char getMnemonic(String string) {
- int index = 0;
- int length = string.length();
- do {
- while ((index < length) && (string.charAt(index) != '&')) {
- index++;
- }
- if (++index >= length) {
- return '\0';
- }
- if (string.charAt(index) != '&') {
- return string.charAt(index);
- }
- index++;
- } while (index < length);
- return '\0';
- }
-
- /**
- * Returns a <code>Point</code> whose x coordinate is the start of the
- * selection in the receiver's text field, and whose y coordinate is the end
- * of the selection. The returned values are zero-relative. An "empty"
- * selection as indicated by the the x and y coordinates having the same
- * value.
- *
- * @return a point representing the selection start and end
- *
- * @exception org.eclipse.swt.SWTException
- * <ul>
- * <li>ERROR_WIDGET_DISPOSED - if the receiver has been
- * disposed</li>
- * <li>ERROR_THREAD_INVALID_ACCESS - if not called from the
- * thread that created the receiver</li>
- * </ul>
- */
- public Point getSelection() {
- checkWidget();
- return text.getSelection();
- }
-
- /**
- * Returns the zero-relative index of the item which is currently selected
- * in the receiver's list, or -1 if no item is selected.
- *
- * @return the index of the selected item
- *
- * @exception org.eclipse.swt.SWTException
- * <ul>
- * <li>ERROR_WIDGET_DISPOSED - if the receiver has been
- * disposed</li>
- * <li>ERROR_THREAD_INVALID_ACCESS - if not called from the
- * thread that created the receiver</li>
- * </ul>
- */
- public int getSelectionIndex() {
- checkWidget();
- return table.getSelectionIndex();
- }
-
- public int getStyle() {
- int style = super.getStyle();
- style &= ~SWT.READ_ONLY;
- if (!text.getEditable()) {
- style |= SWT.READ_ONLY;
- }
- return style;
- }
-
- /**
- * Returns a string containing a copy of the contents of the receiver's text
- * field.
- *
- * @return the receiver's text
- *
- * @exception org.eclipse.swt.SWTException
- * <ul>
- * <li>ERROR_WIDGET_DISPOSED - if the receiver has been
- * disposed</li>
- * <li>ERROR_THREAD_INVALID_ACCESS - if not called from the
- * thread that created the receiver</li>
- * </ul>
- */
- public String getText() {
- checkWidget();
- return text.getText();
- }
-
- /**
- * Returns the height of the receivers's text field.
- *
- * @return the text height
- *
- * @exception org.eclipse.swt.SWTException
- * <ul>
- * <li>ERROR_WIDGET_DISPOSED - if the receiver has been
- * disposed</li>
- * <li>ERROR_THREAD_INVALID_ACCESS - if not called from the
- * thread that created the receiver</li>
- * </ul>
- */
- public int getTextHeight() {
- checkWidget();
- return text.getLineHeight();
- }
-
- /**
- * Returns the maximum number of characters that the receiver's text field
- * is capable of holding. If this has not been changed by
- * <code>setTextLimit()</code>, it will be the constant
- * <code>Combo.LIMIT</code>.
- *
- * @return the text limit
- *
- * @exception org.eclipse.swt.SWTException
- * <ul>
- * <li>ERROR_WIDGET_DISPOSED - if the receiver has been
- * disposed</li>
- * <li>ERROR_THREAD_INVALID_ACCESS - if not called from the
- * thread that created the receiver</li>
- * </ul>
- */
- public int getTextLimit() {
- checkWidget();
- return text.getTextLimit();
- }
-
- /**
- * Gets the number of items that are visible in the drop down portion of the
- * receiver's list.
- *
- * @return the number of items that are visible
- *
- * @exception org.eclipse.swt.SWTException
- * <ul>
- * <li>ERROR_WIDGET_DISPOSED - if the receiver has been
- * disposed</li>
- * <li>ERROR_THREAD_INVALID_ACCESS - if not called from the
- * thread that created the receiver</li>
- * </ul>
- *
- * @since 3.0
- */
- public int getVisibleItemCount() {
- checkWidget();
- return visibleItemCount;
- }
-
- void handleFocus(int type) {
- if (isDisposed()) {
- return;
- }
- switch (type) {
- case SWT.FocusIn: {
- if (hasFocus) {
- return;
- }
- if (getEditable()) {
- text.selectAll();
- }
- hasFocus = true;
- Shell shell = getShell();
- shell.removeListener(SWT.Deactivate, listener);
- shell.addListener(SWT.Deactivate, listener);
- Display display = getDisplay();
- display.removeFilter(SWT.FocusIn, filter);
- display.addFilter(SWT.FocusIn, filter);
- Event e = new Event();
- notifyListeners(SWT.FocusIn, e);
- break;
- }
- case SWT.FocusOut: {
- if (!hasFocus) {
- return;
- }
- Control focusControl = getDisplay().getFocusControl();
- if (focusControl == arrow || focusControl == table
- || focusControl == text) {
- return;
- }
- hasFocus = false;
- Shell shell = getShell();
- shell.removeListener(SWT.Deactivate, listener);
- Display display = getDisplay();
- display.removeFilter(SWT.FocusIn, filter);
- Event e = new Event();
- notifyListeners(SWT.FocusOut, e);
- break;
- }
- }
- }
-
- /**
- * Searches the receiver's list starting at the first item (index 0) until
- * an item is found that is equal to the argument, and returns the index of
- * that item. If no item is found, returns -1.
- *
- * @param string
- * the search item
- * @return the index of the item
- *
- * @exception IllegalArgumentException
- * <ul>
- * <li>ERROR_NULL_ARGUMENT - if the string is null</li>
- * </ul>
- * @exception org.eclipse.swt.SWTException
- * <ul>
- * <li>ERROR_WIDGET_DISPOSED - if the receiver has been
- * disposed</li>
- * <li>ERROR_THREAD_INVALID_ACCESS - if not called from the
- * thread that created the receiver</li>
- * </ul>
- */
- public int indexOf(String string) {
- checkWidget();
- if (string == null) {
- SWT.error(SWT.ERROR_NULL_ARGUMENT);
- }
- return Arrays.asList(getTableItems()).indexOf(string);
- }
-
- /**
- * Searches the receiver's list starting at the given, zero-relative index
- * until an item is found that is equal to the argument, and returns the
- * index of that item. If no item is found or the starting index is out of
- * range, returns -1.
- *
- * @param string
- * the search item
- * @param start
- * the zero-relative index at which to begin the search
- * @return the index of the item
- *
- * @exception IllegalArgumentException
- * <ul>
- * <li>ERROR_NULL_ARGUMENT - if the string is null</li>
- * </ul>
- * @exception org.eclipse.swt.SWTException
- * <ul>
- * <li>ERROR_WIDGET_DISPOSED - if the receiver has been
- * disposed</li>
- * <li>ERROR_THREAD_INVALID_ACCESS - if not called from the
- * thread that created the receiver</li>
- * </ul>
- */
- public int indexOf(String string, int start) {
- checkWidget();
- if (string == null) {
- SWT.error(SWT.ERROR_NULL_ARGUMENT);
- }
- String[] items = getTableItems();
- for (int i = start; i < items.length; i++) {
- if (items[i].equals(string)) {
- return i;
- }
- }
- return -1;
- }
-
- void initAccessible() {
- AccessibleAdapter accessibleAdapter = new AccessibleAdapter() {
- public void getName(AccessibleEvent e) {
- String name = null;
- Label label = getAssociatedLabel();
- if (label != null) {
- name = stripMnemonic(label.getText());
- }
- e.result = name;
- }
-
- public void getKeyboardShortcut(AccessibleEvent e) {
- String shortcut = null;
- Label label = getAssociatedLabel();
- if (label != null) {
- String text1 = label.getText();
- if (text1 != null) {
- char mnemonic = getMnemonic(text1);
- if (mnemonic != '\0') {
- shortcut = "Alt+" + mnemonic; //$NON-NLS-1$
- }
- }
- }
- e.result = shortcut;
- }
-
- public void getHelp(AccessibleEvent e) {
- e.result = getToolTipText();
- }
- };
- getAccessible().addAccessibleListener(accessibleAdapter);
- text.getAccessible().addAccessibleListener(accessibleAdapter);
- table.getAccessible().addAccessibleListener(accessibleAdapter);
-
- arrow.getAccessible().addAccessibleListener(new AccessibleAdapter() {
- public void getName(AccessibleEvent e) {
- e.result = isDropped() ? SWT.getMessage("SWT_Close") : SWT.getMessage("SWT_Open"); //$NON-NLS-1$ //$NON-NLS-2$
- }
-
- public void getKeyboardShortcut(AccessibleEvent e) {
- e.result = "Alt+Down Arrow"; //$NON-NLS-1$
- }
-
- public void getHelp(AccessibleEvent e) {
- e.result = getToolTipText();
- }
- });
-
- getAccessible().addAccessibleTextListener(new AccessibleTextAdapter() {
- public void getCaretOffset(AccessibleTextEvent e) {
- e.offset = text.getCaretPosition();
- }
- });
-
- getAccessible().addAccessibleControlListener(
- new AccessibleControlAdapter() {
- public void getChildAtPoint(AccessibleControlEvent e) {
- Point testPoint = toControl(e.x, e.y);
- if (getBounds().contains(testPoint)) {
- e.childID = ACC.CHILDID_SELF;
- }
- }
-
- public void getLocation(AccessibleControlEvent e) {
- Rectangle location = getBounds();
- Point pt = toDisplay(location.x, location.y);
- e.x = pt.x;
- e.y = pt.y;
- e.width = location.width;
- e.height = location.height;
- }
-
- public void getChildCount(AccessibleControlEvent e) {
- e.detail = 0;
- }
-
- public void getRole(AccessibleControlEvent e) {
- e.detail = ACC.ROLE_COMBOBOX;
- }
-
- public void getState(AccessibleControlEvent e) {
- e.detail = ACC.STATE_NORMAL;
- }
-
- public void getValue(AccessibleControlEvent e) {
- e.result = getText();
- }
- });
-
- text.getAccessible().addAccessibleControlListener(
- new AccessibleControlAdapter() {
- public void getRole(AccessibleControlEvent e) {
- e.detail = text.getEditable() ? ACC.ROLE_TEXT
- : ACC.ROLE_LABEL;
- }
- });
-
- arrow.getAccessible().addAccessibleControlListener(
- new AccessibleControlAdapter() {
- public void getDefaultAction(AccessibleControlEvent e) {
- e.result = isDropped() ? SWT.getMessage("SWT_Close") : SWT.getMessage("SWT_Open"); //$NON-NLS-1$ //$NON-NLS-2$
- }
- });
- }
-
- boolean isDropped() {
- return popup.getVisible();
- }
-
- public boolean isFocusControl() {
- checkWidget();
- if (text.isFocusControl() || arrow.isFocusControl()
- || table.isFocusControl() || popup.isFocusControl()) {
- return true;
- }
- return super.isFocusControl();
- }
-
- void internalLayout(boolean changed) {
- if (isDropped()) {
- dropDown(false);
- }
- Rectangle rect = getClientArea();
- int width = rect.width;
- int height = rect.height;
- Point arrowSize = arrow.computeSize(SWT.DEFAULT, height, changed);
- text.setBounds(0, 0, width - arrowSize.x, height);
- arrow.setBounds(width - arrowSize.x, 0, arrowSize.x, arrowSize.y);
- }
-
- void tableEvent(Event event) {
- switch (event.type) {
- case SWT.Dispose:
- if (getShell() != popup.getParent()) {
- String[] items = getTableItems();
- int selectionIndex = table.getSelectionIndex();
- popup = null;
- table = null;
- createPopup(items, selectionIndex);
- }
- break;
- case SWT.FocusIn: {
- handleFocus(SWT.FocusIn);
- break;
- }
- case SWT.MouseUp: {
- if (event.button != 1) {
- return;
- }
- dropDown(false);
- break;
- }
- case SWT.Selection: {
- int index = table.getSelectionIndex();
- if (index == -1)
- return;
- text.setText(table.getItem(index).getText());
- text.selectAll();
- table.setSelection(index);
- Event e = new Event();
- e.time = event.time;
- e.stateMask = event.stateMask;
- e.doit = event.doit;
- notifyListeners(SWT.Selection, e);
- event.doit = e.doit;
- break;
- }
- case SWT.Traverse: {
- switch (event.detail) {
- case SWT.TRAVERSE_RETURN:
- case SWT.TRAVERSE_ESCAPE:
- case SWT.TRAVERSE_ARROW_PREVIOUS:
- case SWT.TRAVERSE_ARROW_NEXT:
- event.doit = false;
- break;
- }
- Event e = new Event();
- e.time = event.time;
- e.detail = event.detail;
- e.doit = event.doit;
- e.character = event.character;
- e.keyCode = event.keyCode;
- notifyListeners(SWT.Traverse, e);
- event.doit = e.doit;
- event.detail = e.detail;
- break;
- }
- case SWT.KeyUp: {
- Event e = new Event();
- e.time = event.time;
- e.character = event.character;
- e.keyCode = event.keyCode;
- e.stateMask = event.stateMask;
- notifyListeners(SWT.KeyUp, e);
- break;
- }
- case SWT.KeyDown: {
- if (event.character == SWT.ESC) {
- // Escape key cancels popup list
- dropDown(false);
- }
- if ((event.stateMask & SWT.ALT) != 0
- && (event.keyCode == SWT.ARROW_UP || event.keyCode == SWT.ARROW_DOWN)) {
- dropDown(false);
- }
- if (event.character == SWT.CR) {
- // Enter causes default selection
- dropDown(false);
- Event e = new Event();
- e.time = event.time;
- e.stateMask = event.stateMask;
- notifyListeners(SWT.DefaultSelection, e);
- }
- // At this point the widget may have been disposed.
- // If so, do not continue.
- if (isDisposed()) {
- break;
- }
- Event e = new Event();
- e.time = event.time;
- e.character = event.character;
- e.keyCode = event.keyCode;
- e.stateMask = event.stateMask;
- notifyListeners(SWT.KeyDown, e);
- break;
-
- }
- }
- }
-
- void popupEvent(Event event) {
- switch (event.type) {
- case SWT.Paint:
- // draw black rectangle around list
- Rectangle listRect = table.getBounds();
- Color black = getDisplay().getSystemColor(SWT.COLOR_BLACK);
- event.gc.setForeground(black);
- event.gc.drawRectangle(0, 0, listRect.width + 1,
- listRect.height + 1);
- break;
- case SWT.Close:
- event.doit = false;
- dropDown(false);
- break;
- case SWT.Deactivate:
- dropDown(false);
- break;
- }
- }
-
- public void redraw() {
- super.redraw();
- text.redraw();
- arrow.redraw();
- if (popup.isVisible()) {
- table.redraw();
- }
- }
-
- public void redraw(int x, int y, int width, int height, boolean all) {
- super.redraw(x, y, width, height, true);
- }
-
- /**
- * Removes the item from the receiver's list at the given zero-relative
- * index.
- *
- * @param index
- * the index for the item
- *
- * @exception IllegalArgumentException
- * <ul>
- * <li>ERROR_INVALID_RANGE - if the index is not between 0
- * and the number of elements in the list minus 1 (inclusive)</li>
- * </ul>
- * @exception org.eclipse.swt.SWTException
- * <ul>
- * <li>ERROR_WIDGET_DISPOSED - if the receiver has been
- * disposed</li>
- * <li>ERROR_THREAD_INVALID_ACCESS - if not called from the
- * thread that created the receiver</li>
- * </ul>
- */
- public void remove(int index) {
- checkWidget();
- table.remove(index);
- }
-
- /**
- * Removes the items from the receiver's list which are between the given
- * zero-relative start and end indices (inclusive).
- *
- * @param start
- * the start of the range
- * @param end
- * the end of the range
- *
- * @exception IllegalArgumentException
- * <ul>
- * <li>ERROR_INVALID_RANGE - if either the start or end are
- * not between 0 and the number of elements in the list minus
- * 1 (inclusive)</li>
- * </ul>
- * @exception org.eclipse.swt.SWTException
- * <ul>
- * <li>ERROR_WIDGET_DISPOSED - if the receiver has been
- * disposed</li>
- * <li>ERROR_THREAD_INVALID_ACCESS - if not called from the
- * thread that created the receiver</li>
- * </ul>
- */
- public void remove(int start, int end) {
- checkWidget();
- table.remove(start, end);
- }
-
- /**
- * Searches the receiver's list starting at the first item until an item is
- * found that is equal to the argument, and removes that item from the list.
- *
- * @param string
- * the item to remove
- *
- * @exception IllegalArgumentException
- * <ul>
- * <li>ERROR_NULL_ARGUMENT - if the string is null</li>
- * <li>ERROR_INVALID_ARGUMENT - if the string is not found
- * in the list</li>
- * </ul>
- * @exception org.eclipse.swt.SWTException
- * <ul>
- * <li>ERROR_WIDGET_DISPOSED - if the receiver has been
- * disposed</li>
- * <li>ERROR_THREAD_INVALID_ACCESS - if not called from the
- * thread that created the receiver</li>
- * </ul>
- */
- public void remove(String string) {
- checkWidget();
- if (string == null) {
- SWT.error(SWT.ERROR_NULL_ARGUMENT);
- }
- int index = Arrays.asList(getTableItems()).indexOf(string);
- table.remove(index);
- }
-
- /**
- * Removes all of the items from the receiver's list and clear the contents
- * of receiver's text field.
- * <p>
- *
- * @exception org.eclipse.swt.SWTException
- * <ul>
- * <li>ERROR_WIDGET_DISPOSED - if the receiver has been
- * disposed</li>
- * <li>ERROR_THREAD_INVALID_ACCESS - if not called from the
- * thread that created the receiver</li>
- * </ul>
- */
- public void removeAll() {
- checkWidget();
- text.setText(""); //$NON-NLS-1$
- table.removeAll();
- }
-
- /**
- * Removes the listener from the collection of listeners who will be
- * notified when the receiver's text is modified.
- *
- * @param listener1
- * the listener which should no longer be notified
- *
- * @exception IllegalArgumentException
- * <ul>
- * <li>ERROR_NULL_ARGUMENT - if the listener is null</li>
- * </ul>
- * @exception org.eclipse.swt.SWTException
- * <ul>
- * <li>ERROR_WIDGET_DISPOSED - if the receiver has been
- * disposed</li>
- * <li>ERROR_THREAD_INVALID_ACCESS - if not called from the
- * thread that created the receiver</li>
- * </ul>
- *
- * @see ModifyListener
- * @see #addModifyListener
- */
- public void removeModifyListener(ModifyListener listener1) {
- checkWidget();
- if (listener1 == null) {
- SWT.error(SWT.ERROR_NULL_ARGUMENT);
- }
- removeListener(SWT.Modify, listener1);
- }
-
- /**
- * Removes the listener from the collection of listeners who will be
- * notified when the receiver's selection changes.
- *
- * @param listener1
- * the listener which should no longer be notified
- *
- * @exception IllegalArgumentException
- * <ul>
- * <li>ERROR_NULL_ARGUMENT - if the listener is null</li>
- * </ul>
- * @exception org.eclipse.swt.SWTException
- * <ul>
- * <li>ERROR_WIDGET_DISPOSED - if the receiver has been
- * disposed</li>
- * <li>ERROR_THREAD_INVALID_ACCESS - if not called from the
- * thread that created the receiver</li>
- * </ul>
- *
- * @see SelectionListener
- * @see #addSelectionListener
- */
- public void removeSelectionListener(SelectionListener listener1) {
- checkWidget();
- if (listener1 == null) {
- SWT.error(SWT.ERROR_NULL_ARGUMENT);
- }
- removeListener(SWT.Selection, listener1);
- removeListener(SWT.DefaultSelection, listener1);
- }
-
- /**
- * Selects the item at the given zero-relative index in the receiver's list.
- * If the item at the index was already selected, it remains selected.
- * Indices that are out of range are ignored.
- *
- * @param index
- * the index of the item to select
- *
- * @exception org.eclipse.swt.SWTException
- * <ul>
- * <li>ERROR_WIDGET_DISPOSED - if the receiver has been
- * disposed</li>
- * <li>ERROR_THREAD_INVALID_ACCESS - if not called from the
- * thread that created the receiver</li>
- * </ul>
- */
- public void select(int index) {
- checkWidget();
- if (index == -1) {
- table.deselectAll();
- text.setText(""); //$NON-NLS-1$
- return;
- }
- if (0 <= index && index < table.getItemCount()) {
- if (index != getSelectionIndex()) {
- text.setText(table.getItem(index).getText());
- text.selectAll();
- table.select(index);
- table.showSelection();
- }
- }
- }
-
- public void setBackground(Color color) {
- super.setBackground(color);
- background = color;
- if (text != null) {
- text.setBackground(color);
- }
- if (table != null) {
- table.setBackground(color);
- }
- if (arrow != null) {
- arrow.setBackground(color);
- }
- }
-
- /**
- * Sets the editable state.
- *
- * @param editable
- * the new editable state
- *
- * @exception org.eclipse.swt.SWTException
- * <ul>
- * <li>ERROR_WIDGET_DISPOSED - if the receiver has been
- * disposed</li>
- * <li>ERROR_THREAD_INVALID_ACCESS - if not called from the
- * thread that created the receiver</li>
- * </ul>
- *
- * @since 3.0
- */
- public void setEditable(boolean editable) {
- checkWidget();
- text.setEditable(editable);
- }
-
- public void setEnabled(boolean enabled) {
- super.setEnabled(enabled);
- if (popup != null) {
- popup.setVisible(false);
- }
- if (text != null) {
- text.setEnabled(enabled);
- }
- if (arrow != null) {
- arrow.setEnabled(enabled);
- }
- }
-
- public boolean setFocus() {
- checkWidget();
- return text.setFocus();
- }
-
- public void setFont(Font font) {
- super.setFont(font);
- this.font = font;
- text.setFont(font);
- table.setFont(font);
- internalLayout(true);
- }
-
- public void setForeground(Color color) {
- super.setForeground(color);
- foreground = color;
- if (text != null) {
- text.setForeground(color);
- }
- if (table != null) {
- table.setForeground(color);
- }
- if (arrow != null) {
- arrow.setForeground(color);
- }
- }
-
- /**
- * Sets the text of the item in the receiver's list at the given
- * zero-relative index to the string argument. This is equivalent to
- * <code>remove</code>'ing the old item at the index, and then
- * <code>add</code>'ing the new item at that index.
- *
- * @param index
- * the index for the item
- * @param string
- * the new text for the item
- *
- * @exception IllegalArgumentException
- * <ul>
- * <li>ERROR_INVALID_RANGE - if the index is not between 0
- * and the number of elements in the list minus 1 (inclusive)</li>
- * <li>ERROR_NULL_ARGUMENT - if the string is null</li>
- * </ul>
- * @exception org.eclipse.swt.SWTException
- * <ul>
- * <li>ERROR_WIDGET_DISPOSED - if the receiver has been
- * disposed</li>
- * <li>ERROR_THREAD_INVALID_ACCESS - if not called from the
- * thread that created the receiver</li>
- * </ul>
- */
- public void setItem(int index, String string) {
- checkWidget();
- table.getItem(index).setText(0, string);
- }
-
- /**
- * Sets the receiver's list to be the given array of items.
- *
- * @param items
- * the array of items
- *
- * @exception IllegalArgumentException
- * <ul>
- * <li>ERROR_NULL_ARGUMENT - if the items array is null</li>
- * <li>ERROR_INVALID_ARGUMENT - if an item in the items
- * array is null</li>
- * </ul>
- * @exception org.eclipse.swt.SWTException
- * <ul>
- * <li>ERROR_WIDGET_DISPOSED - if the receiver has been
- * disposed</li>
- * <li>ERROR_THREAD_INVALID_ACCESS - if not called from the
- * thread that created the receiver</li>
- * </ul>
- */
- public void setItems(String[] items) {
- checkWidget();
- if (items == null) {
- SWT.error(SWT.ERROR_NULL_ARGUMENT);
- }
-
- for (int i = 0; i < items.length; i++) {
- TableItem item = new TableItem(table, SWT.NONE);
- if (items[i].equals(defaultValue)) {
- item.setFont(JFaceResources.getFontRegistry().getBold(
- JFaceResources.DEFAULT_FONT));
- }
- item.setText(0, items[i]);
- }
- }
-
- /**
- * Sets the layout which is associated with the receiver to be the argument
- * which may be null.
- * <p>
- * Note : No Layout can be set on this Control because it already manages
- * the size and position of its children.
- * </p>
- *
- * @param layout
- * the receiver's new layout or null
- *
- * @exception org.eclipse.swt.SWTException
- * <ul>
- * <li>ERROR_WIDGET_DISPOSED - if the receiver has been
- * disposed</li>
- * <li>ERROR_THREAD_INVALID_ACCESS - if not called from the
- * thread that created the receiver</li>
- * </ul>
- */
- public void setLayout(Layout layout) {
- checkWidget();
- return;
- }
-
- /**
- * Sets the selection in the receiver's text field to the range specified by
- * the argument whose x coordinate is the start of the selection and whose y
- * coordinate is the end of the selection.
- *
- * @param selection
- * a point representing the new selection start and end
- *
- * @exception IllegalArgumentException
- * <ul>
- * <li>ERROR_NULL_ARGUMENT - if the point is null</li>
- * </ul>
- * @exception org.eclipse.swt.SWTException
- * <ul>
- * <li>ERROR_WIDGET_DISPOSED - if the receiver has been
- * disposed</li>
- * <li>ERROR_THREAD_INVALID_ACCESS - if not called from the
- * thread that created the receiver</li>
- * </ul>
- */
- public void setSelection(Point selection) {
- checkWidget();
- if (selection == null) {
- SWT.error(SWT.ERROR_NULL_ARGUMENT);
- }
- text.setSelection(selection.x, selection.y);
- }
-
- /**
- * Sets the contents of the receiver's text field to the given string.
- * <p>
- * Note: The text field in a <code>Combo</code> is typically only capable
- * of displaying a single line of text. Thus, setting the text to a string
- * containing line breaks or other special characters will probably cause it
- * to display incorrectly.
- * </p>
- *
- * @param string
- * the new text
- *
- * @exception IllegalArgumentException
- * <ul>
- * <li>ERROR_NULL_ARGUMENT - if the string is null</li>
- * </ul>
- * @exception org.eclipse.swt.SWTException
- * <ul>
- * <li>ERROR_WIDGET_DISPOSED - if the receiver has been
- * disposed</li>
- * <li>ERROR_THREAD_INVALID_ACCESS - if not called from the
- * thread that created the receiver</li>
- * </ul>
- */
- public void setText(String string) {
- checkWidget();
- if (string == null) {
- SWT.error(SWT.ERROR_NULL_ARGUMENT);
- }
- int index = Arrays.asList(getTableItems()).indexOf(string);
- if (index == -1) {
- table.deselectAll();
- text.setText(string);
- return;
- }
- text.setText(string);
- text.selectAll();
- table.setSelection(index);
- table.showSelection();
- }
-
- /**
- * Sets the maximum number of characters that the receiver's text field is
- * capable of holding to be the argument.
- *
- * @param limit
- * new text limit
- *
- * @exception IllegalArgumentException
- * <ul>
- * <li>ERROR_CANNOT_BE_ZERO - if the limit is zero</li>
- * </ul>
- * @exception org.eclipse.swt.SWTException
- * <ul>
- * <li>ERROR_WIDGET_DISPOSED - if the receiver has been
- * disposed</li>
- * <li>ERROR_THREAD_INVALID_ACCESS - if not called from the
- * thread that created the receiver</li>
- * </ul>
- */
- public void setTextLimit(int limit) {
- checkWidget();
- text.setTextLimit(limit);
- }
-
- public void setToolTipText(String string) {
- checkWidget();
- super.setToolTipText(string);
- arrow.setToolTipText(string);
- text.setToolTipText(string);
- }
-
- public void setVisible(boolean visible) {
- super.setVisible(visible);
- if (!visible) {
- popup.setVisible(false);
- }
- }
-
- /**
- * Sets the number of items that are visible in the drop down portion of the
- * receiver's list.
- *
- * @param count
- * the new number of items to be visible
- *
- * @exception org.eclipse.swt.SWTException
- * <ul>
- * <li>ERROR_WIDGET_DISPOSED - if the receiver has been
- * disposed</li>
- * <li>ERROR_THREAD_INVALID_ACCESS - if not called from the
- * thread that created the receiver</li>
- * </ul>
- *
- * @since 3.0
- */
- public void setVisibleItemCount(int count) {
- checkWidget();
- if (count < 0) {
- return;
- }
- visibleItemCount = count;
- }
-
- String stripMnemonic(String string) {
- int index = 0;
- int length = string.length();
- do {
- while ((index < length) && (string.charAt(index) != '&')) {
- index++;
- }
- if (++index >= length) {
- return string;
- }
- if (string.charAt(index) != '&') {
- return string.substring(0, index - 1)
- + string.substring(index, length);
- }
- index++;
- } while (index < length);
- return string;
- }
-
- void textEvent(Event event) {
- switch (event.type) {
- case SWT.FocusIn: {
- handleFocus(SWT.FocusIn);
- break;
- }
- case SWT.KeyDown: {
- if (event.character == SWT.CR) {
- dropDown(false);
- Event e = new Event();
- e.time = event.time;
- e.stateMask = event.stateMask;
- notifyListeners(SWT.DefaultSelection, e);
- }
- // At this point the widget may have been disposed.
- // If so, do not continue.
- if (isDisposed()) {
- break;
- }
-
- if (event.keyCode == SWT.ARROW_UP
- || event.keyCode == SWT.ARROW_DOWN) {
- event.doit = false;
- if ((event.stateMask & SWT.ALT) != 0) {
- boolean dropped = isDropped();
- text.selectAll();
- if (!dropped) {
- setFocus();
- }
- dropDown(!dropped);
- break;
- }
-
- int oldIndex = getSelectionIndex();
- if (event.keyCode == SWT.ARROW_UP) {
- select(Math.max(oldIndex - 1, 0));
- } else {
- select(Math.min(oldIndex + 1, getItemCount() - 1));
- }
- if (oldIndex != getSelectionIndex()) {
- Event e = new Event();
- e.time = event.time;
- e.stateMask = event.stateMask;
- notifyListeners(SWT.Selection, e);
- }
- // At this point the widget may have been disposed.
- // If so, do not continue.
- if (isDisposed()) {
- break;
- }
- }
-
- // Further work : Need to add support for incremental search in
- // pop up list as characters typed in text widget
-
- Event e = new Event();
- e.time = event.time;
- e.character = event.character;
- e.keyCode = event.keyCode;
- e.stateMask = event.stateMask;
- notifyListeners(SWT.KeyDown, e);
- break;
- }
- case SWT.KeyUp: {
- Event e = new Event();
- e.time = event.time;
- e.character = event.character;
- e.keyCode = event.keyCode;
- e.stateMask = event.stateMask;
- notifyListeners(SWT.KeyUp, e);
- break;
- }
- case SWT.Modify: {
- table.deselectAll();
- Event e = new Event();
- e.time = event.time;
- notifyListeners(SWT.Modify, e);
- break;
- }
- case SWT.MouseDown: {
- if (event.button != 1) {
- return;
- }
- if (text.getEditable()) {
- return;
- }
- boolean dropped = isDropped();
- text.selectAll();
- if (!dropped) {
- setFocus();
- }
- dropDown(!dropped);
- break;
- }
- case SWT.MouseUp: {
- if (event.button != 1) {
- return;
- }
- if (text.getEditable()) {
- return;
- }
- text.selectAll();
- break;
- }
- case SWT.Traverse: {
- switch (event.detail) {
- case SWT.TRAVERSE_RETURN:
- case SWT.TRAVERSE_ARROW_PREVIOUS:
- case SWT.TRAVERSE_ARROW_NEXT:
- // The enter causes default selection and
- // the arrow keys are used to manipulate the list contents so
- // do not use them for traversal.
- event.doit = false;
- break;
- }
-
- Event e = new Event();
- e.time = event.time;
- e.detail = event.detail;
- e.doit = event.doit;
- e.character = event.character;
- e.keyCode = event.keyCode;
- notifyListeners(SWT.Traverse, e);
- event.doit = e.doit;
- event.detail = e.detail;
- break;
- }
- }
- }
-
- /**
- * @param defaultValue
- */
- public void setDefaultValue(String defaultValue) {
- this.defaultValue = defaultValue;
- int index = Arrays.asList(getTableItems()).indexOf(defaultValue);
- if (index != -1) {
- table.getItem(index).setFont(
- JFaceResources.getFontRegistry().getBold(
- JFaceResources.DEFAULT_FONT));
- }
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/utils/UTF8Util.java b/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/utils/UTF8Util.java
deleted file mode 100644
index 31aac19..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/utils/UTF8Util.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.common.ui.internal.utils;
-
-/**
- * TODO: this class doesn't seem to be in use
- * @author mengbo
- * @version 1.5
- */
-public final class UTF8Util {
- private static final char[] HEX_DIGITS = { '0', '1', '2', '3', '4', '5',
- '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F' };
-
- /**
- * @param s
- * @return the unwound string
- */
- public static String unwindEscapeChars(String s) {
- StringBuffer sb = new StringBuffer(s.length());
- int length = s.length();
- for (int i = 0; i < length; i++) {
- char c = s.charAt(i);
- sb.append(getUnwoundString(c));
- }
- return sb.toString();
- }
-
- private static String getUnwoundString(char c) {
- switch (c) {
- case '\b':
- return "\\b";//$NON-NLS-1$
- case '\t':
- return "\\t";//$NON-NLS-1$
- case '\n':
- return "\\n";//$NON-NLS-1$
- case '\f':
- return "\\f";//$NON-NLS-1$
- case '\r':
- return "\\r";//$NON-NLS-1$
-
- // These can be used unescaped in properties file:
- case '\"':
- return "\\\"";//$NON-NLS-1$
- case '\'':
- return "\\\'";//$NON-NLS-1$
-
- case '\\':
- return "\\\\";//$NON-NLS-1$
-
- case '=':
- return "\\=";//$NON-NLS-1$
-
- // This is only done when writing to the .properties file in
- // #unwindValue(String)
- // case '!':
- // return "\\!";//$NON-NLS-1$
- // case '#':
- // return "\\#";//$NON-NLS-1$
-
- default:
- if (((c < 0x0020) || (c > 0x007e))) {
- return new StringBuffer().append('\\').append('u').append(
- toHex((c >> 12) & 0xF)).append(toHex((c >> 8) & 0xF))
- .append(toHex((c >> 4) & 0xF)).append(toHex(c & 0xF))
- .toString();
-
- }
- return String.valueOf(c);
- }
- }
-
- private static char toHex(int halfByte) {
- return HEX_DIGITS[(halfByte & 0xF)];
- }
-
- private UTF8Util()
- {
- // no instantiation
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/utils/WebrootUtil.java b/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/utils/WebrootUtil.java
deleted file mode 100644
index 3a99bf3..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/utils/WebrootUtil.java
+++ /dev/null
@@ -1,268 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.common.ui.internal.utils;
-
-import java.util.Arrays;
-import java.util.Iterator;
-import java.util.Set;
-
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.content.IContentType;
-import org.eclipse.core.runtime.content.IContentTypeManager;
-import org.eclipse.jst.jsf.common.ui.IFileFolderConstants;
-import org.eclipse.jst.jsf.common.ui.JSFUICommonPlugin;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.componentcore.resources.IVirtualFolder;
-import org.eclipse.wst.common.project.facet.core.IFacetedProject;
-import org.eclipse.wst.common.project.facet.core.IProjectFacet;
-import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
-import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
-
-/**
- * Web app utility methods
- */
-public class WebrootUtil {
-
- /**
- * get the webpath for the project path. The project path is something like
- * "/projectname/webroot/filename.jsp", or "/projectname/webroot/folder".
- * The project information should be removed from project path, e.g,
- * "/filename.jsp" or "/folder/*";
- *
- * @param path
- * @return the web path
- */
- public static String getWebPath(IPath path) {
- String strWebrootPath = ""; //$NON-NLS-1$
- IProject project = WorkspaceUtil.getProjectFor(path);
- IPath webContentPath = getWebContentPath(project);
- if (webContentPath != null && webContentPath.isPrefixOf(path)) {
- int start = path.matchingFirstSegments(webContentPath);
- String[] segments = path.segments();
- for (int i = start, n = path.segmentCount(); i < n; i++) {
- strWebrootPath = strWebrootPath
- + IFileFolderConstants.PATH_SEPARATOR + segments[i];
- }
- }
- return strWebrootPath;
- }
-
- /**
- * To see if a resource is under the webcontent folder.
- *
- * @param resource
- * @return true if resource is within the web content folder hierarchy
- */
- public static boolean isUnderWebContentFolder(IResource resource) {
- IPath webContentPath = getWebContentPath(resource.getProject());
- if (webContentPath != null) {
- return webContentPath.isPrefixOf(resource.getFullPath());
- }
- return true;
- }
-
- /**
- * @param project
- * @return full path to web content folder
- */
- public static IPath getWebContentPath(IProject project) {
- if (project != null) {
- IVirtualComponent component = ComponentCore.createComponent(project);
- if (component != null) {
- IVirtualFolder rootFolder = component.getRootFolder();
- if (rootFolder != null) {
- IContainer underlyingFolder = rootFolder.getUnderlyingFolder();
- if (underlyingFolder != null) {
- return underlyingFolder.getFullPath();
- }
- }
- }
- }
- return null;
- }
-
- /**
- * Return the name of the web content folder. i.e, "WebContent"
- *
- * @param project
- * @return the web content folder name
- */
- public static String getWebContentFolderName(IProject project) {
- IPath webContentPath = getWebContentPath(project);
- if (webContentPath != null)
- return webContentPath.lastSegment();
- return null;
- }
-
- /**
- * @param project
- * @return folder where for web content
- */
- public static IFolder getWebContentFolder(IProject project) {
- IPath webContentPath = getWebContentPath(project);
- IFolder folder = null;
- if (webContentPath != null) {
- folder = project.getFolder(webContentPath.removeFirstSegments(1));
- }
- return folder;
- }
-
- /**
- * return the depth of webcontent folder. For example, if the webcontent
- * folder path is /projectname/webContent, then return 2, if it's
- * /projectname/a/webContent, then return 3.
- *
- * @param project
- * @return the depth of webcontent folder
- */
- public static int getWebContentFolderDepth(IProject project) {
- if (project != null) {
- IPath webContentPath = getWebContentPath(project);
- if (webContentPath != null) {
- return webContentPath.segmentCount();
- }
- }
- // default to 2
- return 2;
- }
-
- /**
- * determine the path of web file is valid or not
- *
- * @param path -
- * the path of web file
- * @return - true - valid web file
- */
- public static boolean isValidWebFile(IPath path) {
- String[] jspExtensions = getJSPFileExtensions();
-
- String extension = path.getFileExtension();
- if (extension != null
- && Arrays.asList(jspExtensions).contains(extension))
- {
- return true;
- }
-
- return false;
- }
-
- /**
- * get the webpath for the project path. The project path is something like
- * "/projectname/webroot/filename.jsp", or "/projectname/webroot/folder".
- * The project information should be removed from project path, e.g,
- * "/filename.jsp" or "/folder/*";
- *
- * @param strPath -
- * the project path
- * @return - web path remove from "/projectname/webroot"
- * @deprecated use getWebPath(IPath path) instead.
- */
- public static String getWebPath(String strPath) {
- String strWebrootPath = ""; //$NON-NLS-1$
- if (strPath != null) {
- IPath path = new Path(strPath);
- return getWebPath(path);
- }
- return strWebrootPath;
- }
-
- /**
- * @param strWebPath
- * @return the page name
- */
- public static String getPageNameFromWebPath(String strWebPath) {
- String pageName = strWebPath;
-
- if (pageName.startsWith(IFileFolderConstants.PATH_SEPARATOR)) {
- pageName = pageName.substring(1);
- }
-
- String[] jspExtensions = getJSPFileExtensions();
- for (int i = 0, n = jspExtensions.length; i < n; i++) {
- String extension = IFileFolderConstants.DOT + jspExtensions[i];
- if (pageName.endsWith(extension)) {
- pageName = pageName.substring(0, pageName.length()
- - extension.length());
- break;
- }
- }
-
- return pageName;
- }
- /**
- * Get the JSP file extension from Eclipse preference
- * Windows->Preferences->General->Content Types
- *
- * @return String Array for JSP file extensions
- */
- public static String[] getJSPFileExtensions() {
- IContentTypeManager typeManager = Platform.getContentTypeManager();
- IContentType jspContentType = typeManager
- .getContentType("org.eclipse.jst.jsp.core.jspsource"); //$NON-NLS-1$
- if (jspContentType != null) {
- return jspContentType
- .getFileSpecs(IContentType.FILE_EXTENSION_SPEC);
- }
- return null;
- }
-
- /**
- * Tests if the passed IProject instance is a valid JSF project in the
- * following ways:
- * <ul>
- * <li>project is not null and is accessible, </li>
- * <li>project has the "jst.web" facet set on it.</li>
- * </ul>
- *
- * @param project
- * IProject instance to be tested.
- * @return true if the IProject instance is a valid JSF project, else false.
- */
- public static boolean isValidWebProject(IProject project) {
- boolean isValid = false;
- // check for null or inaccessible project
- if (project != null && project.isAccessible()) {
- // TODO: this was jst.jsf before, but we are checking for jst.web
- // the javadoc seems out of sync with the method name
- // check for "jst.web" facet on project
- try {
- IFacetedProject facetedProject = ProjectFacetsManager
- .create(project);
- if (facetedProject != null) {
- Set projectFacets = facetedProject.getProjectFacets();
- Iterator itProjectFacets = projectFacets.iterator();
- while (itProjectFacets.hasNext()) {
- IProjectFacetVersion projectFacetVersion = (IProjectFacetVersion) itProjectFacets
- .next();
- IProjectFacet projectFacet = projectFacetVersion
- .getProjectFacet();
- if ("jst.web".equals(projectFacet.getId())) { //$NON-NLS-1$
- isValid = true;
- break;
- }
- }
- }
- } catch (CoreException ce) {
- JSFUICommonPlugin.getLogger(WebrootUtil.class).error("checking web project", ce); //$NON-NLS-1$
- }
- }
- return isValid;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/utils/WorkspaceUtil.java b/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/utils/WorkspaceUtil.java
deleted file mode 100644
index 6c5dcba..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common.ui/src/org/eclipse/jst/jsf/common/ui/internal/utils/WorkspaceUtil.java
+++ /dev/null
@@ -1,283 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.common.ui.internal.utils;
-
-import java.io.ByteArrayInputStream;
-import java.io.File;
-import java.io.InputStream;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IWorkspaceRunnable;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jst.jsf.common.ui.IFileFolderConstants;
-import org.eclipse.jst.jsf.common.ui.JSFUICommonPlugin;
-import org.eclipse.jst.jsf.common.ui.internal.logging.Logger;
-
-/**
- * TODO: This class should be abstract to common utility.
- *
- * This class implements management of resource in a workspace.
- */
-public final class WorkspaceUtil {
- /** log instance */
- private static final Logger log = JSFUICommonPlugin
- .getLogger(WorkspaceUtil.class);
-
- private WorkspaceUtil() {
- // no external instantiation
- }
-
- /**
- * Create the given file in the workspace resource info tree.
- * @param resource
- * @param contents
- */
- public static void ensureExistsInWorkspace(final IFile resource,
- final InputStream contents) {
- if (resource == null) {
- return;
- }
- IWorkspaceRunnable body = new IWorkspaceRunnable() {
- public void run(IProgressMonitor monitor) throws CoreException {
- if (resource.exists()) {
- resource.setContents(contents, true, false, null);
- } else {
- ensureExistsInWorkspace(resource.getParent(), true);
- resource.create(contents, true, null);
- }
- }
- };
- try {
- ResourcesPlugin.getWorkspace().run(body, null);
- } catch (CoreException e) {
- // Test.EclipseWorkspaceTest.Error.FileCreationInWorkspace = Fail in
- // creating file:{0} in the workspace resource info tree.
- log
- .error(
- "Test.EclipseWorkspaceTest.Error.FileCreationInWorkspace", resource.getName(), e);//$NON-NLS-1$
- }
- }
-
- /**
- * Create the given file in the workspace resource info tree.
- * @param resource
- * @param contents
- */
- public static void ensureExistsInWorkspace(IFile resource, String contents) {
- // FIXME: We'll need some way for handing file encoding.
- ensureExistsInWorkspace(resource, new ByteArrayInputStream(contents
- .getBytes()));
- }
-
- /**
- * Create the given resource in the workspace resource info tree.
- * @param resource
- * @param local
- */
- public static void ensureExistsInWorkspace(final IResource resource,
- final boolean local) {
- IWorkspaceRunnable body = new IWorkspaceRunnable() {
- public void run(IProgressMonitor monitor) throws CoreException {
- create(resource, local);
- }
- };
- try {
- ResourcesPlugin.getWorkspace().run(body, null);
- } catch (CoreException e) {
- // Test.EclipseWorkspaceTest.Error.ResourceCreationInWorkspace =
- // Fail in creating resource:{0} in the workspace resource info
- // tree.
- log
- .error(
- "Test.EclipseWorkspaceTest.Error.ResourceCreationInWorkspace", resource.getName(), e);//$NON-NLS-1$
- }
- }
-
- /**
- * crate the resource if the resource is not existed, create a new one.
- *
- * @param resource -
- * resource instance
- * @param local -
- * a flag controlling whether or not the folder will be local
- * after the creation
- * @throws CoreException
- */
- protected static void create(final IResource resource, boolean local)
- throws CoreException {
- if (resource == null || resource.exists()) {
- return;
- }
- if (!resource.getParent().exists()) {
- create(resource.getParent(), local);
- }
- switch (resource.getType()) {
- case IResource.FILE:
- ((IFile) resource).create(local ? new ByteArrayInputStream(
- new byte[0]) : null, true, getMonitor());
- break;
- case IResource.FOLDER:
- ((IFolder) resource).create(true, local, getMonitor());
- break;
- case IResource.PROJECT:
- ((IProject) resource).create(getMonitor());
- ((IProject) resource).open(getMonitor());
- break;
- }
- }
-
- /**
- * create and return a NullProgressMonitor
- *
- * @return - NullProgressMonitor
- */
- public static IProgressMonitor getMonitor() {
- return new NullProgressMonitor();
- }
-
- /**
- * Get the project reference for a given path
- *
- * @param path -
- * the path
- * @return IProject - the project reference
- */
- public static IProject getProjectFor(IPath path) {
- String[] segs = path.segments();
- String projectPath = new String();
- IProject[] projects = ResourcesPlugin.getWorkspace().getRoot()
- .getProjects();
- IProject project = null;
- for (int p = 0; p < projects.length; p++) {
- if (projects[p].isOpen()) {
- for (int s = 0; s < segs.length; s++) {
- if (segs[s].equalsIgnoreCase(projects[p].getName())) {
- // Once we have a match on the project name, then
- // the remainder of the segments equals the project path
- for (int s2 = s + 1; s2 < segs.length; s2++) {
- projectPath = projectPath
- + IFileFolderConstants.PATH_SEPARATOR
- + segs[s2];
- }
- project = projects[p];
- break;
- }
- }
- }
- }
- if (project == null) {
- return null;
- }
-
- // TODO: still don't understand why this refreshLocal is necessary
- // for now, going to only allow it if this method is called
- // when the tree isn't locked. This shouldn't cause a regression, since
- // when the call fails currently things keep on going due to the catch
- if (!project.getWorkspace().isTreeLocked())
- {
- try {
- project.refreshLocal(IResource.DEPTH_INFINITE, null);
- } catch (CoreException e) {
- // TODO C.B.:pushing this down to a warning because it creates really
- // spurious output. Don't know why we are calling refreshLocal at all.
- JSFUICommonPlugin.getLogger(WorkspaceUtil.class).info("Error.RefreshingLocal", e); //$NON-NLS-1$
- }
- }
-
- IResource res = project.findMember(new Path(projectPath));
- if ((res != null) && (res.exists())) {
- return project;
- }
- return null;
- }
-
- /**
- * Get the project reference for a given file
- *
- * @param file -
- * the IFile file reference
- * @return IProject - the project reference
- */
- public static IProject getProjectFor(IFile file) {
- IPath testPath = new Path(file.getFullPath().toOSString());
- return getProjectFor(testPath);
- }
-
- /**
- * Get the project reference for a given file
- *
- * @param file -
- * the File file reference
- * @return IProject - the project reference
- */
- public static IProject getProjectFor(File file) {
- IPath testPath = new Path(file.getAbsolutePath());
- return getProjectFor(testPath);
- }
-
- /**
- * Get the project-relative resource reference for a given path
- *
- * @param path -
- * the path
- * @return IResource - the project-relative resource
- */
- public static IResource getProjectRelativeResource(IPath path) {
- String[] segs = path.segments();
- String projectPath = new String();
- IProject[] projects = ResourcesPlugin.getWorkspace().getRoot()
- .getProjects();
- IProject project = null;
- for (int p = 0; p < projects.length; p++) {
- if (projects[p].isOpen()) {
- for (int s = 0; s < segs.length; s++) {
- if (segs[s].equalsIgnoreCase(projects[p].getName())) {
- // Once we have a match on the project name, then
- // the remainder of the segments equals the project path
- for (int s2 = s + 1; s2 < segs.length; s2++) {
- projectPath = projectPath
- + IFileFolderConstants.PATH_SEPARATOR
- + segs[s2];
- }
- project = projects[p];
- break;
- }
- }
- }
- }
- if (project == null) {
- return null;
- }
-
- return project.getFile(projectPath);
- }
-
- /**
- * Get the project-relative resource reference for a given file
- *
- * @param file -
- * the File file reference
- * @return IResource - the project-relative resource
- */
- public static IResource getProjectRelativeResource(File file) {
- IPath testPath = new Path(file.getAbsolutePath());
- return getProjectRelativeResource(testPath);
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/.classpath b/jsf/plugins/org.eclipse.jst.jsf.common/.classpath
deleted file mode 100644
index 304e861..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/.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/jsf/plugins/org.eclipse.jst.jsf.common/.cvsignore b/jsf/plugins/org.eclipse.jst.jsf.common/.cvsignore
deleted file mode 100644
index 2a89e4b..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/.cvsignore
+++ /dev/null
@@ -1,4 +0,0 @@
-bin
-@dot
-build.xml
-javaCompiler...args
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/.options b/jsf/plugins/org.eclipse.jst.jsf.common/.options
deleted file mode 100644
index be5aa7c..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/.options
+++ /dev/null
@@ -1,3 +0,0 @@
-org.eclipse.jst.jsf.common/debug=false
-org.eclipse.jst.jsf.common/debug/metadataload=false
-org.eclipse.jst.jsf.common/debug/lifecyclelistener=false
\ No newline at end of file
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/.project b/jsf/plugins/org.eclipse.jst.jsf.common/.project
deleted file mode 100644
index 8bd8da5..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.jst.jsf.common</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/jsf/plugins/org.eclipse.jst.jsf.common/.settings/org.eclipse.core.resources.prefs b/jsf/plugins/org.eclipse.jst.jsf.common/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index ae7ce73..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Sun May 27 16:00:59 EDT 2007
-eclipse.preferences.version=1
-encoding/<project>=ISO-8859-1
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/.settings/org.eclipse.jdt.core.prefs b/jsf/plugins/org.eclipse.jst.jsf.common/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 4d97a0d..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,89 +0,0 @@
-#Tue Apr 13 15:17:09 PDT 2010
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.doc.comment.support=enabled
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.autoboxing=warning
-org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning
-org.eclipse.jdt.core.compiler.problem.deadCode=warning
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=ignore
-org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
-org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled
-org.eclipse.jdt.core.compiler.problem.fieldHiding=warning
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=warning
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
-org.eclipse.jdt.core.compiler.problem.invalidJavadoc=error
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=enabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=disabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=disabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=protected
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=warning
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocComments=warning
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=protected
-org.eclipse.jdt.core.compiler.problem.missingJavadocTags=warning
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=protected
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=error
-org.eclipse.jdt.core.compiler.problem.nullReference=ignore
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
-org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=ignore
-org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
-org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=ignore
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=ignore
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=error
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=warning
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=error
-org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=error
-org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error
-org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.5
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/.settings/org.eclipse.jdt.ui.prefs b/jsf/plugins/org.eclipse.jst.jsf.common/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index 82eb6c1..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Fri Apr 06 18:25:15 PDT 2007
-eclipse.preferences.version=1
-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8"?><templates/>
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/.settings/org.eclipse.pde.prefs b/jsf/plugins/org.eclipse.jst.jsf.common/.settings/org.eclipse.pde.prefs
deleted file mode 100644
index ae4a084..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/.settings/org.eclipse.pde.prefs
+++ /dev/null
@@ -1,22 +0,0 @@
-#Fri May 30 11:41:40 PDT 2008
-compilers.f.unresolved-features=1
-compilers.f.unresolved-plugins=1
-compilers.incompatible-environment=1
-compilers.p.build=1
-compilers.p.deprecated=1
-compilers.p.discouraged-class=1
-compilers.p.internal=1
-compilers.p.missing-packages=0
-compilers.p.no-required-att=0
-compilers.p.not-externalized-att=0
-compilers.p.unknown-attribute=1
-compilers.p.unknown-class=1
-compilers.p.unknown-element=1
-compilers.p.unknown-identifier=1
-compilers.p.unknown-resource=1
-compilers.p.unresolved-ex-points=0
-compilers.p.unresolved-import=0
-compilers.s.create-docs=false
-compilers.s.doc-folder=doc
-compilers.s.open-tags=1
-eclipse.preferences.version=1
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/META-INF/MANIFEST.MF b/jsf/plugins/org.eclipse.jst.jsf.common/META-INF/MANIFEST.MF
deleted file mode 100644
index 8c1b088..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,81 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %plugin.name
-Bundle-SymbolicName: org.eclipse.jst.jsf.common;singleton:=true
-Bundle-Version: 1.2.1.qualifier
-Bundle-Activator: org.eclipse.jst.jsf.common.JSFCommonPlugin$Implementation
-Bundle-Localization: plugin
-Export-Package: org.eclipse.jst.jsf.common;x-internal:=true,
- org.eclipse.jst.jsf.common.dom,
- org.eclipse.jst.jsf.common.facet;x-internal:=true,
- org.eclipse.jst.jsf.common.facet.libraryprovider;x-internal:=true,
- org.eclipse.jst.jsf.common.facet.libraryprovider.jsf;x-internal:=true,
- org.eclipse.jst.jsf.common.internal;x-friends:="org.eclipse.jst.jsf.core",
- org.eclipse.jst.jsf.common.internal.componentcore;x-internal:=true,
- org.eclipse.jst.jsf.common.internal.finder;x-internal:=true,
- org.eclipse.jst.jsf.common.internal.finder.acceptor;x-internal:=true,
- org.eclipse.jst.jsf.common.internal.finder.matcher;x-internal:=true,
- org.eclipse.jst.jsf.common.internal.locator;x-friends:="org.eclipse.jst.jsf.facelet.core,org.eclipse.jst.jsf.facelet.core.tests",
- org.eclipse.jst.jsf.common.internal.managedobject;x-internal:=true,
- org.eclipse.jst.jsf.common.internal.pde;x-internal:=true,
- org.eclipse.jst.jsf.common.internal.policy;x-internal:=true,
- org.eclipse.jst.jsf.common.internal.resource;x-friends:="org.eclipse.jst.jsf.core.tests,org.eclipse.jst.jsf.facelet.core.tests",
- org.eclipse.jst.jsf.common.internal.strategy;x-internal:=true,
- org.eclipse.jst.jsf.common.internal.types;
- x-friends:="org.eclipse.jst.jsf.core,
- org.eclipse.jst.jsf.core.tests,
- org.eclipse.jst.jsf.validation.el.tests,
- org.eclipse.jst.jsf.designtime.tests,
- org.eclipse.jst.jsf.context.symbol.tests",
- org.eclipse.jst.jsf.common.internal.util;x-internal:=true,
- org.eclipse.jst.jsf.common.metadata,
- org.eclipse.jst.jsf.common.metadata.internal;x-friends:="org.eclipse.jst.jsf.metadata.tests",
- org.eclipse.jst.jsf.common.metadata.internal.impl;x-internal:=true,
- org.eclipse.jst.jsf.common.metadata.internal.util;x-internal:=true,
- org.eclipse.jst.jsf.common.metadata.query,
- org.eclipse.jst.jsf.common.metadata.query.internal;x-friends:="org.eclipse.jst.jsf.metadata.tests",
- org.eclipse.jst.jsf.common.metadata.query.internal.taglib;x-internal:=true,
- org.eclipse.jst.jsf.common.metadata.traittypes.traittypes,
- org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.internal.impl;x-internal:=true,
- org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.internal.util;x-internal:=true,
- org.eclipse.jst.jsf.common.sets,
- org.eclipse.jst.jsf.common.sets.constraint,
- org.eclipse.jst.jsf.common.sets.mapping,
- org.eclipse.jst.jsf.common.util,
- org.eclipse.jst.jsf.common.webxml;x-internal:=true,
- org.eclipse.jst.jsf.common.webxml.internal;x-internal:=true,
- org.eclipse.jst.jsf.common.webxml.internal.operations;x-internal:=true,
- org.eclipse.jst.jsf.context,
- org.eclipse.jst.jsf.context.resolver,
- org.eclipse.jst.jsf.context.resolver.structureddocument,
- org.eclipse.jst.jsf.context.resolver.structureddocument.internal;x-friends:="org.eclipse.jst.jsf.core,org.eclipse.jst.jsf.contentassist.tests",
- org.eclipse.jst.jsf.context.resolver.structureddocument.internal.impl;x-internal:=true,
- org.eclipse.jst.jsf.context.structureddocument,
- org.eclipse.jst.jsf.context.structureddocument.internal.impl;x-internal:=true,
- org.eclipse.jst.jsf.context.symbol,
- org.eclipse.jst.jsf.context.symbol.internal.impl;x-internal:=true,
- org.eclipse.jst.jsf.context.symbol.internal.provider;x-internal:=true,
- org.eclipse.jst.jsf.context.symbol.internal.source;x-internal:=true,
- org.eclipse.jst.jsf.context.symbol.internal.util;x-internal:=true,
- org.eclipse.jst.jsf.context.symbol.provider,
- org.eclipse.jst.jsf.context.symbol.source
-Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.wst.sse.core;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.jst.jsp.core;bundle-version="[1.1.0,1.3.0)",
- org.eclipse.core.resources;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.jface.text;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.wst.sse.ui;bundle-version="[1.0.101,1.3.0)",
- org.eclipse.wst.xml.core;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.jdt.core;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.emf.edit.ui;bundle-version="[2.2.0,3.0.0)",
- org.eclipse.emf.ecore.xmi;bundle-version="[2.2.0,3.0.0)",
- org.eclipse.jdt.ui;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.jst.common.project.facet.core,
- org.eclipse.wst.common.project.facet.core,
- org.eclipse.jst.j2ee,
- org.eclipse.jst.j2ee.web,
- org.eclipse.jst.j2ee.core
-Bundle-ActivationPolicy: lazy
-Bundle-Vendor: %plugin.provider
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Import-Package: org.eclipse.jst.javaee.web.internal.impl
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/about.html b/jsf/plugins/org.eclipse.jst.jsf.common/about.html
deleted file mode 100644
index 8e56059..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/about.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
-
-<p>June, 2008</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.</p>
-
-</body>
-</html>
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/build.properties b/jsf/plugins/org.eclipse.jst.jsf.common/build.properties
deleted file mode 100644
index 3819d76..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/build.properties
+++ /dev/null
@@ -1,25 +0,0 @@
-###############################################################################
-# Copyright (c) 2001, 2007 Oracle Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# Oracle Corporation - initial API and implementation
-###############################################################################
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
- .,\
- bin/,\
- build.properties,\
- plugin.properties,\
- about.html,\
- plugin.xml,\
- icons/,\
- model/,\
- schema/,\
- .options
-javacSource=1.5
-javacTarget=1.5
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/icons/full/obj16/IBeanInstanceSymbol.gif b/jsf/plugins/org.eclipse.jst.jsf.common/icons/full/obj16/IBeanInstanceSymbol.gif
deleted file mode 100644
index 6c05b46..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/icons/full/obj16/IBeanInstanceSymbol.gif
+++ /dev/null
Binary files differ
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/icons/full/obj16/IBeanMethodSymbol.gif b/jsf/plugins/org.eclipse.jst.jsf.common/icons/full/obj16/IBeanMethodSymbol.gif
deleted file mode 100644
index 7d24707..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/icons/full/obj16/IBeanMethodSymbol.gif
+++ /dev/null
Binary files differ
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/icons/full/obj16/IBeanPropertySymbol.gif b/jsf/plugins/org.eclipse.jst.jsf.common/icons/full/obj16/IBeanPropertySymbol.gif
deleted file mode 100644
index 53500da..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/icons/full/obj16/IBeanPropertySymbol.gif
+++ /dev/null
Binary files differ
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/icons/full/obj16/IBeanPropertySymbol_ro.gif b/jsf/plugins/org.eclipse.jst.jsf.common/icons/full/obj16/IBeanPropertySymbol_ro.gif
deleted file mode 100644
index 48d014d..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/icons/full/obj16/IBeanPropertySymbol_ro.gif
+++ /dev/null
Binary files differ
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/icons/full/obj16/IBeanPropertySymbol_ro_indexable.gif b/jsf/plugins/org.eclipse.jst.jsf.common/icons/full/obj16/IBeanPropertySymbol_ro_indexable.gif
deleted file mode 100644
index acc8b31..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/icons/full/obj16/IBeanPropertySymbol_ro_indexable.gif
+++ /dev/null
Binary files differ
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/icons/full/obj16/IBeanPropertySymbol_rw.gif b/jsf/plugins/org.eclipse.jst.jsf.common/icons/full/obj16/IBeanPropertySymbol_rw.gif
deleted file mode 100644
index 9f7abd5..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/icons/full/obj16/IBeanPropertySymbol_rw.gif
+++ /dev/null
Binary files differ
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/icons/full/obj16/IBeanPropertySymbol_rw_indexable.gif b/jsf/plugins/org.eclipse.jst.jsf.common/icons/full/obj16/IBeanPropertySymbol_rw_indexable.gif
deleted file mode 100644
index 7daac85..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/icons/full/obj16/IBeanPropertySymbol_rw_indexable.gif
+++ /dev/null
Binary files differ
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/icons/full/obj16/IBeanPropertySymbol_wo.gif b/jsf/plugins/org.eclipse.jst.jsf.common/icons/full/obj16/IBeanPropertySymbol_wo.gif
deleted file mode 100644
index 9783d84..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/icons/full/obj16/IBeanPropertySymbol_wo.gif
+++ /dev/null
Binary files differ
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/icons/full/obj16/IBeanPropertySymbol_wo_indexable.gif b/jsf/plugins/org.eclipse.jst.jsf.common/icons/full/obj16/IBeanPropertySymbol_wo_indexable.gif
deleted file mode 100644
index 158758e..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/icons/full/obj16/IBeanPropertySymbol_wo_indexable.gif
+++ /dev/null
Binary files differ
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/icons/full/obj16/IBoundedJavaTypeDescriptor.gif b/jsf/plugins/org.eclipse.jst.jsf.common/icons/full/obj16/IBoundedJavaTypeDescriptor.gif
deleted file mode 100644
index cdd3b76..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/icons/full/obj16/IBoundedJavaTypeDescriptor.gif
+++ /dev/null
Binary files differ
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/icons/full/obj16/IBoundedListTypeDescriptor.gif b/jsf/plugins/org.eclipse.jst.jsf.common/icons/full/obj16/IBoundedListTypeDescriptor.gif
deleted file mode 100644
index 83afb9b..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/icons/full/obj16/IBoundedListTypeDescriptor.gif
+++ /dev/null
Binary files differ
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/icons/full/obj16/IBoundedMapTypeDescriptor.gif b/jsf/plugins/org.eclipse.jst.jsf.common/icons/full/obj16/IBoundedMapTypeDescriptor.gif
deleted file mode 100644
index badaab0..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/icons/full/obj16/IBoundedMapTypeDescriptor.gif
+++ /dev/null
Binary files differ
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/icons/full/obj16/IComponentBeanSymbol.gif b/jsf/plugins/org.eclipse.jst.jsf.common/icons/full/obj16/IComponentBeanSymbol.gif
deleted file mode 100644
index 185f84e..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/icons/full/obj16/IComponentBeanSymbol.gif
+++ /dev/null
Binary files differ
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/icons/full/obj16/IComponentBeanSymbol_local.gif b/jsf/plugins/org.eclipse.jst.jsf.common/icons/full/obj16/IComponentBeanSymbol_local.gif
deleted file mode 100644
index 790f06a..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/icons/full/obj16/IComponentBeanSymbol_local.gif
+++ /dev/null
Binary files differ
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/icons/full/obj16/IComponentInstanceSymbol.gif b/jsf/plugins/org.eclipse.jst.jsf.common/icons/full/obj16/IComponentInstanceSymbol.gif
deleted file mode 100644
index 1208917..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/icons/full/obj16/IComponentInstanceSymbol.gif
+++ /dev/null
Binary files differ
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/icons/full/obj16/IComponentInstanceSymbol_local.gif b/jsf/plugins/org.eclipse.jst.jsf.common/icons/full/obj16/IComponentInstanceSymbol_local.gif
deleted file mode 100644
index ed15fea..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/icons/full/obj16/IComponentInstanceSymbol_local.gif
+++ /dev/null
Binary files differ
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/icons/full/obj16/IComponentSymbol.gif b/jsf/plugins/org.eclipse.jst.jsf.common/icons/full/obj16/IComponentSymbol.gif
deleted file mode 100644
index 347a8ff..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/icons/full/obj16/IComponentSymbol.gif
+++ /dev/null
Binary files differ
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/icons/full/obj16/IInstanceSymbol.gif b/jsf/plugins/org.eclipse.jst.jsf.common/icons/full/obj16/IInstanceSymbol.gif
deleted file mode 100644
index f8294d0..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/icons/full/obj16/IInstanceSymbol.gif
+++ /dev/null
Binary files differ
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/icons/full/obj16/IJavaSymbol.gif b/jsf/plugins/org.eclipse.jst.jsf.common/icons/full/obj16/IJavaSymbol.gif
deleted file mode 100644
index d3dc5a9..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/icons/full/obj16/IJavaSymbol.gif
+++ /dev/null
Binary files differ
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/icons/full/obj16/IJavaTypeDescriptor2.gif b/jsf/plugins/org.eclipse.jst.jsf.common/icons/full/obj16/IJavaTypeDescriptor2.gif
deleted file mode 100644
index 9250fec..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/icons/full/obj16/IJavaTypeDescriptor2.gif
+++ /dev/null
Binary files differ
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/icons/full/obj16/IListTypeDescriptor.gif b/jsf/plugins/org.eclipse.jst.jsf.common/icons/full/obj16/IListTypeDescriptor.gif
deleted file mode 100644
index d92f34c..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/icons/full/obj16/IListTypeDescriptor.gif
+++ /dev/null
Binary files differ
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/icons/full/obj16/IManagedBeanSymbol.gif b/jsf/plugins/org.eclipse.jst.jsf.common/icons/full/obj16/IManagedBeanSymbol.gif
deleted file mode 100644
index 1e5345f..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/icons/full/obj16/IManagedBeanSymbol.gif
+++ /dev/null
Binary files differ
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/icons/full/obj16/IManagedBeanSymbol_app.gif b/jsf/plugins/org.eclipse.jst.jsf.common/icons/full/obj16/IManagedBeanSymbol_app.gif
deleted file mode 100644
index 7bb14f5..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/icons/full/obj16/IManagedBeanSymbol_app.gif
+++ /dev/null
Binary files differ
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/icons/full/obj16/IManagedBeanSymbol_none.gif b/jsf/plugins/org.eclipse.jst.jsf.common/icons/full/obj16/IManagedBeanSymbol_none.gif
deleted file mode 100644
index c3b0941..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/icons/full/obj16/IManagedBeanSymbol_none.gif
+++ /dev/null
Binary files differ
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/icons/full/obj16/IManagedBeanSymbol_request.gif b/jsf/plugins/org.eclipse.jst.jsf.common/icons/full/obj16/IManagedBeanSymbol_request.gif
deleted file mode 100644
index b3f0dc9..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/icons/full/obj16/IManagedBeanSymbol_request.gif
+++ /dev/null
Binary files differ
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/icons/full/obj16/IManagedBeanSymbol_session.gif b/jsf/plugins/org.eclipse.jst.jsf.common/icons/full/obj16/IManagedBeanSymbol_session.gif
deleted file mode 100644
index 1eee8aa..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/icons/full/obj16/IManagedBeanSymbol_session.gif
+++ /dev/null
Binary files differ
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/icons/full/obj16/IMapTypeDescriptor.gif b/jsf/plugins/org.eclipse.jst.jsf.common/icons/full/obj16/IMapTypeDescriptor.gif
deleted file mode 100644
index cdd3b76..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/icons/full/obj16/IMapTypeDescriptor.gif
+++ /dev/null
Binary files differ
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/icons/full/obj16/IMessageBundlePropertySymbol.gif b/jsf/plugins/org.eclipse.jst.jsf.common/icons/full/obj16/IMessageBundlePropertySymbol.gif
deleted file mode 100644
index e135a7b..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/icons/full/obj16/IMessageBundlePropertySymbol.gif
+++ /dev/null
Binary files differ
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/icons/full/obj16/IMessageBundlePropertySymbol_intermediate.gif b/jsf/plugins/org.eclipse.jst.jsf.common/icons/full/obj16/IMessageBundlePropertySymbol_intermediate.gif
deleted file mode 100644
index 71c252b..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/icons/full/obj16/IMessageBundlePropertySymbol_intermediate.gif
+++ /dev/null
Binary files differ
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/icons/full/obj16/IMessageBundleSymbol.gif b/jsf/plugins/org.eclipse.jst.jsf.common/icons/full/obj16/IMessageBundleSymbol.gif
deleted file mode 100644
index 7d0f811..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/icons/full/obj16/IMessageBundleSymbol.gif
+++ /dev/null
Binary files differ
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/icons/full/obj16/IMessageBundleTypeDescriptor.gif b/jsf/plugins/org.eclipse.jst.jsf.common/icons/full/obj16/IMessageBundleTypeDescriptor.gif
deleted file mode 100644
index db7414e..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/icons/full/obj16/IMessageBundleTypeDescriptor.gif
+++ /dev/null
Binary files differ
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/icons/full/obj16/IMethodSymbol.gif b/jsf/plugins/org.eclipse.jst.jsf.common/icons/full/obj16/IMethodSymbol.gif
deleted file mode 100644
index c4a8af4..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/icons/full/obj16/IMethodSymbol.gif
+++ /dev/null
Binary files differ
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/icons/full/obj16/IPropertySymbol.gif b/jsf/plugins/org.eclipse.jst.jsf.common/icons/full/obj16/IPropertySymbol.gif
deleted file mode 100644
index c8d381f..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/icons/full/obj16/IPropertySymbol.gif
+++ /dev/null
Binary files differ
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/icons/full/obj16/ITypeDescriptor.gif b/jsf/plugins/org.eclipse.jst.jsf.common/icons/full/obj16/ITypeDescriptor.gif
deleted file mode 100644
index badaab0..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/icons/full/obj16/ITypeDescriptor.gif
+++ /dev/null
Binary files differ
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/icons/full/obj16/IUnconstrainedMapTypeDescriptor.gif b/jsf/plugins/org.eclipse.jst.jsf.common/icons/full/obj16/IUnconstrainedMapTypeDescriptor.gif
deleted file mode 100644
index 33854e9..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/icons/full/obj16/IUnconstrainedMapTypeDescriptor.gif
+++ /dev/null
Binary files differ
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/icons/full/obj16/UnconstrainedMapTypeDescriptor.gif b/jsf/plugins/org.eclipse.jst.jsf.common/icons/full/obj16/UnconstrainedMapTypeDescriptor.gif
deleted file mode 100644
index a26660e..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/icons/full/obj16/UnconstrainedMapTypeDescriptor.gif
+++ /dev/null
Binary files differ
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/model/metadata.ecore b/jsf/plugins/org.eclipse.jst.jsf.common/model/metadata.ecore
deleted file mode 100644
index 9b202c7..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/model/metadata.ecore
+++ /dev/null
@@ -1,100 +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="metadata"
- nsURI="http://org.eclipse.jst.jsf.common.metadata/metadata.ecore" nsPrefix="md">
- <eClassifiers xsi:type="ecore:EClass" name="Model" eSuperTypes="#//Entity">
- <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
- <details key="kind" value="element"/>
- <details key="name" value="metadatamodel"/>
- </eAnnotations>
- <eOperations name="findIncludeGroup" eType="#//EntityGroup">
- <eParameters name="groupId" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
- </eOperations>
- <eOperations name="accept">
- <eParameters name="visitor" eType="#//IEntityVisitor"/>
- </eOperations>
- <eStructuralFeatures xsi:type="ecore:EReference" name="entityGroups" upperBound="-1"
- eType="#//EntityGroup" eKeys="#//Entity/id #//Entity/type">
- <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
- <details key="kind" value="element"/>
- <details key="name" value="entityGroup"/>
- </eAnnotations>
- </eStructuralFeatures>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="sourceModelProvider" unique="false"
- eType="#//IMetaDataSourceModelProvider" volatile="true" transient="true"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="currentModelContext" eType="#//ModelContext"
- volatile="true" transient="true"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="EntityGroup" eSuperTypes="#//Entity"/>
- <eClassifiers xsi:type="ecore:EClass" name="Entity">
- <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
- <details key="kind" value="element"/>
- <details key="name" value="entity"/>
- </eAnnotations>
- <eOperations name="accept">
- <eParameters name="visitor" eType="#//IEntityVisitor"/>
- </eOperations>
- <eOperations name="getModel" eType="#//Model"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="childEntities" upperBound="-1"
- eType="#//Entity" containment="true" eKeys="#//Entity/id #//Entity/type">
- <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
- <details key="kind" value="element"/>
- <details key="name" value="entity"/>
- </eAnnotations>
- </eStructuralFeatures>
- <eStructuralFeatures xsi:type="ecore:EReference" name="traits" upperBound="-1"
- eType="#//Trait" containment="true" eKeys="#//Trait/id">
- <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
- <details key="kind" value="element"/>
- <details key="name" value="trait"/>
- </eAnnotations>
- </eStructuralFeatures>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="id" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"
- iD="true"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="type" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="includeGroups" upperBound="-1"
- eType="#//IncludeEntityGroup">
- <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
- <details key="kind" value="element"/>
- <details key="name" value="include-entity-group"/>
- </eAnnotations>
- </eStructuralFeatures>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="IncludeEntityGroup">
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="id" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="modelUri" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
- <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
- <details key="name" value="uri"/>
- </eAnnotations>
- </eStructuralFeatures>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="Trait">
- <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
- <details key="kind" value="element"/>
- <details key="name" value="trait"/>
- </eAnnotations>
- <eOperations name="accept">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="body" value="visitor.visit(this);"/>
- </eAnnotations>
- <eParameters name="visitor" eType="#//ITraitVisitor"/>
- </eOperations>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="id" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"
- iD="true"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="value" lowerBound="1" eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EObject"
- containment="true">
- <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
- <details key="kind" value="element"/>
- <details key="namespace" value="##targetNamespace"/>
- </eAnnotations>
- </eStructuralFeatures>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="sourceModelProvider" eType="#//IMetaDataSourceModelProvider"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EDataType" name="ITraitVisitor" instanceClassName="org.eclipse.jst.jsf.common.metadata.query.ITraitVisitor"
- serializable="false"/>
- <eClassifiers xsi:type="ecore:EDataType" name="IEntityVisitor" instanceClassName="org.eclipse.jst.jsf.common.metadata.query.IEntityVisitor"
- serializable="false"/>
- <eClassifiers xsi:type="ecore:EDataType" name="IMetaDataSourceModelProvider" instanceClassName="org.eclipse.jst.jsf.common.metadata.internal.IMetaDataSourceModelProvider"/>
- <eClassifiers xsi:type="ecore:EDataType" name="ModelContext" instanceClassName="org.eclipse.jst.jsf.common.metadata.internal.ModelKeyDescriptor"/>
-</ecore:EPackage>
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/model/metadata.genmodel b/jsf/plugins/org.eclipse.jst.jsf.common/model/metadata.genmodel
deleted file mode 100644
index 4707b0b..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/model/metadata.genmodel
+++ /dev/null
@@ -1,65 +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="Copyright (c) 2007 Oracle Corporation"
- modelDirectory="/org.eclipse.jst.jsf.common/src" editDirectory="/org.eclipse.jst.jsf.common/src"
- editorDirectory="/org.eclipse.jst.jsf.common/src" modelPluginID="org.eclipse.jst.jsf.common"
- modelName="Metadata" editPluginClass="org.eclipse.jst.jsf.common.metadata.MetadataPlugin"
- editorPluginClass="org.eclipse.jst.jsf.common.metadata.MetadataPlugin" generateSchema="true"
- testsDirectory="/org.eclipse.jst.jsf.common/src" testSuiteClass="/org.eclipse.jst.jsf.common.metadata.MetadataAllTests"
- importerID="org.eclipse.emf.importer.ecore">
- <genAnnotations source="http://www.eclipse.org/emf/2002/GenModel/exporter/org.eclipse.xsd.ecore.exporter">
- <genAnnotations source="selectedPackages">
- <details key="http://org.eclipse.jst.jsf.common.metadata/metadata.ecore" value="metadata.xsd"/>
- </genAnnotations>
- <details key="directoryURI" value="schema/"/>
- </genAnnotations>
- <foreignModel>metadata.ecore</foreignModel>
- <genPackages prefix="Metadata" basePackage="org.eclipse.jst.jsf.common" resource="XML"
- disposableProviderFactory="true" classPackageSuffix="internal.impl" utilityPackageSuffix="internal.util"
- providerPackageSuffix="internal.provider" presentationPackageSuffix="internal.presentation"
- testsPackageSuffix="internal.tests" generateExampleClass="false" ecorePackage="metadata.ecore#/">
- <genAnnotations source="http://www.eclipse.org/emf/2002/GenModel/exporter/org.eclipse.xsd.ecore.exporter">
- <genAnnotations source="schema/metadata.xsd"/>
- </genAnnotations>
- <genDataTypes ecoreDataType="metadata.ecore#//ITraitVisitor"/>
- <genDataTypes ecoreDataType="metadata.ecore#//IEntityVisitor"/>
- <genDataTypes ecoreDataType="metadata.ecore#//IMetaDataSourceModelProvider"/>
- <genDataTypes ecoreDataType="metadata.ecore#//ModelContext"/>
- <genClasses ecoreClass="metadata.ecore#//Model">
- <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference metadata.ecore#//Model/entityGroups"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute metadata.ecore#//Model/sourceModelProvider"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute metadata.ecore#//Model/currentModelContext"/>
- <genOperations ecoreOperation="metadata.ecore#//Model/findIncludeGroup">
- <genParameters ecoreParameter="metadata.ecore#//Model/findIncludeGroup/groupId"/>
- </genOperations>
- <genOperations ecoreOperation="metadata.ecore#//Model/accept">
- <genParameters ecoreParameter="metadata.ecore#//Model/accept/visitor"/>
- </genOperations>
- </genClasses>
- <genClasses ecoreClass="metadata.ecore#//EntityGroup"/>
- <genClasses ecoreClass="metadata.ecore#//Entity">
- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference metadata.ecore#//Entity/childEntities"/>
- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference metadata.ecore#//Entity/traits"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute metadata.ecore#//Entity/id"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute metadata.ecore#//Entity/type"/>
- <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference metadata.ecore#//Entity/includeGroups"/>
- <genOperations ecoreOperation="metadata.ecore#//Entity/accept">
- <genParameters ecoreParameter="metadata.ecore#//Entity/accept/visitor"/>
- </genOperations>
- <genOperations ecoreOperation="metadata.ecore#//Entity/getModel"/>
- </genClasses>
- <genClasses ecoreClass="metadata.ecore#//Trait">
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute metadata.ecore#//Trait/id"/>
- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference metadata.ecore#//Trait/value"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute metadata.ecore#//Trait/sourceModelProvider"/>
- <genOperations ecoreOperation="metadata.ecore#//Trait/accept">
- <genParameters ecoreParameter="metadata.ecore#//Trait/accept/visitor"/>
- </genOperations>
- </genClasses>
- <genClasses ecoreClass="metadata.ecore#//IncludeEntityGroup">
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute metadata.ecore#//IncludeEntityGroup/id"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute metadata.ecore#//IncludeEntityGroup/modelUri"/>
- </genClasses>
- </genPackages>
-</genmodel:GenModel>
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/model/metadataTraitTypes.ecore b/jsf/plugins/org.eclipse.jst.jsf.common/model/metadataTraitTypes.ecore
deleted file mode 100644
index c21ab4d..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/model/metadataTraitTypes.ecore
+++ /dev/null
@@ -1,48 +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="traittypes"
- nsURI="http://org.eclipse.jst.jsf.common.metadata/metadataTraitTypes.ecore" nsPrefix="mdt">
- <eClassifiers xsi:type="ecore:EClass" name="ListOfValues">
- <eStructuralFeatures xsi:type="ecore:EReference" name="entries" upperBound="-1"
- eType="ecore:EClass http://www.eclipse.org/emf/2003/XMLType#//SimpleAnyType"
- containment="true">
- <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
- <details key="kind" value="element"/>
- <details key="name" value="item"/>
- </eAnnotations>
- </eStructuralFeatures>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="SetGenerator">
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="algorithm" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
- <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
- <details key="kind" value="element"/>
- </eAnnotations>
- </eStructuralFeatures>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="expression" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
- <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
- <details key="kind" value="element"/>
- </eAnnotations>
- </eStructuralFeatures>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="StringValue">
- <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
- <details key="kind" value="simple"/>
- </eAnnotations>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="value" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
- <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
- <details key="kind" value="simple"/>
- </eAnnotations>
- </eStructuralFeatures>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="BooleanValue">
- <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
- <details key="kind" value="simple"/>
- </eAnnotations>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="true" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">
- <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
- <details key="kind" value="simple"/>
- </eAnnotations>
- </eStructuralFeatures>
- </eClassifiers>
-</ecore:EPackage>
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/model/metadataTraitTypes.genmodel b/jsf/plugins/org.eclipse.jst.jsf.common/model/metadataTraitTypes.genmodel
deleted file mode 100644
index 9633b3c..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/model/metadataTraitTypes.genmodel
+++ /dev/null
@@ -1,20 +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="Copyright (c) 2007 Oracle Corporation"
- modelDirectory="/org.eclipse.jst.jsf.common/src" modelPluginID="org.eclipse.jst.jsf.common"
- modelName="TraitTypes" importerID="org.eclipse.emf.importer.ecore">
- <foreignModel>metadataTraitTypes.ecore</foreignModel>
- <genPackages prefix="TraitTypes" basePackage="org.eclipse.jst.jsf.common.metadata.traittypes"
- resource="XML" disposableProviderFactory="true" classPackageSuffix="internal.impl"
- utilityPackageSuffix="internal.util" providerPackageSuffix="internal.provider"
- presentationPackageSuffix="internal.presentation" ecorePackage="metadataTraitTypes.ecore#/">
- <genClasses ecoreClass="metadataTraitTypes.ecore#//ListOfValues">
- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference metadataTraitTypes.ecore#//ListOfValues/entries"/>
- </genClasses>
- <genClasses ecoreClass="metadataTraitTypes.ecore#//SetGenerator">
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute metadataTraitTypes.ecore#//SetGenerator/algorithm"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute metadataTraitTypes.ecore#//SetGenerator/expression"/>
- </genClasses>
- </genPackages>
-</genmodel:GenModel>
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/model/symbol.ecore b/jsf/plugins/org.eclipse.jst.jsf.common/model/symbol.ecore
deleted file mode 100644
index 521e76e..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/model/symbol.ecore
+++ /dev/null
@@ -1,263 +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="symbol"
- nsURI="http:///org/eclipse/jst/jsf/context/symbol.ecore" nsPrefix="org.eclipse.jst.jsf.context.symbol">
- <eClassifiers xsi:type="ecore:EClass" name="IBeanInstanceSymbol" eSuperTypes="#//IInstanceSymbol #//IDescribedInDetail">
- <eOperations name="getJavaTypeDescriptor" eType="#//IJavaTypeDescriptor2"/>
- <eOperations name="setJavaTypeDescriptor">
- <eParameters name="newTypeDescriptor" eType="#//IJavaTypeDescriptor2"/>
- </eOperations>
- <eStructuralFeatures xsi:type="ecore:EReference" name="properties" upperBound="-1"
- eType="#//IBeanPropertySymbol" changeable="false" volatile="true"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="methods" upperBound="-1"
- eType="#//IBeanMethodSymbol" changeable="false" volatile="true"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="IBeanPropertySymbol" eSuperTypes="#//IPropertySymbol #//IDescribedInDetail">
- <eStructuralFeatures xsi:type="ecore:EReference" name="owner" eType="#//IJavaTypeDescriptor2"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="IInstanceSymbol" eSuperTypes="#//IObjectSymbol">
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="typeResolved" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
- changeable="false" volatile="true"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="runtimeSource" eType="#//ERuntimeSource"
- defaultValueLiteral="TAG_INSTANTIATED_SYMBOL"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="IJavaSymbol" eSuperTypes="#//ISymbol">
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="javaElement" eType="#//IJavaElement"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="ISymbol" abstract="true" interface="true">
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="ITypeDescriptor" abstract="true">
- <eOperations name="instanceOf" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">
- <eParameters name="typeSignature" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
- </eOperations>
- <eOperations name="isArray" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
- <eOperations name="getArrayElement" eType="#//IObjectSymbol"/>
- <eOperations name="resolveType" eType="#//IType">
- <eParameters name="resolvedTypeSignature" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
- </eOperations>
- <eOperations name="calculateSyntheticCall" eType="#//ISymbol">
- <eParameters name="methodName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
- <eParameters name="methodArgs" upperBound="-1" eType="#//ValueType"/>
- <eParameters name="symbolName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
- </eOperations>
- <eStructuralFeatures xsi:type="ecore:EReference" name="properties" upperBound="-1"
- eType="#//IPropertySymbol" volatile="true"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="typeSignature" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"
- changeable="false" volatile="true" defaultValueLiteral=""/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="superTypeSignatures" upperBound="-1"
- eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString" volatile="true"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="interfaceTypeSignatures"
- upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"
- volatile="true"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="typeSignatureDelegate"
- eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="methods" upperBound="-1"
- eType="#//IMethodSymbol" volatile="true"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="typeParameterSignatures"
- unique="false" upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"
- transient="true"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="jdtContext" eType="#//IJavaElement"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="enumType" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EDataType" name="IType" instanceClassName="org.eclipse.jdt.core.IType"/>
- <eClassifiers xsi:type="ecore:EDataType" name="IJavaElement" instanceClassName="org.eclipse.jdt.core.IJavaElement"/>
- <eClassifiers xsi:type="ecore:EClass" name="IDescribedInDetail" abstract="true"
- interface="true"/>
- <eClassifiers xsi:type="ecore:EClass" name="IJavaTypeDescriptor2" eSuperTypes="#//ITypeDescriptor">
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="type" eType="#//IType"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="beanProperties" upperBound="-1"
- eType="#//IBeanPropertySymbol" volatile="true"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="beanMethods" upperBound="-1"
- eType="#//IBeanPropertySymbol" volatile="true"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="arrayCount" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="IBeanMethodSymbol" eSuperTypes="#//IDescribedInDetail #//IMethodSymbol">
- <eStructuralFeatures xsi:type="ecore:EReference" name="owner" eType="#//IJavaTypeDescriptor2"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="IComponentSymbol" eSuperTypes="#//IInstanceSymbol #//IDescribedInDetail"/>
- <eClassifiers xsi:type="ecore:EClass" name="IPropertySymbol" eSuperTypes="#//IObjectSymbol">
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="intermediate" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="IMapTypeDescriptor" eSuperTypes="#//ITypeDescriptor">
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="mapSource" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EMap"
- transient="true"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="immutable" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
- defaultValueLiteral="true"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EEnum" name="ERuntimeSource">
- <eLiterals name="BUILT_IN_SYMBOL" literal="BUILT_IN_SYMBOL"/>
- <eLiterals name="MANAGED_BEAN_SYMBOL" value="1"/>
- <eLiterals name="TAG_INSTANTIATED_SYMBOL" value="2"/>
- <eLiterals name="OTHER" value="3"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="IMethodSymbol" eSuperTypes="#//ISymbol">
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="signature" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="IObjectSymbol" abstract="true" interface="true"
- eSuperTypes="#//ISymbol">
- <eOperations name="supportsCoercion" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">
- <eParameters name="typeSignature" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
- </eOperations>
- <eOperations name="coerce" eType="#//ITypeDescriptor">
- <eParameters name="typeSignature" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
- </eOperations>
- <eOperations name="call" eType="#//ISymbol">
- <eParameters name="methodName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
- <eParameters name="methodArguments" upperBound="-1" eType="#//ValueType"/>
- <eParameters name="symbolName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
- </eOperations>
- <eStructuralFeatures xsi:type="ecore:EReference" name="typeDescriptor" eType="#//ITypeDescriptor"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="readable" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="writable" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="IBoundedTypeDescriptor" abstract="true"
- interface="true" eSuperTypes="#//ITypeDescriptor">
- <eOperations name="isUnboundedForType" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">
- <eParameters name="typeSignature" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
- </eOperations>
- <eOperations name="getUnboundedProperty" eType="#//ISymbol">
- <eParameters name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>
- <eParameters name="typeSignature" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
- </eOperations>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="IBoundedMapTypeDescriptor" eSuperTypes="#//IMapTypeDescriptor #//IBoundedTypeDescriptor"/>
- <eClassifiers xsi:type="ecore:EClass" name="IBoundedJavaTypeDescriptor" eSuperTypes="#//IJavaTypeDescriptor2 #//IBoundedTypeDescriptor"/>
- <eClassifiers xsi:type="ecore:EClass" name="IListTypeDescriptor" eSuperTypes="#//ITypeDescriptor">
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="listSource" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EEList"
- transient="true"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="IBoundedListTypeDescriptor" eSuperTypes="#//IListTypeDescriptor #//IBoundedTypeDescriptor"/>
- <eClassifiers xsi:type="ecore:EDataType" name="ValueType" instanceClassName="org.eclipse.jst.jsf.common.internal.types.ValueType"/>
- <eSubpackages name="symbol" nsURI="http:///org/eclipse/jst/jsf/context/symbol.ecore"
- nsPrefix="org.eclipse.jst.jsf.context.symbol">
- <eClassifiers xsi:type="ecore:EDataType" name="ValueType" instanceClassName="org.eclipse.jst.jsf.common.internal.types.ValueType"/>
- <eClassifiers xsi:type="ecore:EClass" name="IBoundedListTypeDescriptor" eSuperTypes="#//symbol/IListTypeDescriptor #//symbol/IBoundedTypeDescriptor"/>
- <eClassifiers xsi:type="ecore:EClass" name="IListTypeDescriptor" eSuperTypes="#//symbol/ITypeDescriptor">
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="listSource" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EEList"
- transient="true"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="IBoundedJavaTypeDescriptor" eSuperTypes="#//symbol/IJavaTypeDescriptor2 #//symbol/IBoundedTypeDescriptor"/>
- <eClassifiers xsi:type="ecore:EClass" name="IBoundedMapTypeDescriptor" eSuperTypes="#//symbol/IMapTypeDescriptor #//symbol/IBoundedTypeDescriptor"/>
- <eClassifiers xsi:type="ecore:EClass" name="IBoundedTypeDescriptor" abstract="true"
- interface="true" eSuperTypes="#//symbol/ITypeDescriptor">
- <eOperations name="getUnboundedProperty" eType="#//symbol/ISymbol">
- <eParameters name="typeSignature" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
- <eParameters name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>
- </eOperations>
- <eOperations name="isUnboundedForType" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">
- <eParameters name="typeSignature" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
- </eOperations>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="IObjectSymbol" abstract="true" interface="true"
- eSuperTypes="#//symbol/ISymbol">
- <eOperations name="call" eType="#//symbol/ISymbol">
- <eParameters name="symbolName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
- <eParameters name="methodArguments" upperBound="-1" eType="#//symbol/ValueType"/>
- <eParameters name="methodName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
- </eOperations>
- <eOperations name="coerce" eType="#//symbol/ITypeDescriptor">
- <eParameters name="typeSignature" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
- </eOperations>
- <eOperations name="supportsCoercion" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">
- <eParameters name="typeSignature" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
- </eOperations>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="writable" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="readable" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="typeDescriptor" eType="#//symbol/ITypeDescriptor"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="IMethodSymbol" eSuperTypes="#//symbol/ISymbol">
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="signature" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EEnum" name="ERuntimeSource">
- <eLiterals name="OTHER" value="3"/>
- <eLiterals name="TAG_INSTANTIATED_SYMBOL" value="2"/>
- <eLiterals name="MANAGED_BEAN_SYMBOL" value="1"/>
- <eLiterals name="BUILT_IN_SYMBOL" literal="BUILT_IN_SYMBOL"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="IMapTypeDescriptor" eSuperTypes="#//symbol/ITypeDescriptor">
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="immutable" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
- defaultValueLiteral="true"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="mapSource" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EMap"
- transient="true"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="IPropertySymbol" eSuperTypes="#//symbol/IObjectSymbol">
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="intermediate" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="IComponentSymbol" eSuperTypes="#//symbol/IInstanceSymbol #//symbol/IDescribedInDetail"/>
- <eClassifiers xsi:type="ecore:EClass" name="IBeanMethodSymbol" eSuperTypes="#//symbol/IDescribedInDetail #//symbol/IMethodSymbol">
- <eStructuralFeatures xsi:type="ecore:EReference" name="owner" eType="#//symbol/IJavaTypeDescriptor2"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="IJavaTypeDescriptor2" eSuperTypes="#//symbol/ITypeDescriptor">
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="arrayCount" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="beanMethods" upperBound="-1"
- eType="#//symbol/IBeanPropertySymbol" volatile="true"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="beanProperties" upperBound="-1"
- eType="#//symbol/IBeanPropertySymbol" volatile="true"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="type" eType="#//symbol/IType"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="IDescribedInDetail" abstract="true"
- interface="true"/>
- <eClassifiers xsi:type="ecore:EDataType" name="IJavaElement" instanceClassName="org.eclipse.jdt.core.IJavaElement"/>
- <eClassifiers xsi:type="ecore:EDataType" name="IType" instanceClassName="org.eclipse.jdt.core.IType"/>
- <eClassifiers xsi:type="ecore:EClass" name="ITypeDescriptor" abstract="true">
- <eOperations name="calculateSyntheticCall" eType="#//symbol/ISymbol">
- <eParameters name="symbolName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
- <eParameters name="methodArgs" upperBound="-1" eType="#//symbol/ValueType"/>
- <eParameters name="methodName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
- </eOperations>
- <eOperations name="resolveType" eType="#//symbol/IType">
- <eParameters name="resolvedTypeSignature" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
- </eOperations>
- <eOperations name="getArrayElement" eType="#//symbol/IObjectSymbol"/>
- <eOperations name="isArray" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
- <eOperations name="instanceOf" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">
- <eParameters name="typeSignature" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
- </eOperations>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="jdtContext" eType="#//symbol/IJavaElement"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="typeParameterSignatures"
- unique="false" upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"
- transient="true"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="methods" upperBound="-1"
- eType="#//symbol/IMethodSymbol" volatile="true"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="typeSignatureDelegate"
- eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="interfaceTypeSignatures"
- upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"
- volatile="true"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="superTypeSignatures"
- upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"
- volatile="true"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="typeSignature" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"
- changeable="false" volatile="true" defaultValueLiteral=""/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="properties" upperBound="-1"
- eType="#//symbol/IPropertySymbol" volatile="true"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="ISymbol" abstract="true" interface="true">
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="IJavaSymbol" eSuperTypes="#//symbol/ISymbol">
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="javaElement" eType="#//symbol/IJavaElement"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="IInstanceSymbol" eSuperTypes="#//symbol/IObjectSymbol">
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="runtimeSource" eType="#//symbol/ERuntimeSource"
- defaultValueLiteral="TAG_INSTANTIATED_SYMBOL"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="typeResolved" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
- changeable="false" volatile="true"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="IBeanPropertySymbol" eSuperTypes="#//symbol/IPropertySymbol #//symbol/IDescribedInDetail">
- <eStructuralFeatures xsi:type="ecore:EReference" name="owner" eType="#//symbol/IJavaTypeDescriptor2"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="IBeanInstanceSymbol" eSuperTypes="#//symbol/IInstanceSymbol #//symbol/IDescribedInDetail">
- <eOperations name="setJavaTypeDescriptor">
- <eParameters name="newTypeDescriptor" eType="#//symbol/IJavaTypeDescriptor2"/>
- </eOperations>
- <eOperations name="getJavaTypeDescriptor" eType="#//symbol/IJavaTypeDescriptor2"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="methods" upperBound="-1"
- eType="#//symbol/IBeanMethodSymbol" changeable="false" volatile="true"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="properties" upperBound="-1"
- eType="#//symbol/IBeanPropertySymbol" changeable="false" volatile="true"/>
- </eClassifiers>
- </eSubpackages>
-</ecore:EPackage>
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/model/symbol.genmodel b/jsf/plugins/org.eclipse.jst.jsf.common/model/symbol.genmodel
deleted file mode 100644
index a068a79..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/model/symbol.genmodel
+++ /dev/null
@@ -1,121 +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="Copyright 2006 Oracle"
- modelDirectory="/org.eclipse.jst.jsf.common/src" editDirectory="/org.eclipse.jst.jsf.common/src"
- editorDirectory="/org.eclipse.jst.jsf.context.symbol.editor/src" modelPluginID="org.eclipse.jst.jsf.common"
- modelName="My" modelPluginClass="" editPluginClass="org.eclipse.jst.jsf.common.JSFCommonPlugin"
- editorPluginClass="org.eclipse.jst.jsf.context.symbol.presentation.MyEditorPlugin"
- testSuiteClass="org.eclipse.jst.jsf.context.symbol.tests.MyAllTests" importerID="org.eclipse.emf.importer.java">
- <foreignModel>@model</foreignModel>
- <genPackages prefix="Symbol" basePackage="org.eclipse.jst.jsf.context" disposableProviderFactory="true"
- classPackageSuffix="internal.impl" utilityPackageSuffix="internal.util" providerPackageSuffix="internal.provider"
- ecorePackage="symbol.ecore#/">
- <genEnums ecoreEnum="symbol.ecore#//ERuntimeSource">
- <genEnumLiterals ecoreEnumLiteral="symbol.ecore#//ERuntimeSource/BUILT_IN_SYMBOL"/>
- <genEnumLiterals ecoreEnumLiteral="symbol.ecore#//ERuntimeSource/MANAGED_BEAN_SYMBOL"/>
- <genEnumLiterals ecoreEnumLiteral="symbol.ecore#//ERuntimeSource/TAG_INSTANTIATED_SYMBOL"/>
- <genEnumLiterals ecoreEnumLiteral="symbol.ecore#//ERuntimeSource/OTHER"/>
- </genEnums>
- <genDataTypes ecoreDataType="symbol.ecore#//IType"/>
- <genDataTypes ecoreDataType="symbol.ecore#//IJavaElement"/>
- <genDataTypes ecoreDataType="symbol.ecore#//ValueType"/>
- <genClasses ecoreClass="symbol.ecore#//IBeanInstanceSymbol">
- <genFeatures property="Readonly" notify="false" createChild="false" ecoreFeature="ecore:EReference symbol.ecore#//IBeanInstanceSymbol/properties"/>
- <genFeatures property="Readonly" notify="false" createChild="false" ecoreFeature="ecore:EReference symbol.ecore#//IBeanInstanceSymbol/methods"/>
- <genOperations ecoreOperation="symbol.ecore#//IBeanInstanceSymbol/getJavaTypeDescriptor"/>
- <genOperations ecoreOperation="symbol.ecore#//IBeanInstanceSymbol/setJavaTypeDescriptor">
- <genParameters ecoreParameter="symbol.ecore#//IBeanInstanceSymbol/setJavaTypeDescriptor/newTypeDescriptor"/>
- </genOperations>
- </genClasses>
- <genClasses ecoreClass="symbol.ecore#//IBeanPropertySymbol">
- <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference symbol.ecore#//IBeanPropertySymbol/owner"/>
- </genClasses>
- <genClasses ecoreClass="symbol.ecore#//IInstanceSymbol">
- <genFeatures property="Readonly" createChild="false" ecoreFeature="ecore:EAttribute symbol.ecore#//IInstanceSymbol/typeResolved"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute symbol.ecore#//IInstanceSymbol/runtimeSource"/>
- </genClasses>
- <genClasses ecoreClass="symbol.ecore#//IJavaSymbol">
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute symbol.ecore#//IJavaSymbol/javaElement"/>
- </genClasses>
- <genClasses ecoreClass="symbol.ecore#//ISymbol">
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute symbol.ecore#//ISymbol/name"/>
- </genClasses>
- <genClasses ecoreClass="symbol.ecore#//ITypeDescriptor">
- <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference symbol.ecore#//ITypeDescriptor/properties"/>
- <genFeatures property="Readonly" createChild="false" ecoreFeature="ecore:EAttribute symbol.ecore#//ITypeDescriptor/typeSignature"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute symbol.ecore#//ITypeDescriptor/superTypeSignatures"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute symbol.ecore#//ITypeDescriptor/interfaceTypeSignatures"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute symbol.ecore#//ITypeDescriptor/typeSignatureDelegate"/>
- <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference symbol.ecore#//ITypeDescriptor/methods"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute symbol.ecore#//ITypeDescriptor/typeParameterSignatures"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute symbol.ecore#//ITypeDescriptor/jdtContext"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute symbol.ecore#//ITypeDescriptor/enumType"/>
- <genOperations ecoreOperation="symbol.ecore#//ITypeDescriptor/instanceOf">
- <genParameters ecoreParameter="symbol.ecore#//ITypeDescriptor/instanceOf/typeSignature"/>
- </genOperations>
- <genOperations ecoreOperation="symbol.ecore#//ITypeDescriptor/isArray"/>
- <genOperations ecoreOperation="symbol.ecore#//ITypeDescriptor/getArrayElement"/>
- <genOperations ecoreOperation="symbol.ecore#//ITypeDescriptor/resolveType">
- <genParameters ecoreParameter="symbol.ecore#//ITypeDescriptor/resolveType/resolvedTypeSignature"/>
- </genOperations>
- <genOperations ecoreOperation="symbol.ecore#//ITypeDescriptor/calculateSyntheticCall">
- <genParameters ecoreParameter="symbol.ecore#//ITypeDescriptor/calculateSyntheticCall/methodName"/>
- <genParameters ecoreParameter="symbol.ecore#//ITypeDescriptor/calculateSyntheticCall/methodArgs"/>
- <genParameters ecoreParameter="symbol.ecore#//ITypeDescriptor/calculateSyntheticCall/symbolName"/>
- </genOperations>
- </genClasses>
- <genClasses image="false" ecoreClass="symbol.ecore#//IDescribedInDetail"/>
- <genClasses ecoreClass="symbol.ecore#//IJavaTypeDescriptor2">
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute symbol.ecore#//IJavaTypeDescriptor2/type"/>
- <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference symbol.ecore#//IJavaTypeDescriptor2/beanProperties"/>
- <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference symbol.ecore#//IJavaTypeDescriptor2/beanMethods"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute symbol.ecore#//IJavaTypeDescriptor2/arrayCount"/>
- </genClasses>
- <genClasses ecoreClass="symbol.ecore#//IBeanMethodSymbol">
- <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference symbol.ecore#//IBeanMethodSymbol/owner"/>
- </genClasses>
- <genClasses ecoreClass="symbol.ecore#//IComponentSymbol"/>
- <genClasses ecoreClass="symbol.ecore#//IPropertySymbol">
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute symbol.ecore#//IPropertySymbol/intermediate"/>
- </genClasses>
- <genClasses ecoreClass="symbol.ecore#//IMapTypeDescriptor">
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute symbol.ecore#//IMapTypeDescriptor/mapSource"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute symbol.ecore#//IMapTypeDescriptor/immutable"/>
- </genClasses>
- <genClasses ecoreClass="symbol.ecore#//IMethodSymbol">
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute symbol.ecore#//IMethodSymbol/signature"/>
- </genClasses>
- <genClasses image="false" ecoreClass="symbol.ecore#//IObjectSymbol">
- <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference symbol.ecore#//IObjectSymbol/typeDescriptor"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute symbol.ecore#//IObjectSymbol/readable"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute symbol.ecore#//IObjectSymbol/writable"/>
- <genOperations ecoreOperation="symbol.ecore#//IObjectSymbol/supportsCoercion">
- <genParameters ecoreParameter="symbol.ecore#//IObjectSymbol/supportsCoercion/typeSignature"/>
- </genOperations>
- <genOperations ecoreOperation="symbol.ecore#//IObjectSymbol/coerce">
- <genParameters ecoreParameter="symbol.ecore#//IObjectSymbol/coerce/typeSignature"/>
- </genOperations>
- <genOperations ecoreOperation="symbol.ecore#//IObjectSymbol/call">
- <genParameters ecoreParameter="symbol.ecore#//IObjectSymbol/call/methodName"/>
- <genParameters ecoreParameter="symbol.ecore#//IObjectSymbol/call/methodArguments"/>
- <genParameters ecoreParameter="symbol.ecore#//IObjectSymbol/call/symbolName"/>
- </genOperations>
- </genClasses>
- <genClasses ecoreClass="symbol.ecore#//IBoundedTypeDescriptor">
- <genOperations ecoreOperation="symbol.ecore#//IBoundedTypeDescriptor/isUnboundedForType">
- <genParameters ecoreParameter="symbol.ecore#//IBoundedTypeDescriptor/isUnboundedForType/typeSignature"/>
- </genOperations>
- <genOperations ecoreOperation="symbol.ecore#//IBoundedTypeDescriptor/getUnboundedProperty">
- <genParameters ecoreParameter="symbol.ecore#//IBoundedTypeDescriptor/getUnboundedProperty/name"/>
- <genParameters ecoreParameter="symbol.ecore#//IBoundedTypeDescriptor/getUnboundedProperty/typeSignature"/>
- </genOperations>
- </genClasses>
- <genClasses ecoreClass="symbol.ecore#//IBoundedMapTypeDescriptor"/>
- <genClasses ecoreClass="symbol.ecore#//IBoundedJavaTypeDescriptor"/>
- <genClasses ecoreClass="symbol.ecore#//IListTypeDescriptor">
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute symbol.ecore#//IListTypeDescriptor/listSource"/>
- </genClasses>
- <genClasses ecoreClass="symbol.ecore#//IBoundedListTypeDescriptor"/>
- </genPackages>
-</genmodel:GenModel>
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/plugin.properties b/jsf/plugins/org.eclipse.jst.jsf.common/plugin.properties
deleted file mode 100644
index b4d063d..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/plugin.properties
+++ /dev/null
@@ -1,21 +0,0 @@
-###############################################################################
-# Copyright (c) 2005 Oracle 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
-#
-###############################################################################
-plugin.name=JavaServer Faces Tools - Common
-plugin.provider=Eclipse.org
-
-###############################################################################
-extension-point.name.0 = annotationFiles
-extension-point.name.1 = JSF EL Symbol Source Provider
-extension-point.name.2 = Contextual Symbol Factory
-extension-point.name.3 = Metadata Domain Loading Strategies (internal)
-extension-point.name.4 = Metadata Domain Source Model Types (internal)
-extension-point.name.5 = Metadata Domain Source Model Type Translators (internal)
-extension-point.name.6 = Standard Metadata Files
-extension-point.name.7 = Metadata Model Manager Factory (internal)
-extension-point.name.8 = Metadata Model Domain Query Factory (internal)
\ No newline at end of file
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/plugin.xml b/jsf/plugins/org.eclipse.jst.jsf.common/plugin.xml
deleted file mode 100644
index 36ab462..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/plugin.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.2"?>
-<plugin>
- <extension-point id="symbolSourceProvider" name="%extension-point.name.1" schema="schema/symbols.exsd"/>
- <extension-point id="contextSymbolFactory" name="%extension-point.name.2" schema="schema/contextSymbolFactory.exsd"/>
- <extension-point id="domainLoadingStrategies" name="%extension-point.name.3" schema="schema/DomainLoadingStrategies.exsd"/>
- <extension-point id="domainSourceModelTypes" name="%extension-point.name.4" schema="schema/DomainSourceModelTypes.exsd"/>
- <extension-point id="domainSourceModelTypeTranslators" name="%extension-point.name.5" schema="schema/DomainSourceModelTypeTranslators.exsd"/>
- <extension-point id="standardMetaDataFiles" name="%extension-point.name.6" schema="schema/StandardMetaDataFiles.exsd"/>
- <extension-point id="mdModelManagerFactory" name="%extension-point.name.7" schema="schema/MDModelManagerFactory.exsd"/>
- <extension-point id="domainQueryFactory" name="%extension-point.name.8" schema="schema/DomainQueryFactory.exsd"/>
- <extension
- point="org.eclipse.jst.jsf.common.domainLoadingStrategies">
- <domainLoader
- domainId="TagLibraryDomain"
- domainLoadingStrategy="org.eclipse.jst.jsf.common.metadata.internal.JSPTagLibDomainLoadingStrategy"/>
- </extension>
- <extension
- point="org.eclipse.jst.jsf.common.domainSourceModelTypes">
- <domainSourceModelTypes
- domainId="TagLibraryDomain"
- domainSourceModelTypeId="DefaultMetaDataTagLibraryHandler"
- locator="org.eclipse.jst.jsf.common.metadata.internal.StandardMetaDataLocator"
- ordinal="10">
- </domainSourceModelTypes>
- </extension>
- <extension
- point="org.eclipse.jst.jsf.common.domainSourceModelTypeTranslators">
- <domainSourceModelTypeTranslator
- domainSourceModelTypeId="DefaultMetaDataTagLibraryHandler"
- translatorClass="org.eclipse.jst.jsf.common.metadata.internal.StandardMetaDataFilesTranslator">
- </domainSourceModelTypeTranslator>
- </extension>
- <extension point="org.eclipse.emf.ecore.generated_package">
- <package
- uri = "http:///org/eclipse/jst/jsf/context/symbol.ecore"
- class = "org.eclipse.jst.jsf.context.symbol.SymbolPackage"
- genModel = "model/symbol.genmodel" />
- <package
- uri = "http://org.eclipse.jst.jsf.common.metadata/metadata.ecore"
- class = "org.eclipse.jst.jsf.common.metadata.MetadataPackage"
- genModel = "model/metadata.genmodel" />
- <package
- uri = "http://org.eclipse.jst.jsf.common.metadata/metadataTraitTypes.ecore"
- class = "org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.TraitTypesPackage"
- genModel = "model/metadataTraitTypes.genmodel" />
- </extension>
- <extension
- point="org.eclipse.emf.edit.itemProviderAdapterFactories">
- <factory
- uri = "http:///org/eclipse/jst/jsf/context/symbol.ecore"
- class = "org.eclipse.jst.jsf.context.symbol.internal.provider.SymbolItemProviderAdapterFactory"
- 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
- org.eclipse.jst.jsf.context.symbol.provider.IContentProposalProvider" />
- </extension>
- <extension
- point="org.eclipse.jst.jsf.common.contextSymbolFactory">
- <contextSymbolFactory
- factory="org.eclipse.jst.jsf.context.symbol.internal.source.UnknownTypeContextSymbolFactory"
- factoryId="org.eclipse.jst.jsf.common.unknownTypeSymbolFactory">
- </contextSymbolFactory>
- </extension>
- <extension
- point="org.eclipse.jst.jsf.common.domainQueryFactory">
- <factory
- class="org.eclipse.jst.jsf.common.metadata.query.internal.taglib.TaglibDomainMetaDataQueryFactory">
- </factory>
- </extension>
-
-</plugin>
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/schema/DomainLoadingStrategies.exsd b/jsf/plugins/org.eclipse.jst.jsf.common/schema/DomainLoadingStrategies.exsd
deleted file mode 100644
index a2b609d..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/schema/DomainLoadingStrategies.exsd
+++ /dev/null
@@ -1,121 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.jst.jsf.common">
-<annotation>
- <appInfo>
- <meta.schema plugin="org.eclipse.jst.jsf.common" id="DomainLoadingStrategies" name="DomainLoadingStrategies"/>
- </appInfo>
- <documentation>
- ** Should be considered internal at this time. Subject to change **
-Allows for naming domains of metadata and binding to classes that can load sources of metadata into that domain. A domain is a set of entities using jsf.common.metadata model. In initial release, Tag Library domain will be supplied. Tag files, Tags, attributes are the known entities on this domain, as an example.
- </documentation>
- </annotation>
-
- <element name="extension">
- <complexType>
- <sequence minOccurs="0" maxOccurs="unbounded">
- <element ref="domainLoader"/>
- </sequence>
- <attribute name="point" type="string" use="required">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- <attribute name="id" type="string">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- <attribute name="name" type="string">
- <annotation>
- <documentation>
-
- </documentation>
- <appInfo>
- <meta.attribute translatable="true"/>
- </appInfo>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <element name="domainLoader">
- <complexType>
- <attribute name="domainId" type="string" use="required">
- <annotation>
- <documentation>
- Key used to name this domain.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="domainLoadingStrategy" type="string" use="required">
- <annotation>
- <documentation>
- Fully qualified java class implementing <code>org.eclipse.jst.jsf.common.metadata.IDomainLoadingStrategy</code> that will be used to load an instance of a metadata model.
-
-Implementing class requires a constructor taking the domainID String.
- </documentation>
- <appInfo>
- <meta.attribute kind="java" basedOn="org.eclipse.jst.jsf.common.metadata.internal.IDomainLoadingStrategy"/>
- </appInfo>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <annotation>
- <appInfo>
- <meta.section type="since"/>
- </appInfo>
- <documentation>
- 2.0
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="examples"/>
- </appInfo>
- <documentation>
- <extension
- point="org.eclipse.jst.jsf.common.domainLoadingStrategies">
- <domainLoader
- domainId="TagLibraryDomain"
- domainLoadingStrategy="org.eclipse.jst.jsf.common.metadata.internal.JSPTagLibDomainLoadingStrategy"/>
- </extension>
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="apiInfo"/>
- </appInfo>
- <documentation>
-
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="implementation"/>
- </appInfo>
- <documentation>
-
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="copyright"/>
- </appInfo>
- <documentation>
- Copyright 2007 Oracle
-All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html
- </documentation>
- </annotation>
-
-</schema>
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/schema/DomainQueryFactory.exsd b/jsf/plugins/org.eclipse.jst.jsf.common/schema/DomainQueryFactory.exsd
deleted file mode 100644
index 39b8e32..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/schema/DomainQueryFactory.exsd
+++ /dev/null
@@ -1,111 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.jst.jsf.common" xmlns="http://www.w3.org/2001/XMLSchema">
-<annotation>
- <appInfo>
- <meta.schema plugin="org.eclipse.jst.jsf.common" id="domainQueryFactory" name="Metadata Domain Query Factory (internal)"/>
- </appInfo>
- <documentation>
- internal... not provisional API
- </documentation>
- </annotation>
-
- <element name="extension">
- <annotation>
- <appInfo>
- <meta.element />
- </appInfo>
- </annotation>
- <complexType>
- <sequence>
- <element ref="factory" minOccurs="0" maxOccurs="1"/>
- </sequence>
- <attribute name="point" type="string" use="required">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- <attribute name="id" type="string">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- <attribute name="name" type="string">
- <annotation>
- <documentation>
-
- </documentation>
- <appInfo>
- <meta.attribute translatable="true"/>
- </appInfo>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <element name="factory">
- <complexType>
- <attribute name="class" type="string" use="required">
- <annotation>
- <documentation>
-
- </documentation>
- <appInfo>
- <meta.attribute kind="java" basedOn="org.eclipse.jst.jsf.common.metadata.query.internal.AbstractMetaDataDomainQueryFactory:"/>
- </appInfo>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <annotation>
- <appInfo>
- <meta.section type="since"/>
- </appInfo>
- <documentation>
- Helios
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="examples"/>
- </appInfo>
- <documentation>
- [Enter extension point usage example here.]
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="apiinfo"/>
- </appInfo>
- <documentation>
- [Enter API information here.]
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="implementation"/>
- </appInfo>
- <documentation>
- [Enter information about supplied implementation of this extension point.]
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="copyright"/>
- </appInfo>
- <documentation>
- Copyright 2010 Oracle
-All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html
- </documentation>
- </annotation>
-
-</schema>
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/schema/DomainSourceModelTypeTranslators.exsd b/jsf/plugins/org.eclipse.jst.jsf.common/schema/DomainSourceModelTypeTranslators.exsd
deleted file mode 100644
index 1d9c020..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/schema/DomainSourceModelTypeTranslators.exsd
+++ /dev/null
@@ -1,120 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.jst.jsf.common">
-<annotation>
- <appInfo>
- <meta.schema plugin="org.eclipse.jst.jsf.common" id="DomainSourceModelTypeTranslators" name="DomainSourceModelTypeTranslators"/>
- </appInfo>
- <documentation>
- ** Should be considered internal at this time. Subject to change **
-Allows for metadata domain translators to be applied to a metadata domain source type.
- </documentation>
- </annotation>
-
- <element name="extension">
- <complexType>
- <sequence minOccurs="0" maxOccurs="unbounded">
- <element ref="domainSourceModelTypeTranslator"/>
- </sequence>
- <attribute name="point" type="string" use="required">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- <attribute name="id" type="string">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- <attribute name="name" type="string">
- <annotation>
- <documentation>
-
- </documentation>
- <appInfo>
- <meta.attribute translatable="true"/>
- </appInfo>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <element name="domainSourceModelTypeTranslator">
- <complexType>
- <attribute name="domainSourceModelTypeId" type="string" use="required">
- <annotation>
- <documentation>
- The unique id from the domainSourceModelTypes ext-pt that will bind the translator class to that domain source.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="translatorClass" type="string" use="required">
- <annotation>
- <documentation>
- Fully qualified class implementing <code>org.eclipse.jst.jsf.common.metadata.IMetaDataTranslator</code> that will translate from the source domain to the "standard" domain of entities and traits.
- </documentation>
- <appInfo>
- <meta.attribute kind="java" basedOn="org.eclipse.jst.jsf.common.metadata.internal.IMetaDataTranslator"/>
- </appInfo>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <annotation>
- <appInfo>
- <meta.section type="since"/>
- </appInfo>
- <documentation>
- 2.0
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="examples"/>
- </appInfo>
- <documentation>
- <extension
- point="org.eclipse.jst.jsf.common.domainSourceModelTypeTranslators">
- <domainSourceModelTypeTranslator
- class="org.eclipse.jst.jsf.common.metadata.internal.TaglibMetaDataTLDTranslator"
- domainSourceModelTypeId="TagLibMetaDataTagLibraryHandler">
- </domainSourceModelTypeTranslator>
- </extension>
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="apiInfo"/>
- </appInfo>
- <documentation>
-
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="implementation"/>
- </appInfo>
- <documentation>
-
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="copyright"/>
- </appInfo>
- <documentation>
- Copyright 2007 Oracle
-All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html
- </documentation>
- </annotation>
-
-</schema>
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/schema/DomainSourceModelTypes.exsd b/jsf/plugins/org.eclipse.jst.jsf.common/schema/DomainSourceModelTypes.exsd
deleted file mode 100644
index 4bb747e..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/schema/DomainSourceModelTypes.exsd
+++ /dev/null
@@ -1,128 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.jst.jsf.common">
-<annotation>
- <appInfo>
- <meta.schema plugin="org.eclipse.jst.jsf.common" id="domainSourceModelTypes" name="Metadata Domain Source Model Types"/>
- </appInfo>
- <documentation>
- ** Should be considered internal at this time. Subject to change **
-Binds metadata source types to a particular domain of metadata.
- </documentation>
- </annotation>
-
- <element name="extension">
- <complexType>
- <sequence minOccurs="0" maxOccurs="unbounded">
- <element ref="domainSourceModelTypes"/>
- </sequence>
- <attribute name="point" type="string" use="required">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- <attribute name="id" type="string">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- <attribute name="name" type="string">
- <annotation>
- <documentation>
-
- </documentation>
- <appInfo>
- <meta.attribute translatable="true"/>
- </appInfo>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <element name="domainSourceModelTypes">
- <complexType>
- <attribute name="domainSourceModelTypeId" type="string" use="required">
- <annotation>
- <documentation>
- Uniquely identifies this combination of domain and source metadata locator. This id should be used by the domainSourceModelTypeTranslator ext-pt.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="domainId" type="string" use="required">
- <annotation>
- <documentation>
- The DomainLoadingStrategy domainId that this source is being bound to.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="locator" type="string" use="required">
- <annotation>
- <documentation>
- A class implementing <code>IMetaDataLocator</code> that is responsible for finding instances of metadata.
- </documentation>
- <appInfo>
- <meta.attribute kind="java" basedOn="org.eclipse.jst.jsf.common.metadata.internal.IMetaDataLocator"/>
- </appInfo>
- </annotation>
- </attribute>
- <attribute name="ordinal" type="string">
- <annotation>
- <documentation>
- An optional integer ordinal that is used to prioritize a source if the domain loading strategy does not supply it's own sorting. The higher the number, the higher the priority.
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <annotation>
- <appInfo>
- <meta.section type="since"/>
- </appInfo>
- <documentation>
- 2.0
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="examples"/>
- </appInfo>
- <documentation>
-
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="apiInfo"/>
- </appInfo>
- <documentation>
-
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="implementation"/>
- </appInfo>
- <documentation>
-
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="copyright"/>
- </appInfo>
- <documentation>
- Copyright 2007 Oracle
-All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html
- </documentation>
- </annotation>
-
-</schema>
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/schema/MDModelManagerFactory.exsd b/jsf/plugins/org.eclipse.jst.jsf.common/schema/MDModelManagerFactory.exsd
deleted file mode 100644
index 295c03a..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/schema/MDModelManagerFactory.exsd
+++ /dev/null
@@ -1,111 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.jst.jsf.common" xmlns="http://www.w3.org/2001/XMLSchema">
-<annotation>
- <appInfo>
- <meta.schema plugin="org.eclipse.jst.jsf.common" id="mdModelManagerFactory" name="Metadata Model Manager Factory (internal)"/>
- </appInfo>
- <documentation>
- internal... not API
- </documentation>
- </annotation>
-
- <element name="extension">
- <annotation>
- <appInfo>
- <meta.element />
- </appInfo>
- </annotation>
- <complexType>
- <sequence>
- <element ref="factory" minOccurs="0" maxOccurs="1"/>
- </sequence>
- <attribute name="point" type="string" use="required">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- <attribute name="id" type="string">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- <attribute name="name" type="string">
- <annotation>
- <documentation>
-
- </documentation>
- <appInfo>
- <meta.attribute translatable="true"/>
- </appInfo>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <element name="factory">
- <complexType>
- <attribute name="class" type="string" use="required">
- <annotation>
- <documentation>
-
- </documentation>
- <appInfo>
- <meta.attribute kind="java" basedOn=":org.eclipse.jst.jsf.common.metadata.internal.IMetaDataModelManagerFactory"/>
- </appInfo>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <annotation>
- <appInfo>
- <meta.section type="since"/>
- </appInfo>
- <documentation>
- Helios
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="examples"/>
- </appInfo>
- <documentation>
- [Enter extension point usage example here.]
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="apiinfo"/>
- </appInfo>
- <documentation>
- [Enter API information here.]
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="implementation"/>
- </appInfo>
- <documentation>
- [Enter information about supplied implementation of this extension point.]
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="copyright"/>
- </appInfo>
- <documentation>
- Copyright 2010 Oracle
-All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html
- </documentation>
- </annotation>
-
-</schema>
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/schema/StandardMetaDataFiles.exsd b/jsf/plugins/org.eclipse.jst.jsf.common/schema/StandardMetaDataFiles.exsd
deleted file mode 100644
index 1ab7d63..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/schema/StandardMetaDataFiles.exsd
+++ /dev/null
@@ -1,134 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.jst.jsf.common">
-<annotation>
- <appInfo>
- <meta.schema plugin="org.eclipse.jst.jsf.common" id="StandardMetaDataFiles" name="StandardMetaDataFiles"/>
- </appInfo>
- <documentation>
- Defines a file of metadata for a given URI in "standard" form loadable by <code>org.eclipse.jst.jsf.common.metadata model</code>
-
-<p><b>This extension point is provisional and subject to change</b></p>
- </documentation>
- </annotation>
-
- <element name="extension">
- <complexType>
- <sequence>
- <element ref="standardMetaDataFile" minOccurs="1" maxOccurs="unbounded"/>
- </sequence>
- <attribute name="point" type="string" use="required">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- <attribute name="id" type="string">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- <attribute name="name" type="string">
- <annotation>
- <documentation>
-
- </documentation>
- <appInfo>
- <meta.attribute translatable="true"/>
- </appInfo>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <element name="standardMetaDataFile">
- <annotation>
- <documentation>
- Mapping of a namespace URI to an XML file loadable by a standard metadata EMF model defined by <code>http://org.eclipse.jst.jsf.common.metadata/metadata.ecore</code>. See <code>org.eclipse.jst.jsf.standard.tagsupport</code> plugin and the /metadata/jsf_core.xml file.
- </documentation>
- </annotation>
- <complexType>
- <attribute name="uri" type="string" use="required">
- <annotation>
- <documentation>
- Content model URI being annotated. eg. "http://java.sun.com/jsf/core". This can, of course, be any string that the consumer wishes to use as a key.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="location" type="string" use="required">
- <annotation>
- <documentation>
- Location of the annotation file. If no locator is provided, it will use the default <code>PluginRelativeStandardMetaDataSourceFileLocator</code> which will find the file in a location relative to the plugin.
-eg. /metadata/jsf_core.xml
- </documentation>
- </annotation>
- </attribute>
- <attribute name="locator" type="string">
- <annotation>
- <documentation>
- Class extending <code>org.eclipse.jst.jsf.common.metadata.internal.StandardMetaDataSourceFileLocator</code> that will be used to locate the standard metadata file.
- </documentation>
- <appInfo>
- <meta.attribute kind="java" basedOn="org.eclipse.jst.jsf.common.metadata.internal.StandardMetaDataSourceFileLocator"/>
- </appInfo>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <annotation>
- <appInfo>
- <meta.section type="since"/>
- </appInfo>
- <documentation>
- 2.0
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="examples"/>
- </appInfo>
- <documentation>
- <extension
- point="org.eclipse.jst.jsf.common.standardMetaDataFiles">
- <standardMetaDataFile
- location="/metadata/JSF_HTML.xml"
- uri="http://java.sun.com/jsf/html">
- </standardMetaDataFile>
- </extension>
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="apiInfo"/>
- </appInfo>
- <documentation>
-
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="implementation"/>
- </appInfo>
- <documentation>
-
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="copyright"/>
- </appInfo>
- <documentation>
- Copyright 2007 Oracle
-All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html
- </documentation>
- </annotation>
-
-</schema>
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/schema/contextSymbolFactory.exsd b/jsf/plugins/org.eclipse.jst.jsf.common/schema/contextSymbolFactory.exsd
deleted file mode 100644
index b44040c..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/schema/contextSymbolFactory.exsd
+++ /dev/null
@@ -1,137 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.jst.jsf.common">
-<annotation>
- <appInfo>
- <meta.schema plugin="org.eclipse.jst.jsf.common" id="contextSymbolFactory" name="Contextual Symbol Factory"/>
- </appInfo>
- <documentation>
- The context symbol factory allows a symbol factory with a specific id to be registered to create symbols in a particular context. Clients wishing to delegate symbol construction in a particular context may then request the symbol factory based on its id.
-
-To get a map of registered symbol factories keyed by id, call SymbolsPlugin.getSymbolFactories().
-
-The most common use of this extension point is by the JSPModelProcessor. By decorating a tag attribute with meta-data pointing to a context symbol factory with a particular id, the JSP model processor will call that symbol factory to create a symbol for that tag.
-
-See developer docs on decorating variable contributing tags for more information.
- </documentation>
- </annotation>
-
- <element name="extension">
- <complexType>
- <choice>
- <element ref="contextSymbolFactory"/>
- </choice>
- <attribute name="point" type="string" use="required">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- <attribute name="id" type="string">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- <attribute name="name" type="string">
- <annotation>
- <documentation>
-
- </documentation>
- <appInfo>
- <meta.attribute translatable="true"/>
- </appInfo>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <element name="contextSymbolFactory">
- <annotation>
- <documentation>
- The context symbol factory description.
- </documentation>
- </annotation>
- <complexType>
- <attribute name="factory" type="string" use="required">
- <annotation>
- <documentation>
- An instance of AbstractContextSymbolFactory that implements the context symbol factory.
- </documentation>
- <appInfo>
- <meta.attribute kind="java" basedOn="org.eclipse.jst.jsf.context.symbol.source.AbstractContextSymbolFactory"/>
- </appInfo>
- </annotation>
- </attribute>
- <attribute name="factoryId" type="string" use="required">
- <annotation>
- <documentation>
- The id that will be used to uniquely identify this factory in meta-data or elsewhere.
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <annotation>
- <appInfo>
- <meta.section type="since"/>
- </appInfo>
- <documentation>
- 1.5
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="examples"/>
- </appInfo>
- <documentation>
- <p>The following example creates a symbol factory for creating symbols.</p>
-
-<p>
-<pre>
-<extension
- point="org.eclipse.jst.jsf.context.symbol.contextSymbolFactory">
- <contextSymbolFactory
- factory="org.eclipse.jst.jsf.designtime.internal.jsp.JSPDefaultSymbolFactory"
- factoryId="org.eclipse.jst.jsf.designtime.core.loadBundle"/>
-</extension>
-</pre>
-</p>
-
-<p>When the symbol factory <i>org.eclipse.jst.jsf.designtime.core.loadBundle</i> is requested, an instance of JSPDefaultSymbolFactory will be constructed.</p>
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="apiInfo"/>
- </appInfo>
- <documentation>
-
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="implementation"/>
- </appInfo>
- <documentation>
-
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="copyright"/>
- </appInfo>
- <documentation>
- Copyright 2006 Oracle
-All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html
- </documentation>
- </annotation>
-
-</schema>
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/schema/grammar-annotations.xsd b/jsf/plugins/org.eclipse.jst.jsf.common/schema/grammar-annotations.xsd
deleted file mode 100644
index 2319744..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/schema/grammar-annotations.xsd
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema
- targetNamespace="http://org.eclipse.jst.jsf.contentmodel.annotations/grammarAnnotationSchema"
- version="1.0"
- attributeFormDefault="unqualified"
- elementFormDefault="unqualified"
- xmlns="http://org.eclipse.jst.jsf.contentmodel.annotations/grammarAnnotationSchema"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-
- <xsd:element name="grammar-annotations"
- type="grammar-annotationType" />
-
- <xsd:complexType name="grammar-annotationType">
- <xsd:sequence>
- <xsd:element name="cm-element"
- type="cm-elementType" minOccurs="1" maxOccurs="unbounded" />
- </xsd:sequence>
- <xsd:attribute name="caseSensitive" type="xsd:boolean" use="optional" default="true"/>
- </xsd:complexType>
- <xsd:complexType name="cm-elementType">
- <xsd:sequence>
- <xsd:element name="cm-attribute" type="cm-attributeType" minOccurs="0" maxOccurs="unbounded"/>
- <xsd:element name="property" type="propertyType" minOccurs="0" maxOccurs="unbounded"/>
- </xsd:sequence>
- <xsd:attribute name="name" type="xsd:string" use="required"/>
- </xsd:complexType>
- <xsd:complexType name="cm-attributeType">
- <xsd:sequence>
- <xsd:element name="property"
- type="propertyType" minOccurs="0" maxOccurs="unbounded"/>
- </xsd:sequence>
- <xsd:attribute name="name" type="xsd:string" use="required"/>
- </xsd:complexType>
- <xsd:complexType name="propertyType">
- <xsd:sequence>
- <xsd:element name="value" type="xsd:string" minOccurs="1" maxOccurs="unbounded"/>
- </xsd:sequence>
- <xsd:attribute name="name" type="xsd:string" use="required"/>
- </xsd:complexType>
-</xsd:schema>
\ No newline at end of file
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/schema/symbols.exsd b/jsf/plugins/org.eclipse.jst.jsf.common/schema/symbols.exsd
deleted file mode 100644
index 8f265a0..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/schema/symbols.exsd
+++ /dev/null
@@ -1,106 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.jst.jsf.common" xmlns="http://www.w3.org/2001/XMLSchema">
-<annotation>
- <appinfo>
- <meta.schema plugin="org.eclipse.jst.jsf.common" id="symbols" name="Symbol Source Provider"/>
- </appinfo>
- <documentation>
- A symbol source provider is called to discover EL namespace variable symbols. For example, managed bean variable symbols, are contributed through a symbol source provider. A symbol source provider may or may not wish to use a context symbol factory depending on the situation.
-
-When an EL variable is resolved, each symbol provider will be considered equally. All of the information that determines a symbol's characteristics must be encoded in the returned ISymbol object.
-
-A list of registered symbol providers may be found by calling JSFCommonPlugin.getSymbolSourceProvider().
- </documentation>
- </annotation>
-
- <element name="extension">
- <complexType>
- <choice>
- <element ref="symbolSourceId"/>
- </choice>
- <attribute name="point" type="string" use="required">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- <attribute name="id" type="string">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- <attribute name="name" type="string">
- <annotation>
- <documentation>
-
- </documentation>
- <appinfo>
- <meta.attribute translatable="true"/>
- </appinfo>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <element name="symbolSourceId">
- <complexType>
- <attribute name="factory" type="string" use="required">
- <annotation>
- <documentation>
- An instance of the factory interface that will be invoked to create an instance of this symbol source provider. Factory must have a zero-arg default constructor.
- </documentation>
- <appinfo>
- <meta.attribute kind="java" basedOn="org.eclipse.jst.jsf.context.symbol.source.ISymbolSourceProviderFactory"/>
- </appinfo>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <annotation>
- <appinfo>
- <meta.section type="since"/>
- </appinfo>
- <documentation>
- 1.5
- </documentation>
- </annotation>
-
- <annotation>
- <appinfo>
- <meta.section type="examples"/>
- </appinfo>
- <documentation>
- The following xml is used to contribute a set of default providers to contribute managed bean, built-in and tag contributed variables:
-
-<p>
-<pre>
- <extension
- point="org.eclipse.jst.jsf.context.symbol.symbolSourceProvider">
- <symbolSourceId factory="org.eclipse.jst.jsf.designtime.internal.symbols.DefaultBeanSymbolSourceProvider"/>
- <symbolSourceId factory="org.eclipse.jst.jsf.designtime.internal.symbols.JSPTagVariableSymbolSourceProvider"/>
- <symbolSourceId factory="org.eclipse.jst.jsf.designtime.internal.symbols.DefaultBuiltInSymbolProvider"/>
- </extension>
-</pre>
-</p>
- </documentation>
- </annotation>
-
-
-
-
- <annotation>
- <appinfo>
- <meta.section type="copyright"/>
- </appinfo>
- <documentation>
- Copyright 2006 Oracle
-All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html
- </documentation>
- </annotation>
-
-</schema>
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/JSFCommonPlugin.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/JSFCommonPlugin.java
deleted file mode 100644
index e9492ef..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/JSFCommonPlugin.java
+++ /dev/null
@@ -1,345 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2007 Oracle Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Oracle Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.common;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtension;
-import org.eclipse.core.runtime.IExtensionPoint;
-import org.eclipse.core.runtime.ILog;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.emf.common.EMFPlugin;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.jst.jsf.context.symbol.source.AbstractContextSymbolFactory;
-import org.eclipse.jst.jsf.context.symbol.source.ISymbolSourceProvider;
-import org.eclipse.jst.jsf.context.symbol.source.ISymbolSourceProviderFactory;
-import org.osgi.framework.Bundle;
-
-/**
- * This is the central singleton for the My edit plugin.
- * <!-- begin-user-doc -->
- * This class is not API.
- * <!-- end-user-doc -->
- * @generated
- */
-public final class JSFCommonPlugin extends EMFPlugin {
-
- /**
- * Plugin id
- */
- public static final String PLUGIN_ID = "org.eclipse.jst.jsf.common"; //$NON-NLS-1$
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public static final String copyright = "Copyright 2006 Oracle"; //$NON-NLS-1$
-
- private static List<ISymbolSourceProviderFactory> registeredSymbolSourceProviders;
- private static Map<String,AbstractContextSymbolFactory> registeredSymbolFactories;
-
- private final static String FACTORY_ATTRIBUTE_NAME = "factory"; //$NON-NLS-1$
- private final static String FACTORY_ATTRIBUTE_ID_NAME = "factoryId"; //$NON-NLS-1$
- private final static String SYMBOL_SOURCE_ID = "symbolSourceId"; //$NON-NLS-1$
- private final static String CONTEXT_SYMBOL_FACTORY = "contextSymbolFactory"; //$NON-NLS-1$
- /**
- * Keep track of the singleton.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public static final JSFCommonPlugin INSTANCE = new JSFCommonPlugin();
-
- /**
- * 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 JSFCommonPlugin() {
- super
- (new ResourceLocator [] {
- });
- }
-
- /**
- * Returns the singleton instance of the Eclipse plugin.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the singleton instance.
- * @generated
- */
- public ResourceLocator getPluginResourceLocator() {
- return plugin;
- }
-
- /**
- * Returns the singleton instance of the Eclipse plugin.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the singleton instance.
- * @generated
- */
- public static Implementation getPlugin() {
- return plugin;
- }
-
- /**
- * @param e
- * @param msg
- */
- public static void log(final Throwable e, final String msg) {
- Implementation plugin2 = getPlugin();
- if (plugin2 != null)
- {
- final ILog log = getPlugin().getLog();
- if (log != null)
- {
- log.log(new Status(IStatus.ERROR, PLUGIN_ID, IStatus.OK, msg, e));
- return;
- }
- }
- // if plugin not active, dump to stderr
- System.err.print(msg+": "); //$NON-NLS-1$
- if (e != null)
- {
- e.printStackTrace(System.err);
- }
- }
-
- /**
- * Logs using the default ILog implementation provided by getLog().
- *
- * @param severity Severity (IStatus constant) of log entry
- * @param message Human-readable message describing log entry
- * @param ex Throwable instance (can be null)
- */
- public static void log(int severity, String message, Throwable ex) {
- getPlugin().getLog().log(new Status(severity, PLUGIN_ID, IStatus.OK, message, ex));
- }
-
- /**
- * Logs using the default ILog implementation provided by getLog().
- *
- * @param severity Severity (IStatus constant) of log entry
- * @param message Human-readable message describing log entry
- */
- public static void log(int severity, String message) {
- log(severity, message, null);
- }
- /**
- * @return all registered symbol source providers
- */
- public static ISymbolSourceProvider[] getSymbolSourceProvider()
- {
- return registeredSymbolSourceProviders.toArray(new ISymbolSourceProvider[0]);
- }
-
- /**
- * @return all registered symbol source providers
- */
- public synchronized static List<ISymbolSourceProviderFactory> getSymbolSourceProviders()
- {
- if (registeredSymbolSourceProviders == null)
- {
- registerProviders();
- if (registeredSymbolSourceProviders == null)
- {
- throw new AssertionError("registerProviders failed"); //$NON-NLS-1$
- }
- }
- return Collections.unmodifiableList(registeredSymbolSourceProviders);
- }
-
- private static void registerProviders()
- {
- final IExtensionPoint point = Platform.getExtensionRegistry().getExtensionPoint(plugin.getBundle().getSymbolicName(), Implementation.SYMBOL_SOURCE_EXT_ID);
- final IExtension[] extensions = point.getExtensions();
- registeredSymbolSourceProviders = new ArrayList<ISymbolSourceProviderFactory>(extensions.length);
-
- for (int i = 0; i < extensions.length; i++)
- {
- final IExtension extension = extensions[i];
- final IConfigurationElement[] elements =
- extension.getConfigurationElements();
- final String bundleId = extension.getContributor().getName();
-
- for (int j = 0; j < elements.length; j++)
- {
- final IConfigurationElement element = elements[j];
- if (SYMBOL_SOURCE_ID.equals(element.getName())
- && element.getAttribute(FACTORY_ATTRIBUTE_NAME) != null)
- {
- String factoryClassName = element.getAttribute(FACTORY_ATTRIBUTE_NAME);
- final Bundle bundle = Platform.getBundle(bundleId);
-
- if (bundle != null)
- {
- try
- {
- Class factoryClass = bundle.loadClass(factoryClassName);
-
- ISymbolSourceProviderFactory factory =
- (ISymbolSourceProviderFactory) factoryClass.newInstance();
-
- registeredSymbolSourceProviders.add(factory);
- }
- catch (Exception e)
- {
- plugin.log(new Status(IStatus.ERROR, plugin.getBundle().getSymbolicName(), 0, "Error loading symbol provider extension point",e)); //$NON-NLS-1$
- }
- }
- }
- }
- }
- }
-
- /**
- * @return the list of registed symbol factories
- */
- public synchronized static Map<String, AbstractContextSymbolFactory> getSymbolFactories()
- {
- if (registeredSymbolFactories == null)
- {
- registerSymbolFactories();
- if (registeredSymbolFactories == null)
- {
- throw new AssertionError("registerProviders failed"); //$NON-NLS-1$
- }
- }
- return Collections.unmodifiableMap(registeredSymbolFactories);
- }
-
- private static void registerSymbolFactories()
- {
- final IExtensionPoint point = Platform.getExtensionRegistry().getExtensionPoint(plugin.getBundle().getSymbolicName(), Implementation.SYMBOL_FACTORY_EXT_ID);
- final IExtension[] extensions = point.getExtensions();
- registeredSymbolFactories = new HashMap<String, AbstractContextSymbolFactory>(extensions.length);
-
- for (int i = 0; i < extensions.length; i++)
- {
- final IExtension extension = extensions[i];
- final IConfigurationElement[] elements =
- extension.getConfigurationElements();
- final String bundleId = extension.getContributor().getName();
-
- for (int j = 0; j < elements.length; j++)
- {
- final IConfigurationElement element = elements[j];
- if (CONTEXT_SYMBOL_FACTORY.equals(element.getName())
- && element.getAttribute(FACTORY_ATTRIBUTE_NAME) != null)
- {
- final String factoryClassName = element.getAttribute(FACTORY_ATTRIBUTE_NAME);
- final String factoryId = element.getAttribute(FACTORY_ATTRIBUTE_ID_NAME);
- final Bundle bundle = Platform.getBundle(bundleId);
-
- if (bundle != null)
- {
- try {
- Class factoryClass = bundle.loadClass(factoryClassName);
-
- AbstractContextSymbolFactory factory =
- (AbstractContextSymbolFactory) factoryClass.newInstance();
- registeredSymbolFactories.put(factoryId, factory);
- } catch (InstantiationException e) {
- plugin.log(new Status(IStatus.ERROR, plugin.getBundle().getSymbolicName(), 0, "Error loading symbol factory extension point",e)); //$NON-NLS-1$
- } catch (IllegalAccessException e) {
- plugin.log(new Status(IStatus.ERROR, plugin.getBundle().getSymbolicName(), 0, "Error loading symbol factory extension point",e)); //$NON-NLS-1$
- } catch (ClassNotFoundException e) {
- plugin.log(new Status(IStatus.ERROR, plugin.getBundle().getSymbolicName(), 0, "Error loading symbol factory extension point",e)); //$NON-NLS-1$
- }
- }
- }
- }
- }
- }
-
- /**
- * Logs an exception in this plugin to the error log
- *
- * @param t
- */
- public static void log(Throwable t)
- {
- ILog log = getPlugin().getLog();
- IStatus status = new Status(IStatus.ERROR, getPlugin().getSymbolicName(), 0, "Caught exception", t); //$NON-NLS-1$
- log.log(status);
- }
-
- /**
- * The actual implementation of the Eclipse <b>Plugin</b>.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public static class Implementation extends EclipsePlugin
- {
- /**
- * Name of the symbolSourceProvider ext point
- */
- public static final String SYMBOL_SOURCE_EXT_ID = "symbolSourceProvider"; //$NON-NLS-1$
- /**
- * Local identifier for the symbol factory extension point
- */
- public static final String SYMBOL_FACTORY_EXT_ID = "contextSymbolFactory"; //$NON-NLS-1$
- /**
- * Creates an instance.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public Implementation() {
- super();
-
- // Remember the static instance.
- //
- plugin = this;
- }
- }
-
-
- /**
- * Utility method returning class from class name using classloader from specified bundle
- * @param className
- * @param bundleId
- * @return Class
- */
- public static Class<?> loadClass(String className, String bundleId) {
- Class<?> aClass = null;
- try {
- if (bundleId != null){
- Bundle bundle = Platform.getBundle(bundleId);
- if (bundle != null){
- aClass = bundle.loadClass(className);
- }
- }
- } catch (ClassNotFoundException e) {
- log(e);
- }
- return aClass;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/dom/AttrDOMAdapter.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/dom/AttrDOMAdapter.java
deleted file mode 100644
index ec51032..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/dom/AttrDOMAdapter.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2008 Oracle Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Oracle Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.common.dom;
-
-import org.w3c.dom.Node;
-
-/**
- * Generic adapter for DOM attribute structures.
- *
- * @author cbateman
- *
- * <p>
- * <b>Provisional API - subject to change</b>
- * </p>
- */
-public abstract class AttrDOMAdapter extends DOMAdapter
-{
-
- private AttributeIdentifier _attributeId; // lazily instantiated.
- private final ElementDOMAdapter _owner;
-
- /**
- * @param owner
- */
- protected AttrDOMAdapter(final ElementDOMAdapter owner)
- {
- _owner = owner;
- }
-
- /**
- * The default implementation always returns the owner specified in the
- * constructor.
- *
- * @return the element that owns this attribute
- */
- public ElementDOMAdapter getOwningElement()
- {
- return _owner;
- }
-
- /**
- * @return the value of the attribute. May return null if the attribute has
- * no value.
- */
- public abstract String getValue();
-
- @Override
- public final short getNodeType()
- {
- return Node.ATTRIBUTE_NODE;
- }
-
- /**
- * @return the attribute identifier
- */
- public final AttributeIdentifier getAttributeIdentifier()
- {
- synchronized (this)
- {
- if (_attributeId == null)
- {
- _attributeId = new MyAttributeIdentifier();
- }
- }
- return _attributeId;
- }
-
- private class MyAttributeIdentifier extends AttributeIdentifier
- {
-
- @Override
- public String getName()
- {
- return AttrDOMAdapter.this.getLocalName();
- }
-
- @Override
- public TagIdentifier getTagIdentifier()
- {
- return getOwningElement().getTagId();
- }
-
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/dom/AttributeIdentifier.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/dom/AttributeIdentifier.java
deleted file mode 100644
index 2bf163e..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/dom/AttributeIdentifier.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2008 Oracle Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Oracle Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.common.dom;
-
-/**
- * Uniquely identifies a named attribute on a tag usint TagIdentifier as a way
- * to uniquely identify the host tag. All instances should be considered
- * immutable and idempotent. Factories may cache copies as transparent
- * singletons for unique TagIdentifier/attribute.
- *
- * THIS CLASS IS NOT API AND SHOULD NOT BE USED
- *
- * @author cbateman
- *
- */
-public abstract class AttributeIdentifier
-{
- /**
- * @return the attribute name (local name, namespace prefix is currently ignored)
- */
- public abstract String getName();
-
- /**
- * @return the tag identifier
- */
- public abstract TagIdentifier getTagIdentifier();
-
- public final boolean equals(Object compareTo)
- {
- if (compareTo instanceof AttributeIdentifier)
- {
- return isSameAttributeType((AttributeIdentifier) compareTo);
- }
- return false;
- }
-
- public final int hashCode()
- {
- // use toLowerCase to ensure equals matches
- int hashCode = getName().toLowerCase().hashCode();
-
- int tagCode = getTagIdentifier().hashCode();
-
- hashCode = hashCode ^ tagCode;
-
- return hashCode;
- }
-
- /**
- * @param attributeId
- * @return true if attributeId represents the same attribute as this.
- */
- public final boolean isSameAttributeType(AttributeIdentifier attributeId)
- {
- // if same object, always true
- if (attributeId == this)
- {
- return true;
- }
-
-
- // if tag identifiers not same, then always false.
- if (!getTagIdentifier().isSameTagType(attributeId.getTagIdentifier()))
- {
- return false;
- }
-
- // if tag id is the same, the tag name must be too.
- return getName().toLowerCase().equals(attributeId.getName().toLowerCase());
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/dom/DOMAdapter.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/dom/DOMAdapter.java
deleted file mode 100644
index fb3c43b..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/dom/DOMAdapter.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2008 Oracle Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Oracle Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.common.dom;
-
-/**
- * A generic adapter that can adapt some non-DOM
- * things to a dom-like structure like an IRegion to a DOM-like structure.
- *
- * <p><b>Provisional API - subject to change</b></p>
- *
- * @author cbateman
- *
- */
-public abstract class DOMAdapter
-{
- /**
- * @return the node type. Conforms to Node.getNodeType.
- */
- public abstract short getNodeType();
-
- /**
- * @return the name prefix. Conforms to W3C Node.getPrefix()
- */
- public abstract String getPrefix();
-
- /**
- * @return the local part of the name. Conforms to W3C Node.getLocalName()
- */
- public abstract String getLocalName();
-
- /**
- * @return the name of the node. Conforms the W3C Node.getNodeName interface
- */
- public abstract String getNodeName();
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/dom/ElementDOMAdapter.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/dom/ElementDOMAdapter.java
deleted file mode 100644
index 4d0ad5d..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/dom/ElementDOMAdapter.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2008 Oracle Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Oracle Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.common.dom;
-
-import java.util.Map;
-
-import org.w3c.dom.Node;
-
-/**
- * T
- * @author cbateman
- *
- * <p><b>Provisional API - subject to change</b></p>
- *
- */
-public abstract class ElementDOMAdapter extends DOMAdapter
-{
- private TagIdentifier _tagIdentifier; // lazily initialized
-
- /**
- * Map should be considered immutable and may throw exceptions if
- * mutations are attempted.
- *
- * @return a nodeName keyed map of attributes belonging to this element
- */
- public abstract Map<String, ? extends AttrDOMAdapter> getAttributes();
-
- @Override
- public final short getNodeType()
- {
- return Node.ELEMENT_NODE;
- }
-
- /**
- * @return the namespace uri for element or null if not applicable (i.e. HTML).
- */
- public abstract String getNamespace();
-
- /**
- * @return the tag identifier for this attribute
- */
- public final TagIdentifier getTagId()
- {
- synchronized(this)
- {
- if (_tagIdentifier == null)
- {
- _tagIdentifier = new MyTagIdentifier();
- }
- }
- return _tagIdentifier;
- }
-
- private final class MyTagIdentifier extends TagIdentifier
- {
- @Override
- public String getTagName()
- {
- return getLocalName();
- }
-
- @Override
- public String getUri()
- {
- return getNamespace();
- }
-
- @Override
- public boolean isJSPTag()
- {
- // shouldn't be called
- throw new UnsupportedOperationException("jsp flag not supported on this identifier"); //$NON-NLS-1$
- }
-
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/dom/TagIdentifier.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/dom/TagIdentifier.java
deleted file mode 100644
index 3d675a6..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/dom/TagIdentifier.java
+++ /dev/null
@@ -1,131 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2007 Oracle Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Oracle Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.common.dom;
-
-import javax.xml.namespace.QName;
-
-
-/**
- * Creates an abstraction for a tag. A tag is defined as a DOM Element whose
- * namespace uri may be defined outside of the DOM, such as in a JSP tag library
- * declaration. This allows tags to be abstracted from actual DOM elements, which
- * is useful in situations like palette creation drops where the construction information
- * is known, but we are not ready to create and add a node to the document yet.
- *
- * All tag TagIdentifier<i>s</i> should be considered immutable and idempotent.
- * TagIdentifier instances may be cached by the factory.
- *
- * <p><b>Provisional API - subject to change</b></p>
- *
- * @author cbateman
- *
- */
-public abstract class TagIdentifier
-{
- /**
- * @return the uri that uniquely identifies the tag.
- *
- * i.e.
- *
- * If the tag is defined by an XML namespace, then that uri string will be returned.
- * If the tag is defined by a JSP tag library, then the tag library uri should
- * be returned.
- */
- public abstract String getUri();
-
- /**
- * @return the local name of the tag (without namespace prefix)
- */
- public abstract String getTagName();
-
- /**
- * @return true if this tag is a JSP tag
- */
- public abstract boolean isJSPTag();
-
- public final boolean equals(Object compareTo)
- {
- if (compareTo instanceof TagIdentifier)
- {
- return isSameTagType((TagIdentifier) compareTo);
- }
- return false;
- }
-
- public final int hashCode()
- {
- // use toLowerCase to ensure equals matches
- int hashCode = getTagName().toLowerCase().hashCode();
-
- String uri = getUri();
- if (uri != null)
- {
- hashCode ^= uri.hashCode();
- }
- return hashCode;
- }
-
- /**
- * @param tagWrapper
- * @return true if tagWrapper represents the same tag as this.
- */
- public final boolean isSameTagType(TagIdentifier tagWrapper)
- {
- if (tagWrapper == this)
- {
- return true;
- }
-
- final String uri = tagWrapper.getUri();
-
- if (uri == null)
- {
- if (getUri() != null)
- {
- return false;
- }
- }
- else if (uri.equals(getUri()))
- {
- final String tagName = tagWrapper.getTagName();
-
- if (tagName == null)
- {
- if(getTagName() != null)
- {
- return false;
- }
- }
- else
- {
- // uri and tag name must both the same for it to be the same type
- // TODO: the ignore case thing is dependent on the type of container document
- // Use toLower instead of equalsIgnoreCase to ensure that hashCode generates
- // a hashCode that guarantees x.equals(y) => x.hashCode == y.hashCode
- if (tagName.toLowerCase().equals((getTagName().toLowerCase())))
- {
- return true;
- }
- }
- }
-
- // fall-through, not same
- return false;
- }
-
- /**
- * @return the QName equivalent. Returns a new object on every invocation.
- */
- public final QName asQName()
- {
- return new QName(getUri(), getTagName());
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/dom/package-info.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/dom/package-info.java
deleted file mode 100644
index af4d45a..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/dom/package-info.java
+++ /dev/null
@@ -1,18 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Oracle 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:
- * Oracle - initial API and implementation
- *
- ********************************************************************************/
-
-/**
- * API for manipulating DOM-based objects.
- *
- * <p><b>Provisional API - subject to change</b></p>
- */
-package org.eclipse.jst.jsf.common.dom;
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/facet/Messages.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/facet/Messages.java
deleted file mode 100644
index 595aa36..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/facet/Messages.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/**
- * Copyright (c) 2008, 2009, Oracle and/or its affiliates. All rights reserved.
- */
-
-
-package org.eclipse.jst.jsf.common.facet;
-
-
-import org.eclipse.osgi.util.NLS;
-
-
-/**
- * Resource bundle
- *
- * @author Debajit Adhikary
- */
-public class Messages extends NLS
-{
- private static final String BUNDLE_NAME = "org.eclipse.jst.jsf.common.facet.messages"; //$NON-NLS-1$
-
- /**
- * see messages.properties
- */
- public static String UserLibraryVersionValidator_cannotReadLibraryVersion;
-
- /**
- * see messages.properties
- */
- public static String UserLibraryVersionValidator_possiblyIncompatibleLibrary;
-
- /**
- * see messages.properties
- */
- public static String UserLibraryVersionValidator_versionMismatch;
-
- static
- {
- // initialize resource bundle
- NLS.initializeMessages(BUNDLE_NAME, Messages.class);
- }
-
-
- private Messages ()
- {
- //
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/facet/libraryprovider/UserLibraryVersionValidator.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/facet/libraryprovider/UserLibraryVersionValidator.java
deleted file mode 100644
index 8747e7e..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/facet/libraryprovider/UserLibraryVersionValidator.java
+++ /dev/null
@@ -1,205 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2008 Oracle Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Oracle Corporation - initial API and implementation
- *******************************************************************************/
-
-
-package org.eclipse.jst.jsf.common.facet.libraryprovider;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.Enumeration;
-import java.util.jar.Attributes;
-import java.util.jar.JarFile;
-import java.util.jar.Manifest;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipFile;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jst.common.project.facet.core.libprov.user.KeyClassesValidator;
-import org.eclipse.jst.common.project.facet.core.libprov.user.UserLibraryProviderInstallOperationConfig;
-import org.eclipse.jst.jsf.common.JSFCommonPlugin;
-import org.eclipse.jst.jsf.common.facet.Messages;
-
-
-/**
- * Checks that a user library is version-compatible with the facet.
- *
- * @author Debajit Adhikary
- *
- */
-public abstract class UserLibraryVersionValidator extends KeyClassesValidator
-{
- private static final String MANIFEST_SPECIFICATION_VERSION = "Specification-Version"; //$NON-NLS-1$
- private static final String MANIFEST_IMPLEMENTATION_VERSION = "Implementation-Version"; //$NON-NLS-1$
-
- private final String classNameIdentifyingImplementationJar;
-
-
- /**
- * @param classNameIdentifyingImplementationJar
- */
- public UserLibraryVersionValidator (final String classNameIdentifyingImplementationJar)
- {
- this.classNameIdentifyingImplementationJar = classNameIdentifyingImplementationJar;
- }
-
-
- @Override
- public IStatus validate (final UserLibraryProviderInstallOperationConfig config)
- {
- // Check super validator
- final IStatus status = super.validate(config);
- if (status.getSeverity() != IStatus.OK)
- return status;
-
- // Superclass validated this lib successfully.
- // Check user library version now.
- final String facetVersion = getFacetVersion(config);
- final String libraryVersion = getLibraryVersion(config);
- return validateVersionStrings(facetVersion, libraryVersion);
- }
-
-
- /**
- * @param facetVersion
- * @param libraryVersion
- * @return the diagnostic for whether the facetVersion and libraryVersion
- * match.
- */
- protected IStatus validateVersionStrings (final String facetVersion,
- final String libraryVersion)
- {
- if (facetVersion == null)
- throw new IllegalArgumentException("Cannot read facet version"); //$NON-NLS-1$
-
- if (libraryVersion == null)
- return new Status(IStatus.WARNING, JSFCommonPlugin.PLUGIN_ID, Messages.UserLibraryVersionValidator_cannotReadLibraryVersion);
-
- if (libraryVersion.compareToIgnoreCase(facetVersion) >= 0) // JSF 2.0 lib for JSF 1.2 app, JSF 1.2 lib for JSF 1.2 app
- return Status.OK_STATUS;
-
- // e.g. JSF 1.2 library used for a JSF 2.0 app
- return new Status(IStatus.WARNING, JSFCommonPlugin.PLUGIN_ID, Messages.UserLibraryVersionValidator_possiblyIncompatibleLibrary);
- }
-
-
- private String getFacetVersion (final UserLibraryProviderInstallOperationConfig config)
- {
- return config.getProjectFacetVersion().getVersionString();
- }
-
-
- private String getLibraryVersion (final UserLibraryProviderInstallOperationConfig config)
- {
- String libraryVersion = null;
-
- try
- {
- for (final IClasspathEntry cpe : config.resolve())
- {
- if (isLibrary(cpe))
- {
- final File libraryFile = cpe.getPath().toFile();
-
- if (libraryFile.exists() && isCorrectLibraryJar(cpe, this.classNameIdentifyingImplementationJar))
- {
- JarFile jarFile = null;
- try
- {
- jarFile = new JarFile(libraryFile);
- libraryVersion = getLibraryVersion(jarFile);
- }
- finally
- {
- if (jarFile != null)
- jarFile.close();
- }
- }
- }
- }
- }
- catch (final IOException e)
- {
- JSFCommonPlugin.log(e, e.getLocalizedMessage());
- }
-
- return libraryVersion;
- }
-
-
- private boolean isLibrary (final IClasspathEntry cpe)
- {
- return cpe.getEntryKind() == IClasspathEntry.CPE_LIBRARY;
- }
-
-
- private boolean isCorrectLibraryJar (final IClasspathEntry cpe,
- final String classNameIdentifyingJar)
- throws IOException
- {
- final File libraryFile = cpe.getPath().toFile();
-
- if (!libraryFile.exists())
- return false;
-
- ZipFile zipFile = null;
-
- try
- {
- zipFile = new ZipFile(libraryFile);
-
- for (final Enumeration<? extends ZipEntry> entries = zipFile.entries(); entries.hasMoreElements();)
- {
- final ZipEntry entry = entries.nextElement();
- final String entryName = entry.getName();
- if (entryName.equals(classNameIdentifyingJar))
- return true;
- }
- }
- finally
- {
- if (zipFile != null)
- zipFile.close();
- }
-
- return false;
- }
-
-
- /**
- * @param jarFile
- * Library jar file to read
- *
- * @return Version of the specified Jar. Uses the manifest
- * Specification-Version entry. If that is not available, then uses
- * the Implementation-Version entry.
- *
- * @throws IOException
- */
- protected String getLibraryVersion (final JarFile jarFile)
- throws IOException
- {
- final Manifest manifest = jarFile.getManifest();
-
- if (manifest == null)
- return null;
-
- final Attributes attributes = manifest.getMainAttributes();
-
- final String specificationVersion = attributes.getValue(MANIFEST_SPECIFICATION_VERSION);
- if (specificationVersion != null)
- return specificationVersion;
-
- final String implementationVersion = manifest.getMainAttributes().getValue(MANIFEST_IMPLEMENTATION_VERSION);
- return implementationVersion;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/facet/libraryprovider/jsf/JsfLibraryUtil.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/facet/libraryprovider/jsf/JsfLibraryUtil.java
deleted file mode 100644
index e55cdf0..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/facet/libraryprovider/jsf/JsfLibraryUtil.java
+++ /dev/null
@@ -1,123 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2008 Oracle Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Oracle Corporation - initial API and implementation
- *******************************************************************************/
-
-
-package org.eclipse.jst.jsf.common.facet.libraryprovider.jsf;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.Enumeration;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipException;
-import java.util.zip.ZipFile;
-
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jst.common.project.facet.core.libprov.user.UserLibraryProviderInstallOperationConfig;
-import org.eclipse.jst.jsf.common.JSFCommonPlugin;
-
-
-/**
- * Utility methods for JSF libraries.
- *
- * @author Debajit Adhikary
- *
- */
-public class JsfLibraryUtil
-{
- /**
- * JSF library vendor type
- */
- public static enum JsfLibraryVendorType
- {
- /** Unknown JSF library type */
- UNKNOWN,
-
- /** Apache MyFaces JSF library */
- MYFACES,
-
- /** Sun-RI JSF library */
- SUN_RI
- }
-
-
- /**
- * @param libConfig UserLibraryProviderInstallOperationConfig
- * @return JsfLibraryVendorType
- */
- public static JsfLibraryVendorType getJsfLibraryVendorType (final UserLibraryProviderInstallOperationConfig libConfig)
- {
- final String MYFACES_IDENTIFYING_CLASS = "org/apache/myfaces/el/VariableResolverImpl.class"; //$NON-NLS-1$
- final String SUNRI_IDENTIFYING_CLASS = "com/sun/faces/el/VariableResolverImpl.class"; //$NON-NLS-1$
-
-
- for (final IClasspathEntry cpe : libConfig.resolve())
- {
- if (isLibrary(cpe))
- {
- final File libraryFile = cpe.getPath().toFile();
-
- if (!libraryFile.exists())
- continue;
-
- ZipFile zipFile = null;
-
- try
- {
- zipFile = new ZipFile(libraryFile);
-
- for (final Enumeration<? extends ZipEntry> entries = zipFile.entries(); entries.hasMoreElements();)
- {
- final ZipEntry entry = entries.nextElement();
- final String entryName = entry.getName();
-
- if (entryName.equals(MYFACES_IDENTIFYING_CLASS))
- return JsfLibraryVendorType.MYFACES;
-
- if (entryName.equals(SUNRI_IDENTIFYING_CLASS))
- return JsfLibraryVendorType.SUN_RI;
- }
- }
- catch (final ZipException e)
- {
- JSFCommonPlugin.log(e, e.getLocalizedMessage());
- }
- catch (final IOException e)
- {
- JSFCommonPlugin.log(e, e.getLocalizedMessage());
- }
- finally
- {
- try
- {
- if (zipFile != null)
- zipFile.close();
- }
- catch (final IOException e)
- {
- JSFCommonPlugin.log(e, e.getLocalizedMessage());
- }
- }
- }
- }
-
- return JsfLibraryVendorType.UNKNOWN;
- }
-
-
- /**
- * @param cpe
- * @return True if the classpath entry is a library.
- */
- public static boolean isLibrary (final IClasspathEntry cpe)
- {
- return cpe.getEntryKind() == IClasspathEntry.CPE_LIBRARY;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/facet/messages.properties b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/facet/messages.properties
deleted file mode 100644
index 7e26b50..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/facet/messages.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-UserLibraryVersionValidator_cannotReadLibraryVersion=Could not read version for selected library. The library may not be correct for this facet version.
-UserLibraryVersionValidator_possiblyIncompatibleLibrary=The library may be incompatible with the selected facet version.
-UserLibraryVersionValidator_versionMismatch=Incorrect library version: The selected library version ({0}) does not match the facet version ({1})
\ No newline at end of file
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/ITestTracker.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/ITestTracker.java
deleted file mode 100644
index 259d909..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/ITestTracker.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2007 Oracle Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Oracle Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.common.internal;
-
-/**
- * An injection interface that allows classes to selectively report test progress.
- *
- * @author cbateman
- *
- */
-public interface ITestTracker
-{
- /**
- * Event types
- *
- */
- public enum Event
- {
- /**
- * Signals that tracking should begin on the eventLabel
- * The seqId must be repeated on the STOP_TRACKING event
- * for the same event.
- */
- START_TRACKING,
- /**
- * Signals that tracking should stop on the named event
- * for the seqId that was passed first in the START_TRACKING.
- *
- */
- STOP_TRACKING
- }
-
- /**
- * Fires the event of type event, a unique instance tracking seqId
- * and a label called eventLabel.
- *
- * @param event
- * @param seqId
- * @param eventLabel
- */
- void fireEvent(Event event, long seqId, String eventLabel);
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/JSPUtil.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/JSPUtil.java
deleted file mode 100644
index 37e7a99..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/JSPUtil.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2007 Oracle Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Oracle Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.common.internal;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.content.IContentType;
-import org.eclipse.core.runtime.content.IContentTypeManager;
-
-/**
- * Utility JSP methods
- * @author cbateman
- *
- */
-public final class JSPUtil
-{
- private final static String CTYPE_JSPSOURCE =
- "org.eclipse.jst.jsp.core.jspsource"; //$NON-NLS-1$
- private final static String CTYPE_JSPFRAGMENTSOURCE =
- "org.eclipse.jst.jsp.core.jspfragmentsource"; //$NON-NLS-1$
- /**
- * @param contentType
- * @return true if contentType is one of the content types registered
- * for JSP files
- */
- public static boolean isJSPContentType(final String contentType)
- {
- return CTYPE_JSPSOURCE.equals(contentType)
- || CTYPE_JSPFRAGMENTSOURCE.equals(contentType);
- }
-
- /**
- * @param file
- * @return true if file is associated with a JSP or JSP fragment content type
- */
- public static boolean isJSPContentType(final IFile file)
- {
- final boolean isJSPSource = isJSPSource(file);
- if (isJSPSource)
- {
- return true;
- }
-
- final boolean isJSPFragment = isJSPFragment(file);
-
- if (isJSPFragment)
- {
- return true;
- }
-
- return false;
- }
-
- private JSPUtil()
- {
- // no instantiation
- }
-
- /**
- * @param file
- * @return true if file is associated with the JSP source content type
- * (returns if JSP fragment)
- */
- public static boolean isJSPSource(IFile file) {
- return isAssociatedWithContentType(file, CTYPE_JSPSOURCE);
- }
-
- /**
- * @param file
- * @return true if the file is associated with the JSP fragment content type
- */
- public static boolean isJSPFragment(IFile file) {
- return isAssociatedWithContentType(file, CTYPE_JSPFRAGMENTSOURCE);
- }
-
- private static boolean isAssociatedWithContentType(final IFile file, final String contentType)
- {
- final IContentTypeManager typeManager = Platform.getContentTypeManager();
- IContentType jspContentType =
- typeManager.getContentType(contentType);
- if (jspContentType != null
- && jspContentType.isAssociatedWith(file.getName()))
- {
- return true;
- }
-
- return false;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/RunOnCompletionPattern.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/RunOnCompletionPattern.java
deleted file mode 100644
index 6ae5a19..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/RunOnCompletionPattern.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2008 Oracle Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Oracle Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.common.internal;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.jobs.IJobChangeEvent;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.core.runtime.jobs.JobChangeAdapter;
-import org.eclipse.jst.jsf.common.JSFCommonPlugin;
-
-/**
- * A pattern that runs a Job and either joins on the job's completion
- * or runs some completion behaviour.
- *
- * @author cbateman
- *
- */
-public class RunOnCompletionPattern implements Runnable
-{
- private final Job _job;
- private final Runnable _runAfter;
-
- /**
- * @param job
- * @param runAfter
- */
- public RunOnCompletionPattern(Job job, Runnable runAfter)
- {
- _job = job;
- _runAfter = runAfter;
- }
-
- public void run()
- {
- if (_runAfter != null)
- {
- _job.addJobChangeListener(new JobChangeAdapter()
- {
-
- @Override
- public void done(IJobChangeEvent event)
- {
- if (event.getResult().getSeverity() != IStatus.ERROR)
- {
- _runAfter.run();
- }
- }
-
- });
- }
-
- _job.schedule();
-
- if (_runAfter == null)
- {
- try
- {
- _job.join();
- }
- catch (InterruptedException e)
- {
- JSFCommonPlugin.log(e, "Joining on job"); //$NON-NLS-1$
- }
- }
- }
-
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/componentcore/AbstractVirtualComponentQuery.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/componentcore/AbstractVirtualComponentQuery.java
deleted file mode 100644
index ae797b3..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/componentcore/AbstractVirtualComponentQuery.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package org.eclipse.jst.jsf.common.internal.componentcore;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.componentcore.resources.IVirtualFolder;
-
-/**
- * Wraps parts of the component core in a way that always PDE-free injection
- * during test.
- *
- * @author cbateman
- *
- */
-public abstract class AbstractVirtualComponentQuery
-{
- /**
- * TODO: reconcile with duplicate. This was taken from JSFAppConfigUtils.
- *
- * Gets an IVirtualFolder instance which represents the root context's web
- * content folder.
- *
- * @param project
- * IProject instance for which to get the folder.
- * @return IVirtualFolder instance which represents the root context's web
- * content folder.
- */
- public abstract IVirtualFolder getWebContentFolder(IProject project);
-
- /**
- * The default implementation that makes static calls to ComponentCore.
- * @author cbateman
- *
- */
- public static class DefaultVirtualComponentQuery extends
- AbstractVirtualComponentQuery
- {
- @Override
- public IVirtualFolder getWebContentFolder(IProject project)
- {
- IVirtualFolder folder = null;
- IVirtualComponent component = ComponentCore
- .createComponent(project);
- if (component != null)
- {
- folder = component.getRootFolder();
- }
- return folder;
- }
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/finder/AbstractFinder.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/finder/AbstractFinder.java
deleted file mode 100644
index 17411f4..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/finder/AbstractFinder.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package org.eclipse.jst.jsf.common.internal.finder;
-
-import org.eclipse.jst.jsf.common.internal.strategy.AbstractIdentifiableStrategy;
-
-
-/**
- * An abstract strategy that finds it's OUTPUT value in a container designated
- * by it's INPUT value.
- *
- * @author cbateman
- *
- * @param <INPUT>
- * @param <OUTPUT>
- * @param <IDTYPE>
- */
-public abstract class AbstractFinder<INPUT, OUTPUT, IDTYPE> extends AbstractIdentifiableStrategy<INPUT, OUTPUT, IDTYPE>
-{
-
- /**
- * @param id
- * @param displayName
- * @param noResultValue
- */
- public AbstractFinder(IDTYPE id, String displayName, OUTPUT noResultValue)
- {
- super(id, displayName, noResultValue);
- }
-
- /**
- * @param input
- * @return the output found in input or getNoResult() if not found.
- * @throws Exception
- */
- public final OUTPUT find(INPUT input) throws Exception
- {
- return perform(input);
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/finder/AbstractMatcher.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/finder/AbstractMatcher.java
deleted file mode 100644
index 4cd661b..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/finder/AbstractMatcher.java
+++ /dev/null
@@ -1,66 +0,0 @@
-package org.eclipse.jst.jsf.common.internal.finder;
-
-import java.util.Collections;
-import java.util.List;
-
-/**
- * A finder that finds it's OUTPUT in INPUT by using a matching strategy.
- * @author cbateman
- * @param <INPUT>
- * @param <OUTPUT>
- * @param <IDTYPE>
- *
- */
-public abstract class AbstractMatcher<INPUT, OUTPUT, IDTYPE> extends AbstractFinder<INPUT, OUTPUT, IDTYPE>
-{
- private final List<? extends IMatcher> _matchers;
-
- /**
- * An interface that defines a match.
- *
- */
- public interface IMatcher
- {
- /**
- * @param matchThis
- * @return true if T matches the expected critieria
- */
- boolean matches(Object matchThis);
- }
-
- /**
- * A matcher that matches always.
- * @author cbateman
- *
- */
- public static final class AlwaysMatcher implements IMatcher
- {
- public boolean matches(Object matchThis)
- {
- return true;
- }
- }
-
- /**
- * @param id
- * @param displayName
- * @param noResultValue
- * @param matchers
- */
- public AbstractMatcher(final IDTYPE id, final String displayName, final OUTPUT noResultValue, final List<? extends IMatcher> matchers)
- {
- super(id, displayName, noResultValue);
- _matchers = matchers;
- }
-
- @Override
- public abstract OUTPUT perform(INPUT input) throws Exception;
-
- /**
- * @return the matchers
- */
- protected final List<IMatcher> getMatchers()
- {
- return Collections.unmodifiableList(_matchers);
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/finder/VisitorMatcher.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/finder/VisitorMatcher.java
deleted file mode 100644
index 9182e7e..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/finder/VisitorMatcher.java
+++ /dev/null
@@ -1,117 +0,0 @@
-package org.eclipse.jst.jsf.common.internal.finder;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-
-/**
- * A matcher finder that uses a visitor to traverse its INPUT and match values
- * using its matchers. An optional value resolver can be used to get the
- * matching value used.
- *
- * INPUT need not implement it's own visitation interface. Rather, an instance
- * of MatchingVisitor must be provided to handle this.
- *
- * @author cbateman
- * @param <INPUT>
- * @param <VISITTYPE>
- * @param <IDTYPE>
- *
- */
-public class VisitorMatcher<INPUT, VISITTYPE, IDTYPE> extends
- AbstractMatcher<INPUT, Collection<? extends VISITTYPE>, IDTYPE>
-{
- private final MatchingAcceptor _acceptor;
-
- /**
- * @param id
- * @param displayName
- * @param acceptor
- * @param matchers
- */
- public VisitorMatcher(IDTYPE id, String displayName,
- final MatchingAcceptor<INPUT, VISITTYPE> acceptor,
- final List<? extends IMatcher> matchers)
- {
- super(id, displayName, Collections.EMPTY_LIST, matchers);
- _acceptor = acceptor;
- }
-
- @Override
- public Collection<? extends VISITTYPE> perform(final INPUT input) throws Exception
- {
- MatchingVisitor visitor = new MatchingVisitor(getMatchers());
- _acceptor.accept(input, visitor);
- return visitor.getFoundMatches();
- }
-
- /**
- * Call visit on each VISITTYPE. Sub-classes must provide implementations of
- * getInputChildren and getVisitableChildren to control what gets visited
- * from the INPUT root.
- *
- * @param <INPUT>
- * @param <VISITTYPE>
- */
- public abstract static class MatchingAcceptor<INPUT, VISITTYPE>
- {
- private void accept(final INPUT input,
- final MatchingVisitor<VISITTYPE> visitor)
- {
- final Collection<? extends VISITTYPE> inputChildren = getInputChildren(input);
- accept(visitor, inputChildren);
- }
-
- private void accept(final MatchingVisitor<VISITTYPE> visitor,
- final Collection<? extends VISITTYPE> inputChildren)
- {
- for (final VISITTYPE visitable : inputChildren)
- {
- visitor.visit(visitable);
- accept(visitor, getVisitableChildren(visitable));
- }
- }
-
- /**
- * @param inputType
- * @return the first level children of INPUT to be visited.
- */
- protected abstract Collection<? extends VISITTYPE> getInputChildren(
- INPUT inputType);
-
- /**
- * @param visitType
- * @return the visitable children of visitType.
- */
- protected abstract Collection<? extends VISITTYPE> getVisitableChildren(
- VISITTYPE visitType);
- }
-
- private static final class MatchingVisitor<VISITTYPE>
- {
- private final List<IMatcher> _matchers;
- private final List<VISITTYPE> _foundMatches = new ArrayList<VISITTYPE>();
- public MatchingVisitor(final List<IMatcher> matcher)
- {
- _matchers = matcher;
- }
-
- public void visit(final VISITTYPE visitable)
- {
- MATCH_LOOP: for (final IMatcher matcher : _matchers)
- {
- if (matcher.matches(visitable))
- {
- _foundMatches.add(visitable);
- break MATCH_LOOP;
- }
- }
- }
-
- protected final List<VISITTYPE> getFoundMatches()
- {
- return _foundMatches;
- }
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/finder/acceptor/ClasspathEntryJarMatchingAcceptor.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/finder/acceptor/ClasspathEntryJarMatchingAcceptor.java
deleted file mode 100644
index 855e4c7..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/finder/acceptor/ClasspathEntryJarMatchingAcceptor.java
+++ /dev/null
@@ -1,91 +0,0 @@
-package org.eclipse.jst.jsf.common.internal.finder.acceptor;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jdt.core.IPackageFragmentRoot;
-import org.eclipse.jst.jsf.common.internal.finder.VisitorMatcher.MatchingAcceptor;
-import org.eclipse.jst.jsf.common.internal.resource.ClasspathJarFile;
-
-/**
- * Accepts all the jars underlying a classpath entry.
- *
- * @author cbateman
- *
- */
-public class ClasspathEntryJarMatchingAcceptor extends
- MatchingAcceptor<IPackageFragmentRoot, ClasspathJarFile>
-{
- private final IProject project;
-
- /**
- * @param project
- */
- public ClasspathEntryJarMatchingAcceptor(final IProject project)
- {
- super();
- this.project = project;
- }
-
- @Override
- protected Collection<? extends ClasspathJarFile> getInputChildren(
- final IPackageFragmentRoot inputType)
- {
- final List<ClasspathJarFile> jarFiles = new ArrayList<ClasspathJarFile>();
- if (inputType.isArchive())
- {
- jarFiles.add(new ClasspathJarFile(project, inputType.getPath()));
- }
- // if (inputType.exists())
- // {
- // List<ClasspathJarFile> jarFiles = new ArrayList<ClasspathJarFile>();
- // switch (inputType.getEntryKind())
- // {
- // // this entry describes a source root in its project
- // case IClasspathEntry.CPE_SOURCE:
- // break;
- // // - this entry describes a folder or JAR containing
- // // binaries
- // case IClasspathEntry.CPE_LIBRARY:
- // {
- // jarFiles.add(new ClasspathJarFile(project, inputType));
- // }
- // break;
- // // - this entry describes another project
- // case IClasspathEntry.CPE_PROJECT:
- // // {
- // // final IPath pathToProject = entry.getPath();
- // // IWorkspace wkspace = ResourcesPlugin.getWorkspace();
- // // IResource res =
- // // wkspace.getRoot().findMember(pathToProject);
- // // if (res instanceof IProject)
- // // {
- // // tagLibsFound.addAll();
- // // }
- // // }
- // break;
- // // - this entry describes a project or library indirectly
- // // via a
- // // classpath variable in the first segment of the path *
- // case IClasspathEntry.CPE_VARIABLE:
- // break;
- // // - this entry describes set of entries referenced
- // // indirectly
- // // via a classpath container
- // case IClasspathEntry.CPE_CONTAINER:
- // break;
- // }
- // }
- return jarFiles;
- }
-
- @Override
- protected Collection<? extends ClasspathJarFile> getVisitableChildren(
- final ClasspathJarFile visitType)
- {
- return Collections.EMPTY_LIST;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/finder/acceptor/FileMatchingAcceptor.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/finder/acceptor/FileMatchingAcceptor.java
deleted file mode 100644
index 650e174..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/finder/acceptor/FileMatchingAcceptor.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package org.eclipse.jst.jsf.common.internal.finder.acceptor;
-
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jst.jsf.common.JSFCommonPlugin;
-import org.eclipse.jst.jsf.common.internal.finder.VisitorMatcher.MatchingAcceptor;
-
-/**
- * A matching acceptor that traverses all of the children of an IContainer.
- *
- * @author cbateman
- *
- */
-public class FileMatchingAcceptor extends MatchingAcceptor<IContainer, IResource>
-{
- @Override
- protected Collection<? extends IResource> getInputChildren(
- final IContainer container)
- {
- IResource[] members = new IResource[0];
- try
- {
- members = container.members();
- } catch (CoreException e)
- {
- JSFCommonPlugin.log(e);
- }
- return Arrays.asList(members);
- }
-
- @Override
- protected Collection<? extends IResource> getVisitableChildren(
- IResource visitType)
- {
- if (visitType instanceof IContainer)
- {
- return getInputChildren((IContainer)visitType);
- }
- return Collections.emptyList();
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/finder/acceptor/JarEntryMatchingAcceptor.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/finder/acceptor/JarEntryMatchingAcceptor.java
deleted file mode 100644
index 79d0393..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/finder/acceptor/JarEntryMatchingAcceptor.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package org.eclipse.jst.jsf.common.internal.finder.acceptor;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Enumeration;
-import java.util.List;
-import java.util.jar.JarEntry;
-import java.util.jar.JarFile;
-
-import org.eclipse.jst.jsf.common.internal.finder.VisitorMatcher.MatchingAcceptor;
-
-/**
- * An acceptor that gets the jar entries from a jar file.
- *
- * @author cbateman
- *
- */
-public class JarEntryMatchingAcceptor extends
- MatchingAcceptor<JarFile, JarEntry>
-{
-
- @Override
- protected Collection<? extends JarEntry> getInputChildren(JarFile inputType)
- {
- final List<JarEntry> children = new ArrayList<JarEntry>();
- Enumeration<JarEntry> entries = inputType.entries();
- while (entries.hasMoreElements())
- {
- children.add(entries.nextElement());
- }
- return children;
- }
-
- @Override
- protected Collection<? extends JarEntry> getVisitableChildren(
- JarEntry visitType)
- {
- return Collections.EMPTY_LIST;
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/finder/acceptor/JarMatchingAcceptor.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/finder/acceptor/JarMatchingAcceptor.java
deleted file mode 100644
index 7742d75..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/finder/acceptor/JarMatchingAcceptor.java
+++ /dev/null
@@ -1,78 +0,0 @@
-package org.eclipse.jst.jsf.common.internal.finder.acceptor;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IPackageFragmentRoot;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jst.jsf.common.JSFCommonPlugin;
-import org.eclipse.jst.jsf.common.internal.finder.AbstractMatcher.AlwaysMatcher;
-import org.eclipse.jst.jsf.common.internal.finder.VisitorMatcher;
-import org.eclipse.jst.jsf.common.internal.finder.VisitorMatcher.MatchingAcceptor;
-import org.eclipse.jst.jsf.common.internal.resource.ClasspathJarFile;
-import org.eclipse.jst.jsf.common.internal.resource.JavaCoreMediator;
-
-/**
- * A matching acceptor that provides the jars referenced by a project.
- *
- * @author cbateman
- *
- */
-public class JarMatchingAcceptor extends
- MatchingAcceptor<IProject, ClasspathJarFile>
-{
- private final JavaCoreMediator _javaCoreMediator;
-
- /**
- * @param javaCoreMediator
- */
- public JarMatchingAcceptor(final JavaCoreMediator javaCoreMediator)
- {
- _javaCoreMediator = javaCoreMediator;
- }
-
- @Override
- protected Collection<ClasspathJarFile> getInputChildren(
- final IProject project)
- {
- final IJavaProject javaProject = _javaCoreMediator.create(project);
- IPackageFragmentRoot[] roots = null;
- try
- {
- roots = javaProject.getPackageFragmentRoots();
- } catch (final JavaModelException e1)
- {
- JSFCommonPlugin.log(e1);
- }
- if (roots == null || roots.length == 0)
- {
- return Collections.EMPTY_LIST;
- }
- final List<ClasspathJarFile> jars = new ArrayList<ClasspathJarFile>();
- VisitorMatcher<IPackageFragmentRoot, ClasspathJarFile, String> entryMatcher = new VisitorMatcher<IPackageFragmentRoot, ClasspathJarFile, String>(
- "", "", new ClasspathEntryJarMatchingAcceptor(project), //$NON-NLS-1$ //$NON-NLS-2$
- Collections.singletonList(new AlwaysMatcher()));
- for (final IPackageFragmentRoot root : roots)
- {
- try
- {
- jars.addAll(entryMatcher.perform(root));
- } catch (Exception e)
- {
- JSFCommonPlugin.log(e);
- }
- }
- return jars;
- }
-
- @Override
- protected Collection<ClasspathJarFile> getVisitableChildren(
- final ClasspathJarFile visitType)
- {
- return Collections.EMPTY_LIST;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/finder/matcher/TaglibFinder.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/finder/matcher/TaglibFinder.java
deleted file mode 100644
index 0febe25..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/finder/matcher/TaglibFinder.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package org.eclipse.jst.jsf.common.internal.finder.matcher;
-
-import org.eclipse.jst.jsf.common.internal.strategy.AbstractIdentifiableStrategy;
-
-
-/**
- * A finder strategy for Facelet tag libraries.
- * @author cbateman
- *
- * @param <INPUT>
- * @param <OUTPUT>
- */
-public abstract class TaglibFinder<INPUT, OUTPUT> extends AbstractIdentifiableStrategy<INPUT, OUTPUT, String>
-{
- /**
- * @param id
- * @param displayName
- * @param noResultValue
- */
- public TaglibFinder(String id, String displayName,
- OUTPUT noResultValue)
- {
- super(id, displayName, noResultValue);
- }
-
- @Override
- public abstract OUTPUT perform(INPUT input) throws Exception;
-}
\ No newline at end of file
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/finder/matcher/TaglibJarEntryFinder.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/finder/matcher/TaglibJarEntryFinder.java
deleted file mode 100644
index fb5c961..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/finder/matcher/TaglibJarEntryFinder.java
+++ /dev/null
@@ -1,56 +0,0 @@
-package org.eclipse.jst.jsf.common.internal.finder.matcher;
-
-import java.util.jar.JarEntry;
-import java.util.regex.Pattern;
-
-import org.eclipse.jst.jsf.common.JSFCommonPlugin;
-import org.eclipse.jst.jsf.common.internal.finder.AbstractMatcher.IMatcher;
-
-
-/**
- * @author cbateman
- *
- */
-public class TaglibJarEntryFinder extends TaglibFinder<JarEntry, JarEntry> implements IMatcher
-{
- /**
- * Unique id of this strategy.
- */
- public static final String ID = TaglibJarEntryFinder.class.getCanonicalName();
- private static final String DISPLAY_NAME = "Display Name"; //$NON-NLS-1$
- private final Pattern _pattern;
-
- /**
- * @param pattern
- */
- public TaglibJarEntryFinder(final Pattern pattern)
- {
- super(ID, DISPLAY_NAME, null);
- _pattern = pattern;
- }
-
- @Override
- public JarEntry perform(JarEntry input) throws Exception
- {
- if (_pattern.matcher(input.getName()).matches())
- {
- return input;
- }
- return getNoResult();
- }
-
- public boolean matches(Object matchThis)
- {
- if (matchThis instanceof JarEntry)
- {
- try
- {
- return perform((JarEntry) matchThis) != getNoResult();
- } catch (Exception e)
- {
- JSFCommonPlugin.log(e, "While matching jar entry: "+matchThis); //$NON-NLS-1$
- }
- }
- return false;
- }
-}
\ No newline at end of file
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/locator/AbstractLocator.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/locator/AbstractLocator.java
deleted file mode 100644
index 409c744..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/locator/AbstractLocator.java
+++ /dev/null
@@ -1,177 +0,0 @@
-package org.eclipse.jst.jsf.common.internal.locator;
-
-import java.util.concurrent.CopyOnWriteArrayList;
-
-import org.eclipse.jst.jsf.common.internal.locator.ILocatorChangeListener.LocatorChangeEvent;
-
-/**
- * The abstract base class of all ILocator implementations.
- *
- * @author cbateman
- *
- * @param <LOCATORTYPE>
- * @param <CONTEXTTYPE>
- * @param <IDTYPE>
- */
-public abstract class AbstractLocator<LOCATORTYPE, CONTEXTTYPE, IDTYPE>
- implements ILocator<LOCATORTYPE, CONTEXTTYPE, IDTYPE>
-{
- /**
- * The default value used for "no result".
- */
- protected static final Object DEFAULT_NO_RESULT_VALUE = null;
-
- private final CopyOnWriteArrayList<ILocatorChangeListener> _listeners;
- private final LOCATORTYPE _noResultValue;
- private final IDTYPE _id;
- private final String _displayName;
- private boolean _isStarted;
-
- private Exception _startTrace;
-
- /**
- * Available for sub-classes that want to use reasonable defaults and only provide
- * mandatory data.
- *
- * No result value is null.
- * A new instance of CopyOnWriteArrayList is used and held private.
- *
- * @param id
- * @param displayName
- *
- */
- public AbstractLocator(final IDTYPE id, final String displayName)
- {
- this(id,
- displayName,
- null,
- new CopyOnWriteArrayList<ILocatorChangeListener>());
- }
-
- /**
- * Available for sub-classes to manually inject dependencies.
- *
- * @param id
- * @param displayName
- * @param noResultValue
- * @param mutableListenerList
- */
- protected AbstractLocator(
- final IDTYPE id,
- final String displayName,
- final LOCATORTYPE noResultValue,
- final CopyOnWriteArrayList<ILocatorChangeListener> mutableListenerList)
- {
- _id = id;
- _displayName = displayName;
- _listeners = mutableListenerList;
- _noResultValue = noResultValue;
- }
-
- public final LOCATORTYPE perform(final CONTEXTTYPE context)
- throws Exception
- {
- return locate(context);
- }
-
- public LOCATORTYPE getNoResult()
- {
- return _noResultValue;
- }
-
- public IDTYPE getId()
- {
- return _id;
- }
-
- public String getDisplayName()
- {
- return _displayName;
- }
-
- public LOCATORTYPE locate(final CONTEXTTYPE context)
- {
- if (isStarted())
- {
- return doLocate(context);
- }
- throw new IllegalStateException("Locator not started"); //$NON-NLS-1$
- }
-
-
- /**
- * @param context
- * @return the located type.
- */
- protected abstract LOCATORTYPE doLocate(CONTEXTTYPE context);
-
- public void start(final CONTEXTTYPE initialContext)
- {
- if (isStarted())
- {
- throw new IllegalStateException("Locator was already started", _startTrace); //$NON-NLS-1$
- }
-
- // set the started flag
- setStarted(true);
- _startTrace = new Exception("Locator was started on this trace"); //$NON-NLS-1$
- }
-
- public void stop()
- {
- // set the started flag
- // clear all listeners
- _listeners.clear();
- setStarted(false);
- _startTrace = null;
- }
-
- /**
- * @param listener
- */
- public void addListener(final ILocatorChangeListener listener)
- {
- _listeners.addIfAbsent(listener);
- }
-
- /**
- * @param listener
- */
- public void removeListener(final ILocatorChangeListener listener)
- {
- _listeners.remove(listener);
- }
-
- /**
- * @param event
- */
- protected void fireChangeEvent(final LocatorChangeEvent event)
- {
- for (final ILocatorChangeListener listener : _listeners)
- {
- listener.changed(event);
- }
- }
-
- public final boolean isStarted()
- {
- return _isStarted;
- }
-
- public boolean canStart()
- {
- if (isStarted())
- {
- return false;
- }
- return true;
- }
-
- /**
- * @param newValue
- */
- protected final void setStarted(final boolean newValue)
- {
- _isStarted = newValue;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/locator/AbstractLocatorProvider.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/locator/AbstractLocatorProvider.java
deleted file mode 100644
index edd77dc..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/locator/AbstractLocatorProvider.java
+++ /dev/null
@@ -1,72 +0,0 @@
-package org.eclipse.jst.jsf.common.internal.locator;
-
-import java.util.Collections;
-import java.util.List;
-
-/**
- * The super-class of all ILocatorProvider's.
- *
- * @author cbateman
- * @param <LOCATORTYPE>
- *
- */
-public abstract class AbstractLocatorProvider<LOCATORTYPE> implements ILocatorProvider<LOCATORTYPE>
-{
- private boolean _isInit = false;
-
- public void initialize()
- {
- doInitialize();
- _isInit = true;
- }
-
- /**
- * Overrride to do the init. You can override initialize if you want to
- */
- protected abstract void doInitialize();
-
- public List<? extends LOCATORTYPE> getLocators()
- {
- if (!_isInit)
- {
- throw new IllegalStateException(
- "initialize must be called before getLocators"); //$NON-NLS-1$
- }
- return doGetLocators();
- }
-
- /**
- * @return the locators.
- */
- protected abstract List<? extends LOCATORTYPE> doGetLocators();
-
- /**
- * A default implementation of the provider that simply sits on a list
- * of a locators.
- *
- * @param <LOCATORTYPE>
- */
- public static class DefaultLocatorProvider<LOCATORTYPE> extends AbstractLocatorProvider<LOCATORTYPE>
- {
- private final List<LOCATORTYPE> _locators;
-
- /**
- * @param locators
- */
- public DefaultLocatorProvider(List<LOCATORTYPE> locators)
- {
- _locators = locators;
- }
- @Override
- protected void doInitialize()
- {
- // nothing to do.
- }
-
- @Override
- protected List<? extends LOCATORTYPE> doGetLocators()
- {
- return Collections.unmodifiableList(_locators);
- }
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/locator/CompositeLocator.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/locator/CompositeLocator.java
deleted file mode 100644
index 65658e8..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/locator/CompositeLocator.java
+++ /dev/null
@@ -1,154 +0,0 @@
-package org.eclipse.jst.jsf.common.internal.locator;
-
-import java.util.Iterator;
-
-import org.eclipse.jst.jsf.common.internal.policy.IIteratorPolicy;
-import org.eclipse.jst.jsf.common.internal.strategy.IteratorPolicyBasedStrategyComposite;
-
-/**
- * @author cbateman
- *
- * @param <LOCATORTYPE>
- * @param <COMPOSITETYPE>
- * @param <CONTEXTTYPE>
- * @param <IDTYPE>
- */
-public abstract class CompositeLocator<LOCATORTYPE, COMPOSITETYPE, CONTEXTTYPE, IDTYPE> extends
-IteratorPolicyBasedStrategyComposite<CONTEXTTYPE, LOCATORTYPE, COMPOSITETYPE, IDTYPE, ILocator<LOCATORTYPE, CONTEXTTYPE, IDTYPE>>
-implements ILocator<COMPOSITETYPE, CONTEXTTYPE, IDTYPE>, ILocatorChangeListener
-{
- private DefaultComposingLocatorDelegate<LOCATORTYPE, COMPOSITETYPE, CONTEXTTYPE, IDTYPE> _delegate;
- private final COMPOSITETYPE _noResultValue;
-
- /**
- * @param id
- * @param displayName
- * @param policy
- * @param noResultValue
- * @param compositionStrategy
- */
- public CompositeLocator(
- final IDTYPE id,
- final String displayName,
- final IIteratorPolicy<IDTYPE> policy,
- final COMPOSITETYPE noResultValue,
- final DefaultCompositionStrategy<CONTEXTTYPE, LOCATORTYPE, COMPOSITETYPE, ILocator<LOCATORTYPE, CONTEXTTYPE, IDTYPE>> compositionStrategy)
- {
- super(policy, compositionStrategy);
- _delegate = new DefaultComposingLocatorDelegate<LOCATORTYPE, COMPOSITETYPE, CONTEXTTYPE, IDTYPE>(id, displayName)
- {
- @Override
- protected COMPOSITETYPE doLocate(final CONTEXTTYPE context)
- {
- return CompositeLocator.this.doLocate(context);
- }
- };
- _noResultValue = noResultValue;
- }
-
- /**
- * @param context
- * @return the located value.
- */
- protected abstract COMPOSITETYPE doLocate(CONTEXTTYPE context);
-
- public final IDTYPE getId()
- {
- return _delegate.getId();
- }
-
- public String getDisplayName()
- {
- return _delegate.getDisplayName();
- }
-
- public void start(final CONTEXTTYPE initialContext)
- {
- if (canStart())
- {
- final Iterator<ILocator<LOCATORTYPE, CONTEXTTYPE, IDTYPE>> iterator = getIterator();
- while (iterator.hasNext())
- {
-
- final ILocator<LOCATORTYPE, CONTEXTTYPE, IDTYPE> next = iterator.next();
- next.addListener(this);
- next.start(initialContext);
- }
- _delegate.start(initialContext);
- }
- throw new IllegalStateException("canStart must be called before calling start"); //$NON-NLS-1$
- }
-
- public boolean canStart()
- {
- boolean canStart = true;
- final Iterator<ILocator<LOCATORTYPE, CONTEXTTYPE, IDTYPE>> iterator = getIterator();
- while (canStart && iterator.hasNext())
- {
- canStart &= iterator.next().canStart();
- }
-
- return canStart && _delegate.canStart();
- }
-
- public boolean isStarted()
- {
- return _delegate.isStarted();
- }
-
- public void stop()
- {
- if (!isStarted())
- {
- final Iterator<ILocator<LOCATORTYPE, CONTEXTTYPE, IDTYPE>> iterator = getIterator();
- while (iterator.hasNext())
- {
- final ILocator<LOCATORTYPE, CONTEXTTYPE, IDTYPE> next = iterator.next();
- next.removeListener(this);
- next.stop();
- }
-
- _delegate.stop();
- }
- }
-
- public COMPOSITETYPE locate(final CONTEXTTYPE context)
- {
- return _delegate.locate(context);
- }
-
- @Override
- public COMPOSITETYPE getNoResult()
- {
- return _noResultValue;
- }
-
-
- public void changed(final LocatorChangeEvent event)
- {
- _delegate.fireChangeEvent(event);
- }
-
-
- public void addListener(final ILocatorChangeListener listener)
- {
- _delegate.addListener(listener);
- }
-
-
- public void removeListener(final ILocatorChangeListener listener)
- {
- _delegate.removeListener(listener);
- }
-
- /**
- * Re-fire events from composed strategies.
- *
- * @param event
- */
- protected void fireChangeEvent(final LocatorChangeEvent event)
- {
- _delegate.fireChangeEvent(event);
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/locator/DefaultComposingLocatorDelegate.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/locator/DefaultComposingLocatorDelegate.java
deleted file mode 100644
index ac698d3..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/locator/DefaultComposingLocatorDelegate.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package org.eclipse.jst.jsf.common.internal.locator;
-
-import java.util.concurrent.CopyOnWriteArrayList;
-
-/**
- * Default delegatable locator for composing locators.
- *
- * @author cbateman
- *
- * @param <LOCATORTYPE>
- * @param <COMPOSITETYPE>
- * @param <CONTEXTTYPE>
- * @param <IDTYPE>
- */
-public class DefaultComposingLocatorDelegate<LOCATORTYPE, COMPOSITETYPE, CONTEXTTYPE, IDTYPE> extends
- AbstractLocator<COMPOSITETYPE, CONTEXTTYPE, IDTYPE>
-{
-
- /**
- * @param id
- * @param displayName
- */
- public DefaultComposingLocatorDelegate(IDTYPE id, String displayName)
- {
- super(id, displayName);
- }
-
-
- /**
- * @param id
- * @param displayName
- * @param noResultValue
- * @param mutableListenerList
- */
- public DefaultComposingLocatorDelegate(
- IDTYPE id,
- String displayName,
- COMPOSITETYPE noResultValue,
- CopyOnWriteArrayList<ILocatorChangeListener> mutableListenerList)
- {
- super(id, displayName, noResultValue, mutableListenerList);
- }
-
-
- @Override
- protected COMPOSITETYPE doLocate(CONTEXTTYPE context)
- {
- throw new UnsupportedOperationException("This method is abstract and should not be called"); //$NON-NLS-1$
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/locator/DefaultLocatorDelegate.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/locator/DefaultLocatorDelegate.java
deleted file mode 100644
index 04d8fdb..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/locator/DefaultLocatorDelegate.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package org.eclipse.jst.jsf.common.internal.locator;
-
-import java.util.concurrent.CopyOnWriteArrayList;
-
-/**
- * Implements the bare minimum of AbstractLocator needed to treat it as a
- * sub-class by composition (delegation).
- *
- * @author cbateman
- * @param <LOCATORTYPE>
- * @param <CONTEXTTYPE>
- * @param <IDTYPE>
- *
- */
-public class DefaultLocatorDelegate<LOCATORTYPE, CONTEXTTYPE, IDTYPE> extends
- AbstractLocator<LOCATORTYPE, CONTEXTTYPE, IDTYPE>
-{
-
- /**
- * @param id
- * @param displayName
- */
- public DefaultLocatorDelegate(IDTYPE id, String displayName)
- {
- super(id, displayName);
- }
-
-
- /**
- * @param id
- * @param displayName
- * @param noResultValue
- * @param mutableListenerList
- */
- public DefaultLocatorDelegate(
- IDTYPE id,
- String displayName,
- LOCATORTYPE noResultValue,
- CopyOnWriteArrayList<ILocatorChangeListener> mutableListenerList)
- {
- super(id, displayName, noResultValue, mutableListenerList);
- }
-
-
- @Override
- protected LOCATORTYPE doLocate(CONTEXTTYPE context)
- {
- throw new UnsupportedOperationException("This method is abstract and should not be called"); //$NON-NLS-1$
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/locator/ILocator.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/locator/ILocator.java
deleted file mode 100644
index abf6bad..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/locator/ILocator.java
+++ /dev/null
@@ -1,68 +0,0 @@
-package org.eclipse.jst.jsf.common.internal.locator;
-
-import org.eclipse.jst.jsf.common.internal.strategy.IIdentifiableStrategy;
-
-/**
- * A generic location strategy object.
- *
- * @author cbateman
- *
- * @param <LOCATORTYPE>
- * the type of object being returned by the locator
- * @param <CONTEXTTYPE>
- * the type of the context object passed for starting and locating
- * @param <IDTYPE>
- * the type of the id used to identify a locator
- * @noimplement extend AbstractLocator instead
- */
-public interface ILocator<LOCATORTYPE, CONTEXTTYPE, IDTYPE> extends
- IIdentifiableStrategy<CONTEXTTYPE, LOCATORTYPE, IDTYPE>
-{
- /**
- * Initialize the locator optionally using initialContext.
- *
- * Must be called before any other methods. Implementations should throw
- * IllegalStateException if this has not been called before anything else.
- *
- * @param initialContext
- */
- void start(CONTEXTTYPE initialContext);
-
- /**
- * Implementations should return false if the system prevents them from
- * starting. It must also be checked before a client attempts to restart a
- * stopped locator. Must return false if isStarted is true.
- *
- * @return true if the locator can be started
- */
- boolean canStart();
-
- /**
- * @return true if the start() has been called but stop has not yet been
- * called.
- */
- boolean isStarted();
-
- /**
- * Stop the locator.
- */
- void stop();
-
- /**
- * @param listener
- */
- void addListener( final ILocatorChangeListener listener);
-
- /**
- * @param listener
- */
- void removeListener(final ILocatorChangeListener listener);
-
- /**
- * perform must call this method in any concrete implementation.
- *
- * @param context
- * @return the located type.
- */
- LOCATORTYPE locate(CONTEXTTYPE context);
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/locator/ILocatorChangeListener.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/locator/ILocatorChangeListener.java
deleted file mode 100644
index 0b996df..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/locator/ILocatorChangeListener.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package org.eclipse.jst.jsf.common.internal.locator;
-
-import java.util.EventListener;
-import java.util.EventObject;
-
-/**
- * @author cbateman
- *
- */
-public interface ILocatorChangeListener extends EventListener
-{
- /**
- * @param event
- */
- public void changed(final LocatorChangeEvent event);
-
- /**
- * @author cbateman
- *
- */
- public static class LocatorChangeEvent extends EventObject
- {
- /**
- * @param source
- */
- public LocatorChangeEvent(ILocator source) {
- super(source);
- }
-
- @Override
- public ILocator getSource() {
- return (ILocator) super.getSource();
- }
-
- /**
- *
- */
- private static final long serialVersionUID = -7930804700395142768L;
-
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/locator/ILocatorProvider.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/locator/ILocatorProvider.java
deleted file mode 100644
index 57472ad..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/locator/ILocatorProvider.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package org.eclipse.jst.jsf.common.internal.locator;
-
-import java.util.List;
-
-/**
- * An object that provides zero or more locators to a client.
- *
- * @author cbateman
- * @param <LOCATORTYPE>
- *
- */
-public interface ILocatorProvider<LOCATORTYPE>
-{
- /**
- * Must be called before getLocators is called. Implementations MUST
- * support multiple calls to initialize on the same instance but need not
- * do anything on any of them.
- */
- void initialize();
-
- /**
- * @return the list of locators.
- */
- List<? extends LOCATORTYPE> getLocators();
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/managedobject/AbstractManagedObject.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/managedobject/AbstractManagedObject.java
deleted file mode 100644
index 9138f0e..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/managedobject/AbstractManagedObject.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2008 Oracle Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Oracle Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.common.internal.managedobject;
-
-import java.util.concurrent.atomic.AtomicBoolean;
-
-
-/**
- * Sub-class for managed objects.
- *
- */
-/**
- * @author cbateman
- *
- */
-public abstract class AbstractManagedObject implements IManagedObject
-{
- /**
- * Flag for checking disposal.
- */
- protected final AtomicBoolean _isDisposed = new AtomicBoolean(false);
-
- /*
- * (non-Javadoc)
- *
- * @see
- * org.eclipse.jst.jsf.common.internal.managedobject.IManagedObject#dispose
- * ()
- */
- public void dispose()
- {
- _isDisposed.set(true);
- }
-
- public boolean isDisposed()
- {
- return _isDisposed.get();
- }
-
- /**
- * Checks if this object is disposed and throws IllegalStateException if it
- * is.
- */
- protected final void assertNotDisposed()
- {
- if (isDisposed())
- {
- throw new IllegalStateException(this.toString() + " is disposed"); //$NON-NLS-1$
- }
- }
- /*
- * (non-Javadoc)
- *
- * @see
- * org.eclipse.jst.jsf.common.internal.managedobject.IManagedObject#checkpoint
- * ()
- */
- public abstract void checkpoint();
-
- /*
- * (non-Javadoc)
- *
- * @see
- * org.eclipse.jst.jsf.common.internal.managedobject.IManagedObject#destroy
- * ()
- */
- public abstract void destroy();
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/managedobject/IManagedObject.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/managedobject/IManagedObject.java
deleted file mode 100644
index 2c43679..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/managedobject/IManagedObject.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2008 Oracle Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Oracle Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.common.internal.managedobject;
-
-/**
- * Represents an object that wishes to be managed by the framework.
- *
- * Clients should not implement: sub-class AbstractManagedObject instead.
- *
- */
-public interface IManagedObject
-{
- /**
- * Called by the object client to indicate is finished with the object. The
- * object should save any data it may want between sessions, perhaps by
- * calling its checkpoint, before cleaning held resources and clearing
- * memory references.
- */
- void dispose();
-
- /**
- * @return true if dispose has been successfully called on the object.
- */
- boolean isDisposed();
-
- /**
- * Called to indicate that the object should remove all its data from both
- * memory and persistent storage. This differentiates it from dispose in
- * that it signals that this object and its associated state will never
- * again be loaded for associated objects.
- */
- void destroy();
-
- /**
- * Indicates that an object should flush cached data and make durable any
- * data it might want between sessions. It does not indicate a disposal of
- * the object.
- */
- void checkpoint();
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/managedobject/ObjectManager.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/managedobject/ObjectManager.java
deleted file mode 100644
index 5695170..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/managedobject/ObjectManager.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2008 Oracle Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Oracle Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.common.internal.managedobject;
-
-
-/**
- * An abstraction for a manager that manages managed objects based on a KEYTYPE
- *
- * @author cbateman
- *
- * @param <T>
- * @param <KEYTYPE>
- */
-public abstract class ObjectManager<T extends IManagedObject, KEYTYPE> extends
- AbstractManagedObject
-{
-
- /**
- * A valid instance of T for the key. The instance of T may be unique on a
- * per-key basis or may not.
- *
- * @param key
- * @return an instance of the managed object associated with key
- * @throws ManagedObjectException
- * if an error occurs during construction
- */
- public abstract T getInstance(KEYTYPE key) throws ManagedObjectException;
-
- @Override
- public abstract void destroy();
-
- @Override
- public abstract void checkpoint();
-
- @Override
- public abstract void dispose();
-
- /**
- * Indicates a problem that occurred during a managed object operation
- *
- * @author cbateman
- *
- */
- public static class ManagedObjectException extends Exception
- {
- /**
- *
- */
- private static final long serialVersionUID = -8723548990029368844L;
-
- /**
- *
- */
- public ManagedObjectException()
- {
- super();
- }
-
- /**
- * @param message
- * @param cause
- */
- public ManagedObjectException(final String message, final Throwable cause)
- {
- super(message, cause);
- }
-
- /**
- * @param message
- */
- public ManagedObjectException(final String message)
- {
- super(message);
- }
-
- /**
- * @param cause
- */
- public ManagedObjectException(final Throwable cause)
- {
- super(cause);
- }
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/pde/AbstractRegistryReader.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/pde/AbstractRegistryReader.java
deleted file mode 100644
index 64677fe..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/pde/AbstractRegistryReader.java
+++ /dev/null
@@ -1,97 +0,0 @@
-package org.eclipse.jst.jsf.common.internal.pde;
-
-import java.util.Collections;
-import java.util.List;
-import java.util.concurrent.atomic.AtomicBoolean;
-
-import org.eclipse.core.runtime.ISafeRunnable;
-import org.eclipse.core.runtime.SafeRunner;
-import org.eclipse.jst.jsf.common.JSFCommonPlugin;
-
-/**
- * A utility base class that simplifies the reading and caching of extension
- * point information.
- *
- * @author cbateman
- * @param <T>
- *
- */
-public abstract class AbstractRegistryReader<T>
-{
- private final String _extPtNamespace;
- private final String _extPtId;
- private List<T> _extensions;
- private final AtomicBoolean _isInitialized = new AtomicBoolean(false);
-
- /**
- * @param extPtNamespace
- * @param extPtId
- */
- protected AbstractRegistryReader(final String extPtNamespace,
- final String extPtId)
- {
- _extPtNamespace = extPtNamespace;
- _extPtId = extPtId;
- }
-
- /**
- * @return the extensions
- */
- public final List<T> getExtensions()
- {
- synchronized (_isInitialized)
- {
- if (_isInitialized.compareAndSet(false, true))
- {
- SafeRunner.run(new ISafeRunnable()
- {
- public void run() throws Exception
- {
- initialize();
- }
-
- public void handleException(Throwable exception)
- {
- // This is expected during testing if there running as JUnit test (non-plugin)
- JSFCommonPlugin.log(exception, "Loading extension point"); //$NON-NLS-1$
- }
- });
- }
- return _extensions;
- }
- }
-
- /**
- * @param extensions
- */
- protected final void internalSetExtensions(List<T> extensions)
- {
- if (_extensions != null)
- {
- throw new IllegalStateException(
- "internalSetExtensions should be called exactly once"); //$NON-NLS-1$
- }
- _extensions = Collections.unmodifiableList(extensions);
- }
-
- /**
- * Called exactly once to initialize the registry.
- */
- protected abstract void initialize();
-
- /**
- * @return the extension point id. see IConfigurationElement.getName
- */
- protected final String getExtPtId()
- {
- return _extPtId;
- }
-
- /**
- * @return the namespace of the extension point. see Bundle.getSymbolicName
- */
- protected final String getExtPtNamespace()
- {
- return _extPtNamespace;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/pde/AbstractSimpleClassExtensionRegistryReader.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/pde/AbstractSimpleClassExtensionRegistryReader.java
deleted file mode 100644
index 288d1d2..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/pde/AbstractSimpleClassExtensionRegistryReader.java
+++ /dev/null
@@ -1,265 +0,0 @@
-package org.eclipse.jst.jsf.common.internal.pde;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.List;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtension;
-import org.eclipse.core.runtime.IExtensionPoint;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.jsf.common.JSFCommonPlugin;
-
-/**
- * @author cbateman
- * @param <T>
- *
- */
-public abstract class AbstractSimpleClassExtensionRegistryReader<T> extends
- AbstractRegistryReader<T>
-{
- /**
- * Indicates no sorting of extension.
- */
- protected final static Comparator NO_SORT = null;
-
- private final String _attributeName;
- private final String _configElementName;
- private final Comparator<SortableExecutableExtension<T>> _comparator;
-
- private boolean _logWarnings = false;
-
- /**
- * @param extPtNamespace
- * @param extPtId
- * @param configElementName
- * @param attributeName
- * @param listComparator
- * May be null if no sorting of the extensions list is required.
- */
- protected AbstractSimpleClassExtensionRegistryReader(
- final String extPtNamespace, final String extPtId,
- final String configElementName, final String attributeName,
- final Comparator<SortableExecutableExtension<T>> listComparator)
- {
- super(extPtNamespace, extPtId);
- _configElementName = configElementName;
- _attributeName = attributeName;
- _comparator = listComparator;
- }
-
- @Override
- protected final void initialize()
- {
- final List<SortableExecutableExtension<T>> result = new ArrayList<SortableExecutableExtension<T>>();
- final IExtensionPoint extensionPoint = Platform.getExtensionRegistry()
- .getExtensionPoint(getExtPtNamespace(), getExtPtId());
- if (extensionPoint == null)
- {
- return;
- }
- IExtension[] extensions = extensionPoint.getExtensions();
- for (int i = 0; i < extensions.length; i++)
- {
- IExtension ext = extensions[i];
- IConfigurationElement[] tagConverter = ext
- .getConfigurationElements();
-
- for (int j = 0; j < tagConverter.length; j++)
- {
- final IConfigurationElement element = tagConverter[j];
-
- if (element.getName().equals(_configElementName))
- {
- element.getAttribute(_attributeName);
- try
- {
- final T obj = (T) element
- .createExecutableExtension(_attributeName);
- result.add(new SortableExecutableExtension<T>(
- _comparator, element.getContributor().getName(),
- obj));
- } catch (ClassCastException ce)
- {
- handleLoadFailure(new CoreException(new Status(
- IStatus.ERROR, JSFCommonPlugin.PLUGIN_ID,
- "Extension class is not the expected type", ce))); //$NON-NLS-1$
- } catch (CoreException e)
- {
- handleLoadFailure(e);
- }
- }
- }
- }
-
- if (result.size() > 0)
- {
- if (_comparator != NO_SORT)
- {
- Collections.sort(result, _comparator);
- }
- } else if (_logWarnings)
- {
- JSFCommonPlugin.log(IStatus.WARNING, String.format(
- "No extensions found for: %s.%s", //$NON-NLS-1$
- getExtPtNamespace(), getExtPtId()));
- }
- final List<T> finalExtensions = new ArrayList<T>();
- for (final SortableExecutableExtension<T> sortable : result)
- {
- finalExtensions.add(sortable.getExtensionObject());
- }
- internalSetExtensions(finalExtensions);
- }
-
- /**
- * Called by initialize when an error occurs trying to load a class from an
- * extension point. Sub-class should implement to handle the failure,
- * typically to log it using their bundle id.
- *
- * @param ce
- */
- protected abstract void handleLoadFailure(final CoreException ce);
-
- /**
- * @param doLogWarnings
- */
- protected void logWarnings(final boolean doLogWarnings) {
- _logWarnings = doLogWarnings;
- }
-
- /**
- * A comparator that sorts canonically by extension namespace and id, but
- * can make exceptions for certain prefices.
- *
- * @param <T>
- *
- */
- protected abstract static class CanonicalComparatorWithPrefixExceptions<T>
- implements Comparator<SortableExecutableExtension<T>>
- {
-
- public int compare(SortableExecutableExtension<T> o1,
- SortableExecutableExtension<T> o2)
- {
- int result = prefixSort(o1, o2);
-
- // if the prefix sort doesn't distinguish a sort order, then
- // compare it canonically
- if (result == 0)
- {
- result = o1.getContributorId().compareTo(o2.getContributorId());
- }
-
- return result;
- }
-
- /**
- * @param o1
- * @param o2
- * @return -1 if o1 should sort before o2 based on prefix. 1 if o2
- * should sort before o1 or 0 if there is sort preference based
- * on prefix.
- */
- protected abstract int prefixSort(SortableExecutableExtension<T> o1,
- SortableExecutableExtension<T> o2);
- }
-
- /**
- * Ensures that contributions from "org.eclipse.jst" plugins are sorted last
- *
- * @param <T>
- */
- public static class CompareOrgEclipseJstContributorsLastComparator<T> extends CanonicalComparatorWithPrefixExceptions<T> {
- @Override
- protected int prefixSort(
- SortableExecutableExtension<T> o1,
- SortableExecutableExtension<T> o2)
- {
- // if o1 is contributed by open source, sort it
- // after
- if (o1.getContributorId().startsWith("org.eclipse.jst")) //$NON-NLS-1$
- {
- return 1;
- }
- // if o2 is contributed by open source, sort o1 first
- else if (o2.getContributorId().startsWith("org.eclipse.jst")) //$NON-NLS-1$
- {
- return -1;
- }
- // otherwise, we don't care
- return 0;
- }
-
- }
- /**
- * Used to sort extensions before locking down the list.
- *
- * @param <T>
- */
- protected final static class SortableExecutableExtension<T> implements
- Comparable<SortableExecutableExtension>
- {
- private final Comparator _comparator;
- private final String _contributorId;
- private final T _extensionObject;
-
- private SortableExecutableExtension(final Comparator comparator,
- final String contributorId, final T extensionObject)
- {
- if (comparator == null)
- {
- _comparator = new Comparator<T>()
- {
- public int compare(T o1, T o2)
- {
- // always return equal.
- return 0;
- }
- };
- } else
- {
- _comparator = comparator;
- }
- _contributorId = contributorId;
- _extensionObject = extensionObject;
- }
-
- public int compareTo(SortableExecutableExtension o)
- {
- return _comparator.compare(this, o);
- }
-
- @Override
- public boolean equals(Object obj)
- {
- return _comparator.compare(this, obj) == 0;
- }
-
- @Override
- public int hashCode()
- {
- return _contributorId.hashCode() ^ _extensionObject.hashCode();
- }
-
- /**
- * @return the id of the bundle that contributed this extension
- */
- public String getContributorId()
- {
- return _contributorId;
- }
-
- /**
- * @return the extension object
- */
- public T getExtensionObject()
- {
- return _extensionObject;
- }
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/policy/CanonicallyOrderedIteratorPolicy.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/policy/CanonicallyOrderedIteratorPolicy.java
deleted file mode 100644
index 24ba27d..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/policy/CanonicallyOrderedIteratorPolicy.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2008 Oracle Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Oracle Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.common.internal.policy;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-
-/**
- * An iterator policy that sorts a comparable iterator type canonically. This
- * policy takes a private copy of the collectin passed in getIterator. The
- * cost of the sort is incurred when getIterator() is called under the
- * assumption that the iterator will normally be used immediately after
- * construction, so there is little value in deferring.
- *
- * @author cbateman
- *
- * @param <ITERATORTYPE>
- */
-public class CanonicallyOrderedIteratorPolicy<ITERATORTYPE extends Comparable<ITERATORTYPE>>
- implements IIteratorPolicy<ITERATORTYPE>
-{
-
- public Iterator<ITERATORTYPE> getIterator(
- Collection<ITERATORTYPE> forCollection)
- {
- return new CanonicalIterator<ITERATORTYPE>(forCollection);
- }
-
- private final static class CanonicalIterator<ITERATORTYPE extends Comparable> implements Iterator<ITERATORTYPE>
- {
- private final Iterator<ITERATORTYPE> _sortedIterator;
- private CanonicalIterator(final Collection<ITERATORTYPE> source)
- {
- List<ITERATORTYPE> sortable = new ArrayList<ITERATORTYPE>(source);
- Collections.sort(sortable);
- _sortedIterator = sortable.iterator();
- }
-
- public boolean hasNext()
- {
- return _sortedIterator.hasNext();
- }
-
- public ITERATORTYPE next()
- {
- return _sortedIterator.next();
- }
- public void remove()
- {
- throw new UnsupportedOperationException();
- }
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/policy/IIdentifiable.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/policy/IIdentifiable.java
deleted file mode 100644
index 6e6368d..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/policy/IIdentifiable.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2008 Oracle Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Oracle Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.common.internal.policy;
-
-/**
- * An object with an unique identity
- * @author cbateman
- * @param <IDTYPE>
- *
- */
-public interface IIdentifiable<IDTYPE>
-{
- /**
- * @return the unique identifier
- */
- IDTYPE getId();
-
- /**
- * @return a human-readable name for this identifier.
- */
- String getDisplayName();
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/policy/IIteratorPolicy.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/policy/IIteratorPolicy.java
deleted file mode 100644
index 6b567f3..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/policy/IIteratorPolicy.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2008 Oracle Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Oracle Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.common.internal.policy;
-
-import java.util.Collection;
-import java.util.Iterator;
-
-/**
- * A policy that allows a strategy composite to change the order in which
- * it queries it's list of strategies.
- *
- * @author cbateman
- * @param <ITERATORTYPE>
- *
- */
-public interface IIteratorPolicy<ITERATORTYPE>
-{
- /**
- * @param forCollection
- * @return an iterator that controls the ordering through forCollection
- * in a policy directed way. The policy may take a copy of the collection
- * or may choose to iterate in place.
- */
- Iterator<ITERATORTYPE> getIterator(Collection<ITERATORTYPE> forCollection);
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/policy/IdentifierOrderedIteratorPolicy.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/policy/IdentifierOrderedIteratorPolicy.java
deleted file mode 100644
index a566af0..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/policy/IdentifierOrderedIteratorPolicy.java
+++ /dev/null
@@ -1,142 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2008 Oracle Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Oracle Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.common.internal.policy;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
-import java.util.NoSuchElementException;
-
-/**
- * An iterator policy that creates Iterators that traverse a target collection
- * by returning items in the order they are in the policyOrder object pased at
- * construction. The target collection passed to getIterator is copied, so the
- * iterator will not be effected by subsequent changes to the target.
- *
- * NOTE: the policyOrder iterable collection should not be modified after it is
- * passed to the constructor.
- *
- * The class is thread-safe, however the iterators are not. That is, more than
- * one thread can safely call any of the public methods, however each Iterator
- * returned by getIterator can only be used safely by a single thread.
- *
- * @author cbateman
- *
- * @param <ITERATORTYPE>
- */
-public class IdentifierOrderedIteratorPolicy<ITERATORTYPE> implements
- IIteratorPolicy<ITERATORTYPE>
-{
- private final Iterable<ITERATORTYPE> _policyOrder;
- // controls whether the policy iterator will return items that are
- // not explicitly listed in policyOrder.
- private volatile boolean _excludeNonExplicitValues = false;
-
- /**
- * @param policyOrder
- */
- public IdentifierOrderedIteratorPolicy(final Iterable<ITERATORTYPE> policyOrder)
- {
- _policyOrder = policyOrder;
- }
-
- /**
- * Default value is <b>false</b>.
- *
- * @return if true, the iterator will not return values in the forCollection
- * passed to getIterator whose identifier are not explicitly listed in
- * the policyOrder, If false, these values will be return after all
- * the policyOrder values have been returned.
- */
- public boolean isExcludeNonExplicitValues()
- {
- return _excludeNonExplicitValues;
- }
-
- /**
- * @param excludeNonExplicitValues
- */
- public void setExcludeNonExplicitValues(boolean excludeNonExplicitValues)
- {
- _excludeNonExplicitValues = excludeNonExplicitValues;
- }
-
- public Iterator<ITERATORTYPE> getIterator(
- final Collection<ITERATORTYPE> forCollection)
- {
- final boolean excludeNonExplicitValues = _excludeNonExplicitValues;
- return new MyIterator<ITERATORTYPE>(forCollection, excludeNonExplicitValues, _policyOrder);
- }
-
- private static class MyIterator<ITERATORTYPE> implements Iterator<ITERATORTYPE>
- {
- private final List<ITERATORTYPE> _items;
- private final Iterator<ITERATORTYPE> _policyIterator;
- private ITERATORTYPE _next;
-
- MyIterator(final Collection<ITERATORTYPE> collection,
- final boolean excludeNonExplicitValues,
- final Iterable<ITERATORTYPE> policyOrder)
- {
- _items = new ArrayList();
- _items.addAll(collection);
-
- _policyIterator = policyOrder.iterator();
- _next = findNext();
- }
-
- public boolean hasNext()
- {
- return _next != null;
- }
-
- public ITERATORTYPE next()
- {
- if (_next != null)
- {
- ITERATORTYPE next = _next;
- //calculate next one before returning
- _next = findNext();
- return next;
- }
-
- throw new NoSuchElementException("No more elements"); //$NON-NLS-1$
- }
-
- public void remove()
- {
- throw new UnsupportedOperationException();
- }
-
- private ITERATORTYPE findNext()
- {
- while (_policyIterator.hasNext())
- {
- ITERATORTYPE next = _policyIterator.next();
- if (_items.contains(next))
- {
- _items.remove(next);
- return next;
- }
- }
-
- // we have exhausted the _items that are in the policy iterator
- // now return any further _items in the order they are in the list
- if (_items.size() > 0)
- {
- return _items.remove(0);
- }
-
- return null;
- }
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/policy/OrderedListProvider.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/policy/OrderedListProvider.java
deleted file mode 100644
index 7540755..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/policy/OrderedListProvider.java
+++ /dev/null
@@ -1,178 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2008 Oracle Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Oracle Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.common.internal.policy;
-
-import java.util.List;
-
-/**
- * Provides a list of order, enablement-modifiable objects.
- *
- * @author cbateman
- *
- */
-public abstract class OrderedListProvider
-{
- private List<OrderableObject> _orderableObjects;
-
- /**
- *
- * @return the list of ordered objects
- */
- public final List<OrderableObject> getOrderedObjects()
- {
- if (_orderableObjects == null)
- {
- _orderableObjects = createAndPopulateOrderedObjects();
- }
- return _orderableObjects;
- }
-
- /**
- * <p>Clears the orderableObjects collection so that the next call
- * of getOrderedObjects() </p>
- */
- public final void resetOrderedObjects()
- {
- _orderableObjects = null;
- }
-
- /**
- * Move the object one toward the front of the list
- *
- * @param object
- */
- public final void moveUp(final OrderableObject object)
- {
- final List<OrderableObject> list = getOrderedObjects();
- final int index = list.indexOf(object);
- if (index > 0)
- {
- OrderableObject item = list.remove(index);
- list.add(index - 1, item);
- }
- }
-
- /**
- * Move the object one toward the end
- * @param object
- */
- public final void moveDown(final OrderableObject object)
- {
- final List<OrderableObject> list = getOrderedObjects();
- int index = list.indexOf(object);
- if (index < list.size() - 1)
- {
- OrderableObject item = list.remove(index);
- list.add(index + 1, item);
- }
- }
-
- /**
- * @return a new list orderable objects populate in their initial order
- * The list must be modifiable.
- */
- protected abstract List<OrderableObject> createAndPopulateOrderedObjects();
-
- /**
- * Proxy object for ordering in list
- *
- * @author cbateman
- *
- */
- public static class OrderableObject implements Cloneable
- {
- private boolean _enabled;
- private Object _object;
-
- /**
- * @param object
- * @param enabled
- */
- public OrderableObject(final Object object, final boolean enabled)
- {
- _object = object;
- _enabled = enabled;
- }
-
- private OrderableObject(final OrderableObject copyMe)
- {
- _object = copyMe._object;
- _enabled = copyMe._enabled;
- }
-
- /**
- * @return true if this object is enabled
- */
- public boolean isEnabled()
- {
- return _enabled;
- }
-
- /**
- * @param enabled
- */
- public void setEnabled(boolean enabled)
- {
- _enabled = enabled;
- }
-
- /**
- * @return the object in the ordered list
- */
- public Object getObject()
- {
- return _object;
- }
-
- /**
- * @param object
- */
- public void setObject(Object object)
- {
- _object = object;
- }
-
- @Override
- public OrderableObject clone()
- {
- return new OrderableObject(this);
- }
-
- @Override
- public boolean equals(Object obj)
- {
- if (obj instanceof OrderableObject)
- {
- if (_enabled == ((OrderableObject)obj)._enabled)
- {
- Object other = ((OrderableObject)obj)._object;
- if (other != null)
- {
- return other.equals(_object);
- }
- return _object == null;
- }
- }
- return false;
- }
-
- @Override
- public int hashCode()
- {
- int enabledCode = _enabled ? 0xcccccccc : 0x33333333;
- if (_object == null)
- {
- return enabledCode;
- }
- return _object.hashCode() ^ enabledCode;
- }
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/resource/AbstractJarLocator.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/resource/AbstractJarLocator.java
deleted file mode 100644
index ba1a51e..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/resource/AbstractJarLocator.java
+++ /dev/null
@@ -1,67 +0,0 @@
-package org.eclipse.jst.jsf.common.internal.resource;
-
-import java.util.Collection;
-import java.util.Collections;
-import java.util.concurrent.CopyOnWriteArrayList;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jst.jsf.common.internal.locator.AbstractLocator;
-import org.eclipse.jst.jsf.common.internal.locator.ILocatorChangeListener;
-
-/**
- * An abstract implementation of the JarLocator.
- *
- * @author cbateman
- *
- */
-public abstract class AbstractJarLocator extends
- AbstractLocator<Collection<? extends ClasspathJarFile>, IProject, String>
- implements IJarLocator
-{
- /**
- * @param id
- * @param displayName
- */
- public AbstractJarLocator(final String id, final String displayName)
- {
- super(id, displayName, Collections.EMPTY_LIST,
- new CopyOnWriteArrayList<ILocatorChangeListener>());
- }
-
- private final CopyOnWriteArrayList<JarChangeListener> _listeners = new CopyOnWriteArrayList<JarChangeListener>();
-
- public final Collection<? extends ClasspathJarFile> getJars(final IProject project)
- {
- return locate(project);
- }
-
- @Override
- protected abstract Collection<? extends ClasspathJarFile> doLocate(IProject context);
-
- public void addListener(final JarChangeListener listener)
- {
- _listeners.addIfAbsent(listener);
- }
-
- public void removeListener(final JarChangeListener listener)
- {
- _listeners.remove(listener);
- }
-
- /**
- * @param event
- */
- protected void fireChangeEvent(final JarChangeEvent event)
- {
- for (final JarChangeListener listener : _listeners)
- {
- listener.changed(event);
- }
- }
-
- public void dispose()
- {
- _listeners.clear();
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/resource/AbstractLifecycleListener.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/resource/AbstractLifecycleListener.java
deleted file mode 100644
index 3bafecd..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/resource/AbstractLifecycleListener.java
+++ /dev/null
@@ -1,221 +0,0 @@
-package org.eclipse.jst.jsf.common.internal.resource;
-
-import java.util.Collection;
-import java.util.Collections;
-import java.util.EventObject;
-import java.util.concurrent.CopyOnWriteArrayList;
-import java.util.concurrent.atomic.AtomicBoolean;
-
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.jst.jsf.common.JSFCommonPlugin;
-
-/**
- *
- * @author cbateman
- * @param <EVENTTYPE>
- * @param <LISTENERTYPE>
- * @param <LIFECYCLEOBJECT>
- *
- */
-public abstract class AbstractLifecycleListener<EVENTTYPE extends EventObject, LISTENERTYPE extends ILifecycleListener<EVENTTYPE>, LIFECYCLEOBJECT>
- extends ImmutableLifecycleListener<LISTENERTYPE>
-{
- /**
- * Exception (non-localized) error message thrown when a null object is
- * added.
- */
- protected static final String CANNOT_ADD_NULL_RESOURCE = "Cannot add null object"; //$NON-NLS-1$
- static final boolean TRACE_EVENTS;
- static
- {
- TRACE_EVENTS = Boolean.valueOf(
- Platform.getDebugOption(JSFCommonPlugin.PLUGIN_ID
- + "/debug/lifecyclelistener")).booleanValue() //$NON-NLS-1$
- || Boolean.valueOf(System.getProperty("org.eclipse.jst.jsf.common/debug/lifecyclelistener")).booleanValue(); //$NON-NLS-1$
- }
-
- private final CopyOnWriteArrayList<LISTENERTYPE> _listeners = new CopyOnWriteArrayList<LISTENERTYPE>();
- private final CopyOnWriteArrayList<LIFECYCLEOBJECT> _lifecycleObjects = new CopyOnWriteArrayList<LIFECYCLEOBJECT>();
- private final AtomicBoolean _isDisposed = new AtomicBoolean(false);
-
- /**
- * Adds listener to the list of objects registered to receive lifecycle
- * events for this resource. Only adds the listener if it is not already in
- * the list.
- *
- * Method is thread-safe and may block the caller
- *
- * Throws {@link IllegalStateException} if isDisposed() == true Throws
- * {@link NullPointerException} if listener == null
- *
- * @param listener
- */
- @Override
- public void addListener(final LISTENERTYPE listener)
- {
- if (isDisposed())
- {
- throw new IllegalStateException();
- }
- if (listener == null)
- {
- throw new NullPointerException("Cannot pass null listener"); //$NON-NLS-1$
- }
- _listeners.addIfAbsent(listener);
- }
-
- /**
- * Removes listener from the list of registered listeners
- *
- * Method is thread-safe and may block the caller
- *
- * Throws {@link IllegalStateException} if isDisposed() == true
- *
- * @param listener
- */
- @Override
- public void removeListener(final LISTENERTYPE listener)
- {
- if (isDisposed())
- {
- throw new IllegalStateException();
- }
- _listeners.remove(listener);
- }
-
- /**
- * @param event
- */
- protected void fireLifecycleEvent(final EVENTTYPE event)
- {
- boolean disposeAfter = false;
- if (TRACE_EVENTS)
- {
- System.err.println(event);
- }
- // NOTE: must use iterator through _listeners so that
- // CopyOnWriteArrayList protects us from concurrent modification
- for (final LISTENERTYPE listener : _listeners)
- {
- final EventResult result = listener.acceptEvent(event);
- disposeAfter |= result.getDisposeAfterEvent();
- }
- if (disposeAfter)
- {
- dispose();
- }
- }
-
- /**
- * @return true if the listener has been disposed
- */
- public boolean isDisposed()
- {
- return _isDisposed.get();
- }
-
- /**
- * Release the resource change listener
- */
- public final void dispose()
- {
- if (_isDisposed.compareAndSet(false, true))
- {
- // ensure that add/removeResource don't cause races to add or
- // remove the resource listener
- synchronized (_lifecycleObjects)
- {
- // remove first to minimize the chance that the listener will
- // be triggered during the remainder of dispose
- removeSystemChangeListener();
- _lifecycleObjects.clear();
- doDispose();
- }
- }
- }
-
- /**
- * Sub-class disposal specialization.
- */
- protected void doDispose()
- {
- // do nothing by default; sub-classes should override to provide their
- // own disposal.
- }
-
- /**
- * @param object
- */
- protected void addLifecycleObject(final LIFECYCLEOBJECT object)
- {
- if (object == null)
- {
- throw new NullPointerException(CANNOT_ADD_NULL_RESOURCE);
- }
- synchronized (_lifecycleObjects)
- {
- // don't add any resources if we've disposed before acquiring the
- // lock
- if (isDisposed())
- {
- return;
- }
- final int preSize = _lifecycleObjects.size();
- if (!_lifecycleObjects.contains(object))
- {
- _lifecycleObjects.add(object);
- }
- // if the size of the array was 0
- // and is now greater, make sure the listener is added
- if (preSize == 0 && _lifecycleObjects.size() > 0)
- {
- addSystemChangeListener();
- }
- }
- }
-
- /**
- * If there are no longer resources being targeted, the resource change
- * listener will be removed.
- *
- * @param res
- */
- public void removeResource(final IResource res)
- {
- synchronized (_lifecycleObjects)
- {
- // don't bother with this stuff if we're disposed.
- if (isDisposed())
- {
- return;
- }
- _lifecycleObjects.remove(res);
- // if there are no longer target resources,
- // remove the workspace listener
- if (_lifecycleObjects.size() == 0)
- {
- removeSystemChangeListener();
- }
- }
- }
-
- /**
- * @return an iterable of the lifecycle objects being tracked.
- */
- protected Collection<LIFECYCLEOBJECT> getLifecycleObjects()
- {
- return Collections.unmodifiableCollection(_lifecycleObjects);
- }
-
- /**
- * Add the system change listener that is used to collect events that will
- * be processed into lifecycle change events.
- */
- protected abstract void addSystemChangeListener();
-
- /**
- * Remove a system change listener added using addSystemChangeListener
- */
- protected abstract void removeSystemChangeListener();
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/resource/ClasspathEntryLifecycleListener.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/resource/ClasspathEntryLifecycleListener.java
deleted file mode 100644
index 80e8c9a..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/resource/ClasspathEntryLifecycleListener.java
+++ /dev/null
@@ -1,213 +0,0 @@
-package org.eclipse.jst.jsf.common.internal.resource;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IResourceDelta;
-import org.eclipse.core.resources.IResourceDeltaVisitor;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jdt.core.ElementChangedEvent;
-import org.eclipse.jdt.core.IElementChangedListener;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IJavaElementDelta;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jst.jsf.common.JSFCommonPlugin;
-import org.eclipse.jst.jsf.common.internal.resource.IClasspathLifecycleListener.ClasspathLifecycleEvent;
-
-/**
- * @author cbateman
- */
-public class ClasspathEntryLifecycleListener
- extends
- AbstractLifecycleListener<IClasspathLifecycleListener.ClasspathLifecycleEvent, IClasspathLifecycleListener, IProject>
- implements IElementChangedListener
-{
- private final JavaCoreMediator _mediator;
-
- /**
- * Initialize an inactive lifecycle listener. A classpath listener will not
- * be installed by this constructor. The object created using this
- * constructor will not fire any events until addClasspathEntry is called at
- * least once to add a target resource
- *
- * @param mediator
- * the mediator to use to access JavaCore operations
- * @throws NullPointerException
- * if mediator is null.
- */
- public ClasspathEntryLifecycleListener(final JavaCoreMediator mediator)
- {
- if (mediator == null)
- {
- throw new NullPointerException(CANNOT_ADD_NULL_RESOURCE);
- }
- _mediator = mediator;
- }
-
- /**
- * Create a new lifecycle listener for the res
- *
- * @param entry
- * @param mediator
- * the workspace to listen to for changes.
- * @throws NullPointerException
- * if res or workspace is null.
- */
- public ClasspathEntryLifecycleListener(final IProject entry,
- final JavaCoreMediator mediator)
- {
- this(mediator);
- if (entry == null)
- {
- throw new NullPointerException(CANNOT_ADD_NULL_RESOURCE);
- }
- addLifecycleObject(entry);
- }
-
- public void elementChanged(final ElementChangedEvent event)
- {
- // we are only interested in package fragment roots that are listening
- // for
- if (event.getType() == ElementChangedEvent.POST_CHANGE)
- {
- handlePostChangeEvent(event);
- }
- }
-
- private void handlePostChangeEvent(final ElementChangedEvent event)
- {
- final IJavaElementDelta delta = event.getDelta();
- new DeltaAcceptor().accept(new DeltaAcceptor.DeltaVisitor()
- {
- public void visit(final IJavaElementDelta visitDelta)
- {
- // we are only interested in package_fragment_root's
- final IJavaElement element = visitDelta.getElement();
- // only interested if a project in our entries list owns the
- // element.
- final IJavaProject javaProject = element.getJavaProject();
- if (javaProject == null
- || !getLifecycleObjects().contains(
- javaProject.getProject()))
- {
- return;
- }
- if (element.getElementType() == IJavaElement.PACKAGE_FRAGMENT_ROOT)
- {
- handlePackageFragmentRoot(visitDelta);
- } else if (element.getElementType() == IJavaElement.JAVA_PROJECT
- && visitDelta.getResourceDeltas() != null)
- {
- handleProject(visitDelta);
- }
- // need to test the flags only for package fragment roots
- }
-
- private void handleProject(final IJavaElementDelta visitDelta)
- {
- for (final IResourceDelta resDelta : visitDelta
- .getResourceDeltas())
- {
- try
- {
- resDelta.accept(new IResourceDeltaVisitor()
- {
- public boolean visit(final IResourceDelta resDelta2)
- throws CoreException
- {
- if (resDelta2.getKind() == IResourceDelta.REMOVED
- && resDelta2.getResource().getType() == IResource.FILE
- && "jar".equals(resDelta2.getResource().getFileExtension())) //$NON-NLS-1$
- {
- fireLifecycleEvent(new ClasspathLifecycleEvent(
- ClasspathEntryLifecycleListener.this,
- visitDelta.getElement(),
- ClasspathLifecycleEvent.Type.REMOVED_DELTA,
- resDelta2.getResource()));
- }
- return true;
- }
- });
- } catch (final CoreException e)
- {
- JSFCommonPlugin.log(e);
- }
- }
- }
-
- private void handlePackageFragmentRoot(
- final IJavaElementDelta visitDelta)
- {
- final int flags = visitDelta.getFlags();
- switch (visitDelta.getKind())
- {
- case IJavaElementDelta.ADDED:
- {
- fireLifecycleEvent(new ClasspathLifecycleEvent(
- ClasspathEntryLifecycleListener.this,
- visitDelta.getElement(),
- ClasspathLifecycleEvent.Type.ADDED));
- }
- break;
- case IJavaElementDelta.REMOVED:
- {
- fireLifecycleEvent(new ClasspathLifecycleEvent(
- ClasspathEntryLifecycleListener.this,
- visitDelta.getElement(),
- ClasspathLifecycleEvent.Type.REMOVED));
- }
- break;
- case IJavaElementDelta.CHANGED:
- if ((flags & IJavaElementDelta.F_ADDED_TO_CLASSPATH) != 0)
- {
- fireLifecycleEvent(new ClasspathLifecycleEvent(
- ClasspathEntryLifecycleListener.this,
- visitDelta.getElement(),
- ClasspathLifecycleEvent.Type.ADDED));
- } else if ((flags & IJavaElementDelta.F_REMOVED_FROM_CLASSPATH) != 0)
- {
- fireLifecycleEvent(new ClasspathLifecycleEvent(
- ClasspathEntryLifecycleListener.this,
- visitDelta.getElement(),
- ClasspathLifecycleEvent.Type.REMOVED));
- } else if ((flags & IJavaElementDelta.F_REORDER) != 0)
- {
- // TODO: how important is the case of a classpath
- // reordering?
- }
- break;
- }
- }
- }, delta);
- }
-
- @Override
- protected void addSystemChangeListener()
- {
- _mediator.addElementChangedListener(this);
- }
-
- @Override
- protected void removeSystemChangeListener()
- {
- _mediator.removeElementChangeListener(this);
- }
-
- private static class DeltaAcceptor
- {
- public interface DeltaVisitor
- {
- public void visit(final IJavaElementDelta delta);
- }
-
- public void accept(final DeltaVisitor visitor,
- final IJavaElementDelta delta)
- {
- visitor.visit(delta);
- for (final IJavaElementDelta childDelta : delta
- .getAffectedChildren())
- {
- accept(visitor, childDelta);
- }
- }
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/resource/ClasspathJarFile.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/resource/ClasspathJarFile.java
deleted file mode 100644
index 0c4bba1..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/resource/ClasspathJarFile.java
+++ /dev/null
@@ -1,133 +0,0 @@
-package org.eclipse.jst.jsf.common.internal.resource;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.jar.JarFile;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.jst.jsf.common.JSFCommonPlugin;
-
-/**
- * Represents a jar that is available on the classpath. Encapsulates the jar
- * as well as information about where it is provided from.
- *
- * The jar itself may have been deleted in which case, exists() will return false.
- *
- * @author cbateman
- *
- */
-public class ClasspathJarFile
-{
- private final IProject _project;
- private final IPath _iPath;
-
- /**
- * @param project
- * @param iPath
- */
- public ClasspathJarFile(final IProject project, final IPath iPath)
- {
- _project = project;
- _iPath = iPath;
- }
-
- /**
- * @return the project that this jar file is being referenced from. Note that this
- * is not necessarily the same as the project that owns it (if it is in the
- * workspace) and a jar file may be referenced by more than one project.
- */
- public IProject getProject()
- {
- return _project;
- }
-
- /**
- * @return the class path entry
- */
- public IPath getPath()
- {
- return _iPath;
- }
-
- /**
- * @return a new JarFile for the underlying jar. Caller MUST close the jar when
- * done.
- */
- public JarFile getJarFile()
- {
- JarFile jarFileFromCPE = null;
- try
- {
- jarFileFromCPE = getJarFileFromCPE(_iPath, _project.getWorkspace());
- } catch (final IOException e)
- {
- JSFCommonPlugin.log(e);
- }
- return jarFileFromCPE;
- }
-
- /**
- * TODO: Merge into JSFAppConfigUtils.
- *
- * @param entry
- * @param workspace
- * @return
- */
- private JarFile getJarFileFromCPE(final IPath entry, final IWorkspace workspace)
- throws IOException
- {
- IPath path = _iPath;
- if (path.getFileExtension() != null
- && path.getFileExtension().length() > 0)
- {
- final IWorkspaceRoot workspaceRoot = workspace.getRoot();
- if (path.getDevice() == null
- && workspaceRoot.getProject(path.segment(0))
- .exists())
- {
- path = workspaceRoot.getFile(path)
- .getLocation();
- }
- final String libraryPathString = path.toString();
- final File file = new File(libraryPathString);
- if (file.exists())
- {
- return new JarFile(file);
- }
- }
- return null;
- }
-
- @Override
- public boolean equals(Object obj)
- {
- if (obj == this)
- {
- return true;
- }
-
- if (! (obj instanceof ClasspathJarFile))
- {
- return false;
- }
-
- ClasspathJarFile other = (ClasspathJarFile) obj;
- return _project.equals(other._project) && _iPath.equals(other._iPath);
- }
-
- @Override
- public int hashCode()
- {
- return _project.hashCode() ^ _iPath.hashCode();
- }
-
- @Override
- public String toString()
- {
- return String.format("ClasspathJarFile for project=%s, entry=%s", _project, _iPath); //$NON-NLS-1$
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/resource/ContentTypeResolver.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/resource/ContentTypeResolver.java
deleted file mode 100644
index c4cd6da..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/resource/ContentTypeResolver.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package org.eclipse.jst.jsf.common.internal.resource;
-
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.content.IContentType;
-import org.eclipse.core.runtime.content.IContentTypeManager;
-
-/**
- * Tools for resolving content types of resources or other object linked from
- * the workspace (i.e. "files" in classpath entries).
- *
- * @author cbateman
- *
- */
-public class ContentTypeResolver
-{
- private final IContentTypeManager _typeManager;
-
- /**
- * Equivalent to Platform.getContentTypeManager().
- */
- public ContentTypeResolver()
- {
- this(Platform.getContentTypeManager());
- }
-
- /**
- * @param typeManager
- */
- public ContentTypeResolver(final IContentTypeManager typeManager)
- {
- _typeManager = typeManager;
- }
-
- /**
- * @param contentTypeId
- * @param fileName
- * @return true if the fileName matches the content type provided. May also return
- * false if the fileName alone is not enough to determine type.
- */
- public boolean matchesType(final String contentTypeId, final String fileName)
- {
- IContentType jspContentType = _typeManager.getContentType(contentTypeId);
- if (jspContentType != null
- && jspContentType.isAssociatedWith(fileName))
- {
- return true;
- }
-
- return false;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/resource/DefaultJarLocator.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/resource/DefaultJarLocator.java
deleted file mode 100644
index 4f31cc1..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/resource/DefaultJarLocator.java
+++ /dev/null
@@ -1,172 +0,0 @@
-package org.eclipse.jst.jsf.common.internal.resource;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IPackageFragmentRoot;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jst.jsf.common.JSFCommonPlugin;
-import org.eclipse.jst.jsf.common.internal.finder.AbstractMatcher.AlwaysMatcher;
-import org.eclipse.jst.jsf.common.internal.finder.AbstractMatcher.IMatcher;
-import org.eclipse.jst.jsf.common.internal.finder.VisitorMatcher;
-import org.eclipse.jst.jsf.common.internal.finder.acceptor.ClasspathEntryJarMatchingAcceptor;
-import org.eclipse.jst.jsf.common.internal.finder.acceptor.JarMatchingAcceptor;
-import org.eclipse.jst.jsf.common.internal.resource.IClasspathLifecycleListener.ClasspathLifecycleEvent;
-import org.eclipse.jst.jsf.common.internal.resource.IJarLocator.JarChangeEvent.Type;
-
-/**
- * A default jar provider that traverses a project and returns all found jars on
- * the classpath that a list of matcher criteria.
- *
- * @author cbateman
- *
- */
-public class DefaultJarLocator extends AbstractJarLocator
-{
- private static final String DISPLAY_NAME = "Default Jar Provider"; //$NON-NLS-1$
- private static final String ID = DefaultJarLocator.class.getCanonicalName();
- private final VisitorMatcher<IProject, ClasspathJarFile, String> _matcher;
- private ClasspathEntryLifecycleListener _classpathEntryListener;
- private final JavaCoreMediator _javaCoreMediator;
-
- /**
- * @param javaCoreMediator
- */
- public DefaultJarLocator(final JavaCoreMediator javaCoreMediator)
- {
- this(Collections.singletonList(new AlwaysMatcher()), javaCoreMediator);
- }
-
- /**
- * @param matchers
- * @param javaCoreMediator
- */
- public DefaultJarLocator(final List<? extends IMatcher> matchers,
- final JavaCoreMediator javaCoreMediator)
- {
- super(ID, DISPLAY_NAME);
- _matcher = new VisitorMatcher<IProject, ClasspathJarFile, String>(ID,
- DISPLAY_NAME, new JarMatchingAcceptor(javaCoreMediator),
- matchers);
- _javaCoreMediator = javaCoreMediator;
- _classpathEntryListener = new ClasspathEntryLifecycleListener(
- _javaCoreMediator);
- }
-
- @Override
- public void start(final IProject project)
- {
- _classpathEntryListener.addLifecycleObject(project);
- _classpathEntryListener.addListener(new IClasspathLifecycleListener()
- {
- public EventResult acceptEvent(final ClasspathLifecycleEvent event)
- {
- final IJavaElement affectedElement = event.getAffectedElement();
- final List<ClasspathJarFile> affectedJarFiles = new ArrayList<ClasspathJarFile>();
- if (isInteresting(project, affectedElement, event))
- {
- Type jarEventType = null;
- switch (event.getType())
- {
- case ADDED:
- jarEventType = Type.JAR_ADDED;
- affectedJarFiles.addAll(getChangedJars((IPackageFragmentRoot) affectedElement));
- break;
- case REMOVED:
- jarEventType = Type.JAR_REMOVED;
- affectedJarFiles.addAll(getChangedJars((IPackageFragmentRoot) affectedElement));
- break;
- case REMOVED_DELTA:
- jarEventType = Type.JAR_REMOVED;
- IResource res = event.getAffectedResource();
- if (res.getType() == IResource.FILE &&
- "jar".equals(res.getFileExtension())) //$NON-NLS-1$
- {
- IPath path = res.getLocation();
- if (path != null)
- {
- affectedJarFiles.add(new ClasspathJarFile(project, path));
- }
- }
- break;
- }
-
- if (jarEventType != null && !affectedJarFiles.isEmpty())
- {
- for (final ClasspathJarFile changedJar : affectedJarFiles)
- {
- fireChangeEvent(new JarChangeEvent(
- DefaultJarLocator.this, jarEventType,
- changedJar));
- }
- }
- }
- return EventResult.getDefaultEventResult();
- }
-
- private Collection<? extends ClasspathJarFile> getChangedJars(
- final IPackageFragmentRoot affectedElement)
- {
- try
- {
- return new VisitorMatcher<IPackageFragmentRoot, ClasspathJarFile, String>(
- "", "", new ClasspathEntryJarMatchingAcceptor(project), //$NON-NLS-1$ //$NON-NLS-2$
- Collections.singletonList(new AlwaysMatcher()))
- .find(affectedElement);
- } catch (final JavaModelException e)
- {
- return Collections.EMPTY_LIST;
- } catch (final Exception e)
- {
- return Collections.EMPTY_LIST;
- }
- }
- });
- super.start(project);
- }
-
- private boolean isInteresting(final IProject project,
- final IJavaElement affectedElement, final ClasspathLifecycleEvent event)
- {
- return
- // first filter out events that aren't related to the project we care about.
- (affectedElement != null
- && affectedElement.getJavaProject() != null
- && project
- .equals(affectedElement.getJavaProject().getProject()))
- // then filter down to only events impacting frag roots
- // or jar file deletions
- && (affectedElement.getElementType() == IJavaElement.PACKAGE_FRAGMENT_ROOT
- || (affectedElement.getElementType() == IJavaElement.JAVA_PROJECT
- && event.getAffectedResource() != null
- && event.getType() == ClasspathLifecycleEvent.Type.REMOVED_DELTA));
- }
-
- @Override
- public void stop()
- {
- _classpathEntryListener.dispose();
- super.stop();
- }
-
- @Override
- protected Collection<? extends ClasspathJarFile> doLocate(
- final IProject project)
- {
- try
- {
- return _matcher.find(project);
- } catch (final Exception e)
- {
- JSFCommonPlugin
- .log(e, "While getting jars for project: " + project); //$NON-NLS-1$
- return getNoResult();
- }
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/resource/EventResult.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/resource/EventResult.java
deleted file mode 100644
index 68aae95..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/resource/EventResult.java
+++ /dev/null
@@ -1,84 +0,0 @@
-package org.eclipse.jst.jsf.common.internal.resource;
-
-/**
- * @author cbateman
- *
- */
-public class EventResult
-{
- private static EventResult DEFAULT;
-
- /**
- * @return an event result with defaults initialized
- */
- public synchronized static EventResult getDefaultEventResult()
- {
- if (DEFAULT == null)
- {
- DEFAULT = new EventResult()
- {
- @Override
- protected void setDisposeAfterEvent(final boolean disposeAfterEvent)
- {
- throw new UnsupportedOperationException();
- }
- };
- }
- return DEFAULT;
- }
-
- private static EventResult DISPOSE_AFTER_EVENT;
-
- /**
- * @return an event result with default except dispose after
- * is set
- */
- public synchronized static EventResult getDisposeAfterEventResult()
- {
- if (DISPOSE_AFTER_EVENT == null)
- {
- DISPOSE_AFTER_EVENT = new EventResult()
- {
- /**
- * @return the remove listener flag
- */
- @Override
- public boolean getDisposeAfterEvent()
- {
- return true;
- }
-
- /**
- * @param disposeAfterEvent
- */
- @Override
- protected void setDisposeAfterEvent(final boolean disposeAfterEvent) {
- _disposeAfterEvent = disposeAfterEvent;
- }
-
- };
- }
- return DISPOSE_AFTER_EVENT;
- }
-
- /**
- * set to true if after the current event is finished firing, the source
- * should be disposed. If self-disposal is not applicable, the flag is ignored
- */
- protected boolean _disposeAfterEvent;
-
- /**
- * @return the remove listener flag
- */
- public boolean getDisposeAfterEvent()
- {
- return _disposeAfterEvent;
- }
-
- /**
- * @param disposeAfterEvent
- */
- protected void setDisposeAfterEvent(final boolean disposeAfterEvent) {
- _disposeAfterEvent = disposeAfterEvent;
- }
-}
\ No newline at end of file
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/resource/IClasspathLifecycleListener.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/resource/IClasspathLifecycleListener.java
deleted file mode 100644
index e2fcfcc..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/resource/IClasspathLifecycleListener.java
+++ /dev/null
@@ -1,162 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2008 Oracle Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Oracle Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.common.internal.resource;
-
-import java.util.EventObject;
-
-import org.eclipse.core.resources.IResource;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jst.jsf.common.internal.resource.IClasspathLifecycleListener.ClasspathLifecycleEvent;
-
-/**
- * Listener can register for events ona particular LifecycleListener
- *
- * @author cbateman
- *
- */
-public interface IClasspathLifecycleListener extends
- ILifecycleListener<ClasspathLifecycleEvent>
-{
- /**
- * Listener accepts the classpath lifecycle event
- *
- * @param event
- */
- EventResult acceptEvent(ClasspathLifecycleEvent event);
-
- /**
- * An event indicating a change on the classpath
- *
- */
- public static class ClasspathLifecycleEvent extends EventObject
- {
- /**
- * Indicates the type of change.
- *
- */
- public enum Type
- {
- /**
- * The affected element was added to the classpath
- */
- ADDED,
- /**
- * The affected element was removed from the classpath
- */
- REMOVED,
- /**
- * A classpath object has been deleted from the workspace. The
- * affected element is the owning IJavaProject. The actual deleted
- * object can be obtained by query getAffectedResource. Note that
- * this is a post change event, so the underlying resources most
- * likely don't exist any more.
- *
- */
- REMOVED_DELTA
- }
-
- private final IJavaElement _affectedElement;
- private final IResource _affectedResource;
- private final Type _type;
-
- /**
- * @param source
- * @param affectedElement
- * @param type
- */
- public ClasspathLifecycleEvent(
- final ClasspathEntryLifecycleListener source,
- final IJavaElement affectedElement, final Type type)
- {
- this(source, affectedElement, type, null);
- }
-
- /**
- * @param source
- * @param affectedElement
- * @param type
- * @param affectedResource
- * @throws IllegalArgumentException
- * if affectedResource is non-null but type doesn't match
- * one that has affectedResources (see
- * isAffectResourceEvent)
- */
- public ClasspathLifecycleEvent(
- final ClasspathEntryLifecycleListener source,
- final IJavaElement affectedElement, final Type type,
- final IResource affectedResource)
- {
- super(source);
- _affectedElement = affectedElement;
- _type = type;
- _affectedResource = affectedResource;
- if (affectedResource != null && !isAffectResourceEvent(type))
- {
- throw new IllegalArgumentException();
- }
- }
-
- @Override
- public ClasspathEntryLifecycleListener getSource()
- {
- return (ClasspathEntryLifecycleListener) super.getSource();
- }
-
- /**
- * @return the type of event.
- */
- public Type getType()
- {
- return _type;
- }
-
- /**
- * @return the affected resource or null if none.
- */
- public IResource getAffectedResource()
- {
- return _affectedResource;
- }
-
- /**
- *
- */
- private static final long serialVersionUID = -2510218872082581659L;
-
- /**
- * @return the element that changed.
- */
- public IJavaElement getAffectedElement()
- {
- return _affectedElement;
- }
-
- /**
- * @param type
- * @return true if the type instance matches one for which
- * affectedResource's are valid in the change event.
- */
- public boolean isAffectResourceEvent(final Type type)
- {
- return type == Type.REMOVED_DELTA;
- }
-
- @Override
- public String toString()
- {
- return String.format(
- "ClasspathLifecycleEvent: IJavaElement=%s, Res = %s, Event=%s", //$NON-NLS-1$
- getAffectedElement(), getAffectedResource(), getType());
- }
-
-
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/resource/IJarLocator.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/resource/IJarLocator.java
deleted file mode 100644
index 34629f9..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/resource/IJarLocator.java
+++ /dev/null
@@ -1,116 +0,0 @@
-package org.eclipse.jst.jsf.common.internal.resource;
-
-import java.util.Collection;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jst.jsf.common.internal.locator.ILocator;
-import org.eclipse.jst.jsf.common.internal.locator.ILocatorChangeListener;
-import org.eclipse.jst.jsf.common.internal.locator.ILocatorChangeListener.LocatorChangeEvent;
-
-/**
- * Provider of jars for use by the locator. Exists to abstract the locator from
- * JDT for test purposes.
- *
- */
-public interface IJarLocator extends
- ILocator<Collection<? extends ClasspathJarFile>, IProject, String>
-{
- /**
- * @param project
- * @return a list of valid jar files.
- */
- Collection<? extends ClasspathJarFile> getJars(final IProject project);
-
- /**
- * @param listener
- */
- void addListener(final JarChangeListener listener);
-
- /**
- * @param listener
- */
- void removeListener(final JarChangeListener listener);
-
- /**
- * Disposes the provider.
- */
- void dispose();
-
- /**
- * Implemented by classes that want receive events signalling a change on
- * the classpath.
- *
- */
- public abstract class JarChangeListener implements ILocatorChangeListener
- {
- /**
- * @param event
- */
- public abstract void changed(JarChangeEvent event);
-
- public final void changed(final LocatorChangeEvent event)
- {
- changed((JarChangeEvent) event);
- }
- }
-
- /**
- * Indicates a change on the class path.
- *
- */
- public class JarChangeEvent extends LocatorChangeEvent
- {
- /**
- * Indicates the type of event
- *
- */
- public enum Type
- {
- /**
- * Indicates a jar has been added.
- */
- JAR_ADDED,
- /**
- * Indicates a jar has been removed.
- */
- JAR_REMOVED;
- }
-
- private final Type _type;
- private final ClasspathJarFile _jar;
-
- /**
- * @param source
- * @param type
- * @param jar
- */
- public JarChangeEvent(final ILocator source, final Type type,
- final ClasspathJarFile jar)
- {
- super(source);
- _type = type;
- _jar = jar;
- }
-
- /**
- * @return the type of the event
- */
- public Type getType()
- {
- return _type;
- }
-
- /**
- * @return the affected jar.
- */
- public ClasspathJarFile getJar()
- {
- return _jar;
- }
-
- /**
- *
- */
- private static final long serialVersionUID = 8163703453414731319L;
- }
-}
\ No newline at end of file
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/resource/ILifecycleListener.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/resource/ILifecycleListener.java
deleted file mode 100644
index 93acba8..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/resource/ILifecycleListener.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package org.eclipse.jst.jsf.common.internal.resource;
-
-import java.util.EventObject;
-
-/**
- * @author cbateman
- *
- * @param <EVENTTYPE>
- */
-public interface ILifecycleListener<EVENTTYPE extends EventObject>
-{
- /**
- * Listener accepts the resource lifecycle event
- *
- * @param event
- * @return the result of accepting the event
- */
- EventResult acceptEvent(EVENTTYPE event);
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/resource/IResourceLifecycleListener.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/resource/IResourceLifecycleListener.java
deleted file mode 100644
index 2306d59..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/resource/IResourceLifecycleListener.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2008 Oracle Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Oracle Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.common.internal.resource;
-
-
-/**
- * Listener can register for events ona particular LifecycleListener
- *
- * @author cbateman
- *
- */
-public interface IResourceLifecycleListener extends ILifecycleListener<ResourceLifecycleEvent>
-{
- /**
- * Listener accepts the classpath lifecycle event
- *
- * @param event
- */
- EventResult acceptEvent(ResourceLifecycleEvent event);
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/resource/ImmutableLifecycleListener.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/resource/ImmutableLifecycleListener.java
deleted file mode 100644
index f544216..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/resource/ImmutableLifecycleListener.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2008 Oracle Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Oracle Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.common.internal.resource;
-
-
-/**
- * A lifecycle listener abstraction that cannot have its resources modified.
- * Clients may only register and deregister for events.
- *
- * @author cbateman
- * @param <LISTENERTYPE>
- *
- */
-public abstract class ImmutableLifecycleListener<LISTENERTYPE extends ILifecycleListener>
-{
-
- /**
- * Adds listener to the list of objects registered to receive
- * lifecycle events for this resource. Only adds the listener
- * if it is not already in the list.
- *
- * Method is thread-safe and may block the caller
- *
- * Throws {@link IllegalStateException} if isDisposed() == true
- *
- * @param listener
- */
- public abstract void addListener(final LISTENERTYPE listener);
-
- /**
- * Removes listener from the list of registered listeners
- *
- * Method is thread-safe and may block the caller
- *
- * Throws {@link IllegalStateException} if isDisposed() == true
- *
- * @param listener
- */
- public abstract void removeListener(final LISTENERTYPE listener);
-}
\ No newline at end of file
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/resource/JavaCoreMediator.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/resource/JavaCoreMediator.java
deleted file mode 100644
index 7f84c3f..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/resource/JavaCoreMediator.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package org.eclipse.jst.jsf.common.internal.resource;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jdt.core.IElementChangedListener;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.JavaCore;
-
-/**
- * Implements pass-through methods to the static JavaCore class. This allows us
- * to decouple from JavaCore for testing and other dep-injection purposes.
- *
- * @author cbateman
- *
- */
-public class JavaCoreMediator
-{
- /**
- * @param project
- * @return a java project for project. Return null if project is null.
- */
- public IJavaProject create(final IProject project)
- {
- return JavaCore.create(project);
- }
-
- /**
- * @param listener
- */
- public void addElementChangedListener(final IElementChangedListener listener)
- {
- JavaCore.addElementChangedListener(listener);
- }
-
- /**
- * @param listener
- */
- public void removeElementChangeListener(
- final ClasspathEntryLifecycleListener listener)
- {
- JavaCore.removeElementChangedListener(listener);
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/resource/LifecycleListener.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/resource/LifecycleListener.java
deleted file mode 100644
index 3aee0de..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/resource/LifecycleListener.java
+++ /dev/null
@@ -1,381 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2008 Oracle Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Oracle Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.common.internal.resource;
-
-import java.util.List;
-
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IResourceChangeEvent;
-import org.eclipse.core.resources.IResourceChangeListener;
-import org.eclipse.core.resources.IResourceDelta;
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.jst.jsf.common.internal.ITestTracker;
-import org.eclipse.jst.jsf.common.internal.ITestTracker.Event;
-import org.eclipse.jst.jsf.common.internal.resource.ResourceLifecycleEvent.EventType;
-import org.eclipse.jst.jsf.common.internal.resource.ResourceLifecycleEvent.ReasonType;
-
-/**
- * Listens to resource changes and fires lifecycle events
- *
- * @author cbateman
- *
- */
-public class LifecycleListener extends
- AbstractLifecycleListener<ResourceLifecycleEvent, IResourceLifecycleListener, IResource>
- implements IResourceChangeListener
-{
- private static boolean ENABLE_TEST_TRACKING = false;
- private static long _seqId;
- private ITestTracker _testTracker; // ==
- final IWorkspace _workspace;
-
- // null;
- // initialized
- // by
- // setter
- // injection
- /**
- * Initialize an inactive lifecycle listener. A workspace listener will not
- * be installed by this constructor. The object created using this
- * constructor will not fire any events until addResource is called at least
- * once to add a target resource
- *
- * @param workspace
- * the workspace to listen to for changes.
- * @throws NullPointerException
- * if workspace is null.
- */
- public LifecycleListener(final IWorkspace workspace)
- {
- super();
- if (workspace == null)
- {
- throw new NullPointerException(CANNOT_ADD_NULL_RESOURCE);
- }
- _workspace = workspace;
- }
-
- /**
- * Create a new lifecycle listener for the res
- *
- * @param res
- * @param workspace
- * the workspace to listen to for changes.
- * @throws NullPointerException
- * if res or workspace is null.
- */
- public LifecycleListener(final IResource res, final IWorkspace workspace)
- {
- this(workspace);
- if (res == null)
- {
- throw new NullPointerException(CANNOT_ADD_NULL_RESOURCE);
- }
- addResource(res);
- }
-
- /**
- * @param resources
- * @param workspace
- * the workspace to listen to for changes.
- * @throws NullPointerException
- * if resources, a member of resources or workspace is null.
- */
- public LifecycleListener(final List<IResource> resources,
- final IWorkspace workspace)
- {
- this(workspace);
- for (final IResource resource : resources)
- {
- if (resource != null)
- {
- addResource(resource);
- } else
- {
- throw new NullPointerException(CANNOT_ADD_NULL_RESOURCE);
- }
- }
- }
-
- @Override
- protected void addSystemChangeListener()
- {
- _workspace.addResourceChangeListener(this);
- }
-
- @Override
- protected void removeSystemChangeListener()
- {
- _workspace.removeResourceChangeListener(this);
- }
-
- /**
- * @param testTracker
- */
- public final void setTestTracker(final ITestTracker testTracker)
- {
- _testTracker = testTracker;
- }
-
- /**
- * @param newValue
- */
- protected final void setEnableTracing(final boolean newValue)
- {
- ENABLE_TEST_TRACKING = newValue;
- }
-
- /**
- * @param res
- * a resource you want to receive events for. MUST NOT BE NULL.
- * @throw {@link NullPointerException} if res is null
- */
- public void addResource(final IResource res)
- {
- addLifecycleObject(res);
- }
-
- public void resourceChanged(final IResourceChangeEvent event)
- {
- final long seqId = _seqId++;
- if (_testTracker != null && ENABLE_TEST_TRACKING)
- {
- _testTracker.fireEvent(Event.START_TRACKING, seqId,
- "trackMethod_resourceChanged"); //$NON-NLS-1$
- }
- assert (!isDisposed());
- switch (event.getType())
- {
- case IResourceChangeEvent.PRE_CLOSE:
- {
- final IProject proj = (IProject) event.getResource();
- // must use iterator to ensure copy on write behaviour
- for (final IResource res : getLifecycleObjects())
- {
- if (proj == res || proj == res.getProject())
- {
- fireLifecycleEvent(new ResourceLifecycleEvent(this,
- res, EventType.RESOURCE_INACCESSIBLE,
- ReasonType.RESOURCE_PROJECT_CLOSED));
- }
- }
- }
- break;
- case IResourceChangeEvent.PRE_DELETE:
- {
- final IProject proj = (IProject) event.getResource();
- // must use iterator to ensure copy on write behaviour
- for (final IResource res : getLifecycleObjects())
- {
- // if the resource being tracked is the resource being
- // deleted,
- // then fire a resource delete event
- if (proj == res)
- {
- fireLifecycleEvent(new ResourceLifecycleEvent(this,
- res, EventType.RESOURCE_INACCESSIBLE,
- ReasonType.RESOURCE_DELETED));
- }
- // if the resource being tracked is a resource in the
- // project being
- // deleted, then fire a project deleted event
- else if (proj == res.getProject())
- {
- fireLifecycleEvent(new ResourceLifecycleEvent(this,
- res, EventType.RESOURCE_INACCESSIBLE,
- ReasonType.RESOURCE_PROJECT_DELETED));
- }
- }
- }
- break;
- case IResourceChangeEvent.POST_CHANGE:
- {
- for (final IResource res : getLifecycleObjects())
- {
- IResourceDelta delta = event.getDelta();
- // only care about post change events to resources
- // that we are tracking
- if (delta != null)
- {
- delta = delta.findMember(res.getFullPath());
- if (delta != null)
- {
- visit(delta);
- }
- }
- }
- }
- break;
- default:
- // do nothing
- // we only handle these three
- }
- if (ENABLE_TEST_TRACKING && _testTracker != null)
- {
- _testTracker.fireEvent(Event.STOP_TRACKING, seqId,
- "trackMethod_resourceChanged"); //$NON-NLS-1$
- }
- }
-
- private void visit(final IResourceDelta delta)
- {
- assert (!isDisposed());
- final IResource res = delta.getResource();
- // the wkspace root is a special case since even though
- // it is registered as the target resource, we are interested
- // in new projects created in the root
- if (res.getType() == IResource.ROOT)
- {
- handleWorkspaceRoot(delta);
- } else if (res instanceof IContainer)
- {
- handleContainer(delta, res);
- } else
- {
- handleFile(delta, res);
- }
- }
-
- private void handleContainer(final IResourceDelta delta, IResource container)
- {
- handleChange(delta, container, container);
- for (final IResourceDelta childDelta : delta.getAffectedChildren())
- {
- if (childDelta.getResource().getType() == IResource.FILE
- || childDelta.getResource().getType() == IResource.FOLDER)
- {
- handleChange(childDelta, childDelta.getResource(), container);
- }
- }
- }
-
- private void handleFile(final IResourceDelta delta, final IResource res)
- {
- switch (delta.getKind())
- {
- case IResourceDelta.ADDED:
- case IResourceDelta.REMOVED:
- {
- handleChange(delta, res, res);
- }
- break;
- case IResourceDelta.CHANGED:
- {
- // the contents of the file have changed
- if ((delta.getFlags() & IResourceDelta.CONTENT) != 0)
- {
- fireLifecycleEvent(new ResourceLifecycleEvent(this, res,
- EventType.RESOURCE_CHANGED,
- ReasonType.RESOURCE_CHANGED_CONTENTS));
- }
- }
- break;
- }
- }
-
- private void handleChange(final IResourceDelta delta, final IResource res,
- final IResource interestedResource)
- {
- switch (delta.getKind())
- {
- case IResourceDelta.ADDED:
- {
- handleAdd(delta, res, interestedResource);
- }
- break;
- case IResourceDelta.REMOVED:
- {
- handleRemove(delta, res, interestedResource);
- }
- break;
- }
- }
-
- private void handleRemove(final IResourceDelta delta, final IResource res,
- final IResource interestedResource)
- {
- if ((delta.getFlags() & IResourceDelta.MOVED_TO) != 0)
- {
- if (res.equals(interestedResource))
- {
- fireLifecycleEvent(new ResourceLifecycleEvent(this, res,
- EventType.RESOURCE_INACCESSIBLE,
- ReasonType.RESOURCE_MOVED));
- } else if (res.getParent().equals(interestedResource))
- {
- fireLifecycleEvent(new ResourceLifecycleEvent(this, res,
- EventType.RESOURCE_INACCESSIBLE,
- ReasonType.RESOURCE_MOVED_CONTAINER));
- }
- } else
- {
- if (res.equals(interestedResource))
- {
- fireLifecycleEvent(new ResourceLifecycleEvent(this, res,
- EventType.RESOURCE_INACCESSIBLE,
- ReasonType.RESOURCE_DELETED));
- } else if (res.getParent().equals(interestedResource))
- {
- fireLifecycleEvent(new ResourceLifecycleEvent(this, res,
- EventType.RESOURCE_INACCESSIBLE,
- ReasonType.RESOURCE_DELETED_FROM_CONTAINER));
- }
- }
- }
-
- private void handleAdd(final IResourceDelta delta, final IResource res,
- final IResource interestedResource)
- {
- if ((delta.getFlags() & IResourceDelta.MOVED_FROM) != 0)
- {
- if (res.equals(interestedResource))
- {
- fireLifecycleEvent(new ResourceLifecycleEvent(this, res,
- EventType.RESOURCE_ADDED, ReasonType.RESOURCE_MOVED));
- } else if (res.getParent().equals(interestedResource))
- {
- fireLifecycleEvent(new ResourceLifecycleEvent(this, res,
- EventType.RESOURCE_ADDED,
- ReasonType.RESOURCE_MOVED_CONTAINER));
- }
- } else
- {
- if (res.equals(interestedResource))
- {
- fireLifecycleEvent(new ResourceLifecycleEvent(this, res,
- EventType.RESOURCE_ADDED, ReasonType.RESOURCE_ADDED));
- } else if (res.getParent().equals(interestedResource))
- {
- fireLifecycleEvent(new ResourceLifecycleEvent(this, res,
- EventType.RESOURCE_ADDED,
- ReasonType.RESOURCE_ADDED_TO_CONTAINER));
- }
- }
- }
-
- private void handleWorkspaceRoot(final IResourceDelta delta)
- {
- for (final IResourceDelta childDelta : delta
- .getAffectedChildren(IResourceDelta.ADDED|IResourceDelta.CHANGED))
- {
- final IResource res = childDelta.getResource();
- if ((childDelta.getFlags() & IResourceDelta.OPEN) != 0 &&
- // project was just opened
- res.getType() == IResource.PROJECT)
- {
- fireLifecycleEvent(new ResourceLifecycleEvent(this, res,
- EventType.RESOURCE_ADDED, ReasonType.PROJECT_OPENED));
- }
- }
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/resource/ResourceLifecycleEvent.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/resource/ResourceLifecycleEvent.java
deleted file mode 100644
index 15ac306..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/resource/ResourceLifecycleEvent.java
+++ /dev/null
@@ -1,167 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2008 Oracle Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Oracle Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.common.internal.resource;
-
-import java.util.EventObject;
-
-import org.eclipse.core.resources.IResource;
-
-/**
- * @author cbateman
- *
- */
-public class ResourceLifecycleEvent extends EventObject
-{
- /**
- *
- */
- private static final long serialVersionUID = -8692801944833729L;
-
- /**
- * the type of lifecycle event this enum is not closed and may add new
- * fields in the future
- */
- public enum EventType
- {
- /**
- * Indicates that the resource is no longer accessible (as testable with
- * IResource.isAccessible). The reasonType will indicate why.
- */
- RESOURCE_INACCESSIBLE,
-
- /**
- * Indicates that the resource being tracked has changed in some way,
- * use ReasonType to determine specifics
- */
- RESOURCE_CHANGED,
-
- /**
- * Indicates that the resource being tracked hass been added. Use
- * ReasonType to determine specifics.
- */
- RESOURCE_ADDED;
- }
-
- /**
- * encodes the cause of the event if the event type provides one this enum
- * is not closed and may add new fields in the future
- */
- public enum ReasonType
- {
- /**
- * The resource was deleted from the workspace, this event is pre change
- * if the event is project and post change otherwise
- */
- RESOURCE_DELETED,
- /**
- * The resource was delete from it's container. This fired when the
- * PARENT of the resource being deleted is registered for lifecycle
- * events (i.e. _affectedResource.getParent() == registeredResource)
- */
- RESOURCE_DELETED_FROM_CONTAINER,
- /**
- * The resource's project was deleted. This event is pre-change. Note
- * that if the tracked resource is a project, RESOURCE_DELETED will be
- * fired, not this event.
- */
- RESOURCE_PROJECT_DELETED,
- /**
- * The resource's project was closed. This event is pre-change
- */
- RESOURCE_PROJECT_CLOSED,
- /**
- * Occurs when the contents of a non-project resource has changed
- */
- RESOURCE_CHANGED_CONTENTS,
- /**
- * Occurs when a project resource is added
- */
- PROJECT_OPENED,
- /**
- * Occurs when a non-project resource is added to a container. This is
- * fired if the resource being added was in the list of resources
- * registered for lifecycle events (i.e. _affectedResource ==
- * registeredResource).
- */
- RESOURCE_ADDED,
- /**
- * Occurs when a non-project resource is added to a container. This is
- * fired if the PARENT of the resource being added was in the resources
- * registered for lifecycle events (i.e. _affectedResource.getParent() =
- * registeredResource)
- */
- RESOURCE_ADDED_TO_CONTAINER,
- /**
- * Occurs when a resource has becomes added or inaccessible due to a
- * move operation. This event is fired when the resource being moved is
- * the one of interest.
- */
- RESOURCE_MOVED,
- /**
- * Occurs when a resource has becomes added or inaccessible due to a
- * move operation. This event is fired when the PARENT of resource being
- * moved is the one of interest.
- */
- RESOURCE_MOVED_CONTAINER
- }
-
- private final IResource _affectedResource;
- private final EventType _eventType;
- private final ReasonType _reasonType;
-
- /**
- * @param source
- * @param affectedResource
- * @param eventType
- * @param reasonType
- */
- public ResourceLifecycleEvent(final LifecycleListener source,
- final IResource affectedResource,
- final EventType eventType, final ReasonType reasonType)
- {
- super(source);
- _affectedResource = affectedResource;
- _eventType = eventType;
- _reasonType = reasonType;
- }
-
- /**
- * @return the affected resource
- */
- public IResource getAffectedResource()
- {
- return _affectedResource;
- }
-
- /**
- * @return the event that has occurred
- */
- public EventType getEventType()
- {
- return _eventType;
- }
-
- /**
- * @return the cause of the event
- */
- public ReasonType getReasonType()
- {
- return _reasonType;
- }
-
- @Override
- public String toString()
- {
- return String.format(
- "ResourceLifecycleEvent: Res = %s, Event=%s, Reason=%s", //$NON-NLS-1$
- getAffectedResource(), getEventType(), getReasonType());
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/resource/ResourceManager.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/resource/ResourceManager.java
deleted file mode 100644
index 2ecedd4..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/resource/ResourceManager.java
+++ /dev/null
@@ -1,63 +0,0 @@
-package org.eclipse.jst.jsf.common.internal.resource;
-
-import java.util.List;
-
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IWorkspace;
-
-/**
- * A resource singleton object manager that manages singletons that are aware
- * of the the resources they are singletons for.
- *
- * @author cbateman
- * @param <RESTYPE>
- *
- */
-public abstract class ResourceManager<RESTYPE extends IResource> extends
- ResourceSingletonObjectManager<ResourceTracker<RESTYPE>, IResource>
-{
- /**
- * @param workspace
- */
- public ResourceManager(IWorkspace workspace)
- {
- super(workspace);
- }
-
- public void dispose()
- {
- super.dispose();
- }
-
- /**
- * @param listener
- */
- public void addListener(final IResourceLifecycleListener listener)
- {
- super.addLifecycleEventListener(listener);
- }
-
- /**
- * @param listener
- */
- public void removeListener(final IResourceLifecycleListener listener)
- {
- super.removeLifecycleEventListener(listener);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.jsf.common.internal.resource.ResourceSingletonObjectManager#createNewInstance(org.eclipse.core.resources.IResource)
- */
- protected abstract ResourceTracker<RESTYPE> createNewInstance(final IResource resource);
-
- /**
- * Initialize any state about the current resources we are managing.
- */
- public abstract void initResources();
-
- /**
- * @return the current list of resources being managed.
- */
- public abstract List<RESTYPE> getResources();
-
-}
\ No newline at end of file
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/resource/ResourceSingletonObjectManager.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/resource/ResourceSingletonObjectManager.java
deleted file mode 100644
index 749abbf..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/resource/ResourceSingletonObjectManager.java
+++ /dev/null
@@ -1,388 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2008 Oracle Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Oracle Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.common.internal.resource;
-
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.jst.jsf.common.internal.managedobject.IManagedObject;
-import org.eclipse.jst.jsf.common.internal.managedobject.ObjectManager;
-import org.eclipse.jst.jsf.common.internal.resource.ResourceLifecycleEvent.EventType;
-import org.eclipse.jst.jsf.common.internal.resource.ResourceLifecycleEvent.ReasonType;
-
-/**
- * An object manager that manages a single instanceof an IManagedObject per
- * resource. The manager takes care of ensuring that a managed object is
- * properly disposed when a resource lifecycle event renders it inaccessible
- * (i.e file is deleted, project is closed or delete).
- *
- * @author cbateman
- *
- * @param <RESOURCE>
- * @param <MANAGEDOBJECT>
- */
-public abstract class ResourceSingletonObjectManager<MANAGEDOBJECT extends IManagedObject, RESOURCE extends IResource>
- extends ObjectManager<MANAGEDOBJECT, RESOURCE>
-{
- // lazily initialized
- private LifecycleListener _lifecycleListener;
- final Map<RESOURCE, ManagedResourceObject<MANAGEDOBJECT>> _perResourceObjects;
- private final IWorkspace _workspace;
-
- /**
- * Default constructor
- * @param workspace
- */
- protected ResourceSingletonObjectManager(final IWorkspace workspace)
- {
- _workspace = workspace;
- _perResourceObjects = new HashMap<RESOURCE, ManagedResourceObject<MANAGEDOBJECT>>();
- }
-
- /**
- * @return the workspace
- */
- protected final IWorkspace getWorkspace()
- {
- return _workspace;
- }
-
-
- /**
- * @return an unmodifiable view on the map of currently managed objects keyed
- * by the resource they are mapped to.
- */
- protected final Map<RESOURCE, ManagedResourceObject<MANAGEDOBJECT>> getPerResourceObjects()
- {
- return Collections.unmodifiableMap(_perResourceObjects);
- }
-
- @Override
- public final MANAGEDOBJECT getInstance(final RESOURCE key)
- throws ManagedObjectException
- {
- assertNotDisposed();
- synchronized(this)
- {
- runBeforeGetInstance(key);
- ManagedResourceObject managedResObject = _perResourceObjects.get(key);
-
- if (managedResObject == null)
- {
- final MANAGEDOBJECT managedObject = createNewInstance(key);
-
- if (managedObject == null)
- {
- throw new ManagedObjectException(
- "No object available for resource"); //$NON-NLS-1$
- }
- managedResObject = manageResource(key, managedObject);
- }
-
- runAfterGetInstance(key);
- return (MANAGEDOBJECT) managedResObject.getManagedObject();
- }
- }
-
- /**
- * @param resource
- * @return a new instance of T associated with S. This operation must not
- * cache T: a brand new instance is always required. getInstance
- * will perform caching and resource listening.
- */
- protected abstract MANAGEDOBJECT createNewInstance(RESOURCE resource);
-
- /**
- * @param resource
- */
- protected void runBeforeGetInstance(final RESOURCE resource)
- {
- // do nothing by default
- }
-
- /**
- * @param resource
- */
- protected void runAfterGetInstance(final RESOURCE resource)
- {
- // do nothing by default
- }
-
- /**
- * @param resource
- * @return true if there already exists a managed object associated with
- * the resource
- */
- public synchronized boolean isInstance(RESOURCE resource)
- {
- assertNotDisposed();
- return _perResourceObjects.containsKey(resource);
- }
-
- /**
- * @return a copy of the current set of RESOURCE object keys that we
- * are managing singletons for. Collection is mutable, but as a copy,
- * changes to it do not effect thie object manager.
- */
- public synchronized Collection<RESOURCE> getManagedResources()
- {
- assertNotDisposed();
- return new HashSet(_perResourceObjects.keySet());
- }
- /**
- * Should be called by concrete classes to indicate they have created a new
- * managed object for resource, for which they want to track lifecycle
- * changes.
- *
- * @param resource
- * @param managedObject
- */
- private synchronized ManagedResourceObject manageResource(final RESOURCE resource,
- final MANAGEDOBJECT managedObject)
- {
- final LifecycleListener listener = lazilyGetLifecycleListener();
- listener.addResource(resource);
- final MyLifecycleEventListener<RESOURCE, MANAGEDOBJECT> eventListener =
- new MyLifecycleEventListener<RESOURCE, MANAGEDOBJECT>(
- this, managedObject, resource);
- listener.addListener(eventListener);
-
- final ManagedResourceObject<MANAGEDOBJECT> managedResourceObject = new ManagedResourceObject<MANAGEDOBJECT>(
- managedObject, eventListener);
- _perResourceObjects.put(resource, managedResourceObject);
- return managedResourceObject;
- }
-
- /**
- * Stop managing the resource. If resource is the last one, the resource
- * change listener will be removed (it will be added again when next
- * manageResource is called).
- *
- * @param resource
- * @return the managed object that has just be disassociated from the resource.
- * The object is not disposed, destroyed or checkpointed before being returned.
- */
- protected final synchronized MANAGEDOBJECT unmanageResource(final RESOURCE resource)
- {
- final ManagedResourceObject managedResourceObject =
- _perResourceObjects.remove(resource);
- final LifecycleListener listener = lazilyGetLifecycleListener();
-
- if (managedResourceObject != null)
- {
- listener.removeListener(managedResourceObject.getEventListener());
- }
-
- listener.removeResource(resource);
- return (MANAGEDOBJECT) managedResourceObject.getManagedObject();
- }
-
- /**
- * Call to register a listener
- *
- * @param listener
- */
- protected final void addLifecycleEventListener(
- final IResourceLifecycleListener listener)
- {
- assertNotDisposed();
- final LifecycleListener lifecycleListener = lazilyGetLifecycleListener();
- lifecycleListener.addListener(listener);
- }
-
- /**
- * Call to remove a listener
- *
- * @param listener
- */
- protected final void removeLifecycleEventListener(
- final IResourceLifecycleListener listener)
- {
- final LifecycleListener lifecycleListener = lazilyGetLifecycleListener();
- lifecycleListener.removeListener(listener);
- }
-
- /**
- * Add additional resources to the set to listen to.
- *
- * @param res
- */
- protected final void addResource(final IResource res)
- {
- final LifecycleListener lifecycleListener = lazilyGetLifecycleListener();
- lifecycleListener.addResource(res);
- }
-
- /**
- * Remove a resource that is being listened to. Must not be used to remove
- * internally added resources (i.e. only use this if you called addResource(res).
- *
- * @param res
- */
- protected final void removeResource(final IResource res)
- {
- synchronized(this)
- {
- if (_perResourceObjects.keySet().contains(res))
- {
- throw new IllegalArgumentException("Can't remove managed resources with this method"); //$NON-NLS-1$
- }
- }
- final LifecycleListener lifecycleListener = lazilyGetLifecycleListener();
- lifecycleListener.removeResource(res);
- }
-
- private synchronized LifecycleListener lazilyGetLifecycleListener()
- {
- if (_lifecycleListener == null)
- {
- _lifecycleListener = new LifecycleListener(_workspace);
- }
- return _lifecycleListener;
- }
-
- /**
- * @author cbateman
- *
- * @param <MANAGEDOBJECT>
- */
- protected final static class ManagedResourceObject<MANAGEDOBJECT extends IManagedObject>
- {
- private final MANAGEDOBJECT _managedObject;
- private final MyLifecycleEventListener _eventListener;
-
- private ManagedResourceObject(final MANAGEDOBJECT managedObject,
- final MyLifecycleEventListener eventListener)
- {
- _managedObject = managedObject;
- _eventListener = eventListener;
- }
-
- /**
- * @return the managed object
- */
- public MANAGEDOBJECT getManagedObject()
- {
- return _managedObject;
- }
-
- /**
- * @return the event listener
- */
- public MyLifecycleEventListener getEventListener()
- {
- return _eventListener;
- }
- }
-
- private static class MyLifecycleEventListener<RESOURCE extends IResource, MANAGEDOBJECT extends IManagedObject> implements
- IResourceLifecycleListener
- {
- private final RESOURCE _resource;
- private final MANAGEDOBJECT _managedObject;
- private final ResourceSingletonObjectManager<MANAGEDOBJECT, RESOURCE> _target;
-
- private MyLifecycleEventListener(final ResourceSingletonObjectManager<MANAGEDOBJECT, RESOURCE> target,
- final MANAGEDOBJECT managedObject,
- final RESOURCE resource)
- {
- _resource = resource;
- _managedObject = managedObject;
- _target = target;
- }
-
- public EventResult acceptEvent(final ResourceLifecycleEvent event)
- {
- final EventResult result = EventResult.getDefaultEventResult();
-
- // not interested
- if (!_resource.equals(event.getAffectedResource()))
- {
- return EventResult.getDefaultEventResult();
- }
-
- if (event.getEventType() == EventType.RESOURCE_INACCESSIBLE)
- {
- try
- {
- if (event.getReasonType() == ReasonType.RESOURCE_DELETED
- || event.getReasonType() == ReasonType.RESOURCE_PROJECT_DELETED)
- {
- _managedObject.destroy();
- }
- else
- {
- _managedObject.dispose();
- }
- }
- // dispose/destroy is external code out our control, so make sure
- // unmanage gets called if it blows up.
- finally
- {
- _target.unmanageResource(_resource);
- }
- }
- return result;
- }
- }
-
-
- /**
- * Unmanages all resources and calls checkpoint and dispose on all managed
- * objects. After this call, other methods my throw exception is called.
- *
- * Sub-class may override, but should always call dispose after disposing
- * their own specialized state.
- */
- @Override
- public void dispose()
- {
- if (_isDisposed.compareAndSet(false, true))
- {
- // TODO: implement a better lock strategy on resource manager
- synchronized (this)
- {
- Map<RESOURCE, ManagedResourceObject<MANAGEDOBJECT>> copy = new HashMap<RESOURCE, ManagedResourceObject<MANAGEDOBJECT>>(
- getPerResourceObjects());
-
- for (Map.Entry<RESOURCE, ManagedResourceObject<MANAGEDOBJECT>> entry : copy.entrySet())
- {
- RESOURCE res = entry.getKey();
- MANAGEDOBJECT unmanagedResource = unmanageResource(res);
- unmanagedResource.checkpoint();
- unmanagedResource.dispose();
- }
- _perResourceObjects.clear();
- if (_lifecycleListener != null)
- {
- _lifecycleListener.dispose();
- }
- }
- }
- }
-
- @Override
- public void destroy()
- {
- // do nothing by default
- }
-
- @Override
- public void checkpoint()
- {
- // do nothing by default
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/resource/ResourceTracker.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/resource/ResourceTracker.java
deleted file mode 100644
index 8f431dd..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/resource/ResourceTracker.java
+++ /dev/null
@@ -1,129 +0,0 @@
-package org.eclipse.jst.jsf.common.internal.resource;
-
-import java.util.concurrent.atomic.AtomicLong;
-
-import org.eclipse.core.resources.IResource;
-import org.eclipse.jst.jsf.common.internal.managedobject.AbstractManagedObject;
-import org.eclipse.jst.jsf.common.internal.resource.ResourceLifecycleEvent.EventType;
-import org.eclipse.jst.jsf.common.internal.resource.ResourceLifecycleEvent.ReasonType;
-
-/**
- * A managed object that tracks changes to a resource.
- *
- * @author cbateman
- * @param <RESTYPE>
- *
- */
-public abstract class ResourceTracker<RESTYPE extends IResource> extends
- AbstractManagedObject implements IResourceLifecycleListener
-{
- private final RESTYPE _resource;
- private final AtomicLong _lastModifiedStamp = new AtomicLong();
-
- /**
- * @param resource
- */
- public ResourceTracker(final RESTYPE resource)
- {
- super();
- _resource = resource;
- _lastModifiedStamp.set(resource.getModificationStamp());
- }
-
- /**
- * @return the resource that is being tracked
- */
- public final RESTYPE getResource()
- {
- return _resource;
- }
-
- /**
- * @return the last modificatino stamp stored for the resource.
- */
- public final long getLastModifiedStamp()
- {
- return _lastModifiedStamp.get();
- }
-
- public EventResult acceptEvent(final ResourceLifecycleEvent event)
- {
- if (!isInteresting(event))
- {
- return EventResult.getDefaultEventResult();
- }
-
- final EventType eventType = event.getEventType();
-
- final ReasonType reasonType = event.getReasonType();
- switch (eventType)
- {
- case RESOURCE_ADDED:
- // added resources kick an add event.
- fireResourceAdded(event.getAffectedResource(), reasonType);
- break;
- case RESOURCE_CHANGED:
- // changed resources kick a change event
- fireResourceChanged(event.getAffectedResource(), reasonType);
- break;
- case RESOURCE_INACCESSIBLE:
- // removed resources kick a remove event
- fireResourceInAccessible(event.getAffectedResource(), reasonType);
- break;
- }
-
- return EventResult.getDefaultEventResult();
- }
-
- /**
- * @param event
- * @return true if this event is interesting
- */
- protected boolean isInteresting(final ResourceLifecycleEvent event)
- {
- return _resource.equals(event.getAffectedResource());
- }
-
- /**
- * @param affectedResource
- * @param reasonType
- */
- protected abstract void fireResourceInAccessible(IResource affectedResource, ReasonType reasonType);
-
- /**
- * @param affectedResource
- * @param reasonType
- */
- protected abstract void fireResourceChanged(IResource affectedResource, ReasonType reasonType);
-
- /**
- * Note that this may fire for both the new resource and it's parent
- * container if both are registered by the lifecycle event. Check reasonType
- * to ensure you getting the event you want: i.e. RESOURCE_ADDED vs.
- * RESOURCE_ADDED_TO_CONTAINER
- *
- * @param affectedResource
- * @param reasonType
- */
- protected abstract void fireResourceAdded(IResource affectedResource,
- ReasonType reasonType);
-
- @Override
- public void dispose()
- {
- super.dispose();
- }
-
- @Override
- public void checkpoint()
- {
- // nothing currently persisted
- }
-
- @Override
- public void destroy()
- {
- // nothing currently persisted
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/resource/WorkspaceMediator.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/resource/WorkspaceMediator.java
deleted file mode 100644
index 7e87047..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/resource/WorkspaceMediator.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package org.eclipse.jst.jsf.common.internal.resource;
-
-import org.eclipse.core.resources.IWorkspaceRunnable;
-import org.eclipse.core.resources.WorkspaceJob;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-
-/**
- * Mediates between a client and certain workspace interface. This is allows
- * us to decouple from the IWorkspace interface, especially for testing.
- *
- * @author cbateman
- *
- */
-public class WorkspaceMediator
-{
- /**
- * @param runnable
- * @param name
- */
- public void runInWorkspaceJob(final IWorkspaceRunnable runnable, final String name)
- {
- new WorkspaceJob(name)
- {
- @Override
- public IStatus runInWorkspace(IProgressMonitor monitor)
- throws CoreException
- {
- runnable.run(monitor);
- return Status.OK_STATUS;
- }
-
- }.schedule();
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/strategy/AbstractIdentifiableStrategy.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/strategy/AbstractIdentifiableStrategy.java
deleted file mode 100644
index 0de9778..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/strategy/AbstractIdentifiableStrategy.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package org.eclipse.jst.jsf.common.internal.strategy;
-
-/**
- * Abstract base implementation for identifiable strategies.
- *
- * @author cbateman
- *
- * @param <INPUT>
- * @param <OUTPUT>
- * @param <IDTYPE>
- */
-public abstract class AbstractIdentifiableStrategy<INPUT, OUTPUT, IDTYPE> implements
- IIdentifiableStrategy<INPUT, OUTPUT, IDTYPE>
-{
- private final IDTYPE _id;
- private final OUTPUT _noResultValue;
- private final String _displayName;
-
- /**
- * @param id
- * @param displayName
- * @param noResultValue
- */
- public AbstractIdentifiableStrategy(final IDTYPE id, final String displayName,
- final OUTPUT noResultValue)
- {
- _id = id;
- _noResultValue = noResultValue;
- _displayName = displayName;
- }
-
- public abstract OUTPUT perform(INPUT input) throws Exception;
-
- public OUTPUT getNoResult()
- {
- return _noResultValue;
- }
-
- public IDTYPE getId()
- {
- return _id;
- }
-
- public String getDisplayName()
- {
- return _displayName;
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/strategy/AbstractTestableExtensibleDefaultProviderSelectionStrategy.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/strategy/AbstractTestableExtensibleDefaultProviderSelectionStrategy.java
deleted file mode 100644
index 028da97..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/strategy/AbstractTestableExtensibleDefaultProviderSelectionStrategy.java
+++ /dev/null
@@ -1,114 +0,0 @@
-package org.eclipse.jst.jsf.common.internal.strategy;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.jst.jsf.common.internal.policy.IdentifierOrderedIteratorPolicy;
-
-/**
- * Will select in order the testable, then extension-point, then default strategies.
- * <p>
- * Users should use addTestableStrategy(), addExtensionStrategy(), and addDefaultStrategy() and <b>NOT</b> addStrategy()
- * <p>
- * Users must supply a defaultStrategy at minimum;
- * <p>
- * @param <INPUT>
- * @param <OUTPUT>
- */
-public abstract class AbstractTestableExtensibleDefaultProviderSelectionStrategy<INPUT, OUTPUT>
- extends
- IteratorPolicyBasedStrategyComposite<INPUT, OUTPUT, OUTPUT, String, IIdentifiableStrategy<INPUT, OUTPUT, String>> {
-
- private static final String TEST_STRATEGY_ID = "testInjection"; //$NON-NLS-1$
- /**
- * LocatorProviderStrategy id for extension-pt
- */
- private static final String EXT_PT_STRATEGY_ID = "extensionPointInjection"; //$NON-NLS-1$
- /**
- * LocatorProviderStrategy id for platform default
- */
- private static final String DEFAULT_STRATEGY_ID = "platformDefault"; //$NON-NLS-1$
-
- /**
- * Contructor
- */
- protected AbstractTestableExtensibleDefaultProviderSelectionStrategy() {
- super(new MyIteratorPolicy());
- }
-
- @Override
- public OUTPUT getNoResult() {
- return null;
- }
-
- /**
- * @param testStrategy
- */
- public void addTestableStrategy(final ISimpleStrategy<INPUT, OUTPUT> testStrategy) {
- super.addStrategy(new IdententifiableStrategyWrapper(testStrategy, TEST_STRATEGY_ID));
- }
-
- /**
- * @param extensionStrategy
- */
- public void addExtensionStrategy(final ISimpleStrategy<INPUT, OUTPUT> extensionStrategy) {
- super.addStrategy(new IdententifiableStrategyWrapper(extensionStrategy, EXT_PT_STRATEGY_ID));
- }
-
- /**
- * @param defaultStrategy
- */
- public void addDefaultStrategy(final ISimpleStrategy<INPUT, OUTPUT> defaultStrategy) {
- super.addStrategy(new IdententifiableStrategyWrapper(defaultStrategy, DEFAULT_STRATEGY_ID));
- }
-
- private class IdententifiableStrategyWrapper<INPUT, OUTPUT, String> implements IIdentifiableStrategy<INPUT, OUTPUT, String> {
-
- private ISimpleStrategy<INPUT, OUTPUT> _innerStrategy;
- private String _id;
-
- IdententifiableStrategyWrapper(final ISimpleStrategy<INPUT, OUTPUT> innerStrategy, final String id) {
- _innerStrategy = innerStrategy;
- _id = id;
- }
-
- public OUTPUT perform(INPUT input) throws Exception {
- return _innerStrategy.perform(input);
- }
-
- public OUTPUT getNoResult() {
- return null;
- }
-
- public String getId() {
- return _id;
- }
-
- public java.lang.String getDisplayName() {
- return null;
- }
-
- }
- private static class MyIteratorPolicy extends
- IdentifierOrderedIteratorPolicy<String> {
-
- private static List<String> _selectionOrder;
-
- static {
- _selectionOrder = new ArrayList<String>();
- _selectionOrder
- .add(TEST_STRATEGY_ID);
- _selectionOrder
- .add(EXT_PT_STRATEGY_ID);
- _selectionOrder
- .add(DEFAULT_STRATEGY_ID);
- }
-
- public MyIteratorPolicy() {
- super(_selectionOrder);
- setExcludeNonExplicitValues(true);
- }
-
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/strategy/IIdentifiableStrategy.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/strategy/IIdentifiableStrategy.java
deleted file mode 100644
index 94cf53d..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/strategy/IIdentifiableStrategy.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2008 Oracle Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Oracle Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.common.internal.strategy;
-
-import org.eclipse.jst.jsf.common.internal.policy.IIdentifiable;
-
-
-/**
- * A simple strategy that is identifiable
- *
- * @author cbateman
- *
- * @param <INPUT>
- * @param <OUTPUT>
- * @param <IDTYPE>
- */
-public interface IIdentifiableStrategy<INPUT, OUTPUT, IDTYPE>
- extends ISimpleStrategy<INPUT, OUTPUT>, IIdentifiable<IDTYPE>
-{
- // nothing added.
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/strategy/ISimpleStrategy.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/strategy/ISimpleStrategy.java
deleted file mode 100644
index 787a310..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/strategy/ISimpleStrategy.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2008 Oracle Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Oracle Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.common.internal.strategy;
-
-/**
- * A strategy that takes an INPUT, performs a calculation on it, and returns
- * an OUTPUT
- * @author cbateman
- *
- * @param <INPUT>
- * @param <OUTPUT>
- */
-public interface ISimpleStrategy<INPUT, OUTPUT>
-{
- /**
- * Perform the algorithm on input and return OUTPUT. This type of
- * operation should avoid side-effects, but may throw exceptions.
- *
- * @param input
- * @return the result of the strategy algorithm
- * @throws Exception implementers should narrow what exceptions are thrown.
- */
- public OUTPUT perform(INPUT input) throws Exception;
-
- /**
- * @return the single value that perform will return if it cannot calculate
- * a meaningful result for an input. The value must be unique, the same
- * for all inputs and must be testable using the '==' operator.
- */
- public OUTPUT getNoResult();
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/strategy/IteratorPolicyBasedStrategyComposite.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/strategy/IteratorPolicyBasedStrategyComposite.java
deleted file mode 100644
index ff59abb..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/strategy/IteratorPolicyBasedStrategyComposite.java
+++ /dev/null
@@ -1,168 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2008 Oracle Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Oracle Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.common.internal.strategy;
-
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.LinkedHashMap;
-import java.util.Map;
-
-import org.eclipse.jst.jsf.common.JSFCommonPlugin;
-import org.eclipse.jst.jsf.common.internal.policy.IIteratorPolicy;
-
-/**
- * A strategy composite that uses an iterator policy to provide the iterator
- * used to decide what order to execute the strategy in.
- *
- * This composite represents a grouping of strategies which represent N ways
- * to perform a particular calculation and which any number for those N ways
- * may be applicable to any particular situation given the policy in place.
- *
- * By default, the first such strategy in policy order to provide the calculation
- * wins and it's result is returned. You can modify the way the result is composed
- * by providing your own composition strategy using the two-arg constructor.
- *
- *
- *
- * @author cbateman
- *
- * @param <INPUT>
- * @param <OUTPUT>
- * @param <RESULTTYPE>
- * @param <IDTYPE>
- * @param <STRATEGYTYPE>
- */
-public abstract class IteratorPolicyBasedStrategyComposite<INPUT, OUTPUT, RESULTTYPE, IDTYPE, STRATEGYTYPE extends IIdentifiableStrategy<INPUT, OUTPUT, IDTYPE>>
- extends StrategyComposite<INPUT, OUTPUT, RESULTTYPE, IDTYPE, STRATEGYTYPE>
-{
- private final Map<IDTYPE, STRATEGYTYPE> _strategies;
- private IIteratorPolicy<IDTYPE> _policy;
- private final Object _changeLock = new Object();
-
- /**
- * @param policy
- */
- protected IteratorPolicyBasedStrategyComposite(final IIteratorPolicy<IDTYPE> policy)
- {
- super();
- _policy = policy;
- _strategies = new LinkedHashMap<IDTYPE, STRATEGYTYPE>();
- }
-
- /**
- * @param policy
- * @param compositionStrategy
- */
- protected IteratorPolicyBasedStrategyComposite(final IIteratorPolicy<IDTYPE> policy, AbstractCompositionStrategy<INPUT, OUTPUT, RESULTTYPE, STRATEGYTYPE> compositionStrategy)
- {
- super(compositionStrategy);
- _policy = policy;
- _strategies = new LinkedHashMap<IDTYPE, STRATEGYTYPE>();
- }
-
- /**
- * Add strategy if not already present.
- *
- * @param strategy
- */
- public final void addStrategy(final STRATEGYTYPE strategy)
- {
- synchronized(_changeLock)
- {
- _strategies.put(strategy.getId(), strategy);
- }
- }
-
- /**
- * @param strategy
- */
- public final void removeStrategy(final STRATEGYTYPE strategy)
- {
- synchronized(_changeLock)
- {
- _strategies.remove(strategy.getId());
- }
- }
-
- /**
- * Change the active policy used to select the order in which the composite
- * calls it's child strategies.
- *
- * If the policy is not set, then strategies are called in
- *
- * @param policy
- */
- public final void setPolicy(final IIteratorPolicy<IDTYPE> policy)
- {
- // policy may not be null
- if (policy == null)
- {
- JSFCommonPlugin.log(new Exception("stack trace only"), "Policy can't be null"); //$NON-NLS-1$ //$NON-NLS-2$
- return;
- }
-
- // protect access in case getIterator is being called simulataneously
- synchronized(_changeLock)
- {
- _policy = policy;
- }
- }
-
- @Override
- public final Iterator<STRATEGYTYPE> getIterator()
- {
- IIteratorPolicy<IDTYPE> policy = null;
- Map<IDTYPE, STRATEGYTYPE> strategies = Collections.emptyMap();
-
- synchronized(_changeLock)
- {
- policy = _policy;
- strategies = Collections.unmodifiableMap(new HashMap<IDTYPE, STRATEGYTYPE>(_strategies));
- }
-
- final Iterator<IDTYPE> iterator = policy.getIterator(strategies.keySet());
- return new StrategyIterator<IDTYPE, STRATEGYTYPE>(strategies, iterator);
- }
-
- @Override
- public abstract RESULTTYPE getNoResult();
-
- private static class StrategyIterator<IDTYPE, STRATEGYTYPE> implements
- Iterator<STRATEGYTYPE>
- {
- private final Map<IDTYPE, STRATEGYTYPE> _map;
- private final Iterator<IDTYPE> _policyIterator;
-
- private StrategyIterator(final Map<IDTYPE, STRATEGYTYPE> map,
- final Iterator<IDTYPE> policyIterator)
- {
- _map = map;
- _policyIterator = policyIterator;
- }
-
- public boolean hasNext()
- {
- return _policyIterator.hasNext();
- }
-
- public STRATEGYTYPE next()
- {
- IDTYPE id = _policyIterator.next();
- return _map.get(id);
- }
-
- public void remove()
- {
- throw new UnsupportedOperationException();
- }
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/strategy/MergingCompositionStrategy.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/strategy/MergingCompositionStrategy.java
deleted file mode 100644
index 4e8cb42..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/strategy/MergingCompositionStrategy.java
+++ /dev/null
@@ -1,213 +0,0 @@
-package org.eclipse.jst.jsf.common.internal.strategy;
-
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import org.eclipse.jst.jsf.common.internal.strategy.StrategyComposite.AbstractCompositionStrategy;
-import org.eclipse.jst.jsf.common.internal.strategy.StrategyComposite.CompositionArguments;
-
-/**
- * A composition strategy that merges the result of all composed strategies. The
- * merge policy is left to concrete implementations. Three concrete impls are
- * provided: one that uses compose all (List) and one that uses compose unique
- * (Set) and a third that uses Map.
- *
- * @author cbateman
- *
- * @param <INPUT>
- * @param <MERGETYPE>
- * @param <STRATEGY>
- */
-/**
- * @author cbateman
- *
- * @param <INPUT>
- * @param <OUTPUT>
- * @param <MERGETYPE>
- * @param <STRATEGY>
- */
-public abstract class MergingCompositionStrategy<INPUT, OUTPUT, MERGETYPE, STRATEGY extends ISimpleStrategy<INPUT, OUTPUT>>
-extends AbstractCompositionStrategy<INPUT, OUTPUT, MERGETYPE, STRATEGY>
-{
- /**
- * The result of the merge.
- */
- protected final MERGETYPE _composedResult;
-
- /**
- * @param composedResult
- * @param noResultValue
- */
- public MergingCompositionStrategy(final MERGETYPE composedResult,
- final MERGETYPE noResultValue)
- {
- super();
- _composedResult = composedResult;
- }
-
- @Override
- public boolean compose(final CompositionArguments<INPUT, OUTPUT, STRATEGY> args)
- throws Exception
- {
- final OUTPUT result = args.getStrategy().perform(args.getInput());
- if (result != args.getStrategy().getNoResult())
- {
- doCompose(result);
- }
- // never stop composing early
- return false;
- }
-
- /**
- * Sub-classes must implement to do the detail composition for their result
- * type.
- *
- * @param result
- */
- protected abstract void doCompose(OUTPUT result);
-
- @Override
- public MERGETYPE getComposedResult()
- {
- return _composedResult;
- }
-
- @Override
- public abstract void reset();
-
- /**
- * An implementation that uses a List to implement the list policy. The
- * result is to add all results from all composed strategies to a single
- * list. Duplicates may occur.
- *
- * @param <INPUT>
- * @param <OUTPUT>
- * @param <MERGETYPE>
- * @param <STRATEGY>
- * `
- */
- public static class ListMergingCompositionStrategy<INPUT, OUTPUT, MERGETYPE extends List, STRATEGY extends ISimpleStrategy<INPUT, OUTPUT>>
- extends
- MergingCompositionStrategy<INPUT, OUTPUT, MERGETYPE, STRATEGY>
- {
- /**
- * @param composedResult
- * @param noResultValue
- */
- public ListMergingCompositionStrategy(final MERGETYPE composedResult,
- final MERGETYPE noResultValue)
- {
- super(composedResult, noResultValue);
- }
-
- @Override
- protected void doCompose(final OUTPUT result)
- {
- if (result instanceof Collection)
- {
- _composedResult.addAll((Collection) result);
- } else
- {
- _composedResult.add(result);
- }
- }
-
- @Override
- public void reset()
- {
- _composedResult.clear();
- }
- }
-
- /**
- * An implementation that uses a List to implement the list policy. The
- * result is to add all results from all composed strategies to a single
- * list. Duplicates will not occur.
- *
- * @param <INPUT>
- * @param <OUTPUT>
- * @param <MERGETYPE>
- * @param <STRATEGY>
- */
- public static class SetMergingCompositionStrategy<INPUT, OUTPUT, MERGETYPE extends Set, STRATEGY extends ISimpleStrategy<INPUT, OUTPUT>>
- extends
- MergingCompositionStrategy<INPUT, OUTPUT, MERGETYPE, STRATEGY>
- {
- /**
- * @param composedResult
- * @param noResultValue
- */
- public SetMergingCompositionStrategy(final MERGETYPE composedResult,
- final MERGETYPE noResultValue)
- {
- super(composedResult, noResultValue);
- }
-
- @Override
- protected void doCompose(final OUTPUT result)
- {
- if (result instanceof Collection)
- {
- _composedResult.addAll((Collection) result);
- } else
- {
- _composedResult.add(result);
- }
- }
-
- @Override
- public void reset()
- {
- _composedResult.clear();
- }
- }
-
- /**
- * @author cbateman
- *
- * @param <INPUT>
- * @param <OUTPUT>
- * @param <MERGETYPE>
- * @param <STRATEGY>
- */
- public abstract static class MapMergingCompositionStrategy<INPUT, OUTPUT, MERGETYPE extends Map, STRATEGY extends ISimpleStrategy<INPUT, OUTPUT>>
- extends
- MergingCompositionStrategy<INPUT, OUTPUT, MERGETYPE, STRATEGY>
- {
- /**
- * @param composedResult
- * @param noResultValue
- */
- public MapMergingCompositionStrategy(final MERGETYPE composedResult,
- final MERGETYPE noResultValue)
- {
- super(composedResult, noResultValue);
- }
-
- @Override
- protected void doCompose(final OUTPUT result)
- {
- if (result instanceof Map)
- {
- _composedResult.putAll((Map) result);
- } else
- {
- _composedResult.put(calculateKey(result), result);
- }
- }
-
- /**
- * @param result
- * @return the key to be used for result in any composed map.
- */
- protected abstract Object calculateKey(final OUTPUT result);
-
- @Override
- public void reset()
- {
- _composedResult.clear();
- }
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/strategy/SimpleStrategyComposite.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/strategy/SimpleStrategyComposite.java
deleted file mode 100644
index 25c567a..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/strategy/SimpleStrategyComposite.java
+++ /dev/null
@@ -1,83 +0,0 @@
-package org.eclipse.jst.jsf.common.internal.strategy;
-
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Iterator;
-
-/**
- * A simple concrete implementation that uses a constructor provided values
- * to implement abstract methods.
- *
- * @author cbateman
- *
- * @param <INPUT>
- * @param <OUTPUT>
- * @param <RESULTTYPE>
- * @param <IDTYPE>
- * @param <STRATEGYTYPE>
- */
-public class SimpleStrategyComposite<INPUT, OUTPUT, RESULTTYPE, IDTYPE, STRATEGYTYPE extends IIdentifiableStrategy<INPUT,OUTPUT,IDTYPE>> extends
-StrategyComposite<INPUT, OUTPUT, RESULTTYPE, IDTYPE, STRATEGYTYPE>
-{
-
- private final RESULTTYPE _noResultValue;
- private final Collection<STRATEGYTYPE> _strategies;
-
- /**
- * Use the list of strategies and null as the no result value.
- * @param strategies
- */
- public SimpleStrategyComposite(final Collection<STRATEGYTYPE> strategies)
- {
- this(strategies, (RESULTTYPE) null);
- }
- /**
- * Use the list of strategies and the provided no result value.
- * @param strategies
- * @param noResultValue
- */
- public SimpleStrategyComposite(final Collection<STRATEGYTYPE> strategies, final RESULTTYPE noResultValue)
- {
- super();
- _strategies = strategies;
- _noResultValue = noResultValue;
- }
-
- /**
- * Use the provided strategies, composition strategy and null for the no result value
- * @param strategies
- * @param compositionStrategy
- */
- public SimpleStrategyComposite(final Collection<STRATEGYTYPE> strategies,
- final AbstractCompositionStrategy<INPUT, OUTPUT, RESULTTYPE, STRATEGYTYPE> compositionStrategy)
- {
- this(strategies, null, compositionStrategy);
- }
-
- /**
- * Use the provided strategies, composition strategy and null for the no result value
- * @param strategies
- * @param noResultValue
- * @param compositionStrategy
- */
- public SimpleStrategyComposite(final Collection<STRATEGYTYPE> strategies, final RESULTTYPE noResultValue,
- final AbstractCompositionStrategy<INPUT, OUTPUT, RESULTTYPE, STRATEGYTYPE> compositionStrategy)
- {
- super(compositionStrategy);
- _strategies = strategies;
- _noResultValue = noResultValue;
- }
-
- @Override
- public RESULTTYPE getNoResult()
- {
- return _noResultValue;
- }
-
- @Override
- public Iterator<STRATEGYTYPE> getIterator()
- {
- return Collections.unmodifiableCollection(_strategies).iterator();
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/strategy/StrategyComposite.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/strategy/StrategyComposite.java
deleted file mode 100644
index c7842c0..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/strategy/StrategyComposite.java
+++ /dev/null
@@ -1,240 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2008 Oracle Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Oracle Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.common.internal.strategy;
-
-import java.util.Iterator;
-
-import org.eclipse.jst.jsf.common.JSFCommonPlugin;
-
-/**
- * A composite strategy whos role is to iterate through a number of child
- * stategies until one returns a valid value for an input.
- *
- * @author cbateman
- *
- * @param <INPUT>
- * @param <OUTPUT>
- * @param <RESULTOUTPUT>
- * @param <IDTYPE>
- * @param <STRATEGYTYPE>
- */
-public abstract class StrategyComposite<INPUT, OUTPUT, RESULTOUTPUT, IDTYPE, STRATEGYTYPE extends IIdentifiableStrategy<INPUT, OUTPUT, IDTYPE>>
-implements ISimpleStrategy<INPUT, RESULTOUTPUT>
-{
- private final AbstractCompositionStrategy<INPUT, OUTPUT, RESULTOUTPUT, STRATEGYTYPE> _compositionStrategy;
-
- /**
- * @param compositionStrategy
- */
- protected StrategyComposite(
- final AbstractCompositionStrategy<INPUT, OUTPUT, RESULTOUTPUT, STRATEGYTYPE> compositionStrategy)
- {
- _compositionStrategy = compositionStrategy;
- }
-
- /**
- * Default constructor: composite returns the first value found.
- */
- protected StrategyComposite()
- {
- // by default, the composition strategy selects the first value
- this(
- new DefaultCompositionStrategy<INPUT, OUTPUT, RESULTOUTPUT, STRATEGYTYPE>());
- }
-
- public final RESULTOUTPUT perform(final INPUT input)
- {
- final Iterator<STRATEGYTYPE> sIt = getIterator();
-
- RESULTOUTPUT result = getNoResult();
- boolean finishedComposing = false;
-
- EXECUTE_LOOP: while (sIt.hasNext())
- {
- final STRATEGYTYPE strategy = sIt.next();
- try
- {
- finishedComposing = _compositionStrategy
- .compose(new CompositionArguments<INPUT, OUTPUT, STRATEGYTYPE>(
- strategy, input));
- // returns true if we are done composing
- if (finishedComposing)
- {
- result = _compositionStrategy.getComposedResult();
- break EXECUTE_LOOP;
- }
- } catch (final Exception e)
- {
- JSFCommonPlugin.log(e);
- }
- }
-
- if (finishedComposing)
- {
- return result;
- }
- return getNoResult();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see
- * org.eclipse.jst.jsf.common.internal.strategy.ISimpleStrategy#getNoResult
- * ()
- */
- public abstract RESULTOUTPUT getNoResult();
-
- /**
- * @return an iterator that will return the next strategy to be executed
- */
- public abstract Iterator<STRATEGYTYPE> getIterator();
-
- /**
- * @author cbateman
- * @param <INPUT>
- * @param <OUTPUT>
- * @param <RESULTOUTPUT>
- * @param <STRATEGY>
- */
- public abstract static class AbstractCompositionStrategy<INPUT, OUTPUT, RESULTOUTPUT, STRATEGY extends ISimpleStrategy<INPUT, OUTPUT>>
- implements ISimpleStrategy<CompositionArguments<INPUT, OUTPUT, STRATEGY>, Boolean>
- {
- private final Boolean _noResultValue;
-
- /**
- *
- */
- protected AbstractCompositionStrategy()
- {
- _noResultValue = null;
- reset();
- }
-
- /**
- * @param input
- * @return true if composing is finished based on the input, false
- * otherwise
- * @throws Exception
- */
- public abstract boolean compose(CompositionArguments<INPUT, OUTPUT, STRATEGY> input) throws Exception;
-
- @SuppressWarnings("boxing")
- public final Boolean perform(final CompositionArguments<INPUT, OUTPUT, STRATEGY> input) throws Exception
- {
- return compose(input);
- }
-
- /**
- * @return the result of composing.
- */
- public abstract RESULTOUTPUT getComposedResult();
-
- public Boolean getNoResult()
- {
- return _noResultValue;
- }
-
- /**
- * Clear any composed result and make strategy reusable as if it were
- * newly constructed. This method is only called automatically at construction.
- *
- * Owners should call to control the contents of their result list.
- */
- public abstract void reset();
- }
-
- /**
- * The default composition strategy. This causes the first strategy that returns
- * a non-NoResult value to have it's value returned.
- *
- * @param <INPUT>
- * @param <OUTPUT>
- * @param <RESULTOUTPUT>
- * @param <STRATEGY>
- */
- public final static class DefaultCompositionStrategy<INPUT, OUTPUT, RESULTOUTPUT, STRATEGY extends ISimpleStrategy<INPUT, OUTPUT>>
- extends AbstractCompositionStrategy<INPUT, OUTPUT, RESULTOUTPUT, STRATEGY>
- {
- private RESULTOUTPUT _result;
-
- /**
- *
- */
- public DefaultCompositionStrategy()
- {
- super();
- }
-
- @Override
- public boolean compose(final CompositionArguments<INPUT, OUTPUT, STRATEGY> arg) throws Exception
- {
- final OUTPUT result = arg.getStrategy().perform(arg.getInput());
- if (result != arg.getStrategy().getNoResult())
- {
- _result = (RESULTOUTPUT)result;
- return true;
- }
- return false;
- }
-
- @Override
- public RESULTOUTPUT getComposedResult()
- {
- return _result;
- }
-
- @Override
- public void reset()
- {
- _result = null;
- }
- }
-
- /**
- * Bundle values needed by the composing strategies into a single arg object.
- *
- * @param <INPUT>
- * @param <OUTPUT>
- * @param <STRATEGY>
- */
- public final static class CompositionArguments<INPUT, OUTPUT, STRATEGY extends ISimpleStrategy<INPUT, OUTPUT>>
- {
- private final STRATEGY _strategy;
- private final INPUT _input;
-
- /**
- * @param strategy
- * @param input
- */
- public CompositionArguments(final STRATEGY strategy, final INPUT input)
- {
- _strategy = strategy;
- _input = input;
- }
-
- /**
- * @return the strategy
- */
- public STRATEGY getStrategy()
- {
- return _strategy;
- }
-
- /**
- * @return the input
- */
- public INPUT getInput()
- {
- return _input;
- }
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/strategy/TestableProjectFactoryStrategy.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/strategy/TestableProjectFactoryStrategy.java
deleted file mode 100644
index 7028bf7..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/strategy/TestableProjectFactoryStrategy.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package org.eclipse.jst.jsf.common.internal.strategy;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.QualifiedName;
-
-
-/**
- * Abstract class that, when given a project session key,
- * will provide the instance of OUTPUT to use, or no result
- * <p>
- * Users need only set the project session property with the key and OUTPUT instance
- * @param <OUTPUT>
- */
-public abstract class TestableProjectFactoryStrategy<OUTPUT> implements ISimpleStrategy<IProject, OUTPUT> {
- private QualifiedName _key;
-
- /**
- * @param testableFactorySessionKey - project property session key for property value holding testable instance
- */
- public TestableProjectFactoryStrategy(final QualifiedName testableFactorySessionKey) {
- _key = testableFactorySessionKey;
- }
-
- public OUTPUT perform(final IProject project) throws Exception {
- if (_key != null && project != null) {
- final Object factory = project.getSessionProperties().get(_key);
- if (factory != null)
- return (OUTPUT)factory;
- }
- return getNoResult();
- }
-
- public OUTPUT getNoResult() {
- return null;
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/strategy/TestableResourceFactoryStrategy.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/strategy/TestableResourceFactoryStrategy.java
deleted file mode 100644
index c935e01..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/strategy/TestableResourceFactoryStrategy.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package org.eclipse.jst.jsf.common.internal.strategy;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.QualifiedName;
-
-
-/**
- * Copy of {@link TestableProjectFactoryStrategy} except that this can accept IResources
- *
- * An abstract class that, when given a project resource and a project session key,
- * will provide the instance of OUTPUT to use, or,
- * no result will be returned if the resource is not a project.
- * <p>
- * Users need only set the project session property with the key and OUTPUT instance
- * @param <OUTPUT>
- */
-public abstract class TestableResourceFactoryStrategy<OUTPUT> implements ISimpleStrategy<IResource, OUTPUT> {
- private QualifiedName _key;
-
- /**
- * @param testableFactorySessionKey - project property session key for property value holding testable instance
- */
- public TestableResourceFactoryStrategy(final QualifiedName testableFactorySessionKey) {
- _key = testableFactorySessionKey;
- }
-
- public OUTPUT perform(final IResource resource) throws Exception {
- if (_key != null && resource != null) {
- if (resource instanceof IProject) {
- final Object factory = ((IProject)resource).getSessionProperties().get(_key);
- if (factory != null)
- return (OUTPUT)factory;
- }
- }
- return getNoResult();
- }
-
- public OUTPUT getNoResult() {
- return null;
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/types/BooleanLiteralType.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/types/BooleanLiteralType.java
deleted file mode 100644
index 6055e5f..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/types/BooleanLiteralType.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Oracle 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:
- * Cameron Bateman/Oracle - initial API and implementation
- *
- ********************************************************************************/
-
-package org.eclipse.jst.jsf.common.internal.types;
-
-import org.eclipse.jdt.core.Signature;
-
-/**
- * Represents a BooleanLiteral as defined by JSP.2.9
- *
- * @author cbateman
- *
- */
-public class BooleanLiteralType extends LiteralType
-{
- /**
- * The literal FALSE singleton
- */
- public final static BooleanLiteralType FALSE = new BooleanLiteralType(false);
- /**
- * The literal TRUE singleton
- */
- public final static BooleanLiteralType TRUE = new BooleanLiteralType(true);
-
- private final boolean _literalValue;
-
-
- /**
- * @param value
- * @return a constant boolean literal type corresponding to value
- */
- public static BooleanLiteralType valueOf(boolean value)
- {
- return value ? TRUE : FALSE;
- }
-
- /**
- * @param literalValue
- */
- /*package*/BooleanLiteralType(boolean literalValue)
- {
- super(Signature.SIG_BOOLEAN);
- _literalValue = literalValue;
- }
-
- public Number coerceToNumber(Class T) throws TypeCoercionException
- {
- // illegal to coerce boolean to number per JSP.2.8.3 step 3
- throw new TypeCoercionException("Cannot coerce boolean to number"); //$NON-NLS-1$
- }
-
- public String getLiteralValue()
- {
- return Boolean.toString(_literalValue);
- }
-
- public Object getLiteralValueRaw()
- {
- return Boolean.valueOf(_literalValue);
- }
-
- public Boolean coerceToBoolean() throws TypeCoercionException
- {
- return Boolean.valueOf(_literalValue);
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/types/CompositeType.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/types/CompositeType.java
deleted file mode 100644
index 9069f05..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/types/CompositeType.java
+++ /dev/null
@@ -1,172 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Oracle 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:
- * Cameron Bateman/Oracle - initial API and implementation
- *
- ********************************************************************************/
-
-package org.eclipse.jst.jsf.common.internal.types;
-
-import org.eclipse.jdt.core.Signature;
-
-
-/**
- * Encapsulates the runtime type or types of a JSF entity in a
- * way that can be compared to other entities
- *
- * @author cbateman
- *
- */
-public class CompositeType
-{
- private final String[] _signatures;
- private final int _assignmentType;
-
- private boolean[] _isTypeSignature; // = null lazily derived from signatures
- // on first access
- /**
- * @param signatureStrings
- * @param assignmentType
- */
- public CompositeType(String[] signatureStrings, int assignmentType)
- {
- if (signatureStrings == null
- || signatureStrings.length < 1)
- {
- throw new AssertionError("Must specify at least one signature string"); //$NON-NLS-1$
- }
-
- _signatures = new String[signatureStrings.length];
- System.arraycopy(signatureStrings, 0, _signatures, 0, _signatures.length);
- _assignmentType = assignmentType;
- }
-
- /**
- * Convenience constructor for most common case where composite only
- * consistes of a single type signature
- *
- * @param signatureString
- * @param assignmentType
- */
- public CompositeType(String signatureString, int assignmentType)
- {
- this(new String[]{signatureString}, assignmentType);
- }
- /**
- * @return the assignment type mask
- */
- public int getAssignmentTypeMask()
- {
- return _assignmentType;
- }
-
- /**
- * @return true if the composite type supports being on the LHS of an
- * assignment
- */
- public boolean isLHS()
- {
- return TypeUtil.matchesLHS(_assignmentType);
- }
-
- /**
- * @return true if the composite type supports being on the RHS of an
- * assignment
- */
- public boolean isRHS()
- {
- return TypeUtil.matchesRHS(_assignmentType);
- }
-
- /**
- * @return an array of booleans. The value in each index of the array
- * is true if the corresponding position _signatures corresponds to a type
- * signature and false if it's a method signature
- */
- public boolean[] getIsTypeSignature()
- {
- return getTypeSignatureFlags();
- }
-
- /**
- * @return the type signatures. Changes to the returned form do not
- * affect the internal values
- */
- public String[] getSignatures()
- {
- final String[] copy = new String[_signatures.length];
- System.arraycopy(_signatures, 0, copy, 0, _signatures.length);
- return copy;
- }
-
- public String toString()
- {
- final StringBuffer stringBuffer = new StringBuffer();
-
- for (int i = 0; i < _signatures.length; i++)
- {
- stringBuffer.append(_signatures[i]);
- stringBuffer.append(" | "); //$NON-NLS-1$
- }
-
- return stringBuffer.toString();
- }
-
- /**
- * @return a version of to string with of the type signatures replaced
- * with their more Javaeseque names
- */
- public String toUserReadableString()
- {
- final StringBuffer stringBuffer = new StringBuffer();
-
- for (int i = 0; i < _signatures.length; i++)
- {
- final String signature = _signatures[i];
-
- if (getTypeSignatureFlags()[i])
- {
- stringBuffer.append(Signature.getSignatureSimpleName(signature));
- }
-
- if (i < _signatures.length -1)
- {
- stringBuffer.append(", "); //$NON-NLS-1$
- }
- }
- return stringBuffer.toString();
- }
-
- private boolean[] getTypeSignatureFlags()
- {
- if (_isTypeSignature == null)
- {
- _isTypeSignature = new boolean[_signatures.length];
-
- for (int i = 0; i < _signatures.length; i++)
- {
- try
- {
- Signature.getTypeSignatureKind(_signatures[i]);
-
- // if an exception wasn't thrown above, then it
- // is some sort of type signature
- _isTypeSignature[i] = true;
- }
- catch (IllegalArgumentException ae)
- {
- // getTypeSignatureKind threw an exception, so
- // this signature is a method
- _isTypeSignature[i] = false;
- }
- }
- }
-
- return _isTypeSignature;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/types/CompositeTypeCoercer.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/types/CompositeTypeCoercer.java
deleted file mode 100644
index 5f2aff4..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/types/CompositeTypeCoercer.java
+++ /dev/null
@@ -1,124 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Oracle 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:
- * Cameron Bateman/Oracle - initial API and implementation
- *
- ********************************************************************************/
-
-package org.eclipse.jst.jsf.common.internal.types;
-
-
-/**
- * Follows type coercion rules codified in section JSP.2.8 of the
- * JSP 2.0 Specification.
- *
- * This class operates on CompositeType's and returns raw
- * Java signatures for the single resulting type coercion.
- *
- * The rules are stretched a little bit since JSP.2.8 defines how to
- * coerce an *instance* A to a type T. But since we have no runtime instances,
- * only their types, we approximate by taking what we know about the type of A
- * and coercing it T as best we can.
- *
- * Also, whereas the spec says to throw errors when coercion is not possible,
- * we have two cases:
- *
- * 1) We can determine definitively that there is no coercion
- * 2) We cannot determine whether there is or isn't a coercion
- *
- * In case 1, we always throw an exception. In case 2, we return null to indicate
- * "indeterminate" result, rather than error.
- *
- * @author cbateman
- *
- */
-public class CompositeTypeCoercer
-{
- /**
- * This method follows JSP.2.8.3 except that rather than returning a specific
- * type that has been coerced to, it determines the most exact possible type
- * that typeOfA can be coerced to, to be number compatible. The caller must
- * decide what do with the return value compared to the type (N in the spec)
- * that they want to coerce to.
- *
- * @param typeOfA
- * @return a new signature for the type of A after being coerced to a Number
- * @throws TypeCoercionException if A can definitively not be coerced to
- * a number
- */
- public static String coerceToNumber(final CompositeType typeOfA)
- throws TypeCoercionException
- {
- String coercedType = null;
- boolean errorDetected = true; // assume error: only false if we
- // find a member of typeOfA that
- // coerces to number
-
- // JSP.2.8.1 -- auto-box primitives
- final CompositeType boxedTypeOfA =
- TypeTransformer.transformBoxPrimitives(typeOfA);
- final boolean[] typesigs = boxedTypeOfA.getIsTypeSignature();
-
- // iterate through all of the signatures that represent types
- // and find at least one that can be coerced to a number
- for (int i = 0; i < typesigs.length; i++)
- {
- if (typesigs[i])
- {
- try
- {
- final String testType =
- TypeCoercer.coerceToNumber(boxedTypeOfA.getSignatures()[i]);
-
- if (testType != null)
- {
- // if we have already found a coercible type, then
- // we need to return null, since we have a conflict that
- // we don't know how to resolve to a type??????
- if (coercedType != null)
- {
- return null;
- }
-
- coercedType = testType;
- }
- errorDetected = false; // we have found a number coercion or indeterminate
- }
- catch (TypeCoercionException tce)
- {
- // do nothing: so far error still detected
- }
- }
- }
-
- // we have three choices:
- // 1: if errorDetected was never cleared, we definitely never found
- // a coerceable type, so throw exception
- if (errorDetected)
- {
- throw new TypeCoercionException();
- }
-
- // otherwise the flag was cleared return what we found
- if (coercedType != null)
- {
- // need to unbox per JSP.2.8.1
- coercedType =
- TypeTransformer.transformUnboxPrimitives(coercedType);
- }
-
- return coercedType;
- }
-
-
-// public static String coerceToBoolean(CompositeType compositeType)
-// {
-//
-// }
-
-}
\ No newline at end of file
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/types/FloatLiteralType.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/types/FloatLiteralType.java
deleted file mode 100644
index 5631b87..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/types/FloatLiteralType.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Oracle 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:
- * Cameron Bateman/Oracle - initial API and implementation
- *
- ********************************************************************************/
-
-package org.eclipse.jst.jsf.common.internal.types;
-
-import java.math.BigDecimal;
-import java.math.BigInteger;
-
-import org.eclipse.jdt.core.Signature;
-
-/**
- * Represents an FloatLiteral as defined by JSP.2.9
- * @author cbateman
- *
- */
-public class FloatLiteralType extends NumericTypeLiteral
-{
- private final double _literalValue;
-
- /**
- * @param literalValue
- */
- public FloatLiteralType(double literalValue)
- {
- // according to the notes to JSP.2.9, bullet 5, float literals are doubles
- super(Signature.SIG_DOUBLE);
- _literalValue = literalValue;
- }
-
- protected Number getBoxedValue()
- {
- return new Double(_literalValue);
- }
-
- public Number coerceToNumber(Class T) throws TypeCoercionException
- {
- if (T == BigInteger.class)
- {
- return new BigDecimal(_literalValue).toBigInteger();
- }
- else if (T == BigDecimal.class)
- {
- return new BigDecimal(_literalValue);
- }
-
- Number commonCoercion = super.coerceToNumber(T);
-
- if (commonCoercion == null)
- {
- throw new IllegalArgumentException("Not a target numeric type: "+T); //$NON-NLS-1$
- }
-
- return commonCoercion;
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/types/IAssignable.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/types/IAssignable.java
deleted file mode 100644
index 8b74dfd..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/types/IAssignable.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Oracle 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:
- * Cameron Bateman/Oracle - initial API and implementation
- *
- ********************************************************************************/
-
-package org.eclipse.jst.jsf.common.internal.types;
-
-/**
- * Defines the lhs/rhs rules for a type
- * @author cbateman
- *
- */
-public interface IAssignable
-{
- /**
- * Type is none: it cannot be assigned to. method binding.
- */
- public static int ASSIGNMENT_TYPE_NONE = 0x0;
- /**
- * Type is lhs: it can be assigned to
- */
- public static int ASSIGNMENT_TYPE_LHS = 0x1;
-
- /**
- * Type is rhs: it can be assigned from
- */
- public static int ASSIGNMENT_TYPE_RHS = 0x2;
-
- /**
- * @return the assigment mask
- */
- public int getAssignability();
-
- /**
- * @return true if ASSIGNMENT_TYPE_LHS is set in getAssignability
- */
- public boolean isLHS();
- /**
- * @return true if ASSIGNMENT_TYPE_RHS is set in getAssignability
- */
- public boolean isRHS();
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/types/IntegerLiteralType.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/types/IntegerLiteralType.java
deleted file mode 100644
index d7a3be8..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/types/IntegerLiteralType.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Oracle 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:
- * Cameron Bateman/Oracle - initial API and implementation
- *
- ********************************************************************************/
-
-package org.eclipse.jst.jsf.common.internal.types;
-
-import java.math.BigDecimal;
-import java.math.BigInteger;
-
-import org.eclipse.jdt.core.Signature;
-
-/**
- * Represents a IntegerLiteral as defined by JSP.2.9
- * @author cbateman
- *
- */
-public class IntegerLiteralType extends NumericTypeLiteral
-{
- /**
- * A singleton for zero literals
- */
- public final static IntegerLiteralType ZERO = new IntegerLiteralType(0);
-
- private final long _literalValue;
-
- /**
- * @param literalValue
- */
- public IntegerLiteralType(long literalValue)
- {
- // according to the notes to JSP.2.9, bullet 4, integer literals are longs
- super(Signature.SIG_LONG);
- _literalValue = literalValue;
- }
-
- protected Number getBoxedValue()
- {
- return Long.valueOf(_literalValue);
- }
-
- /**
- * Per JSP.2.8.3, step 5
- * @see org.eclipse.jst.jsf.common.internal.types.LiteralType#coerceToNumber(java.lang.Class)
- */
- public Number coerceToNumber(Class T) throws TypeCoercionException
- {
- if (T == BigInteger.class)
- {
- return BigInteger.valueOf(_literalValue);
- }
- else if (T == BigDecimal.class)
- {
- return BigDecimal.valueOf(_literalValue);
- }
-
- Number commonCoercion = super.coerceToNumber(T);
-
- if (commonCoercion == null)
- {
- throw new IllegalArgumentException("Not a target numeric type: "+T); //$NON-NLS-1$
- }
-
- return commonCoercion;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/types/LiteralType.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/types/LiteralType.java
deleted file mode 100644
index 3ea6de5..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/types/LiteralType.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Oracle 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:
- * Cameron Bateman/Oracle - initial API and implementation
- *
- ********************************************************************************/
-
-package org.eclipse.jst.jsf.common.internal.types;
-
-
-/**
- * Encodes a type signature and a string that has some literal value based on
- * the type signature. The class represents only a value object -- no attempt
- * is made to assert that the literalValue is really of the type specified.
- *
- * @author cbateman
- *
- */
-public abstract class LiteralType extends ValueType
-{
-
- /**
- * Consider a new literal type
- *
- * @param signature
- */
- protected LiteralType(final String signature)
- {
- super(signature, IAssignable.ASSIGNMENT_TYPE_RHS);
- }
-
- /**
- * @return the literal value string (unparsed)
- */
- public abstract String getLiteralValue();
-
- /**
- * @return the actual untranslated literal value as an object
- */
- public abstract Object getLiteralValueRaw();
-
- /**
- * @return the type signature
- */
- public final String getSignature() {
- return super.getSignature();
- }
-
- /**
- * @return a type signature for the kind of number this literal will coerce
- * into when asked to become a number or null if this cannot be determined
- * @throws TypeCoercionException if this literal has no legal coercion into
- * a number
- */
- public String getNumberCoercion() throws TypeCoercionException
- {
- // always box before coercion
- return
- TypeCoercer.coerceToNumber(
- TypeTransformer.transformBoxPrimitives(getSignature()));
- }
-
- /**
- * @param T
- * @return a Number coercion of the literal's value, null if indeterminate
- * @throws TypeCoercionException if the coercion is illegal
- */
- public abstract Number coerceToNumber(Class T) throws TypeCoercionException;
-
- /**
- * @return a Boolean coercion of the literal's value, null if indeterminate
- * @throws TypeCoercionException if the coercion is illegal
- */
- public abstract Boolean coerceToBoolean() throws TypeCoercionException;
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/types/Messages.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/types/Messages.java
deleted file mode 100644
index b3db7a5..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/types/Messages.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 Oracle 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:
- * Cameron Bateman/Oracle - initial API and implementation
- *
- ********************************************************************************/
-package org.eclipse.jst.jsf.common.internal.types;
-
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-/**
- * Message bundle
- *
- */
-public class Messages {
- private static final String BUNDLE_NAME = "org.eclipse.jst.jsf.common.internal.types.messages"; //$NON-NLS-1$
-
- private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle
- .getBundle(BUNDLE_NAME);
-
- private Messages() {
- // no external construction
- }
-
- /**
- * @param key
- * @return the string for key or !key! if not found
- */
- public static String getString(String key) {
- try {
- return RESOURCE_BUNDLE.getString(key);
- } catch (MissingResourceException e) {
- return '!' + key + '!';
- }
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/types/MethodType.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/types/MethodType.java
deleted file mode 100644
index 38e47b0..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/types/MethodType.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Oracle 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:
- * Cameron Bateman/Oracle - initial API and implementation
- *
- ********************************************************************************/
-
-package org.eclipse.jst.jsf.common.internal.types;
-
-/**
- * Signature type for method bindings in an EL expression
- *
- * @author cbateman
- *
- */
-public class MethodType implements SignatureBasedType
-{
- private final String _methodName;
- private final String _signature;
-
- /**
- * @param methodName
- * @param signature
- */
- public MethodType(final String methodName, final String signature)
- {
- _methodName = methodName;
- _signature = signature;
- }
-
- /**
- * @see org.eclipse.jst.jsf.common.internal.types.SignatureBasedType#getSignature()
- */
- public String getSignature()
- {
- return _signature;
- }
-
- /**
- * @return the method name signature
- */
- public String getMethodName()
- {
- return _methodName;
- }
-
- public CompositeType toCompositeType()
- {
- return new CompositeType(_signature, IAssignable.ASSIGNMENT_TYPE_NONE);
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/types/NullLiteralType.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/types/NullLiteralType.java
deleted file mode 100644
index eeb43e6..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/types/NullLiteralType.java
+++ /dev/null
@@ -1,110 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Oracle 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:
- * Cameron Bateman/Oracle - initial API and implementation
- *
- ********************************************************************************/
-
-package org.eclipse.jst.jsf.common.internal.types;
-
-import java.math.BigDecimal;
-import java.math.BigInteger;
-
-/**
- * Represents a NullLiteralType per JSP.2.9
- *
- * @author cbateman
- *
- */
-public class NullLiteralType extends LiteralType
-{
- /**
- * The singleton null literal
- */
- public final static NullLiteralType SINGLETON = new NullLiteralType();
-
- /**
- * Construct a new null
- */
- private NullLiteralType()
- {
- super(TypeConstants.TYPE_NULL); // use void to indicate null in this situation
- }
-
- /**
- * Per JSP.2.8.5 null is always false
- *
- * @see org.eclipse.jst.jsf.common.internal.types.LiteralType#coerceToBoolean()
- */
- public Boolean coerceToBoolean() throws TypeCoercionException
- {
- return Boolean.FALSE;
- }
-
- /**
- * Per JSP.2.8.3, null is always 0
- *
- * @see org.eclipse.jst.jsf.common.internal.types.LiteralType#coerceToNumber(java.lang.Class)
- */
- public Number coerceToNumber(Class T) throws TypeCoercionException {
- if (T == BigInteger.class)
- {
- return BigInteger.ZERO;
- }
- else if (T == BigDecimal.class)
- {
- return new BigDecimal(0.0);
- }
- else if (T == Double.class || T == Double.TYPE)
- {
- return new Double(0.0);
- }
- else if (T == Float.class || T == Float.TYPE)
- {
- return new Float(0.0);
- }
- else if (T == Long.class || T == Long.TYPE)
- {
- return Long.valueOf(0L);
- }
- else if (T == Integer.class || T == Integer.TYPE)
- {
- return Integer.valueOf(0);
- }
- else if (T == Short.class || T == Short.TYPE)
- {
- return Short.valueOf((short)0);
- }
- else if (T == Byte.class || T == Byte.TYPE)
- {
- return Byte.valueOf((byte)0);
- }
- else
- {
- throw new IllegalArgumentException("Not a target numeric type: "+T); //$NON-NLS-1$
- }
- }
-
- /**
- * Per JSP.2.8.2 null is always an empty string
- * @see org.eclipse.jst.jsf.common.internal.types.LiteralType#getLiteralValue()
- */
- public String getLiteralValue()
- {
- return ""; //$NON-NLS-1$
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.jsf.core.internal.types.LiteralType#getLiteralValueRaw()
- */
- public Object getLiteralValueRaw()
- {
- return null;
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/types/NumericTypeLiteral.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/types/NumericTypeLiteral.java
deleted file mode 100644
index 8b6acbe..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/types/NumericTypeLiteral.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Oracle 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:
- * Cameron Bateman/Oracle - initial API and implementation
- *
- ********************************************************************************/
-
-package org.eclipse.jst.jsf.common.internal.types;
-
-
-/**
- * Common super-type for Float and Integer literals
- * @author cbateman
- *
- */
-public abstract class NumericTypeLiteral extends LiteralType
-{
- /**
- * @param signature
- */
- protected NumericTypeLiteral(String signature)
- {
- super(signature);
- }
-
- /**
- * @return the boxed form of the numeric literal value
- */
- protected abstract Number getBoxedValue();
-
- public Number coerceToNumber(Class T) throws TypeCoercionException
- {
- Number boxedLiteralValue = getBoxedValue();
-
- if (T == Double.class || T == Double.TYPE)
- {
- return new Double(boxedLiteralValue.doubleValue());
- }
- else if (T == Float.class || T == Float.TYPE)
- {
- return new Float(boxedLiteralValue.floatValue());
- }
- else if (T == Long.class || T == Long.TYPE)
- {
- return boxedLiteralValue;
- }
- else if (T == Integer.class || T == Integer.TYPE)
- {
- return Integer.valueOf(boxedLiteralValue.intValue());
- }
- else if (T == Short.class || T == Short.TYPE)
- {
- return Short.valueOf(boxedLiteralValue.shortValue());
- }
- else if (T == Byte.class || T == Byte.TYPE)
- {
- return Byte.valueOf(boxedLiteralValue.byteValue());
- }
- else
- {
- return null;
- }
- }
-
- public String getLiteralValue()
- {
- return getBoxedValue().toString();
- }
-
- public Object getLiteralValueRaw()
- {
- return getBoxedValue();
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.jsf.core.internal.types.LiteralType#coerceToBoolean()
- */
- public Boolean coerceToBoolean() throws TypeCoercionException {
- // JSP.2.8.5 does not provide for number -> boolean coercion
- throw new TypeCoercionException("Cannot coerce number to boolean"); //$NON-NLS-1$
- }
-
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/types/SignatureBasedType.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/types/SignatureBasedType.java
deleted file mode 100644
index 41e2bb4..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/types/SignatureBasedType.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Oracle 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:
- * Cameron Bateman/Oracle - initial API and implementation
- *
- ********************************************************************************/
-
-package org.eclipse.jst.jsf.common.internal.types;
-
-/**
- * Defines a signature-based type. Signatures must conform to the JVM
- * type signature format as defined in the JVM specs and in the JDT Signature
- * class
- *
- * @author cbateman
- *
- */
-public interface SignatureBasedType
-{
- /**
- * @return the signature string
- */
- public String getSignature();
-
- /**
- * @return a version of the this type in CompositeType form
- */
- public CompositeType toCompositeType();
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/types/StringLiteralType.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/types/StringLiteralType.java
deleted file mode 100644
index 2e887fd..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/types/StringLiteralType.java
+++ /dev/null
@@ -1,131 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Oracle 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:
- * Cameron Bateman/Oracle - initial API and implementation
- *
- ********************************************************************************/
-
-package org.eclipse.jst.jsf.common.internal.types;
-
-import java.math.BigDecimal;
-import java.math.BigInteger;
-
-/**
- * Represents a StringLiteral as defined by JSP.2.9
- *
- * @author cbateman
- */
-public class StringLiteralType extends LiteralType
-{
- private final String _literalValue;
-
- /**
- * @param value
- */
- public StringLiteralType(String value)
- {
- super(TypeConstants.TYPE_STRING);
- _literalValue = value;
- }
-
- public Number coerceToNumber(Class T) throws TypeCoercionException
- {
- try
- {
- if (T == BigInteger.class)
- {
- if ("".equals(_literalValue)) //$NON-NLS-1$
- {
- return BigInteger.ZERO;
- }
- return new BigInteger(_literalValue);
- }
- else if (T == BigDecimal.class)
- {
- if ("".equals(_literalValue)) //$NON-NLS-1$
- {
- return new BigDecimal(0.0);
- }
- return new BigDecimal(_literalValue);
- }
- else if (T == Double.class || T == Double.TYPE)
- {
- if ("".equals(_literalValue)) //$NON-NLS-1$
- {
- return new Double(0.0);
- }
-
- return Double.valueOf(_literalValue);
- }
- else if (T == Float.class || T == Float.TYPE)
- {
- if ("".equals(_literalValue)) //$NON-NLS-1$
- {
- return new Float(0.0);
- }
- return Float.valueOf(_literalValue);
- }
- else if (T == Long.class || T == Long.TYPE)
- {
- if ("".equals(_literalValue)) //$NON-NLS-1$
- {
- return Long.valueOf(0L);
- }
- return Long.valueOf(_literalValue);
- }
- else if (T == Integer.class || T == Integer.TYPE)
- {
- if ("".equals(_literalValue)) //$NON-NLS-1$
- {
- return Integer.valueOf(0);
- }
- return Integer.valueOf(_literalValue);
- }
- else if (T == Short.class || T == Short.TYPE)
- {
- if ("".equals(_literalValue)) //$NON-NLS-1$
- {
- return Short.valueOf((short)0);
- }
- return Short.valueOf(_literalValue);
- }
- else if (T == Byte.class || T == Byte.TYPE)
- {
- if ("".equals(_literalValue)) //$NON-NLS-1$
- {
- return Byte.valueOf((byte)0);
- }
- return Byte.valueOf(_literalValue);
- }
- else
- {
- throw new IllegalArgumentException("Not a target numeric type: "+T); //$NON-NLS-1$
- }
- }
- catch (NumberFormatException nfe)
- {
- throw new TypeCoercionException(nfe);
- }
- }
-
- public String getLiteralValue()
- {
- return _literalValue;
- }
-
- public Object getLiteralValueRaw()
- {
- return _literalValue;
- }
-
- public Boolean coerceToBoolean() throws TypeCoercionException
- {
- // JSP.2.8.5
- return Boolean.valueOf(_literalValue);
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/types/TypeCoercer.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/types/TypeCoercer.java
deleted file mode 100644
index fa75a12..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/types/TypeCoercer.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Oracle 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:
- * Cameron Bateman/Oracle - initial API and implementation
- *
- ********************************************************************************/
-
-package org.eclipse.jst.jsf.common.internal.types;
-
-import org.eclipse.jdt.core.Signature;
-
-/**
- * Coercer for simple type signatures
- *
- * @author cbateman
- *
- */
-public class TypeCoercer
-{
-
- /**
- * Based on JSP.2.8.3 in JSP 2.0 specification
- *
- * @param boxedTypeSignature -- an auto-boxed type signature
- * @return the coerced type or null if cannot be resolved. No unboxing
- * is performed on the return.
- * @throws TypeCoercionException if boxedTypeSignature is
- */
- public static String coerceToNumber(final String boxedTypeSignature)
- throws TypeCoercionException
- {
- String boxedTypeSignature_ = boxedTypeSignature;
-
- // can't coerce arrays to numbers
- if (Signature.getTypeSignatureKind(boxedTypeSignature_)
- == Signature.ARRAY_TYPE_SIGNATURE)
- {
- throw new TypeCoercionException("Cannot coerce arrays to numbers"); //$NON-NLS-1$
- }
- // if it's character, pre-coerce to short per step 2
- if (TypeConstants.SIGNATURE_BOXED_CHARACTER.equals(boxedTypeSignature))
- {
- boxedTypeSignature_ = TypeConstants.TYPE_BOXED_SHORT;
- }
-
- if (TypeCoercer.typeIsNumeric(boxedTypeSignature_)
- || TypeCoercer.typeIsNull(boxedTypeSignature_))
- {
- return boxedTypeSignature_;
- }
- else if (typeIsString(boxedTypeSignature_))
- {
- // undetermined a string may or not resolve to a number
- // depending on its runtime value
- return null;
- }
- else
- {
- throw new TypeCoercionException();
- }
- }
-
- /**
- * @param boxedTypeSignature
- * @return true if type can be coerced to boolean; null if indeterminate
- */
- public static boolean canCoerceToBoolean(String boxedTypeSignature)
- {
- // JSP.2.8.5 -- boolean is always boolean; string is converted by Boolean.valueOf(String)
- if (typeIsBoolean(boxedTypeSignature)
- || typeIsString(boxedTypeSignature)
- || typeIsNull(boxedTypeSignature))
- {
- return true;
- }
- // nothing else really convertible besides null
- return false;
- }
-
- /**
- * @param typeSignature -- boxed type signature
- * @return true if the typeSignature is numeric
- */
- public static boolean typeIsNumeric(final String typeSignature)
- {
- return (TypeConstants.TYPE_BOXED_BYTE.equals(typeSignature) ||
- TypeConstants.TYPE_BOXED_SHORT.equals(typeSignature) ||
- TypeConstants.TYPE_BOXED_INTEGER.equals(typeSignature) ||
- TypeConstants.TYPE_BOXED_LONG.equals(typeSignature) ||
- TypeConstants.TYPE_BOXED_FLOAT.equals(typeSignature) ||
- TypeConstants.TYPE_BOXED_DOUBLE.equals(typeSignature) ||
- TypeConstants.TYPE_BIG_INTEGER.equals(typeSignature) ||
- TypeConstants.TYPE_BIG_DOUBLE.equals(typeSignature));
- }
-
- /**
- * @param typeSignature
- * @return true if the typeSignature represents a String
- */
- public static boolean typeIsString(final String typeSignature)
- {
- return (TypeConstants.TYPE_STRING.equals(typeSignature));
- }
-
- /**
- * @param typeSignature -- boxed type signature
- * @return true if the typeSignature represents a boxed boolean
- */
- public static boolean typeIsBoolean(final String typeSignature)
- {
- return (TypeConstants.TYPE_BOXED_BOOLEAN.equals(typeSignature));
- }
-
- /**
- * @param typeSignature
- * @return true if type is the EL null type
- */
- public static boolean typeIsNull(final String typeSignature)
- {
- return (TypeConstants.TYPE_NULL.equals(typeSignature));
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/types/TypeCoercionException.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/types/TypeCoercionException.java
deleted file mode 100644
index aa18bbd..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/types/TypeCoercionException.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Oracle 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:
- * Cameron Bateman/Oracle - initial API and implementation
- *
- ********************************************************************************/
-
-package org.eclipse.jst.jsf.common.internal.types;
-
-/**
- * @author cbateman
- *
- */
-public class TypeCoercionException extends Exception
-{
- /**
- *
- */
- private static final long serialVersionUID = 1L;
-
- /**
- * @see java.lang.Exception
- */
- public TypeCoercionException() {
- super();
- }
-
- /**
- * @param message
- * @param cause
- * @see java.lang.Exception
- */
- public TypeCoercionException(String message, Throwable cause) {
- super(message, cause);
- }
-
- /**
- * @param message
- * @see java.lang.Exception
- */
- public TypeCoercionException(String message) {
- super(message);
- }
-
- /**
- * @param cause
- * @see java.lang.Exception
- */
- public TypeCoercionException(Throwable cause) {
- super(cause);
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/types/TypeComparator.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/types/TypeComparator.java
deleted file mode 100644
index a57a94b..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/types/TypeComparator.java
+++ /dev/null
@@ -1,292 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Oracle 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:
- * Cameron Bateman/Oracle - initial API and implementation
- *
- ********************************************************************************/
-
-package org.eclipse.jst.jsf.common.internal.types;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.emf.common.util.Diagnostic;
-import org.eclipse.jdt.core.Signature;
-
-/**
- * Static utility class used to compare two CompositeTypes for compatability
- *
- * @author cbateman
- *
- */
-public final class TypeComparator {
- private static class SignatureTestResult {
- /**
- * the diagnostic
- */
- private final Diagnostic diagnostic;
- /**
- * Measure of the probability that the tested signatures were meant to
- * match. Larger value means higher probability.
- */
- private final int matchQuality;
-
- /**
- * @param diagnostic
- * @param matchQuality -
- * Measure of the probability that the tested signatures were
- * meant to match. Larger value means higher probability.
- */
- public SignatureTestResult(final Diagnostic diagnostic,
- final int matchQuality) {
- super();
- this.diagnostic = diagnostic;
- this.matchQuality = matchQuality;
- }
- }
-
- private final TypeComparatorDiagnosticFactory _factory;
-
- /**
- * Default Constructor
- * @param factory
- */
- public TypeComparator(final TypeComparatorDiagnosticFactory factory)
- {
- _factory = factory;
- }
-
- /**
- * @param firstType
- * @param secondType
- * @return true if firstType is assignable to secondType or vice-versa,
- * depending on their assignment and runtime types
- */
- public Diagnostic calculateTypeCompatibility(
- final CompositeType firstType, final CompositeType secondType) {
- // first, box all primitives
- final CompositeType boxedFirstType = TypeTransformer
- .transformBoxPrimitives(firstType);
- final CompositeType boxedSecondType = TypeTransformer
- .transformBoxPrimitives(secondType);
-
- final String[] mustBeSatisfied = boxedFirstType.getSignatures();
- final String[] testSignatures = boxedSecondType.getSignatures();
- List<String> mustbeMethods = Collections.emptyList();
- List<String> mustbeTypes = Collections.emptyList();
- for (final String mustbeSignature : mustBeSatisfied) {
- if (TypeUtil.isMethodSignature(mustbeSignature)) {
- if (mustbeMethods.isEmpty()) {
- mustbeMethods = new ArrayList<String>(mustbeSignature
- .length());
- }
- mustbeMethods.add(mustbeSignature);
- } else {
- if (mustbeTypes.isEmpty()) {
- mustbeTypes = new ArrayList<String>(mustbeSignature
- .length());
- }
- mustbeTypes.add(mustbeSignature);
- }
- }
- final boolean mustbeWriteable = firstType.isLHS();
- SignatureTestResult bestResult = null;
- for (final String isSignature : testSignatures) {
- SignatureTestResult testResult;
- if (TypeUtil.isMethodSignature(isSignature)) {
- testResult = checkMethodSignature(isSignature, mustbeTypes,
- mustbeMethods);
- if (testResult.diagnostic.getSeverity() == Diagnostic.OK) {
- return testResult.diagnostic;
- }
- } else {
- testResult = checkTypeSignature(isSignature, mustbeTypes,
- mustbeMethods, mustbeWriteable);
- if (testResult.diagnostic.getSeverity() == Diagnostic.OK) {
- return checkAssignability(firstType, secondType);
- }
- }
- if (bestResult == null
- || bestResult.matchQuality < testResult.matchQuality) {
- bestResult = testResult;
- }
- }
- // TODO: bestResult empty? (should not happen, but who knows...
- return bestResult.diagnostic;
- }
-
- private SignatureTestResult checkTypeSignature(
- final String isSignature, final List<String> mustbeTypes,
- final List<String> mustbeMethods, final boolean mustbeWriteable) {
- if (mustbeTypes.isEmpty()) {
- final Diagnostic diag = _factory.create_METHOD_EXPRESSION_EXPECTED();
- return new SignatureTestResult(diag, 0);
- }
- for (final String mustbeSignature : mustbeTypes) {
- if (mustbeSignature.equals(isSignature)
- || canCoerce(isSignature, mustbeSignature, mustbeWriteable)) {
- final Diagnostic diag = Diagnostic.OK_INSTANCE;
- return new SignatureTestResult(diag, 5);
- }
- }
- final String[] params = new String[2];
- params[0] = readableSignatures(mustbeTypes);
- params[1] = Signature.toString(isSignature);
- final Diagnostic diag = _factory.create_INCOMPATIBLE_TYPES(params);
- return new SignatureTestResult(diag, 1);
- }
-
- private SignatureTestResult checkMethodSignature(
- final String isSignature, final List<String> mustbeTypes,
- final List<String> mustbeMethods) {
- if (mustbeMethods.isEmpty()) {
- final Diagnostic diag = _factory.create_VALUE_EXPRESSION_EXPECTED();
- return new SignatureTestResult(diag, 0);
- }
- for (final String mustbeSignature : mustbeMethods) {
- if (methodSignaturesMatch(mustbeSignature, isSignature)) {
- final Diagnostic diag = Diagnostic.OK_INSTANCE;
- return new SignatureTestResult(diag, 5);
- }
- }
- final String[] params = new String[2];
- params[0] = readableSignatures(mustbeMethods);
- params[1] = Signature
- .toString(isSignature, "method", null, false, true); //$NON-NLS-1$
- final Diagnostic diag = _factory.create_INCOMPATIBLE_METHOD_TYPES(params);
- return new SignatureTestResult(diag, 1);
- }
-
- private static String readableSignatures(final List<String> signatures) {
- StringBuilder res = null;
- for (final String sig : signatures) {
- String sigText;
- if (TypeUtil.isMethodSignature(sig)) {
- sigText = Signature.toString(sig, "method", null, false, true); //$NON-NLS-1$
- } else {
- sigText = Signature.toString(sig);
- }
- if (res == null) {
- res = new StringBuilder(sigText);
- } else {
- res.append(", ").append(sigText); //$NON-NLS-1$
- }
- }
- return res != null ? res.toString() : "[no signature]"; //$NON-NLS-1$
- }
-
- private static boolean canCoerce(final String testType,
- final String checkType, final boolean checkTypeIsWritable) {
- boolean canCoerce = canCoerce(testType, checkType);
-
- // if the check type is writable, we need to be sure that the
- // coercion can work in both directions
- if (canCoerce && checkTypeIsWritable) {
- // reverse roles: can checkType assign back to test type?
- canCoerce &= canCoerce(checkType, testType);
- }
-
- return canCoerce;
- }
-
- private static boolean canCoerce(final String testType,
- final String checkType) {
- // can always to coerce to string or object
- if (TypeCoercer.typeIsString(checkType)/*
- || TypeConstants.TYPE_JAVAOBJECT.equals(checkType)*/)
- {
- return true;
- } else if (TypeCoercer.typeIsNumeric(checkType)) {
- return canCoerceNumeric(testType);
- } else if (TypeCoercer.typeIsBoolean(checkType)) {
- return TypeCoercer.canCoerceToBoolean(testType);
- }
-
- // otherwise, no type coercion available
- return false;
- }
-
- private static boolean canCoerceNumeric(final String testType) {
- try {
- TypeCoercer.coerceToNumber(testType);
- // TODO: there is a case when coerceToNumber returns
- // null meaning "not sure", that we may want to handle
- // differently, with a warning
- return true;
- } catch (final TypeCoercionException tce) {
- // outright failure -- can't coerce
- return false;
- }
- }
-
- private static boolean methodSignaturesMatch(final String firstMethodSig,
- final String secondMethodSig) {
- // TODO: need to account for primitive type coercions
- if (firstMethodSig.equals(secondMethodSig)) {
- return true;
- }
- final String[] firstMethodParams = Signature
- .getParameterTypes(firstMethodSig);
- final String[] secondMethodParams = Signature
- .getParameterTypes(secondMethodSig);
-
- // fail fast if param count doesn't match
- if (firstMethodParams.length != secondMethodParams.length) {
- return false;
- }
-
- // now check each parameter
- for (int i = 0; i < firstMethodParams.length; i++) {
- // need to box primitives before comparing
- final String firstMethodParam = TypeTransformer
- .transformBoxPrimitives(firstMethodParams[i]);
- final String secondMethodParam = TypeTransformer
- .transformBoxPrimitives(secondMethodParams[i]);
-
- if (!firstMethodParam.equals(secondMethodParam)) {
- return false;
- }
- }
-
- // if we get to here then we need only check the return type
- final String firstReturn = TypeTransformer
- .transformBoxPrimitives(Signature.getReturnType(firstMethodSig));
- final String secondReturn = TypeTransformer
- .transformBoxPrimitives(Signature
- .getReturnType(secondMethodSig));
-
- if (!firstReturn.equals(secondReturn)) {
- return false;
- }
-
- // if we get to here, then everything checks out
- return true;
- }
-
- /**
- * Precond: both firstType and secondType must represent value bindings.
- *
- * @param firstType
- * @param secondType
- * @return a diagnostic validating that the two composite have compatible
- * assignability
- */
- private Diagnostic checkAssignability(final CompositeType firstType,
- final CompositeType secondType) {
- if (firstType.isRHS() && !secondType.isRHS()) {
- return _factory.create_PROPERTY_NOT_READABLE();
- }
-
- if (firstType.isLHS() && !secondType.isLHS()) {
- return _factory.create_PROPERTY_NOT_WRITABLE();
- }
-
- return Diagnostic.OK_INSTANCE;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/types/TypeComparatorDiagnosticFactory.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/types/TypeComparatorDiagnosticFactory.java
deleted file mode 100644
index 23d2ccc..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/types/TypeComparatorDiagnosticFactory.java
+++ /dev/null
@@ -1,147 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2008 Oracle Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Oracle Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.common.internal.types;
-
-import org.eclipse.emf.common.util.BasicDiagnostic;
-import org.eclipse.emf.common.util.Diagnostic;
-import org.eclipse.osgi.util.NLS;
-
-/**
- * Diagnostic Factory for type comparator diagnostics.
- *
- * @author cbateman
- *
- */
-public final class TypeComparatorDiagnosticFactory
-{
- /**
- * The id used in the source field of all Diagnostic's created by this
- * factory to uniquely identify TypeComparator validation as their source
- * type.
- */
- public final static String SOURCE_IDENTIFIER = "org.eclipse.jst.jsf.common.types.TypeComparator"; //$NON-NLS-1$
-
- /**
- * A method expression was expected, but something else (i.e. a value
- * expression) was provided.
- */
- public final static int METHOD_EXPRESSION_EXPECTED_ID = 0;
-
- /**
- * Value expression type was incompatible with the expected type.
- */
- public static final int INCOMPATIBLE_TYPES_ID = 1;
-
- /**
- * A value expression was expected, but something else (i.e. a method
- * expression) was provided.
- */
- public static final int VALUE_EXPRESSION_EXPECTED_ID = 2;
-
- /**
- * Method expression signature did not match what was expected.
- */
- public static final int INCOMPATIBLE_METHOD_TYPES_ID = 3;
-
- /**
- * A property was expected to be readable but no getter was found.
- */
- public static final int PROPERTY_NOT_READABLE_ID = 4;
-
- /**
- * A property was expected to be writable but no setter was found
- */
- public static final int PROPERTY_NOT_WRITABLE_ID = 5;
-
- /**
- * the number of diagnostic ids
- */
- public static final int NUM_IDS = 6;
-
- private final TypeComparatorPreferences _prefs;
-
- /**
- * @param prefs
- */
- public TypeComparatorDiagnosticFactory(final TypeComparatorPreferences prefs)
- {
- _prefs = prefs;
- }
- // A method expression was supplied as expected, but its signature did
- // * not match the expected.
- /**
- * @return a diagnostic
- */
- public Diagnostic create_METHOD_EXPRESSION_EXPECTED()
- {
- return create(METHOD_EXPRESSION_EXPECTED_ID, Messages
- .getString("TypeComparator.Expression.No_Method")); //$NON-NLS-1$
- }
-
- /**
- * @param params
- * @return a diagnostic
- */
- public Diagnostic create_INCOMPATIBLE_TYPES(final Object[] params)
- {
- return create(
- INCOMPATIBLE_TYPES_ID,
- NLS
- .bind(
- Messages
- .getString("TypeComparator.Expression.Incompatible_Value"), params)); //$NON-NLS-1$
- }
-
- /**
- * @return a diagnostic
- */
- public Diagnostic create_VALUE_EXPRESSION_EXPECTED()
- {
- return create(VALUE_EXPRESSION_EXPECTED_ID, Messages
- .getString("TypeComparator.Expression.No_Value")); //$NON-NLS-1$
- }
-
- /**
- * @param params
- * @return a diagnostic
- */
- public Diagnostic create_INCOMPATIBLE_METHOD_TYPES(final Object[] params)
- {
- return create(INCOMPATIBLE_METHOD_TYPES_ID, NLS.bind(Messages
- .getString("TypeComparator.Expression.Incompatible_Method"), //$NON-NLS-1$
- params));
- }
-
- /**
- * @return a diagnostic
- */
- public Diagnostic create_PROPERTY_NOT_READABLE()
- {
- return create(PROPERTY_NOT_READABLE_ID, Messages
- .getString("TypeComparator.Expression.Not.Gettable")); //$NON-NLS-1$
- }
-
- /**
- * @return a diagnostic
- */
- public Diagnostic create_PROPERTY_NOT_WRITABLE()
- {
- return create(PROPERTY_NOT_WRITABLE_ID, Messages
- .getString("TypeComparator.Expression.Expected.Settable")); //$NON-NLS-1$
- }
-
- private BasicDiagnostic create(int diagnosticId, String message)
- {
- final int severity = _prefs.getDefaultSeverity(diagnosticId);
- return new BasicDiagnostic(severity, SOURCE_IDENTIFIER, diagnosticId, message,
- null);
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/types/TypeComparatorPreferences.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/types/TypeComparatorPreferences.java
deleted file mode 100644
index 49f63bc..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/types/TypeComparatorPreferences.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2008 Oracle Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Oracle Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.common.internal.types;
-
-import org.eclipse.emf.common.util.Diagnostic;
-
-/**
- * Preference info for type comparator diagnostics
- *
- * @author cbateman
- *
- */
-public class TypeComparatorPreferences
-{
-
- /**
- * @param diagnosticId
- * @return the default severity of a diagnostic
- */
- public int getDefaultSeverity(final int diagnosticId)
- {
- switch (diagnosticId)
- {
- case TypeComparatorDiagnosticFactory.METHOD_EXPRESSION_EXPECTED_ID:
- return Diagnostic.ERROR;
- case TypeComparatorDiagnosticFactory.INCOMPATIBLE_TYPES_ID:
- return Diagnostic.INFO;
- case TypeComparatorDiagnosticFactory.VALUE_EXPRESSION_EXPECTED_ID:
- return Diagnostic.ERROR;
- case TypeComparatorDiagnosticFactory.INCOMPATIBLE_METHOD_TYPES_ID:
- return Diagnostic.ERROR;
- case TypeComparatorDiagnosticFactory.PROPERTY_NOT_READABLE_ID:
- return Diagnostic.WARNING;
- case TypeComparatorDiagnosticFactory.PROPERTY_NOT_WRITABLE_ID:
- return Diagnostic.WARNING;
- default:
- throw new IllegalArgumentException("Diagnostic Id: "+ diagnosticId +" is out of range"); //$NON-NLS-1$ //$NON-NLS-2$
-
- }
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/types/TypeConstants.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/types/TypeConstants.java
deleted file mode 100644
index 4561f6d..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/types/TypeConstants.java
+++ /dev/null
@@ -1,114 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Oracle 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:
- * Cameron Bateman/Oracle - initial API and implementation
- *
- ********************************************************************************/
-
-package org.eclipse.jst.jsf.common.internal.types;
-
-/**
- * @author cbateman
- *
- */
-public class TypeConstants
-{
- /**
- * we overload "void" to represent null
- */
- public final static String TYPE_NULL = "V"; //$NON-NLS-1$
- /**
- * unboxed boolean
- */
- public final static String TYPE_BOOLEAN = "Z"; //$NON-NLS-1$
- /**
- * string type
- */
- public final static String TYPE_STRING = "Ljava.lang.String;"; //$NON-NLS-1$
- /**
- * big integer
- */
- public final static String TYPE_BIG_INTEGER = "Ljava.math.BigInteger;"; //$NON-NLS-1$
-
- /**
- * big double
- */
- public final static String TYPE_BIG_DOUBLE = "Ljava.math.BigDecimal;"; //$NON-NLS-1$
-
- /* boxed types */
- /**
- * Boxed byte
- */
- public final static String TYPE_BOXED_BYTE = "Ljava.lang.Byte;"; //$NON-NLS-1$
- /**
- * Boxed short
- */
- public final static String TYPE_BOXED_SHORT = "Ljava.lang.Short;"; //$NON-NLS-1$
- /**
- * Boxed int
- */
- public final static String TYPE_BOXED_INTEGER = "Ljava.lang.Integer;"; //$NON-NLS-1$
- /**
- * Boxed long
- */
- public final static String TYPE_BOXED_LONG = "Ljava.lang.Long;"; //$NON-NLS-1$
- /**
- * Boxed float
- */
- public final static String TYPE_BOXED_FLOAT = "Ljava.lang.Float;"; //$NON-NLS-1$
- /**
- * Boxed double
- */
- public final static String TYPE_BOXED_DOUBLE = "Ljava.lang.Double;"; //$NON-NLS-1$
- /**
- * Boxed boolean
- */
- public final static String TYPE_BOXED_BOOLEAN = "Ljava.lang.Boolean;"; //$NON-NLS-1$
- /**
- * Boxed char
- */
- public final static String SIGNATURE_BOXED_CHARACTER = "Ljava.lang.Character"; //$NON-NLS-1$
- /**
- * Map type
- */
- public final static String TYPE_MAP = "Ljava.util.Map;"; //$NON-NLS-1$
- /**
- * Collection type
- */
- public final static String TYPE_COLLECTION = "Ljava.util.Collection;"; //$NON-NLS-1$
- /**
- * Comparable type
- */
- public final static String TYPE_COMPARABLE = "Ljava.lang.Comparable;"; //$NON-NLS-1$
-
- /**
- * List type
- */
- public final static String TYPE_LIST = "Ljava.util.List;"; //$NON-NLS-1$
-
- /**
- * java.lang.Object type signature
- */
- public static final String TYPE_JAVAOBJECT = "Ljava.lang.Object;"; //$NON-NLS-1$
- /**
- * Type signature for the JSF Data Model type
- */
- public static final String TYPE_DATA_MODEL = "Ljavax.faces.model.DataModel;"; //$NON-NLS-1$
- /**
- * Type signature for the Result Set type
- */
- public static final String TYPE_RESULT_SET = "Ljava.sql.ResultSet;"; //$NON-NLS-1$
- /**
- * Type signature for the JSTL ResultSet type
- */
- public static final String TYPE_JAVAX_SERVLET_JSP_JSTL_SQL_RESULT = "Ljavax.servlet.jsp.jstl.sql.Result;"; //$NON-NLS-1$
- /**
- * Type signature of the base type of all enum types
- */
- public static final String TYPE_ENUM_BASE = "Ljava.lang.Enum;"; //$NON-NLS-1$
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/types/TypeInfo.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/types/TypeInfo.java
deleted file mode 100644
index d514f42..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/types/TypeInfo.java
+++ /dev/null
@@ -1,110 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2007 Oracle Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Oracle Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.common.internal.types;
-
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jst.jsf.context.symbol.IBeanMethodSymbol;
-import org.eclipse.jst.jsf.context.symbol.IBeanPropertySymbol;
-
-/**This class contains all info that is cached for a given IType.
- * @see org.eclipse.jst.jsf.common.internal.types.TypeInfoCache
- *
- * @author Matthias
- */
-class TypeInfo {
-
- /**Empty String array. Used for the (usual) case when a type has no missing supertypes.
- */
- public static String[] NO_NAMES = new String[0];
-
- private IBeanMethodSymbol[] methods = null;
- private IBeanPropertySymbol[] properties = null;
- private IType[] supertypes = null;
- private IType[] interfaceTypes = null;
- private String[] missingSupertypeNames = null;
-
- /**Creates an empty TypeInfo object
- */
- public TypeInfo() {
- super();
- }
-
- /**Returns the method symbols. Returns <code>null</code> if none have been cached.
- * @return the method symbols. May be null.
- */
- public IBeanMethodSymbol[] getMethodSymbols() {
- return methods;
- }
-
- /**Returns the property symbols. Returns <code>null</code> if none have been cached.
- * @return the property symbols. May be null.
- */
- public IBeanPropertySymbol[] getPropertySymbols() {
- return properties;
- }
-
- /**Sets the methods symbols to be cached.
- * @param methods - the method symbols
- */
- public void setMethodSymbols(IBeanMethodSymbol[] methods) {
- this.methods = methods;
- }
-
- /**Sets the property symbols to be cached.
- * @param properties - the property symbols
- */
- public void setPropertySymbols(IBeanPropertySymbol[] properties) {
- this.properties = properties;
- }
-
- /**Returns the supertypes. Returns <code>null</code> if none have been cached.
- * @return the supertypes. May be null.
- */
- public IType[] getSupertypes() {
- return supertypes;
- }
-
- /**Sets the supertypes to be cached.
- * @param superTypes - the property symbols
- */
- public void setSupertypes(IType[] superTypes) {
- this.supertypes = superTypes;
- }
-
- /**Returns the interface types. Returns <code>null</code> if none have been cached.
- * @return the interface types. May be null.
- */
- public IType[] getInterfaceTypes() {
- return interfaceTypes;
- }
-
- /**Sets the interface types to be cached.
- * @param interfaceTypes - the property symbols
- */
- public void setInterfaceTypes(IType[] interfaceTypes) {
- this.interfaceTypes = interfaceTypes;
- }
-
- /**Returns the names of the missing supertypes. Returns <code>null</code> if none have been cached.
- * @return the names of the missing supertypes. May be null.
- */
- public String[] getMissingSupertypeNames() {
- return missingSupertypeNames;
- }
-
- /**Sets the supertypes to be cached.
- * @param missingSupertypeNames - the names of the missing supertypes
- */
- public void setMissingSupertypeNames(String[] missingSupertypeNames) {
- this.missingSupertypeNames = missingSupertypeNames;
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/types/TypeInfoCache.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/types/TypeInfoCache.java
deleted file mode 100644
index c58f31c..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/types/TypeInfoCache.java
+++ /dev/null
@@ -1,603 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2008 Oracle Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Oracle Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.common.internal.types;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.jdt.core.ElementChangedEvent;
-import org.eclipse.jdt.core.IClassFile;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IElementChangedListener;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IJavaElementDelta;
-import org.eclipse.jdt.core.IPackageFragment;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.ITypeHierarchy;
-import org.eclipse.jdt.core.ITypeRoot;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jst.jsf.common.JSFCommonPlugin;
-import org.eclipse.jst.jsf.context.symbol.IBeanMethodSymbol;
-import org.eclipse.jst.jsf.context.symbol.IBeanPropertySymbol;
-
-/**Provides a cache for java IType properties. It can cache bean property symbols, method symbols,
- * supertypes and implemented interfaces per IType. The cache listens to changes in the java model
- * and invalidates affected properties, but does not update them.
- *
- * @author Matthias
- */
-public class TypeInfoCache implements IElementChangedListener {
-
- private static TypeInfoCache instance = null;
-
- /**Returns the TypeInfoCache instance. This instance is considered
- * protected and must not be disposded with disposeInstance.
- *
- * @return the TypeInfoCache instance
- */
- public static synchronized TypeInfoCache getInstance() {
- if (instance == null) {
- instance = createNewInstance();
- }
- return instance;
- }
-
- /**
- * Create a new instance of the type cache.
- *
- * @return a new instance of the type info cache.
- */
- public static TypeInfoCache createNewInstance()
- {
- final TypeInfoCache newCache = new TypeInfoCache();
- JavaCore.addElementChangedListener(newCache, ElementChangedEvent.POST_CHANGE);
- return newCache;
- }
-
- /**
- * If cache is not the singleton instance acquired with {@link #getInstance()}
- * then the cache will be disposed and should not be used. If cache is
- * protected instance, then nothing will happen (the singleton instance
- * cannot be disposed).
- *
- * @param cache
- */
- public static void disposeInstance(final TypeInfoCache cache)
- {
- if (cache != null
- && cache != instance)
- {
- JavaCore.removeElementChangedListener(cache);
-
- synchronized(cache)
- {
- if (cache.cachedInfo != null)
- {
- cache.cachedInfo.clear();
- }
-
- if (cache.cachedTypesByAffectingTypeRoot != null)
- {
- cache.cachedTypesByAffectingTypeRoot.clear();
- }
-
- if (cache.cachedTypesByMissingSupertypename != null)
- {
- cache.cachedTypesByMissingSupertypename.clear();
- }
- }
- }
- }
-
- private final Map<IType, TypeInfo> cachedInfo;
- private final Map<ITypeRoot, Set<IType>> cachedTypesByAffectingTypeRoot;
- private final Map<String, Set<IType>> cachedTypesByMissingSupertypename;
-
- private TypeInfoCache() {
- cachedInfo = new HashMap<IType, TypeInfo>();
- cachedTypesByAffectingTypeRoot = new HashMap();
- cachedTypesByMissingSupertypename = new HashMap(10);
- }
-
- public void elementChanged(ElementChangedEvent event) {
- updateChangedJavaElement(event.getDelta());
- }
-
- /**Returns the cached info({@link TypeInfo}) for a given type. Will
- * return <code>null</code> if no info has been cached or the the type/something it depends on
- * has changed since then.
- *
- * @param type - the type in question
- * @return a TypeInfo instance that contains all cached info for the given type. May be null.
- */
- protected TypeInfo getTypeInfo(IType type) {
- TypeInfo info = null;
- if (type != null)
- {
- info = cachedInfo.get(type);
- }
- return info;
- }
-
- /**Returns the cached bean property symbols for a given type. Will return null if no
- * bean property symbols have been cached or the type/something it depends on has changed since
- * then.
- * @param beanType - the bean type in question
- * @return the bean property symbols for the given type. May be null.
- * @see TypeInfoCache#cachePropertySymbols(IType, IBeanPropertySymbol[])
- */
- public synchronized IBeanPropertySymbol[] getCachedPropertySymbols(IType beanType) {
- IBeanPropertySymbol[] props = null;
-
- if (beanType != null)
- {
- TypeInfo typeInfo = getTypeInfo(beanType);
- if (typeInfo != null)
- {
- props = typeInfo.getPropertySymbols();
- }
- }
- return props;
- }
-
- /**Returns the cached method symbols for a given type. Will return null if no
- * method symbols have been cached or the type/something it depends on has changed since
- * then.
- * @param beanType - the bean type in question
- * @return the method symbols for the given type. May be null.
- * @see TypeInfoCache#cacheMethodSymbols(IType, IBeanMethodSymbol[])
- */
- public synchronized IBeanMethodSymbol[] getCachedMethodSymbols(IType beanType) {
- IBeanMethodSymbol[] methods = null;
-
- if (beanType != null)
- {
- TypeInfo typeInfo = getTypeInfo(beanType);
- if (typeInfo != null)
- {
- methods = typeInfo.getMethodSymbols();
- }
- }
-
- return methods;
- }
-
- /**Returns the cached supertypes for a given type. Will return null if no supertypes
- * have been cached for this type or if the type/something it depends on has changed since
- * then.
- * @param type - the bean type in question
- * @return the supertypes for the given type. May be null.
- * @see TypeInfoCache#cacheSupertypesFor(IType)
- */
- public synchronized IType[] getCachedSupertypes(IType type) {
- IType[] types = null;
-
- if (type != null)
- {
- TypeInfo typeInfo = getTypeInfo(type);
- if (typeInfo != null)
- {
- types = typeInfo.getSupertypes();
- }
- }
-
- return types;
- }
-
- /**Returns the cached implemented interfaces for a given type. Will return null if no interfaces
- * have been cached for this type or if the type/something it depends on has changed since
- * then.
- * @param type - the bean type in question
- * @return the interface types implemented by the given type. May be null.
- * @see TypeInfoCache#cacheInterfaceTypesFor(IType)
- */
- public synchronized IType[] getCachedInterfaceTypes(IType type)
- {
- IType[] types = null;
-
- if (type != null)
- {
- TypeInfo typeInfo = getTypeInfo(type);
- if (typeInfo != null)
- {
- types = typeInfo.getInterfaceTypes();
- }
- }
-
- return types;
- }
-
- /**Caches the given method symbols for the given type.
- * @param beanType - the type
- * @param methods - the method symbols to cache
- */
- public synchronized void cacheMethodSymbols(IType beanType, IBeanMethodSymbol[] methods) {
- if (beanType != null)
- {
- TypeInfo typeInfo = getOrCreateTypeInfo(beanType);
- if (typeInfo != null) {
- typeInfo.setMethodSymbols(methods);
- }
- }
- }
-
- /**Caches the given property symbols for the given type.
- * @param beanType - the type
- * @param properties - the property symbols to cache
- */
- public synchronized void cachePropertySymbols(IType beanType, IBeanPropertySymbol[] properties) {
- if (beanType != null)
- {
- TypeInfo typeInfo = getOrCreateTypeInfo(beanType);
- if (typeInfo != null) {
- typeInfo.setPropertySymbols(properties);
- }
- }
- }
-
- /**Caches the supertypes for the given type. The supertypes will be calculated (and also returned)
- * by this method.
- * @param type - the type to cache supertypes for
- * @return the supertypes of the given type.
- */
- public synchronized IType[] cacheSupertypesFor(IType type)
- {
- IType[] types = null;
-
- if (type != null)
- {
- TypeInfo typeInfo = getOrCreateTypeInfo(type);
-
- if (typeInfo != null)
- {
- types = typeInfo.getSupertypes();
- }
- }
- return types;
- }
-
- /**Caches the interface types for the given type. The interface types will be calculated (and also
- * returned) by this method.
- * @param type - the type to cache interface types for
- * @return the interface types implemented by the given type.
- */
- public synchronized IType[] cacheInterfaceTypesFor(IType type)
- {
- IType[] types = null;
-
- if (type != null)
- {
- TypeInfo typeInfo = getOrCreateTypeInfo(type);
- if (typeInfo != null)
- {
- types = typeInfo.getInterfaceTypes();
- }
- }
- return types;
- }
-
- /**Returns the TypeInfo for the given type. If no TypeInfo exists for this type, an empty TypeInfo
- * will be created and cached.
- * @param type - the type in question
- * @return the (modifyable) TypeInfo for the given type
- */
- protected TypeInfo getOrCreateTypeInfo(IType type) {
- TypeInfo typeInfo = getTypeInfo(type);
- if (typeInfo == null) {
- try {
- final ITypeHierarchy hierarchy =
- type.newSupertypeHierarchy(new NullProgressMonitor());
- final IType[] supertypes = hierarchy.getAllSuperclasses(type);
- final IType[] interfaceTypes = hierarchy.getAllInterfaces();
- final IType[] rootClasses = hierarchy.getRootClasses();
- List missingSupertypesList = null;
- for (int i = 0; i < rootClasses.length; i++) {
- String superclassName = rootClasses[i].getSuperclassName();
- if (superclassName != null) {
- if (missingSupertypesList == null) {
- missingSupertypesList = new ArrayList(1);
- }
- superclassName = shortTypename(superclassName);
- missingSupertypesList.add(superclassName);
- }
- }
- String[] missingSupertypes = null;
- if (missingSupertypesList != null) {
- missingSupertypes = (String[]) missingSupertypesList.toArray(new String[missingSupertypesList.size()]);
- } else {
- missingSupertypes = TypeInfo.NO_NAMES;
- }
- typeInfo = new TypeInfo();
- typeInfo.setSupertypes(supertypes);
- typeInfo.setInterfaceTypes(interfaceTypes);
- typeInfo.setMissingSupertypeNames(missingSupertypes);
- cachedInfo.put(type, typeInfo);
- registerCachedType(type, typeInfo);
- } catch (JavaModelException e) {
- JSFCommonPlugin.log(e);
- }
- }
- return typeInfo;
- }
-
- /**Returns the typename fragment after the last "." (which in most cases is identical to the
- * unqualified typename).
- * Used only to make sure that if n1 and n2 are names of the same type
- * shortname(n1) equals shortname(2) even if one name is qualified and one not.
- * @param typename
- * @return the typename fragment after the last "."
- */
- private String shortTypename(String typename) {
- int pos = typename.lastIndexOf('.');
- if (pos >= 0) {
- typename = typename.substring(pos + 1);
- }
- return typename;
- }
-
- /**
- * Registers the given type for all ITypeRoot's it depends on, so that it can be uncached if
- * one of this ITypeRoot's has changed. The type must be unregistered when it should not be watched
- * anymore.
- * @param type - the type
- * @param typeInfo - TypeInfo of the given type
- * @see TypeInfoCache#unregisterCachedType(IType, TypeInfo)
- */
- protected void registerCachedType(IType type, TypeInfo typeInfo) {
- registerTypeForTypeRoot(type, type.getTypeRoot());
- IType[] supertypes = typeInfo.getSupertypes();
- for (int i = 0; i < supertypes.length; i++) {
- registerTypeForTypeRoot(type, supertypes[i].getTypeRoot());
- }
- String[] missingSupertypeNames = typeInfo.getMissingSupertypeNames();
- if (missingSupertypeNames != null) {
- for (int i = 0; i < missingSupertypeNames.length; i++) {
- registerTypeForMissingSupertype(type, missingSupertypeNames[i]);
- }
- }
- }
-
- private void registerTypeForTypeRoot(IType type, ITypeRoot typeRoot) {
- Set dependentTypes = cachedTypesByAffectingTypeRoot.get(typeRoot);
- if (dependentTypes == null) {
- dependentTypes = new HashSet(5);
- cachedTypesByAffectingTypeRoot.put(typeRoot, dependentTypes);
- }
- dependentTypes.add(type);
- }
-
- private void registerTypeForMissingSupertype(IType type, String supertype) {
- Set dependentTypes = cachedTypesByMissingSupertypename.get(supertype);
- if (dependentTypes == null) {
- dependentTypes = new HashSet(5);
- cachedTypesByMissingSupertypename.put(supertype, dependentTypes);
- }
- dependentTypes.add(type);
- }
-
- /**Unregisters the given type for all ITypeRoot's it depended on.
- * @param type - the type
- * @param typeInfo - TypeInfo of the given type
- */
- protected void unregisterCachedType(IType type, TypeInfo typeInfo) {
- unregisterTypeForTypeRoot(type, type.getTypeRoot());
- IType[] supertypes = typeInfo.getSupertypes();
- for (int i = 0; i < supertypes.length; i++) {
- unregisterTypeForTypeRoot(type, supertypes[i].getTypeRoot());
- }
- String[] missingSupertypeNames = typeInfo.getMissingSupertypeNames();
- if (missingSupertypeNames != null) {
- for (int i = 0; i < missingSupertypeNames.length; i++) {
- unregisterTypeForMissingSupertype(type, missingSupertypeNames[i]);
- }
- }
- }
-
- private void unregisterTypeForTypeRoot(IType type, ITypeRoot typeRoot) {
- Set dependentTypes = cachedTypesByAffectingTypeRoot.get(typeRoot);
- if (dependentTypes != null) {
- dependentTypes.remove(type);
- if (dependentTypes.isEmpty()) {
- cachedTypesByAffectingTypeRoot.remove(typeRoot);
- }
- }
- }
-
- private void unregisterTypeForMissingSupertype(IType type, String supertype) {
- Set dependentTypes = cachedTypesByMissingSupertypename.get(supertype);
- if (dependentTypes != null) {
- dependentTypes.remove(type);
- if (dependentTypes.isEmpty()) {
- cachedTypesByMissingSupertypename.remove(supertype);
- }
- }
- }
-
- /**This will remove all cached info for all types.
- */
- protected synchronized void uncacheAllTypes() {
- cachedInfo.clear();
- cachedTypesByAffectingTypeRoot.clear();
- cachedTypesByMissingSupertypename.clear();
- }
-
- /**Removes all cached info for all types that are subtypes of a type of the given ITypeRoot.
- * @param typeRoot
- */
- protected synchronized void uncacheAffectedTypes(ITypeRoot typeRoot) {
- Collection affectedTypes = cachedTypesByAffectingTypeRoot.get(typeRoot);
- if (affectedTypes != null && !affectedTypes.isEmpty()) {
- List affectedTypesCopy = new ArrayList(affectedTypes);
- for (Iterator it = affectedTypesCopy.iterator(); it.hasNext(); ) {
- IType cachedType = (IType) it.next();
- TypeInfo typeInfo = cachedInfo.remove(cachedType);
- unregisterCachedType(cachedType, typeInfo);
- }
- }
- }
-
- /**Removes all cached info for all types (or subtypes of types) that specify a supertype
- * that has a name similar to the given name.
- * @param supertypename - the missing supertype name. May be qualified or not
- */
- protected synchronized void uncacheTypesWithMissingSupertype(String supertypename) {
- Collection affectedTypes = cachedTypesByMissingSupertypename.get(shortTypename(supertypename));
- if (affectedTypes != null && !affectedTypes.isEmpty()) {
- List affectedTypesCopy = new ArrayList(affectedTypes);
- for (Iterator it = affectedTypesCopy.iterator(); it.hasNext(); ) {
- IType cachedType = (IType) it.next();
- TypeInfo typeInfo = cachedInfo.remove(cachedType);
- unregisterCachedType(cachedType, typeInfo);
- }
- }
- }
-
- /**Removes all cached info that may be affected by the given change.
- * @param delta - the change in the java model
- */
- protected void updateChangedJavaElement(IJavaElementDelta delta) {
- IJavaElement element= delta.getElement();
- switch (element.getElementType()) {
- case IJavaElement.JAVA_MODEL:
- updateChangedJavaModel(delta, element);
- break;
- case IJavaElement.JAVA_PROJECT:
- updateChangedJavaProject(delta, element);
- break;
- case IJavaElement.PACKAGE_FRAGMENT_ROOT:
- updateChangedPackageFragmentRoot(delta, element);
- break;
- case IJavaElement.PACKAGE_FRAGMENT:
- updateChangedPackageFragment(delta, (IPackageFragment) element);
- break;
- case IJavaElement.CLASS_FILE:
- case IJavaElement.COMPILATION_UNIT:
- updateChangedOpenable(delta, element);
- break;
- }
- }
-
- private void updateChangedChildren(IJavaElementDelta delta) {
- if ((delta.getFlags() & IJavaElementDelta.F_CHILDREN) > 0) {
- IJavaElementDelta[] children= delta.getAffectedChildren();
- for (int i= 0; i < children.length; i++) {
- updateChangedJavaElement(children[i]);
- }
- }
- }
-
- private void updateChangedJavaModel(IJavaElementDelta delta, IJavaElement element) {
- switch (delta.getKind()) {
- case IJavaElementDelta.ADDED :
- case IJavaElementDelta.REMOVED :
- uncacheAllTypes();
- break;
- case IJavaElementDelta.CHANGED :
- updateChangedChildren(delta);
- break;
- }
- }
-
- private void updateChangedJavaProject(IJavaElementDelta delta, IJavaElement element) {
- int kind = delta.getKind();
- int flags = delta.getFlags();
- if ((flags & IJavaElementDelta.F_OPENED) != 0) {
- kind = IJavaElementDelta.ADDED; // affected in the same way
- }
- if ((flags & IJavaElementDelta.F_CLOSED) != 0) {
- kind = IJavaElementDelta.REMOVED; // affected in the same way
- }
- switch (kind) {
- case IJavaElementDelta.ADDED :
- case IJavaElementDelta.REMOVED :
- uncacheAllTypes();
- break;
- case IJavaElementDelta.CHANGED :
- updateChangedChildren(delta);
- break;
- }
- }
-
- private void updateChangedPackageFragment(IJavaElementDelta delta, IPackageFragment element) {
- switch (delta.getKind()) {
- case IJavaElementDelta.ADDED :
- // if the package fragment is in the projects being considered, this could
- // introduce new types, changing the hierarchy
- case IJavaElementDelta.REMOVED :
- // is a change if the package fragment contains supertypes?
- uncacheAllTypes();
- break;
- case IJavaElementDelta.CHANGED :
- // look at the files in the package fragment
- updateChangedChildren(delta);
- }
- }
-
- private void updateChangedPackageFragmentRoot(IJavaElementDelta delta, IJavaElement element) {
- switch (delta.getKind()) {
- case IJavaElementDelta.ADDED :
- case IJavaElementDelta.REMOVED :
- uncacheAllTypes();
- break;
- case IJavaElementDelta.CHANGED :
- int flags = delta.getFlags();
- if (((flags & IJavaElementDelta.F_ADDED_TO_CLASSPATH) > 0)||(flags & IJavaElementDelta.F_REMOVED_FROM_CLASSPATH) > 0) {
- uncacheAllTypes();
- } else {
- updateChangedChildren(delta);
- }
- break;
- }
- }
-
- /**Removes all cached info that may be affected by the change in this IOpenable
- * @param delta - the change in the java model
- * @param element - the (changed) IOpenable considered
- */
- protected void updateChangedOpenable(IJavaElementDelta delta, IJavaElement element) {
- if (element instanceof ITypeRoot) {
- ITypeRoot typeRoot = (ITypeRoot) element;
- uncacheAffectedTypes(typeRoot);
- // Creates missing superclass for any cached type?
- if (delta.getKind() == IJavaElementDelta.ADDED) {
- if (typeRoot instanceof ICompilationUnit) {
- ICompilationUnit cu = (ICompilationUnit) typeRoot;
- try {
- IType[] types = cu.getAllTypes();
- for (int i = 0; i < types.length; i++) {
- uncacheTypesWithMissingSupertype(types[i].getElementName());
- }
- } catch (JavaModelException e) {
- if (!e.isDoesNotExist())
- {
- JSFCommonPlugin.log(IStatus.INFO, "Unable to get types for compilation unit " + cu, e); //$NON-NLS-1$
- }
- uncacheAllTypes();
- }
- } else if (typeRoot instanceof IClassFile) {
- IClassFile cf = (IClassFile) typeRoot;
- IType type = cf.getType();
- uncacheTypesWithMissingSupertype(type.getElementName());
- }
- }
- }
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/types/TypeTransformer.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/types/TypeTransformer.java
deleted file mode 100644
index 4c5718f..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/types/TypeTransformer.java
+++ /dev/null
@@ -1,213 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Oracle 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:
- * Cameron Bateman/Oracle - initial API and implementation
- *
- ********************************************************************************/
-
-package org.eclipse.jst.jsf.common.internal.types;
-
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-
-import org.eclipse.jdt.core.Signature;
-
-/**
- * Transforms one CompositeType to another according to particular
- * transform rules.
- *
- * In general, every transformation should be of the form:
- *
- * CompositeType transform(CompositeType original, other inputs...);
- *
- * @author cbateman
- *
- */
-public class TypeTransformer
-{
- private final static Map boxConversions = new HashMap();
- private final static Map unBoxConversions = new HashMap();
-
- static
- {
- // see jdt.core.Signature or JVM link spec for more details
- boxConversions.put("B", "Ljava.lang.Byte;"); //$NON-NLS-1$//$NON-NLS-2$
- boxConversions.put("C", "Ljava.lang.Character;"); //$NON-NLS-1$ //$NON-NLS-2$
- boxConversions.put("D", "Ljava.lang.Double;"); //$NON-NLS-1$ //$NON-NLS-2$
- boxConversions.put("F", "Ljava.lang.Float;"); //$NON-NLS-1$ //$NON-NLS-2$
- boxConversions.put("I", "Ljava.lang.Integer;"); //$NON-NLS-1$ //$NON-NLS-2$
- boxConversions.put("J", "Ljava.lang.Long;"); //$NON-NLS-1$ //$NON-NLS-2$
- boxConversions.put("S", "Ljava.lang.Short;"); //$NON-NLS-1$ //$NON-NLS-2$
- boxConversions.put("Z", "Ljava.lang.Boolean;"); //$NON-NLS-1$ //$NON-NLS-2$
- // don't box V
- boxConversions.put("V", "V"); //$NON-NLS-1$ //$NON-NLS-2$
-
- // invert hte box conversions
- for (final Iterator it = boxConversions.keySet().iterator(); it.hasNext();)
- {
- final String newValue = (String) it.next();
- final String newKey = (String) boxConversions.get(newValue);
- if (unBoxConversions.put(newKey, newValue) != null)
- {
- // if put returns non-null then we have replaced a key
- // added on a previous iteration. This implies
- // that box mappings are no longer one-to-one
- throw new AssertionError("Duplicated boxing value"); //$NON-NLS-1$
- }
- }
- }
-
- /**
- * @param compositeType
- * @return an equivilent form of compositeType with all primitive type
- * signatures converted to their fully qualified boxed equivilent but
- * otherwise unchanged.
- *
- * Example: J -> Ljava.lang.Long;
- */
- public static CompositeType transformBoxPrimitives(CompositeType compositeType)
- {
- String[] signatures = compositeType.getSignatures();
- String[] newsignatures = new String[signatures.length];
-
- for (int i = 0; i < signatures.length; i++)
- {
- newsignatures[i] = transformBoxPrimitives(signatures[i]);
- }
-
- return new CompositeType(newsignatures, compositeType.getAssignmentTypeMask());
- }
-
- /**
- * Performs boxing for a single typeSignature string
- * @param curSignature
- * @return the boxed signature
- */
- public static String transformBoxPrimitives(final String curSignature)
- {
- String newSignature = curSignature;
-
- // first determine if we have a type or method signature
- try
- {
- int kind = Signature.getTypeSignatureKind(curSignature);
-
- // interested in base types, since these need boxing
- if (kind == Signature.BASE_TYPE_SIGNATURE)
- {
- // grab the box for the primitive
- newSignature = (String) boxConversions.get(curSignature);
- }
- else if (kind == Signature.ARRAY_TYPE_SIGNATURE)
- {
- // check if it's array of primitives
- final String baseType = Signature.getElementType(curSignature);
-
- if (Signature.getTypeSignatureKind(baseType) == Signature.BASE_TYPE_SIGNATURE)
- {
- // it is, so box it
- final String newBaseType = (String) boxConversions.get(baseType);
- final int numBraces = Signature.getArrayCount(curSignature);
- newSignature = ""; //$NON-NLS-1$
- for (int j = 0; j < numBraces; j++)
- {
- newSignature += "["; //$NON-NLS-1$
- }
-
- newSignature += newBaseType;
- }
- }
- }
- catch (IllegalArgumentException e)
- {
- // signature was not a type signature, so must be a method sig
- // do nothing: don't box method types
- }
-
- return newSignature;
- }
-
- /**
- * Performs the exact inverse of transformBoxPrimitives -- takes all
- * boxing type signatures and replaces them with their primitive equivilent
- * @param compositeType
- * @return a new composite with all boxed primitives unboxed
- */
- public static CompositeType transformUnboxPrimitives(CompositeType compositeType)
- {
- String[] signatures = compositeType.getSignatures();
- String[] newsignatures = new String[signatures.length];
-
- for (int i = 0; i < signatures.length; i++)
- {
- newsignatures[i] = transformUnboxPrimitives(signatures[i]);
- }
-
- return new CompositeType(newsignatures, compositeType.getAssignmentTypeMask());
- }
-
- /**
- * Performs unboxing for a single typeSignature string
- *
- * @param typeSignature
- * @return the transformed signature
- */
- public static String transformUnboxPrimitives(final String typeSignature)
- {
- String newSignature = typeSignature;
-
- // first determine if we have a type or method signature
- try
- {
- int kind = Signature.getTypeSignatureKind(typeSignature);
-
- // interested in class types, since these need boxing
- if (kind == Signature.CLASS_TYPE_SIGNATURE)
- {
- // grab the box for the primitive
- String checkForUnbox = (String) unBoxConversions.get(typeSignature);
-
- if (checkForUnbox != null)
- {
- newSignature = checkForUnbox;
- }
- }
- else if (kind == Signature.ARRAY_TYPE_SIGNATURE)
- {
- // check if it's array of objects
- final String baseType = Signature.getElementType(typeSignature);
-
- if (Signature.getTypeSignatureKind(baseType) == Signature.CLASS_TYPE_SIGNATURE)
- {
- // it is, so unbox it
- final String newBaseTypeCandidate = (String) unBoxConversions.get(baseType);
-
- if (newBaseTypeCandidate != null)
- {
- final int numBraces = Signature.getArrayCount(typeSignature);
- newSignature = ""; //$NON-NLS-1$
- for (int j = 0; j < numBraces; j++)
- {
- newSignature += "["; //$NON-NLS-1$
- }
-
- newSignature += newBaseTypeCandidate;
- }
- }
- }
- }
- catch (IllegalArgumentException e)
- {
- // signature was not a type signature, so must be a method sig
- // do nothing: don't box method types
- }
-
- return newSignature;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/types/TypeUtil.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/types/TypeUtil.java
deleted file mode 100644
index a302fc4..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/types/TypeUtil.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Oracle 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:
- * Cameron Bateman/Oracle - initial API and implementation
- *
- ********************************************************************************/
-
-package org.eclipse.jst.jsf.common.internal.types;
-
-import org.eclipse.jdt.core.Signature;
-
-/**
- * Package utility class
- * @author cbateman
- *
- */
-/*package*/final class TypeUtil
-{
- /**
- * @param assignmentType
- * @return true if assignmentType has lhs flag set
- */
- public static boolean matchesLHS(int assignmentType)
- {
- return (assignmentType & IAssignable.ASSIGNMENT_TYPE_LHS) != 0;
- }
-
- /**
- * @param assignmentType
- * @return true if assignmentType has rhs flag set
- */
- public static boolean matchesRHS(int assignmentType)
- {
- return (assignmentType & IAssignable.ASSIGNMENT_TYPE_RHS) != 0;
- }
-
- /**
- * @param signature
- * @return true if the signature is a method signature
- */
- public static boolean isMethodSignature(final String signature)
- {
- // method signature must start with a "("
- return signature.charAt(0) == Signature.C_PARAM_START;
- }
- private TypeUtil() {/*not instantiable*/}
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/types/ValueType.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/types/ValueType.java
deleted file mode 100644
index 2d12825..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/types/ValueType.java
+++ /dev/null
@@ -1,238 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Oracle 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:
- * Cameron Bateman/Oracle - initial API and implementation
- *
- ********************************************************************************/
-
-package org.eclipse.jst.jsf.common.internal.types;
-
-import org.eclipse.jdt.core.Signature;
-
-/**
- * Value object representing a value binding type by it's type and assignability
- * information
- *
- * @author cbateman
- *
- */
-public class ValueType implements SignatureBasedType, IAssignable
-{
- /**
- * A default empty string array
- */
- protected final static String[] EMPTY_STRING_ARRAY = new String[0];
-
- private final String _signature;
- private final String[] _typeArgs;
- private final int _assignmentMask;
- private final String[] _superTypes;
- private final String[] _interfaceTypes;
-
- private final boolean _isEnumType;
-
- private String[] _allTypes; // lazy creation on getAllTypes
-
- /**
- * Construct a new ValueType object with the given
- * signature
- *
- * @param signature
- * @param typeArgs generic type arguments for signature or empty if none
- * @param superTypes
- * @param interfaceTypes
- * @param isEnumType
- * @param assignmentMask
- */
- public ValueType(final String signature,
- final String[] typeArgs,
- final String[] superTypes,
- final String[] interfaceTypes,
- final boolean isEnumType,
- final int assignmentMask)
- {
- if (signature == null)
- {
- throw new AssertionError("signature can never be null"); //$NON-NLS-1$
- }
-
- _signature = signature;
- _typeArgs = typeArgs;
- _assignmentMask = assignmentMask;
- _superTypes = superTypes != null ? superTypes : EMPTY_STRING_ARRAY;
- _interfaceTypes = interfaceTypes != null ? interfaceTypes : EMPTY_STRING_ARRAY;
- _isEnumType = isEnumType;
- }
-
- /**
- * Copy constructor equivilent to
- * ValueType(template.getSignature(), template.getSuperTypes(), template.getInterfaceTypes(),assingmentMask, template._isEnumType)
- *
- * @param template
- * @param assignmentMask
- */
- public ValueType(final ValueType template, final int assignmentMask)
- {
- this(template._signature, template._typeArgs, template._superTypes,
- template._interfaceTypes, template._isEnumType, assignmentMask);
- }
-
- /**
- * Convienence constructor for creating ValueType's with no supertype, type argument
- * or interface info. Equivilent to:
- * ValueType(signature, new String[0], new String[0], new String[0], false, assignmentMask)
- *
- * @param signature
- * @param assignmentMask
- */
- public ValueType(final String signature, final int assignmentMask)
- {
- this(signature, EMPTY_STRING_ARRAY, EMPTY_STRING_ARRAY, EMPTY_STRING_ARRAY, false, assignmentMask);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.jsf.core.internal.types.SignatureBasedType#getSignature()
- */
- public String getSignature()
- {
- return _signature;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.jsf.common.internal.types.IAssignable#getAssignability()
- */
- public int getAssignability() {
- return _assignmentMask;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.jsf.common.internal.types.IAssignable#isLHS()
- */
- public boolean isLHS() {
- return TypeUtil.matchesLHS(_assignmentMask);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.jsf.common.internal.types.IAssignable#isRHS()
- */
- public boolean isRHS() {
- return TypeUtil.matchesRHS(_assignmentMask);
- }
-
- /* (non-Javadoc)
- * @see java.lang.Object#toString()
- */
- public String toString()
- {
- return Signature.getSignatureSimpleName
- (TypeTransformer.transformBoxPrimitives(_signature));
- }
-
- /**
- * @return an array of all signatures of all super types or empty
- * array if there are no super types for this type
- *
- * Note: if isArray() == true, then these are the super types of
- * the base element
- */
- public String[] getSuperTypes()
- {
- return _superTypes;
- }
-
- /**
- * @return an array of all interfaces implemented or empty array
- * if none
- *
- * Note: if isArray() == true, then these are the interfacess of
- * the base element
- */
- public String[] getInterfaceTypes()
- {
- return _interfaceTypes;
- }
-
- /**
- * @return all types including the base type, super types and interface
- * types.
- *
- * Note: if isArray() == true, then these are the super types of
- * the base element
-
- */
- public String[] getAllTypes()
- {
- if (_allTypes == null)
- {
- int numberOfTypes = 1 + _superTypes.length + _interfaceTypes.length;
- _allTypes = new String[numberOfTypes];
- _allTypes[0] = _signature;
- System.arraycopy(_superTypes, 0, _allTypes, 1, _superTypes.length);
- System.arraycopy(_interfaceTypes, 0, _allTypes, 1+_superTypes.length, _interfaceTypes.length);
- }
- return _allTypes;
- }
-
- /**
- * @return the type arguments for getSignature() if any or empty array if none
- */
- public String[] getTypeArguments()
- {
- return _typeArgs;
- }
-
- /**
- *
- */
- public CompositeType toCompositeType()
- {
- return new CompositeType(getAllTypes(), getAssignability());
- }
-
- /**
- * @param signature
- * @return true if an instance of this type would satisfy instanceof signature
- *
- */
- public boolean isInstanceOf(final String signature)
- {
- // if this is an array, then the super types are for the base
- // type and we can't be an instance of anything but signature
- if (isArray())
- {
- return getSignature().equals(signature);
- }
-
- final String[] allTypes = getAllTypes();
-
- for (int i = 0; i < allTypes.length; i++)
- {
- if (allTypes[i].equals(signature))
- {
- return true;
- }
- }
-
- return false;
- }
-
- /**
- * @return true if this is an array type
- */
- public boolean isArray()
- {
- return Signature.getArrayCount(getSignature()) > 0;
- }
-
- /**
- * @return true if the value type represents a (>=Java5) enum type
- */
- public boolean isEnumType() {
- return _isEnumType;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/types/messages.properties b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/types/messages.properties
deleted file mode 100644
index 3df119b..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/types/messages.properties
+++ /dev/null
@@ -1,18 +0,0 @@
-###############################################################################
-# Copyright (c) 2001, 2007 Oracle Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# Oracle Corporation - initial API and implementation
-###############################################################################
-TypeComparator.Expression.Doesnt.Match.Expected.Types=EL expression does not evaluate to expected types for this attribute
-TypeComparator.Expression.Not.Gettable=Expression is not gettable
-TypeComparator.Expression.Expected.Settable=Attribute expects settable value, but expression is not settable
-
-TypeComparator.Expression.No_Method=Expression must be a method expression but is a value expression
-TypeComparator.Expression.No_Value=Expression must be a value expression but is a method expression
-TypeComparator.Expression.Incompatible_Method=Method must have signature "{0}" but has signature "{1}"
-TypeComparator.Expression.Incompatible_Value=Cannot coerce type {1} to {0}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/util/JarUtilities.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/util/JarUtilities.java
deleted file mode 100644
index 76c609e..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/util/JarUtilities.java
+++ /dev/null
@@ -1,90 +0,0 @@
-package org.eclipse.jst.jsf.common.internal.util;
-
-import java.io.File;
-import java.net.MalformedURLException;
-import java.net.URI;
-import java.net.URL;
-import java.util.jar.JarEntry;
-import java.util.jar.JarFile;
-
-/**
- * @author cbateman
- *
- */
-public class JarUtilities
-{
- private static final String JAR_PREFIX = "jar:"; //$NON-NLS-1$
- private static final String JAR_FILE_PREFIX = JAR_PREFIX + "file:"; //$NON-NLS-1$
- /**
- * A common instance.
- */
- public static final JarUtilities INSTANCE = new JarUtilities();
- /**
- * @param jarFile
- * @return the URL for the jarFile
- * @throws MalformedURLException
- */
- public URL createJarUrl(final JarFile jarFile) throws MalformedURLException
- {
- return createJarUrl(jarFile, ""); //$NON-NLS-1$
- }
-
- /**
- * @param jarFile
- * @param jarEntry
- * @return the URL for the jarEntry inside jarFile.
- * @throws MalformedURLException
- */
- public URL createJarUrl(final JarFile jarFile, final JarEntry jarEntry) throws MalformedURLException
- {
- return createJarUrl(jarFile, jarEntry != null ? jarEntry.getName() : ""); //$NON-NLS-1$
- }
-
- /**
- * @param jarFile
- * @param jarEntryName
- * @return the URL for the jarEntryName inside jarFile.
- * @throws MalformedURLException
- */
- public URL createJarUrl(final JarFile jarFile, final String jarEntryName) throws MalformedURLException
- {
- final String fixedJarFileName = jarFile.getName().replace("\\", "/"); //$NON-NLS-1$ //$NON-NLS-2$
- return createJarUrl(fixedJarFileName, jarEntryName != null ? jarEntryName : ""); //$NON-NLS-1$
- }
-
- /**
- * @param filePath
- * @param jarEntryName
- * @return the URL for the jarEntryName in the file at filePath
- * @throws MalformedURLException
- */
- public URL createJarUrl(final String filePath, final String jarEntryName) throws MalformedURLException
- {
- final String urlString = String.format("jar:file:///%s!/%s", //$NON-NLS-1$
- filePath, jarEntryName);
- return new URL(urlString);
- }
-
- /**
- * @param url
- * @return a file for the URL if url is in the local file system (must conform to jar:file:// uri).
- * or null.
- */
- public File getFile(final URL url)
- {
- String string = url.toString();
- if (string != null && string.startsWith(JAR_FILE_PREFIX))
- {
- string = string.substring(JAR_PREFIX.length());
- try
- {
- return new File(URI.create(string));
- } catch (IllegalArgumentException e)
- {
- // fallthorough and return null if the file can't do anything
- // with the string.
- }
- }
- return null;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/Entity.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/Entity.java
deleted file mode 100644
index 977011a..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/Entity.java
+++ /dev/null
@@ -1,163 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.jst.jsf.common.metadata;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jst.jsf.common.metadata.query.IEntityVisitor;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Entity</b></em>'.
- * <p><b>Provisional API - subject to change</b></p>
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- * <li>{@link org.eclipse.jst.jsf.common.metadata.Entity#getChildEntities <em>Child Entities</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.common.metadata.Entity#getTraits <em>Traits</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.common.metadata.Entity#getId <em>Id</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.common.metadata.Entity#getType <em>Type</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.common.metadata.Entity#getIncludeGroups <em>Include Groups</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.jsf.common.metadata.MetadataPackage#getEntity()
- * @model extendedMetaData="kind='element' name='entity'"
- * @generated
- */
-public interface Entity extends EObject {
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- String copyright = "Copyright (c) 2007 Oracle Corporation"; //$NON-NLS-1$
-
- /**
- * Returns the value of the '<em><b>Child Entities</b></em>' containment reference list.
- * The list contents are of type {@link org.eclipse.jst.jsf.common.metadata.Entity}.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Child Entities</em>' containment reference list isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @return the value of the '<em>Child Entities</em>' containment reference list.
- * @see org.eclipse.jst.jsf.common.metadata.MetadataPackage#getEntity_ChildEntities()
- * @model type="org.eclipse.jst.jsf.common.metadata.Entity" containment="true"
- * extendedMetaData="kind='element' name='entity'"
- * @generated
- */
- EList getChildEntities();
-
- /**
- * Returns the value of the '<em><b>Traits</b></em>' containment reference list.
- * The list contents are of type {@link org.eclipse.jst.jsf.common.metadata.Trait}.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Traits</em>' containment reference list isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @return the value of the '<em>Traits</em>' containment reference list.
- * @see org.eclipse.jst.jsf.common.metadata.MetadataPackage#getEntity_Traits()
- * @model type="org.eclipse.jst.jsf.common.metadata.Trait" containment="true"
- * extendedMetaData="kind='element' name='trait'"
- * @generated
- */
- EList getTraits();
-
- /**
- * Returns the value of the '<em><b>Id</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Id</em>' attribute isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @return the value of the '<em>Id</em>' attribute.
- * @see #setId(String)
- * @see org.eclipse.jst.jsf.common.metadata.MetadataPackage#getEntity_Id()
- * @model id="true" required="true"
- * @generated
- */
- String getId();
-
- /**
- * Sets the value of the '{@link org.eclipse.jst.jsf.common.metadata.Entity#getId <em>Id</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Id</em>' attribute.
- * @see #getId()
- * @generated
- */
- void setId(String value);
-
- /**
- * Returns the value of the '<em><b>Type</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Type</em>' attribute isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @return the value of the '<em>Type</em>' attribute.
- * @see #setType(String)
- * @see org.eclipse.jst.jsf.common.metadata.MetadataPackage#getEntity_Type()
- * @model
- * @generated
- */
- String getType();
-
- /**
- * Sets the value of the '{@link org.eclipse.jst.jsf.common.metadata.Entity#getType <em>Type</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Type</em>' attribute.
- * @see #getType()
- * @generated
- */
- void setType(String value);
-
- /**
- * Returns the value of the '<em><b>Include Groups</b></em>' reference list.
- * The list contents are of type {@link org.eclipse.jst.jsf.common.metadata.IncludeEntityGroup}.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Include Groups</em>' reference list isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @return the value of the '<em>Include Groups</em>' reference list.
- * @see org.eclipse.jst.jsf.common.metadata.MetadataPackage#getEntity_IncludeGroups()
- * @model type="org.eclipse.jst.jsf.common.metadata.IncludeEntityGroup"
- * extendedMetaData="kind='element' name='include-entity-group'"
- * @generated
- */
- EList getIncludeGroups();
-
- /**
- * <!-- begin-user-doc -->
- * @param visitor
- * <!-- end-user-doc -->
- * @model visitorDataType="org.eclipse.jst.jsf.common.metadata.query.IEntityVisitor"
- * @generated
- */
- void accept(IEntityVisitor visitor);
-
- /**
- * <!-- begin-user-doc -->
- * @return Model
- * <!-- end-user-doc -->
- * @model kind="operation"
- * @generated
- */
- Model getModel();
-
-} // Entity
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/EntityGroup.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/EntityGroup.java
deleted file mode 100644
index fd98b48..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/EntityGroup.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.jst.jsf.common.metadata;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Entity Group</b></em>'.
- * <p><b>Provisional API - subject to change</b></p>
- * <!-- end-user-doc -->
- *
- *
- * @see org.eclipse.jst.jsf.common.metadata.MetadataPackage#getEntityGroup()
- * @model
- * @generated
- */
-public interface EntityGroup extends Entity {
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- String copyright = "Copyright (c) 2007 Oracle Corporation"; //$NON-NLS-1$
-
-} // EntityGroup
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/IncludeEntityGroup.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/IncludeEntityGroup.java
deleted file mode 100644
index be4f146..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/IncludeEntityGroup.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.jst.jsf.common.metadata;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Include Entity Group</b></em>'.
- * <p><b>Provisional API - subject to change</b></p>
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- * <li>{@link org.eclipse.jst.jsf.common.metadata.IncludeEntityGroup#getId <em>Id</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.common.metadata.IncludeEntityGroup#getModelUri <em>Model Uri</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.jsf.common.metadata.MetadataPackage#getIncludeEntityGroup()
- * @model
- * @generated
- */
-public interface IncludeEntityGroup extends EObject {
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- String copyright = "Copyright (c) 2007 Oracle Corporation"; //$NON-NLS-1$
-
- /**
- * Returns the value of the '<em><b>Id</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Id</em>' attribute isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @return the value of the '<em>Id</em>' attribute.
- * @see #setId(String)
- * @see org.eclipse.jst.jsf.common.metadata.MetadataPackage#getIncludeEntityGroup_Id()
- * @model required="true"
- * @generated
- */
- String getId();
-
- /**
- * Sets the value of the '{@link org.eclipse.jst.jsf.common.metadata.IncludeEntityGroup#getId <em>Id</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Id</em>' attribute.
- * @see #getId()
- * @generated
- */
- void setId(String value);
-
- /**
- * Returns the value of the '<em><b>Model Uri</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Model Uri</em>' attribute isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @return the value of the '<em>Model Uri</em>' attribute.
- * @see #setModelUri(String)
- * @see org.eclipse.jst.jsf.common.metadata.MetadataPackage#getIncludeEntityGroup_ModelUri()
- * @model extendedMetaData="name='uri'"
- * @generated
- */
- String getModelUri();
-
- /**
- * Sets the value of the '{@link org.eclipse.jst.jsf.common.metadata.IncludeEntityGroup#getModelUri <em>Model Uri</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Model Uri</em>' attribute.
- * @see #getModelUri()
- * @generated
- */
- void setModelUri(String value);
-
-} // IncludeEntityGroup
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/MetadataFactory.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/MetadataFactory.java
deleted file mode 100644
index 8b8ea0c..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/MetadataFactory.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.jst.jsf.common.metadata;
-
-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.
- * <p><b>NOT API</b></p>
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.jsf.common.metadata.MetadataPackage
- * @generated
- */
-public interface MetadataFactory extends EFactory {
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- String copyright = "Copyright (c) 2007 Oracle Corporation"; //$NON-NLS-1$
-
- /**
- * The singleton instance of the factory.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- MetadataFactory eINSTANCE = org.eclipse.jst.jsf.common.metadata.internal.impl.MetadataFactoryImpl.init();
-
- /**
- * Returns a new object of class '<em>Trait</em>'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return a new object of class '<em>Trait</em>'.
- * @generated
- */
- Trait createTrait();
-
- /**
- * Returns a new object of class '<em>Include Entity Group</em>'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return a new object of class '<em>Include Entity Group</em>'.
- * @generated
- */
- IncludeEntityGroup createIncludeEntityGroup();
-
- /**
- * Returns a new object of class '<em>Model</em>'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return a new object of class '<em>Model</em>'.
- * @generated
- */
- Model createModel();
-
- /**
- * Returns a new object of class '<em>Entity</em>'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return a new object of class '<em>Entity</em>'.
- * @generated
- */
- Entity createEntity();
-
- /**
- * Returns a new object of class '<em>Entity Group</em>'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return a new object of class '<em>Entity Group</em>'.
- * @generated
- */
- EntityGroup createEntityGroup();
-
- /**
- * Returns the package supported by this factory.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the package supported by this factory.
- * @generated
- */
- MetadataPackage getMetadataPackage();
-
-} //MetadataFactory
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/MetadataPackage.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/MetadataPackage.java
deleted file mode 100644
index 087f6db..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/MetadataPackage.java
+++ /dev/null
@@ -1,871 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.jst.jsf.common.metadata;
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EDataType;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EReference;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Package</b> for the model.
- * It contains accessors for the meta objects to represent
- * <ul>
- * <li>each class,</li>
- * <li>each feature of each class,</li>
- * <li>each enum,</li>
- * <li>and each data type</li>
- * </ul>
- * <p><b>NOT API</b></p>
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.jsf.common.metadata.MetadataFactory
- * @model kind="package"
- * @generated
- */
-public interface MetadataPackage extends EPackage {
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- String copyright = "Copyright (c) 2007 Oracle Corporation"; //$NON-NLS-1$
-
- /**
- * The package name.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- String eNAME = "metadata"; //$NON-NLS-1$
-
- /**
- * The package namespace URI.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- String eNS_URI = "http://org.eclipse.jst.jsf.common.metadata/metadata.ecore"; //$NON-NLS-1$
-
- /**
- * The package namespace name.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- String eNS_PREFIX = "md"; //$NON-NLS-1$
-
- /**
- * The singleton instance of the package.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- MetadataPackage eINSTANCE = org.eclipse.jst.jsf.common.metadata.internal.impl.MetadataPackageImpl.init();
-
- /**
- * The meta object id for the '{@link org.eclipse.jst.jsf.common.metadata.internal.impl.TraitImpl <em>Trait</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.jsf.common.metadata.internal.impl.TraitImpl
- * @see org.eclipse.jst.jsf.common.metadata.internal.impl.MetadataPackageImpl#getTrait()
- * @generated
- */
- int TRAIT = 3;
-
- /**
- * The meta object id for the '{@link org.eclipse.jst.jsf.common.metadata.internal.impl.EntityImpl <em>Entity</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.jsf.common.metadata.internal.impl.EntityImpl
- * @see org.eclipse.jst.jsf.common.metadata.internal.impl.MetadataPackageImpl#getEntity()
- * @generated
- */
- int ENTITY = 2;
-
- /**
- * The feature id for the '<em><b>Child Entities</b></em>' containment reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int ENTITY__CHILD_ENTITIES = 0;
-
- /**
- * The feature id for the '<em><b>Traits</b></em>' containment reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int ENTITY__TRAITS = 1;
-
- /**
- * The feature id for the '<em><b>Id</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int ENTITY__ID = 2;
-
- /**
- * The feature id for the '<em><b>Type</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int ENTITY__TYPE = 3;
-
- /**
- * The feature id for the '<em><b>Include Groups</b></em>' reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int ENTITY__INCLUDE_GROUPS = 4;
-
- /**
- * The number of structural features of the '<em>Entity</em>' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int ENTITY_FEATURE_COUNT = 5;
-
- /**
- * The meta object id for the '{@link org.eclipse.jst.jsf.common.metadata.internal.impl.ModelImpl <em>Model</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.jsf.common.metadata.internal.impl.ModelImpl
- * @see org.eclipse.jst.jsf.common.metadata.internal.impl.MetadataPackageImpl#getModel()
- * @generated
- */
- int MODEL = 0;
-
- /**
- * The feature id for the '<em><b>Child Entities</b></em>' containment reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int MODEL__CHILD_ENTITIES = ENTITY__CHILD_ENTITIES;
-
- /**
- * The feature id for the '<em><b>Traits</b></em>' containment reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int MODEL__TRAITS = ENTITY__TRAITS;
-
- /**
- * The feature id for the '<em><b>Id</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int MODEL__ID = ENTITY__ID;
-
- /**
- * The feature id for the '<em><b>Type</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int MODEL__TYPE = ENTITY__TYPE;
-
- /**
- * The feature id for the '<em><b>Include Groups</b></em>' reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int MODEL__INCLUDE_GROUPS = ENTITY__INCLUDE_GROUPS;
-
- /**
- * The feature id for the '<em><b>Entity Groups</b></em>' reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int MODEL__ENTITY_GROUPS = ENTITY_FEATURE_COUNT + 0;
-
- /**
- * The feature id for the '<em><b>Source Model Provider</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int MODEL__SOURCE_MODEL_PROVIDER = ENTITY_FEATURE_COUNT + 1;
-
- /**
- * The feature id for the '<em><b>Current Model Context</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int MODEL__CURRENT_MODEL_CONTEXT = ENTITY_FEATURE_COUNT + 2;
-
- /**
- * The number of structural features of the '<em>Model</em>' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int MODEL_FEATURE_COUNT = ENTITY_FEATURE_COUNT + 3;
-
- /**
- * The meta object id for the '{@link org.eclipse.jst.jsf.common.metadata.internal.impl.IncludeEntityGroupImpl <em>Include Entity Group</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.jsf.common.metadata.internal.impl.IncludeEntityGroupImpl
- * @see org.eclipse.jst.jsf.common.metadata.internal.impl.MetadataPackageImpl#getIncludeEntityGroup()
- * @generated
- */
- int INCLUDE_ENTITY_GROUP = 4;
-
- /**
- * The meta object id for the '{@link org.eclipse.jst.jsf.common.metadata.internal.impl.EntityGroupImpl <em>Entity Group</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.jsf.common.metadata.internal.impl.EntityGroupImpl
- * @see org.eclipse.jst.jsf.common.metadata.internal.impl.MetadataPackageImpl#getEntityGroup()
- * @generated
- */
- int ENTITY_GROUP = 1;
-
- /**
- * The feature id for the '<em><b>Child Entities</b></em>' containment reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int ENTITY_GROUP__CHILD_ENTITIES = ENTITY__CHILD_ENTITIES;
-
- /**
- * The feature id for the '<em><b>Traits</b></em>' containment reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int ENTITY_GROUP__TRAITS = ENTITY__TRAITS;
-
- /**
- * The feature id for the '<em><b>Id</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int ENTITY_GROUP__ID = ENTITY__ID;
-
- /**
- * The feature id for the '<em><b>Type</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int ENTITY_GROUP__TYPE = ENTITY__TYPE;
-
- /**
- * The feature id for the '<em><b>Include Groups</b></em>' reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int ENTITY_GROUP__INCLUDE_GROUPS = ENTITY__INCLUDE_GROUPS;
-
- /**
- * The number of structural features of the '<em>Entity Group</em>' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int ENTITY_GROUP_FEATURE_COUNT = ENTITY_FEATURE_COUNT + 0;
-
- /**
- * The feature id for the '<em><b>Id</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int TRAIT__ID = 0;
-
- /**
- * The feature id for the '<em><b>Value</b></em>' containment reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int TRAIT__VALUE = 1;
-
- /**
- * The feature id for the '<em><b>Source Model Provider</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int TRAIT__SOURCE_MODEL_PROVIDER = 2;
-
- /**
- * The number of structural features of the '<em>Trait</em>' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int TRAIT_FEATURE_COUNT = 3;
-
- /**
- * The feature id for the '<em><b>Id</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int INCLUDE_ENTITY_GROUP__ID = 0;
-
- /**
- * The feature id for the '<em><b>Model Uri</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int INCLUDE_ENTITY_GROUP__MODEL_URI = 1;
-
- /**
- * The number of structural features of the '<em>Include Entity Group</em>' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int INCLUDE_ENTITY_GROUP_FEATURE_COUNT = 2;
-
- /**
- * The meta object id for the '<em>ITrait Visitor</em>' data type.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.jsf.common.metadata.query.ITraitVisitor
- * @see org.eclipse.jst.jsf.common.metadata.internal.impl.MetadataPackageImpl#getITraitVisitor()
- * @generated
- */
- int ITRAIT_VISITOR = 5;
-
- /**
- * The meta object id for the '<em>IEntity Visitor</em>' data type.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.jsf.common.metadata.query.IEntityVisitor
- * @see org.eclipse.jst.jsf.common.metadata.internal.impl.MetadataPackageImpl#getIEntityVisitor()
- * @generated
- */
- int IENTITY_VISITOR = 6;
-
- /**
- * The meta object id for the '<em>IMeta Data Source Model Provider</em>' data type.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.jsf.common.metadata.internal.IMetaDataSourceModelProvider
- * @see org.eclipse.jst.jsf.common.metadata.internal.impl.MetadataPackageImpl#getIMetaDataSourceModelProvider()
- * @generated
- */
- int IMETA_DATA_SOURCE_MODEL_PROVIDER = 7;
-
-
- /**
- * The meta object id for the '<em>Model Context</em>' data type.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.jsf.common.metadata.internal.ModelKeyDescriptor
- * @see org.eclipse.jst.jsf.common.metadata.internal.impl.MetadataPackageImpl#getModelContext()
- * @generated
- */
- int MODEL_CONTEXT = 8;
-
-
- /**
- * Returns the meta object for class '{@link org.eclipse.jst.jsf.common.metadata.Trait <em>Trait</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for class '<em>Trait</em>'.
- * @see org.eclipse.jst.jsf.common.metadata.Trait
- * @generated
- */
- EClass getTrait();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jst.jsf.common.metadata.Trait#getId <em>Id</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Id</em>'.
- * @see org.eclipse.jst.jsf.common.metadata.Trait#getId()
- * @see #getTrait()
- * @generated
- */
- EAttribute getTrait_Id();
-
- /**
- * Returns the meta object for the containment reference '{@link org.eclipse.jst.jsf.common.metadata.Trait#getValue <em>Value</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the containment reference '<em>Value</em>'.
- * @see org.eclipse.jst.jsf.common.metadata.Trait#getValue()
- * @see #getTrait()
- * @generated
- */
- EReference getTrait_Value();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jst.jsf.common.metadata.Trait#getSourceModelProvider <em>Source Model Provider</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Source Model Provider</em>'.
- * @see org.eclipse.jst.jsf.common.metadata.Trait#getSourceModelProvider()
- * @see #getTrait()
- * @generated
- */
- EAttribute getTrait_SourceModelProvider();
-
- /**
- * Returns the meta object for class '{@link org.eclipse.jst.jsf.common.metadata.IncludeEntityGroup <em>Include Entity Group</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for class '<em>Include Entity Group</em>'.
- * @see org.eclipse.jst.jsf.common.metadata.IncludeEntityGroup
- * @generated
- */
- EClass getIncludeEntityGroup();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jst.jsf.common.metadata.IncludeEntityGroup#getId <em>Id</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Id</em>'.
- * @see org.eclipse.jst.jsf.common.metadata.IncludeEntityGroup#getId()
- * @see #getIncludeEntityGroup()
- * @generated
- */
- EAttribute getIncludeEntityGroup_Id();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jst.jsf.common.metadata.IncludeEntityGroup#getModelUri <em>Model Uri</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Model Uri</em>'.
- * @see org.eclipse.jst.jsf.common.metadata.IncludeEntityGroup#getModelUri()
- * @see #getIncludeEntityGroup()
- * @generated
- */
- EAttribute getIncludeEntityGroup_ModelUri();
-
- /**
- * Returns the meta object for class '{@link org.eclipse.jst.jsf.common.metadata.Model <em>Model</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for class '<em>Model</em>'.
- * @see org.eclipse.jst.jsf.common.metadata.Model
- * @generated
- */
- EClass getModel();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jst.jsf.common.metadata.Model#getSourceModelProvider <em>Source Model Provider</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Source Model Provider</em>'.
- * @see org.eclipse.jst.jsf.common.metadata.Model#getSourceModelProvider()
- * @see #getModel()
- * @generated
- */
- EAttribute getModel_SourceModelProvider();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jst.jsf.common.metadata.Model#getCurrentModelContext <em>Current Model Context</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Current Model Context</em>'.
- * @see org.eclipse.jst.jsf.common.metadata.Model#getCurrentModelContext()
- * @see #getModel()
- * @generated
- */
- EAttribute getModel_CurrentModelContext();
-
- /**
- * Returns the meta object for the reference list '{@link org.eclipse.jst.jsf.common.metadata.Model#getEntityGroups <em>Entity Groups</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the reference list '<em>Entity Groups</em>'.
- * @see org.eclipse.jst.jsf.common.metadata.Model#getEntityGroups()
- * @see #getModel()
- * @generated
- */
- EReference getModel_EntityGroups();
-
- /**
- * Returns the meta object for class '{@link org.eclipse.jst.jsf.common.metadata.Entity <em>Entity</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for class '<em>Entity</em>'.
- * @see org.eclipse.jst.jsf.common.metadata.Entity
- * @generated
- */
- EClass getEntity();
-
- /**
- * Returns the meta object for the containment reference list '{@link org.eclipse.jst.jsf.common.metadata.Entity#getChildEntities <em>Child Entities</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the containment reference list '<em>Child Entities</em>'.
- * @see org.eclipse.jst.jsf.common.metadata.Entity#getChildEntities()
- * @see #getEntity()
- * @generated
- */
- EReference getEntity_ChildEntities();
-
- /**
- * Returns the meta object for the containment reference list '{@link org.eclipse.jst.jsf.common.metadata.Entity#getTraits <em>Traits</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the containment reference list '<em>Traits</em>'.
- * @see org.eclipse.jst.jsf.common.metadata.Entity#getTraits()
- * @see #getEntity()
- * @generated
- */
- EReference getEntity_Traits();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jst.jsf.common.metadata.Entity#getId <em>Id</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Id</em>'.
- * @see org.eclipse.jst.jsf.common.metadata.Entity#getId()
- * @see #getEntity()
- * @generated
- */
- EAttribute getEntity_Id();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jst.jsf.common.metadata.Entity#getType <em>Type</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Type</em>'.
- * @see org.eclipse.jst.jsf.common.metadata.Entity#getType()
- * @see #getEntity()
- * @generated
- */
- EAttribute getEntity_Type();
-
- /**
- * Returns the meta object for the reference list '{@link org.eclipse.jst.jsf.common.metadata.Entity#getIncludeGroups <em>Include Groups</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the reference list '<em>Include Groups</em>'.
- * @see org.eclipse.jst.jsf.common.metadata.Entity#getIncludeGroups()
- * @see #getEntity()
- * @generated
- */
- EReference getEntity_IncludeGroups();
-
- /**
- * Returns the meta object for class '{@link org.eclipse.jst.jsf.common.metadata.EntityGroup <em>Entity Group</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for class '<em>Entity Group</em>'.
- * @see org.eclipse.jst.jsf.common.metadata.EntityGroup
- * @generated
- */
- EClass getEntityGroup();
-
- /**
- * Returns the meta object for data type '{@link org.eclipse.jst.jsf.common.metadata.query.ITraitVisitor <em>ITrait Visitor</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for data type '<em>ITrait Visitor</em>'.
- * @see org.eclipse.jst.jsf.common.metadata.query.ITraitVisitor
- * @model instanceClass="org.eclipse.jst.jsf.common.metadata.query.ITraitVisitor" serializable="false"
- * @generated
- */
- EDataType getITraitVisitor();
-
- /**
- * Returns the meta object for data type '{@link org.eclipse.jst.jsf.common.metadata.query.IEntityVisitor <em>IEntity Visitor</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for data type '<em>IEntity Visitor</em>'.
- * @see org.eclipse.jst.jsf.common.metadata.query.IEntityVisitor
- * @model instanceClass="org.eclipse.jst.jsf.common.metadata.query.IEntityVisitor" serializable="false"
- * @generated
- */
- EDataType getIEntityVisitor();
-
- /**
- * Returns the meta object for data type '{@link org.eclipse.jst.jsf.common.metadata.internal.IMetaDataSourceModelProvider <em>IMeta Data Source Model Provider</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for data type '<em>IMeta Data Source Model Provider</em>'.
- * @see org.eclipse.jst.jsf.common.metadata.internal.IMetaDataSourceModelProvider
- * @model instanceClass="org.eclipse.jst.jsf.common.metadata.internal.IMetaDataSourceModelProvider"
- * @generated
- */
- EDataType getIMetaDataSourceModelProvider();
-
- /**
- * Returns the meta object for data type '{@link org.eclipse.jst.jsf.common.metadata.internal.ModelKeyDescriptor <em>Model Context</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for data type '<em>Model Context</em>'.
- * @see org.eclipse.jst.jsf.common.metadata.internal.ModelKeyDescriptor
- * @model instanceClass="org.eclipse.jst.jsf.common.metadata.internal.ModelKeyDescriptor"
- * @generated
- */
- EDataType getModelContext();
-
- /**
- * 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
- */
- MetadataFactory getMetadataFactory();
-
- /**
- * <!-- 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
- */
- @SuppressWarnings("hiding")
- interface Literals {
- /**
- * The meta object literal for the '{@link org.eclipse.jst.jsf.common.metadata.internal.impl.TraitImpl <em>Trait</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.jsf.common.metadata.internal.impl.TraitImpl
- * @see org.eclipse.jst.jsf.common.metadata.internal.impl.MetadataPackageImpl#getTrait()
- * @generated
- */
- EClass TRAIT = eINSTANCE.getTrait();
-
- /**
- * The meta object literal for the '<em><b>Id</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EAttribute TRAIT__ID = eINSTANCE.getTrait_Id();
-
- /**
- * The meta object literal for the '<em><b>Value</b></em>' containment reference feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EReference TRAIT__VALUE = eINSTANCE.getTrait_Value();
-
- /**
- * The meta object literal for the '<em><b>Source Model Provider</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EAttribute TRAIT__SOURCE_MODEL_PROVIDER = eINSTANCE.getTrait_SourceModelProvider();
-
- /**
- * The meta object literal for the '{@link org.eclipse.jst.jsf.common.metadata.internal.impl.IncludeEntityGroupImpl <em>Include Entity Group</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.jsf.common.metadata.internal.impl.IncludeEntityGroupImpl
- * @see org.eclipse.jst.jsf.common.metadata.internal.impl.MetadataPackageImpl#getIncludeEntityGroup()
- * @generated
- */
- EClass INCLUDE_ENTITY_GROUP = eINSTANCE.getIncludeEntityGroup();
-
- /**
- * The meta object literal for the '<em><b>Id</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EAttribute INCLUDE_ENTITY_GROUP__ID = eINSTANCE.getIncludeEntityGroup_Id();
-
- /**
- * The meta object literal for the '<em><b>Model Uri</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EAttribute INCLUDE_ENTITY_GROUP__MODEL_URI = eINSTANCE.getIncludeEntityGroup_ModelUri();
-
- /**
- * The meta object literal for the '{@link org.eclipse.jst.jsf.common.metadata.internal.impl.ModelImpl <em>Model</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.jsf.common.metadata.internal.impl.ModelImpl
- * @see org.eclipse.jst.jsf.common.metadata.internal.impl.MetadataPackageImpl#getModel()
- * @generated
- */
- EClass MODEL = eINSTANCE.getModel();
-
- /**
- * The meta object literal for the '<em><b>Source Model Provider</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EAttribute MODEL__SOURCE_MODEL_PROVIDER = eINSTANCE.getModel_SourceModelProvider();
-
- /**
- * The meta object literal for the '<em><b>Current Model Context</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EAttribute MODEL__CURRENT_MODEL_CONTEXT = eINSTANCE.getModel_CurrentModelContext();
-
- /**
- * The meta object literal for the '<em><b>Entity Groups</b></em>' reference list feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EReference MODEL__ENTITY_GROUPS = eINSTANCE.getModel_EntityGroups();
-
- /**
- * The meta object literal for the '{@link org.eclipse.jst.jsf.common.metadata.internal.impl.EntityImpl <em>Entity</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.jsf.common.metadata.internal.impl.EntityImpl
- * @see org.eclipse.jst.jsf.common.metadata.internal.impl.MetadataPackageImpl#getEntity()
- * @generated
- */
- EClass ENTITY = eINSTANCE.getEntity();
-
- /**
- * The meta object literal for the '<em><b>Child Entities</b></em>' containment reference list feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EReference ENTITY__CHILD_ENTITIES = eINSTANCE.getEntity_ChildEntities();
-
- /**
- * The meta object literal for the '<em><b>Traits</b></em>' containment reference list feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EReference ENTITY__TRAITS = eINSTANCE.getEntity_Traits();
-
- /**
- * The meta object literal for the '<em><b>Id</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EAttribute ENTITY__ID = eINSTANCE.getEntity_Id();
-
- /**
- * The meta object literal for the '<em><b>Type</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EAttribute ENTITY__TYPE = eINSTANCE.getEntity_Type();
-
- /**
- * The meta object literal for the '<em><b>Include Groups</b></em>' reference list feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EReference ENTITY__INCLUDE_GROUPS = eINSTANCE.getEntity_IncludeGroups();
-
- /**
- * The meta object literal for the '{@link org.eclipse.jst.jsf.common.metadata.internal.impl.EntityGroupImpl <em>Entity Group</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.jsf.common.metadata.internal.impl.EntityGroupImpl
- * @see org.eclipse.jst.jsf.common.metadata.internal.impl.MetadataPackageImpl#getEntityGroup()
- * @generated
- */
- EClass ENTITY_GROUP = eINSTANCE.getEntityGroup();
-
- /**
- * The meta object literal for the '<em>ITrait Visitor</em>' data type.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.jsf.common.metadata.query.ITraitVisitor
- * @see org.eclipse.jst.jsf.common.metadata.internal.impl.MetadataPackageImpl#getITraitVisitor()
- * @generated
- */
- EDataType ITRAIT_VISITOR = eINSTANCE.getITraitVisitor();
-
- /**
- * The meta object literal for the '<em>IEntity Visitor</em>' data type.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.jsf.common.metadata.query.IEntityVisitor
- * @see org.eclipse.jst.jsf.common.metadata.internal.impl.MetadataPackageImpl#getIEntityVisitor()
- * @generated
- */
- EDataType IENTITY_VISITOR = eINSTANCE.getIEntityVisitor();
-
- /**
- * The meta object literal for the '<em>IMeta Data Source Model Provider</em>' data type.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.jsf.common.metadata.internal.IMetaDataSourceModelProvider
- * @see org.eclipse.jst.jsf.common.metadata.internal.impl.MetadataPackageImpl#getIMetaDataSourceModelProvider()
- * @generated
- */
- EDataType IMETA_DATA_SOURCE_MODEL_PROVIDER = eINSTANCE.getIMetaDataSourceModelProvider();
-
- /**
- * The meta object literal for the '<em>Model Context</em>' data type.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.jsf.common.metadata.internal.ModelKeyDescriptor
- * @see org.eclipse.jst.jsf.common.metadata.internal.impl.MetadataPackageImpl#getModelContext()
- * @generated
- */
- EDataType MODEL_CONTEXT = eINSTANCE.getModelContext();
-
- }
-
-} //MetadataPackage
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/Model.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/Model.java
deleted file mode 100644
index 26b2a63..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/Model.java
+++ /dev/null
@@ -1,130 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.jst.jsf.common.metadata;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.jst.jsf.common.metadata.internal.IMetaDataSourceModelProvider;
-import org.eclipse.jst.jsf.common.metadata.internal.ModelKeyDescriptor;
-import org.eclipse.jst.jsf.common.metadata.query.IEntityVisitor;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Model</b></em>'.
- * <p><b>Provisional API - subject to change</b></p>
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- * <li>{@link org.eclipse.jst.jsf.common.metadata.Model#getEntityGroups <em>Entity Groups</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.common.metadata.Model#getSourceModelProvider <em>Source Model Provider</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.common.metadata.Model#getCurrentModelContext <em>Current Model Context</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.jsf.common.metadata.MetadataPackage#getModel()
- * @model extendedMetaData="kind='element' name='metadatamodel'"
- * @generated
- */
-public interface Model extends Entity {
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- String copyright = "Copyright (c) 2007 Oracle Corporation"; //$NON-NLS-1$
-
- /**
- * Returns the value of the '<em><b>Source Model Provider</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Source Model Provider</em>' attribute isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @return the value of the '<em>Source Model Provider</em>' attribute.
- * @see #setSourceModelProvider(IMetaDataSourceModelProvider)
- * @see org.eclipse.jst.jsf.common.metadata.MetadataPackage#getModel_SourceModelProvider()
- * @model unique="false" dataType="org.eclipse.jst.jsf.common.metadata.IMetaDataSourceModelProvider" transient="true" volatile="true"
- * @generated
- */
- IMetaDataSourceModelProvider getSourceModelProvider();
-
- /**
- * Sets the value of the '{@link org.eclipse.jst.jsf.common.metadata.Model#getSourceModelProvider <em>Source Model Provider</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Source Model Provider</em>' attribute.
- * @see #getSourceModelProvider()
- * @generated
- */
- void setSourceModelProvider(IMetaDataSourceModelProvider value);
-
- /**
- * Returns the value of the '<em><b>Current Model Context</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Current Model Context</em>' attribute isn't clear,
- * there really should be more of a description here...
- * @deprecated - Helios
- * </p>
- * <!-- end-user-doc -->
- * @return the value of the '<em>Current Model Context</em>' attribute.
- * @see #setCurrentModelContext(ModelKeyDescriptor)
- * @see org.eclipse.jst.jsf.common.metadata.MetadataPackage#getModel_CurrentModelContext()
- * @model dataType="org.eclipse.jst.jsf.common.metadata.ModelContext" transient="true" volatile="true"
- * @generated
- */
- ModelKeyDescriptor getCurrentModelContext();
-
- /**
- * Sets the value of the '{@link org.eclipse.jst.jsf.common.metadata.Model#getCurrentModelContext <em>Current Model Context</em>}' attribute.
- * <!-- begin-user-doc -->
- * @deprecated - Helios
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Current Model Context</em>' attribute.
- * @see #getCurrentModelContext()
- * @generated
- */
- void setCurrentModelContext(ModelKeyDescriptor value);
-
- /**
- * Returns the value of the '<em><b>Entity Groups</b></em>' reference list.
- * The list contents are of type {@link org.eclipse.jst.jsf.common.metadata.EntityGroup}.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Entity Groups</em>' reference list isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @return the value of the '<em>Entity Groups</em>' reference list.
- * @see org.eclipse.jst.jsf.common.metadata.MetadataPackage#getModel_EntityGroups()
- * @model type="org.eclipse.jst.jsf.common.metadata.EntityGroup"
- * extendedMetaData="kind='element' name='entityGroup'"
- * @generated
- */
- EList getEntityGroups();
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param groupId
- * @return EntityGroup
- * @model
- * @generated
- */
- EntityGroup findIncludeGroup(String groupId);
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @model visitorDataType="org.eclipse.jst.jsf.common.metadata.IEntityVisitor"
- * @generated
- */
- void accept(IEntityVisitor visitor);
-
-} // Model
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/Trait.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/Trait.java
deleted file mode 100644
index 4eb1b30..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/Trait.java
+++ /dev/null
@@ -1,129 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.jst.jsf.common.metadata;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jst.jsf.common.metadata.internal.IMetaDataSourceModelProvider;
-import org.eclipse.jst.jsf.common.metadata.query.ITraitVisitor;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Trait</b></em>'.
- * <p><b>Provisional API - subject to change</b></p>
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- * <li>{@link org.eclipse.jst.jsf.common.metadata.Trait#getId <em>Id</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.common.metadata.Trait#getValue <em>Value</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.common.metadata.Trait#getSourceModelProvider <em>Source Model Provider</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.jsf.common.metadata.MetadataPackage#getTrait()
- * @model extendedMetaData="kind='element' name='trait'"
- * @generated
- */
-public interface Trait extends EObject {
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- String copyright = "Copyright (c) 2007 Oracle Corporation"; //$NON-NLS-1$
-
- /**
- * Returns the value of the '<em><b>Id</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Id</em>' attribute isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @return the value of the '<em>Id</em>' attribute.
- * @see #setId(String)
- * @see org.eclipse.jst.jsf.common.metadata.MetadataPackage#getTrait_Id()
- * @model id="true" required="true"
- * @generated
- */
- String getId();
-
- /**
- * Sets the value of the '{@link org.eclipse.jst.jsf.common.metadata.Trait#getId <em>Id</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Id</em>' attribute.
- * @see #getId()
- * @generated
- */
- void setId(String value);
-
- /**
- * Returns the value of the '<em><b>Value</b></em>' containment reference.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Value</em>' reference isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @return the value of the '<em>Value</em>' containment reference.
- * @see #setValue(EObject)
- * @see org.eclipse.jst.jsf.common.metadata.MetadataPackage#getTrait_Value()
- * @model containment="true" required="true"
- * extendedMetaData="kind='element' namespace='##targetNamespace'"
- * @generated
- */
- EObject getValue();
-
- /**
- * Sets the value of the '{@link org.eclipse.jst.jsf.common.metadata.Trait#getValue <em>Value</em>}' containment reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Value</em>' containment reference.
- * @see #getValue()
- * @generated
- */
- void setValue(EObject value);
-
- /**
- * Returns the value of the '<em><b>Source Model Provider</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Source Model Provider</em>' attribute isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @return the value of the '<em>Source Model Provider</em>' attribute.
- * @see #setSourceModelProvider(IMetaDataSourceModelProvider)
- * @see org.eclipse.jst.jsf.common.metadata.MetadataPackage#getTrait_SourceModelProvider()
- * @model dataType="org.eclipse.jst.jsf.common.metadata.IMetaDataSourceModelProvider"
- * @generated
- */
- IMetaDataSourceModelProvider getSourceModelProvider();
-
- /**
- * Sets the value of the '{@link org.eclipse.jst.jsf.common.metadata.Trait#getSourceModelProvider <em>Source Model Provider</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Source Model Provider</em>' attribute.
- * @see #getSourceModelProvider()
- * @generated
- */
- void setSourceModelProvider(IMetaDataSourceModelProvider value);
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param visitor
- * @model visitorDataType="org.eclipse.jst.jsf.common.metadata.query.ITraitVisitor"
- * annotation="http://www.eclipse.org/emf/2002/GenModel body='visitor.visit(this);'"
- * @generated
- */
- void accept(ITraitVisitor visitor);
-
-} // Trait
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/AbstractMetaDataLocator.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/AbstractMetaDataLocator.java
deleted file mode 100644
index a3e46e3..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/AbstractMetaDataLocator.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 Oracle 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:
- * Oracle - initial API and implementation
- *
- ********************************************************************************/
-package org.eclipse.jst.jsf.common.metadata.internal;
-
-import java.util.HashSet;
-import java.util.Set;
-
-/**
- * Convenient abstract class that a source model locator should consider extending.
- */
-public abstract class AbstractMetaDataLocator implements IMetaDataLocator, IMetaDataObservable{
-
- private IDomainSourceModelType domainSourceModelType;
- private Set <IMetaDataObserver> observers;
-
- /**
- * Constructor
- */
- public AbstractMetaDataLocator(){
- observers = new HashSet(1);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.jsf.common.metadata.internal.IMetaDataLocator#getDomainSourceModelType()
- */
- public IDomainSourceModelType getDomainSourceModelType() {
- return domainSourceModelType;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.jsf.common.metadata.internal.IMetaDataLocator#setDomainSourceModelType(org.eclipse.jst.jsf.common.metadata.internal.IDomainSourceModelType)
- */
- public void setDomainSourceModelType(
- final IDomainSourceModelType domainSourceModelType) {
- this.domainSourceModelType = domainSourceModelType;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.jsf.common.metadata.internal.IMetaDataLocator#addObserver(org.eclipse.jst.jsf.common.metadata.internal.IMetaDataObserver)
- */
- public void addObserver(final IMetaDataObserver observer) {
- observers.add(observer);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.jsf.common.metadata.internal.IMetaDataLocator#removeObserver(org.eclipse.jst.jsf.common.metadata.internal.IMetaDataObserver)
- */
- public void removeObserver(final IMetaDataObserver observer) {
- observers.remove(observer);
- }
-
- /**
- * @return the set of {@link IMetaDataObserver}s for this instance
- */
- public Set <IMetaDataObserver> getObservers(){
- return observers;
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/AbstractMetaDataModelManager.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/AbstractMetaDataModelManager.java
deleted file mode 100644
index 829bf23..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/AbstractMetaDataModelManager.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Oracle Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Oracle Corporation - initial API and implementation and/or initial documentation
- *******************************************************************************/
-
-package org.eclipse.jst.jsf.common.metadata.internal;
-
-import org.eclipse.jst.jsf.common.internal.managedobject.AbstractManagedObject;
-
-
-/**
- * Abstract implementation of an {@link IMetaDataModelManager} that all implementers must subclass
- */
-public abstract class AbstractMetaDataModelManager extends AbstractManagedObject implements IMetaDataModelManager {
-
- @Override
- public void dispose() {
- //do nothing by default
- }
-
- @Override
- public void checkpoint() {
- //do nothing by default
- }
-
- @Override
- public void destroy() {
- // do nothing by default
- }
-
-}
\ No newline at end of file
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/AbstractTagLibDomainContentModelMetaDataTranslator.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/AbstractTagLibDomainContentModelMetaDataTranslator.java
deleted file mode 100644
index ed0d1c5..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/AbstractTagLibDomainContentModelMetaDataTranslator.java
+++ /dev/null
@@ -1,360 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2007 Oracle Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Oracle Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.common.metadata.internal;
-
-import java.util.Iterator;
-
-import org.eclipse.jst.jsf.common.metadata.Entity;
-import org.eclipse.jst.jsf.common.metadata.MetadataFactory;
-import org.eclipse.jst.jsf.common.metadata.MetadataPackage;
-import org.eclipse.jst.jsf.common.metadata.Model;
-import org.eclipse.jst.jsf.common.metadata.Trait;
-import org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.BooleanValue;
-import org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.StringValue;
-import org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.TraitTypesFactory;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMAttributeDeclaration;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMDocument;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration;
-
-/**
- * Abstract class that the taglib domain translators use to
- * convert the CM model to a standard meta data model
- *
- */
-public abstract class AbstractTagLibDomainContentModelMetaDataTranslator {
-
- /**
- * {@link IMetaDataModelMergeAssistant} to use
- */
- protected IMetaDataModelMergeAssistant _assistant;
-
- /**
- * Set the assistant to use during the translation. Must be called prior to doTransalate(doc);
- * @param assistant
- */
- protected void setAssistant(IMetaDataModelMergeAssistant assistant){
- _assistant = assistant;
- }
-
- /**
- * Transforms the CMDocument into entities and traits of a standard metadata model
- * using the assistant that must be set before this call.
- * @param doc
- */
- protected void doTranslate(CMDocument doc){
- createTags(doc);
- createTagfileTraits(doc);
- }
-
- /**
- * @param entity
- * @param key
- * @param value
- */
- protected void createSimpleStringEntityTraitIfNecessary(final Entity entity, final String key,
- final String value) {
- Trait t = findTraitOnEntityById(entity, key);
- if (t == null){
- t = internalCreateTrait(entity, key);
-
- StringValue val = TraitTypesFactory.eINSTANCE.createStringValue();
- val.setValue(value);
-
- t.setValue(val);
- }
- }
-
- /**
- * @param entity
- * @param key
- * @param value
- */
- protected void createSimpleBooleanObjectEntityTraitIfNecessary(final Entity entity,
- String key, boolean value) {
-
- Trait t = findTraitOnEntityById(entity, key);
- if (t == null){
- t = internalCreateTrait(entity, key);
-
- BooleanValue val = TraitTypesFactory.eINSTANCE.createBooleanValue();
- val.setTrue(value);
-
- t.setValue(val);
- }
-
- }
-
- /**
- * @param entity
- * @param key
- * @return Trait
- */
- protected Trait internalCreateTrait(final Entity entity, final String key) {
- Trait t = MetadataFactory.eINSTANCE.createTrait();
- t.setId(key);
- t.setSourceModelProvider(_assistant.getSourceModelProvider());
- entity.getTraits().add(t);
- return t;
- }
-
- /**
- * @param entity
- * @param key
- * @return Trait
- */
- protected Trait findTraitOnEntityById(final Entity entity, final String key) {
- for (Iterator it=entity.getTraits().iterator();it.hasNext();){
- Trait t = (Trait)it.next();
- if (key.equals(t.getId()))
- return t;
- }
- return null;
- }
-
- /**
- * @param nodeName
- * @return Entity
- */
- protected Entity findTagEntity(final String nodeName) {
- for (Iterator it=getMergedModel().getChildEntities().iterator();it.hasNext();){
- Entity entity = (Entity)it.next();
- if (nodeName.equals(entity.getId()))
- return entity;
- }
- return null;
- }
-
- /**
- * @param tag
- * @param attributeName
- * @return Attribute entity for supplied attribute name and given Tag entity. Will return null if not found.
- */
- protected Entity findAttributeEntityForTagEntity(final Entity tag, final String attributeName) {
- for (Iterator it=tag.getChildEntities().iterator();it.hasNext();){
- Entity attr = (Entity)it.next();
- if (attributeName.equals(attr.getId()))
- return attr;
- }
- return null;
- }
- /**
- * Create entities for tags
- * @param doc
- */
- protected void createTags(final CMDocument doc) {
- for (Iterator it=doc.getElements().iterator();it.hasNext();){
- CMElementDeclaration tag = (CMElementDeclaration)it.next();
- Entity entity = findTagEntity(tag.getNodeName());
- if (entity == null){
- entity = MetadataFactory.eINSTANCE.createEntity();
- entity.setId(getTagNodeName(tag));
- entity.setType("tag"); //$NON-NLS-1$
- getMergedModel().getChildEntities().add(entity);
- }
- setTagEntityTraits(tag, entity);
- }
-
- }
-
- /**
- * @param tag
- * @return tag node name
- */
- protected String getTagNodeName(CMElementDeclaration tag) {
- return tag.getNodeName();
- }
-
- /**
- * Sets the standard traits for a tag entity from the element declaration
- * @param tag
- * @param entity
- */
- protected void setTagEntityTraits(CMElementDeclaration tag, Entity entity) {
- createSimpleStringEntityTraitIfNecessary(entity, "display-label", getTagDisplayName(tag)); //$NON-NLS-1$
- createSimpleStringEntityTraitIfNecessary(entity, "description", getTagDescription(tag)); //$NON-NLS-1$
- createSimpleStringEntityTraitIfNecessary(entity, "small-icon", getTagSmallIcon(tag)); //$NON-NLS-1$
- createSimpleStringEntityTraitIfNecessary(entity, "large-icon", getTagLargeIcon(tag)); //$NON-NLS-1$
- createSimpleBooleanObjectEntityTraitIfNecessary(entity, "expert", getTagIsExpert(tag)); //$NON-NLS-1$
- createSimpleBooleanObjectEntityTraitIfNecessary(entity, "hidden", getTagIsHidden(tag)); //$NON-NLS-1$
-
- createAttributeEntities(entity, tag);
- }
-
- /**
- * @param tagEntity
- * @param tag
- */
- protected void createAttributeEntities(Entity tagEntity,
- CMElementDeclaration tag) {
-
- for (Iterator it=tag.getAttributes().iterator();it.hasNext();){
- CMAttributeDeclaration cmAttr = (CMAttributeDeclaration)it.next();
- Entity attr = findAttributeEntityForTagEntity(tagEntity, cmAttr.getAttrName());
- if (attr == null) {
- attr = MetadataFactory.eINSTANCE.createEntity();
- attr.setId(cmAttr.getAttrName());
- tagEntity.getChildEntities().add(attr);
- }
- createAttributeTraits(attr, cmAttr);
- }
-
-
- }
-
- /**
- * @param attr
- * @param cmAttr
- */
- protected void createAttributeTraits(Entity attr,
- CMAttributeDeclaration cmAttr) {
-
- createSimpleStringEntityTraitIfNecessary(attr, "description", getTagAttributeDescription(cmAttr)); //$NON-NLS-1$
- createSimpleBooleanObjectEntityTraitIfNecessary(attr, "required", getTagAttributeIsRequired(cmAttr)); //$NON-NLS-1$
- createSimpleStringEntityTraitIfNecessary(attr, "default-value", getTagAttributeDefaultValue(cmAttr)); //$NON-NLS-1$
- }
-
- /**
- * @param cmAttr
- * @return null. subclass should override if CMAttributeDeclaration has the metadata.
- */
- protected String getTagAttributeDescription(CMAttributeDeclaration cmAttr) {return null;}
-
- /**
- * @param cmAttr
- * @return false. subclass should override if CMAttributeDeclaration has the metadata.
- */
- protected boolean getTagAttributeIsRequired(CMAttributeDeclaration cmAttr) {return cmAttr.getUsage() == CMAttributeDeclaration.REQUIRED;}
-
- /**
- * @param cmAttr
- * @return null. subclass should override if CMAttributeDeclaration has the metadata.
- */
- protected String getTagAttributeDefaultValue(CMAttributeDeclaration cmAttr) {return null;}
-
- /**
- * @param tag
- * @return false. subclass should override if CMElementDeclaration has the metadata.
- */
- protected boolean getTagIsHidden(CMElementDeclaration tag) {return false;}
-
- /**
- * @param tag
- * @return false. subclass should override if CMElementDeclaration has the metadata.
- */
- protected boolean getTagIsExpert(CMElementDeclaration tag) {return false;}
-
- /**
- * @param tag
- * @return null. subclass should override if CMElementDeclaration has the metadata.
- */
- protected String getTagLargeIcon(CMElementDeclaration tag) {return null;}
-
- /**
- * @param tag
- * @return null. subclass should override if CMElementDeclaration has the metadata.
- */
- protected String getTagSmallIcon(CMElementDeclaration tag) {return null;}
-
- /**
- * @param tag
- * @return null. subclass should override if CMElementDeclaration has the metadata.
- */
- protected String getTagDescription(CMElementDeclaration tag) {return null;}
-
- /**
- * @param tag
- * @return tag.getElementName()
- */
- protected String getTagDisplayName(CMElementDeclaration tag) {return tag.getElementName();}
-
- /**
- * Creates standard traits for tag file entity from CMDocument metadata
- * @param doc
- */
- protected void createTagfileTraits(CMDocument doc) {
- Model model = getMergedModel();
-
- createSimpleStringEntityTraitIfNecessary(model, "display-label", getURIDisplayLabel()); //$NON-NLS-1$
- createSimpleStringEntityTraitIfNecessary(model, "description", getURIDescription()); //$NON-NLS-1$
- createSimpleStringEntityTraitIfNecessary(model, "default-prefix", getURIDefaultPrefix()); //$NON-NLS-1$
- createSimpleBooleanObjectEntityTraitIfNecessary(model, "expert", getURIExpert()); //$NON-NLS-1$
- createSimpleBooleanObjectEntityTraitIfNecessary(model, "hidden", getURIHidden()); //$NON-NLS-1$
-
- }
-
- /**
- * @return the display label to use for this model. Subclasses should override if model has the meta data.
- */
- protected String getURIDisplayLabel(){
- return getMergedModel().getId();
- }
-
- /**
- * @return default prefix to use for tags. Returns null. Subclasses should override if model has the meta data.
- */
- protected String getURIDefaultPrefix(){
- return null;
- }
-
- /**
- * @return description to use. Default is the URI. Subclasses should override if model has the meta data.
- */
- protected String getURIDescription(){
- return getMergedModel().getId();
- }
-
- /**
- * @return false. Subclasses should override if model has the meta data.
- */
- protected boolean getURIExpert() { return false;}
-
- /**
- * @return false. Subclasses should override if model has the meta data.
- */
- protected boolean getURIHidden() {return false; }
-
- /**
- * @return a model of all entities and traits
- */
- protected Model getMergedModel() {
- Model model = (Model)_assistant.getMergedModel().getRoot();
- if (model == null){
- //need to create model key object
- Model tld = createTLDModel();
- _assistant.getMergedModel().setRoot(tld);
- model = (Model)_assistant.getMergedModel().getRoot();
- }
- return model;
- }
-
- /**
- * @return new model
- */
- protected Model createTLDModel() {
- Model entity = getFactory().createModel();
- entity.setId(_assistant.getMergedModel().getModelContext().getModelIdentifier());
- return entity;
- }
-
- /**
- * @return MetadataFactory instance
- */
- protected MetadataFactory getFactory(){
- return (MetadataFactory) MetadataPackage.eINSTANCE.getEFactoryInstance();
- }
-
- /**
- * @return CMDocument being used for the current translate call
- */
- protected CMDocument getSourceModel() {
- return (CMDocument)_assistant.getSourceModelProvider().getSourceModel();
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/DomainLoadingStrategy.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/DomainLoadingStrategy.java
deleted file mode 100644
index 8cfda6a..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/DomainLoadingStrategy.java
+++ /dev/null
@@ -1,195 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 Oracle 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:
- * Oracle - initial API and implementation
- *
- ********************************************************************************/
-package org.eclipse.jst.jsf.common.metadata.internal;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jst.jsf.common.JSFCommonPlugin;
-
-/**
- * Default class used for loading metadata.
- * Loads the source types from extensions defined against the domain.
- *
- * see org.eclipse.jst.jsf.common.domainLoadingStrategies ext-pt
- */
-public class DomainLoadingStrategy implements IDomainLoadingStrategy, IMetaDataObserver {
-
- /**
- * Domain id
- */
- protected String domain;
-
- private MetaDataModel _model;
- private List <IDomainSourceModelType> _sourceTypes;
- private List <IMetaDataSourceModelProvider> _sources;
-
- /**
- * Constructor
- * @param domain
- */
- public DomainLoadingStrategy(String domain){
- this.domain = domain;
- }
-
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.jsf.common.metadata.internal.IDomainLoadingStrategy#load(org.eclipse.jst.jsf.common.metadata.internal.MetaDataModel)
- */
- public void load(MetaDataModel model) {
- this._model = model;
- _sourceTypes = loadDomainSourceModelTypes();
- sortSourceTypes(_sourceTypes);
- _sources = locateMetaDataSourceInstances(_sourceTypes, model);
- mergeModel(model, _sources);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.jsf.common.metadata.internal.IDomainLoadingStrategy#reload()
- */
- public void reload() throws ModelNotSetException {
- //System.out.println("reload");//debug //$NON-NLS-1$
- if (_model == null)
- throw new ModelNotSetException();
-
- removeOldLocatorObservers();
- _sources = locateMetaDataSourceInstances(_sourceTypes, _model);
- mergeModel(_model, _sources);
- }
-
- /**
- * Responsible for iterating through the sorted list of <code>IMetaDataSourceModelProvider</code>
- * and merging the models after first translating the source model as required, into a single mreged model of
- * standard metadata Entities and Traits.
- * @param model
- * @param sources
- */
- protected void mergeModel(final MetaDataModel model, final List <IMetaDataSourceModelProvider> sources) {
-
- StandardModelFactory.debug(">> Begin Merge: "+model.getModelContext()+"("+sources.size()+ " sources)", StandardModelFactory.DEBUG_MD_LOAD); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-
- final IMetaDataModelMergeAssistant assistant = createModelMergeAssistant(model);
- for (final IMetaDataSourceModelProvider mds : sources){
- final Iterator translators = mds.getLocator().getDomainSourceModelType().getTranslators().iterator();
- while (translators.hasNext()){
- final IMetaDataTranslator translator = (IMetaDataTranslator)translators.next();
- if (translator.canTranslate(mds)){
- StandardModelFactory.debug(">>> Merging: "+model.getModelContext()+"::"+mds, StandardModelFactory.DEBUG_MD_LOAD); //$NON-NLS-1$//$NON-NLS-2$
- assistant.setSourceModelProvider(mds);
- try {
- translator.translate(assistant);
- } catch (Exception e) {
- StandardModelFactory.debug(">>>> Error during translate/merge of: "+model.getModelContext()+": "+mds, StandardModelFactory.DEBUG_MD_LOAD); //$NON-NLS-1$ //$NON-NLS-2$
- JSFCommonPlugin.log(IStatus.ERROR, "Error during load of: "+mds, e); //$NON-NLS-1$
- }
- }
- }
- }
- assistant.setMergeComplete();
- StandardModelFactory.debug(">> End Merge: "+model.getModelContext(),StandardModelFactory.DEBUG_MD_LOAD); //$NON-NLS-1$
- }
-
- /**
- * @param model
- * @return an instance of a IMetaDataModelMergeAssistant to be used while merging source models
- */
- protected IMetaDataModelMergeAssistant createModelMergeAssistant(MetaDataModel model){
- return new MetaDataModelMergeAssistantImpl(model);
- }
-
- /**
- * Allows for subclasses to override the default mechanism for sorting the source types.
- * @param sourceTypes
- */
- protected void sortSourceTypes(List <IDomainSourceModelType> sourceTypes) {
- //allows override
- }
-
- /**
- * @return list of <code>IDomainSourceModelType</code>s located in the <code>DomainSourceTypesRegistry</code>
- * for the specified uri
- */
- protected List <IDomainSourceModelType> loadDomainSourceModelTypes() {
- return DomainSourceTypesRegistry.getInstance().getDomainSourceTypes(domain);
- }
-
- /**
- * @param sourceTypes
- * @param model
- * @return list of <code>IMetaDataSourceModelProvider</code> instances from the domain source types applicable for
- * this domain for this particular uri specified in the model
- */
- protected List <IMetaDataSourceModelProvider> locateMetaDataSourceInstances(final List <IDomainSourceModelType> sourceTypes, MetaDataModel model) {
- final List<IMetaDataSourceModelProvider> sources = new ArrayList<IMetaDataSourceModelProvider>();
- final IProject project = getProject(model);
- for (final IDomainSourceModelType sourceType : sourceTypes){
- final IMetaDataLocator locator = sourceType.getLocator(project);
- if (locator != null) {
- //We MUST set the sourceType here to associate the handler with locator to use for the source models
- locator.setDomainSourceModelType(sourceType);
-
- final List <IMetaDataSourceModelProvider> providers = locator.locateMetaDataModelProviders(model.getModelContext().getModelIdentifier());
- if (providers != null && !providers.isEmpty()){
- for (final IMetaDataSourceModelProvider provider : providers){
- //We MUST set the sourceType here to associate the translators to use for the source models
- provider.setLocator(locator);
- sources.add(provider);
- }
- }
- //listen for changes
- locator.addObserver(this);
- }
- }
- return sources;
- }
-
- private IProject getProject(final MetaDataModel model) {
- return (IProject)model.getModelContext().getAdapter(IProject.class);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.jsf.common.metadata.internal.IMetaDataObserver#notifyMetadataChanged(org.eclipse.jst.jsf.common.metadata.internal.IMetaDataChangeNotificationEvent)
- */
- public void notifyMetadataChanged(final IMetaDataChangeNotificationEvent event) {
- //for now, if any event occurs, we need to flush the _model so that it will rebuild
- _model.setNeedsRefresh();
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.jsf.common.metadata.internal.IDomainLoadingStrategy#cleanup()
- */
- public void cleanup(){
- removeOldLocatorObservers();
- _sources = null;
- _sourceTypes = null;
- _model = null;
- }
-
- private void removeOldLocatorObservers(){
- if (_sources != null){
- for (final IMetaDataSourceModelProvider provider : _sources){
- if (provider != null) {
- final IMetaDataLocator locator = provider.getLocator();
- if (locator != null){
- locator.removeObserver(this);
- locator.setDomainSourceModelType(null);
- provider.setLocator(null);
- }
- }
- }
- }
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/DomainLoadingStrategyRegistry.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/DomainLoadingStrategyRegistry.java
deleted file mode 100644
index d5b1755..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/DomainLoadingStrategyRegistry.java
+++ /dev/null
@@ -1,171 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 Oracle 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:
- * Oracle - initial API and implementation
- *
- ********************************************************************************/
-package org.eclipse.jst.jsf.common.metadata.internal;
-
-import java.lang.reflect.InvocationTargetException;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtensionPoint;
-import org.eclipse.core.runtime.IExtensionRegistry;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.jst.jsf.common.JSFCommonPlugin;
-
-
-/**
- * Registry of strategies used to load domains of metadata.
- * Uses the <code>org.eclipse.jst.jsf.common.domainLoadingStrategies</code> ext-pt to load.
- *
- * see <code>org.eclipse.jst.jsf.common.domainLoadingStrategies</code> ext-pt
- */
-public class DomainLoadingStrategyRegistry{
- private static DomainLoadingStrategyRegistry INSTANCE;
-
- private HashMap <String, DomainLoadingStrategyDescriptorImpl> domainLoadingStrategyDescriptors;
-
- private static final String EXTENSION_POINT_ID = "domainLoadingStrategies"; //$NON-NLS-1$
-
- private DomainLoadingStrategyRegistry(){
- init();
- }
-
- /**
- * @return singleton instance of the DomainLoadingStrategyRegistry
- */
- public synchronized static DomainLoadingStrategyRegistry getInstance() {
- if (INSTANCE == null){
- INSTANCE = new DomainLoadingStrategyRegistry();
- }
- return INSTANCE;
- }
-
- /**
- * Loads registry with descriptors from the domainLoadingStrategies ext-pt.
- */
- synchronized final void init(){
- final IExtensionRegistry extensionRegistry = Platform.getExtensionRegistry();
- final IExtensionPoint point = extensionRegistry.getExtensionPoint(JSFCommonPlugin.PLUGIN_ID, EXTENSION_POINT_ID );
- if (point != null) {
- IConfigurationElement[] elements = point.getConfigurationElements();
- for (int i = 0; i < elements.length; i++) {
- IConfigurationElement element = elements[i];
- DomainLoadingStrategyDescriptorImpl dls = new DomainLoadingStrategyDescriptorImpl(element);
- addDomainLoadingStrategyDescriptor(dls);
- }
- }
- }
-
- /**
- * Add domain loading strategy descriptor for a domain to the registry domains
- * @param strategy
- */
- protected void addDomainLoadingStrategyDescriptor(final DomainLoadingStrategyDescriptorImpl strategy){
- getDescriptors().put(strategy.getDomain(), strategy);
- }
-
- /**
- * @param domain
- * @return an instance of an <code>IDomainLoadingStrategy</code> for the given domain
- */
- public IDomainLoadingStrategy getLoadingStrategy(final String domain){
- final DomainLoadingStrategyDescriptorImpl strategy = getDescriptors().get(domain);
- if (strategy == null){
- return createDefaultLoadingStrategy();
- }
- return createLoadingStrategy(domain);
- }
-
-
- /**
- * @return strategy that will only use standard metadata files
- */
- private IDomainLoadingStrategy createDefaultLoadingStrategy() {
- return new DomainLoadingStrategy(null);
- }
-
- private IDomainLoadingStrategy createLoadingStrategy(final String domain){
- return getDescriptors().get(domain).newInstance();
- }
-
- private Map <String, DomainLoadingStrategyDescriptorImpl> getDescriptors(){
- if (domainLoadingStrategyDescriptors == null){
- domainLoadingStrategyDescriptors = new HashMap<String, DomainLoadingStrategyDescriptorImpl>();
- }
- return domainLoadingStrategyDescriptors;
- }
-
- /**
- * Implementation of a DomainLoadingStrategy descriptor that is responsible for creating instances of the IDomainLoadingStrategy
- */
- private static class DomainLoadingStrategyDescriptorImpl {
- String domain;
- String loadingStrategyClassName;
- String bundleId;
- Class strategy;
- IConfigurationElement element;
-
- DomainLoadingStrategyDescriptorImpl(IConfigurationElement element){
- this.element = element;
- this.init();
- }
-
- private void init() {
- domain = element.getAttribute("domainId"); //$NON-NLS-1$
- bundleId = element.getContributor().getName();
- loadingStrategyClassName = element.getAttribute("domainLoadingStrategy"); //$NON-NLS-1$
- }
-
- /**
- * @return domain id
- */
- public String getDomain() {
- return domain;
- }
-
- /**
- * @return new instance of IDomainLoadingStrategy
- */
- public IDomainLoadingStrategy newInstance(){
- try {
- Class[] parameterTypes = new Class[]{String.class};
- Object[] initargs = new Object[]{domain};
- Object loader = this.getLoadingStrategy().getConstructor(parameterTypes).newInstance(initargs);
- if (loader instanceof IDomainLoadingStrategy)
- return (IDomainLoadingStrategy)loader;
- } catch (InstantiationException e) {
- JSFCommonPlugin.log(IStatus.ERROR, "Unable to instantiate IDomainLoadingStrategy for: "+ domain,e); //$NON-NLS-1$
- } catch (IllegalAccessException e) {
- JSFCommonPlugin.log(IStatus.ERROR, "IllegalAccessException during creation of IDomainLoadingStrategy for: "+ domain,e); //$NON-NLS-1$
- } catch (IllegalArgumentException e) {
- JSFCommonPlugin.log(IStatus.ERROR, "IllegalArgumentException during creation of IDomainLoadingStrategy for: "+ domain,e); //$NON-NLS-1$
- } catch (SecurityException e) {
- JSFCommonPlugin.log(IStatus.ERROR, "SecurityException during creation of IDomainLoadingStrategy for: "+ domain,e); //$NON-NLS-1$
- } catch (InvocationTargetException e) {
- JSFCommonPlugin.log(IStatus.ERROR, "InvocationTargetException during creation of IDomainLoadingStrategy for: "+ domain,e); //$NON-NLS-1$
- } catch (NoSuchMethodException e) {
- JSFCommonPlugin.log(IStatus.ERROR, "NoSuchMethodException during creation of IDomainLoadingStrategy for: "+ domain,e); //$NON-NLS-1$
- }
- return null;
- }
-
- private Class getLoadingStrategy() {
- if (strategy == null){
- strategy = JSFCommonPlugin.loadClass(loadingStrategyClassName, bundleId);
- }
- return strategy;
- }
-
- }
-
-}
\ No newline at end of file
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/DomainSourceModelTypeDescriptor.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/DomainSourceModelTypeDescriptor.java
deleted file mode 100644
index d2e9251..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/DomainSourceModelTypeDescriptor.java
+++ /dev/null
@@ -1,235 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 Oracle 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:
- * Oracle - initial API and implementation
- *
- ********************************************************************************/
-package org.eclipse.jst.jsf.common.metadata.internal;
-
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.Set;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtensionPoint;
-import org.eclipse.core.runtime.IExtensionRegistry;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.jst.jsf.common.JSFCommonPlugin;
-
-/**
- * Implementation of a {@link IDomainSourceModelType} descriptor.
- * Responsible for producing instances of {@link IDomainSourceModelType}.
- * Also responsible for creating the {@link IMetaDataTranslator} descriptors from the
- * <code>com.eclipse.jst.jsf.common.domainSourceModelTypeTranslators</code> ext-pt
- */
-public class DomainSourceModelTypeDescriptor {
- private static final String TRANSLATORS_EXTENSION_POINT_ID = "domainSourceModelTypeTranslators"; //$NON-NLS-1$
- private static final String STANDARD_FILE_NULL_TRANSLATOR = "org.eclipse.jst.jsf.common.metadata.internal.StandardMetaDataFilesTranslator"; //$NON-NLS-1$
- private String domain = "DEFAULT"; //$NON-NLS-1$
- private String domainSourceModelTypeId;
- private String locatorClassName = "org.eclipse.jst.jsf.common.metadata.internal.StandardMetaDataLocator"; //$NON-NLS-1$
- private Set translatorDescriptors;
- private String bundleId = JSFCommonPlugin.PLUGIN_ID;
- private int ordinal;
-
- /**
- * Constructor
- * @param domain
- * @param domainSourceModelTypeId
- * @param locatorClassName
- * @param bundleId
- * @param ordinal
- */
- public DomainSourceModelTypeDescriptor(String domain, String domainSourceModelTypeId, String locatorClassName, String bundleId, int ordinal){
- this.domain = domain;
- this.locatorClassName = locatorClassName;
- this.domainSourceModelTypeId = domainSourceModelTypeId;
- this.bundleId = bundleId;
- this.ordinal = ordinal;
- init();
- }
-
- /**
- * Default model type descriptor that will load only standard metadata files
- */
- public DomainSourceModelTypeDescriptor(){
-// getTranslatorDescriptors();
- //createTranslatorInstances() will add the standard null translator
- }
-
- private synchronized void init() {
- IExtensionRegistry extensionRegistry = Platform.getExtensionRegistry();
- IExtensionPoint point = extensionRegistry.getExtensionPoint(JSFCommonPlugin.PLUGIN_ID, TRANSLATORS_EXTENSION_POINT_ID );
- if (point != null) {
- IConfigurationElement[] elements = point.getConfigurationElements();
- for (int i = 0; i < elements.length; i++) {
- IConfigurationElement element = elements[i];
- String srcHdlrId = element.getAttribute("domainSourceModelTypeId"); //$NON-NLS-1$
- if (srcHdlrId.equals(domainSourceModelTypeId))
- addTranslatorDescriptor(element);
- }
- }
- }
-
- private void addTranslatorDescriptor(IConfigurationElement element) {
- String translator = element.getAttribute("translatorClass"); //$NON-NLS-1$
- DomainSourceModelTranslatorDescriptor d = new DomainSourceModelTranslatorDescriptor(translator, element.getContributor().getName());
- getTranslatorDescriptors().add(d);
- }
-
- private Set getTranslatorDescriptors(){
- if (translatorDescriptors == null){
- translatorDescriptors = new HashSet();
- }
- return translatorDescriptors;
- }
-
- /**
- * @return domain
- */
- public String getDomain() {
- return domain;
- }
-
- /**
- * @return new instance of the {@link IDomainSourceModelType}
- */
- public IDomainSourceModelType getInstance(){
- return new DomainSourceModelTypeImpl();
- }
-
- /**
- * Internal class implementing {@link IDomainSourceModelType}
- */
- class DomainSourceModelTypeImpl implements IDomainSourceModelType{
-
- private Set translators;
- private IMetaDataLocator locator;
-
- DomainSourceModelTypeImpl(){
- // restrict construction to package scope
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.jsf.common.metadata.internal.IDomainSourceModelType#getDomain()
- */
- public String getDomain() {
- return domain;
- }
-
- /**
- * @return value of ordinal defined by the ext-pt used for ordering source types for a domain
- */
- public int getOrdinal(){
- return ordinal;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.jsf.common.metadata.internal.IDomainSourceModelType#getLocator()
- */
- public IMetaDataLocator getLocator(IProject project) {
- if (locator == null){
- locator = MetaDataLocatorFactory.getInstance().getLocator(locatorClassName, bundleId, project);
- }
-
- return locator;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.jsf.common.metadata.internal.IDomainSourceModelType#getTranslators()
- */
- public Set getTranslators() {
- if (translators == null){
- translators = createTranslatorInstances();
- }
- return translators;
- }
-
- /* (non-Javadoc)
- * @see java.lang.Object#toString()
- */
- public String toString(){
- StringBuffer buf = new StringBuffer("DomainSourceModelTypeImpl"); //$NON-NLS-1$
- buf.append("(domain = "); //$NON-NLS-1$
- buf.append(getDomain());
- buf.append(", locator = "); //$NON-NLS-1$
- buf.append(locator != null ? locator.toString() : "null"); //$NON-NLS-1$
- buf.append(")"); //$NON-NLS-1$
- return buf.toString();
- }
-
- private Set createTranslatorInstances() {
- translators = new HashSet<IMetaDataTranslator>();
- if (getTranslatorDescriptors().size() == 0){// for TagLibDomain, we are adding null translator via extension (as of 7/16/07)
- //would get here if a domain and source type was defined without a domain translator. Should not happen, but
- //add Null Translator for now....
- //we could/should raise exception.
- //Developers should add a STANDARD_FILE_NULL_TRANSLATOR if using standard metadata format.
- Class klass = JSFCommonPlugin.loadClass(STANDARD_FILE_NULL_TRANSLATOR, JSFCommonPlugin.PLUGIN_ID);
- try {
- translators.add(klass.newInstance());
- return translators;
- } catch (InstantiationException e) {
- // TODO: other error handling?
- JSFCommonPlugin.log(e, "Error in createTranslatorInstances(STANDARD_FILE_NULL_TRANSLATOR)"); //$NON-NLS-1$
- } catch (IllegalAccessException e) {
- // TODO: other error handling?
- JSFCommonPlugin.log(e, "Error in createTranslatorInstances(STANDARD_FILE_NULL_TRANSLATOR)"); //$NON-NLS-1$
- }
-
- }
-
- Iterator <DomainSourceModelTranslatorDescriptor>it = getTranslatorDescriptors().iterator();
- while (it.hasNext()){
- final DomainSourceModelTranslatorDescriptor d = it.next();
- final Class klass = JSFCommonPlugin.loadClass(d.getTranslator(), d.getBundleId());
- try {
- translators.add(klass.newInstance());
- } catch (InstantiationException e) {
- // TODO: other error handling?
- JSFCommonPlugin.log(e, "Error in createTranslatorInstances"); //$NON-NLS-1$
- } catch (IllegalAccessException e) {
- // TODO: other error handling?
- JSFCommonPlugin.log(e, "Error in createTranslatorInstances"); //$NON-NLS-1$
- }
- }
- return translators;
- }
-
- }
-
- /**
- * Internal class implementing a descriptor for DomainSourceModelTranslators
- */
- static class DomainSourceModelTranslatorDescriptor {
-
- private final String _translator;
- private final String _bundleId;
-
- /**
- * Constructor
- * @param translator
- * @param bundleId
- */
- public DomainSourceModelTranslatorDescriptor(final String translator, final String bundleId) {
- this._translator = translator;
- this._bundleId = bundleId;
- }
-
- String getTranslator(){
- return _translator;
- }
-
- String getBundleId(){
- return _bundleId;
- }
-
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/DomainSourceTypesRegistry.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/DomainSourceTypesRegistry.java
deleted file mode 100644
index 54d0ed1..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/DomainSourceTypesRegistry.java
+++ /dev/null
@@ -1,131 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 Oracle 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:
- * Oracle - initial API and implementation
- *
- ********************************************************************************/
-package org.eclipse.jst.jsf.common.metadata.internal;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtensionPoint;
-import org.eclipse.core.runtime.IExtensionRegistry;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.jst.jsf.common.JSFCommonPlugin;
-import org.eclipse.jst.jsf.common.metadata.internal.DomainSourceModelTypeDescriptor.DomainSourceModelTypeImpl;
-
-/**
- * Registry of Domain Source Types loaded from domainSourceModelTypes ext-pt.
- */
-public class DomainSourceTypesRegistry{
- private static final String EXTENSION_POINT_ID = "domainSourceModelTypes"; //$NON-NLS-1$
- private static DomainSourceTypesRegistry INSTANCE;
- private Map<String, List<DomainSourceModelTypeDescriptor>> domainSourceTypeDescriptors;
-
- private DomainSourceTypesRegistry(){
- init();
- }
-
- /**
- * @return singleton instance of DomainSourceTypesRegistry
- */
- public synchronized static DomainSourceTypesRegistry getInstance() {
- if (INSTANCE == null){
- INSTANCE = new DomainSourceTypesRegistry();
- }
- return INSTANCE;
- }
-
- /**
- * @param domain identifier
- * @return list of <code>IDomainSourceModelType</code> sorted in descending order by ordinal
- */
- public List<IDomainSourceModelType> getDomainSourceTypes(String domain){
- final List<DomainSourceModelTypeDescriptor> list = getDomainSourceModelDescriptors(domain);
- final List<IDomainSourceModelType> types = new ArrayList<IDomainSourceModelType>();
- for(final DomainSourceModelTypeDescriptor d : list){
- types.add(d.getInstance());
- }
- //default sort descending by ordinal
- Collections.sort(types, new Comparator(){
- public int compare(final Object o1, final Object o2) {
- final DomainSourceModelTypeImpl desc1 = (DomainSourceModelTypeImpl)o1;
- final DomainSourceModelTypeImpl desc2 = (DomainSourceModelTypeImpl)o2;
- if (desc1.getOrdinal() == desc2.getOrdinal())
- return 0;
- if (desc1.getOrdinal() > desc2.getOrdinal())
- return -1;
-
- return 1;
- }
-
- });
-
- return types;
- }
-
- private List getDomainSourceModelDescriptors(final String domain) {
- final List ret = getDescriptors().get(domain);
- if (ret != null && ret.size()>0)
- return ret;
-
- return getDefaultSourceModelDescriptor();
- }
-
- private List getDefaultSourceModelDescriptor() {
- final List ret = new ArrayList();
- final DomainSourceModelTypeDescriptor desc = new DomainSourceModelTypeDescriptor();
- ret.add(desc);
- return ret;
- }
-
- private synchronized void init() {
- final IExtensionRegistry extensionRegistry = Platform.getExtensionRegistry();
- final IExtensionPoint point = extensionRegistry.getExtensionPoint(JSFCommonPlugin.PLUGIN_ID, EXTENSION_POINT_ID );
- if (point != null) {
- final IConfigurationElement[] elements = point.getConfigurationElements();
- for (int i = 0; i < elements.length; i++) {
- final IConfigurationElement element = elements[i];
- addDomainSourceTypeDescriptor(element);
- }
- }
- }
-
- private void addDomainSourceTypeDescriptor(final IConfigurationElement element) {
- final String domainId = element.getAttribute("domainId"); //$NON-NLS-1$
- final String srcHdlrId = element.getAttribute("domainSourceModelTypeId"); //$NON-NLS-1$
- final String locator = element.getAttribute("locator"); //$NON-NLS-1$
- final String ordinalStr = element.getAttribute("ordinal"); //$NON-NLS-1$
- int ordinal = 1;
- if (ordinalStr!=null && !ordinalStr.equals("")){ //$NON-NLS-1$
- ordinal = Integer.parseInt(ordinalStr);
- }
- final DomainSourceModelTypeDescriptor d = new DomainSourceModelTypeDescriptor(domainId, srcHdlrId, locator, element.getContributor().getName(), ordinal);
- List<DomainSourceModelTypeDescriptor> descs = getDescriptors().get(domainId);
- if (descs == null){
- descs = new ArrayList<DomainSourceModelTypeDescriptor>();
- getDescriptors().put(domainId, descs);
- }
- descs.add(d);
- }
-
- private Map<String, List<DomainSourceModelTypeDescriptor>> getDescriptors() {
- if (domainSourceTypeDescriptors == null){
- domainSourceTypeDescriptors = new HashMap<String, List<DomainSourceModelTypeDescriptor>>();
- }
- return domainSourceTypeDescriptors;
- }
-
-
-}
\ No newline at end of file
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/IClassLoaderProvider.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/IClassLoaderProvider.java
deleted file mode 100644
index 6c81696..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/IClassLoaderProvider.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2007 Oracle Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Oracle Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.common.metadata.internal;
-
-/**
- * Provides class loading by using the plugin's classloader that defined an item of metadata
- */
-public interface IClassLoaderProvider {
- /**
- * @param className
- * @return Class - implementers should eat exceptions and return null whenever class cannot be returned
- */
- public Class loadClass(String className);
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/IDomainLoadingStrategy.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/IDomainLoadingStrategy.java
deleted file mode 100644
index ee21e62..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/IDomainLoadingStrategy.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 Oracle 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:
- * Oracle - initial API and implementation
- *
- ********************************************************************************/
-package org.eclipse.jst.jsf.common.metadata.internal;
-
-
-/**
- * Defines a strategy to use for loading a standard metadata model for a certain domain.
- * see <code>org.eclipse.jst.jsf.common.domainLoadingStrategies</code> ext-pt
- */
-public interface IDomainLoadingStrategy {
-
- /**
- * Create a merged "standard" metadata model.
- * @param model to load
- *
- */
- public void load(MetaDataModel model);
-
- /**
- * Reload a merged "standard" metadata model.
- * Allows for some optimization for reload.
- * @throws ModelNotSetException
- *
- */
- public void reload() throws ModelNotSetException;
-
-
- /**
- * Opportunity to cleanup and should be called when strategy is being destroyed
- */
- public void cleanup();
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/IDomainSourceModelType.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/IDomainSourceModelType.java
deleted file mode 100644
index 56744a8..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/IDomainSourceModelType.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 Oracle 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:
- * Oracle - initial API and implementation
- *
- ********************************************************************************/
-package org.eclipse.jst.jsf.common.metadata.internal;
-
-import java.util.Set;
-
-import org.eclipse.core.resources.IProject;
-
-/**
- * Binds a domain of metadata to a source model type which is defined by a {@link IMetaDataLocator}
- * and set of {@link IMetaDataTranslator}s
- * Not intended to be implemented by clients. Created from ext-pts.
- */
-public interface IDomainSourceModelType {
- /**
- * @return domain id
- */
- public String getDomain();
- /**
- * @param project - may be null
- * @return instance of IMetaDataLocator - may return null if the locator cannot operate in the current context
- */
- public IMetaDataLocator getLocator(IProject project);
-// public int getOrdinal();
- /**
- * @return set of {@link IMetaDataTranslator}s for the domain source model type
- */
- public Set<IMetaDataTranslator> getTranslators();
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/IImageDescriptorProvider.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/IImageDescriptorProvider.java
deleted file mode 100644
index 9405a6a..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/IImageDescriptorProvider.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2007 Oracle Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Oracle Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.common.metadata.internal;
-
-import org.eclipse.jface.resource.ImageDescriptor;
-
-/**
- * Provides image descriptors relative to the plugin that provided the image metadata
- *
- */
-public interface IImageDescriptorProvider {
- /**
- * @param imagePath
- * @return ImageDescriptor - implementers should eat exceptions and return null whenever imageDescriptor cannot be returned
- */
- public ImageDescriptor getImageDescriptor(String imagePath);
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/IMetaDataChangeNotificationEvent.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/IMetaDataChangeNotificationEvent.java
deleted file mode 100644
index 29c6ce1..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/IMetaDataChangeNotificationEvent.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 Oracle 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:
- * Oracle - initial API and implementation
- *
- ********************************************************************************/
-package org.eclipse.jst.jsf.common.metadata.internal;
-
-/**
- * Experimental and not used at the moment.
- *
- */
-public interface IMetaDataChangeNotificationEvent {
- //change to enums if we do Java5
- /**
- * TODO:
- */
- public static final int ADDED = 1;
- /**
- * TODO:
- */
- public static final int REMOVED = 2;
- /**
- * TODO:
- */
- public static final int CHANGED = 3;
-
- /**
- * @return the uri
- */
- public String getURI();
- /**
- * @return when to the event types above
- */
- public int getEventType();
- /**
- * @return the meta-data locator
- */
- public IMetaDataLocator getLocator();
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/IMetaDataDomainContext.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/IMetaDataDomainContext.java
deleted file mode 100644
index 33ff0a5..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/IMetaDataDomainContext.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Oracle Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Oracle Corporation - initial API and implementation and/or initial documentation
- *******************************************************************************/
-
-package org.eclipse.jst.jsf.common.metadata.internal;
-
-import org.eclipse.jst.jsf.common.metadata.query.internal.MetaDataQueryContextFactory;
-import org.eclipse.jst.jsf.context.IModelContext;
-
-/**
- * Domain context
- * <p>
- * @noimplement - see {@link MetaDataQueryContextFactory}
- *
- */
-public interface IMetaDataDomainContext extends IModelContext{
- /**
- * @return domain identifier for this context.
- */
- public String getDomainId();
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/IMetaDataDomainQueryFactory.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/IMetaDataDomainQueryFactory.java
deleted file mode 100644
index 85403c8..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/IMetaDataDomainQueryFactory.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Oracle Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Oracle Corporation - initial API and implementation and/or initial documentation
- *******************************************************************************/
-
-package org.eclipse.jst.jsf.common.metadata.internal;
-
-import org.eclipse.jst.jsf.common.metadata.query.internal.IMetaDataQuery;
-
-/**
- * Produces {@link IMetaDataQuery}s for a metadata domain
- *
- */
-public interface IMetaDataDomainQueryFactory {
- /**
- * @param context
- * @return {@link IMetaDataQuery}
- */
- public IMetaDataQuery createQuery(final IMetaDataDomainContext context);
-
- /**
- * @return the domain id that this factory handles
- */
- public String getDomainIdentifier();
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/IMetaDataLocator.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/IMetaDataLocator.java
deleted file mode 100644
index c440556..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/IMetaDataLocator.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 Oracle 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:
- * Oracle - initial API and implementation
- *
- ********************************************************************************/
-package org.eclipse.jst.jsf.common.metadata.internal;
-
-import java.util.List;
-
-/**
- * Locates instances of metadata of a specific source model type
- */
-public interface IMetaDataLocator {
- /**
- * @param uri
- * @return a list of <code>IMetaDataSourceModelProvider</code>s for the uri located by this instance
- */
- public List <IMetaDataSourceModelProvider> locateMetaDataModelProviders(String uri);
-
- /**
- * Opportunity for service to start (add listeners, etc.).
- * Framework calls this immediately after construction and all setup should occur at this time.
- */
- public void startLocating();
- /**
- * Stop looking for instances of metadata model sources. An opportunity to cleanup.
- */
- public void stopLocating();
-
- /**
- * @param observer add a {@link IMetaDataObserver} of this locator
- */
- public void addObserver(IMetaDataObserver observer);
- /**
- * @param observer remove a {@link IMetaDataObserver} of this locator
- */
- public void removeObserver(IMetaDataObserver observer);
-
- /**
- * @return IDomainSourceModelType instance that created this locator
- */
- public IDomainSourceModelType getDomainSourceModelType();
- /**
- * @param domainSourceModelType set the domainSourceModelType instance that created this locator
- */
- public void setDomainSourceModelType(IDomainSourceModelType domainSourceModelType);
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/IMetaDataModelContext.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/IMetaDataModelContext.java
deleted file mode 100644
index 37869cc..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/IMetaDataModelContext.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Oracle Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Oracle Corporation - initial API and implementation and/or initial documentation
- *******************************************************************************/
-
-package org.eclipse.jst.jsf.common.metadata.internal;
-
-import org.eclipse.jst.jsf.common.metadata.Model;
-
-/**
- * Context for establishing the metadata model
- * <p>
- * @noimplement - not intended to be implemented, users must subclass {@link MetaDataModelContext} if necesary
- */
-public interface IMetaDataModelContext extends IMetaDataDomainContext {
-
- /**
- * @return the string that will uniquely identify the {@link Model} within this domain of metadata
- */
- public String getModelIdentifier();
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/IMetaDataModelManager.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/IMetaDataModelManager.java
deleted file mode 100644
index dc9cc0e..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/IMetaDataModelManager.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Oracle Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Oracle Corporation - initial API and implementation and/or initial documentation
- *******************************************************************************/
-
-package org.eclipse.jst.jsf.common.metadata.internal;
-
-import org.eclipse.jst.jsf.common.internal.managedobject.IManagedObject;
-import org.eclipse.jst.jsf.common.metadata.Model;
-
-/**
- * Returns {@link Model}s for a given context which can then be queried.
- * <p>
- * Responsible for managing all domains of metadata
- * <p>
- * @noimplement - users must extend AbstractMetaDataModelManager
- * @noextend
- */
-public interface IMetaDataModelManager extends IManagedObject {
-
- /**
- * Will locate a MetaData Model. Sets the model context in the
- * model.
- *
- * @param modelContext
- * @return the {@link Model} for the given model identifier
- */
- public Model getModel(
- final IMetaDataModelContext modelContext);
-
-
-}
\ No newline at end of file
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/IMetaDataModelManagerFactory.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/IMetaDataModelManagerFactory.java
deleted file mode 100644
index 5c8fa84..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/IMetaDataModelManagerFactory.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Oracle Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Oracle Corporation - initial API and implementation and/or initial documentation
- *******************************************************************************/
-
-package org.eclipse.jst.jsf.common.metadata.internal;
-
-import org.eclipse.core.resources.IResource;
-
-/**
- * A factory that will produce {@link IMetaDataModelManager}s
- */
-public interface IMetaDataModelManagerFactory {
- /**
- * @param projectOrWorkspaceRoot
- * @return IMetaDataModelManager for the project, or shared IMetaDataModelManager for the workspace
- */
- public IMetaDataModelManager getInstance(IResource projectOrWorkspaceRoot);
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/IMetaDataModelMergeAssistant.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/IMetaDataModelMergeAssistant.java
deleted file mode 100644
index 0a6a341..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/IMetaDataModelMergeAssistant.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 Oracle 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:
- * Oracle - initial API and implementation
- *
- ********************************************************************************/
-package org.eclipse.jst.jsf.common.metadata.internal;
-
-import org.eclipse.jst.jsf.common.metadata.Entity;
-import org.eclipse.jst.jsf.common.metadata.EntityGroup;
-import org.eclipse.jst.jsf.common.metadata.Trait;
-
-
-/**
- * Helper class interface to merge source models into a single merged model.
- * Not intended to be implemented by clients
- *
- */
-public interface IMetaDataModelMergeAssistant {
- /**
- * @return merged model
- */
- public MetaDataModel getMergedModel();
- /**
- * Method that will first check to see if an entity with the same id exists in the merged model.
- * If not, it will add it. The entities includeGroups are then also merged.
- * @param entity
- * @return the merged model entity
- *
- */
- public Entity addEntity(Entity entity);
- /**
- * Method will add an entity if not already existing in the merged model, and then check for an existing trait by id on the merged model's entity.
- * @param entity
- * @param trait
- * @return flag indicating whether or not the traits was new and therefore added to the merged model's entity
- */
- public boolean addTrait(Entity entity, Trait trait);
-
- /**
- * Method will add an entityGroup to the model if not already exiting in the merged model (by id).
- * @param entityGroup
- */
- public void addEntityGroup(EntityGroup entityGroup);
- /**
- * Signal that the merge is complete so that any post-processing may occur.
- * This should be the last call made on the merge assistant and should be done before client calls for the merged model result.
- * This should signal that entityGroups processing should begin.
- */
- public void setMergeComplete();
-
- /**
- * @param mds - {@link IMetaDataSourceModelProvider}
- */
- public void setSourceModelProvider(IMetaDataSourceModelProvider mds);
- /**
- * @return {@link IMetaDataSourceModelProvider} for current operation
- */
- public IMetaDataSourceModelProvider getSourceModelProvider();
-
- /**
- * @param queryRoot
- * @param entityKey - key relative to queryRoot
- * @return entity - will return null if not found
- */
- public Entity getMergedEntity(Entity queryRoot, String entityKey);
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/IMetaDataObservable.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/IMetaDataObservable.java
deleted file mode 100644
index 69152d3..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/IMetaDataObservable.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 Oracle 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:
- * Oracle - initial API and implementation
- *
- ********************************************************************************/
-package org.eclipse.jst.jsf.common.metadata.internal;
-
-/**
- * Allows {@link IMetaDataObserver}s to observe changes.
- * Experimental.
- *
- */
-public interface IMetaDataObservable {
- /**
- * Add the observer to the set of observers. Has no effect if
- * the same observer is already registered
- *
- * @param observer
- */
- public void addObserver(IMetaDataObserver observer);
-
- /**
- * Remove the observer from the set of observers. Has no effect
- * if observer was not already registered.
- *
- * @param observer must not be null
- */
- public void removeObserver(IMetaDataObserver observer);
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/IMetaDataObserver.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/IMetaDataObserver.java
deleted file mode 100644
index 5a138a3..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/IMetaDataObserver.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 Oracle 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:
- * Oracle - initial API and implementation
- *
- ********************************************************************************/
-package org.eclipse.jst.jsf.common.metadata.internal;
-
-/**
- * Interface for notification when an {@link IMetaDataObservable} changes
- *
- */
-public interface IMetaDataObserver {
- /**
- * Callback to observer when an {@link IMetaDataObservable} throws an event
- * @param event
- */
- public void notifyMetadataChanged(IMetaDataChangeNotificationEvent event);
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/IMetaDataSourceModelProvider.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/IMetaDataSourceModelProvider.java
deleted file mode 100644
index 6a19c3b..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/IMetaDataSourceModelProvider.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 Oracle 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:
- * Oracle - initial API and implementation
- *
- ********************************************************************************/
-package org.eclipse.jst.jsf.common.metadata.internal;
-
-import org.eclipse.core.runtime.IAdaptable;
-
-
-/**
- * Provides a source of metadata that can be transformed into a merged standard model
- * LIKELY TO CHANGE
- */
-public interface IMetaDataSourceModelProvider extends IAdaptable{
- /**
- * @return the source model
- */
- public Object getSourceModel();
- /**
- * @return the IMetaDataLocator instance that located this model provider instance
- */
- public IMetaDataLocator getLocator();
- /**
- * @param locator instance that located this model provider instance
- */
- public void setLocator(IMetaDataLocator locator);
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/IMetaDataTranslator.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/IMetaDataTranslator.java
deleted file mode 100644
index 2a7f6e2..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/IMetaDataTranslator.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 Oracle 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:
- * Oracle - initial API and implementation
- *
- ********************************************************************************/
-package org.eclipse.jst.jsf.common.metadata.internal;
-
-/**
- * Translate from the source model metadata structure into a standard metadata domain of metadata.
- *
- */
-public interface IMetaDataTranslator {
- /**
- * @param assistant perform translation using the IMetaDataModelMergeAssistant
- */
- public void translate(IMetaDataModelMergeAssistant assistant);
- /**
- * @param modelProvider - cannot be null
- * @return true if this translator can translate this model source
- */
- public boolean canTranslate(IMetaDataSourceModelProvider modelProvider);
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/IPathSensitiveMetaDataLocator.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/IPathSensitiveMetaDataLocator.java
deleted file mode 100644
index 0f0ed71..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/IPathSensitiveMetaDataLocator.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 Oracle 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:
- * Oracle - initial API and implementation
- *
- ********************************************************************************/
-package org.eclipse.jst.jsf.common.metadata.internal;
-
-import org.eclipse.core.resources.IProject;
-
-/**
- * A <code>IMetaDataLocator</code> that is sensitive to the project context
- */
-public interface IPathSensitiveMetaDataLocator extends IMetaDataLocator {
- /**
- * @param project
- */
- public void setProjectContext(IProject project);
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/IResourceBundleProvider.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/IResourceBundleProvider.java
deleted file mode 100644
index 640da35..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/IResourceBundleProvider.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2007 Oracle Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Oracle Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.common.metadata.internal;
-
-import java.util.ResourceBundle;
-
-/**
- * Provides the resource bundle from the plugin that defined an item of metadata.
- */
-public interface IResourceBundleProvider {
- /**
- * @return ResourceBundle - implementers should eat exceptions and return null whenever resourceBundle cannot be returned
- */
- public ResourceBundle getResourceBundle();
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/IResourceURLProvider.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/IResourceURLProvider.java
deleted file mode 100644
index f82d0fb..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/IResourceURLProvider.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/**
- * Copyright (c) 2008 Oracle Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Oracle Corporation - initial API and implementation
- */
-package org.eclipse.jst.jsf.common.metadata.internal;
-
-import java.net.URL;
-
-/**
- * Provides absolute URLs from resource path, which is relative to the plug-in
- * with the metadata that specified the resource path.
- *
- * @author Ian Trimble - Oracle
- */
-public interface IResourceURLProvider {
-
- /**
- * Get absolute URL for resource path, which is relative to the plug-in that
- * specified the resource metadata.
- *
- * @param resourcePath Path to resource, relative to metadata plug-in.
- * @return Absolute URL for resource path.
- */
- public URL getResourceURL(String resourcePath);
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/IStandardMetaDataSourceInfo.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/IStandardMetaDataSourceInfo.java
deleted file mode 100644
index 02270a3..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/IStandardMetaDataSourceInfo.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 Oracle 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:
- * Oracle - initial API and implementation
- *
- ********************************************************************************/
-package org.eclipse.jst.jsf.common.metadata.internal;
-
-
-/**
- * Represents the metadata file defined by the StandardMetaDataFile extension-point
- * Not intended to be implemented by clients
- */
-public interface IStandardMetaDataSourceInfo {
- /**
- * @return location of metadata file that the locator class will use
- */
- public String getLocation();
- /**
- * @return bundle id of plugin defining the metadata file
- */
- public String getBundleId();
- /**
- * @return class name of the locator that will find the the standard metadata file
- */
- public String getLocatorClassname();
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/JSPTagLibDomainLoadingStrategy.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/JSPTagLibDomainLoadingStrategy.java
deleted file mode 100644
index 80cbbd9..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/JSPTagLibDomainLoadingStrategy.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 Oracle 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:
- * Oracle - initial API and implementation
- *
- ********************************************************************************/
-package org.eclipse.jst.jsf.common.metadata.internal;
-
-import java.util.List;
-
-
-/**
- * Strategy for loading tag metadata. Extends and uses the default {@link DomainLoadingStrategy}.
- * Mainly exists for illustrative purposes. Could be removed..
- */
-public class JSPTagLibDomainLoadingStrategy extends DomainLoadingStrategy {
-
- /**
- * Constructor
- * @param domain
- */
- public JSPTagLibDomainLoadingStrategy(String domain) {
- super(domain);
- }
-
- /*@Override*/
- /* (non-Javadoc)
- * @see org.eclipse.jst.jsf.common.metadata.internal.DomainLoadingStrategy#sortSourceTypes(java.util.List)
- */
- protected void sortSourceTypes(List<IDomainSourceModelType> sourceTypes) {
- //an opportunity to override the priority of the source types...
- }
-
-
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/Messages.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/Messages.java
deleted file mode 100644
index 74fd0a7..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/Messages.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Oracle 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:
- * Gerry Kessler/Oracle - initial API and implementation
- *
- ********************************************************************************/
-
-package org.eclipse.jst.jsf.common.metadata.internal;
-
-import org.eclipse.osgi.util.NLS;
-
-/**
- * Externalized strings for Metadata
- */
-public class Messages extends NLS {
- private static final String BUNDLE_NAME = "org.eclipse.jst.jsf.common.metadata.internal.messages"; //$NON-NLS-1$
-
- /**
- * Property key not found in bundle
- */
- public static String Key_not_found;
-
- /**
- * Missing resource
- */
- public static String MissingResource_exception;
- static {
- // initialize resource bundle
- NLS.initializeMessages(BUNDLE_NAME, Messages.class);
- }
-
- private Messages() {
- // no external instantiation
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/MetaDataChangeNotificationEvent.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/MetaDataChangeNotificationEvent.java
deleted file mode 100644
index 8ecc17d..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/MetaDataChangeNotificationEvent.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 Oracle 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:
- * Oracle - initial API and implementation
- *
- ********************************************************************************/
-package org.eclipse.jst.jsf.common.metadata.internal;
-
-/**
- * Experimental. Subject to change.
- *
- */
-public class MetaDataChangeNotificationEvent implements
- IMetaDataChangeNotificationEvent {
-
- private String _uri;
- private IMetaDataLocator _locator;
- private int _type;
-
- /**
- * Constructor
- * @param locator
- * @param uri
- * @param type
- */
- public MetaDataChangeNotificationEvent(IMetaDataLocator locator, String uri, int type){
- this._locator = locator;
- this._uri = uri;
- this._type = type;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.jsf.common.metadata.internal.IMetaDataChangeNotificationEvent#getEventType()
- */
- public int getEventType() {
- return _type;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.jsf.common.metadata.internal.IMetaDataChangeNotificationEvent#getLocator()
- */
- public IMetaDataLocator getLocator() {
- return _locator;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.jsf.common.metadata.internal.IMetaDataChangeNotificationEvent#getURI()
- */
- public String getURI() {
- return _uri;
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/MetaDataLocatorFactory.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/MetaDataLocatorFactory.java
deleted file mode 100644
index a590590..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/MetaDataLocatorFactory.java
+++ /dev/null
@@ -1,169 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2007 Oracle Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Oracle Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.common.metadata.internal;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.StringTokenizer;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResourceChangeEvent;
-import org.eclipse.core.resources.IResourceChangeListener;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jst.jsf.common.JSFCommonPlugin;
-
-/**
- * Creates instances of IMetaDataLocators and caches them so that there is only one instance of a particular locator
- * when client requests one.
- */
-public class MetaDataLocatorFactory
- implements IResourceChangeListener {
-
- private static MetaDataLocatorFactory INSTANCE = null;
- private Map<String, IMetaDataLocator> _locators;
-
- private static final boolean DEBUG = false;
- /**
- * @return singleton instance of the MetaDataLocatorFactory
- */
- public synchronized static MetaDataLocatorFactory getInstance(){
- if (INSTANCE == null){
- INSTANCE = new MetaDataLocatorFactory();
- ResourcesPlugin.getWorkspace().addResourceChangeListener(INSTANCE, IResourceChangeEvent.PRE_CLOSE);
- }
- return INSTANCE;
- }
-
-
-
- private Map<String, IMetaDataLocator> getLocators() {
- if (_locators == null){
- _locators = new HashMap<String, IMetaDataLocator>();
- }
- return _locators;
- }
-
- /**
- * @param locatorClassName - may NOT be null
- * @param bundleId - may NOT be null
- * @param project - may be null
- * @return shared instance of IMetaDataLocator
- * may return null if is IPathSensitiveMetaDataLocator and there is no project context
- */
- public IMetaDataLocator getLocator(final String locatorClassName, final String bundleId, final IProject project){
- final Class klass = JSFCommonPlugin.loadClass(locatorClassName, bundleId);
- String key = getKey(locatorClassName, bundleId);
- IMetaDataLocator locator = null;
- try {
- IMetaDataLocator tempLocator = (IMetaDataLocator)klass.newInstance();
- if (tempLocator != null) {
- if (tempLocator instanceof IPathSensitiveMetaDataLocator) {
- if (project == null)
- return null;
-
- key = getKey(locatorClassName, project.getName());
- }
-
- locator = getLocators().get(key);
- if (locator == null) {
- locator = tempLocator;
- if (locator instanceof IPathSensitiveMetaDataLocator)
- ((IPathSensitiveMetaDataLocator)locator).setProjectContext(project);
-
- if (DEBUG)
- System.out.println("Created locator: "+locator.toString()); //$NON-NLS-1$
-
- getLocators().put(key, locator);
- locator.startLocating();
- }
- }
- } catch (InstantiationException e) {
- JSFCommonPlugin.log(IStatus.ERROR, "Could not instantiate IMetaDataLocator: "+key, e); //$NON-NLS-1$
- } catch (IllegalAccessException e) {
- JSFCommonPlugin.log(IStatus.ERROR, "IllegalAccessException while creating IMetaDataLocator: "+key, e); //$NON-NLS-1$
- }
-
- return locator;
- }
-
- /**
- * @param locatorClassName
- * @param contextId - this may be the bundleID or the projectName if it is a path sensitive locator
- * @return key
- */
- private String getKey(final String locatorClassName, final String contextId) {
- StringBuffer buf = new StringBuffer(contextId);
- buf.append(":"); //$NON-NLS-1$
- buf.append(locatorClassName);
- return buf.toString();
- }
-
- /**
- * Stops and disposes all locators
- */
- public void dispose(){
- ResourcesPlugin.getWorkspace().removeResourceChangeListener(this);
- for (Iterator it=getLocators().values().iterator();it.hasNext();){
- IMetaDataLocator locator = (IMetaDataLocator)it.next();
- locator.stopLocating();
- }
- getLocators().clear();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see
- * org.eclipse.core.resources.IResourceChangeListener#resourceChanged(org
- * .eclipse.core.resources.IResourceChangeEvent)
- */
- public void resourceChanged(final IResourceChangeEvent event) {
- if (event.getType() == IResourceChangeEvent.PRE_CLOSE
- || event.getType() == IResourceChangeEvent.PRE_DELETE) {
- // a project is closing - release and cleanup
- final IProject aProject = (IProject) event.getResource();
-
- if (aProject != null) {
- List<String> locatorsToRemove = new ArrayList<String>();
- for (Iterator it=getLocators().keySet().iterator();it.hasNext();){
- String key = (String)it.next();
- if (locatorIsForProject(key, aProject.getName())) {
- locatorsToRemove.add(key);
- }
- }
-
- if (! locatorsToRemove.isEmpty()) {
- for (String key : locatorsToRemove) {
- IMetaDataLocator locator = getLocators().get(key);
-
- if (DEBUG)
- System.out.println("Removed locator: "+locator.toString()); //$NON-NLS-1$
-
- locator.stopLocating();
- getLocators().remove(key);
- }
- }
- }
- }
- }
-
- private boolean locatorIsForProject(final String key, final String projectName) {
- StringTokenizer t = new StringTokenizer(key, ":"); //$NON-NLS-1$
- String contextId = t.nextToken();
- if (contextId.equals(projectName))
- return true;
- return false;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/MetaDataModel.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/MetaDataModel.java
deleted file mode 100644
index 0a477c4..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/MetaDataModel.java
+++ /dev/null
@@ -1,139 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 Oracle 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:
- * Oracle - initial API and implementation
- *
- ********************************************************************************/
-package org.eclipse.jst.jsf.common.metadata.internal;
-
-import org.eclipse.jst.jsf.common.metadata.Model;
-
-/**
- * Responsible for loading and holding onto the standard metadata model using the IDomainLoadingStrategy.
- * Wraps the model (root) with the strategy used for loading it, along with the identifying key (modelKeyDescriptor)
- */
-public class MetaDataModel {
-
- private Object root;
- private IMetaDataModelContext modelContext;
- private ModelKeyDescriptor modelKeyDescriptor;
- private IDomainLoadingStrategy strategy;
- private boolean refresh;
-
-
-
- /**
- * Constructor
- * @param context
- * @param strategy
- */
- public MetaDataModel(final IMetaDataModelContext context, final IDomainLoadingStrategy strategy){
- this.modelContext = context;
- this.strategy = strategy;
- }
-
- /**
- * @return the root of the model.
- */
- public Object getRoot(){
- return root;
- }
-
- /**
- * @param root
- */
- public void setRoot(Object root){
- this.root = root;
- if (root != null) {
- //setCurrentModelContext has been deprecated... ModelKeyDescriptor can die after that
- Model m = (Model)root;
- m.setCurrentModelContext(getModelKey());
- }
- }
-
- private ModelKeyDescriptor getModelKey() {
- if (modelKeyDescriptor == null) {
- modelKeyDescriptor = (ModelKeyDescriptor)modelContext.getAdapter(ModelKeyDescriptor.class);
- }
- return modelKeyDescriptor;
- }
-
- /**
- * @return modelContext
- */
- public IMetaDataModelContext getModelContext(){
- return modelContext;
- }
-
-// public void accept(IEntityVisitor visitor){
-// if (getRoot() instanceof Model)
-// visitor.visit((Model)getRoot());
-// }
-
- /**
- * @return true if the model is null or is not, in fact, a {@link Model}
- */
- public boolean isEmpty() {
- if (root == null || !(root instanceof Model))
- return true;
-
- return false;
- }
-
- /**
- * Load the model. Delegates to the strategy.
- */
- public synchronized void load(){
- StandardModelFactory.debug("> Begin Loading: "+modelContext.toString(), StandardModelFactory.DEBUG_MD_LOAD); //$NON-NLS-1$
- strategy.load(this);
- StandardModelFactory.debug("> End Loading: "+modelContext.toString(),StandardModelFactory.DEBUG_MD_LOAD); //$NON-NLS-1$
- }
-
- /**
- * Reloads the model delegating to strategy reload
- * @throws ModelNotSetException
- */
- public void reload()throws ModelNotSetException{
- setRoot(null);
- refresh = false;
- strategy.reload();
- }
-
- /**
- * @return flag indicating that the model is stale
- */
- public boolean needsRefresh() {
- return refresh;
- }
-
- /**
- * Flag that model is stale
- */
- public void setNeedsRefresh() {
- refresh = true;
- }
-
- /**
- * Cleans up the model releasing references.
- */
- public void cleanup(){
- if (strategy != null)
- strategy.cleanup();
- strategy = null;
- root = null;
-// modelKeyDescriptor = null;
- modelContext = null;
- }
-
- public String toString() {
- StringBuffer buf = new StringBuffer("MetaDataModel: "); //$NON-NLS-1$
- buf.append(modelContext.toString());
- return buf.toString();
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/MetaDataModelContext.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/MetaDataModelContext.java
deleted file mode 100644
index e90bd26..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/MetaDataModelContext.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Oracle Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Oracle Corporation - initial API and implementation and/or initial documentation
- *******************************************************************************/
-
-package org.eclipse.jst.jsf.common.metadata.internal;
-
-import org.eclipse.core.resources.IProject;
-
-/**
- * Implementation of IMetaDataModelContext2
- *
- */
-public final class MetaDataModelContext implements IMetaDataModelContext {
-
- private final IProject _project;
- private final String _domainId;
- private final String _modelId;
-
- /**
- * @param project
- * @param domainId
- * @param modelId
- */
- public MetaDataModelContext(final IProject project, final String domainId, final String modelId) {
- _project = project;
- _domainId = domainId;
- _modelId = fixJSPURIIfNecessary(modelId); //major hack carried forward from ModelKeyDescriptor!
- }
-
- //this is a workaround for issue where jsp "uri" may upper or lower cased
- private String fixJSPURIIfNecessary(final String tempuri) {
- if (tempuri != null && tempuri.equals("jsp11")) //$NON-NLS-1$
- return tempuri.toUpperCase();
- return tempuri;
- }
-
- public Object getAdapter(Class adapter) {
- if (adapter == ModelKeyDescriptor.class)
- return new ModelKeyDescriptor(_project, _domainId, _modelId);
- return null;
- }
-
- public IProject getProject() {
- return _project;
- }
-
- public String getDomainId() {
- return _domainId;
- }
-
- public String getModelIdentifier() {
- return _modelId;
- }
-
- @Override
- public String toString() {
- final StringBuffer buf = new StringBuffer();
- if (getProject() != null) {
- buf.append(getProject().getName()).append(":"); //$NON-NLS-1$
- }
- buf.append(getDomainId()).append(":"); //$NON-NLS-1$
- buf.append(getModelIdentifier()).append(":"); //$NON-NLS-1$
- return buf.toString();
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/MetaDataModelContextImpl.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/MetaDataModelContextImpl.java
deleted file mode 100644
index 668f521..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/MetaDataModelContextImpl.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 Oracle 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:
- * Oracle - initial API and implementation
- *
- ********************************************************************************/
-package org.eclipse.jst.jsf.common.metadata.internal;
-
-import org.eclipse.jst.jsf.common.metadata.query.IMetaDataModelContext;
-
-/**
- * Simple implementation of {@link IMetaDataModelContext}
- * @deprecated - Helios
- *
- */
-public class MetaDataModelContextImpl implements IMetaDataModelContext, Cloneable {
- private final String _domain;
-
- /**
- * Constructor
- * @param domain id
- */
- public MetaDataModelContextImpl(final String domain){
- _domain = domain;
- }
-
- public String getDomainID() {
- return _domain;
- }
-
- public Object getAdapter(final Class adapter) {
- if (IMetaDataModelContext.class.equals(adapter))
- return this;
- return null;
- }
-
- @Override
- protected Object clone() throws CloneNotSupportedException {
- return super.clone();
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/MetaDataModelManager.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/MetaDataModelManager.java
deleted file mode 100644
index 674c877..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/MetaDataModelManager.java
+++ /dev/null
@@ -1,232 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 Oracle 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:
- * Oracle - initial API and implementation
- *
- ********************************************************************************/
-package org.eclipse.jst.jsf.common.metadata.internal;
-
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.concurrent.locks.Lock;
-import java.util.concurrent.locks.ReentrantLock;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.jst.jsf.common.JSFCommonPlugin;
-import org.eclipse.jst.jsf.common.metadata.Model;
-
-/**
- * Singleton instance for each IProject used to manage all standard metdata models for that project.
- *
- * Manager is responsible for loading and caching MetaDataModels. Models are keyed by URI.
- *
- * The manager listens for project closing resource events so that the resources can be freed up.
- */
-public final class MetaDataModelManager extends AbstractMetaDataModelManager {
-
- private static IMetaDataModelManager SHARED_INSTANCE;
-
- // used to lock all instance calls for getModel
- private static final Lock GLOBAL_INSTANCE_LOCK = new ReentrantLock();
- private final ModelMap models;
-
-
- /**
- * @return instance that is project agnostic.
- */
- public synchronized static IMetaDataModelManager getSharedInstance(){
- if (SHARED_INSTANCE == null) {
- SHARED_INSTANCE = new MetaDataModelManager(null);
- }
- return SHARED_INSTANCE;
- }
-
- /**
- * @param project
- */
- MetaDataModelManager(final IProject project) {
-// this.project = project;
- models = new ModelMap();
- }
-
- public Model getModel(
- final IMetaDataModelContext modelContext)
- {
- boolean gotLock = false;
- try
- {
- final int maxTries = 6;
- int numTries = 0;
- final Job currentJob = Job.getJobManager().currentJob();
- while (numTries < maxTries &&
- !(gotLock = GLOBAL_INSTANCE_LOCK.tryLock(5000, TimeUnit.MILLISECONDS)))
- {
- numTries++;
- if (currentJob != null)
- {
- currentJob.yieldRule(null);
- }
- }
-
- if (!gotLock)
- {
- return null;
- }
- StandardModelFactory.debug(">START getModel: "+modelContext, StandardModelFactory.DEBUG_MD_GET); //$NON-NLS-1$
-
- MetaDataModel model = models.get(modelContext);
- if (model == null) {
- // long in = System.currentTimeMillis();
- model = loadMetadata(modelContext);
- //System.out.println("Time to load "+modelContext.getURI()+": "+
- // String.valueOf(System.currentTimeMillis() - in));
- } else if (model.needsRefresh()) {
- try {
- model.reload();
- } catch (ModelNotSetException e) {
- // simply load it - should not get here
- model = loadMetadata(modelContext);
- }
- }
-
-// if (model != null && model.getRoot() != null)
-// ((Model) model.getRoot())
-// .setCurrentModelContext(modelContext);
-
- StandardModelFactory.debug(">END getModel: "+modelContext, StandardModelFactory.DEBUG_MD_GET); //$NON-NLS-1$
- if (model != null && !model.isEmpty()){
- return (Model)model.getRoot();
- }
- return null;
- }
- catch (final InterruptedException e)
- {
- return null;
- }
- finally
- {
- if (gotLock)
- {
- GLOBAL_INSTANCE_LOCK.unlock();
- }
- }
- }
-
- private MetaDataModel loadMetadata(final IMetaDataModelContext context) {
-// if (!Thread.holdsLock(GLOBAL_INSTANCE_LOCK.)) {
-// JSFCommonPlugin
-// .log(IStatus.ERROR,
-// "Internal Error: loadMetadata must not be called if class lock not held"); //$NON-NLS-1$
-// return null;
-// }
-
- final IDomainLoadingStrategy strategy = DomainLoadingStrategyRegistry
- .getInstance().getLoadingStrategy(
- context.getDomainId());
- ;
- if (strategy == null) {
- JSFCommonPlugin
- .log(
- IStatus.ERROR,
- "Internal Error: Unable to locate metadata loading strategy for: " + context.toString()); //$NON-NLS-1$
- return null;
- }
- final MetaDataModel model = StandardModelFactory.getInstance().createModel(
- context, strategy);// new MetaDataModel(modelKey,
- // strategy);
- model.load();
- addModel(model);
-
- return model;
- }
-
- private void addModel(final MetaDataModel model) {
- if (model != null)
- models.put(model);
- }
-
- public void dispose() {
- super.dispose();
- models.dispose();
- }
-
- /**
- * Map of models keyed by DOMAIN_ID:MODEL_ID from the context. Project is not part of key.
- *
- */
- private static class ModelMap
- {
- final Map<String, MetaDataModel> map;
- private final AtomicBoolean _isDisposed = new AtomicBoolean(false);
-
- ModelMap() {
- map = new HashMap<String, MetaDataModel>();
- }
-
- /**
- * @param model
- * adds model to the map using the given key descriptor
- */
- public void put(final MetaDataModel model) {
- assert !_isDisposed.get();
- final String key = calculateKey(model);
- synchronized (this) {
- map.put(key, model);
- }
- }
-
- /**
- * @param context
- * @return MetaDataModel for this context. May return null.
- */
- public MetaDataModel get(final IMetaDataModelContext context) {
- assert !_isDisposed.get();
-
- final String key = calculateKey(context);
-
- synchronized (this)
- {
- return map.get(key);
- }
- }
-
- public void dispose() {
- if (_isDisposed.compareAndSet(false, true)) {
- synchronized(this)
- {
- for (final Iterator<Map.Entry<String, MetaDataModel>> it = map.entrySet().iterator(); it.hasNext();)
- {
- // System.out.println("kill mmModel: "+model.toString());
- final Map.Entry<String, MetaDataModel> entry = it.next();
- final MetaDataModel model = entry.getValue();
-
- if (model != null)
- {
- model.cleanup();
- }
- it.remove();
- }
- }
- }
- }
-
- private String calculateKey(final MetaDataModel model) {
- return calculateKey(model.getModelContext());
- }
-
- private String calculateKey(final IMetaDataModelContext context) {
- final StringBuffer buf = new StringBuffer(context.getDomainId()).append(":").append(context.getModelIdentifier()); //$NON-NLS-1$;
- return buf.toString();
- }
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/MetaDataModelManagerFactory.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/MetaDataModelManagerFactory.java
deleted file mode 100644
index 246755b..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/MetaDataModelManagerFactory.java
+++ /dev/null
@@ -1,219 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Oracle Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Oracle Corporation - initial API and implementation and/or initial documentation
- *******************************************************************************/
-
-package org.eclipse.jst.jsf.common.metadata.internal;
-
-import java.util.List;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.QualifiedName;
-import org.eclipse.jst.jsf.common.JSFCommonPlugin;
-import org.eclipse.jst.jsf.common.internal.pde.AbstractSimpleClassExtensionRegistryReader;
-import org.eclipse.jst.jsf.common.internal.resource.ResourceSingletonObjectManager;
-import org.eclipse.jst.jsf.common.internal.strategy.AbstractTestableExtensibleDefaultProviderSelectionStrategy;
-import org.eclipse.jst.jsf.common.internal.strategy.ISimpleStrategy;
-import org.eclipse.jst.jsf.common.internal.strategy.TestableResourceFactoryStrategy;
-
-/**
- * Produces {@link IMetaDataModelManager}s
- *
- */
-public final class MetaDataModelManagerFactory extends ResourceSingletonObjectManager<IMetaDataModelManager, IResource> {
-
- private static MetaDataModelManagerFactory INSTANCE;
-
- private IMetaDataModelManagerFactory EXT_PT_BASED_FACTORY;
-
- //private constructor
- private MetaDataModelManagerFactory(final IWorkspace workspace) {
- super(workspace);
- }
-
- /**
- * Project property session key for testing.
- * Project value should hold the testable {@link IMetaDataModelManagerFactory} instance or null
- * NOT API - for testing purposes
- */
- public static final QualifiedName TESTABLE_FACTORY_SESSION_KEY = new QualifiedName(JSFCommonPlugin.PLUGIN_ID, "MDModelManagerFactoryInstance"); //$NON-NLS-1$
-
- /**
- * @param project
- * @return IMetaDataModelManager
- */
- public static IMetaDataModelManager getMetaDataModelManagerInstance(final IProject project) {
- try {
- return getMetaDataModelManagerFactoryInstance(project).getInstance(project != null ? project : ResourcesPlugin.getWorkspace().getRoot());
- } catch (ManagedObjectException e) {
- if (project != null)
- JSFCommonPlugin.log(e, "Cannot create IMetaDataModelManager for "+project.getName()+ " (1)"); //$NON-NLS-1$ //$NON-NLS-2$
- else
- JSFCommonPlugin.log(e, "Cannot create workspace shared IMetaDataModelManager (1)"); //$NON-NLS-1$
- }
- return null;
- }
-
- private synchronized static MetaDataModelManagerFactory getMetaDataModelManagerFactoryInstance(final IProject project) {
- if (INSTANCE == null) {
- final IWorkspace workspace = getWorkspace(project);
- INSTANCE = new MetaDataModelManagerFactory(workspace);
- INSTANCE.init();
- }
- return INSTANCE;
- }
-
- private static IWorkspace getWorkspace(final IProject project) {
- if (project != null)
- return project.getWorkspace();
-
- return ResourcesPlugin.getWorkspace();
- }
-
-
- private void init() {
- final MetaDataModelManagerFactoryExtensionPointReader reader = new MetaDataModelManagerFactoryExtensionPointReader();
- final List<IMetaDataModelManagerFactory> res = reader.getExtensions();
- if (res != null && res.size() > 0) {//return first
- EXT_PT_BASED_FACTORY = res.get(0);
- }
- }
-
- @Override
- protected IMetaDataModelManager createNewInstance(final IResource resource) {
- try {
- final IMetaDataModelManagerFactory factory = getMetaDataModelManagerFactoryProviderInstances(resource);
- if (factory != null)
- return factory.getInstance(resource);
- } catch (Exception e) {
- if (resource != null)
- JSFCommonPlugin.log(e, "Cannot create IMetaDataModelManager for "+resource.getName()+ " (2)"); //$NON-NLS-1$ //$NON-NLS-2$
- else
- JSFCommonPlugin.log(e, "Cannot create workspace shared IMetaDataModelManager (2)"); //$NON-NLS-1$
- }
- return null;
- }
-
- private IMetaDataModelManagerFactory getMetaDataModelManagerFactoryProviderInstances(final IResource resource) {
- final CompositeFactorySelectionStrategyProvider factoryProvider = new CompositeFactorySelectionStrategyProvider();
- return factoryProvider != null ? factoryProvider.getFactoryToUse(resource) : null;
- }
-
- private class CompositeFactorySelectionStrategyProvider
- {
- public IMetaDataModelManagerFactory getFactoryToUse(final IResource resource) {
- final MetaDataModelManagerProviderSelectionStrategy providerSelector = new MetaDataModelManagerProviderSelectionStrategy();
- addStrategies(providerSelector);
-
- final IMetaDataModelManagerFactory provider = providerSelector.perform(resource);
- if (provider != providerSelector.getNoResult())
- {
- return provider;
- }
- return null;
- }
-
- private void addStrategies(final MetaDataModelManagerProviderSelectionStrategy providerSelector) {
- providerSelector.addDefaultStrategy(new DefaultManagerProviderStrategy());
- providerSelector.addExtensionStrategy(new ExtensionBasedManagerProviderStrategy());
- providerSelector.addTestableStrategy(new TestableManagerProviderStrategy(TESTABLE_FACTORY_SESSION_KEY));
- }
-
- }
-
- private static class MetaDataModelManagerProviderSelectionStrategy
- extends
- AbstractTestableExtensibleDefaultProviderSelectionStrategy<IResource, IMetaDataModelManagerFactory> {
-
- private static final IMetaDataModelManagerFactory NO_RESULT = null;
-
- @Override
- public IMetaDataModelManagerFactory getNoResult() {
- return NO_RESULT;
- }
- }
-
- private abstract class AbstractManagerProviderStrategy
- implements ISimpleStrategy<IResource, IMetaDataModelManagerFactory> {
-
- private final IMetaDataModelManagerFactory NO_RESULT = null;
- public IMetaDataModelManagerFactory getNoResult() {
- return NO_RESULT;
- }
- }
-
- private class DefaultManagerProviderStrategy extends
- AbstractManagerProviderStrategy {
-
- public IMetaDataModelManagerFactory perform(final IResource input) throws Exception {
- return new DefaultManagerProvider();
- }
-
- }
-
- private static class DefaultManagerProvider
- implements IMetaDataModelManagerFactory {
-
- public IMetaDataModelManager getInstance(final IResource project) {
- if (project != null && project instanceof IProject)
- return new MetaDataModelManager((IProject)project);
- return MetaDataModelManager.getSharedInstance();
- }
-
- }
-
- private class ExtensionBasedManagerProviderStrategy
- extends AbstractManagerProviderStrategy {
-
- public IMetaDataModelManagerFactory perform(final IResource input) throws Exception {
- return EXT_PT_BASED_FACTORY != null ? EXT_PT_BASED_FACTORY : getNoResult();
- }
- }
-
- private static class TestableManagerProviderStrategy<IMetaDataModelManagerFactory>
- extends TestableResourceFactoryStrategy<IMetaDataModelManagerFactory> {
-
- /**
- * @param testableFactorySessionKey - project property session key for property value holding testable instance
- */
- public TestableManagerProviderStrategy(final QualifiedName testableFactorySessionKey) {
- super(testableFactorySessionKey);
- }
-
- }
-
- private static class MetaDataModelManagerFactoryExtensionPointReader extends
- AbstractSimpleClassExtensionRegistryReader<IMetaDataModelManagerFactory> {
-
- private static final String EXT_PT_ID = "mdModelManagerFactory"; //$NON-NLS-1$
- private static final String EXT_PT_ELEMENT = "factory"; //$NON-NLS-1$
- private static final String EXT_PT_ATTR = "class"; //$NON-NLS-1$
-
- protected MetaDataModelManagerFactoryExtensionPointReader() {
- super(
- JSFCommonPlugin.PLUGIN_ID,
- EXT_PT_ID, EXT_PT_ELEMENT, EXT_PT_ATTR,
- new CompareOrgEclipseJstContributorsLastComparator<IMetaDataModelManagerFactory>()
- );
- }
-
- @Override
- protected void handleLoadFailure(final CoreException ce) {
- JSFCommonPlugin.log(ce,
- "Error loading IMetaDataModelManagerFactory from extension"); //$NON-NLS-1$
-
- }
-
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/MetaDataModelMergeAssistantImpl.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/MetaDataModelMergeAssistantImpl.java
deleted file mode 100644
index b5d609c..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/MetaDataModelMergeAssistantImpl.java
+++ /dev/null
@@ -1,391 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 Oracle 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:
- * Oracle - initial API and implementation
- *
- ********************************************************************************/
-package org.eclipse.jst.jsf.common.metadata.internal;
-
-import java.util.Iterator;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.emf.ecore.util.EcoreUtil.Copier;
-import org.eclipse.jst.jsf.common.JSFCommonPlugin;
-import org.eclipse.jst.jsf.common.metadata.Entity;
-import org.eclipse.jst.jsf.common.metadata.EntityGroup;
-import org.eclipse.jst.jsf.common.metadata.IncludeEntityGroup;
-import org.eclipse.jst.jsf.common.metadata.Model;
-import org.eclipse.jst.jsf.common.metadata.Trait;
-import org.eclipse.jst.jsf.common.metadata.query.MetaDataException;
-import org.eclipse.jst.jsf.common.metadata.query.internal.HierarchicalSearchControl;
-import org.eclipse.jst.jsf.common.metadata.query.internal.IMetaDataQuery;
-import org.eclipse.jst.jsf.common.metadata.query.internal.MetaDataQueryFactory;
-import org.eclipse.jst.jsf.common.metadata.query.internal.SearchControl;
-import org.eclipse.jst.jsf.common.metadata.query.internal.SimpleEntityQueryVisitorImpl;
-import org.eclipse.jst.jsf.common.metadata.query.internal.SimpleResultSet;
-import org.eclipse.jst.jsf.common.metadata.query.internal.SimpleTraitQueryVisitorImpl;
-/**
- * Implements {@link IMetaDataModelMergeAssistant}
- *
- * Responsible for merging source models into one. The first model in has subsequent
- * entities and traits added to it.
- *
- * TODO - make locating of existing entities and traits in the merged model more efficient
- * TODO - refactor out Taglibdomain-only aspects of include-group processing
- *
- */
-public class MetaDataModelMergeAssistantImpl implements
- IMetaDataModelMergeAssistant {
-
- private MetaDataModel mergedModel;
- private SimpleEntityQueryVisitorImpl entityVisitor;
- private SimpleTraitQueryVisitorImpl traitVisitor;
- private IMetaDataSourceModelProvider provider;
-
- /**
- * Constructor. Queries with search control limited to first found.
- * @param model
- */
- public MetaDataModelMergeAssistantImpl(final MetaDataModel model) {
- this.mergedModel = model;
- entityVisitor = new SimpleEntityQueryVisitorImpl(new HierarchicalSearchControl(1,
- HierarchicalSearchControl.SCOPE_ALL_LEVELS));
- traitVisitor = new SimpleTraitQueryVisitorImpl(new SearchControl(1));
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.jsf.common.metadata.internal.IMetaDataModelMergeAssistant#getMergedModel()
- */
- public MetaDataModel getMergedModel() {
- return mergedModel;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.jsf.common.metadata.internal.IMetaDataModelMergeAssistant#getSourceModel()
- */
- public IMetaDataSourceModelProvider getSourceModelProvider() {
- return provider;
- }
-
- public void setSourceModelProvider(final IMetaDataSourceModelProvider provider) {
- this.provider = provider;
- }
-
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.jsf.common.metadata.internal.IMetaDataModelMergeAssistant#addEntityGroup(org.eclipse.jst.jsf.common.metadata.EntityGroup)
- */
- public void addEntityGroup(final EntityGroup entityGroup) {
- final Model model = (Model)getMergedModel().getRoot();
- if (!isExistingEntityGroup(model, entityGroup)){
- model.getEntityGroups().add(entityGroup);
- }
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.jsf.common.metadata.internal.IMetaDataModelMergeAssistant#addEntity(org.eclipse.jst.jsf.common.metadata.Entity)
- */
- public Entity addEntity(final Entity entity) {
- Entity mmEntity = getMergedEntity(entity);
- if (mmEntity == null){
- mmEntity = addEntityAsNecessary((Entity)entity.eContainer(), entity);
- return mmEntity;
- }
- addIncludeGroupsAsNecessary(mmEntity, entity);
- return mmEntity;
- }
-
- public Entity getMergedEntity(final Entity queryRoot, final String entityKey){
- Entity ret = null;
- SimpleResultSet rs = (SimpleResultSet)entityVisitor.findEntities(queryRoot, entityKey);
- try {
- if (! rs.getResults().isEmpty())
- ret = (Entity)rs.getResults().get(0);
- rs.close();
- } catch (MetaDataException e) {
- JSFCommonPlugin.log(IStatus.ERROR, "Error in getMergedEntity()", e); //$NON-NLS-1$
- }
- return ret;
- }
- private void addIncludeGroupsAsNecessary(final Entity mmEntity, final Entity entity) {
- for (final Iterator it=entity.getIncludeGroups().iterator();it.hasNext();){
- final IncludeEntityGroup grp = (IncludeEntityGroup)it.next();
- boolean found = false;
- for (Iterator it2=mmEntity.getIncludeGroups().iterator();it2.hasNext();){
- final IncludeEntityGroup grp2 = (IncludeEntityGroup)it2.next();
- if (grp2.equals(grp)){
- found = true;
- break;
- }
- }
- if (!found){//maybe we should clone and add
- mmEntity.getIncludeGroups().add(grp);
- }
- }
- }
-
- /**
- * Checks to see if the entity (by id) is present in the mergedModel or not.
- * If not, it will perform a copy of the entity and it's attributes using
- * EcoreUtil.Copier.
- *
- * @param parent
- * @param entity
- * @return
- */
- private Entity addEntityAsNecessary(final Entity parent, final Entity entity) {
- Entity mmParent = null;
- Entity mmEntity = null;
- if (parent != null){
- mmParent = getMergedEntity(parent);
- if (mmParent == null){
- mmParent = addEntityAsNecessary((Entity)entity.eContainer(), entity);
- }
- }
- if (mmParent != null){
- mmEntity = addEntityInternal(mmParent, entity);
- return mmEntity;
- }
- return mmEntity;
- }
-
- private boolean isExistingEntityGroup(final Model model, final EntityGroup entityGroup) {
- boolean found = false;
- for(final Iterator it=model.getEntityGroups().iterator();it.hasNext();){
- if (entityGroup.getId().equals(((EntityGroup)it.next()).getId()))
- return true;
- }
- return found;
- }
-
- private Entity getExistingChildEntity(final Entity parent, final Entity entity) {
- for(final Iterator it=parent.getChildEntities().iterator();it.hasNext();){
- final Entity foundEntity = (Entity)it.next();
- if (entity.getId().equals(foundEntity.getId()))
- return foundEntity;
- }
- return null;
- }
-
- private /*synchronized*/ Entity addEntityInternal(final Entity parent, final Entity entity) {
- final Copier copier = new Copier();
- final Entity mmEntity =(Entity)copier.copy(entity);
- copier.copyReferences();
- parent.getChildEntities().add(mmEntity);
- return mmEntity;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.jsf.common.metadata.internal.IMetaDataModelMergeAssistant#addTrait(org.eclipse.jst.jsf.common.metadata.Entity, org.eclipse.jst.jsf.common.metadata.Trait)
- */
- public boolean addTrait(final Entity entity, final Trait trait) {
- final Entity returnedEntity = getMergedEntity(entity);
- if (returnedEntity != null){
- return addTraitAsNecessary(returnedEntity, trait);
- }
- return false;
- }
-
-
- private boolean addTraitAsNecessary(Entity mergedEntity, Trait trait) {
- final Trait mmTrait = getMergedTrait(mergedEntity, trait);
- if (mmTrait == null){
- addTraitInternal(mergedEntity, trait);
- return true;
-
- }
- return false;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.jsf.common.metadata.internal.IMetaDataModelMergeAssistant#setMergeComplete()
- */
- public void setMergeComplete() {
- final Model model = (Model)getMergedModel().getRoot();
- if (model != null){
- StandardModelFactory.debug(">> Begin processIncludeGroups for: "+getMergedModel().getModelContext(),StandardModelFactory.DEBUG_MD_LOAD); //$NON-NLS-1$
-
- processIncludeGroups(model);
-
- StandardModelFactory.debug(">> End processIncludeGroups for: "+getMergedModel().getModelContext(),StandardModelFactory.DEBUG_MD_LOAD); //$NON-NLS-1$
- }
- }
-
- /**
- * Copies the passed trait and adds it to the merged entity.
- * The source model provider of the trait is then set on the trait so that
- * the trait can know where it came from.
- *
- * @param parent
- * @param trait
- * @return merged Trait
- */
- private Trait addTraitInternal(final Entity parent, final Trait trait) {
- final Copier copier = new Copier();
- final Trait mmTrait =(Trait)copier.copy(trait);
- copier.copyReferences();
- parent.getTraits().add(mmTrait);
- //set the model key to know from where the trait came
- mmTrait.setSourceModelProvider(trait.getSourceModelProvider());
- return mmTrait;
- }
-
- /**
- * Locates the entity in the merged model matching by id only.
- * If not located, this method returns null;
- *
- * @param entity
- * @return merged entity
- */
- private Entity getMergedEntity(final Entity entity){
- if (entity instanceof Model)
- return (Entity)mergedModel.getRoot();
-
- Entity ret = null;
- final String entityKey = getIdRelativeToRoot(entity);
- final SimpleResultSet rs = (SimpleResultSet)entityVisitor.findEntities((Entity)mergedModel.getRoot(), entityKey);
- try {
- if (! rs.getResults().isEmpty())
- ret = (Entity)rs.getResults().get(0);
- rs.close();
- } catch (MetaDataException e) {
- JSFCommonPlugin.log(IStatus.ERROR, "Error in getMergedEntity()", e); //$NON-NLS-1$
- }
- return ret;
- }
-
- private String getIdRelativeToRoot(final Entity entity) {
- Entity e = entity;
- final StringBuffer buf = new StringBuffer();
- while (e.eContainer() != null){
- buf.insert(0, e.getId());
- if (e.eContainer()!=null && e.eContainer().eContainer() != null)
- buf.insert(0,"/"); //$NON-NLS-1$
- e = (Entity)e.eContainer();
- }
- return buf.toString();
- }
-
- /**
- * Locates the trait in the merged model matching by id only.
- * If not located, this method returns null;
- *
- * @param entity
- * @param trait
- * @return merged Trait
- */
- public Trait getMergedTrait(final Entity entity, final Trait trait){
- final SimpleResultSet rs = (SimpleResultSet)traitVisitor.findTraits(entity, trait.getId());
- Trait ret = null;
- try {
- if (! rs.getResults().isEmpty())
- ret = (Trait)rs.getResults().get(0);
- rs.close();
- } catch (MetaDataException e) {
- JSFCommonPlugin.log(IStatus.ERROR, "Error in getMergedTrait()", e); //$NON-NLS-1$
- }
- return ret;
- }
-
- private void processIncludeGroups(final Model root) {
- addEntityGroupReferencesRecursively(root);
- }
-
- private void addEntityGroupReferencesRecursively(final Entity entity) {
- doIncludes(entity);
- for (int i=0, size=entity.getChildEntities().size();i<size;i++){
- addEntityGroupReferencesRecursively((Entity)entity.getChildEntities().get(i));
- }
- }
-
- private void doIncludes(final Entity entity){
- for (int j=0, groupsSize=entity.getIncludeGroups().size();j<groupsSize; j++){
- final IncludeEntityGroup include = (IncludeEntityGroup)entity.getIncludeGroups().get(j);
- if (include.getId() != null){
- //is this a local merge?
- if (include.getModelUri() == null||
- (include.getModelUri()
- .equals(getMergedModel()
- .getModelContext().getModelIdentifier())) ){
- final EntityGroup eg = ((Model)getMergedModel().getRoot()).findIncludeGroup(include.getId());
- addIncludeRefs(entity, eg);
- } else //external model include
- addIncludeRefs(entity, include);
- }
- }
- }
- /*
- * Adds traits and child entities from an external entity group to the passed entity
- * @param entity
- * @param include
- */
- private void addIncludeRefs(final Entity entity, final IncludeEntityGroup include) {
- final IMetaDataModelContext modelContext = getMergedModel().getModelContext();
- final IMetaDataQuery query = MetaDataQueryFactory.getInstance().createQuery(modelContext);
- final Model externalModel = query.getQueryHelper().getModel(include.getModelUri());
- if (externalModel != null){
- final EntityGroup entityGroup = externalModel.findIncludeGroup(include.getId());
- addIncludeRefs(entity, entityGroup);
- }
- else {
- JSFCommonPlugin.log(IStatus.ERROR, "Unable to load external metadata model refs for "+modelContext.getModelIdentifier() //$NON-NLS-1$
- + " into "+ include.getModelUri()); //$NON-NLS-1$
- }
- }
-
- /*
- * Adds traits and child entities from a local entity group to the passed entity if not already present for the entity.
- * First
- * @param entity
- * @param entityGroup
- */
- private void addIncludeRefs(final Entity entity, final EntityGroup entityGroup) {
- if (entityGroup == null)
- return;
-
- for (int i=0, size=entityGroup.getTraits().size();i<size;i++){
- addTrait(entity, (Trait)entityGroup.getTraits().get(i));
- }
-
- for (int i=0, size=entityGroup.getChildEntities().size();i<size;i++){
- traverseAndAddIncludes(entity, (Entity)entityGroup.getChildEntities().get(i));
- }
- }
-
- private void traverseAndAddIncludes(final Entity parent, final Entity entity){
- final Entity mergedEntity = addIncludedEntityAsNecessary(parent, entity);
-
- for (final Iterator/*<Trait>*/ it=entity.getTraits().iterator();it.hasNext();){
- final Trait trait = (Trait)it.next();
- addTraitAsNecessary(mergedEntity, trait);
- }
-
- for (final Iterator/*<EntityKey>*/ it=entity.getChildEntities().iterator();it.hasNext();){
- final Entity e = (Entity)it.next();
- traverseAndAddIncludes(mergedEntity, e);//add as normal
- }
-
- }
-
- /*
- * Checks to see if the entity (by id) is present as a child entity in the parent or not.
- * If not, it will add the entity to the childEntities without copying.
- *
- * @param parent
- * @param entity
- * @return Entity
- */
- private Entity addIncludedEntityAsNecessary(final Entity parent, final Entity entity) {
- Entity mergedEntity = getExistingChildEntity(parent, entity);
- if (mergedEntity == null){
- mergedEntity = addEntityInternal(parent, entity);
- }
- return mergedEntity;
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/ModelKeyDescriptor.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/ModelKeyDescriptor.java
deleted file mode 100644
index 380d218..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/ModelKeyDescriptor.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 Oracle 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:
- * Oracle - initial API and implementation
- *
- ********************************************************************************/
-package org.eclipse.jst.jsf.common.metadata.internal;
-
-import org.eclipse.core.resources.IProject;
-
-/**
- * Meta data model key descriptor used to lazily load a model when it is required
- *
- */
-public class ModelKeyDescriptor {
- private final IProject project;
- private final String domain;
- private final String uri;
- private final String key;
-
- /**
- * Constructor
- * @param project
- * @param domain
- * @param uri
- */
- public ModelKeyDescriptor(final IProject project, final String domain, final String uri){
- this.project = project;
- this.domain = domain;
- this.uri = fixJSPURIIfNecessary(uri);
- final String proj = project != null ? project.getName() : "Null"; //$NON-NLS-1$
- final StringBuffer buf = new StringBuffer(proj);
- buf.append(":"); //$NON-NLS-1$
- buf.append(this.domain);
- buf.append(":"); //$NON-NLS-1$
- buf.append(this.uri);
- key = buf.toString();
- }
-
- //this is a workaround for issue where jsp "uri" may upper or lower cased
- private String fixJSPURIIfNecessary(final String tempuri) {
- if (tempuri != null && tempuri.equals("jsp11")) //$NON-NLS-1$
- return tempuri.toUpperCase();
- return tempuri;
- }
-
- /**
- * @return domain id
- */
- public final String getDomain(){
- return domain;
- }
-
- /**
- * @return model uri
- */
- public final String getUri(){
- return uri;
- }
-
- /**
- * @return project
- */
- public final IProject getProject(){
- return project;
- }
-
- /* (non-Javadoc)
- * @see java.lang.Object#toString()
- */
- public final String toString(){
- return key;
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/ModelNotSetException.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/ModelNotSetException.java
deleted file mode 100644
index 34b90b1..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/ModelNotSetException.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 Oracle 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:
- * Oracle - initial API and implementation
- *
- ********************************************************************************/
-package org.eclipse.jst.jsf.common.metadata.internal;
-
-/**
- * Experimental
- *
- */
-public class ModelNotSetException extends Exception {
- private static final long serialVersionUID = 1L;
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/PluginRelativeStandardMetaDataSourceFileLocator.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/PluginRelativeStandardMetaDataSourceFileLocator.java
deleted file mode 100644
index db7ed2a..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/PluginRelativeStandardMetaDataSourceFileLocator.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2007 Oracle 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:
- * Oracle - initial API and implementation
- *
- ********************************************************************************/
-
-package org.eclipse.jst.jsf.common.metadata.internal;
-
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.ResourceBundle;
-
-import org.eclipse.core.runtime.FileLocator;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
-import org.osgi.framework.Bundle;
-
-/**
- * Default implementation of StandardMetaDataSourceFileLocator that will locate standard metadata files
- * and resource bundles relative to the plugin that registered the files using the
- * <code>org.eclipse.jst.jsf.common.StandardMetaDataFiles</code> ext-pt.
- *
- */
-public class PluginRelativeStandardMetaDataSourceFileLocator extends StandardMetaDataSourceFileLocator{
-
- private ResourceBundle resourceBundle;
-
- /*
- * Returns InputStream of standard metadata file from plugin relative location.
- *
- */
- public InputStream getInputStream() throws IOException {
- URL url = getURL();
- if (url != null)
- return url.openStream();
-
- String fileName = Path.fromOSString(fileInfo.getLocation()).toString() + " (Plugin: " + fileInfo.getBundleId()+")" ; //$NON-NLS-1$ //$NON-NLS-2$
- throw new FileNotFoundException("Metadata file not found: "+ fileName); //$NON-NLS-1$
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.jsf.common.metadata.internal.StandardMetaDataSourceFileLocator#getURL()
- */
- public URL getURL() {
- final Bundle bundle = Platform.getBundle(fileInfo.getBundleId());
- if (bundle == null)
- {
- return null;
- }
- final IPath fromOSString = Path.fromOSString(fileInfo.getLocation());
- return FileLocator.find(bundle, fromOSString, null);
- }
-
-
- /*
- * Returns property resource bundle if it exists. May return null.
- * This implementation assumes that the basename of the bundle is the same
- * as the source file name and in the same directory.
- *
- */
- public ResourceBundle getResourceBundle() throws IOException, MalformedURLException {
- if (resourceBundle == null){
- URL bundleURL = getStandardMetaDataSourceFileBasenameURL();
- if (bundleURL == null)
- return null;
-
- resourceBundle = ResourceBundleHelper.getResourceBundle(bundleURL);
- }
- return resourceBundle;
- }
-
- private URL getStandardMetaDataSourceFileBasenameURL() {
- IPath annotationPath = Path.fromOSString(fileInfo.getLocation());
- IPath annotationFolder = annotationPath.removeLastSegments(1);
- IPath propertiesLocation = annotationPath.removeFirstSegments(annotationPath.segmentCount() - 1).removeFileExtension();
- // append location of properties file
- IPath propertiesFile = annotationFolder.append(propertiesLocation);
-
- // append .properties extension if needed
- if (propertiesFile.getFileExtension() == null)
- propertiesFile = propertiesFile.addFileExtension("properties"); //$NON-NLS-1$
- // create a URL out of the properties file location
- return FileLocator.find(Platform.getBundle(fileInfo.getBundleId()),
- propertiesFile, null);
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/ResourceBundleHelper.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/ResourceBundleHelper.java
deleted file mode 100644
index fc55894..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/ResourceBundleHelper.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- * Jens Lukowski/Innoopract - initial renaming/restructuring
- * Gerry Kessler/Oracle - copied from org.eclipse.wst.sse.core.internal.encoding.util and modified heavily
- *******************************************************************************/
-package org.eclipse.jst.jsf.common.metadata.internal;
-
-import java.io.IOException;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.net.URLClassLoader;
-import java.util.Locale;
-import java.util.ResourceBundle;
-
-import org.eclipse.core.runtime.FileLocator;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-
-/**
- * ResourceBundleHelper
- *
- */
-public final class ResourceBundleHelper {
-
- /**
- * @param resourceURL
- * @return ResourceBundle
- * @throws MalformedURLException - may return null
- * @throws IOException
- */
- public static ResourceBundle getResourceBundle(final URL resourceURL) throws MalformedURLException, IOException {
- return getResourceBundle(resourceURL, Locale.getDefault());
- }
-
- /**
- * @param resourceURL
- * @param targetLocale
- * @return ResourceBundle - may return null
- * @throws MalformedURLException
- * @throws IOException
- */
- public static ResourceBundle getResourceBundle(final URL resourceURL, final Locale targetLocale) throws MalformedURLException, IOException {
- // try to load bundle from the location specified in the resourceURL
- //
- final String protocol = resourceURL.getProtocol();
- final String host = resourceURL.getHost();
- final String file = resourceURL.getFile();
- final IPath path = new Path(file);
-
- String dir = "./"; //$NON-NLS-1$
- final String bundleName = path.removeFileExtension().segment(path.segmentCount() - 1);
- if (path.segmentCount() > 1)
- {
- dir = path.removeLastSegments(1).toString();
- }
-
- // create a class loader with a class path that points to the resource
- // bundle's location
- //
- final URL[] classpath = new URL[1];
- classpath[0] = FileLocator.resolve(new URL(protocol, host, dir));
- // TODO: does this need to be in a doPrivileged block?
- final ClassLoader resourceLoader = new URLClassLoader(classpath, null);
-
- return ResourceBundle.getBundle(bundleName, targetLocale, resourceLoader);
- }
-
- private ResourceBundleHelper()
- {
- // no instantiation
- }
-}
-
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/StandardMetaDataFileInfo.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/StandardMetaDataFileInfo.java
deleted file mode 100644
index 25cc1c2..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/StandardMetaDataFileInfo.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 Oracle 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:
- * Oracle - initial API and implementation
- *
- ********************************************************************************/
-package org.eclipse.jst.jsf.common.metadata.internal;
-
-/**
- * Contains information about annotation files.
- */
-public final class StandardMetaDataFileInfo implements IStandardMetaDataSourceInfo{
-
- private final String fileLocation;
- private final String fileLocatorClassname;
- private final String bundleId;
-
- /**
- * Constructor
- * @param fileLocation
- * @param bundleId
- * @param fileLocatorClassname
- */
- public StandardMetaDataFileInfo( String fileLocation, String bundleId, String fileLocatorClassname) {
- this.fileLocation = fileLocation.trim();
- this.bundleId = bundleId.trim();
- this.fileLocatorClassname = fileLocatorClassname;
- }
-
- /**
- * Get the location of the annotation file as originally specified.
- *
- * @return String
- */
- public String getLocation() {
- return fileLocation;
- }
-
- /**
- * Get the annotation file locator classname that must implement ICMAnnotationSourceFileLocator.
- * Can return null or empty string. Caller should provide default.
- *
- * @return String
- */
- public String getLocatorClassname() {
- return fileLocatorClassname != null ? fileLocatorClassname.trim() : null;
- }
-
- /**
- * Get the bundle id of the plugin where the annotation file is located.
- *
- * @return String
- */
- public String getBundleId() {
- return bundleId;
- }
-
- public String toString(){
- StringBuffer buf = new StringBuffer("StandardMetaDataFileInfo"); //$NON-NLS-1$
- buf.append(": "); //$NON-NLS-1$
- buf.append(bundleId);
- buf.append("/"); //$NON-NLS-1$
- buf.append(fileLocation);
- if (getLocatorClassname() != null){
- buf.append(": "); //$NON-NLS-1$
- buf.append(getLocatorClassname());
- }
- return buf.toString();
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/StandardMetaDataFileRegistry.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/StandardMetaDataFileRegistry.java
deleted file mode 100644
index 49d0d4e..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/StandardMetaDataFileRegistry.java
+++ /dev/null
@@ -1,321 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2006, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM - Initial API and implementation
- * Jens Lukowski/Innoopract - initial renaming/restructuring
- * Gerry Kessler/Oracle - code borrowed and repurposed for JSF subproject
- *
- *******************************************************************************/
-package org.eclipse.jst.jsf.common.metadata.internal;
-
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URISyntaxException;
-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 java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-import org.eclipse.core.runtime.FileLocator;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jst.jsf.common.JSFCommonPlugin;
-import org.eclipse.jst.jsf.common.metadata.Model;
-import org.eclipse.jst.jsf.common.metadata.Trait;
-
-
-/**
- * Registry of standard metadata files
- */
-public final class StandardMetaDataFileRegistry {
- private Map<String, List<IMetaDataSourceModelProvider>> mdFilesMap = new HashMap<String, List<IMetaDataSourceModelProvider>>(1);
- private List<IMetaDataSourceModelProvider> EMPTY_LIST = new ArrayList<IMetaDataSourceModelProvider>(0);
-
- private static StandardMetaDataFileRegistry reg;
-
- /**
- * @return the singleton instance of the registry
- */
- public synchronized static StandardMetaDataFileRegistry getInstance() {
- if (reg == null){
- reg = new StandardMetaDataFileRegistry();
- }
- return reg;
- }
-
- private StandardMetaDataFileRegistry() {
- new StandardMetaDataFileRegistryReader(this).readRegistry();
- }
-
- /**
- * @param uri as String
- * @return list of standard metadata sources as <code>IMetaDataSourceModelProvider</code>s.
- * Returns empty list of no standard metadata files are registered for the given uri.
- */
- public synchronized List<IMetaDataSourceModelProvider> getStandardMetaDataModelProviders(String uri) {
- List<IMetaDataSourceModelProvider> theList = mdFilesMap.get(uri);
- return theList != null ? theList : EMPTY_LIST ;
- }
-
- /**
- * For use by registry reader only
- * @param uri
- * @param fileInfo
- */
- public synchronized void addStandardMetaDataFileInfo(String uri, IStandardMetaDataSourceInfo fileInfo) {
- List<IMetaDataSourceModelProvider> providers = mdFilesMap.get(uri);
- if (providers == null) {
- providers = new ArrayList<IMetaDataSourceModelProvider>();
- mdFilesMap.put(uri, providers);
- }
- providers.add(new StandardMetaDataFilesProvider(fileInfo));
- }
-
-/**
- * Internal implementation of IMetaDataSourceModelProvider for "standard" metadata sources
- *
- */
-static class StandardMetaDataFilesProvider implements IMetaDataSourceModelProvider {
-
- private org.eclipse.jst.jsf.common.metadata.internal.IStandardMetaDataSourceInfo info;
- private Object model;
- private IMetaDataLocator locator;
- private StandardMetaDataSourceFileLocator fileLocator = null;
-
- /**
- * Constructor
- * @param info
- */
- StandardMetaDataFilesProvider(IStandardMetaDataSourceInfo info){
- this.info = info;
- }
-
- private StandardMetaDataSourceFileLocator getFileLocator(){
- if (fileLocator == null){
- if (info.getLocatorClassname() == null){
- fileLocator = new PluginRelativeStandardMetaDataSourceFileLocator();
- }
- else {
- Class klass = JSFCommonPlugin.loadClass(info.getLocatorClassname(), info.getBundleId());
- try {
- fileLocator = (StandardMetaDataSourceFileLocator)klass.newInstance();
- } catch (InstantiationException e) {
- JSFCommonPlugin.log(IStatus.ERROR, "InstantiationException: StandardMetaDataFilesProvider.getFileLocator()", e); //$NON-NLS-1$
- } catch (IllegalAccessException e) {
- JSFCommonPlugin.log(IStatus.ERROR, "IllegalAccessException: StandardMetaDataFilesProvider.getFileLocator()", e); //$NON-NLS-1$
- }
- }
- if (fileLocator != null)
- fileLocator.setFileInfo(info);
- }
- return fileLocator;
- }
-
- private InputStream getInputStream() throws IOException {
- if (getFileLocator() != null){
- return getFileLocator().getInputStream();
- }
- return null;
-
- }
-
- private URI getMDFileURI()
- {
- try
- {
- StandardMetaDataSourceFileLocator fileLocator2 = getFileLocator();
- if (fileLocator2 != null)
- {
- final URL url = fileLocator2.getURL();
- if (url == null)
- {
- JSFCommonPlugin.log(new RuntimeException(),
- "Couldn't locate meta-data file for " //$NON-NLS-1$
- + fileLocator2.getFileInfo()
- .getLocation());
- return null;
- }
-
- java.net.URI uri = url.toURI();
- return URI.createURI(uri.toString());
- }
- }
- catch (URISyntaxException e)
- {
- JSFCommonPlugin.log(IStatus.ERROR, "Metadata File Load Error: " //$NON-NLS-1$
- + getFileLocator().getFileInfo().toString()
- + ": URISyntaxException: " + e.getMessage()); //$NON-NLS-1$
- }
- return null;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.jsf.common.metadata.internal.IMetaDataSourceModelProvider#getSourceModel()
- */
- public Object getSourceModel() {
- if (model != null)
- return model;
-
- InputStream inputStream = null;
- try {
- URI uri = getMDFileURI();
- inputStream = getInputStream();
- if (inputStream != null && uri != null){
- EList contents = StandardModelFactory.getInstance().loadStandardFileResource(inputStream, this, uri);
- //check to see if this is a Model
- if (contents != null && !contents.isEmpty() &&
- contents.get(0) instanceof Model){
- model = contents.get(0);
- ((Model)model).setSourceModelProvider(this);
- }
- }
- } catch (FileNotFoundException e){
- JSFCommonPlugin.log(IStatus.ERROR, e.getLocalizedMessage());
- } catch (IOException e) {
- JSFCommonPlugin.log(IStatus.ERROR,"IOException(1): StandardMetaDataFilesProvider.getSourceModel():"+getModelName(), e); //$NON-NLS-1$
- } finally {
- if (inputStream != null){
- try {
- inputStream.close();
- } catch (IOException e) {
- JSFCommonPlugin.log( IStatus.ERROR,"IOException (2): StandardMetaDataFilesProvider.getSourceModel():"+getModelName(), e); //$NON-NLS-1$
- }
- }
- }
- return model;
- }
-
- private String getModelName() {
- return info.toString();
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.jsf.common.metadata.internal.IMetaDataSourceModelProvider#getLocator()
- */
- public IMetaDataLocator getLocator() {
- return locator;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.jsf.common.metadata.internal.IMetaDataSourceModelProvider#setLocator(org.eclipse.jst.jsf.common.metadata.internal.IMetaDataLocator)
- */
- public void setLocator(IMetaDataLocator locator) {
- this.locator = locator;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.jsf.common.metadata.internal.IMetaDataSourceModelProvider#getResourceBundle()
- */
- private ResourceBundle internalGetResourceBundle() {
- if (getFileLocator() != null){
- try {
- return fileLocator.getResourceBundle();
- } catch (MissingResourceException e) {
- JSFCommonPlugin.log(IStatus.ERROR, "InternalGetResourceBundle1", e); //$NON-NLS-1$
- } catch (IOException e) {
- JSFCommonPlugin.log(IStatus.ERROR, "InternalGetResourceBundle2", e); //$NON-NLS-1$
- }
- }
- return null;
- }
-
- public Object getAdapter(Class klass) {
- final StandardMetaDataFilesProvider mdp = this;
- if (klass == IImageDescriptorProvider.class){
- return new IImageDescriptorProvider(){
- String imageBase;
- public ImageDescriptor getImageDescriptor(String imagePath) {
- imagePath = appendImageBase(imagePath);
- String bundleID = mdp.getFileLocator().getFileInfo().getBundleId();
- URL url = FileLocator.find(Platform.getBundle(bundleID), new Path(imagePath), null);
- return ImageDescriptor.createFromURL(url);
- }
- private String appendImageBase(String imagePath) {
- return getImageBase() + imagePath;
- }
-
- private String getImageBase(){
- if (imageBase == null){
- final Model aModel = (Model)getSourceModel();
- final Trait t = getImageBasePath(aModel);
- if (t == null){
- imageBase = ""; //$NON-NLS-1$
- } else {
- imageBase = TraitValueHelper.getValueAsString(t);
- if (imageBase != null && imageBase.length() > 0){
- imageBase = imageBase +"/"; //$NON-NLS-1$
- }
- }
- }
- return imageBase;
- }
-
- private Trait getImageBasePath(final Model aModel) {
- for (final Iterator it= aModel.getTraits().iterator(); it.hasNext();) {
- Trait t = (Trait)it.next();
- if (t.getId().equals("images-base-path")){ //$NON-NLS-1$
- return t;
- }
- }
- return null;
- }
-
- };
-
- } else if (klass == IResourceBundleProvider.class) {
- return new IResourceBundleProvider(){
-
- public ResourceBundle getResourceBundle() {
- return mdp.internalGetResourceBundle();
- }
-
- };
-
- } else if (klass == IClassLoaderProvider.class){
- return new IClassLoaderProvider(){
-
- public Class loadClass(String className) {
- String bundleID = mdp.getFileLocator().getFileInfo().getBundleId();
- try {
- return Platform.getBundle(bundleID).loadClass(className);
- } catch (ClassNotFoundException e) {
- return null;
- }
- }
-
- };
- } else if (klass == IResourceURLProvider.class) {
- return new IResourceURLProvider() {
-
- public URL getResourceURL(String resourcePath) {
- URL resourceURL = null;
- String bundleID = mdp.getFileLocator().getFileInfo().getBundleId();
- try {
- resourceURL = FileLocator.resolve(Platform.getBundle(bundleID).getResource(resourcePath));
- } catch (IOException ioe) {
- //do nothing, will return null resourceURL
- }
- return resourceURL;
- }
-
- };
- }
- return null;
- }
-
-}
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/StandardMetaDataFileRegistryReader.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/StandardMetaDataFileRegistryReader.java
deleted file mode 100644
index 802481b..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/StandardMetaDataFileRegistryReader.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2006, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM - Initial API and implementation
- * Jens Lukowski/Innoopract - initial renaming/restructuring
- * Gerry Kessler/Oracle - code borrowed and repurposed for JSF subproject
- *
- *******************************************************************************/
-package org.eclipse.jst.jsf.common.metadata.internal;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtensionPoint;
-import org.eclipse.core.runtime.IExtensionRegistry;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.jst.jsf.common.JSFCommonPlugin;
-
-
-/**
- * This class reads the standardMetaDataFiles extensions adds each specified standard metadata
- * file to the StandardMetaDataFileRegistry.
- *
- * @see StandardMetaDataFileRegistry
- * also see StandardMetaDataFile extension-point
- */
-public class StandardMetaDataFileRegistryReader {
- /**
- * EXTENSION POINT ID
- */
- protected static final String EXTENSION_POINT_ID = "standardMetaDataFiles"; //$NON-NLS-1$
- /**
- * IConfigurationElement element name
- */
- protected static final String TAG_NAME = "StandardMetaDataFile"; //$NON-NLS-1$
- /**
- * Uri attribute name for IConfigurationElement
- */
- protected static final String ATT_URI = "uri"; //$NON-NLS-1$
- /**
- * Location attribute name for IConfigurationElement
- */
- protected static final String ATT_LOCATION = "location"; //$NON-NLS-1$
- /**
- * Locator attribute name for IConfigurationElement
- */
- protected static final String ATT_LOCATOR = "locator"; //$NON-NLS-1$
-
- private StandardMetaDataFileRegistry annotationFileRegistry;
-
- /**
- * Constructor
- * @param registry
- */
- public StandardMetaDataFileRegistryReader(StandardMetaDataFileRegistry registry) {
- this.annotationFileRegistry = registry;
- }
-
- /**
- * read the registery
- */
- public void readRegistry() {
- IExtensionRegistry extensionRegistry = Platform.getExtensionRegistry();
- IExtensionPoint point = extensionRegistry.getExtensionPoint(JSFCommonPlugin.PLUGIN_ID, EXTENSION_POINT_ID);
- if (point != null) {
- IConfigurationElement[] elements = point.getConfigurationElements();
- for (int i = 0; i < elements.length; i++) {
- readElement(elements[i]);
- }
- }
- }
-
- private void readElement(IConfigurationElement element) {
- if (element.getName().equalsIgnoreCase(TAG_NAME)) {
- String uri = element.getAttribute(ATT_URI);
- String location = element.getAttribute(ATT_LOCATION);
- String locator = element.getAttribute(ATT_LOCATOR);
- String bundleId = null;
- if (uri != null && location != null) {
- try {
- bundleId = element.getContributor().getName();
- StandardMetaDataFileInfo fileInfo = new StandardMetaDataFileInfo(location, bundleId, locator);
- annotationFileRegistry.addStandardMetaDataFileInfo(uri, fileInfo);
- }
- catch (Exception e) {
- JSFCommonPlugin.log(IStatus.ERROR, "Internal Error: exception occurred while reading StandardMetaDataFile ext-pt: "+location + ":"+uri, e); //$NON-NLS-1$ //$NON-NLS-2$ }
- }
- }
- }
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/StandardMetaDataFilesTranslator.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/StandardMetaDataFilesTranslator.java
deleted file mode 100644
index 6695ec5..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/StandardMetaDataFilesTranslator.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 Oracle 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:
- * Oracle - initial API and implementation
- *
- ********************************************************************************/
-package org.eclipse.jst.jsf.common.metadata.internal;
-
-import java.util.Iterator;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.emf.ecore.util.EcoreUtil.Copier;
-import org.eclipse.jst.jsf.common.JSFCommonPlugin;
-import org.eclipse.jst.jsf.common.metadata.Entity;
-import org.eclipse.jst.jsf.common.metadata.EntityGroup;
-import org.eclipse.jst.jsf.common.metadata.Model;
-import org.eclipse.jst.jsf.common.metadata.Trait;
-import org.eclipse.jst.jsf.common.metadata.internal.StandardMetaDataFileRegistry.StandardMetaDataFilesProvider;
-
-
-/**
- * A 'null' translation of a metadata file. Entities and traits are not transformed.
- *
- */
-public class StandardMetaDataFilesTranslator implements IMetaDataTranslator {
-
- public boolean canTranslate(final IMetaDataSourceModelProvider modelProvider) {
- if (modelProvider instanceof StandardMetaDataFilesProvider)
- return true;
- return false;
- }
-
- public void translate(final IMetaDataModelMergeAssistant assistant) {//TODO: throw proper errors
- //null translate - sourceModel object are already Entities and traits
- //traverse the tree and add to model
-
- //temp - throw proper errors
- //assert assistant.getSourceModel() instanceof ModelKeyDescriptor;
-
- final MetaDataModel mm = assistant.getMergedModel();
- final Model mk = (Model)assistant.getSourceModelProvider().getSourceModel();
- if (mm.getRoot() == null) {
- //create copy, otherwise source model becomes merged model because of reference
- final Copier copier = new Copier();
- final Model newModel = (Model)copier.copy(mk.getModel());
- copier.copyReferences();
- mm.setRoot(newModel);
- }
- else {
- //for each entity and trait call "add". assistant will handle merge.
- if (mk != null) {//possible that model was not loaded
- traverseAndAdd(assistant, mk);
- } else if (StandardModelFactory.DEBUG_MD_LOAD) {
- JSFCommonPlugin.log(IStatus.ERROR,"Unable to load source model: "+assistant.getSourceModelProvider()); //$NON-NLS-1$
- }
- }
- }
-
- /**
- * Add entity and any children
- * @param assistant
- * @param entity
- */
- protected void traverseAndAdd(final IMetaDataModelMergeAssistant assistant, final Entity entity){
- final Entity mmEntity = assistant.addEntity(entity);
-
- if (entity instanceof Model){
- final Model model = (Model)entity;
- for (final Iterator/*EntityGroup*/ it=model.getEntityGroups().iterator();it.hasNext();){
- assistant.addEntityGroup((EntityGroup)it.next());
- }
- }
-
- for (final Iterator/*<Trait>*/ it=entity.getTraits().iterator();it.hasNext();){
- final Trait trait = (Trait)it.next();
- assistant.addTrait(mmEntity, trait);
- }
-
- for (final Iterator/*<EntityKey>*/ it=entity.getChildEntities().iterator();it.hasNext();){
- final Entity e = (Entity)it.next();
- traverseAndAdd(assistant, e);
- }
-
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/StandardMetaDataLocator.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/StandardMetaDataLocator.java
deleted file mode 100644
index fd3e3ea..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/StandardMetaDataLocator.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 Oracle 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:
- * Oracle - initial API and implementation
- *
- ********************************************************************************/
-package org.eclipse.jst.jsf.common.metadata.internal;
-
-import java.util.List;
-
-
-/**
- * Implementation of IMetaDataLocator for standard metadata sources.
- * Uses StandardMetaDataFileRegistry to locate instances.
- *
- */
-public class StandardMetaDataLocator extends AbstractMetaDataLocator {
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.jsf.common.metadata.internal.IMetaDataLocator#locateMetaDataModelProviders(java.lang.String)
- */
- public List locateMetaDataModelProviders(String uri) {
- return StandardMetaDataFileRegistry.getInstance().getStandardMetaDataModelProviders(uri);
- }
-
- /*
- * Does nothing.
- */
- public void startLocating() {
- //do nothing
- }
-
- /*
- * Does nothing.
- */
- public void stopLocating() {
- //do nothing
- }
-
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/StandardMetaDataSourceFileLocator.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/StandardMetaDataSourceFileLocator.java
deleted file mode 100644
index e65d0da..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/StandardMetaDataSourceFileLocator.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2007 Oracle 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:
- * Oracle - initial API and implementation
- *
- ********************************************************************************/
-
-package org.eclipse.jst.jsf.common.metadata.internal;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URL;
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-
-/**
- * Used to supply an InputStream to the parser of an annotation
- * meta-data file and the URL to the resource bundle for a properties file, if any.
- *
- * Implementors must provide a zero-argument constructor.
- *
- * CURRENTLY INTERNAL... WILL BE MADE API AT SOME POINT
- *
- */
-public abstract class StandardMetaDataSourceFileLocator {
- /**
- * metadata file to locate
- */
- protected IStandardMetaDataSourceInfo fileInfo;
-
- /**
- * Set the <code>IStandardMetaDataSourceInfo</code> for this locator
- * @param fileInfo
- */
- public final void setFileInfo(IStandardMetaDataSourceInfo fileInfo){
- this.fileInfo = fileInfo;
- }
-
- /**
- * @return the <code>IStandardMetaDataSourceInfo</code> for this locator
- */
- protected final IStandardMetaDataSourceInfo getFileInfo(){
- return fileInfo;
- }
- /**
- * Return InputStream to the meta-data source file.
- * Callers are responsible for closing the stream.
- * @return InputStream
- * @throws IOException
- */
- public abstract InputStream getInputStream() throws IOException;
-
- /**
- * Return URL to the meta-data source file.
-
- * @return URL or null if cannot find a the file for getFileInfo
- */
- public abstract URL getURL();
-
- /**
- * Return ResourceBundle for the property files if there are any. Return null if not.
- *
- * @return java.util.ResourceBundle
- * @throws IOException
- * @throws MissingResourceException
- */
- public abstract ResourceBundle getResourceBundle() throws IOException, MissingResourceException;
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/StandardModelFactory.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/StandardModelFactory.java
deleted file mode 100644
index fa24bb8..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/StandardModelFactory.java
+++ /dev/null
@@ -1,304 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 Oracle 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:
- * Oracle - initial API and implementation
- *
- ********************************************************************************/
-package org.eclipse.jst.jsf.common.metadata.internal;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.StringTokenizer;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
-import org.eclipse.emf.ecore.util.BasicExtendedMetaData;
-import org.eclipse.emf.ecore.util.ExtendedMetaData;
-import org.eclipse.emf.ecore.xmi.ClassNotFoundException;
-import org.eclipse.emf.ecore.xmi.FeatureNotFoundException;
-import org.eclipse.emf.ecore.xmi.IllegalValueException;
-import org.eclipse.emf.ecore.xmi.PackageNotFoundException;
-import org.eclipse.emf.ecore.xmi.UnresolvedReferenceException;
-import org.eclipse.emf.ecore.xmi.XMIException;
-import org.eclipse.emf.ecore.xmi.XMLResource;
-import org.eclipse.emf.ecore.xmi.impl.XMLResourceFactoryImpl;
-import org.eclipse.jst.jsf.common.JSFCommonPlugin;
-import org.eclipse.jst.jsf.common.metadata.Model;
-import org.eclipse.jst.jsf.common.metadata.internal.util.MetadataResourceImpl;
-
-/**
- * Singleton that produces and loads standard metadata models.
- * All models are loaded into the same ResourceSet.
- * <p>
- * All metadata extension models must be registered with org.eclipse.emf.ecore.generated_package extension-point.
- * No other mechanism is provided for model uri resolution.
- * <p>
- * Debug tracing for model loading is available: <code>org.eclipse.jst.jsf.common/debug/metadataload=true</code>
- * <p>
- * When the /debug/metadataload trace flag is set, and in case extension models are known not to be available,
- * and metadata is referencing those models, error logging can be suppressed by launching with the following properties set:<br>
- * metadata.package.ignores<br>
- * metadata.classname.ignores
- * <p>
- * eg. Usage for when WPE is not present<p>
- * <code>
- -Dmetadata.package.ignores=http://org.eclipse.jsf.pagedesigner/dtinfo.ecore,<br>http://org.eclipse.jsf.pagedesigner/QuickEditTabSections.ecore<br>
- -Dmetadata.classname.ignores=DTInfo,QuickEditTabSections<br>
- * </code>
- * <p>
- * see {@link Model}
- */
-public class StandardModelFactory {
- private static StandardModelFactory INSTANCE;
- static boolean DEBUG_MD_LOAD = false;
- static boolean DEBUG_MD_GET = false;
- private ExtendedMetaData extendedMetaData;
- private ResourceSet resourceSet;
-
-
- /**
- * @return singleton instance of the metadata model factory
- */
- public synchronized static StandardModelFactory getInstance(){
- if (INSTANCE == null){
- INSTANCE = new StandardModelFactory();
- INSTANCE.init();
-
- if (JSFCommonPlugin.getPlugin().isDebugging()){
- DEBUG_MD_LOAD = Boolean.valueOf(Platform.getDebugOption(JSFCommonPlugin.PLUGIN_ID+"/debug/metadataload")).booleanValue();//$NON-NLS-1$
- DEBUG_MD_GET = Boolean.valueOf(Platform.getDebugOption(JSFCommonPlugin.PLUGIN_ID+"/debug/metadataget")).booleanValue();//$NON-NLS-1$
- }
- }
- return INSTANCE;
- }
-
- private void init() {
- resourceSet = new ResourceSetImpl();
-
- extendedMetaData = new BasicExtendedMetaData(resourceSet.getPackageRegistry());
-
- // Register the appropriate resource factory to handle all file extensions.
- //
- resourceSet.getResourceFactoryRegistry().getExtensionToFactoryMap().put
- (Resource.Factory.Registry.DEFAULT_EXTENSION,
- new XMLResourceFactoryImpl());
-
- //relying on the org.eclipse.emf.ecore.generated_package ext-pt to register traits
- }
-
- private StandardModelFactory() {
- super();
- }
-
-// /**
-// * Factory method that probably belongs somewhere else!
-// * @param key
-// * @param strategy
-// * @return an empty MetaDataModel
-// * @deprecated
-// */
-// public MetaDataModel createModel(ModelKeyDescriptor key, IDomainLoadingStrategy strategy){
-// return new MetaDataModel(key, strategy);
-// }
-
- /**
- * @param context
- * @param strategy
- * @return MetaDataModel
- */
- public MetaDataModel createModel(final IMetaDataModelContext context, final IDomainLoadingStrategy strategy) {
- return new MetaDataModel(context, strategy);
- }
-//
-// /**
-// * Factory method that probably belongs somewhere else!
-// * @param modelContext
-// * @return a ModelKeyDescriptor for the context
-// * @deprecated
-// */
-// public ModelKeyDescriptor createModelKeyDescriptor(final ITaglibDomainMetaDataModelContext modelContext) {
-// return new ModelKeyDescriptor(modelContext.getProject(), modelContext.getDomainID(), modelContext.getURI());
-// }
-
- /**
- * @param inputStream
- * @param provider
- * @param uri
- * @return the root of the standard model from the resource as an EList
- * @throws IOException
- */
- public EList loadStandardFileResource(final InputStream inputStream,
- final IMetaDataSourceModelProvider provider,
- final org.eclipse.emf.common.util.URI uri) throws IOException
- {
- final XMLResource res = new MetadataResourceImpl(provider);
-
- debug(String.format(
- ">>> Loading standard meta-data file for uri %s", uri), DEBUG_MD_LOAD); //$NON-NLS-1$
-
- res.setURI(uri);
- resourceSet.getResources().add(res);
- setLoadOptions(res);
- res.load(inputStream, null);
- if (DEBUG_MD_LOAD)
- {
- reportErrors(res);
- }
- final EList root = res.getContents();
- return root;
- }
-
- private void reportErrors(Resource res) {
- EList<Resource.Diagnostic> errs = res.getErrors();
- if (! errs.isEmpty()){
- for (Iterator<Resource.Diagnostic> it= errs.iterator();it.hasNext();){
- StandardModelErrorMessageFactory.logErrorMessage(it.next());
- }
- }
- }
-
- /**
- * Sets default load options for the resource
- * @param resource
- */
- protected void setLoadOptions(XMLResource resource) {
- Map options = resource.getDefaultLoadOptions();
-// options.put(XMLResource.OPTION_SAVE_TYPE_INFORMATION, true);
- options.put(XMLResource.OPTION_SCHEMA_LOCATION, Boolean.TRUE);
- options.put(XMLResource.OPTION_EXTENDED_META_DATA, extendedMetaData);
- options.put(XMLResource.OPTION_RESOURCE_HANDLER, resource);
- options.put(XMLResource.OPTION_LAX_FEATURE_PROCESSING, Boolean.TRUE);
- options.put(XMLResource.OPTION_RECORD_UNKNOWN_FEATURE, Boolean.FALSE);//turning this off so that res.getErrors() has values to check! bizarre that I should need to do this.
-// options.put(XMLResource.OPTION_DOM_USE_NAMESPACES_IN_SCOPE, Boolean.TRUE);
-
-// if (DEBUG_MD_LOAD)
-// {
-// System.out.println("Using load options: "+options);
-// }
- }
-
-
- static class StandardModelErrorMessageFactory {
- private static List<String> _missingPackageURIs;
- private static List<String> _missingClassnames;
-
- /**
- * Simply logs all messages against JSFCommonPlugin, for now.
- * @param diagnostic
- */
- public static void logErrorMessage(Resource.Diagnostic diagnostic) {
- //should be XMIException
- if (diagnostic instanceof XMIException) {
- XMIException ex = (XMIException)diagnostic;
- String msg = createMessage(ex);
- if (msg != null)
- JSFCommonPlugin.log(IStatus.ERROR, msg);
- }
- else {
- JSFCommonPlugin.log(IStatus.ERROR, diagnostic.toString());//do better???
- }
- }
-
- private static String createMessage(XMIException ex) {
-
- StringBuffer buf = new StringBuffer("Metadata Load Error: ") //$NON-NLS-1$
- .append(ex.getClass().getSimpleName()).append(": "); //$NON-NLS-1$
-
- if (ex instanceof PackageNotFoundException) {
- if (shouldIgnore(ex))
- return null;
-
- buf.append(((PackageNotFoundException)ex).uri());
- }
- else if (ex instanceof ClassNotFoundException) {
- if (shouldIgnore(ex))
- return null;
-
- buf.append(((ClassNotFoundException)ex).getName());
- }
- else if (ex instanceof FeatureNotFoundException)
- buf.append(((FeatureNotFoundException)ex).getName());
- else if (ex instanceof IllegalValueException)
- buf.append(((IllegalValueException)ex).getValue().toString());
- else if (ex instanceof UnresolvedReferenceException)
- buf.append(((UnresolvedReferenceException)ex).getReference());
- else
- buf.append(ex.getMessage());
-
- buf.append(" in ").append(ex.getLocation()).append(": Line = ") //$NON-NLS-1$ //$NON-NLS-2$
- .append(ex.getLine()).append(": Column = ").append(ex.getColumn()); //$NON-NLS-1$
- return buf.toString();
- }
-
- private static boolean shouldIgnore(XMIException ex) {
- if (ex instanceof PackageNotFoundException) {
- String uri = ((PackageNotFoundException)ex).uri();
- return getMissingPackageURIs().contains(uri);
- }
- else if (ex instanceof ClassNotFoundException) {
- String className = ((ClassNotFoundException)ex).getName();
- return getMissingClassnames().contains(className);
- }
- return false;
- }
-
- private static List<String> getMissingPackageURIs() {
- if (_missingPackageURIs == null) {
- _missingPackageURIs = buildList("metadata.package.ignores"); //$NON-NLS-1$
-
- }
- return _missingPackageURIs;
- }
-
- private static List<String> getMissingClassnames() {
- if (_missingClassnames == null) {
- _missingClassnames = buildList("metadata.classname.ignores"); //$NON-NLS-1$
- }
- return _missingClassnames;
- }
-
- private static List<String> buildList(String propertyName) {
- List<String> ret = new ArrayList<String>();
- String ignoreSet = System.getProperty(propertyName);
- if (ignoreSet == null )//try env
- ignoreSet = System.getenv(propertyName);
-
- if (ignoreSet != null && !(ignoreSet.equals(""))){ //$NON-NLS-1$
- StringTokenizer st = new StringTokenizer(ignoreSet, ","); //$NON-NLS-1$
- while(st.hasMoreTokens()){
- String uri = st.nextToken();
- if (!(uri.equals(""))) //$NON-NLS-1$
- ret.add(uri);
- }
- }
-
- return ret;
- }
-
- }
-
- /**
- * Debug output. The parenthesis shows thread id.
- * @param msg
- * @param debugFlag
- */
- public static void debug(String msg, boolean debugFlag) {
- if (debugFlag)
- System.out.println(msg + "["+Thread.currentThread().getId()+"]"); //$NON-NLS-1$ //$NON-NLS-2$
- }
-
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/TaglibDomainMetaDataModelContextImpl.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/TaglibDomainMetaDataModelContextImpl.java
deleted file mode 100644
index 26a678a..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/TaglibDomainMetaDataModelContextImpl.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 Oracle 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:
- * Oracle - initial API and implementation
- *
- ********************************************************************************/
-package org.eclipse.jst.jsf.common.metadata.internal;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jst.jsf.common.metadata.query.ITaglibDomainMetaDataModelContext;
-
-/**
- * Simple implementation of {@link ITaglibDomainMetaDataModelContext}
- * @deprecated - Helios
- */
-public class TaglibDomainMetaDataModelContextImpl extends MetaDataModelContextImpl implements IMetaDataModelContext, ITaglibDomainMetaDataModelContext, Cloneable
-{
- private final IProject _project;
- private final String _uri;
-
- /**
- * Constructor
- * @param project
- * @param domain
- * @param uri
- */
- public TaglibDomainMetaDataModelContextImpl(final String domain, final IProject project, final String uri){
- super(domain);
- this._project = project;
- this._uri = uri;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.jsf.common.metadata.query.ITaglibDomainMetaDataModelContext#getProject()
- */
- public IProject getProject() {
- return _project;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.jsf.common.metadata.query.ITaglibDomainMetaDataModelContext#getURI()
- */
- public String getURI() {
- return _uri;
- }
-
- public Object getAdapter(Class adapter) {
- if (adapter.equals(ITaglibDomainMetaDataModelContext.class))
- return this;
-
- return super.getAdapter(adapter);
- }
-
- @Override
- public Object clone() throws CloneNotSupportedException {
- return super.clone();
- }
-
-
- public String getDomainId() {
- return getDomainID();
- }
-
- public String getModelIdentifier() {
- return getURI();
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/TraitValueHelper.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/TraitValueHelper.java
deleted file mode 100644
index a0812fe..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/TraitValueHelper.java
+++ /dev/null
@@ -1,213 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 Oracle 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:
- * Oracle - initial API and implementation
- *
- ********************************************************************************/
-package org.eclipse.jst.jsf.common.metadata.internal;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.impl.BasicEObjectImpl;
-import org.eclipse.emf.ecore.util.FeatureMap;
-import org.eclipse.emf.ecore.xml.type.AnyType;
-import org.eclipse.emf.ecore.xml.type.SimpleAnyType;
-import org.eclipse.jst.jsf.common.JSFCommonPlugin;
-import org.eclipse.jst.jsf.common.metadata.Trait;
-import org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.BooleanValue;
-import org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.ListOfValues;
-import org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.StringValue;
-import org.eclipse.osgi.util.NLS;
-
-/**
- * Experimental/prototype class to assist with decoding trait values.
- * This could/should be made API at some point after "hardening". (https://bugs.eclipse.org/bugs/show_bug.cgi?id=192052)
- */
-public class TraitValueHelper {
- private static final String KEY_NOT_FOUND = Messages.Key_not_found;
- /**
- * @param trait
- * @return EClass of trait value
- */
- public static EClass getValueType(final Trait trait){
- if (trait == null)
- return null;
- if (trait.getValue() != null)
- return trait.getValue().eClass();
- return null;
- }
-
- /**
- * @param trait
- * @return value of trait as String Object.
- */
- public static Object getValue(final Trait trait){
- if (trait == null)
- return null;
-
- if (trait.getValue() == null)
- return null;
-
- if (trait.getValue() instanceof StringValue) {
- return ((StringValue)trait.getValue()).getValue();
- }
- else if (trait.getValue() instanceof SimpleAnyType){
- return ((SimpleAnyType)trait.getValue()).getRawValue();
- }
- else if (trait.getValue() instanceof AnyType){
- AnyType any = (AnyType)trait.getValue();
- FeatureMap map = any.getMixed();
- return getTextValueFromFeatureMap(map);
- }
- else if ( trait.getValue().eIsProxy() && trait.getValue() instanceof BasicEObjectImpl){
- BasicEObjectImpl o = (BasicEObjectImpl)trait.getValue();
- return o.eProxyURI().toString();
- }
- return trait.getValue();
- }
-
- private static String getTextValueFromFeatureMap(final FeatureMap map) {
- for (final Iterator it=map.iterator();it.hasNext();){
- final FeatureMap.Entry entry = (FeatureMap.Entry)it.next();
- if (entry.getEStructuralFeature().getName().equals("text")) //$NON-NLS-1$
- return (String)entry.getValue();
- }
- return null;
- }
-
- /**
- * @param trait
- * @return value of trait as String. If externalized, will resolve from resource bundle.
- */
- public static String getValueAsString(final Trait trait){
- final Object val = getValue(trait);
- if (val instanceof String){
- return getNLSValue(trait, (String)val);
- }
- else if (val instanceof BooleanValue)
- return String.valueOf(((BooleanValue)val).isTrue());
-
- return null;
- }
-
- /**
- *
- * @param trait whose value a {@link ListOfValues} or is a single string
- * @return List of Strings. If externalized, will resolve from resource bundle
- * using getNLSValue(Trait trait, String rawValue)
- */
- public synchronized static List getValueAsListOfStrings(final Trait trait){
- //PROTO ONLY!!! Need to make WAY more robust!
- final List ret = new ArrayList();
- if (trait.getValue() instanceof ListOfValues) {
- for(final Iterator it=trait.getValue().eContents().iterator();it.hasNext();){
- final Object o = it.next();
- if (o instanceof SimpleAnyType){
- final SimpleAnyType sat = (SimpleAnyType)o;
- final String rawValue = getTextValueFromFeatureMap(sat.getMixed());
- final String nlsValue = getNLSValue(trait, rawValue);
-
- ret.add(nlsValue);
- }
- }
- }
- else {
- //may be single value
- String o = getValueAsString(trait);
- if (o != null)
- ret.add(o);
- }
- return ret;
- }
-
- /**
- * Looks for '%' (and not '%%') at beginning of rawValue. If found, looks to the
- * traits sourceModelProvider for resource bundle to resolve the key after
- * stripping the '%' sign.
- * @param trait
- * @param rawValue of string in from metadata
- * @return the NLS Value or rawValue if it cannot be located
- */
- public static String getNLSValue(final Trait trait, final String rawValue) {
- String result = rawValue;
- if (rawValue.startsWith("%") && !rawValue.startsWith("%%")){ //$NON-NLS-1$//$NON-NLS-2$
- final String key = rawValue.substring(1);
- result = getNLSPropertyValue(trait, key);
- if (result == null){
- result = rawValue;
- }
- }
- return result == null ? null : result.trim();
- }
-
- //will return null if there is an IOException with ResourceBundle
- private static String getNLSPropertyValue(final Trait trait, final String key){
- try{
- IMetaDataSourceModelProvider provider = trait.getSourceModelProvider();
- IResourceBundleProvider resourceBundleProvider = (IResourceBundleProvider)provider.getAdapter(IResourceBundleProvider.class);
- if (resourceBundleProvider != null){
- ResourceBundle resourceBundle_ = resourceBundleProvider.getResourceBundle();
- if (resourceBundle_ != null){
- String replVal = resourceBundle_.getString(key);
- return replVal;
- }
- }
- //return original string
- return key;
-
- } catch (MissingResourceException e){
- //fall thru
- JSFCommonPlugin.log(e, NLS.bind(Messages.MissingResource_exception, new String[]{key}));
- }
- return key + KEY_NOT_FOUND;
- }
-
- /**
- * If trait type is {@link BooleanValue} returns value, otherwise
- * it will get the value as a String and attempt to coerce to boolean.
- * Will return 'false' if coercion fails, or value was null.
- * @param trait
- * @return true or false
- */
- public static boolean getValueAsBoolean(final Trait trait) {
- if (trait != null && trait.getValue() instanceof BooleanValue) {
- return ((BooleanValue)trait.getValue()).isTrue();
- }
- final String val = getValueAsString(trait);
- if (val == null)
- return false;
-
- return Boolean.valueOf(val).booleanValue();
- }
-
-// /**
-// * @param trait
-// * @return name of class or primitive datatype that the value is defined as.
-// * For SimpleAnyTypes, the getInstanceType().getInstanceClassName() is returned.
-// * For AnyType, java.lang.String is always returned.
-// * For all others, the class.getName() is returned.
-// */
-// public static String getValueInstanceClassName(Trait trait) {String.class.getName();
-// if (trait.getValue() instanceof SimpleAnyType) {
-// return ((SimpleAnyType)trait.getValue()).getInstanceType().getInstanceClassName();
-// }
-// else if (trait.getValue() instanceof AnyType) {
-// return String.class.getName();
-// }
-// else {
-// return trait.getValue().getClass().getName();
-// }
-//
-// }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/TraitValueHelper2.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/TraitValueHelper2.java
deleted file mode 100644
index 64238d7..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/TraitValueHelper2.java
+++ /dev/null
@@ -1,226 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2010 Oracle 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:
- * Oracle - initial API and implementation
- *
- ********************************************************************************/
-package org.eclipse.jst.jsf.common.metadata.internal;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.impl.BasicEObjectImpl;
-import org.eclipse.emf.ecore.util.FeatureMap;
-import org.eclipse.emf.ecore.xml.type.AnyType;
-import org.eclipse.emf.ecore.xml.type.SimpleAnyType;
-import org.eclipse.jst.jsf.common.JSFCommonPlugin;
-import org.eclipse.jst.jsf.common.metadata.Trait;
-import org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.BooleanValue;
-import org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.ListOfValues;
-import org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.StringValue;
-import org.eclipse.osgi.util.NLS;
-
-/**
- * Experimental/prototype class to assist with decoding trait values.
- * This could/should be made API at some point after "hardening". (https://bugs.eclipse.org/bugs/show_bug.cgi?id=192052)
- * <p>
- * May be subclassed
- * <p>
- * Note: non-static copy of TraitValueHelper
- */
-public class TraitValueHelper2 {
- private static final String KEY_NOT_FOUND = Messages.Key_not_found;
-
- /**
- * @param trait
- * @return EClass of trait value
- */
- public EClass getValueType(final Trait trait){
- if (trait == null)
- return null;
- if (trait.getValue() != null)
- return trait.getValue().eClass();
- return null;
- }
-
- /**
- * @param trait
- * @return value of trait as String Object.
- */
- public Object getValue(final Trait trait){
- if (trait == null)
- return null;
-
- if (trait.getValue() == null)
- return null;
-
- if (trait.getValue() instanceof StringValue) {
- return ((StringValue)trait.getValue()).getValue();
- }
- else if (trait.getValue() instanceof SimpleAnyType){
- return ((SimpleAnyType)trait.getValue()).getRawValue();
- }
- else if (trait.getValue() instanceof AnyType){
- AnyType any = (AnyType)trait.getValue();
- FeatureMap map = any.getMixed();
- return getTextValueFromFeatureMap(map);
- }
- else if ( trait.getValue().eIsProxy() && trait.getValue() instanceof BasicEObjectImpl){
- BasicEObjectImpl o = (BasicEObjectImpl)trait.getValue();
- return o.eProxyURI().toString();
- }
- return trait.getValue();
- }
-
- /**
- * @param map
- * @return String
- */
- protected String getTextValueFromFeatureMap(final FeatureMap map) {
- for (final Iterator it=map.iterator();it.hasNext();){
- final FeatureMap.Entry entry = (FeatureMap.Entry)it.next();
- if (entry.getEStructuralFeature().getName().equals("text")) //$NON-NLS-1$
- return (String)entry.getValue();
- }
- return null;
- }
-
- /**
- * @param trait
- * @return value of trait as String. If externalized, will resolve from resource bundle.
- */
- public String getValueAsString(final Trait trait){
- final Object val = getValue(trait);
- if (val instanceof String){
- return getNLSValue(trait, (String)val);
- }
- else if (val instanceof BooleanValue)
- return String.valueOf(((BooleanValue)val).isTrue());
-
- return null;
- }
-
- /**
- * @param trait whose value a {@link ListOfValues} or is a single string
- * @return List of Strings. If externalized, will resolve from resource bundle
- * using getNLSValue(Trait trait, String rawValue)
- */
- public synchronized List getValueAsListOfStrings(final Trait trait){
- //PROTO ONLY!!! Need to make WAY more robust!
- final List ret = new ArrayList();
- if (trait.getValue() instanceof ListOfValues) {
- for(final Iterator it=trait.getValue().eContents().iterator();it.hasNext();){
- final Object o = it.next();
- if (o instanceof SimpleAnyType){
- final SimpleAnyType sat = (SimpleAnyType)o;
- final String rawValue = getTextValueFromFeatureMap(sat.getMixed());
- final String nlsValue = getNLSValue(trait, rawValue);
-
- ret.add(nlsValue);
- }
- }
- }
- else {
- //may be single value
- String o = getValueAsString(trait);
- if (o != null)
- ret.add(o);
- }
- return ret;
- }
-
- /**
- * Looks for '%' (and not '%%') at beginning of rawValue. If found, looks to the
- * traits sourceModelProvider for resource bundle to resolve the key after
- * stripping the '%' sign.
- * @param trait
- * @param rawValue of string in from metadata
- * @return the NLS Value or rawValue if it cannot be located
- */
- public String getNLSValue(final Trait trait, final String rawValue) {
- String result = rawValue;
- if (rawValue.startsWith("%") && !rawValue.startsWith("%%")){ //$NON-NLS-1$//$NON-NLS-2$
- final String key = rawValue.substring(1);
- result = getNLSPropertyValue(trait, key);
- if (result == null){
- result = rawValue;
- }
- }
- return result == null ? null : result.trim();
- }
-
- /**
- * @param trait
- * @param key
- * @return String
- */
- //will return null if there is an IOException with ResourceBundle
- protected String getNLSPropertyValue(final Trait trait, final String key){
- try{
- IMetaDataSourceModelProvider provider = trait.getSourceModelProvider();
- IResourceBundleProvider resourceBundleProvider = (IResourceBundleProvider)provider.getAdapter(IResourceBundleProvider.class);
- if (resourceBundleProvider != null){
- ResourceBundle resourceBundle_ = resourceBundleProvider.getResourceBundle();
- if (resourceBundle_ != null){
- String replVal = resourceBundle_.getString(key);
- return replVal;
- }
- }
- //return original string
- return key;
-
- } catch (MissingResourceException e){
- //fall thru
- JSFCommonPlugin.log(e, NLS.bind(Messages.MissingResource_exception, new String[]{key}));
- }
- return key + KEY_NOT_FOUND;
- }
-
- /**
- * If trait type is {@link BooleanValue} returns value, otherwise
- * it will get the value as a String and attempt to coerce to boolean.
- * Will return 'false' if coercion fails, or value was null.
- * @param trait
- * @return true or false
- */
- public boolean getValueAsBoolean(final Trait trait) {
- if (trait != null && trait.getValue() instanceof BooleanValue) {
- return ((BooleanValue)trait.getValue()).isTrue();
- }
- final String val = getValueAsString(trait);
- if (val == null)
- return false;
-
- return Boolean.valueOf(val).booleanValue();
- }
-
-// /**
-// * @param trait
-// * @return name of class or primitive datatype that the value is defined as.
-// * For SimpleAnyTypes, the getInstanceType().getInstanceClassName() is returned.
-// * For AnyType, java.lang.String is always returned.
-// * For all others, the class.getName() is returned.
-// */
-// public String getValueInstanceClassName(Trait trait) {String.class.getName();
-// if (trait.getValue() instanceof SimpleAnyType) {
-// return ((SimpleAnyType)trait.getValue()).getInstanceType().getInstanceClassName();
-// }
-// else if (trait.getValue() instanceof AnyType) {
-// return String.class.getName();
-// }
-// else {
-// return trait.getValue().getClass().getName();
-// }
-//
-// }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/impl/EntityGroupImpl.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/impl/EntityGroupImpl.java
deleted file mode 100644
index eb8ef8b..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/impl/EntityGroupImpl.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: EntityGroupImpl.java,v 1.6 2008/11/18 22:24:39 gkessler Exp $
- */
-package org.eclipse.jst.jsf.common.metadata.internal.impl;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.jst.jsf.common.metadata.EntityGroup;
-import org.eclipse.jst.jsf.common.metadata.MetadataPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Entity Group</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * </p>
- *
- * @generated
- */
-@SuppressWarnings("hiding")
-public class EntityGroupImpl extends EntityImpl implements EntityGroup {
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public static final String copyright = "Copyright (c) 2007 Oracle Corporation"; //$NON-NLS-1$
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected EntityGroupImpl() {
- super();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected EClass eStaticClass() {
- return MetadataPackage.Literals.ENTITY_GROUP;
- }
-
-} //EntityGroupImpl
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/impl/EntityImpl.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/impl/EntityImpl.java
deleted file mode 100644
index ab8247d..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/impl/EntityImpl.java
+++ /dev/null
@@ -1,432 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: EntityImpl.java,v 1.8 2010/01/27 23:54:32 gkessler Exp $
- */
-package org.eclipse.jst.jsf.common.metadata.internal.impl;
-
-import java.util.Collection;
-import java.util.Iterator;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.EObjectResolvingEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.jst.jsf.common.metadata.Entity;
-import org.eclipse.jst.jsf.common.metadata.IncludeEntityGroup;
-import org.eclipse.jst.jsf.common.metadata.MetadataPackage;
-import org.eclipse.jst.jsf.common.metadata.Model;
-import org.eclipse.jst.jsf.common.metadata.Trait;
-import org.eclipse.jst.jsf.common.metadata.query.IEntityVisitor;
-import org.eclipse.jst.jsf.common.metadata.query.internal.IHierarchicalEntityVisitor;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Entity</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- * <li>{@link org.eclipse.jst.jsf.common.metadata.internal.impl.EntityImpl#getChildEntities <em>Child Entities</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.common.metadata.internal.impl.EntityImpl#getTraits <em>Traits</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.common.metadata.internal.impl.EntityImpl#getId <em>Id</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.common.metadata.internal.impl.EntityImpl#getType <em>Type</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.common.metadata.internal.impl.EntityImpl#getIncludeGroups <em>Include Groups</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class EntityImpl extends EObjectImpl implements Entity {
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public static final String copyright = "Copyright (c) 2007 Oracle Corporation"; //$NON-NLS-1$
-
- /**
- * The cached value of the '{@link #getChildEntities() <em>Child Entities</em>}' containment reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getChildEntities()
- * @generated
- * @ordered
- */
- protected EList childEntities = null;
-
- /**
- * The cached value of the '{@link #getTraits() <em>Traits</em>}' containment reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getTraits()
- * @generated
- * @ordered
- */
- protected EList traits = null;
-
- /**
- * The default value of the '{@link #getId() <em>Id</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getId()
- * @generated
- * @ordered
- */
- protected static final String ID_EDEFAULT = null;
-
- /**
- * The cached value of the '{@link #getId() <em>Id</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getId()
- * @generated
- * @ordered
- */
- protected String id = ID_EDEFAULT;
-
- /**
- * The default value of the '{@link #getType() <em>Type</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getType()
- * @generated
- * @ordered
- */
- protected static final String TYPE_EDEFAULT = null;
-
- /**
- * The cached value of the '{@link #getType() <em>Type</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getType()
- * @generated
- * @ordered
- */
- protected String type = TYPE_EDEFAULT;
-
- /**
- * The cached value of the '{@link #getIncludeGroups() <em>Include Groups</em>}' reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getIncludeGroups()
- * @generated
- * @ordered
- */
- protected EList includeGroups = null;
-
- /**
- * The cached value of the Model
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated NOT
- */
- private Model _model;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected EntityImpl() {
- super();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected EClass eStaticClass() {
- return MetadataPackage.Literals.ENTITY;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EList getChildEntities() {
- if (childEntities == null) {
- childEntities = new EObjectContainmentEList(Entity.class, this, MetadataPackage.ENTITY__CHILD_ENTITIES);
- }
- return childEntities;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EList getTraits() {
- if (traits == null) {
- traits = new EObjectContainmentEList(Trait.class, this, MetadataPackage.ENTITY__TRAITS);
- }
- return traits;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EList getIncludeGroups() {
- if (includeGroups == null) {
- includeGroups = new EObjectResolvingEList(IncludeEntityGroup.class, this, MetadataPackage.ENTITY__INCLUDE_GROUPS);
- }
- return includeGroups;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public String getId() {
- return id;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setId(String newId) {
- String oldId = id;
- id = newId;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, MetadataPackage.ENTITY__ID, oldId, id));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public String getType() {
- return type;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setType(String newType) {
- String oldType = type;
- type = newType;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, MetadataPackage.ENTITY__TYPE, oldType, type));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated NOT
- */
- private boolean accept(final IHierarchicalEntityVisitor visitor) {
- if (visitor.visitEnter( this )) {
- acceptChildren(visitor);
- }
- return visitor.visitLeave(this);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated NOT
- */
- public void accept(final IEntityVisitor visitor) {
- if (visitor instanceof IHierarchicalEntityVisitor) {
- accept((IHierarchicalEntityVisitor)visitor);
- }
- else {
- if (visitor.stopVisiting())
- return;
-
- visitor.visit(this);
- if (visitor.stopVisiting())
- return;
-
- acceptChildren(visitor);
-
- visitor.visitCompleted(this);
- }
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated NOT
- */
- private void acceptChildren(final IEntityVisitor visitor) {
- if (!getChildEntities().isEmpty()){
- for (final Iterator/*<Entity>*/ it = getChildEntities().iterator(); it.hasNext();){
- final Entity k = (Entity)it.next();
- k.accept(visitor);
- if (visitor.stopVisiting())
- return;
- }
- }
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated NOT
- */
- public Model getModel() {
- if (_model == null){
- EObject parent = this.eContainer();
- while (true){
- if (parent instanceof Model){
- _model = (Model)parent;
- break;
- }
- if (parent != null)
- parent = parent.eContainer();
- else
- break;
- }
- }
- return _model;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
- switch (featureID) {
- case MetadataPackage.ENTITY__CHILD_ENTITIES:
- return ((InternalEList)getChildEntities()).basicRemove(otherEnd, msgs);
- case MetadataPackage.ENTITY__TRAITS:
- return ((InternalEList)getTraits()).basicRemove(otherEnd, msgs);
- }
- return super.eInverseRemove(otherEnd, featureID, msgs);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public Object eGet(int featureID, boolean resolve, boolean coreType) {
- switch (featureID) {
- case MetadataPackage.ENTITY__CHILD_ENTITIES:
- return getChildEntities();
- case MetadataPackage.ENTITY__TRAITS:
- return getTraits();
- case MetadataPackage.ENTITY__ID:
- return getId();
- case MetadataPackage.ENTITY__TYPE:
- return getType();
- case MetadataPackage.ENTITY__INCLUDE_GROUPS:
- return getIncludeGroups();
- }
- return super.eGet(featureID, resolve, coreType);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void eSet(int featureID, Object newValue) {
- switch (featureID) {
- case MetadataPackage.ENTITY__CHILD_ENTITIES:
- getChildEntities().clear();
- getChildEntities().addAll((Collection)newValue);
- return;
- case MetadataPackage.ENTITY__TRAITS:
- getTraits().clear();
- getTraits().addAll((Collection)newValue);
- return;
- case MetadataPackage.ENTITY__ID:
- setId((String)newValue);
- return;
- case MetadataPackage.ENTITY__TYPE:
- setType((String)newValue);
- return;
- case MetadataPackage.ENTITY__INCLUDE_GROUPS:
- getIncludeGroups().clear();
- getIncludeGroups().addAll((Collection)newValue);
- return;
- }
- super.eSet(featureID, newValue);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void eUnset(int featureID) {
- switch (featureID) {
- case MetadataPackage.ENTITY__CHILD_ENTITIES:
- getChildEntities().clear();
- return;
- case MetadataPackage.ENTITY__TRAITS:
- getTraits().clear();
- return;
- case MetadataPackage.ENTITY__ID:
- setId(ID_EDEFAULT);
- return;
- case MetadataPackage.ENTITY__TYPE:
- setType(TYPE_EDEFAULT);
- return;
- case MetadataPackage.ENTITY__INCLUDE_GROUPS:
- getIncludeGroups().clear();
- return;
- }
- super.eUnset(featureID);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean eIsSet(int featureID) {
- switch (featureID) {
- case MetadataPackage.ENTITY__CHILD_ENTITIES:
- return childEntities != null && !childEntities.isEmpty();
- case MetadataPackage.ENTITY__TRAITS:
- return traits != null && !traits.isEmpty();
- case MetadataPackage.ENTITY__ID:
- return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
- case MetadataPackage.ENTITY__TYPE:
- return TYPE_EDEFAULT == null ? type != null : !TYPE_EDEFAULT.equals(type);
- case MetadataPackage.ENTITY__INCLUDE_GROUPS:
- return includeGroups != null && !includeGroups.isEmpty();
- }
- return super.eIsSet(featureID);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public String toString() {
- if (eIsProxy()) return super.toString();
-
- StringBuffer result = new StringBuffer(super.toString());
- result.append(" (id: "); //$NON-NLS-1$
- result.append(id);
- result.append(", type: "); //$NON-NLS-1$
- result.append(type);
- result.append(')');
- return result.toString();
- }
-
-} //EntityImpl
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/impl/IncludeEntityGroupImpl.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/impl/IncludeEntityGroupImpl.java
deleted file mode 100644
index 3943823..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/impl/IncludeEntityGroupImpl.java
+++ /dev/null
@@ -1,219 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: IncludeEntityGroupImpl.java,v 1.3 2008/11/18 22:24:39 gkessler Exp $
- */
-package org.eclipse.jst.jsf.common.metadata.internal.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.jst.jsf.common.metadata.IncludeEntityGroup;
-import org.eclipse.jst.jsf.common.metadata.MetadataPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Include Entity Group</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- * <li>{@link org.eclipse.jst.jsf.common.metadata.internal.impl.IncludeEntityGroupImpl#getId <em>Id</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.common.metadata.internal.impl.IncludeEntityGroupImpl#getModelUri <em>Model Uri</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class IncludeEntityGroupImpl extends EObjectImpl implements IncludeEntityGroup {
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public static final String copyright = "Copyright (c) 2007 Oracle Corporation"; //$NON-NLS-1$
-
- /**
- * The default value of the '{@link #getId() <em>Id</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getId()
- * @generated
- * @ordered
- */
- protected static final String ID_EDEFAULT = null;
-
- /**
- * The cached value of the '{@link #getId() <em>Id</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getId()
- * @generated
- * @ordered
- */
- protected String id = ID_EDEFAULT;
-
- /**
- * The default value of the '{@link #getModelUri() <em>Model Uri</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getModelUri()
- * @generated
- * @ordered
- */
- protected static final String MODEL_URI_EDEFAULT = null;
-
- /**
- * The cached value of the '{@link #getModelUri() <em>Model Uri</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getModelUri()
- * @generated
- * @ordered
- */
- protected String modelUri = MODEL_URI_EDEFAULT;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected IncludeEntityGroupImpl() {
- super();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected EClass eStaticClass() {
- return MetadataPackage.Literals.INCLUDE_ENTITY_GROUP;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public String getId() {
- return id;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setId(String newId) {
- String oldId = id;
- id = newId;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, MetadataPackage.INCLUDE_ENTITY_GROUP__ID, oldId, id));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public String getModelUri() {
- return modelUri;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setModelUri(String newModelUri) {
- String oldModelUri = modelUri;
- modelUri = newModelUri;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, MetadataPackage.INCLUDE_ENTITY_GROUP__MODEL_URI, oldModelUri, modelUri));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public Object eGet(int featureID, boolean resolve, boolean coreType) {
- switch (featureID) {
- case MetadataPackage.INCLUDE_ENTITY_GROUP__ID:
- return getId();
- case MetadataPackage.INCLUDE_ENTITY_GROUP__MODEL_URI:
- return getModelUri();
- }
- return super.eGet(featureID, resolve, coreType);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void eSet(int featureID, Object newValue) {
- switch (featureID) {
- case MetadataPackage.INCLUDE_ENTITY_GROUP__ID:
- setId((String)newValue);
- return;
- case MetadataPackage.INCLUDE_ENTITY_GROUP__MODEL_URI:
- setModelUri((String)newValue);
- return;
- }
- super.eSet(featureID, newValue);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void eUnset(int featureID) {
- switch (featureID) {
- case MetadataPackage.INCLUDE_ENTITY_GROUP__ID:
- setId(ID_EDEFAULT);
- return;
- case MetadataPackage.INCLUDE_ENTITY_GROUP__MODEL_URI:
- setModelUri(MODEL_URI_EDEFAULT);
- return;
- }
- super.eUnset(featureID);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean eIsSet(int featureID) {
- switch (featureID) {
- case MetadataPackage.INCLUDE_ENTITY_GROUP__ID:
- return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
- case MetadataPackage.INCLUDE_ENTITY_GROUP__MODEL_URI:
- return MODEL_URI_EDEFAULT == null ? modelUri != null : !MODEL_URI_EDEFAULT.equals(modelUri);
- }
- return super.eIsSet(featureID);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public String toString() {
- if (eIsProxy()) return super.toString();
-
- StringBuffer result = new StringBuffer(super.toString());
- result.append(" (id: "); //$NON-NLS-1$
- result.append(id);
- result.append(", modelUri: "); //$NON-NLS-1$
- result.append(modelUri);
- result.append(')');
- return result.toString();
- }
-
-} //IncludeEntityGroupImpl
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/impl/MetadataFactoryImpl.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/impl/MetadataFactoryImpl.java
deleted file mode 100644
index b80967e..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/impl/MetadataFactoryImpl.java
+++ /dev/null
@@ -1,239 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: MetadataFactoryImpl.java,v 1.5 2008/11/18 22:24:39 gkessler Exp $
- */
-package org.eclipse.jst.jsf.common.metadata.internal.impl;
-
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EDataType;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.impl.EFactoryImpl;
-import org.eclipse.emf.ecore.plugin.EcorePlugin;
-import org.eclipse.jst.jsf.common.metadata.Entity;
-import org.eclipse.jst.jsf.common.metadata.EntityGroup;
-import org.eclipse.jst.jsf.common.metadata.IncludeEntityGroup;
-import org.eclipse.jst.jsf.common.metadata.MetadataFactory;
-import org.eclipse.jst.jsf.common.metadata.MetadataPackage;
-import org.eclipse.jst.jsf.common.metadata.Model;
-import org.eclipse.jst.jsf.common.metadata.Trait;
-import org.eclipse.jst.jsf.common.metadata.internal.IMetaDataSourceModelProvider;
-import org.eclipse.jst.jsf.common.metadata.internal.ModelKeyDescriptor;
-
-
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model <b>Factory</b>.
- * <!-- end-user-doc -->
- * @generated
- */
-public class MetadataFactoryImpl extends EFactoryImpl implements MetadataFactory {
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public static final String copyright = "Copyright (c) 2007 Oracle Corporation"; //$NON-NLS-1$
-
- /**
- * Creates the default factory implementation.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return MetadataFactory
- * @generated
- */
- public static MetadataFactory init() {
- try {
- MetadataFactory theMetadataFactory = (MetadataFactory)EPackage.Registry.INSTANCE.getEFactory("http://org.eclipse.jst.jsf.common.metadata/metadata.ecore"); //$NON-NLS-1$
- if (theMetadataFactory != null) {
- return theMetadataFactory;
- }
- }
- catch (Exception exception) {
- EcorePlugin.INSTANCE.log(exception);
- }
- return new MetadataFactoryImpl();
- }
-
- /**
- * Creates an instance of the factory.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public MetadataFactoryImpl() {
- super();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EObject create(EClass eClass) {
- switch (eClass.getClassifierID()) {
- case MetadataPackage.MODEL: return createModel();
- case MetadataPackage.ENTITY_GROUP: return createEntityGroup();
- case MetadataPackage.ENTITY: return createEntity();
- case MetadataPackage.TRAIT: return createTrait();
- case MetadataPackage.INCLUDE_ENTITY_GROUP: return createIncludeEntityGroup();
- default:
- throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$
- }
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public Object createFromString(EDataType eDataType, String initialValue) {
- switch (eDataType.getClassifierID()) {
- case MetadataPackage.IMETA_DATA_SOURCE_MODEL_PROVIDER:
- return createIMetaDataSourceModelProviderFromString(eDataType, initialValue);
- case MetadataPackage.MODEL_CONTEXT:
- return createModelContextFromString(eDataType, initialValue);
- default:
- throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$
- }
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public String convertToString(EDataType eDataType, Object instanceValue) {
- switch (eDataType.getClassifierID()) {
- case MetadataPackage.IMETA_DATA_SOURCE_MODEL_PROVIDER:
- return convertIMetaDataSourceModelProviderToString(eDataType, instanceValue);
- case MetadataPackage.MODEL_CONTEXT:
- return convertModelContextToString(eDataType, instanceValue);
- default:
- throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$
- }
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public Trait createTrait() {
- TraitImpl trait = new TraitImpl();
- return trait;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public IncludeEntityGroup createIncludeEntityGroup() {
- IncludeEntityGroupImpl includeEntityGroup = new IncludeEntityGroupImpl();
- return includeEntityGroup;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public Model createModel() {
- ModelImpl model = new ModelImpl();
- return model;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public Entity createEntity() {
- EntityImpl entity = new EntityImpl();
- return entity;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EntityGroup createEntityGroup() {
- EntityGroupImpl entityGroup = new EntityGroupImpl();
- return entityGroup;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param eDataType IMetaDataSourceModelProvider
- * @param initialValue
- * @return IMetaDataSourceModelProvider
- * @generated
- */
- public IMetaDataSourceModelProvider createIMetaDataSourceModelProviderFromString(EDataType eDataType, String initialValue) {
- return (IMetaDataSourceModelProvider)super.createFromString(eDataType, initialValue);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param eDataType
- * @param instanceValue
- * @return String
- * @generated
- */
- public String convertIMetaDataSourceModelProviderToString(EDataType eDataType, Object instanceValue) {
- return super.convertToString(eDataType, instanceValue);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param eDataType
- * @param initialValue
- * @return ModelKeyDescriptor
- * @generated
- */
- public ModelKeyDescriptor createModelContextFromString(EDataType eDataType, String initialValue) {
- return (ModelKeyDescriptor)super.createFromString(eDataType, initialValue);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param eDataType
- * @param instanceValue
- * @return String
- * @generated
- */
- public String convertModelContextToString(EDataType eDataType, Object instanceValue) {
- return super.convertToString(eDataType, instanceValue);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public MetadataPackage getMetadataPackage() {
- return (MetadataPackage)getEPackage();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return MetadataPackage
- * @deprecated
- * @generated
- */
- public static MetadataPackage getPackage() {
- return MetadataPackage.eINSTANCE;
- }
-
-} //MetadataFactoryImpl
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/impl/MetadataPackageImpl.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/impl/MetadataPackageImpl.java
deleted file mode 100644
index 52c73c3..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/impl/MetadataPackageImpl.java
+++ /dev/null
@@ -1,604 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: MetadataPackageImpl.java,v 1.7 2008/11/18 22:24:39 gkessler Exp $
- */
-package org.eclipse.jst.jsf.common.metadata.internal.impl;
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EDataType;
-import org.eclipse.emf.ecore.EOperation;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.ecore.impl.EPackageImpl;
-import org.eclipse.jst.jsf.common.metadata.Entity;
-import org.eclipse.jst.jsf.common.metadata.EntityGroup;
-import org.eclipse.jst.jsf.common.metadata.IncludeEntityGroup;
-import org.eclipse.jst.jsf.common.metadata.MetadataFactory;
-import org.eclipse.jst.jsf.common.metadata.MetadataPackage;
-import org.eclipse.jst.jsf.common.metadata.Model;
-import org.eclipse.jst.jsf.common.metadata.Trait;
-import org.eclipse.jst.jsf.common.metadata.internal.IMetaDataSourceModelProvider;
-import org.eclipse.jst.jsf.common.metadata.internal.ModelKeyDescriptor;
-import org.eclipse.jst.jsf.common.metadata.query.IEntityVisitor;
-import org.eclipse.jst.jsf.common.metadata.query.ITraitVisitor;
-
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model <b>Package</b>.
- * <!-- end-user-doc -->
- * @generated
- */
-public class MetadataPackageImpl extends EPackageImpl implements MetadataPackage {
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public static final String copyright = "Copyright (c) 2007 Oracle Corporation"; //$NON-NLS-1$
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private EClass traitEClass = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private EClass includeEntityGroupEClass = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private EClass modelEClass = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private EClass entityEClass = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private EClass entityGroupEClass = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private EDataType iTraitVisitorEDataType = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private EDataType iEntityVisitorEDataType = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private EDataType iMetaDataSourceModelProviderEDataType = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private EDataType modelContextEDataType = 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.jst.jsf.common.metadata.MetadataPackage#eNS_URI
- * @see #init()
- * @generated
- */
- private MetadataPackageImpl() {
- super(eNS_URI, MetadataFactory.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 -->
- * @return MetadataPackage
- * @see #eNS_URI
- * @see #createPackageContents()
- * @see #initializePackageContents()
- * @generated
- */
- public static MetadataPackage init() {
- if (isInited) return (MetadataPackage)EPackage.Registry.INSTANCE.getEPackage(MetadataPackage.eNS_URI);
-
- // Obtain or create and register package
- MetadataPackageImpl theMetadataPackage = (MetadataPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(eNS_URI) instanceof MetadataPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(eNS_URI) : new MetadataPackageImpl());
-
- isInited = true;
-
- // Create package meta-data objects
- theMetadataPackage.createPackageContents();
-
- // Initialize created meta-data
- theMetadataPackage.initializePackageContents();
-
- // Mark meta-data to indicate it can't be changed
- theMetadataPackage.freeze();
-
- return theMetadataPackage;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EClass getTrait() {
- return traitEClass;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EReference getTrait_Value() {
- return (EReference)traitEClass.getEStructuralFeatures().get(1);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getTrait_SourceModelProvider() {
- return (EAttribute)traitEClass.getEStructuralFeatures().get(2);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EClass getIncludeEntityGroup() {
- return includeEntityGroupEClass;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getIncludeEntityGroup_Id() {
- return (EAttribute)includeEntityGroupEClass.getEStructuralFeatures().get(0);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getIncludeEntityGroup_ModelUri() {
- return (EAttribute)includeEntityGroupEClass.getEStructuralFeatures().get(1);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getTrait_Id() {
- return (EAttribute)traitEClass.getEStructuralFeatures().get(0);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EClass getModel() {
- return modelEClass;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getModel_SourceModelProvider() {
- return (EAttribute)modelEClass.getEStructuralFeatures().get(1);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getModel_CurrentModelContext() {
- return (EAttribute)modelEClass.getEStructuralFeatures().get(2);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EReference getModel_EntityGroups() {
- return (EReference)modelEClass.getEStructuralFeatures().get(0);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EClass getEntity() {
- return entityEClass;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EReference getEntity_ChildEntities() {
- return (EReference)entityEClass.getEStructuralFeatures().get(0);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EReference getEntity_Traits() {
- return (EReference)entityEClass.getEStructuralFeatures().get(1);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getEntity_Id() {
- return (EAttribute)entityEClass.getEStructuralFeatures().get(2);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getEntity_Type() {
- return (EAttribute)entityEClass.getEStructuralFeatures().get(3);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EReference getEntity_IncludeGroups() {
- return (EReference)entityEClass.getEStructuralFeatures().get(4);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EClass getEntityGroup() {
- return entityGroupEClass;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EDataType getITraitVisitor() {
- return iTraitVisitorEDataType;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EDataType getIEntityVisitor() {
- return iEntityVisitorEDataType;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EDataType getIMetaDataSourceModelProvider() {
- return iMetaDataSourceModelProviderEDataType;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EDataType getModelContext() {
- return modelContextEDataType;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public MetadataFactory getMetadataFactory() {
- return (MetadataFactory)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
- modelEClass = createEClass(MODEL);
- createEReference(modelEClass, MODEL__ENTITY_GROUPS);
- createEAttribute(modelEClass, MODEL__SOURCE_MODEL_PROVIDER);
- createEAttribute(modelEClass, MODEL__CURRENT_MODEL_CONTEXT);
-
- entityGroupEClass = createEClass(ENTITY_GROUP);
-
- entityEClass = createEClass(ENTITY);
- createEReference(entityEClass, ENTITY__CHILD_ENTITIES);
- createEReference(entityEClass, ENTITY__TRAITS);
- createEAttribute(entityEClass, ENTITY__ID);
- createEAttribute(entityEClass, ENTITY__TYPE);
- createEReference(entityEClass, ENTITY__INCLUDE_GROUPS);
-
- traitEClass = createEClass(TRAIT);
- createEAttribute(traitEClass, TRAIT__ID);
- createEReference(traitEClass, TRAIT__VALUE);
- createEAttribute(traitEClass, TRAIT__SOURCE_MODEL_PROVIDER);
-
- includeEntityGroupEClass = createEClass(INCLUDE_ENTITY_GROUP);
- createEAttribute(includeEntityGroupEClass, INCLUDE_ENTITY_GROUP__ID);
- createEAttribute(includeEntityGroupEClass, INCLUDE_ENTITY_GROUP__MODEL_URI);
-
- // Create data types
- iTraitVisitorEDataType = createEDataType(ITRAIT_VISITOR);
- iEntityVisitorEDataType = createEDataType(IENTITY_VISITOR);
- iMetaDataSourceModelProviderEDataType = createEDataType(IMETA_DATA_SOURCE_MODEL_PROVIDER);
- modelContextEDataType = createEDataType(MODEL_CONTEXT);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private boolean isInitialized = false;
-
- /**
- * Complete the initialization of the package and its meta-model. This
- * method is guarded to have no affect on any invocation but its first.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void initializePackageContents() {
- if (isInitialized) return;
- isInitialized = true;
-
- // Initialize package
- setName(eNAME);
- setNsPrefix(eNS_PREFIX);
- setNsURI(eNS_URI);
-
- // Add supertypes to classes
- modelEClass.getESuperTypes().add(this.getEntity());
- entityGroupEClass.getESuperTypes().add(this.getEntity());
-
- // Initialize classes and features; add operations and parameters
- initEClass(modelEClass, Model.class, "Model", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEReference(getModel_EntityGroups(), this.getEntityGroup(), null, "entityGroups", null, 0, -1, Model.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getModel_SourceModelProvider(), this.getIMetaDataSourceModelProvider(), "sourceModelProvider", null, 0, 1, Model.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getModel_CurrentModelContext(), this.getModelContext(), "currentModelContext", null, 0, 1, Model.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
- EOperation op = addEOperation(modelEClass, this.getEntityGroup(), "findIncludeGroup", 0, 1); //$NON-NLS-1$
- addEParameter(op, ecorePackage.getEString(), "groupId", 0, 1); //$NON-NLS-1$
-
- op = addEOperation(modelEClass, null, "accept"); //$NON-NLS-1$
- addEParameter(op, this.getIEntityVisitor(), "visitor", 0, 1); //$NON-NLS-1$
-
- initEClass(entityGroupEClass, EntityGroup.class, "EntityGroup", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-
- initEClass(entityEClass, Entity.class, "Entity", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEReference(getEntity_ChildEntities(), this.getEntity(), null, "childEntities", null, 0, -1, Entity.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- getEntity_ChildEntities().getEKeys().add(this.getEntity_Id());
- getEntity_ChildEntities().getEKeys().add(this.getEntity_Type());
- initEReference(getEntity_Traits(), this.getTrait(), null, "traits", null, 0, -1, Entity.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- getEntity_Traits().getEKeys().add(this.getTrait_Id());
- initEAttribute(getEntity_Id(), ecorePackage.getEString(), "id", null, 1, 1, Entity.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getEntity_Type(), ecorePackage.getEString(), "type", null, 0, 1, Entity.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getEntity_IncludeGroups(), this.getIncludeEntityGroup(), null, "includeGroups", null, 0, -1, Entity.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
- op = addEOperation(entityEClass, null, "accept"); //$NON-NLS-1$
- addEParameter(op, this.getIEntityVisitor(), "visitor", 0, 1); //$NON-NLS-1$
-
- op = addEOperation(entityEClass, this.getModel(), "getModel", 0, 1); //$NON-NLS-1$
-
- initEClass(traitEClass, Trait.class, "Trait", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEAttribute(getTrait_Id(), ecorePackage.getEString(), "id", null, 1, 1, Trait.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getTrait_Value(), ecorePackage.getEObject(), null, "value", null, 1, 1, Trait.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getTrait_SourceModelProvider(), this.getIMetaDataSourceModelProvider(), "sourceModelProvider", null, 0, 1, Trait.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
- op = addEOperation(traitEClass, null, "accept"); //$NON-NLS-1$
- addEParameter(op, this.getITraitVisitor(), "visitor", 0, 1); //$NON-NLS-1$
-
- initEClass(includeEntityGroupEClass, IncludeEntityGroup.class, "IncludeEntityGroup", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEAttribute(getIncludeEntityGroup_Id(), ecorePackage.getEString(), "id", null, 1, 1, IncludeEntityGroup.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getIncludeEntityGroup_ModelUri(), ecorePackage.getEString(), "modelUri", null, 0, 1, IncludeEntityGroup.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
- // Initialize data types
- initEDataType(iTraitVisitorEDataType, ITraitVisitor.class, "ITraitVisitor", !IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEDataType(iEntityVisitorEDataType, IEntityVisitor.class, "IEntityVisitor", !IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEDataType(iMetaDataSourceModelProviderEDataType, IMetaDataSourceModelProvider.class, "IMetaDataSourceModelProvider", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEDataType(modelContextEDataType, ModelKeyDescriptor.class, "ModelContext", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-
- // Create resource
- createResource(eNS_URI);
-
- // Create annotations
- // http:///org/eclipse/emf/ecore/util/ExtendedMetaData
- createExtendedMetaDataAnnotations();
- // http://www.eclipse.org/emf/2002/GenModel
- createGenModelAnnotations();
- }
-
- /**
- * Initializes the annotations for <b>http:///org/eclipse/emf/ecore/util/ExtendedMetaData</b>.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected void createExtendedMetaDataAnnotations() {
- String source = "http:///org/eclipse/emf/ecore/util/ExtendedMetaData"; //$NON-NLS-1$
- addAnnotation
- (modelEClass,
- source,
- new String[] {
- "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
- "name", "metadatamodel" //$NON-NLS-1$ //$NON-NLS-2$
- });
- addAnnotation
- (getModel_EntityGroups(),
- source,
- new String[] {
- "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
- "name", "entityGroup" //$NON-NLS-1$ //$NON-NLS-2$
- });
- addAnnotation
- (entityEClass,
- source,
- new String[] {
- "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
- "name", "entity" //$NON-NLS-1$ //$NON-NLS-2$
- });
- addAnnotation
- (getEntity_ChildEntities(),
- source,
- new String[] {
- "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
- "name", "entity" //$NON-NLS-1$ //$NON-NLS-2$
- });
- addAnnotation
- (getEntity_Traits(),
- source,
- new String[] {
- "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
- "name", "trait" //$NON-NLS-1$ //$NON-NLS-2$
- });
- addAnnotation
- (getEntity_IncludeGroups(),
- source,
- new String[] {
- "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
- "name", "include-entity-group" //$NON-NLS-1$ //$NON-NLS-2$
- });
- addAnnotation
- (getIncludeEntityGroup_ModelUri(),
- source,
- new String[] {
- "name", "uri" //$NON-NLS-1$ //$NON-NLS-2$
- });
- addAnnotation
- (traitEClass,
- source,
- new String[] {
- "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
- "name", "trait" //$NON-NLS-1$ //$NON-NLS-2$
- });
- addAnnotation
- (getTrait_Value(),
- source,
- new String[] {
- "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
- "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
- });
- }
-
- /**
- * Initializes the annotations for <b>http://www.eclipse.org/emf/2002/GenModel</b>.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @SuppressWarnings("cast")
- protected void createGenModelAnnotations() {
- String source = "http://www.eclipse.org/emf/2002/GenModel"; //$NON-NLS-1$
- addAnnotation
- ((EOperation)traitEClass.getEOperations().get(0),
- source,
- new String[] {
- "body", "visitor.visit(this);" //$NON-NLS-1$ //$NON-NLS-2$
- });
- }
-
-} //MetadataPackageImpl
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/impl/ModelImpl.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/impl/ModelImpl.java
deleted file mode 100644
index cfbb83e..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/impl/ModelImpl.java
+++ /dev/null
@@ -1,258 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: ModelImpl.java,v 1.8 2010/01/27 23:54:32 gkessler Exp $
- */
-package org.eclipse.jst.jsf.common.metadata.internal.impl;
-
-import java.util.Collection;
-import java.util.Iterator;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.util.EObjectResolvingEList;
-import org.eclipse.jst.jsf.common.metadata.EntityGroup;
-import org.eclipse.jst.jsf.common.metadata.MetadataPackage;
-import org.eclipse.jst.jsf.common.metadata.Model;
-import org.eclipse.jst.jsf.common.metadata.internal.IMetaDataSourceModelProvider;
-import org.eclipse.jst.jsf.common.metadata.internal.ModelKeyDescriptor;
-import org.eclipse.jst.jsf.common.metadata.query.IEntityVisitor;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Model</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- * <li>{@link org.eclipse.jst.jsf.common.metadata.internal.impl.ModelImpl#getEntityGroups <em>Entity Groups</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.common.metadata.internal.impl.ModelImpl#getSourceModelProvider <em>Source Model Provider</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.common.metadata.internal.impl.ModelImpl#getCurrentModelContext <em>Current Model Context</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-@SuppressWarnings("hiding")
-public class ModelImpl extends EntityImpl implements Model {
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public static final String copyright = "Copyright (c) 2007 Oracle Corporation"; //$NON-NLS-1$
-
- /**
- * The cached value of the '{@link #getEntityGroups() <em>Entity Groups</em>}' reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getEntityGroups()
- * @generated
- * @ordered
- */
- protected EList entityGroups = null;
-
- /**
- * The default value of the '{@link #getSourceModelProvider() <em>Source Model Provider</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getSourceModelProvider()
- * @generated
- * @ordered
- */
- protected static final IMetaDataSourceModelProvider SOURCE_MODEL_PROVIDER_EDEFAULT = null;
-
- /**
- * The default value of the '{@link #getCurrentModelContext() <em>Current Model Context</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getCurrentModelContext()
- * @generated
- * @ordered
- */
- protected static final ModelKeyDescriptor CURRENT_MODEL_CONTEXT_EDEFAULT = null;
-
- private IMetaDataSourceModelProvider sourceModelProvider;
-
- private ModelKeyDescriptor _modelContext;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected ModelImpl() {
- super();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected EClass eStaticClass() {
- return MetadataPackage.Literals.MODEL;
- }
-
- /**
- * <!-- begin-user-doc -->
- * May return null.
- * <!-- end-user-doc -->
- * @generated NOT
- */
- public IMetaDataSourceModelProvider getSourceModelProvider() {
- return sourceModelProvider;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated NOT
- */
- public void setSourceModelProvider(IMetaDataSourceModelProvider newSourceModelProvider) {
- sourceModelProvider = newSourceModelProvider;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated NOT
- */
- public ModelKeyDescriptor getCurrentModelContext() {
- return _modelContext;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated NOT
- */
- public void setCurrentModelContext(ModelKeyDescriptor newCurrentModelContext) {
- _modelContext = newCurrentModelContext;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EList getEntityGroups() {
- if (entityGroups == null) {
- entityGroups = new EObjectResolvingEList(EntityGroup.class, this, MetadataPackage.MODEL__ENTITY_GROUPS);
- }
- return entityGroups;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public Object eGet(int featureID, boolean resolve, boolean coreType) {
- switch (featureID) {
- case MetadataPackage.MODEL__ENTITY_GROUPS:
- return getEntityGroups();
- case MetadataPackage.MODEL__SOURCE_MODEL_PROVIDER:
- return getSourceModelProvider();
- case MetadataPackage.MODEL__CURRENT_MODEL_CONTEXT:
- return getCurrentModelContext();
- }
- return super.eGet(featureID, resolve, coreType);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void eSet(int featureID, Object newValue) {
- switch (featureID) {
- case MetadataPackage.MODEL__ENTITY_GROUPS:
- getEntityGroups().clear();
- getEntityGroups().addAll((Collection)newValue);
- return;
- case MetadataPackage.MODEL__SOURCE_MODEL_PROVIDER:
- setSourceModelProvider((IMetaDataSourceModelProvider)newValue);
- return;
- case MetadataPackage.MODEL__CURRENT_MODEL_CONTEXT:
- setCurrentModelContext((ModelKeyDescriptor)newValue);
- return;
- }
- super.eSet(featureID, newValue);
- }
-
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated NOT
- */
- public EntityGroup findIncludeGroup(String groupId){
- EntityGroup ret = null;
- for (Iterator it=getEntityGroups().iterator();it.hasNext();){
- EntityGroup entityGroup = (EntityGroup)it.next();
- if (entityGroup.getId().equals(groupId)){
- ret = entityGroup;
- break;
- }
- }
- return ret;
- }
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void eUnset(int featureID) {
- switch (featureID) {
- case MetadataPackage.MODEL__ENTITY_GROUPS:
- getEntityGroups().clear();
- return;
- case MetadataPackage.MODEL__SOURCE_MODEL_PROVIDER:
- setSourceModelProvider(SOURCE_MODEL_PROVIDER_EDEFAULT);
- return;
- case MetadataPackage.MODEL__CURRENT_MODEL_CONTEXT:
- setCurrentModelContext(CURRENT_MODEL_CONTEXT_EDEFAULT);
- return;
- }
- super.eUnset(featureID);
- }
- /**
- * <!-- begin-user-doc -->
- * Due to a mistake in the EMF model, Model is not inheriting accept method from Entity. This should be fixed.
- * <!-- end-user-doc -->
- * @generated NOT
- */
-
- public void accept(IEntityVisitor visitor) {
- super.accept(visitor);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated NOT
- */
- public Model getModel() {
- return this;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean eIsSet(int featureID) {
- switch (featureID) {
- case MetadataPackage.MODEL__ENTITY_GROUPS:
- return entityGroups != null && !entityGroups.isEmpty();
- case MetadataPackage.MODEL__SOURCE_MODEL_PROVIDER:
- return SOURCE_MODEL_PROVIDER_EDEFAULT == null ? getSourceModelProvider() != null : !SOURCE_MODEL_PROVIDER_EDEFAULT.equals(getSourceModelProvider());
- case MetadataPackage.MODEL__CURRENT_MODEL_CONTEXT:
- return CURRENT_MODEL_CONTEXT_EDEFAULT == null ? getCurrentModelContext() != null : !CURRENT_MODEL_CONTEXT_EDEFAULT.equals(getCurrentModelContext());
- }
- return super.eIsSet(featureID);
- }
-
-} //ModelImpl
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/impl/TraitImpl.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/impl/TraitImpl.java
deleted file mode 100644
index 942168c..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/impl/TraitImpl.java
+++ /dev/null
@@ -1,330 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: TraitImpl.java,v 1.9 2008/11/18 22:24:39 gkessler Exp $
- */
-package org.eclipse.jst.jsf.common.metadata.internal.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.jst.jsf.common.metadata.MetadataPackage;
-import org.eclipse.jst.jsf.common.metadata.Trait;
-import org.eclipse.jst.jsf.common.metadata.internal.IMetaDataSourceModelProvider;
-import org.eclipse.jst.jsf.common.metadata.query.ITraitVisitor;
-
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Trait</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- * <li>{@link TraitImpl#getValue <em>Value</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class TraitImpl extends EObjectImpl implements Trait {
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public static final String copyright = "Copyright (c) 2007 Oracle Corporation"; //$NON-NLS-1$
-
- /**
- * The default value of the '{@link #getId() <em>Id</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getId()
- * @generated
- * @ordered
- */
- protected static final String ID_EDEFAULT = null;
-
- /**
- * The cached value of the '{@link #getId() <em>Id</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getId()
- * @generated
- * @ordered
- */
- protected String id = ID_EDEFAULT;
-
- /**
- * The cached value of the '{@link #getValue() <em>Value</em>}' containment reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getValue()
- * @generated
- * @ordered
- */
- protected EObject value = null;
-
- /**
- * The default value of the '{@link #getSourceModelProvider() <em>Source Model Provider</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getSourceModelProvider()
- * @generated
- * @ordered
- */
- protected static final IMetaDataSourceModelProvider SOURCE_MODEL_PROVIDER_EDEFAULT = null;
-
- /**
- * The cached value of the '{@link #getSourceModelProvider() <em>Source Model Provider</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getSourceModelProvider()
- * @generated
- * @ordered
- */
- protected IMetaDataSourceModelProvider sourceModelProvider = SOURCE_MODEL_PROVIDER_EDEFAULT;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected TraitImpl() {
- super();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected EClass eStaticClass() {
- return MetadataPackage.Literals.TRAIT;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EObject getValue() {
- return value;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param newValue
- * @param msgs
- * @return NotificationChain
- * @generated
- */
- public NotificationChain basicSetValue(EObject newValue, NotificationChain msgs) {
- EObject oldValue = value;
- value = newValue;
- if (eNotificationRequired()) {
- ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, MetadataPackage.TRAIT__VALUE, oldValue, newValue);
- if (msgs == null) msgs = notification; else msgs.add(notification);
- }
- return msgs;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setValue(EObject newValue) {
- if (newValue != value) {
- NotificationChain msgs = null;
- if (value != null)
- msgs = ((InternalEObject)value).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - MetadataPackage.TRAIT__VALUE, null, msgs);
- if (newValue != null)
- msgs = ((InternalEObject)newValue).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - MetadataPackage.TRAIT__VALUE, null, msgs);
- msgs = basicSetValue(newValue, msgs);
- if (msgs != null) msgs.dispatch();
- }
- else if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, MetadataPackage.TRAIT__VALUE, newValue, newValue));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public IMetaDataSourceModelProvider getSourceModelProvider() {
- return sourceModelProvider;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setSourceModelProvider(IMetaDataSourceModelProvider newSourceModelProvider) {
- IMetaDataSourceModelProvider oldSourceModelProvider = sourceModelProvider;
- sourceModelProvider = newSourceModelProvider;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, MetadataPackage.TRAIT__SOURCE_MODEL_PROVIDER, oldSourceModelProvider, sourceModelProvider));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public String getId() {
- return id;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setId(String newId) {
- String oldId = id;
- id = newId;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, MetadataPackage.TRAIT__ID, oldId, id));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated NOT
- */
- public void accept(ITraitVisitor visitor) {
- visitor.visit(this);
- visitor.visitCompleted(this);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
- switch (featureID) {
- case MetadataPackage.TRAIT__VALUE:
- return basicSetValue(null, msgs);
- }
- return super.eInverseRemove(otherEnd, featureID, msgs);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public Object eGet(int featureID, boolean resolve, boolean coreType) {
- switch (featureID) {
- case MetadataPackage.TRAIT__ID:
- return getId();
- case MetadataPackage.TRAIT__VALUE:
- return getValue();
- case MetadataPackage.TRAIT__SOURCE_MODEL_PROVIDER:
- return getSourceModelProvider();
- }
- return super.eGet(featureID, resolve, coreType);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void eSet(int featureID, Object newValue) {
- switch (featureID) {
- case MetadataPackage.TRAIT__ID:
- setId((String)newValue);
- return;
- case MetadataPackage.TRAIT__VALUE:
- setValue((EObject)newValue);
- return;
- case MetadataPackage.TRAIT__SOURCE_MODEL_PROVIDER:
- setSourceModelProvider((IMetaDataSourceModelProvider)newValue);
- return;
- }
- super.eSet(featureID, newValue);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void eUnset(int featureID) {
- switch (featureID) {
- case MetadataPackage.TRAIT__ID:
- setId(ID_EDEFAULT);
- return;
- case MetadataPackage.TRAIT__VALUE:
- setValue((EObject)null);
- return;
- case MetadataPackage.TRAIT__SOURCE_MODEL_PROVIDER:
- setSourceModelProvider(SOURCE_MODEL_PROVIDER_EDEFAULT);
- return;
- }
- super.eUnset(featureID);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean eIsSet(int featureID) {
- switch (featureID) {
- case MetadataPackage.TRAIT__ID:
- return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
- case MetadataPackage.TRAIT__VALUE:
- return value != null;
- case MetadataPackage.TRAIT__SOURCE_MODEL_PROVIDER:
- return SOURCE_MODEL_PROVIDER_EDEFAULT == null ? sourceModelProvider != null : !SOURCE_MODEL_PROVIDER_EDEFAULT.equals(sourceModelProvider);
- }
- return super.eIsSet(featureID);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public String toString() {
- if (eIsProxy()) return super.toString();
-
- StringBuffer result = new StringBuffer(super.toString());
- result.append(" (id: "); //$NON-NLS-1$
- result.append(id);
- result.append(", sourceModelProvider: "); //$NON-NLS-1$
- result.append(sourceModelProvider);
- result.append(')');
- return result.toString();
- }
-
- public boolean equals(Object value_){
- if (!(value_ instanceof String))
- return super.equals(value_);
-
- String key = (String)value_;
- if (key.equals(getId()))
- return true;
-
- return false;
- }
-
- @Override
- public int hashCode()
- {
- // try to match convention x.equals(y) => x.hashCode() == y.hashCode()
- return getId() != null ? getId().hashCode() : 0xDEADBEEF;
- }
-} //TraitImpl
\ No newline at end of file
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/messages.properties b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/messages.properties
deleted file mode 100644
index 5e9fd47..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/messages.properties
+++ /dev/null
@@ -1,13 +0,0 @@
-###############################################################################
-# Copyright (c) 2007 Oracle Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# Oracle Corporation - initial API and implementation
-###############################################################################
-
-MissingResource_exception=MissingResourceException for NLSPropertyValue: {0}
-Key_not_found=(key not found)
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/util/MetadataAdapterFactory.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/util/MetadataAdapterFactory.java
deleted file mode 100644
index f73a841..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/util/MetadataAdapterFactory.java
+++ /dev/null
@@ -1,200 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: MetadataAdapterFactory.java,v 1.5 2008/11/18 22:24:36 gkessler Exp $
- */
-package org.eclipse.jst.jsf.common.metadata.internal.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.jst.jsf.common.metadata.Entity;
-import org.eclipse.jst.jsf.common.metadata.EntityGroup;
-import org.eclipse.jst.jsf.common.metadata.IncludeEntityGroup;
-import org.eclipse.jst.jsf.common.metadata.MetadataPackage;
-import org.eclipse.jst.jsf.common.metadata.Model;
-import org.eclipse.jst.jsf.common.metadata.Trait;
-
-
-
-/**
- * <!-- 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.jst.jsf.common.metadata.MetadataPackage
- * @generated
- */
-public class MetadataAdapterFactory extends AdapterFactoryImpl {
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public static final String copyright = "Copyright (c) 2007 Oracle Corporation"; //$NON-NLS-1$
-
- /**
- * The cached model package.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected static MetadataPackage modelPackage;
-
- /**
- * Creates an instance of the adapter factory.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public MetadataAdapterFactory() {
- if (modelPackage == null) {
- modelPackage = MetadataPackage.eINSTANCE;
- }
- }
-
- /**
- * Returns whether this factory is applicable for the type of the object.
- * <!-- begin-user-doc -->
- * This implementation returns <code>true</code> if the object is either the model's package or is an instance object of the model.
- * <!-- end-user-doc -->
- * @return whether this factory is applicable for the type of the object.
- * @generated
- */
- public boolean isFactoryForType(Object object) {
- if (object == modelPackage) {
- return true;
- }
- if (object instanceof EObject) {
- return ((EObject)object).eClass().getEPackage() == modelPackage;
- }
- return false;
- }
-
- /**
- * The switch the delegates to the <code>createXXX</code> methods.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected MetadataSwitch modelSwitch =
- new MetadataSwitch() {
- public Object caseModel(Model object) {
- return createModelAdapter();
- }
- public Object caseEntityGroup(EntityGroup object) {
- return createEntityGroupAdapter();
- }
- public Object caseEntity(Entity object) {
- return createEntityAdapter();
- }
- public Object caseTrait(Trait object) {
- return createTraitAdapter();
- }
- public Object caseIncludeEntityGroup(IncludeEntityGroup object) {
- return createIncludeEntityGroupAdapter();
- }
- 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.jst.jsf.common.metadata.Trait <em>Trait</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.jst.jsf.common.metadata.Trait
- * @generated
- */
- public Adapter createTraitAdapter() {
- return null;
- }
-
- /**
- * Creates a new adapter for an object of class '{@link org.eclipse.jst.jsf.common.metadata.IncludeEntityGroup <em>Include Entity Group</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.jst.jsf.common.metadata.IncludeEntityGroup
- * @generated
- */
- public Adapter createIncludeEntityGroupAdapter() {
- return null;
- }
-
- /**
- * Creates a new adapter for an object of class '{@link org.eclipse.jst.jsf.common.metadata.Model <em>Model</em>}'.
- * <!-- begin-user-doc -->
- * This default implementation returns null so that we can easily ignore cases;
- * it's useful to ignore a case when inheritance will catch all the cases anyway.
- * <!-- end-user-doc -->
- * @return the new adapter.
- * @see org.eclipse.jst.jsf.common.metadata.Model
- * @generated
- */
- public Adapter createModelAdapter() {
- return null;
- }
-
- /**
- * Creates a new adapter for an object of class '{@link org.eclipse.jst.jsf.common.metadata.Entity <em>Entity</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.jst.jsf.common.metadata.Entity
- * @generated
- */
- public Adapter createEntityAdapter() {
- return null;
- }
-
- /**
- * Creates a new adapter for an object of class '{@link org.eclipse.jst.jsf.common.metadata.EntityGroup <em>Entity Group</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.jst.jsf.common.metadata.EntityGroup
- * @generated
- */
- public Adapter createEntityGroupAdapter() {
- 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;
- }
-
-} //MetadataAdapterFactory
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/util/MetadataResourceFactoryImpl.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/util/MetadataResourceFactoryImpl.java
deleted file mode 100644
index 708b72f..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/util/MetadataResourceFactoryImpl.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: MetadataResourceFactoryImpl.java,v 1.3 2008/11/18 22:24:36 gkessler Exp $
- */
-package org.eclipse.jst.jsf.common.metadata.internal.util;
-
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.impl.ResourceFactoryImpl;
-import org.eclipse.emf.ecore.xmi.XMLResource;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Resource Factory</b> associated with the package.
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.jsf.common.metadata.internal.util.MetadataResourceImpl
- * @generated
- */
-public class MetadataResourceFactoryImpl extends ResourceFactoryImpl {
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public static final String copyright = "Copyright (c) 2007 Oracle Corporation"; //$NON-NLS-1$
-
- /**
- * Creates an instance of the resource factory.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public MetadataResourceFactoryImpl() {
- super();
- }
-
- /**
- * Creates an instance of the resource.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated NOT
- */
- public Resource createResource(URI uri) {
- XMLResource result = new MetadataResourceImpl(uri);
- result.getDefaultSaveOptions().put(XMLResource.OPTION_EXTENDED_META_DATA, Boolean.TRUE);
- result.getDefaultLoadOptions().put(XMLResource.OPTION_EXTENDED_META_DATA, Boolean.TRUE);
-
- result.getDefaultSaveOptions().put(XMLResource.OPTION_SCHEMA_LOCATION, Boolean.TRUE);
-
- result.getDefaultLoadOptions().put(XMLResource.OPTION_USE_ENCODED_ATTRIBUTE_STYLE, Boolean.TRUE);
- result.getDefaultSaveOptions().put(XMLResource.OPTION_USE_ENCODED_ATTRIBUTE_STYLE, Boolean.TRUE);
-
- result.getDefaultLoadOptions().put(XMLResource.OPTION_USE_LEXICAL_HANDLER, Boolean.TRUE);
- return result;
- }
-
-} //MetadataResourceFactoryImpl
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/util/MetadataResourceImpl.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/util/MetadataResourceImpl.java
deleted file mode 100644
index 2db23d2..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/util/MetadataResourceImpl.java
+++ /dev/null
@@ -1,222 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: MetadataResourceImpl.java,v 1.12 2008/11/18 22:24:36 gkessler Exp $
- */
-package org.eclipse.jst.jsf.common.metadata.internal.util;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.xmi.PackageNotFoundException;
-import org.eclipse.emf.ecore.xmi.XMLHelper;
-import org.eclipse.emf.ecore.xmi.XMLLoad;
-import org.eclipse.emf.ecore.xmi.XMLResource;
-import org.eclipse.emf.ecore.xmi.impl.SAXXMLHandler;
-import org.eclipse.emf.ecore.xmi.impl.XMLHelperImpl;
-import org.eclipse.emf.ecore.xmi.impl.XMLLoadImpl;
-import org.eclipse.emf.ecore.xmi.impl.XMLResourceImpl;
-import org.eclipse.jst.jsf.common.JSFCommonPlugin;
-import org.eclipse.jst.jsf.common.metadata.Entity;
-import org.eclipse.jst.jsf.common.metadata.MetadataPackage;
-import org.eclipse.jst.jsf.common.metadata.Model;
-import org.eclipse.jst.jsf.common.metadata.Trait;
-import org.eclipse.jst.jsf.common.metadata.internal.IMetaDataSourceModelProvider;
-import org.xml.sax.helpers.DefaultHandler;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Resource </b> associated with the package.
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.jsf.common.metadata.internal.util.MetadataResourceFactoryImpl
- * @generated NOT
- */
-public class MetadataResourceImpl extends XMLResourceImpl implements XMLResource.ResourceHandler {
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public static final String copyright = "Oracle inc."; //$NON-NLS-1$
-
- /**
- * IMetaDataSourceModelProvider
- */
- protected IMetaDataSourceModelProvider _provider;
- /**
- * Creates an instance of the resource.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param uri the URI of the new resource.
- * @generated
- */
- public MetadataResourceImpl(URI uri) {
- super(uri);
- }
-
- /**
- * Constructor
- */
- public MetadataResourceImpl() {
- super();
- }
-
-
- /**
- * Constructor
- * @param provider
- */
- public MetadataResourceImpl(IMetaDataSourceModelProvider provider){
- super();
- _provider = provider;
- }
-
- /**
- * @generated NOT
- */
- protected XMLLoad createXMLLoad() {
- return new MetadataXMLLoad(createXMLHelper());
- }
- /**
- * Override createXMLHelper so that MetadataPackage.eINSTANCE is used for the NoNamespace package
- * @generated NOT
- */
- protected XMLHelper createXMLHelper() {
- return new XMLHelperImpl(){
- @Override
- public EPackage getNoNamespacePackage() {
- return MetadataPackage.eINSTANCE;
- }
- };
- }
-
- public void postLoad(XMLResource resource, InputStream inputStream,
- Map options)
- {
- final List<EObject> resContents = resource.getContents();
-
- if (resContents.size() > 0)
- {
- final Object aRoot = resContents.get(0);
- if (aRoot instanceof Model)
- {
- setModelKeyInTraits((Model) aRoot, (Model) aRoot);
- }
- }
- else
- {
- JSFCommonPlugin.log(IStatus.WARNING,
- "No model loaded for "+getURI()); //$NON-NLS-1$
- }
- }
-
- private void setModelKeyInTraits(Model root, Entity currentEntity) {
- // TODO: does this have side effect that we care about? nothing is done with the return value
- MetadataPackage.eINSTANCE.getTrait_SourceModelProvider();
- for (int i=0;i < currentEntity.getTraits().size();i++){
- ((Trait)currentEntity.getTraits().get(i)).setSourceModelProvider(_provider);
- }
- for (int j=0;j < currentEntity.getChildEntities().size();j++){
- setModelKeyInTraits(root,(Entity)currentEntity.getChildEntities().get(j));
- }
-
- if (currentEntity == root){
- for (int k=0;k < root.getEntityGroups().size();k++){
- setModelKeyInTraits(root,(Entity)root.getEntityGroups().get(k));
- }
- }
- }
-
-
- public void postSave(XMLResource resource, OutputStream outputStream,
- Map options) {
- // do nothing
- }
-
- public void preLoad(XMLResource resource, InputStream inputStream,
- Map options) {
- // do nothing
- }
-
- public void preSave(XMLResource resource, OutputStream outputStream,
- Map options) {
- // do nothing
- }
-
- /**
- * Override the handleErrors() method so that resource will load gracefully, and errors reported later
- * when appropriate
- *
- * @generated NOT
- */
- private static class MetadataXMLLoad extends XMLLoadImpl {
-
- public MetadataXMLLoad(XMLHelper helper) {
- super(helper);
- }
-
- @Override
- protected void handleErrors() throws IOException {
- //by doing nothing here, this allows the list of non-fatal errors (res.getErrors()) to be returned
- }
-
- @Override
- protected DefaultHandler makeDefaultHandler() {
- return new MetadataXMLHandler(resource, helper, options);
- }
- }
-
- /**
- * Ensures that only EMF extension models registered with the EMF Package Registry are considered.
- * @generated NOT
- */
- private static class MetadataXMLHandler extends SAXXMLHandler {
-
- public MetadataXMLHandler(XMLResource xmiResource, XMLHelper helper,
- Map<?, ?> options) {
- super(xmiResource, helper, options);
- }
-
- @Override
- protected EPackage getPackageForURI(String uriString) {
- //code taken from super and modified so that only package registry is considered
- if (uriString == null)
- {
- return null;
- }
-
- EPackage ePackage = packageRegistry.getEPackage(uriString);
-
- if (ePackage != null && ePackage.eIsProxy())
- {
- ePackage = null;
- }
-
- if (ePackage == null)
- {
- ePackage = handleMissingPackage(uriString);
- }
-
- if (ePackage == null)
- {
- error
- (new PackageNotFoundException
- (uriString,
- getLocation(),
- getLineNumber(),
- getColumnNumber()));
- }
-
- return ePackage;
- }
- }
-} //MetadataResourceImpl
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/util/MetadataSwitch.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/util/MetadataSwitch.java
deleted file mode 100644
index 141be3b..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/util/MetadataSwitch.java
+++ /dev/null
@@ -1,233 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: MetadataSwitch.java,v 1.7 2008/11/18 22:24:36 gkessler Exp $
- */
-package org.eclipse.jst.jsf.common.metadata.internal.util;
-
-
-import java.util.List;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jst.jsf.common.metadata.Entity;
-import org.eclipse.jst.jsf.common.metadata.EntityGroup;
-import org.eclipse.jst.jsf.common.metadata.IncludeEntityGroup;
-import org.eclipse.jst.jsf.common.metadata.MetadataPackage;
-import org.eclipse.jst.jsf.common.metadata.Model;
-import org.eclipse.jst.jsf.common.metadata.Trait;
-
-
-
-/**
- * <!-- 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.jst.jsf.common.metadata.MetadataPackage
- * @generated
- */
-public class MetadataSwitch {
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public static final String copyright = "Copyright (c) 2007 Oracle Corporation"; //$NON-NLS-1$
-
- /**
- * The cached model package
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected static MetadataPackage modelPackage;
-
- /**
- * Creates an instance of the switch.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public MetadataSwitch() {
- if (modelPackage == null) {
- modelPackage = MetadataPackage.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 -->
- * @param theEObject
- * @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 -->
- * @param theEClass
- * @param theEObject
- * @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);
- }
- 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 -->
- * @param classifierID
- * @param theEObject
- * @return the first non-null result returned by a <code>caseXXX</code> call.
- * @generated
- */
- protected Object doSwitch(int classifierID, EObject theEObject) {
- switch (classifierID) {
- case MetadataPackage.MODEL: {
- Model model = (Model)theEObject;
- Object result = caseModel(model);
- if (result == null) result = caseEntity(model);
- if (result == null) result = defaultCase(theEObject);
- return result;
- }
- case MetadataPackage.ENTITY_GROUP: {
- EntityGroup entityGroup = (EntityGroup)theEObject;
- Object result = caseEntityGroup(entityGroup);
- if (result == null) result = caseEntity(entityGroup);
- if (result == null) result = defaultCase(theEObject);
- return result;
- }
- case MetadataPackage.ENTITY: {
- Entity entity = (Entity)theEObject;
- Object result = caseEntity(entity);
- if (result == null) result = defaultCase(theEObject);
- return result;
- }
- case MetadataPackage.TRAIT: {
- Trait trait = (Trait)theEObject;
- Object result = caseTrait(trait);
- if (result == null) result = defaultCase(theEObject);
- return result;
- }
- case MetadataPackage.INCLUDE_ENTITY_GROUP: {
- IncludeEntityGroup includeEntityGroup = (IncludeEntityGroup)theEObject;
- Object result = caseIncludeEntityGroup(includeEntityGroup);
- if (result == null) result = defaultCase(theEObject);
- return result;
- }
- default: return defaultCase(theEObject);
- }
- }
-
- /**
- * Returns the result of interpretting the object as an instance of '<em>Trait</em>'.
- * <!-- begin-user-doc -->
- * This implementation returns null;
- * returning a non-null result will terminate the switch.
- * <!-- end-user-doc -->
- * @param object the target of the switch.
- * @return the result of interpretting the object as an instance of '<em>Trait</em>'.
- * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
- * @generated
- */
- public Object caseTrait(Trait object) {
- return null;
- }
-
- /**
- * Returns the result of interpretting the object as an instance of '<em>Include Entity Group</em>'.
- * <!-- begin-user-doc -->
- * This implementation returns null;
- * returning a non-null result will terminate the switch.
- * <!-- end-user-doc -->
- * @param object the target of the switch.
- * @return the result of interpretting the object as an instance of '<em>Include Entity Group</em>'.
- * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
- * @generated
- */
- public Object caseIncludeEntityGroup(IncludeEntityGroup object) {
- return null;
- }
-
- /**
- * Returns the result of interpretting the object as an instance of '<em>Model</em>'.
- * <!-- begin-user-doc -->
- * This implementation returns null;
- * returning a non-null result will terminate the switch.
- * <!-- end-user-doc -->
- * @param object the target of the switch.
- * @return the result of interpretting the object as an instance of '<em>Model</em>'.
- * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
- * @generated
- */
- public Object caseModel(Model object) {
- return null;
- }
-
- /**
- * Returns the result of interpretting the object as an instance of '<em>Entity</em>'.
- * <!-- begin-user-doc -->
- * This implementation returns null;
- * returning a non-null result will terminate the switch.
- * <!-- end-user-doc -->
- * @param object the target of the switch.
- * @return the result of interpretting the object as an instance of '<em>Entity</em>'.
- * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
- * @generated
- */
- public Object caseEntity(Entity object) {
- return null;
- }
-
- /**
- * Returns the result of interpretting the object as an instance of '<em>Entity Group</em>'.
- * <!-- begin-user-doc -->
- * This implementation returns null;
- * returning a non-null result will terminate the switch.
- * <!-- end-user-doc -->
- * @param object the target of the switch.
- * @return the result of interpretting the object as an instance of '<em>Entity Group</em>'.
- * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
- * @generated
- */
- public Object caseEntityGroup(EntityGroup object) {
- return null;
- }
-
- /**
- * Returns the result of interpretting the object as an instance of '<em>EObject</em>'.
- * <!-- begin-user-doc -->
- * This implementation returns null;
- * returning a non-null result will terminate the switch, but this is the last case anyway.
- * <!-- end-user-doc -->
- * @param object the target of the switch.
- * @return the result of interpretting the object as an instance of '<em>EObject</em>'.
- * @see #doSwitch(org.eclipse.emf.ecore.EObject)
- * @generated
- */
- public Object defaultCase(EObject object) {
- return null;
- }
-
-} //MetadataSwitch
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/util/MetadataXMLProcessor.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/util/MetadataXMLProcessor.java
deleted file mode 100644
index 036ef6b..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/util/MetadataXMLProcessor.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: MetadataXMLProcessor.java,v 1.4 2008/11/18 22:24:36 gkessler Exp $
- */
-package org.eclipse.jst.jsf.common.metadata.internal.util;
-
-import java.util.Map;
-
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.xmi.util.XMLProcessor;
-import org.eclipse.jst.jsf.common.metadata.MetadataPackage;
-
-
-/**
- * This class contains helper methods to serialize and deserialize XML documents
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class MetadataXMLProcessor extends XMLProcessor {
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public static final String copyright = "Copyright (c) 2007 Oracle Corporation"; //$NON-NLS-1$
-
-
- /**
- * Public constructor to instantiate the helper.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public MetadataXMLProcessor() {
- super((EPackage.Registry.INSTANCE));
- MetadataPackage.eINSTANCE.eClass();
- }
-
- /**
- * Register for "*" and "xml" file extensions the MetadataResourceFactoryImpl factory.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected Map getRegistrations() {
- if (registrations == null) {
- super.getRegistrations();
- registrations.put(XML_EXTENSION, new MetadataResourceFactoryImpl());
- registrations.put(STAR_EXTENSION, new MetadataResourceFactoryImpl());
- }
- return registrations;
- }
-
-} //MetadataXMLProcessor
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/package-info.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/package-info.java
deleted file mode 100644
index 836883f..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/package-info.java
+++ /dev/null
@@ -1,17 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 Oracle 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:
- * Oracle - initial API and implementation
- *
- ********************************************************************************/
-
-/**
- * EMF interface objects for design-time metadata.
- * <p><b>Provisional API - subject to change</b></p>
- */
-package org.eclipse.jst.jsf.common.metadata;
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/query/AbstractEntityQueryVisitor.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/query/AbstractEntityQueryVisitor.java
deleted file mode 100644
index fd3d6ff..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/query/AbstractEntityQueryVisitor.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 Oracle 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:
- * Oracle - initial API and implementation
- *
- ********************************************************************************/
-
-package org.eclipse.jst.jsf.common.metadata.query;
-
-import org.eclipse.jst.jsf.common.metadata.Entity;
-
-/**
- * Abstract class implementing {@link IEntityQueryVisitor} that concrete subclasses should provide implementations
- * <p><b>Provisional API - subject to change</b></p>
- */
-public abstract class AbstractEntityQueryVisitor extends AbstractEntityVisitor
- implements IEntityQueryVisitor {
-
- private String _delimiter = "/"; //$NON-NLS-1$
-
- /**
- * @return EmptyResultSet. Subclasses should override.
- */
- public IResultSet<Entity> findEntities(final Entity initialEntityContext, final String entityKey) {
- return new EmptyResultSet();
- }
-
- /**
- * @return String delimiting levels in the hierarchy. Defaults to "/"
- */
- protected String getLevelDelimiter() {
- return _delimiter;
- }
-
- /**
- * Sets the string used to delimit the levels in an entityKey
- * @param delimiter
- */
- protected void setLevelDelimiter(final String delimiter) {
- _delimiter = delimiter;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/query/AbstractEntityVisitor.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/query/AbstractEntityVisitor.java
deleted file mode 100644
index 54e6f01..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/query/AbstractEntityVisitor.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 Oracle 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:
- * Oracle - initial API and implementation
- *
- ********************************************************************************/
-
-package org.eclipse.jst.jsf.common.metadata.query;
-
-import org.eclipse.jst.jsf.common.metadata.Entity;
-
-/**
- * Abstract implementation that concrete subclasses should ovveride
- * <p><b>Provisional API - subject to change</b></p>
- */
-public abstract class AbstractEntityVisitor extends AbstractMetaDataVisitor
- implements IEntityVisitor {
-
- public abstract void visit(Entity entity);
-
- public void visitCompleted(Entity entity){
- //subclasses should override if needed
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/query/AbstractMetaDataVisitor.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/query/AbstractMetaDataVisitor.java
deleted file mode 100644
index 15443e5..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/query/AbstractMetaDataVisitor.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 Oracle 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:
- * Oracle - initial API and implementation
- *
- ********************************************************************************/
-
-package org.eclipse.jst.jsf.common.metadata.query;
-
-/**
- * Abstract class implementing {@link IMetaDataVisitor}
- * <p><b>Provisional API - subject to change</b></p>
- */
-public abstract class AbstractMetaDataVisitor implements IMetaDataVisitor {
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.jsf.common.metadata.query.IMetaDataVisitor#stopVisiting()
- */
- public boolean stopVisiting() {
- return false;
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/query/AbstractResultSet.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/query/AbstractResultSet.java
deleted file mode 100644
index 4c795b1..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/query/AbstractResultSet.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 Oracle 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:
- * Oracle - initial API and implementation
- *
- ********************************************************************************/
-
-package org.eclipse.jst.jsf.common.metadata.query;
-
-import java.util.Collections;
-import java.util.List;
-
-/**
- * Abstract implementation of {@link IResultSet} that developers may subclass.
- * Users should assume that the results are only valid at the time of the query. This may change in the future.
- * <p><b>Provisional API - subject to change</b></p>
- * @param <T>
- */
-public abstract class AbstractResultSet<T> implements IResultSet<T> {
- private List _results;
- private boolean _isClosed = false;
-
- public List<T> getResults() throws MetaDataException {
- initIfNecessary();
- return _results;
- }
-
- public final void close() throws MetaDataException {
- doClose();
- _isClosed = true;
- _results = null;
- }
-
- /**
- * Overridable method to close resultset. This is called by close()
- * @throws MetaDataException
- */
- protected void doClose() throws MetaDataException {
- //subclasses to provide override
- }
-
- public final boolean isClosed() {
- return _isClosed;
- }
-
- /**
- * @return List of results. Null is tolerated.
- */
- protected abstract List<T> getInternalResults();
-
- private void initIfNecessary() throws MetaDataException {
- if (_isClosed)
- throw new MetaDataException("Attempt to access a closed resultset."); //$NON-NLS-1$
-
- if (_results == null) {
- List<T> checkNullResults = getInternalResults();
- if (checkNullResults == null){
- checkNullResults = Collections.EMPTY_LIST;
- }
- _results = Collections.unmodifiableList(checkNullResults);
- }
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/query/AbstractTraitQueryVisitor.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/query/AbstractTraitQueryVisitor.java
deleted file mode 100644
index ddb8940..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/query/AbstractTraitQueryVisitor.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 Oracle 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:
- * Oracle - initial API and implementation
- *
- ********************************************************************************/
-
-package org.eclipse.jst.jsf.common.metadata.query;
-
-import org.eclipse.jst.jsf.common.metadata.Entity;
-
-/**
- * Abstract implmentation of {@link ITraitQueryVisitor} that subclasses should use to provide implmentation
- * <p><b>Provisional API - subject to change</b></p>
- */
-public abstract class AbstractTraitQueryVisitor extends AbstractTraitVisitor implements
- ITraitQueryVisitor {
-
- /**
- * @return EmptyResultSet. Subclasses should override.
- */
- public IResultSet findTraits(Entity entity, String traitKey) {
- return new EmptyResultSet();
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/query/AbstractTraitVisitor.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/query/AbstractTraitVisitor.java
deleted file mode 100644
index 795a473..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/query/AbstractTraitVisitor.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 Oracle 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:
- * Oracle - initial API and implementation
- *
- ********************************************************************************/
-
-package org.eclipse.jst.jsf.common.metadata.query;
-
-import org.eclipse.jst.jsf.common.metadata.Trait;
-
-/**
- * Abstract Trait visitor
- * <p><b>Provisional API - subject to change</b></p>
- */
-public abstract class AbstractTraitVisitor extends AbstractMetaDataVisitor implements ITraitVisitor{
-
- public abstract void visit(final Trait trait);
-
- public void visitCompleted(final Trait trait) {
- //subclasses should override if needed
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/query/EmptyResultSet.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/query/EmptyResultSet.java
deleted file mode 100644
index 26a1c76..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/query/EmptyResultSet.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 Oracle 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:
- * Oracle - initial API and implementation
- *
- ********************************************************************************/
-
-package org.eclipse.jst.jsf.common.metadata.query;
-
-import java.util.Collections;
-import java.util.List;
-
-/**
- * Implementation of an empty result set
- * <p><b>Provisional API - subject to change</b></p>
- */
-public final class EmptyResultSet implements IResultSet {
- private boolean _isClosed = false;
- public void close() {
- _isClosed = true;
- }
-
- public List getResults() throws MetaDataException{
- if (_isClosed)
- throw new MetaDataException("Resultset is closed"); //$NON-NLS-1$
-
- return Collections.EMPTY_LIST;
- }
-
- public boolean isClosed() {
- return _isClosed;
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/query/IEntityQueryVisitor.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/query/IEntityQueryVisitor.java
deleted file mode 100644
index d5a2780..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/query/IEntityQueryVisitor.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 Oracle 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:
- * Oracle - initial API and implementation
- *
- ********************************************************************************/
-package org.eclipse.jst.jsf.common.metadata.query;
-
-import org.eclipse.jst.jsf.common.metadata.Entity;
-
-/**
- * Entity querying interface
- * <p>NOT to implemented by clients directly. Clients should subclass AbstractEntityQueryVisitor instead.
- * <p><b>Provisional API - subject to change</b></p>
- */
-public interface IEntityQueryVisitor extends IEntityVisitor{
- /**
- * @param initialEntityContext
- * @param entityKey to find relative to the passed intialEntityContext
- * @return IResultSet of Entities matching the key. IResultSet must NOT be null. Implementers may return {@link EmptyResultSet}.
- */
- public IResultSet<Entity> findEntities(final Entity initialEntityContext,
- final String entityKey);
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/query/IEntityVisitor.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/query/IEntityVisitor.java
deleted file mode 100644
index fcc1783..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/query/IEntityVisitor.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 Oracle 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:
- * Oracle - initial API and implementation
- *
- ********************************************************************************/
-package org.eclipse.jst.jsf.common.metadata.query;
-
-import org.eclipse.jst.jsf.common.metadata.Entity;
-
-/**
- * Visitor interface for Entities
- * <p>NOT to implemented by clients directly. Clients should subclass AbstractEntityVisitor instead.
- * <p><b>Provisional API - subject to change</b></p>
- */
-public interface IEntityVisitor extends IMetaDataVisitor {
- /**
- * Visit the entity.
- * The entity and then it's children are visited
- * @param entity - must not be NULL
- */
- public void visit(final Entity entity);
- /**
- * Signal that the entity and all it's children is now completely 'visited'.
- * The entity will call this method at the end of the accept method.
- * @param entity - must not be NULL
- */
- public void visitCompleted(Entity entity);
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/query/IMetaDataModelContext.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/query/IMetaDataModelContext.java
deleted file mode 100644
index 3ffb574..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/query/IMetaDataModelContext.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 Oracle 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:
- * Oracle - initial API and implementation
- *
- ********************************************************************************/
-package org.eclipse.jst.jsf.common.metadata.query;
-
-import org.eclipse.jst.jsf.context.IModelContext;
-
-/**
- * <p><b>Provisional API - subject to change</b></p>
- * @deprecated - Helios
- */
-public interface IMetaDataModelContext extends IModelContext {
- /**
- * @return domain identifier for this context.
- * <p>This must match the domain id from the org.eclipse.jst.jsf.common.DomainLoadingStrategies
- */
- public String getDomainID();
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/query/IMetaDataVisitor.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/query/IMetaDataVisitor.java
deleted file mode 100644
index 35a3652..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/query/IMetaDataVisitor.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 Oracle 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:
- * Oracle - initial API and implementation
- *
- ********************************************************************************/
-package org.eclipse.jst.jsf.common.metadata.query;
-
-/**
- * Common interface for Entity and Trait visitors
- * <p>NOT to implemented by clients directly. Clients should subclass AbstractMetaDataVisitor instead.
- * <p><b>Provisional API - subject to change</b></p>
- */
-public interface IMetaDataVisitor {
- /**
- * @return true if visitor has recognized that visiting should stop
- */
- public boolean stopVisiting();
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/query/IResultSet.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/query/IResultSet.java
deleted file mode 100644
index 591fdd7..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/query/IResultSet.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 Oracle 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:
- * Oracle - initial API and implementation
- *
- ********************************************************************************/
-package org.eclipse.jst.jsf.common.metadata.query;
-
-import java.util.List;
-
-
-
-/**
- * Results from a metadata query. The resultset should be considered valid only at the time that the query is performed.
- * Once "closed", the resultset should not be accessed again.
- *
- * <p>Not intended to be implemented directly by clients. Developers should extend {@link AbstractResultSet} instead.
- * <p><b>Provisional API - subject to change</b></p>
- * @param <T>
- */
-public interface IResultSet<T> {
-
- /**
- * @return unmodifiable List of results. May NOT be null. Implementer must return Collections.EMPTY_LIST instead.
- * @throws MetaDataException
- */
- public List<T> getResults() throws MetaDataException;
-
- /**
- * Signal that the query results are no longer required allowing for any cleanup that may be required
- * Once a resultset is closed, a MetaDataException should be thrown if the next() or hasNext() is called. Clients can check isClosed() first.
- * @throws MetaDataException
- */
- public void close() throws MetaDataException;
-
- /**
- * @return true if this resultset has been closed.
- */
- public boolean isClosed();
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/query/ITaglibDomainMetaDataModelContext.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/query/ITaglibDomainMetaDataModelContext.java
deleted file mode 100644
index f5962e7..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/query/ITaglibDomainMetaDataModelContext.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 Oracle 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:
- * Oracle - initial API and implementation
- *
- ********************************************************************************/
-package org.eclipse.jst.jsf.common.metadata.query;
-
-import org.eclipse.core.resources.IProject;
-
-/**
- * Context for determining the Model to locate in the MetaDataManager
- * <p>Should NOT be implemented by clients
- * <p><b>Provisional API - subject to change</b></p>
- * @deprecated - Helios
- */
-public interface ITaglibDomainMetaDataModelContext extends IMetaDataModelContext {
- /**
- * @return project
- */
- public IProject getProject();
- /**
- * @return the namespace URI as String
- */
- public String getURI();
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/query/ITraitQueryVisitor.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/query/ITraitQueryVisitor.java
deleted file mode 100644
index a8631f9..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/query/ITraitQueryVisitor.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 Oracle 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:
- * Oracle - initial API and implementation
- *
- ********************************************************************************/
-package org.eclipse.jst.jsf.common.metadata.query;
-
-import org.eclipse.jst.jsf.common.metadata.Entity;
-import org.eclipse.jst.jsf.common.metadata.Trait;
-
-/**
- * Trait querying interface
- * <p>NOT to implemented by clients directly. Clients should subclass AbstractTraitQueryVisitor instead.
- * <p><b>Provisional API - subject to change</b></p>
- */
-public interface ITraitQueryVisitor extends ITraitVisitor{
- /**
- * @param entity
- * @param traitKey
- * @return IResultSet of Traits. IResultSet must NOT be null. Implementers may return {@link EmptyResultSet}.
- */
- public IResultSet<Trait> findTraits(final Entity entity,
- final String traitKey);
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/query/ITraitVisitor.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/query/ITraitVisitor.java
deleted file mode 100644
index 9b39a10..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/query/ITraitVisitor.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 Oracle 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:
- * Oracle - initial API and implementation
- *
- ********************************************************************************/
-package org.eclipse.jst.jsf.common.metadata.query;
-
-import org.eclipse.jst.jsf.common.metadata.Trait;
-
-/**
- * Visitor interface for Traits
- * <p>NOT to implemented by clients directly. Clients should subclass AbstractTraitVisitor instead.
- * <p><b>Provisional API - subject to change</b></p>
- */
-public interface ITraitVisitor extends IMetaDataVisitor {
- /**
- * Visit the Trait.
- * Implementer cannot assume ordering of trait visiting.
- * @param trait - must not be null
- */
- public void visit(final Trait trait);
-
- /**
- * Signal that the the trait has been completely visited
- * @param trait
- */
- public void visitCompleted(final Trait trait);
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/query/MetaDataException.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/query/MetaDataException.java
deleted file mode 100644
index 50b314f..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/query/MetaDataException.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 Oracle 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:
- * Oracle - initial API and implementation
- *
- ********************************************************************************/
-
-package org.eclipse.jst.jsf.common.metadata.query;
-
-/**
- * Exception intended to be superclass of all exceptions thrown while handling metadata during query
- * <p><b>Provisional API - subject to change</b></p>
- */
-public class MetaDataException extends Exception {
-
- /**
- *
- */
- private static final long serialVersionUID = 1L;
-
- /**
- * Constructor
- */
- public MetaDataException(){
- super();
- }
- /**
- * Constructor
- * @param msg
- */
- public MetaDataException(String msg){
- super(msg);
- }
-
- /**
- * Constructor
- * @param msg
- * @param cause
- */
- public MetaDataException(String msg, Throwable cause){
- super(msg, cause);
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/query/TaglibDomainMetaDataQueryHelper.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/query/TaglibDomainMetaDataQueryHelper.java
deleted file mode 100644
index 16e579f..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/query/TaglibDomainMetaDataQueryHelper.java
+++ /dev/null
@@ -1,270 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 Oracle 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:
- * Oracle - initial API and implementation
- *
- ********************************************************************************/
-package org.eclipse.jst.jsf.common.metadata.query;
-
-import javax.xml.namespace.QName;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.Assert;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jst.jsf.common.JSFCommonPlugin;
-import org.eclipse.jst.jsf.common.metadata.Entity;
-import org.eclipse.jst.jsf.common.metadata.Model;
-import org.eclipse.jst.jsf.common.metadata.Trait;
-import org.eclipse.jst.jsf.common.metadata.internal.IMetaDataModelContext;
-import org.eclipse.jst.jsf.common.metadata.internal.IMetaDataModelManager;
-import org.eclipse.jst.jsf.common.metadata.internal.MetaDataModelManagerFactory;
-import org.eclipse.jst.jsf.common.metadata.internal.ModelKeyDescriptor;
-import org.eclipse.jst.jsf.common.metadata.internal.TaglibDomainMetaDataModelContextImpl;
-import org.eclipse.jst.jsf.common.metadata.query.internal.HierarchicalSearchControl;
-import org.eclipse.jst.jsf.common.metadata.query.internal.SimpleEntityQueryVisitorImpl;
-import org.eclipse.jst.jsf.common.metadata.query.internal.SimpleTraitQueryVisitorImpl;
-
-
-/**
- * Helper class with static methods to simplify querying of a metadata model.
- *
- * <p>Steps for use:
- * <br>1) Get the ITaglibDomainMetaDataModelContext using createMetaDataModelContext or createTagLibraryDomainMetaDataModelContext
- * <br>2) Use appropriate getXXX methods using the ITaglibDomainMetaDataModelContext.
- * <p><b>Provisional API - subject to change</b></p>
- *
- * @deprecated - Helios <p>
- * use ITaglibMetaDataQuery:<p>
- * <code>
- * IMetaDataDomainContext context = MetaDataQueryContextFactory.getInstance().createTaglibDomainModelContext(project);<br/>
- * ITaglibMetaDataQuery query = MetaDataQueryFactory.getInstance().createQuery(context);
- * </code>
- * <p>
- * @see IResultSet
- * @see IEntityQueryVisitor
- * @see ITraitQueryVisitor
- * @see ITaglibDomainMetaDataModelContext
- * @see Model
- * @see Entity
- * @see Trait
- *
-
- */
-public final class TaglibDomainMetaDataQueryHelper{
- /**
- * Domain id for Tag library domain of metatdata
- */
- public static final String TAGLIB_DOMAIN = "TagLibraryDomain"; //need better place for this //$NON-NLS-1$
-
- /**
- * private constructor
- */
- private TaglibDomainMetaDataQueryHelper (){
- super();
- }
-
- /**
- * Convenience method for creating {@link ITaglibDomainMetaDataModelContext}s for TAGLIB_DOMAIN
- * @param project
- * @param uri
- * @return ITaglibDomainMetaDataModelContext
- */
- public static ITaglibDomainMetaDataModelContext createMetaDataModelContext(IProject project, String uri){
- return new TaglibDomainMetaDataModelContextImpl(TAGLIB_DOMAIN, project, uri);
- }
- /**
- * @param modelContext
- * @return Model object for given context. May return null if not located.
- */
- public static Model getModel(final ITaglibDomainMetaDataModelContext modelContext) {
-// MetaDataModel model = getMDModel(modelContext);
-// //we may want to throw error that model is empty
-// if (model != null && !model.isEmpty()){
-// return (Model)model.getRoot();
-// }
- return getMDModel(modelContext);
- }
-
- /**
- * @param modelContext
- * @param entityKey relative to root of the model
- * @return the first entity match from the root of the model. May return null.
- */
- public static Entity getEntity(final ITaglibDomainMetaDataModelContext modelContext,
- final String entityKey) {
- IEntityQueryVisitor visitor = new SimpleEntityQueryVisitorImpl(new HierarchicalSearchControl(1, HierarchicalSearchControl.SCOPE_ALL_LEVELS));
- IResultSet/*<Entity>*/ rs = getEntities(modelContext,entityKey, visitor);
- Entity e = null;
- try {
- if (! rs.getResults().isEmpty()){
- e = (Entity)rs.getResults().get(0);
- }
- rs.close();
- } catch (MetaDataException ex) {
- JSFCommonPlugin.log(IStatus.ERROR, "Error in Helper.getEntity() - 1", ex); //$NON-NLS-1$
- }
-
- return e;
- }
-
- /**
- * @param modelContext
- * @param entityKey relative to root of model
- * @param visitor
- * @return an IResultSet of entity objects
- */
- public static IResultSet/*<Entity>*/ getEntities(final ITaglibDomainMetaDataModelContext modelContext,
- final String entityKey, final IEntityQueryVisitor visitor){
- Model model = getModel(modelContext);
- //we may want to throw error that model is empty
- return getEntities(model, entityKey, visitor);
-
- }
-
- /**
- * @param entity
- * @param traitKey
- * @return a trait or null for the given entity and traitKey using a SimpleEntityQueryVisitorImpl
- */
- public static Trait getTrait(final Entity entity, final String traitKey){
- ITraitQueryVisitor visitor = new SimpleTraitQueryVisitorImpl();
- Trait t= null;
- IResultSet/*<Trait>*/ rs = getTraits(entity, traitKey, visitor);
- try {
- if (! rs.getResults().isEmpty()){
- t = (Trait)rs.getResults().get(0);
- }
- rs.close();
- } catch (MetaDataException ex) {
- JSFCommonPlugin.log(IStatus.ERROR, "Error in Helper.getTrait()", ex); //$NON-NLS-1$
- }
-
- return t;
- }
-
- /**
- * @param entity
- * @param traitKey
- * @param traitQueryVisitor
- * @return an IResultSet of trait objects using supplied traitQueryVisitor. IResultSet should NOT be null.
- */
- public static IResultSet/*<Trait>*/ getTraits(Entity entity, String traitKey,
- ITraitQueryVisitor traitQueryVisitor) {
- IResultSet/*<Trait>*/ rs = traitQueryVisitor.findTraits(entity, traitKey);
- return rs;
- }
-
- /**
- * @param initialEntityContext
- * @param entityKey relative to initial passed entity
- * @return the first entity located by key using SimpleEntityQueryVisitorImpl
- */
- public static Entity getEntity(Entity initialEntityContext, String entityKey) {
- IEntityQueryVisitor visitor = new SimpleEntityQueryVisitorImpl(new HierarchicalSearchControl(1, HierarchicalSearchControl.SCOPE_ALL_LEVELS));
- Entity e= null;
- IResultSet/*<Entity>*/ rs = getEntities(initialEntityContext, entityKey, visitor);
- try {
- if (! rs.getResults().isEmpty()){
- e = (Entity)rs.getResults().get(0);
- }
- rs.close();
- } catch (MetaDataException ex) {
- JSFCommonPlugin.log(IStatus.ERROR, "Error in Helper.getEntity() - 0", ex); //$NON-NLS-1$
- }
-
- return e;
- }
-
- /**
- * @param initialEntityContext
- * @param entityQuery relative to initial passed entity
- * @param entityKeyQueryVisitor
- * @return IResultSet of entities located by key using entityQueryVisitor. IResultSet should NOT be null.
- */
- public static IResultSet/*<Entity>*/ getEntities(Entity initialEntityContext, String entityQuery,
- IEntityQueryVisitor entityKeyQueryVisitor) {
-
- return entityKeyQueryVisitor.findEntities(initialEntityContext, entityQuery);
- }
-
-
- /**
- * Retrieve the MetaDataModel from the ModelManager for given key
- * @param modelContext
- * @return Model
- */
- private static Model getMDModel(final ITaglibDomainMetaDataModelContext modelContext){
- final IMetaDataModelContext context = getContextAdapter(modelContext);
- final IMetaDataModelManager mgr = MetaDataModelManagerFactory.getMetaDataModelManagerInstance(modelContext.getProject());
- if (mgr != null)
- return mgr.getModel(context);
-
-// MetaDataModelManager mgr = null;
-// if (modelContext.getProject() != null)
-// mgr = MetaDataModelManager.getInstance(modelContext.getProject());
-// else //temp(?)
-// mgr = MetaDataModelManager.getSharedInstance();
-//
-// if (mgr != null)
-// return mgr.getModel(modelContext);
-
- return null;
- }
-
- private static IMetaDataModelContext getContextAdapter(
- final ITaglibDomainMetaDataModelContext modelContext) {
- return new IMetaDataModelContext() {
-
- public Object getAdapter(Class adapter) {
- if (adapter == IProject.class)
- return getProject();
- else if (adapter == ModelKeyDescriptor.class)
- return new ModelKeyDescriptor(modelContext.getProject(), modelContext.getDomainID(), modelContext.getURI());
- return null;
- }
-
- public String getDomainId() {
- return modelContext.getDomainID();
- }
-
- public IProject getProject() {
- return modelContext.getProject();
- }
-
- public String getModelIdentifier() {
- //doing below for "fixing" the jsp11 uri
- return ((ModelKeyDescriptor)getAdapter(ModelKeyDescriptor.class)).getUri();
- }
- };
- }
-
- /**
- * @param modelContext
- * @param entityKey
- * @param traitKey
- * @return first trait found for entity and trait key starting from root of the model using SimpleMetaDataQueryImpl
- */
- public static Trait getTrait(final ITaglibDomainMetaDataModelContext modelContext,
- final String entityKey, final String traitKey) {
- Entity entity = getEntity(modelContext, entityKey);
- Trait t = null;
- if (entity != null){
- t = getTrait(entity, traitKey);
- }
- return t;
- }
-
- /**
- * @param tagEntity
- * @return QName for tag entity
- */
- public static QName getQNameForTagEntity(Entity tagEntity) {
- Assert.isTrue(tagEntity != null);
- return new QName(tagEntity.getModel().getCurrentModelContext().getUri(), tagEntity.getId());
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/query/internal/AbstractMetaDataDomainQueryFactory.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/query/internal/AbstractMetaDataDomainQueryFactory.java
deleted file mode 100644
index 630846a..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/query/internal/AbstractMetaDataDomainQueryFactory.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Oracle Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Oracle Corporation - initial API and implementation and/or initial documentation
- *******************************************************************************/
-
-package org.eclipse.jst.jsf.common.metadata.query.internal;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jst.jsf.common.metadata.internal.IMetaDataDomainContext;
-import org.eclipse.jst.jsf.common.metadata.internal.IMetaDataDomainQueryFactory;
-import org.eclipse.jst.jsf.common.metadata.internal.IMetaDataModelManager;
-import org.eclipse.jst.jsf.common.metadata.internal.MetaDataModelManagerFactory;
-
-/**
- * Abstract query factory for a domain of metadata that all implementers of
- * {@link IMetaDataDomainQueryFactory} must extend
- *
- */
-public abstract class AbstractMetaDataDomainQueryFactory implements
- IMetaDataDomainQueryFactory {
-
- private final String _domainId;
-
- /**
- * Constructor
- * @param domainId
- */
- public AbstractMetaDataDomainQueryFactory(final String domainId) {
- _domainId = domainId;
- }
-
- public final String getDomainIdentifier() {
- return _domainId;
- }
-
- /**
- * @param context
- * @return IMetaDataModelManager
- */
- protected IMetaDataModelManager getManager(final IMetaDataDomainContext context) {
- final IProject project = (IProject) context.getAdapter(IProject.class);
- return MetaDataModelManagerFactory.getMetaDataModelManagerInstance(project);
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/query/internal/AbstractMetaDataQuery.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/query/internal/AbstractMetaDataQuery.java
deleted file mode 100644
index 32f8ca4..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/query/internal/AbstractMetaDataQuery.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Oracle Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Oracle Corporation - initial API and implementation and/or initial documentation
- *******************************************************************************/
-
-package org.eclipse.jst.jsf.common.metadata.query.internal;
-
-import org.eclipse.jst.jsf.common.metadata.internal.IMetaDataDomainContext;
-import org.eclipse.jst.jsf.common.metadata.internal.IMetaDataModelManager;
-
-
-/**
- * Abstract {@link IMetaDataQuery} that all implementers must extend.
- * <p>
- * Provides a default {@link IMetaDataQueryHelper} that can be overridden.
- */
-public abstract class AbstractMetaDataQuery implements IMetaDataQuery{
-
- private final IMetaDataModelManager _manager;
- private final IMetaDataDomainContext _managerContext;
- private IMetaDataQueryHelper _helper;
-
- /**
- * @param manager
- * @param managerContext
- */
- public AbstractMetaDataQuery(final IMetaDataModelManager manager, final IMetaDataDomainContext managerContext) {
- _manager = manager;
- _managerContext = managerContext;
- }
-
- public IMetaDataQueryHelper getQueryHelper() {
- if (_helper == null) {
- _helper = new MetaDataQueryHelper(getManager(), getDomainContext());
- }
- return _helper;
- }
-
- public void setQueryHelper(final IMetaDataQueryHelper helper) {
- _helper = helper;
- }
-
- /**
- * NOT API
- * @return IMetaDataModelManager
- */
- public final IMetaDataModelManager getManager() {
- return _manager;
- }
-
- /**
- * NOT API
- * @return IMetaDataModelManagerContext
- */
- public final IMetaDataDomainContext getDomainContext() {
- return _managerContext;
- }
-
- /**
- * Convenience method
- * @return domain id
- */
- protected final String getDomainId() {
- return getDomainContext().getDomainId();
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/query/internal/HierarchicalSearchControl.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/query/internal/HierarchicalSearchControl.java
deleted file mode 100644
index 36d446e..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/query/internal/HierarchicalSearchControl.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 Oracle 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:
- * Oracle - initial API and implementation
- *
- ********************************************************************************/
-
-package org.eclipse.jst.jsf.common.metadata.query.internal;
-
-/**
- * Sets controls on how a tree of nodes can be searched
- */
-public class HierarchicalSearchControl extends SearchControl {
- //scope levels
- /**
- * Do not recurse.
- */
- public static final int SCOPE_CURRENT_LEVEL = 0;
- /**
- * Allow for one level of children to be visited from initial context
- */
- public static final int SCOPE_ONE_LEVEL = 1;
- /**
- * Allow unlimited recursion of children
- */
- public static final int SCOPE_ALL_LEVELS = 2;
-
- private int scope = SCOPE_ALL_LEVELS;
-
- /**
- * Constructor using defaults of COUNT_LIMIT_NONE and SCOPE_ALL_LEVELS
- */
- public HierarchicalSearchControl(){
- super();
- }
- /**
- * Constructor
- * @param countLimit
- * @param scope
- */
- public HierarchicalSearchControl(int countLimit, int scope){
- super(countLimit);
- this.scope = scope;
- }
-
-
- /**
- * @param scope
- */
- public void setScope(int scope){
- this.scope= scope;
- }
-
- /**
- * @return scope
- */
- public int getScope(){
- return scope;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/query/internal/IEntityPredicateMatcher.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/query/internal/IEntityPredicateMatcher.java
deleted file mode 100644
index 2271e7a..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/query/internal/IEntityPredicateMatcher.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Oracle Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Oracle Corporation - initial API and implementation and/or initial documentation
- *******************************************************************************/
-
-package org.eclipse.jst.jsf.common.metadata.query.internal;
-
-import org.eclipse.jst.jsf.common.metadata.Entity;
-
-/**
- * Matches entities
- */
-public interface IEntityPredicateMatcher extends IPredicateMatcher<Entity> {
- /**
- * Signals to matcher that you are moving down the hierarchy by one
- */
- public void pushLevel();
- /**
- * Signals to matcher that you are moving up the hierarchy by one
- */
- public void popLevel();
-
- /**
- * @return the deepest level in the hierarchy that is being matched
- */
- public int getMaxLevel();
-
- /**
- * @return current level being matched in the hierarchy
- */
- public int getCurrentLevel();
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/query/internal/IHierarchicalEntityVisitor.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/query/internal/IHierarchicalEntityVisitor.java
deleted file mode 100644
index b91fd9e..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/query/internal/IHierarchicalEntityVisitor.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package org.eclipse.jst.jsf.common.metadata.query.internal;
-
-import org.eclipse.jst.jsf.common.metadata.Entity;
-import org.eclipse.jst.jsf.common.metadata.query.IEntityVisitor;
-
-/**
- * Provides the necessary hierarchical visitor interface methods to
- * provide conditional navigation of the entity hierarchy
- *
- */
-public interface IHierarchicalEntityVisitor extends IEntityVisitor {
- /**
- * @param entity
- * @return true if children should be traversed
- */
- boolean visitEnter(Entity entity);
- /**
- * @param entity
- * @return true when coming out of a branch
- */
- boolean visitLeave(Entity entity);
-
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/query/internal/IMetaDataModelManagerContext.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/query/internal/IMetaDataModelManagerContext.java
deleted file mode 100644
index 737625e..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/query/internal/IMetaDataModelManagerContext.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package org.eclipse.jst.jsf.common.metadata.query.internal;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jst.jsf.common.metadata.internal.IMetaDataDomainContext;
-
-/**
- * Context for the meta data model manager
- *
- */
-public interface IMetaDataModelManagerContext extends IMetaDataDomainContext {
- /**
- * @return project - may be null
- */
- public IProject getProject();
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/query/internal/IMetaDataQuery.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/query/internal/IMetaDataQuery.java
deleted file mode 100644
index b650613..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/query/internal/IMetaDataQuery.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Oracle Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Oracle Corporation - initial API and implementation and/or initial documentation
- *******************************************************************************/
-
-package org.eclipse.jst.jsf.common.metadata.query.internal;
-
-/**
- * Interface to be used when querying metadata
- * <p>
- * @noextend
- * @noimplement
- */
-public interface IMetaDataQuery {
- /**
- * @return {@link IMetaDataQueryHelper}
- */
- public IMetaDataQueryHelper getQueryHelper();
-
- /**
- * @param helper
- */
- public void setQueryHelper(final IMetaDataQueryHelper helper);
-
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/query/internal/IMetaDataQueryHelper.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/query/internal/IMetaDataQueryHelper.java
deleted file mode 100644
index 47ca31d..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/query/internal/IMetaDataQueryHelper.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Oracle Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Oracle Corporation - initial API and implementation and/or initial documentation
- *******************************************************************************/
-
-package org.eclipse.jst.jsf.common.metadata.query.internal;
-
-import org.eclipse.jst.jsf.common.metadata.Entity;
-import org.eclipse.jst.jsf.common.metadata.Model;
-import org.eclipse.jst.jsf.common.metadata.Trait;
-import org.eclipse.jst.jsf.common.metadata.query.IEntityQueryVisitor;
-import org.eclipse.jst.jsf.common.metadata.query.IResultSet;
-import org.eclipse.jst.jsf.common.metadata.query.ITraitQueryVisitor;
-
-/**
- * Interface for accessing 'raw' meta data query capabilities.
- * <p>
- * May be subclassed, but implementers must extend {@link MetaDataQueryHelper}
- *
- */
-public interface IMetaDataQueryHelper {
-
- /**
- * @param modelId
- * @return Model object for given context. May return null if not located.
- */
- public Model getModel(final String modelId);
-
- /**
- * @param modelId
- * @param entityKey relative to root of the model
- * @return the first entity match from the root of the model. May return null.
- */
- public Entity getEntity(final String modelId,
- final String entityKey);
-
- /**
- * @param modelId
- * @param entityKey relative to root of model
- * @param visitor
- * @return an IResultSet of entity objects
- */
- public IResultSet<Entity> getEntities(
- final String modelId, final String entityKey,
- final IEntityQueryVisitor visitor);
-
- /**
- * @param entity
- * @param traitKey
- * @return a trait or null for the given entity and traitKey using a SimpleEntityQueryVisitorImpl
- */
- public Trait getTrait(final Entity entity, final String traitKey);
-
- /**
- * @param entity
- * @param traitKey
- * @param traitQueryVisitor
- * @return an IResultSet of trait objects using supplied traitQueryVisitor. IResultSet should NOT be null.
- */
- public IResultSet<Trait> getTraits(Entity entity, String traitKey,
- ITraitQueryVisitor traitQueryVisitor);
-
- /**
- * @param initialEntityContext
- * @param entityKey relative to initial passed entity
- * @return the first entity located by key using SimpleEntityQueryVisitorImpl
- */
- public Entity getEntity(Entity initialEntityContext, String entityKey);
-
- /**
- * @param initialEntityContext
- * @param entityQuery relative to initial passed entity
- * @param entityKeyQueryVisitor
- * @return IResultSet of entities located by key using entityQueryVisitor. IResultSet should NOT be null.
- */
- public IResultSet<Entity> getEntities(Entity initialEntityContext,
- String entityQuery, IEntityQueryVisitor entityKeyQueryVisitor);
-
- /**
- * @param modelId
- * @param entityKey
- * @param traitKey
- * @return first trait found for entity and trait key starting from root of the model using SimpleMetaDataQueryImpl
- */
- public Trait getTrait(final String modelId,
- final String entityKey, final String traitKey);
-
- /**
- * @param <T>
- * @param results
- * @return first <T> from result set. May return null.
- */
- public <T> T getFirstFromResultSet(final IResultSet<T> results);
-// /**
-// * @param tagEntity
-// * @return QName for entity
-// */
-// public QName getQNameForEntity(final Entity tagEntity);
-
-}
\ No newline at end of file
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/query/internal/IPredicateMatcher.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/query/internal/IPredicateMatcher.java
deleted file mode 100644
index 61572fc..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/query/internal/IPredicateMatcher.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Oracle Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Oracle Corporation - initial API and implementation and/or initial documentation
- *******************************************************************************/
-
-package org.eclipse.jst.jsf.common.metadata.query.internal;
-
-/**
- * Matches predicates
- *
- * @param <T>
- */
-public interface IPredicateMatcher<T> {
- /**
- * @param object
- * @return MATCH
- */
- public MATCH matches(T object);
-
- /**
- * Reset the matcher should it be ca
- */
- public void reset();
- /**
- * Enumeration of match results
- *
- */
- public enum MATCH {
- /**
- * Does not match
- */
- NOT,
- /**
- * Partial match thru the hierarchy... continue
- */
- PARTIALLY,
- /**
- * Full match - leaf most predicate satisfied
- */
- FULLY;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/query/internal/IPredicateMatcherFactory.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/query/internal/IPredicateMatcherFactory.java
deleted file mode 100644
index 4e017de..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/query/internal/IPredicateMatcherFactory.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Oracle Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Oracle Corporation - initial API and implementation and/or initial documentation
- *******************************************************************************/
-
-package org.eclipse.jst.jsf.common.metadata.query.internal;
-
-import org.eclipse.core.runtime.IAdaptable;
-
-/**
- * Factory for producing {@link IPredicateMatcher}s
- *
- */
-public interface IPredicateMatcherFactory extends IAdaptable {
- //marker interface
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/query/internal/IQuerySpec.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/query/internal/IQuerySpec.java
deleted file mode 100644
index c9183e9..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/query/internal/IQuerySpec.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Oracle Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Oracle Corporation - initial API and implementation and/or initial documentation
- *******************************************************************************/
-
-package org.eclipse.jst.jsf.common.metadata.query.internal;
-
-/**
- * Interface for specifying the key for querying
- * <p>
- * @noimplement
- */
-public interface IQuerySpec {
-
- /**
- * @return key
- */
- public Key getKey();
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/query/internal/ITraitPredicateMatcher.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/query/internal/ITraitPredicateMatcher.java
deleted file mode 100644
index b0b77d0..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/query/internal/ITraitPredicateMatcher.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Oracle Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Oracle Corporation - initial API and implementation and/or initial documentation
- *******************************************************************************/
-
-package org.eclipse.jst.jsf.common.metadata.query.internal;
-
-import org.eclipse.jst.jsf.common.metadata.Trait;
-
-/**
- * Matches entities using TraitQuerySpec
- *
- */
-public interface ITraitPredicateMatcher {
- /**
- * @param trait
- * @return true if matched
- */
- public boolean matches (final Trait trait);
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/query/internal/InvalidQuerySpecificationException.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/query/internal/InvalidQuerySpecificationException.java
deleted file mode 100644
index 49a693c..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/query/internal/InvalidQuerySpecificationException.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Oracle Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Oracle Corporation - initial API and implementation and/or initial documentation
- *******************************************************************************/
-
-package org.eclipse.jst.jsf.common.metadata.query.internal;
-
-/**
- * Thrown when query specification does not meet the criteria for the domain or the query
- *
- */
-public class InvalidQuerySpecificationException extends Exception {
- /**
- * serializaion id
- */
- private static final long serialVersionUID = -2835106570357619405L;
-
- /**
- * @param message
- */
- public InvalidQuerySpecificationException(final String message) {
- super(message);
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/query/internal/Key.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/query/internal/Key.java
deleted file mode 100644
index 367592a..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/query/internal/Key.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Oracle Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Oracle Corporation - initial API and implementation and/or initial documentation
- *******************************************************************************/
-
-package org.eclipse.jst.jsf.common.metadata.query.internal;
-
-import org.eclipse.jst.jsf.context.IModelContext;
-
-/**
- * Abstract class defining a metadata filter
- */
-public abstract class Key implements IModelContext{
- //
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/query/internal/MetaDataDomainContext.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/query/internal/MetaDataDomainContext.java
deleted file mode 100644
index 8b75bb8..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/query/internal/MetaDataDomainContext.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Oracle Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Oracle Corporation - initial API and implementation and/or initial documentation
- *******************************************************************************/
-
-package org.eclipse.jst.jsf.common.metadata.query.internal;
-
-import org.eclipse.jst.jsf.common.metadata.internal.IMetaDataDomainContext;
-
-/**
- * Implements {@link IMetaDataDomainContext}
- *
- */
-public class MetaDataDomainContext implements IMetaDataDomainContext {
-
- private final String _domainId;
-
- /**
- * Constructor
- * @param domainId
- */
- public MetaDataDomainContext(final String domainId) {
- _domainId = domainId;
- }
- public Object getAdapter(final Class adapter) {
- return null;
- }
-
- public final String getDomainId() {
- return _domainId;
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/query/internal/MetaDataQueryContextFactory.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/query/internal/MetaDataQueryContextFactory.java
deleted file mode 100644
index 265a6e4..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/query/internal/MetaDataQueryContextFactory.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Oracle Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Oracle Corporation - initial API and implementation and/or initial documentation
- *******************************************************************************/
-
-package org.eclipse.jst.jsf.common.metadata.query.internal;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jst.jsf.common.metadata.Trait;
-import org.eclipse.jst.jsf.common.metadata.internal.IMetaDataDomainContext;
-import org.eclipse.jst.jsf.common.metadata.query.internal.taglib.ITaglibDomainPredicateMatcherFactory;
-import org.eclipse.jst.jsf.common.metadata.query.internal.taglib.TaglibDomainContextImpl;
-import org.eclipse.jst.jsf.common.metadata.query.internal.taglib.TaglibDomainEntityIdRegexPredicateMatcher;
-import org.eclipse.jst.jsf.common.metadata.query.internal.taglib.TaglibDomainEntityQuerySpec;
-import org.eclipse.jst.jsf.common.metadata.query.internal.taglib.TaglibDomainTraitIdRegexPredicateMatcher;
-import org.eclipse.jst.jsf.common.metadata.query.internal.taglib.TaglibDomainTraitQuerySpec;
-
-/**
- * Factory for producing {@link IMetaDataDomainContext}s and {@link IPredicateMatcherFactory}s
- *
- */
-public final class MetaDataQueryContextFactory {
-
- private static MetaDataQueryContextFactory INSTANCE = new MetaDataQueryContextFactory();
-
- private MetaDataQueryContextFactory(){
- //read registry for query context and matcher factories here... future
- }
-
- /**
- * @return singleton instance of {@link MetaDataQueryContextFactory}
- */
- public static MetaDataQueryContextFactory getInstance() {
- synchronized (INSTANCE) {
- return INSTANCE;
- }
- }
-
- /**
- * Creates a context for querying the tag library domain
- * @param project - must not be null
- * @return ITaglibDomainModelContext
- */
- public IMetaDataDomainContext createTaglibDomainModelContext(final IProject project) {
- assert project != null;
- return new TaglibDomainContextImpl(project);
- }
-
- /**
- * @return {@link ITaglibDomainPredicateMatcherFactory}
- */
- public ITaglibDomainPredicateMatcherFactory getTaglibDomainPredicateMatcherFactory() {
- //currently only produces one kind of factory
- return new TaglibDomainRegexQueryMatcherFactory();
- }
-
- private static class TaglibDomainRegexQueryMatcherFactory implements ITaglibDomainPredicateMatcherFactory {
-
- public TaglibDomainEntityIdRegexPredicateMatcher createTagLibraryModelMatcher(final String uri) {
- return new TaglibDomainEntityIdRegexPredicateMatcher(new TaglibDomainEntityQuerySpec(uri));
- }
-
- public TaglibDomainEntityIdRegexPredicateMatcher createTagEntityMatcher(final String uri,
- final String tagName) {
- return new TaglibDomainEntityIdRegexPredicateMatcher(new TaglibDomainEntityQuerySpec(uri, tagName));
- }
-
- public TaglibDomainEntityIdRegexPredicateMatcher createTagAttributeEntityMatcher(final String uri,
- final String tagName, final String tagAttributeName) {
- return new TaglibDomainEntityIdRegexPredicateMatcher(new TaglibDomainEntityQuerySpec(uri, tagName, tagAttributeName));
- }
-
- public IPredicateMatcher<Trait> createTraitMatcher(final String traitId) {
- return new TaglibDomainTraitIdRegexPredicateMatcher(new TaglibDomainTraitQuerySpec(traitId));
- }
-
- public Object getAdapter(final Class adapter) {
- return null;
- }
-
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/query/internal/MetaDataQueryFactory.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/query/internal/MetaDataQueryFactory.java
deleted file mode 100644
index 4b9c168..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/query/internal/MetaDataQueryFactory.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Oracle Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Oracle Corporation - initial API and implementation and/or initial documentation
- *******************************************************************************/
-
-package org.eclipse.jst.jsf.common.metadata.query.internal;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jst.jsf.common.JSFCommonPlugin;
-import org.eclipse.jst.jsf.common.internal.pde.AbstractSimpleClassExtensionRegistryReader;
-import org.eclipse.jst.jsf.common.metadata.internal.IMetaDataDomainContext;
-import org.eclipse.jst.jsf.common.metadata.internal.IMetaDataDomainQueryFactory;
-
-/**
- * Entry point for querying metadata. Delegates query creation to the domainQueryFactory registered for the domain.
- * <p>
- * Usage Ex.:
- * IMetaDataDomainContext context = MetaDataQueryContextFactory.getInstance().createTaglibDomainContext(project, uri);
- * ITaglibMetaDataQuery query = MetaDataQueryFactory.getInstance().createQuery(context);
- */
-public final class MetaDataQueryFactory {
- private static MetaDataQueryFactory INSTANCE = new MetaDataQueryFactory();
- private static DomainQueryFactoryReader DOMAIN_FACTORY_READER = new DomainQueryFactoryReader();
- /**
- * @return the singleton instance of the MetaDataQueryFactory
- */
- public static MetaDataQueryFactory getInstance() {
- synchronized(INSTANCE) {
- return INSTANCE;
- }
- }
-
- private MetaDataQueryFactory() {
- //
- }
-
- /**
- * Create a query for against a domain of metadata that has no project context.
- * <p>
- * This is the same as calling createQuery(String domainId, IProject project) with project == null.
- * @param <T>
- * @param context
- * @return {@link IMetaDataQuery}
- */
- public <T extends IMetaDataQuery> T createQuery(final IMetaDataDomainContext context) {
- //given domain id, get the query factory
- final IMetaDataDomainQueryFactory factory = DOMAIN_FACTORY_READER.getFactoryFor(context.getDomainId());
- if (factory != null)
- return (T)factory.createQuery(context);
-
- JSFCommonPlugin.log(new UnsupportedOperationException(), "Unknown query factory for domain id: "+context.getDomainId()); //$NON-NLS-1$
- return null;
- }
-
- private static class DomainQueryFactoryReader
- extends
- AbstractSimpleClassExtensionRegistryReader<IMetaDataDomainQueryFactory> {
-
- private static final String EXT_PT_ID = "domainQueryFactory"; //$NON-NLS-1$
- private static final String EXT_PT_ELEMENT = "factory"; //$NON-NLS-1$
- private static final String EXT_PT_ATTR = "class"; //$NON-NLS-1$
-
- /**
- * Constructor
- */
- protected DomainQueryFactoryReader() {
- super(JSFCommonPlugin.PLUGIN_ID,
- EXT_PT_ID, EXT_PT_ELEMENT, EXT_PT_ATTR,
- new CompareOrgEclipseJstContributorsLastComparator<IMetaDataDomainQueryFactory>()
- );
- }
-
- @Override
- protected void handleLoadFailure(final CoreException ce) {
- JSFCommonPlugin.log(ce,
- "Error loading IMetaDataDomainQueryFactory from extension"); //$NON-NLS-1$
-
- }
-
- public IMetaDataDomainQueryFactory getFactoryFor(final String domainId) {
- for (final IMetaDataDomainQueryFactory factory : getExtensions()) {
- if (factory.getDomainIdentifier().equals(domainId)){
- return factory;
- }
- }
- return null;
- }
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/query/internal/MetaDataQueryHelper.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/query/internal/MetaDataQueryHelper.java
deleted file mode 100644
index eb09aa9..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/query/internal/MetaDataQueryHelper.java
+++ /dev/null
@@ -1,143 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2010 Oracle 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:
- * Oracle - initial API and implementation
- *
- ********************************************************************************/
-package org.eclipse.jst.jsf.common.metadata.query.internal;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jst.jsf.common.JSFCommonPlugin;
-import org.eclipse.jst.jsf.common.metadata.Entity;
-import org.eclipse.jst.jsf.common.metadata.Model;
-import org.eclipse.jst.jsf.common.metadata.Trait;
-import org.eclipse.jst.jsf.common.metadata.internal.IMetaDataDomainContext;
-import org.eclipse.jst.jsf.common.metadata.internal.IMetaDataModelContext;
-import org.eclipse.jst.jsf.common.metadata.internal.IMetaDataModelManager;
-import org.eclipse.jst.jsf.common.metadata.internal.MetaDataModelContext;
-import org.eclipse.jst.jsf.common.metadata.query.IEntityQueryVisitor;
-import org.eclipse.jst.jsf.common.metadata.query.IResultSet;
-import org.eclipse.jst.jsf.common.metadata.query.ITraitQueryVisitor;
-import org.eclipse.jst.jsf.common.metadata.query.MetaDataException;
-
-
-/**
- * Helper class with static methods to simplify querying of a metadata model.
- *
- * @see IResultSet
- * @see IEntityQueryVisitor
- * @see ITraitQueryVisitor
- * @see Model
- * @see Entity
- * @see Trait
- * <p>
- * May be subclassed.
- *
- */
-public class MetaDataQueryHelper implements IMetaDataQueryHelper{
-
- private IMetaDataModelManager _manager;
- private IMetaDataDomainContext _managerContext;
-
- /**
- * Constructor
- * @param manager
- * @param managerContext
- */
- public MetaDataQueryHelper (final IMetaDataModelManager manager,final IMetaDataDomainContext managerContext){
- _manager = manager;
- _managerContext = managerContext;
- }
-
- public Model getModel(final String modelId) {
- return getMDModel(modelId);
- }
-
- public Entity getEntity(final String modelId, final String entityKey) {
- final IEntityQueryVisitor visitor = new SimpleEntityQueryVisitorImpl(new HierarchicalSearchControl(1, HierarchicalSearchControl.SCOPE_ALL_LEVELS));
- final IResultSet<Entity> rs = getEntities(modelId,entityKey, visitor);
- return getFirstFromResultSet(rs);
- }
-
- public IResultSet<Entity> getEntities(final String modelId, final String entityKey, final IEntityQueryVisitor visitor){
- final Model model = getModel(modelId);
- //we may want to throw error that model is empty
- return getEntities(model, entityKey, visitor);
- }
-
- public Trait getTrait(final Entity entity, final String traitKey){
- final ITraitQueryVisitor visitor = new SimpleTraitQueryVisitorImpl();
- final IResultSet<Trait> rs = getTraits(entity, traitKey, visitor);
- return getFirstFromResultSet(rs);
- }
-
- public IResultSet<Trait> getTraits(final Entity entity, final String traitKey, final ITraitQueryVisitor traitQueryVisitor) {
- final IResultSet<Trait> rs = traitQueryVisitor.findTraits(entity, traitKey);
- return rs;
- }
-
- public Entity getEntity(final Entity initialEntityContext, final String entityKey) {
- final IEntityQueryVisitor visitor = new SimpleEntityQueryVisitorImpl(new HierarchicalSearchControl(1, HierarchicalSearchControl.SCOPE_ALL_LEVELS));
- final IResultSet<Entity> rs = getEntities(initialEntityContext, entityKey, visitor);
- return getFirstFromResultSet(rs);
- }
-
- public IResultSet<Entity> getEntities(final Entity initialEntityContext, final String entityQuery, final IEntityQueryVisitor entityKeyQueryVisitor) {
- return entityKeyQueryVisitor.findEntities(initialEntityContext, entityQuery);
- }
-
- public Trait getTrait(final String modelId, final String entityKey, final String traitKey) {
- final Entity entity = getEntity(modelId, entityKey);
- Trait t = null;
- if (entity != null){
- t = getTrait(entity, traitKey);
- }
- return t;
- }
-
- public <T> T getFirstFromResultSet(final IResultSet<T> results) {
- T result = null;
- try {
- if (! results.getResults().isEmpty()){
- result = results.getResults().get(0);
- }
- results.close();
- } catch (MetaDataException ex) {
- JSFCommonPlugin.log(IStatus.ERROR, "Error in getFirstFromResultSet()", ex); //$NON-NLS-1$
- }
- return result;
- }
-
- /**
- * Retrieve Model from the ModelManager for given key
- * @param modelId
- * @return Model
- */
- private Model getMDModel(final String modelId){
- if (_manager != null)
- return _manager.getModel(getModelContext(modelId));
-
- return null;
- }
-
- /**
- * @param modelId
- * @return IMetaDataModelContext2
- */
- protected IMetaDataModelContext getModelContext(final String modelId) {
- return new MetaDataModelContext((
- IProject)_managerContext.getAdapter(IProject.class),
- _managerContext.getDomainId(),
- modelId);
- }
-// public QName getQNameForEntity(final Entity tagEntity) {
-// Assert.isTrue(tagEntity != null);
-// return new QName(tagEntity.getModel().getId(), tagEntity.getId());
-// }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/query/internal/SearchControl.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/query/internal/SearchControl.java
deleted file mode 100644
index 43e1317..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/query/internal/SearchControl.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 Oracle 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:
- * Oracle - initial API and implementation
- *
- ********************************************************************************/
-package org.eclipse.jst.jsf.common.metadata.query.internal;
-
-/**
- * Simple class used by {@link SimpleEntityQueryVisitorImpl} allowing some control of a metadata query.
- * A query visitor can use this to optimize the query results and signal completion.
- */
-public class SearchControl {
-
- /**
- * No limit on query results
- */
- public static final int COUNT_LIMIT_NONE = -1;
-
- //default settings
- private int countLimit = COUNT_LIMIT_NONE;
-
-
- /**
- * Constructor using defaults of COUNT_LIMIT_NONE
- */
- public SearchControl(){
- //use default settings
- }
-
- /**
- * Constructor
- * @param countLimit
- */
- public SearchControl(int countLimit){
- this.countLimit = countLimit;
- }
-
- /**
- * @param limit results count limit
- */
- public void setCountLimit(int limit){
- this.countLimit = limit;
- }
-
- /**
- * @return query results count limit
- */
- public int getCountLimit(){
- return countLimit;
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/query/internal/SimpleEntityQueryVisitorImpl.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/query/internal/SimpleEntityQueryVisitorImpl.java
deleted file mode 100644
index c67f4e5..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/query/internal/SimpleEntityQueryVisitorImpl.java
+++ /dev/null
@@ -1,205 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 Oracle 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:
- * Oracle - initial API and implementation
- *
- ********************************************************************************/
-package org.eclipse.jst.jsf.common.metadata.query.internal;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.StringTokenizer;
-
-import org.eclipse.jst.jsf.common.metadata.Entity;
-import org.eclipse.jst.jsf.common.metadata.query.AbstractEntityQueryVisitor;
-import org.eclipse.jst.jsf.common.metadata.query.IResultSet;
-
-
-/**
- * A simple metadata query visitor implementing {@link org.eclipse.jst.jsf.common.metadata.query.IEntityQueryVisitor} and {@link org.eclipse.jst.jsf.common.metadata.query.ITraitQueryVisitor}.<p>
- * - simple find entity and traits by id only <br>
- * - does not allow for wild card searchs<br>
- * <p>
- * TODO - fix for case-sensitivity https://bugs.eclipse.org/bugs/show_bug.cgi?id=212794
- *
- */
-public class SimpleEntityQueryVisitorImpl extends AbstractEntityQueryVisitor implements IHierarchicalEntityVisitor {
- private HierarchicalSearchControl control;
- private boolean _stop;
-
- private EntityQueryFilterVisitor entityQuery;
- private List<Entity> _entityResults;
- private Entity initialEntityContext;
-
- /**
- * Constructor that also creates a default SearchControl
- */
- public SimpleEntityQueryVisitorImpl() {
- super();
- control = new HierarchicalSearchControl();
- }
-
- /**
- * Constructor
- * @param control
- */
- public SimpleEntityQueryVisitorImpl(final HierarchicalSearchControl control) {
- super();
- this.control = control;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.jsf.common.metadata.query.IEntityQueryVisitor#findEntities(org.eclipse.jst.jsf.common.metadata.Entity, java.lang.String)
- */
- public IResultSet<Entity> findEntities(final Entity initialEntity,
- final String entityKey) {
-
- resetQuery();
-
- if (initialEntity != null){
- this.initialEntityContext = initialEntity;
- entityQuery = new EntityQueryFilterVisitor(initialEntity.getId(), entityKey);
- initialEntity.accept(this);
- }
-
- return new SimpleResultSet(getInternalEntityResults());
- }
-
- private void resetQuery() {
- _stop = false;
- _entityResults = null;
- }
-
- private List<Entity> getInternalEntityResults(){
- if (_entityResults == null){
- _entityResults = new ArrayList<Entity>();
- }
- return _entityResults;
- }
-
-
- public boolean visitEnter(final Entity entity) {
-
- if (entity == initialEntityContext)
- return true;
-
- entityQuery.pushLevel();
- if (entityQuery.canVisit(entity))
- return entityQuery.visit(entity);
-
- return false;
- }
-
- public boolean visitLeave(Entity entity) {
- checkShouldStopVisitingEntities();
- if (entity != initialEntityContext)
- entityQuery.popLevel();
- return true;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.jsf.common.metadata.query.IEntityVisitor#visit(org.eclipse.jst.jsf.common.metadata.Entity)
- */
- public void visit(final Entity key) {
- //do nothing... all work now done in visitEnter/visitLeave
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.jsf.common.metadata.query.IMetaDataVisitor#stopVisiting()
- */
- public boolean stopVisiting() {
- return _stop;
- }
-
- private void checkShouldStopVisitingEntities(){
- //implement how to set stop to signal to the entity accept() to skip visiting
- if (_stop == false
- && control.getCountLimit()== getInternalEntityResults().size()
- && control.getCountLimit() != SearchControl.COUNT_LIMIT_NONE )
-
- _stop = true;
- }
-
- /**
- * Visitor that filters and acts upon hierarchical data that compares that an entity's id for with another with case-insensitive compare
- */
- private class EntityQueryFilterVisitor {
-
- private String entityId;
- private List<String> entityQueue;
- private int curLevel = 0;
-
- /**
- * Constructor
- * @param initialContextId - Entity id from which the query is rooted
- * @param queryKey - query key which may be compound ("A/B/C" - assuming "/" is the delimiter)
- */
- public EntityQueryFilterVisitor(final String initialContextId, final String queryKey){
- init(initialContextId, queryKey);
- }
-
- private void init(final String initialContextId, final String key) {
- entityQueue = new ArrayList<String>(3);
- addLevel(initialContextId);
- if (key == null || key.trim().equals("") || key.trim().equals(getLevelDelimiter())){ //$NON-NLS-1$
- addLevel(""); //$NON-NLS-1$
- }
- else {
- final StringTokenizer st = new StringTokenizer(key, getLevelDelimiter());
- String partialKey = st.nextToken();
- addLevel(partialKey);
- while (st.hasMoreElements()){
- partialKey = st.nextToken();
- addLevel(partialKey);
- }
- }
- }
-
- /**
- * @param entity
- * @return flag indicating that filter was passed and children may be visited
- */
- public boolean canVisit(final Entity entity) {
- // only one filter rule... does this entity id match the current level's entity id (case-insensitive)
- return entityId.compareTo(entity.getId().toUpperCase()) == 0;
- }
-
- /**
- * Operates on passed entity and determines if it should be part of the query results
- * @param entity
- * @return true if children of entity should be visited
- */
- public boolean visit(final Entity entity) {
- //one operation... if we have found the leaf-most entity in the query, add it to the results and go no deeper
- if (curLevel == entityQueue.size() - 1) {
- getInternalEntityResults().add(entity);
- return false;
- }
- return true;
- }
-
- private void addLevel(final String key) {
- entityQueue.add(key.toUpperCase());
- }
-
- /**
- * Move up one level in the query
- */
- public void popLevel(){
- entityId = entityQueue.get(--curLevel);
- }
-
- /**
- * Move down one level in the query
- */
- public void pushLevel() {
- entityId = entityQueue.get(++curLevel);
- }
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/query/internal/SimpleResultSet.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/query/internal/SimpleResultSet.java
deleted file mode 100644
index 059bed1..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/query/internal/SimpleResultSet.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 Oracle 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:
- * Oracle - initial API and implementation
- *
- ********************************************************************************/
-package org.eclipse.jst.jsf.common.metadata.query.internal;
-
-
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.jst.jsf.common.metadata.query.AbstractResultSet;
-
-/**
- * Simple implementation of {@link org.eclipse.jst.jsf.common.metadata.query.IResultSet} by extending AbstractResultSet
- * @param <T>
- *
- */
-public final class SimpleResultSet<T> extends AbstractResultSet<T> {
- private List<T> results;
-
- /**
- * Constructor passing a list to hold the results
- * @param results
- */
- public SimpleResultSet(List<T> results){
- super();
- this.results = results;
- }
-
- protected List<T> getInternalResults(){
- if (results == null){
- results = Collections.EMPTY_LIST;
- }
- return results;
- }
-
-
-}
-
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/query/internal/SimpleTraitQueryVisitorImpl.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/query/internal/SimpleTraitQueryVisitorImpl.java
deleted file mode 100644
index 6b7491c..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/query/internal/SimpleTraitQueryVisitorImpl.java
+++ /dev/null
@@ -1,111 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 Oracle 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:
- * Oracle - initial API and implementation
- *
- ********************************************************************************/
-package org.eclipse.jst.jsf.common.metadata.query.internal;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.jst.jsf.common.metadata.Entity;
-import org.eclipse.jst.jsf.common.metadata.Trait;
-import org.eclipse.jst.jsf.common.metadata.query.AbstractTraitQueryVisitor;
-import org.eclipse.jst.jsf.common.metadata.query.IResultSet;
-
-
-/**
- * A simple metadata query visitor implementing {@link org.eclipse.jst.jsf.common.metadata.query.ITraitQueryVisitor}.
- * - simple find traits by id only
- * - Does not allow for wild card searchs
- */
-public class SimpleTraitQueryVisitorImpl extends AbstractTraitQueryVisitor {
-
- private String _traitQuery;
- private SearchControl _control;
- private boolean _stop;
- private List<Trait> _traitResults;
-
- /**
- * Constructor that also creates a default SearchControl
- */
- public SimpleTraitQueryVisitorImpl() {
- super();
- _control = new SearchControl();
- }
-
- /**
- * Constructor
- * @param control
- */
- public SimpleTraitQueryVisitorImpl(SearchControl control) {
- super();
- this._control = control;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.jsf.common.metadata.query.ITraitQueryVisitor#findTraits(org.eclipse.jst.jsf.common.metadata.Entity, java.lang.String)
- */
- public IResultSet<Trait> findTraits(final Entity entity, final String traitQuery){
-
- resetQuery();
- if (entity != null){
- this._traitQuery = traitQuery;
- for (Iterator<Trait> it=entity.getTraits().iterator();it.hasNext();){
- Trait t = it.next();
- t.accept(this);
- if (stopVisiting())
- break;
- }
- }
- return new SimpleResultSet(getInternalTraitResults());
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.jsf.common.metadata.query.ITraitVisitor#visit(org.eclipse.jst.jsf.common.metadata.Trait)
- */
- public void visit(Trait trait) {
- if (trait.getId().equals(_traitQuery))
- getInternalTraitResults().add(trait);
-
- checkShouldStopVisitingTraits();
- }
-
- /**
- *
- */
- private void resetQuery() {
- _stop = false;
- _traitResults = null;
- }
-
- /**
- * @return lazy init of a SimpleResultSet of Traits
- */
- private List<Trait> getInternalTraitResults(){
- if (_traitResults == null){
- _traitResults = new ArrayList<Trait>();
- }
- return _traitResults;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.jsf.common.metadata.query.IMetaDataVisitor#stopVisiting()
- */
- public boolean stopVisiting() {
- return _stop;
- }
-
- private void checkShouldStopVisitingTraits(){
- if (_control.getCountLimit()== getInternalTraitResults().size() && _control.getCountLimit() != SearchControl.COUNT_LIMIT_NONE)
- _stop = true;
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/query/internal/TraitQuerySpec.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/query/internal/TraitQuerySpec.java
deleted file mode 100644
index 5b0ccc8..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/query/internal/TraitQuerySpec.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Oracle Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Oracle Corporation - initial API and implementation and/or initial documentation
- *******************************************************************************/
-
-package org.eclipse.jst.jsf.common.metadata.query.internal;
-
-
-/**
- * Implements a query spec for querying traits matching using equality for the id
- */
-public class TraitQuerySpec implements IQuerySpec {
-
- private final String _traitId;
- /**
- * @param traitId
- */
- public TraitQuerySpec(final String traitId) {
- _traitId = traitId;
- }
- public TraitKey getKey() {
- return null;
- }
-
- class TraitKey extends Key {
-
- public Object getAdapter(Class adapter) {
- // TODO Auto-generated method stub
- return null;
- }
-
- public String getId() {
- return _traitId;
- }
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/query/internal/TraitQuerySpecVisitor.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/query/internal/TraitQuerySpecVisitor.java
deleted file mode 100644
index db80e77..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/query/internal/TraitQuerySpecVisitor.java
+++ /dev/null
@@ -1,107 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Oracle Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Oracle Corporation - initial API and implementation and/or initial documentation
- *******************************************************************************/
-
-package org.eclipse.jst.jsf.common.metadata.query.internal;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.jst.jsf.common.metadata.Entity;
-import org.eclipse.jst.jsf.common.metadata.Trait;
-import org.eclipse.jst.jsf.common.metadata.query.AbstractTraitQueryVisitor;
-import org.eclipse.jst.jsf.common.metadata.query.IResultSet;
-import org.eclipse.jst.jsf.common.metadata.query.MetaDataException;
-import org.eclipse.jst.jsf.common.metadata.query.internal.IPredicateMatcher.MATCH;
-
-/**
- * Visits a set of entities matching by trait predicate matcher
- *
- */
-public class TraitQuerySpecVisitor extends AbstractTraitQueryVisitor {
-
- private List<Trait> _traitResults;
- private Collection<Entity> _entities;
- private IPredicateMatcher<Trait> _matcher;
- private SearchControl _control;
- private boolean _stop;
-
-
- /**
- * Constructor using default search control
- * @param entities
- * @param traitMatcher
- */
- public TraitQuerySpecVisitor(final Collection<Entity> entities, final IPredicateMatcher<Trait> traitMatcher) {
- this(entities, traitMatcher, new SearchControl());
- }
-
- /**
- * Constructor using search control for a single match
- * @param entities
- * @param traitMatcher
- * @param control
- */
- public TraitQuerySpecVisitor(final Collection<Entity> entities, final IPredicateMatcher<Trait> traitMatcher, final SearchControl control) {
- super();
- _entities = entities;
- _matcher = traitMatcher;
- _traitResults = new ArrayList<Trait>();
- _control = control;
- }
-
- /**
- * @return IResultSet<Trait> - will not be null
- * @throws MetaDataException
- */
- public IResultSet<Trait> findTraits() throws MetaDataException {
-
- _matcher.reset();
-
- if (_entities != null && _entities.size() > 0){
- ENTITIES_LOOP: for (final Entity entity : _entities) {
- final Iterator<Trait> it = entity.getTraits().iterator();
- while (it.hasNext()) {
- Trait trait = it.next();
- trait.accept(this);
- checkShouldStopVisiting();
- if (stopVisiting())
- break ENTITIES_LOOP;
- }
- }
- }
-
- return new SimpleResultSet(_traitResults);
- }
-
- public boolean stopVisiting() {
- return _stop;
- }
-
- private void checkShouldStopVisiting(){
- //implement how to set stop to signal to the entity accept() to skip visiting
- if (_stop == false
- && _control.getCountLimit()== _traitResults.size()
- && _control.getCountLimit() != SearchControl.COUNT_LIMIT_NONE )
-
- _stop = true;
- }
-
- @Override
- public void visit(final Trait trait) {
- final MATCH match = _matcher.matches(trait);
- if (match == MATCH.FULLY) {
- _traitResults.add(trait);
- }
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/query/internal/taglib/ITaglibDomainEntityPredicateMatcher.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/query/internal/taglib/ITaglibDomainEntityPredicateMatcher.java
deleted file mode 100644
index c4fa789..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/query/internal/taglib/ITaglibDomainEntityPredicateMatcher.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Oracle Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Oracle Corporation - initial API and implementation and/or initial documentation
- *******************************************************************************/
-
-package org.eclipse.jst.jsf.common.metadata.query.internal.taglib;
-
-import org.eclipse.jst.jsf.common.metadata.query.internal.IEntityPredicateMatcher;
-
-/**
- * Matches tag library entities
- */
-public interface ITaglibDomainEntityPredicateMatcher extends IEntityPredicateMatcher {
-
- /**
- * @return uri of the tag library - need this to determine model.
- * In the future, this may change if we allow for wild card search of models of a given domain
- */
- public String getUri();
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/query/internal/taglib/ITaglibDomainMetaDataQuery.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/query/internal/taglib/ITaglibDomainMetaDataQuery.java
deleted file mode 100644
index 21c417c..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/query/internal/taglib/ITaglibDomainMetaDataQuery.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Oracle Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Oracle Corporation - initial API and implementation and/or initial documentation
- *******************************************************************************/
-
-package org.eclipse.jst.jsf.common.metadata.query.internal.taglib;
-
-import org.eclipse.jst.jsf.common.metadata.Entity;
-import org.eclipse.jst.jsf.common.metadata.Model;
-import org.eclipse.jst.jsf.common.metadata.Trait;
-import org.eclipse.jst.jsf.common.metadata.query.IResultSet;
-import org.eclipse.jst.jsf.common.metadata.query.MetaDataException;
-import org.eclipse.jst.jsf.common.metadata.query.internal.IMetaDataQuery;
-import org.eclipse.jst.jsf.common.metadata.query.internal.IPredicateMatcher;
-
-/**
- * Interface for querying in a tag library domain context
- * <p>
- * @noimplement - not intended to be implemented by clients
- *
- */
-public interface ITaglibDomainMetaDataQuery extends IMetaDataQuery {
-
- /**
- * Find the tag library model for the passed uri which may be different from the one from the initial context
- * @param uri - may not be null
- * @return {@link Model} for this tag library's uri. May be null.
- */
- public Model findTagLibraryModel(final String uri);
-
-
- /**
- * @param tagLib - may not be null
- * @param tagName - may not be null
- * @return {@link Entity} for the tag name in the library. May be null
- */
- public Entity findTagEntity(final Model tagLib, final String tagName);
-
- /**
- * @param tagEntity - may not be null
- * @param attributeName - may not be null
- * @return {@link Entity} for the tag attribute name of this tag. May be null.
- */
- public Entity findTagAttributeEntity(final Entity tagEntity, final String attributeName);
-
- /**
- * @param entityMatcher
- * @return Set of {@link Entity}s matching the query specification
- */
- public IResultSet<Entity> findEntities(final ITaglibDomainEntityPredicateMatcher entityMatcher);
-
- /**
- * @param entityMatcher
- * @return First {@link Entity} matching the query specification. May be null.
- */
- public Entity findEntity(final ITaglibDomainEntityPredicateMatcher entityMatcher);
-
- /**
- * @param entity - may not be null
- * @param traitId - may not be null
- * @return {@link Trait} - may be null
- */
- public Trait findTrait(final Entity entity, final String traitId);
-
- /**
- * @param entityMatcher
- * @param traitMatcher
- * @return Set of {@link Trait}s matching both the entity and trait query specifications. Will not be null.
- * @throws MetaDataException
- */
- public IResultSet<Trait> findTraits(final ITaglibDomainEntityPredicateMatcher entityMatcher, final IPredicateMatcher<Trait> traitMatcher) throws MetaDataException;
-
-
- /**
- * @param entityMatcher
- * @param traitMatcher
- * @return First {@link Trait} matching both the entity and trait query specifications. May return null.
- */
- public Trait findTrait(final ITaglibDomainEntityPredicateMatcher entityMatcher, final IPredicateMatcher<Trait> traitMatcher);
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/query/internal/taglib/ITaglibDomainPredicateMatcherFactory.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/query/internal/taglib/ITaglibDomainPredicateMatcherFactory.java
deleted file mode 100644
index c186865..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/query/internal/taglib/ITaglibDomainPredicateMatcherFactory.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Oracle Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Oracle Corporation - initial API and implementation and/or initial documentation
- *******************************************************************************/
-
-package org.eclipse.jst.jsf.common.metadata.query.internal.taglib;
-
-import org.eclipse.jst.jsf.common.metadata.Trait;
-import org.eclipse.jst.jsf.common.metadata.query.internal.IPredicateMatcher;
-import org.eclipse.jst.jsf.common.metadata.query.internal.IPredicateMatcherFactory;
-
-
-/**
- * Interface for creating {@link IPredicateMatcher}s for the tag library domain.
- * <p>
- * @noextend
- */
-public interface ITaglibDomainPredicateMatcherFactory extends IPredicateMatcherFactory {
-
- /**
- * Returns a matcher that will match a tag library specification
- * @param uri - may not be null
- * @return {@link ITaglibDomainEntityPredicateMatcher}
- */
- public ITaglibDomainEntityPredicateMatcher createTagLibraryModelMatcher(final String uri);
- /**
- * Returns a matcher that will match a tag specification
- * @param uri - may not be null
- * @param tagName - may not be null
- * @return {@link ITaglibDomainEntityPredicateMatcher}
- */
- public ITaglibDomainEntityPredicateMatcher createTagEntityMatcher(final String uri, final String tagName);
-
- /**
- * Returns a matcher that will match a tag attribute specification
- * @param uri - may not be null
- * @param tagName - may not be null
- * @param tagAttributeName - may not be null
- * @return {@link ITaglibDomainEntityPredicateMatcher}
- */
- public ITaglibDomainEntityPredicateMatcher createTagAttributeEntityMatcher(final String uri, final String tagName, final String tagAttributeName) ;
-
- /**
- * Returns a matcher that will match the trait id
- * @param traitId - may not be null
- * @return {@link IPredicateMatcher} for {@link Trait}
- */
- public IPredicateMatcher<Trait> createTraitMatcher(final String traitId);
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/query/internal/taglib/TaglibDomainContextImpl.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/query/internal/taglib/TaglibDomainContextImpl.java
deleted file mode 100644
index d5a4dab..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/query/internal/taglib/TaglibDomainContextImpl.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Oracle Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Oracle Corporation - initial API and implementation and/or initial documentation
- *******************************************************************************/
-
-package org.eclipse.jst.jsf.common.metadata.query.internal.taglib;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jst.jsf.common.metadata.query.internal.IMetaDataModelManagerContext;
-import org.eclipse.jst.jsf.common.metadata.query.internal.MetaDataDomainContext;
-
-/**
- * Implements {@link IMetaDataModelManagerContext} for tag library domain
- *
- */
-public class TaglibDomainContextImpl
- extends MetaDataDomainContext
- implements IMetaDataModelManagerContext {
-
-
- private static final String TAGLIB_DOMAIN_ID = "TagLibraryDomain"; //$NON-NLS-1$
-
- private final IProject _project;
-
- /**
- * Constructor
- * @param project
- */
- public TaglibDomainContextImpl(final IProject project) {
- super(TAGLIB_DOMAIN_ID);
- _project = project;
- }
-
- public Object getAdapter(Class adapter) {
- if (adapter == IProject.class)
- return _project;
- return null;
- }
-
- public IProject getProject() {
- return _project;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/query/internal/taglib/TaglibDomainEntityIdRegexPredicateMatcher.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/query/internal/taglib/TaglibDomainEntityIdRegexPredicateMatcher.java
deleted file mode 100644
index 444e9eb..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/query/internal/taglib/TaglibDomainEntityIdRegexPredicateMatcher.java
+++ /dev/null
@@ -1,103 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Oracle Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Oracle Corporation - initial API and implementation and/or initial documentation
- *******************************************************************************/
-
-package org.eclipse.jst.jsf.common.metadata.query.internal.taglib;
-
-import java.util.regex.Pattern;
-import java.util.regex.PatternSyntaxException;
-
-import org.eclipse.jst.jsf.common.metadata.Entity;
-
-/**
- * Entity id regex matcher used by the IEntityQueryVisitor
- *
- */
-public class TaglibDomainEntityIdRegexPredicateMatcher implements ITaglibDomainEntityPredicateMatcher {
-
- private static final int LEVEL_UNSET = 0;
- private static final int LEVEL_MODEL = 1;
- private static final int LEVEL_TAG = 2;
- private static final int LEVEL_TAGATTR = 3;
-
- private final Pattern _modelKey;
- private final Pattern _tagKey;
- private final Pattern _tagAttrKey;
- private final int _leafLevel;
- private int _currentLevel;
-
- /**
- * @param spec
- * @throws PatternSyntaxException
- */
- public TaglibDomainEntityIdRegexPredicateMatcher(final TaglibDomainEntityQuerySpec spec) throws PatternSyntaxException {
- _modelKey = spec.getKey().getUri() != null ? java.util.regex.Pattern.compile(spec.getKey().getUri()) : null;
- _tagKey = spec.getKey().getTagName() != null ? java.util.regex.Pattern.compile(spec.getKey().getTagName()) : null;
- _tagAttrKey = spec.getKey().getTagAttributeName() != null ? java.util.regex.Pattern.compile(spec.getKey().getTagAttributeName()) : null;;
- _leafLevel = _tagAttrKey != null ? LEVEL_TAGATTR : (_tagKey != null ? LEVEL_TAG : LEVEL_MODEL);
- _currentLevel = LEVEL_UNSET;
- }
-
- public MATCH matches(final Entity entity) {
- if (_currentLevel == LEVEL_MODEL && matches(entity, _modelKey)) {
- return isFullMatch(entity);
- }
- else if (_currentLevel == LEVEL_TAG && matches(entity, _tagKey)){
- return isFullMatch(entity);
- }
- else if (_currentLevel == LEVEL_TAGATTR && matches(entity, _tagAttrKey)){
- return isFullMatch(entity);
- }
- return MATCH.NOT;
- }
-
- private boolean matches(final Entity entity, final Pattern _key) {
- if (_key.matcher(entity.getId()).find())
- return true;
- return false;
- }
-
- private MATCH isFullMatch(final Entity entity) {
- if (_currentLevel == _leafLevel)
- return MATCH.FULLY;
- return MATCH.PARTIALLY;
- }
-
- /**
- * Move up one level in the hierarchy
- */
- public void popLevel() {
- _currentLevel--;
- }
-
- /**
- * Move down one level in the hierarchy
- */
- public void pushLevel() {
- _currentLevel++;
- }
-
- public String getUri() {
- return _modelKey.pattern().toString();
- }
-
- public void reset() {
- _currentLevel = LEVEL_UNSET;
- }
-
- public int getMaxLevel() {
- return _leafLevel;
- }
-
- public int getCurrentLevel() {
- return _currentLevel;
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/query/internal/taglib/TaglibDomainEntityQuerySpec.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/query/internal/taglib/TaglibDomainEntityQuerySpec.java
deleted file mode 100644
index f53f671..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/query/internal/taglib/TaglibDomainEntityQuerySpec.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Oracle Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Oracle Corporation - initial API and implementation and/or initial documentation
- *******************************************************************************/
-
-package org.eclipse.jst.jsf.common.metadata.query.internal.taglib;
-
-import org.eclipse.jst.jsf.common.metadata.query.internal.IQuerySpec;
-import org.eclipse.jst.jsf.common.metadata.query.internal.Key;
-
-/**
- * Implements a tag entity query spec where the entity's id's are matched.
- * <p>
- * The PredicateMatcher will use this class to do an regex match of the id to the value
- *
- */
-public final class TaglibDomainEntityQuerySpec implements IQuerySpec {
-
- private final String _uri;
- private final String _tagName;
- private final String _tagAttrName;
-
- /**
- * Construct a query spec for a tag library model
- * @param uri - may not be null
- */
- public TaglibDomainEntityQuerySpec(final String uri) {
- _uri = uri;
- _tagName = null;
- _tagAttrName = null;
- }
-
- /**
- * Construct a query spec for a tag
- * @param uri - may not be null
- * @param tagName - may not be null
- */
- public TaglibDomainEntityQuerySpec (final String uri, final String tagName) {
- _uri = uri;
- _tagName = tagName;
- _tagAttrName = null;
- }
-
- /**
- * Construct a query spec for a tag attribute
- * @param uri - may not be null
- * @param tagName - may not be null
- * @param tagAttributeName - may not be null
- */
- public TaglibDomainEntityQuerySpec (final String uri, final String tagName, final String tagAttributeName) {
- _uri = uri;
- _tagName = tagName;
- _tagAttrName = tagAttributeName;
- }
- public TagDomainEntityKey getKey() {
- return new TagDomainEntityKey();
- }
-
- class TagDomainEntityKey extends Key {
-
- /**
- * @return model uri
- */
- public String getUri() {
- return _uri;
- }
-
- public String getTagName() {
- return _tagName;
- }
-
- public String getTagAttributeName() {
- return _tagAttrName;
- }
- public Object getAdapter(Class adapter) {
- return null;
- }
-
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/query/internal/taglib/TaglibDomainEntityQuerySpecVisitor.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/query/internal/taglib/TaglibDomainEntityQuerySpecVisitor.java
deleted file mode 100644
index 0f51a85..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/query/internal/taglib/TaglibDomainEntityQuerySpecVisitor.java
+++ /dev/null
@@ -1,156 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Oracle Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Oracle Corporation - initial API and implementation and/or initial documentation
- *******************************************************************************/
-
-package org.eclipse.jst.jsf.common.metadata.query.internal.taglib;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jst.jsf.common.metadata.Entity;
-import org.eclipse.jst.jsf.common.metadata.Model;
-import org.eclipse.jst.jsf.common.metadata.internal.IMetaDataDomainContext;
-import org.eclipse.jst.jsf.common.metadata.internal.IMetaDataModelContext;
-import org.eclipse.jst.jsf.common.metadata.internal.IMetaDataModelManager;
-import org.eclipse.jst.jsf.common.metadata.internal.MetaDataModelContext;
-import org.eclipse.jst.jsf.common.metadata.internal.MetaDataModelManagerFactory;
-import org.eclipse.jst.jsf.common.metadata.query.AbstractEntityQueryVisitor;
-import org.eclipse.jst.jsf.common.metadata.query.IResultSet;
-import org.eclipse.jst.jsf.common.metadata.query.internal.HierarchicalSearchControl;
-import org.eclipse.jst.jsf.common.metadata.query.internal.IHierarchicalEntityVisitor;
-import org.eclipse.jst.jsf.common.metadata.query.internal.SearchControl;
-import org.eclipse.jst.jsf.common.metadata.query.internal.IPredicateMatcher.MATCH;
-import org.eclipse.jst.jsf.common.metadata.query.internal.SimpleResultSet;
-
-/**
- * @author gekessle
- *
- */
-public class TaglibDomainEntityQuerySpecVisitor extends AbstractEntityQueryVisitor implements IHierarchicalEntityVisitor {
- private HierarchicalSearchControl _control;
- private ITaglibDomainEntityPredicateMatcher _matcher;
- private IMetaDataDomainContext _context;
- private List<Entity> _entityResults;
- private Model _initialEntity;
- private boolean _stop;
-
- /**
- * Constructor with default SearchControl
- * @param context
- * @param matcher
- */
- public TaglibDomainEntityQuerySpecVisitor(final IMetaDataDomainContext context, final ITaglibDomainEntityPredicateMatcher matcher) {
- this(context, matcher, new HierarchicalSearchControl());
- }
-
- /**
- * Constructor
- * @param context
- * @param matcher
- * @param control
- */
- public TaglibDomainEntityQuerySpecVisitor(final IMetaDataDomainContext context, final ITaglibDomainEntityPredicateMatcher matcher, final HierarchicalSearchControl control) {
- _matcher = matcher;
- _context = context;
- _control = control;
- }
-
- /**
- * @return Set of {@link Entity}s matching the entity query spec
- * Note: does not support wild card match of models yet.
- */
- public IResultSet<Entity> findEntities() {// throws InvalidQuerySpecification, MetaDataException {
- _matcher.reset();
-
- //first find model according to matcher...
- //DOES NOT SUPPORT WILD CARDS FOR MODEL URI YET!!!
- //we cannot support wild cards because models are loaded lazily; even their id's.
- final IMetaDataModelManager mgr = MetaDataModelManagerFactory.getMetaDataModelManagerInstance(getProject());
- if (mgr != null) {
- final Model model= mgr.getModel(getModelContext());
- findEntities(model);
- } else {
- //throw err?
- }
- return new SimpleResultSet<Entity>(getInternalEntityResults());
- }
-
- private void findEntities(final Model model) {
-
- if (model != null){
- _initialEntity = model;
- _initialEntity.accept(this);
- }
-
- }
-
- private List<Entity> getInternalEntityResults(){
- if (_entityResults == null){
- _entityResults = new ArrayList<Entity>();
- }
- return _entityResults;
- }
-
- private IMetaDataModelContext getModelContext() {
- return new MetaDataModelContext(getProject(), _context.getDomainId(), _matcher.getUri());
- }
-
- private IProject getProject() {
- return (IProject)_context.getAdapter(IProject.class);
- }
-
- public boolean visitEnter(final Entity entity) {
- _matcher.pushLevel();
- if (_matcher.getCurrentLevel() <= _matcher.getMaxLevel()) {
- final MATCH match = _matcher.matches(entity);
- if (match == MATCH.FULLY) {
- getInternalEntityResults().add(entity);
- checkShouldStopVisitingEntities();
- return false;
- }
- else if (match == MATCH.PARTIALLY) {
- return true;
- }
- }
- return false;
- }
-
- public boolean stopVisiting() {
- return _stop;
- }
-
- private void checkShouldStopVisitingEntities(){
- //implement how to set stop to signal to the entity accept() to skip visiting
- if (_stop == false
- && _control.getCountLimit()== getInternalEntityResults().size()
- && _control.getCountLimit() != SearchControl.COUNT_LIMIT_NONE )
-
- _stop = true;
- }
-
- public boolean visitLeave(Entity entity) {
-// _stop = _matcher.checkShouldStopVisitingEntities();
-// if (entity != _initialEntity)
-// _entityQuery.popLevel();
- if (entity != _initialEntity)
- _matcher.popLevel();
- return true;
- }
-
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.jsf.common.metadata.query.IEntityVisitor#visit(org.eclipse.jst.jsf.common.metadata.Entity)
- */
- public void visit(final Entity key) {
- //do nothing... all work now done in visitEnter/visitLeave
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/query/internal/taglib/TaglibDomainMetaDataQuery.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/query/internal/taglib/TaglibDomainMetaDataQuery.java
deleted file mode 100644
index dc3248c..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/query/internal/taglib/TaglibDomainMetaDataQuery.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Oracle Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Oracle Corporation - initial API and implementation and/or initial documentation
- *******************************************************************************/
-
-package org.eclipse.jst.jsf.common.metadata.query.internal.taglib;
-
-import org.eclipse.jst.jsf.common.metadata.Entity;
-import org.eclipse.jst.jsf.common.metadata.Model;
-import org.eclipse.jst.jsf.common.metadata.Trait;
-import org.eclipse.jst.jsf.common.metadata.internal.IMetaDataDomainContext;
-import org.eclipse.jst.jsf.common.metadata.internal.IMetaDataModelManager;
-import org.eclipse.jst.jsf.common.metadata.query.IResultSet;
-import org.eclipse.jst.jsf.common.metadata.query.MetaDataException;
-import org.eclipse.jst.jsf.common.metadata.query.internal.AbstractMetaDataQuery;
-import org.eclipse.jst.jsf.common.metadata.query.internal.HierarchicalSearchControl;
-import org.eclipse.jst.jsf.common.metadata.query.internal.IPredicateMatcher;
-import org.eclipse.jst.jsf.common.metadata.query.internal.SearchControl;
-import org.eclipse.jst.jsf.common.metadata.query.internal.TraitQuerySpecVisitor;
-
-/**
- * Implements {@link ITaglibDomainMetaDataQuery}
- *
- */
-public class TaglibDomainMetaDataQuery
- extends AbstractMetaDataQuery
- implements ITaglibDomainMetaDataQuery {
-
- /**
- * Constructor
- * @param manager
- * @param managerContext
- */
- public TaglibDomainMetaDataQuery(final IMetaDataModelManager manager, final IMetaDataDomainContext managerContext) {
- super(manager, managerContext);
- }
-
- public Model findTagLibraryModel(final String uri) {
- return getQueryHelper().getModel(uri);
- }
-
- public Entity findTagEntity(final Model tagLib, final String tagName) {
- return getQueryHelper().getEntity(tagLib, tagName);
- }
-
- public Entity findTagAttributeEntity(final Entity tagEntity, final String attributeName) {
- return getQueryHelper().getEntity(tagEntity, attributeName);
- }
-
- public Trait findTrait(final Entity entity, final String traitId) {
- return getQueryHelper().getTrait(entity, traitId);
- }
-
- public IResultSet<Entity> findEntities(final ITaglibDomainEntityPredicateMatcher matcher) {
- final TaglibDomainEntityQuerySpecVisitor visitor = new TaglibDomainEntityQuerySpecVisitor(getDomainContext(), matcher);
- return visitor.findEntities();
- }
-
- public IResultSet<Trait> findTraits(final ITaglibDomainEntityPredicateMatcher entityMatcher, final IPredicateMatcher<Trait> traitMatcher) throws MetaDataException {
- final TraitQuerySpecVisitor visitor = new TraitQuerySpecVisitor(findEntities(entityMatcher).getResults(), traitMatcher);
- return visitor.findTraits();
- }
-
- public Entity findEntity(final ITaglibDomainEntityPredicateMatcher entityMatcher) {
- final HierarchicalSearchControl control = new HierarchicalSearchControl();
- control.setCountLimit(1);
- final TaglibDomainEntityQuerySpecVisitor visitor = new TaglibDomainEntityQuerySpecVisitor(getDomainContext(), entityMatcher, control);
- final IResultSet<Entity> results = visitor.findEntities();
- return getQueryHelper().getFirstFromResultSet(results);
- }
-
- public Trait findTrait(final ITaglibDomainEntityPredicateMatcher entityMatcher, final IPredicateMatcher<Trait> traitMatcher) {
- TraitQuerySpecVisitor visitor;
- try {
- final SearchControl control = new SearchControl();
- control.setCountLimit(1);
- visitor = new TraitQuerySpecVisitor(findEntities(entityMatcher).getResults(), traitMatcher, control);
- IResultSet<Trait> results = visitor.findTraits();
- return getQueryHelper().getFirstFromResultSet(results);
- } catch (MetaDataException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
- return null;
-
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/query/internal/taglib/TaglibDomainMetaDataQueryFactory.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/query/internal/taglib/TaglibDomainMetaDataQueryFactory.java
deleted file mode 100644
index d7f08ae..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/query/internal/taglib/TaglibDomainMetaDataQueryFactory.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Oracle Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Oracle Corporation - initial API and implementation and/or initial documentation
- *******************************************************************************/
-
-package org.eclipse.jst.jsf.common.metadata.query.internal.taglib;
-
-import org.eclipse.jst.jsf.common.metadata.internal.IMetaDataDomainContext;
-import org.eclipse.jst.jsf.common.metadata.query.internal.AbstractMetaDataDomainQueryFactory;
-import org.eclipse.jst.jsf.common.metadata.query.internal.IMetaDataQuery;
-
-/**
- * Factory for producing TagLibraryDomain {@link IMetaDataQuery}s.
- * ({@link ITaglibDomainMetaDataQuery} specifically)
- */
-public class TaglibDomainMetaDataQueryFactory
- extends
- AbstractMetaDataDomainQueryFactory {
-
- /**
- * Constructor
- */
- public TaglibDomainMetaDataQueryFactory() {
- super("TagLibraryDomain"); //$NON-NLS-1$
- }
-
- public ITaglibDomainMetaDataQuery createQuery(final IMetaDataDomainContext context) {
- return new TaglibDomainMetaDataQuery(getManager(context), context);
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/query/internal/taglib/TaglibDomainTraitIdRegexPredicateMatcher.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/query/internal/taglib/TaglibDomainTraitIdRegexPredicateMatcher.java
deleted file mode 100644
index c52c44c..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/query/internal/taglib/TaglibDomainTraitIdRegexPredicateMatcher.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Oracle Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Oracle Corporation - initial API and implementation and/or initial documentation
- *******************************************************************************/
-
-package org.eclipse.jst.jsf.common.metadata.query.internal.taglib;
-
-import java.util.regex.Pattern;
-import java.util.regex.PatternSyntaxException;
-
-import org.eclipse.jst.jsf.common.metadata.Trait;
-import org.eclipse.jst.jsf.common.metadata.query.internal.IPredicateMatcher;
-
-/**
- *
- *
- */
-public class TaglibDomainTraitIdRegexPredicateMatcher implements IPredicateMatcher<Trait> {
-
- private final Pattern _traitKey;
-
- /**
- * Constructor
- * @param traitSpec
- * @throws PatternSyntaxException
- */
- public TaglibDomainTraitIdRegexPredicateMatcher(final TaglibDomainTraitQuerySpec traitSpec) throws PatternSyntaxException {
- _traitKey = Pattern.compile(traitSpec.getKey().getTraitId());
- }
-
- public MATCH matches(final Trait trait) {
- if (_traitKey.matcher(trait.getId()).find())
- return MATCH.FULLY;
- return MATCH.NOT;
- }
-
- public void reset() {
- //nothing to do
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/query/internal/taglib/TaglibDomainTraitQuerySpec.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/query/internal/taglib/TaglibDomainTraitQuerySpec.java
deleted file mode 100644
index 5a934cb..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/query/internal/taglib/TaglibDomainTraitQuerySpec.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Oracle Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Oracle Corporation - initial API and implementation and/or initial documentation
- *******************************************************************************/
-
-package org.eclipse.jst.jsf.common.metadata.query.internal.taglib;
-
-import org.eclipse.jst.jsf.common.metadata.query.internal.IQuerySpec;
-import org.eclipse.jst.jsf.common.metadata.query.internal.Key;
-
-/**
- * Implements a tag trait query spec where the trait id's are matched.
- * <p>
- * The PredicateMatcher will use this class to do an regex match of the id to the value
- *
- */
-public final class TaglibDomainTraitQuerySpec implements IQuerySpec {
-
- private final String _traidId;
-
- /**
- * Construct a query spec for a tag library model
- * @param traidId - may not be null
- */
- public TaglibDomainTraitQuerySpec(final String traidId) {
- _traidId = traidId;
- }
-
- public TagDomainTraitKey getKey() {
- return new TagDomainTraitKey();
- }
-
- class TagDomainTraitKey extends Key {
-
- /**
- * @return model traidId
- */
- public String getTraitId() {
- return _traidId;
- }
-
- public Object getAdapter(Class adapter) {
- return null;
- }
-
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/query/package-info.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/query/package-info.java
deleted file mode 100644
index bb9019e..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/query/package-info.java
+++ /dev/null
@@ -1,17 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Oracle 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:
- * Oracle - initial API and implementation
- *
- ********************************************************************************/
-
-/**
- * Meta-data query interface.
- * <p><b>Provisional API - subject to change</b></p>
- */
-package org.eclipse.jst.jsf.common.metadata.query;
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/traittypes/traittypes/BooleanValue.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/traittypes/traittypes/BooleanValue.java
deleted file mode 100644
index 9a658b8..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/traittypes/traittypes/BooleanValue.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/**
- * Copyright (c) 2007 Oracle Corporation
- *
- * $Id: BooleanValue.java,v 1.1 2010/01/21 00:01:44 gkessler Exp $
- */
-package org.eclipse.jst.jsf.common.metadata.traittypes.traittypes;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Boolean Value</b></em>'.
- *
- * Only String value of 'true' in xml will result in isTrue() being true.
- * All other String values will result in false.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- * <li>{@link org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.BooleanValue#isTrue <em>True</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.TraitTypesPackage#getBooleanValue()
- * @model extendedMetaData="kind='simple'"
- * @generated
- */
-public interface BooleanValue extends EObject {
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated NOT
- */
- String copyright = "Copyright (c) 2007 Oracle Corporation"; //$NON-NLS-1$
-
- /**
- * Returns the value of the '<em><b>True</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>True</em>' attribute isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @return the value of the '<em>True</em>' attribute.
- * @see #setTrue(boolean)
- * @see org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.TraitTypesPackage#getBooleanValue_True()
- * @model required="true"
- * extendedMetaData="kind='simple'"
- * @generated
- */
- boolean isTrue();
-
- /**
- * Sets the value of the '{@link org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.BooleanValue#isTrue <em>True</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>True</em>' attribute.
- * @see #isTrue()
- * @generated
- */
- void setTrue(boolean value);
-
-} // BooleanValue
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/traittypes/traittypes/ListOfValues.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/traittypes/traittypes/ListOfValues.java
deleted file mode 100644
index 12e92a4..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/traittypes/traittypes/ListOfValues.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.jst.jsf.common.metadata.traittypes.traittypes;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>List Of Values</b></em>'.
- *
- * <p><b>Provisional API - subject to change</b></p>
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- * <li>{@link org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.ListOfValues#getEntries <em>Entries</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.TraitTypesPackage#getListOfValues()
- * @model
- * @generated
- */
-public interface ListOfValues extends EObject {
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- String copyright = "Copyright (c) 2007 Oracle Corporation"; //$NON-NLS-1$
-
- /**
- * Returns the value of the '<em><b>Entries</b></em>' containment reference list.
- * The list contents are of type {@link org.eclipse.emf.ecore.xml.type.SimpleAnyType}.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Entries</em>' containment reference list isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @return the value of the '<em>Entries</em>' containment reference list.
- * @see org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.TraitTypesPackage#getListOfValues_Entries()
- * @model type="org.eclipse.emf.ecore.xml.type.SimpleAnyType" containment="true"
- * extendedMetaData="kind='element' name='item'"
- * @generated
- */
- EList getEntries();
-
-} // ListOfValues
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/traittypes/traittypes/SetGenerator.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/traittypes/traittypes/SetGenerator.java
deleted file mode 100644
index 023ae6f..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/traittypes/traittypes/SetGenerator.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.jst.jsf.common.metadata.traittypes.traittypes;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Set Generator</b></em>'.
- *
- * <p><b>Provisional API - subject to change</b></p>
- * <!-- end-user-doc -->
- *
- *
- * @see org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.TraitTypesPackage#getSetGenerator()
- * @model
- * @generated
- */
-public interface SetGenerator extends EObject {
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- String copyright = "Copyright (c) 2007 Oracle Corporation"; //$NON-NLS-1$
-
- /**
- * Returns the value of the '<em><b>Algorithm</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Algorithm</em>' attribute isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @return the value of the '<em>Algorithm</em>' attribute.
- * @see #setAlgorithm(String)
- * @see org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.TraitTypesPackage#getSetGenerator_Algorithm()
- * @model extendedMetaData="kind='element'"
- * @generated
- */
- String getAlgorithm();
-
- /**
- * Sets the value of the '{@link org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.SetGenerator#getAlgorithm <em>Algorithm</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Algorithm</em>' attribute.
- * @see #getAlgorithm()
- * @generated
- */
- void setAlgorithm(String value);
-
- /**
- * Returns the value of the '<em><b>Expression</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Expression</em>' attribute isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @return the value of the '<em>Expression</em>' attribute.
- * @see #setExpression(String)
- * @see org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.TraitTypesPackage#getSetGenerator_Expression()
- * @model extendedMetaData="kind='element'"
- * @generated
- */
- String getExpression();
-
- /**
- * Sets the value of the '{@link org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.SetGenerator#getExpression <em>Expression</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Expression</em>' attribute.
- * @see #getExpression()
- * @generated
- */
- void setExpression(String value);
-
-} // SetGenerator
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/traittypes/traittypes/StringValue.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/traittypes/traittypes/StringValue.java
deleted file mode 100644
index b978ad8..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/traittypes/traittypes/StringValue.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/**
- * Copyright (c) 2007 Oracle Corporation
- *
- * $Id: StringValue.java,v 1.1 2010/01/21 00:01:44 gkessler Exp $
- */
-package org.eclipse.jst.jsf.common.metadata.traittypes.traittypes;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>String Value</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- * <li>{@link org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.StringValue#getValue <em>Value</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.TraitTypesPackage#getStringValue()
- * @model extendedMetaData="kind='simple'"
- * @generated
- */
-public interface StringValue extends EObject {
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated NOT
- */
- String copyright = "Copyright (c) 2007 Oracle Corporation";//$NON-NLS-1$
-
- /**
- * Returns the value of the '<em><b>Value</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Value</em>' attribute isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @return the value of the '<em>Value</em>' attribute.
- * @see #setValue(String)
- * @see org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.TraitTypesPackage#getStringValue_Value()
- * @model required="true"
- * extendedMetaData="kind='simple'"
- * @generated
- */
- String getValue();
-
- /**
- * Sets the value of the '{@link org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.StringValue#getValue <em>Value</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Value</em>' attribute.
- * @see #getValue()
- * @generated
- */
- void setValue(String value);
-
-} // StringValue
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/traittypes/traittypes/TraitTypesFactory.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/traittypes/traittypes/TraitTypesFactory.java
deleted file mode 100644
index af30b04..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/traittypes/traittypes/TraitTypesFactory.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.jst.jsf.common.metadata.traittypes.traittypes;
-
-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.
- *
- * <p><b>Provisional API - subject to change</b></p>
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.TraitTypesPackage
- * @generated
- */
-public interface TraitTypesFactory extends EFactory {
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- String copyright = "Copyright (c) 2007 Oracle Corporation"; //$NON-NLS-1$
-
- /**
- * The singleton instance of the factory.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- TraitTypesFactory eINSTANCE = org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.internal.impl.TraitTypesFactoryImpl.init();
-
- /**
- * Returns a new object of class '<em>List Of Values</em>'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return a new object of class '<em>List Of Values</em>'.
- * @generated
- */
- ListOfValues createListOfValues();
-
- /**
- * Returns a new object of class '<em>Set Generator</em>'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return a new object of class '<em>Set Generator</em>'.
- * @generated
- */
- SetGenerator createSetGenerator();
-
- /**
- * Returns a new object of class '<em>String Value</em>'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return a new object of class '<em>String Value</em>'.
- * @generated
- */
- StringValue createStringValue();
-
- /**
- * Returns a new object of class '<em>Boolean Value</em>'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return a new object of class '<em>Boolean Value</em>'.
- * @generated
- */
- BooleanValue createBooleanValue();
-
- /**
- * Returns the package supported by this factory.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the package supported by this factory.
- * @generated
- */
- TraitTypesPackage getTraitTypesPackage();
-
-} //TraitTypesFactory
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/traittypes/traittypes/TraitTypesPackage.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/traittypes/traittypes/TraitTypesPackage.java
deleted file mode 100644
index 81b82fb..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/traittypes/traittypes/TraitTypesPackage.java
+++ /dev/null
@@ -1,395 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.jst.jsf.common.metadata.traittypes.traittypes;
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EReference;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Package</b> for the model.
- * It contains accessors for the meta objects to represent
- * <ul>
- * <li>each class,</li>
- * <li>each feature of each class,</li>
- * <li>each enum,</li>
- * <li>and each data type</li>
- * </ul>
- *
- * <p><b>Provisional API - subject to change</b></p>
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.TraitTypesFactory
- * @model kind="package"
- * @generated
- */
-@SuppressWarnings("hiding")
-public interface TraitTypesPackage extends EPackage {
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- String copyright = "Copyright (c) 2007 Oracle Corporation"; //$NON-NLS-1$
-
- /**
- * The package name.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- String eNAME = "traittypes"; //$NON-NLS-1$
-
- /**
- * The package namespace URI.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- String eNS_URI = "http://org.eclipse.jst.jsf.common.metadata/metadataTraitTypes.ecore"; //$NON-NLS-1$
-
- /**
- * The package namespace name.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- String eNS_PREFIX = "mdt"; //$NON-NLS-1$
-
- /**
- * The singleton instance of the package.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- TraitTypesPackage eINSTANCE = org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.internal.impl.TraitTypesPackageImpl.init();
-
- /**
- * The meta object id for the '{@link org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.internal.impl.ListOfValuesImpl <em>List Of Values</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.internal.impl.ListOfValuesImpl
- * @see org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.internal.impl.TraitTypesPackageImpl#getListOfValues()
- * @generated
- */
- int LIST_OF_VALUES = 0;
-
- /**
- * The feature id for the '<em><b>Entries</b></em>' containment reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int LIST_OF_VALUES__ENTRIES = 0;
-
- /**
- * The number of structural features of the '<em>List Of Values</em>' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int LIST_OF_VALUES_FEATURE_COUNT = 1;
-
-
- /**
- * The meta object id for the '{@link org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.internal.impl.SetGeneratorImpl <em>Set Generator</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.internal.impl.SetGeneratorImpl
- * @see org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.internal.impl.TraitTypesPackageImpl#getSetGenerator()
- * @generated
- */
- int SET_GENERATOR = 1;
-
- /**
- * The feature id for the '<em><b>Algorithm</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int SET_GENERATOR__ALGORITHM = 0;
-
- /**
- * The feature id for the '<em><b>Expression</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int SET_GENERATOR__EXPRESSION = 1;
-
- /**
- * The number of structural features of the '<em>Set Generator</em>' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int SET_GENERATOR_FEATURE_COUNT = 2;
-
-
- /**
- * The meta object id for the '{@link org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.internal.impl.StringValueImpl <em>String Value</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.internal.impl.StringValueImpl
- * @see org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.internal.impl.TraitTypesPackageImpl#getStringValue()
- * @generated
- */
- int STRING_VALUE = 2;
-
- /**
- * The feature id for the '<em><b>Value</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int STRING_VALUE__VALUE = 0;
-
- /**
- * The number of structural features of the '<em>String Value</em>' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int STRING_VALUE_FEATURE_COUNT = 1;
-
- /**
- * The meta object id for the '{@link org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.internal.impl.BooleanValueImpl <em>Boolean Value</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.internal.impl.BooleanValueImpl
- * @see org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.internal.impl.TraitTypesPackageImpl#getBooleanValue()
- * @generated
- */
- int BOOLEAN_VALUE = 3;
-
- /**
- * The feature id for the '<em><b>True</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int BOOLEAN_VALUE__TRUE = 0;
-
- /**
- * The number of structural features of the '<em>Boolean Value</em>' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int BOOLEAN_VALUE_FEATURE_COUNT = 1;
-
-
- /**
- * Returns the meta object for class '{@link org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.ListOfValues <em>List Of Values</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for class '<em>List Of Values</em>'.
- * @see org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.ListOfValues
- * @generated
- */
- EClass getListOfValues();
-
- /**
- * Returns the meta object for the containment reference list '{@link org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.ListOfValues#getEntries <em>Entries</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the containment reference list '<em>Entries</em>'.
- * @see org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.ListOfValues#getEntries()
- * @see #getListOfValues()
- * @generated
- */
- EReference getListOfValues_Entries();
-
- /**
- * Returns the meta object for class '{@link org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.SetGenerator <em>Set Generator</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for class '<em>Set Generator</em>'.
- * @see org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.SetGenerator
- * @generated
- */
- EClass getSetGenerator();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.SetGenerator#getAlgorithm <em>Algorithm</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Algorithm</em>'.
- * @see org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.SetGenerator#getAlgorithm()
- * @see #getSetGenerator()
- * @generated
- */
- EAttribute getSetGenerator_Algorithm();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.SetGenerator#getExpression <em>Expression</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Expression</em>'.
- * @see org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.SetGenerator#getExpression()
- * @see #getSetGenerator()
- * @generated
- */
- EAttribute getSetGenerator_Expression();
-
- /**
- * Returns the meta object for class '{@link org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.StringValue <em>String Value</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for class '<em>String Value</em>'.
- * @see org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.StringValue
- * @generated
- */
- EClass getStringValue();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.StringValue#getValue <em>Value</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Value</em>'.
- * @see org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.StringValue#getValue()
- * @see #getStringValue()
- * @generated
- */
- EAttribute getStringValue_Value();
-
- /**
- * Returns the meta object for class '{@link org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.BooleanValue <em>Boolean Value</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for class '<em>Boolean Value</em>'.
- * @see org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.BooleanValue
- * @generated
- */
- EClass getBooleanValue();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.BooleanValue#isTrue <em>True</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>True</em>'.
- * @see org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.BooleanValue#isTrue()
- * @see #getBooleanValue()
- * @generated
- */
- EAttribute getBooleanValue_True();
-
- /**
- * 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
- */
- TraitTypesFactory getTraitTypesFactory();
-
- /**
- * <!-- 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.jst.jsf.common.metadata.traittypes.traittypes.internal.impl.ListOfValuesImpl <em>List Of Values</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.internal.impl.ListOfValuesImpl
- * @see org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.internal.impl.TraitTypesPackageImpl#getListOfValues()
- * @generated
- */
- EClass LIST_OF_VALUES = eINSTANCE.getListOfValues();
-
- /**
- * The meta object literal for the '<em><b>Entries</b></em>' containment reference list feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EReference LIST_OF_VALUES__ENTRIES = eINSTANCE.getListOfValues_Entries();
-
- /**
- * The meta object literal for the '{@link org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.internal.impl.SetGeneratorImpl <em>Set Generator</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.internal.impl.SetGeneratorImpl
- * @see org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.internal.impl.TraitTypesPackageImpl#getSetGenerator()
- * @generated
- */
- EClass SET_GENERATOR = eINSTANCE.getSetGenerator();
-
- /**
- * The meta object literal for the '<em><b>Algorithm</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EAttribute SET_GENERATOR__ALGORITHM = eINSTANCE.getSetGenerator_Algorithm();
-
- /**
- * The meta object literal for the '<em><b>Expression</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EAttribute SET_GENERATOR__EXPRESSION = eINSTANCE.getSetGenerator_Expression();
-
- /**
- * The meta object literal for the '{@link org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.internal.impl.StringValueImpl <em>String Value</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.internal.impl.StringValueImpl
- * @see org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.internal.impl.TraitTypesPackageImpl#getStringValue()
- * @generated
- */
- EClass STRING_VALUE = eINSTANCE.getStringValue();
-
- /**
- * The meta object literal for the '<em><b>Value</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EAttribute STRING_VALUE__VALUE = eINSTANCE.getStringValue_Value();
-
- /**
- * The meta object literal for the '{@link org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.internal.impl.BooleanValueImpl <em>Boolean Value</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.internal.impl.BooleanValueImpl
- * @see org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.internal.impl.TraitTypesPackageImpl#getBooleanValue()
- * @generated
- */
- EClass BOOLEAN_VALUE = eINSTANCE.getBooleanValue();
-
- /**
- * The meta object literal for the '<em><b>True</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EAttribute BOOLEAN_VALUE__TRUE = eINSTANCE.getBooleanValue_True();
-
- }
-
-} //TraitTypesPackage
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/traittypes/traittypes/internal/impl/BooleanValueImpl.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/traittypes/traittypes/internal/impl/BooleanValueImpl.java
deleted file mode 100644
index 85d4a90..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/traittypes/traittypes/internal/impl/BooleanValueImpl.java
+++ /dev/null
@@ -1,167 +0,0 @@
-/**
- * Copyright (c) 2007 Oracle Corporation
- *
- * $Id: BooleanValueImpl.java,v 1.2 2010/04/27 17:40:10 gkessler Exp $
- */
-package org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.internal.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.jst.jsf.common.metadata.traittypes.traittypes.BooleanValue;
-import org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.TraitTypesPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Boolean Value</b></em>'.
- *
- * Only String value of 'true' in xml will result in isTrue() being true.
- * All other String values will result in false.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- * <li>{@link org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.internal.impl.BooleanValueImpl#isTrue <em>True</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class BooleanValueImpl extends EObjectImpl implements BooleanValue {
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public static final String copyright = "Copyright (c) 2007 Oracle Corporation"; //$NON-NLS-1$
-
- /**
- * The default value of the '{@link #isTrue() <em>True</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #isTrue()
- * @generated
- * @ordered
- */
- protected static final boolean TRUE_EDEFAULT = false;
-
- /**
- * The cached value of the '{@link #isTrue() <em>True</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #isTrue()
- * @generated
- * @ordered
- */
- protected boolean true_ = TRUE_EDEFAULT;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected BooleanValueImpl() {
- super();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected EClass eStaticClass() {
- return TraitTypesPackage.Literals.BOOLEAN_VALUE;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean isTrue() {
- return true_;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setTrue(boolean newTrue) {
- boolean oldTrue = true_;
- true_ = newTrue;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, TraitTypesPackage.BOOLEAN_VALUE__TRUE, oldTrue, true_));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public Object eGet(int featureID, boolean resolve, boolean coreType) {
- switch (featureID) {
- case TraitTypesPackage.BOOLEAN_VALUE__TRUE:
- return isTrue() ? 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 TraitTypesPackage.BOOLEAN_VALUE__TRUE:
- setTrue(((Boolean)newValue).booleanValue());
- return;
- }
- super.eSet(featureID, newValue);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void eUnset(int featureID) {
- switch (featureID) {
- case TraitTypesPackage.BOOLEAN_VALUE__TRUE:
- setTrue(TRUE_EDEFAULT);
- return;
- }
- super.eUnset(featureID);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean eIsSet(int featureID) {
- switch (featureID) {
- case TraitTypesPackage.BOOLEAN_VALUE__TRUE:
- return true_ != TRUE_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(" (isTrue(): "); //$NON-NLS-1$
- result.append(true_);
- result.append(')');
- return result.toString();
- }
-
-} //BooleanValueImpl
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/traittypes/traittypes/internal/impl/ListOfValuesImpl.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/traittypes/traittypes/internal/impl/ListOfValuesImpl.java
deleted file mode 100644
index 4cbfe03..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/traittypes/traittypes/internal/impl/ListOfValuesImpl.java
+++ /dev/null
@@ -1,157 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: ListOfValuesImpl.java,v 1.4 2008/11/18 22:24:38 gkessler Exp $
- */
-package org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.internal.impl;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.NotificationChain;
-
-import org.eclipse.emf.common.util.EList;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-
-import org.eclipse.emf.ecore.xml.type.SimpleAnyType;
-
-import org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.ListOfValues;
-import org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.TraitTypesPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>List Of Values</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- * <li>{@link org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.internal.impl.ListOfValuesImpl#getEntries <em>Entries</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class ListOfValuesImpl extends EObjectImpl implements ListOfValues {
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public static final String copyright = "Copyright (c) 2007 Oracle Corporation"; //$NON-NLS-1$
-
- /**
- * The cached value of the '{@link #getEntries() <em>Entries</em>}' containment reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getEntries()
- * @generated
- * @ordered
- */
- protected EList entries = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected ListOfValuesImpl() {
- super();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected EClass eStaticClass() {
- return TraitTypesPackage.Literals.LIST_OF_VALUES;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EList getEntries() {
- if (entries == null) {
- entries = new EObjectContainmentEList(SimpleAnyType.class, this, TraitTypesPackage.LIST_OF_VALUES__ENTRIES);
- }
- return entries;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
- switch (featureID) {
- case TraitTypesPackage.LIST_OF_VALUES__ENTRIES:
- return ((InternalEList)getEntries()).basicRemove(otherEnd, msgs);
- }
- return super.eInverseRemove(otherEnd, featureID, msgs);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public Object eGet(int featureID, boolean resolve, boolean coreType) {
- switch (featureID) {
- case TraitTypesPackage.LIST_OF_VALUES__ENTRIES:
- return getEntries();
- }
- return super.eGet(featureID, resolve, coreType);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void eSet(int featureID, Object newValue) {
- switch (featureID) {
- case TraitTypesPackage.LIST_OF_VALUES__ENTRIES:
- getEntries().clear();
- getEntries().addAll((Collection)newValue);
- return;
- }
- super.eSet(featureID, newValue);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void eUnset(int featureID) {
- switch (featureID) {
- case TraitTypesPackage.LIST_OF_VALUES__ENTRIES:
- getEntries().clear();
- return;
- }
- super.eUnset(featureID);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean eIsSet(int featureID) {
- switch (featureID) {
- case TraitTypesPackage.LIST_OF_VALUES__ENTRIES:
- return entries != null && !entries.isEmpty();
- }
- return super.eIsSet(featureID);
- }
-
-} //ListOfValuesImpl
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/traittypes/traittypes/internal/impl/SetGeneratorImpl.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/traittypes/traittypes/internal/impl/SetGeneratorImpl.java
deleted file mode 100644
index 5435dc3..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/traittypes/traittypes/internal/impl/SetGeneratorImpl.java
+++ /dev/null
@@ -1,219 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: SetGeneratorImpl.java,v 1.4 2010/04/27 17:40:10 gkessler Exp $
- */
-package org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.internal.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.jst.jsf.common.metadata.traittypes.traittypes.SetGenerator;
-import org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.TraitTypesPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Set Generator</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- * <li>{@link org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.internal.impl.SetGeneratorImpl#getAlgorithm <em>Algorithm</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.internal.impl.SetGeneratorImpl#getExpression <em>Expression</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class SetGeneratorImpl extends EObjectImpl implements SetGenerator {
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public static final String copyright = "Copyright (c) 2007 Oracle Corporation"; //$NON-NLS-1$
-
- /**
- * The default value of the '{@link #getAlgorithm() <em>Algorithm</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getAlgorithm()
- * @generated
- * @ordered
- */
- protected static final String ALGORITHM_EDEFAULT = null;
-
- /**
- * The cached value of the '{@link #getAlgorithm() <em>Algorithm</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getAlgorithm()
- * @generated
- * @ordered
- */
- protected String algorithm = ALGORITHM_EDEFAULT;
-
- /**
- * The default value of the '{@link #getExpression() <em>Expression</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getExpression()
- * @generated
- * @ordered
- */
- protected static final String EXPRESSION_EDEFAULT = null;
-
- /**
- * The cached value of the '{@link #getExpression() <em>Expression</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getExpression()
- * @generated
- * @ordered
- */
- protected String expression = EXPRESSION_EDEFAULT;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected SetGeneratorImpl() {
- super();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected EClass eStaticClass() {
- return TraitTypesPackage.Literals.SET_GENERATOR;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public String getAlgorithm() {
- return algorithm;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setAlgorithm(String newAlgorithm) {
- String oldAlgorithm = algorithm;
- algorithm = newAlgorithm;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, TraitTypesPackage.SET_GENERATOR__ALGORITHM, oldAlgorithm, algorithm));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public String getExpression() {
- return expression;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setExpression(String newExpression) {
- String oldExpression = expression;
- expression = newExpression;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, TraitTypesPackage.SET_GENERATOR__EXPRESSION, oldExpression, expression));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public Object eGet(int featureID, boolean resolve, boolean coreType) {
- switch (featureID) {
- case TraitTypesPackage.SET_GENERATOR__ALGORITHM:
- return getAlgorithm();
- case TraitTypesPackage.SET_GENERATOR__EXPRESSION:
- return getExpression();
- }
- return super.eGet(featureID, resolve, coreType);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void eSet(int featureID, Object newValue) {
- switch (featureID) {
- case TraitTypesPackage.SET_GENERATOR__ALGORITHM:
- setAlgorithm((String)newValue);
- return;
- case TraitTypesPackage.SET_GENERATOR__EXPRESSION:
- setExpression((String)newValue);
- return;
- }
- super.eSet(featureID, newValue);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void eUnset(int featureID) {
- switch (featureID) {
- case TraitTypesPackage.SET_GENERATOR__ALGORITHM:
- setAlgorithm(ALGORITHM_EDEFAULT);
- return;
- case TraitTypesPackage.SET_GENERATOR__EXPRESSION:
- setExpression(EXPRESSION_EDEFAULT);
- return;
- }
- super.eUnset(featureID);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean eIsSet(int featureID) {
- switch (featureID) {
- case TraitTypesPackage.SET_GENERATOR__ALGORITHM:
- return ALGORITHM_EDEFAULT == null ? algorithm != null : !ALGORITHM_EDEFAULT.equals(algorithm);
- case TraitTypesPackage.SET_GENERATOR__EXPRESSION:
- return EXPRESSION_EDEFAULT == null ? expression != null : !EXPRESSION_EDEFAULT.equals(expression);
- }
- 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(" (algorithm: "); //$NON-NLS-1$
- result.append(algorithm);
- result.append(", expression: "); //$NON-NLS-1$
- result.append(expression);
- result.append(')');
- return result.toString();
- }
-
-} //SetGeneratorImpl
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/traittypes/traittypes/internal/impl/StringValueImpl.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/traittypes/traittypes/internal/impl/StringValueImpl.java
deleted file mode 100644
index 89f5026..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/traittypes/traittypes/internal/impl/StringValueImpl.java
+++ /dev/null
@@ -1,167 +0,0 @@
-/**
- * Copyright (c) 2007 Oracle Corporation
- *
- * $Id: StringValueImpl.java,v 1.1 2010/01/21 00:01:44 gkessler Exp $
- */
-package org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.internal.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.jst.jsf.common.metadata.traittypes.traittypes.StringValue;
-import org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.TraitTypesPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>String Value</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- * <li>{@link org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.internal.impl.StringValueImpl#getValue <em>Value</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class StringValueImpl extends EObjectImpl implements StringValue {
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated NOT
- */
- public static final String copyright = "Copyright (c) 2007 Oracle Corporation"; //$NON-NLS-1$
-
- /**
- * The default value of the '{@link #getValue() <em>Value</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getValue()
- * @generated
- * @ordered
- */
- protected static final String VALUE_EDEFAULT = null;
-
- /**
- * The cached value of the '{@link #getValue() <em>Value</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getValue()
- * @generated
- * @ordered
- */
- protected String value = VALUE_EDEFAULT;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected StringValueImpl() {
- super();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected EClass eStaticClass() {
- return TraitTypesPackage.Literals.STRING_VALUE;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public String getValue() {
- return value;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setValue(String newValue) {
- String oldValue = value;
- value = newValue;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, TraitTypesPackage.STRING_VALUE__VALUE, oldValue, value));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public Object eGet(int featureID, boolean resolve, boolean coreType) {
- switch (featureID) {
- case TraitTypesPackage.STRING_VALUE__VALUE:
- return getValue();
- }
- return super.eGet(featureID, resolve, coreType);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void eSet(int featureID, Object newValue) {
- switch (featureID) {
- case TraitTypesPackage.STRING_VALUE__VALUE:
- setValue((String)newValue);
- return;
- }
- super.eSet(featureID, newValue);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void eUnset(int featureID) {
- switch (featureID) {
- case TraitTypesPackage.STRING_VALUE__VALUE:
- setValue(VALUE_EDEFAULT);
- return;
- }
- super.eUnset(featureID);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean eIsSet(int featureID) {
- switch (featureID) {
- case TraitTypesPackage.STRING_VALUE__VALUE:
- return VALUE_EDEFAULT == null ? value != null : !VALUE_EDEFAULT.equals(value);
- }
- return super.eIsSet(featureID);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated NOT
- */
- public String toString() {
- if (eIsProxy()) return super.toString();
-
- StringBuffer result = new StringBuffer(super.toString());
- result.append(" (value: "); //$NON-NLS-1$
- result.append(value);
- result.append(')');
- return result.toString();
- }
-
-} //StringValueImpl
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/traittypes/traittypes/internal/impl/TraitTypesFactoryImpl.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/traittypes/traittypes/internal/impl/TraitTypesFactoryImpl.java
deleted file mode 100644
index d67b816..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/traittypes/traittypes/internal/impl/TraitTypesFactoryImpl.java
+++ /dev/null
@@ -1,141 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: TraitTypesFactoryImpl.java,v 1.9 2010/04/27 17:40:10 gkessler Exp $
- */
-package org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.internal.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.jst.jsf.common.metadata.traittypes.traittypes.BooleanValue;
-import org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.ListOfValues;
-import org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.SetGenerator;
-import org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.StringValue;
-import org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.TraitTypesFactory;
-import org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.TraitTypesPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model <b>Factory</b>.
- * <!-- end-user-doc -->
- * @generated
- */
-public class TraitTypesFactoryImpl extends EFactoryImpl implements TraitTypesFactory {
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public static final String copyright = "Copyright (c) 2007 Oracle Corporation"; //$NON-NLS-1$
-
- /**
- * Creates the default factory implementation.
- * <!-- begin-user-doc -->
- * @return the factory
- * <!-- end-user-doc -->
- * @generated NOT
- */
- public static TraitTypesFactory init() {
- try {
- TraitTypesFactory theTraitTypesFactory = (TraitTypesFactory)EPackage.Registry.INSTANCE.getEFactory("http://org.eclipse.jst.jsf.common.metadata/metadataTraitTypes.ecore"); //$NON-NLS-1$
- if (theTraitTypesFactory != null) {
- return theTraitTypesFactory;
- }
- }
- catch (Exception exception) {
- EcorePlugin.INSTANCE.log(exception);
- }
- return new TraitTypesFactoryImpl();
- }
-
- /**
- * Creates an instance of the factory.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public TraitTypesFactoryImpl() {
- super();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EObject create(EClass eClass) {
- switch (eClass.getClassifierID()) {
- case TraitTypesPackage.LIST_OF_VALUES: return createListOfValues();
- case TraitTypesPackage.SET_GENERATOR: return createSetGenerator();
- case TraitTypesPackage.STRING_VALUE: return createStringValue();
- case TraitTypesPackage.BOOLEAN_VALUE: return createBooleanValue();
- default:
- throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$
- }
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public ListOfValues createListOfValues() {
- ListOfValuesImpl listOfValues = new ListOfValuesImpl();
- return listOfValues;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public SetGenerator createSetGenerator() {
- SetGeneratorImpl setGenerator = new SetGeneratorImpl();
- return setGenerator;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public StringValue createStringValue() {
- StringValueImpl stringValue = new StringValueImpl();
- return stringValue;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public BooleanValue createBooleanValue() {
- BooleanValueImpl booleanValue = new BooleanValueImpl();
- return booleanValue;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public TraitTypesPackage getTraitTypesPackage() {
- return (TraitTypesPackage)getEPackage();
- }
-
- /**
- * <!-- begin-user-doc -->
- * @return the package
- * <!-- end-user-doc -->
- * @deprecated
- * @generated
- */
- public static TraitTypesPackage getPackage() {
- return TraitTypesPackage.eINSTANCE;
- }
-
-} //TraitTypesFactoryImpl
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/traittypes/traittypes/internal/impl/TraitTypesPackageImpl.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/traittypes/traittypes/internal/impl/TraitTypesPackageImpl.java
deleted file mode 100644
index 37db295..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/traittypes/traittypes/internal/impl/TraitTypesPackageImpl.java
+++ /dev/null
@@ -1,355 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: TraitTypesPackageImpl.java,v 1.9 2010/04/27 17:40:10 gkessler Exp $
- */
-package org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.internal.impl;
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.ecore.impl.EPackageImpl;
-import org.eclipse.emf.ecore.xml.type.XMLTypePackage;
-import org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.BooleanValue;
-import org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.ListOfValues;
-import org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.SetGenerator;
-import org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.StringValue;
-import org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.TraitTypesFactory;
-import org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.TraitTypesPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model <b>Package</b>.
- * <!-- end-user-doc -->
- * @generated
- */
-public class TraitTypesPackageImpl extends EPackageImpl implements TraitTypesPackage {
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public static final String copyright = "Copyright (c) 2007 Oracle Corporation"; //$NON-NLS-1$
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private EClass listOfValuesEClass = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private EClass setGeneratorEClass = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private EClass stringValueEClass = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private EClass booleanValueEClass = 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.jst.jsf.common.metadata.traittypes.traittypes.TraitTypesPackage#eNS_URI
- * @see #init()
- * @generated
- */
- private TraitTypesPackageImpl() {
- super(eNS_URI, TraitTypesFactory.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.
- *
- * <p>This method is used to initialize {@link TraitTypesPackage#eINSTANCE} when that field is accessed.
- * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.
- * <!-- begin-user-doc -->
- * @return the package
- * <!-- end-user-doc -->
- * @see #eNS_URI
- * @see #createPackageContents()
- * @see #initializePackageContents()
- * @generated
- */
- public static TraitTypesPackage init() {
- if (isInited) return (TraitTypesPackage)EPackage.Registry.INSTANCE.getEPackage(TraitTypesPackage.eNS_URI);
-
- // Obtain or create and register package
- TraitTypesPackageImpl theTraitTypesPackage = (TraitTypesPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof TraitTypesPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new TraitTypesPackageImpl());
-
- isInited = true;
-
- // Initialize simple dependencies
- XMLTypePackage.eINSTANCE.eClass();
-
- // Create package meta-data objects
- theTraitTypesPackage.createPackageContents();
-
- // Initialize created meta-data
- theTraitTypesPackage.initializePackageContents();
-
- // Mark meta-data to indicate it can't be changed
- theTraitTypesPackage.freeze();
-
-
- // Update the registry and return the package
- EPackage.Registry.INSTANCE.put(TraitTypesPackage.eNS_URI, theTraitTypesPackage);
- return theTraitTypesPackage;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EClass getListOfValues() {
- return listOfValuesEClass;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EReference getListOfValues_Entries() {
- return (EReference)listOfValuesEClass.getEStructuralFeatures().get(0);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EClass getSetGenerator() {
- return setGeneratorEClass;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getSetGenerator_Algorithm() {
- return (EAttribute)setGeneratorEClass.getEStructuralFeatures().get(0);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getSetGenerator_Expression() {
- return (EAttribute)setGeneratorEClass.getEStructuralFeatures().get(1);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EClass getStringValue() {
- return stringValueEClass;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getStringValue_Value() {
- return (EAttribute)stringValueEClass.getEStructuralFeatures().get(0);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EClass getBooleanValue() {
- return booleanValueEClass;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getBooleanValue_True() {
- return (EAttribute)booleanValueEClass.getEStructuralFeatures().get(0);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public TraitTypesFactory getTraitTypesFactory() {
- return (TraitTypesFactory)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
- listOfValuesEClass = createEClass(LIST_OF_VALUES);
- createEReference(listOfValuesEClass, LIST_OF_VALUES__ENTRIES);
-
- setGeneratorEClass = createEClass(SET_GENERATOR);
- createEAttribute(setGeneratorEClass, SET_GENERATOR__ALGORITHM);
- createEAttribute(setGeneratorEClass, SET_GENERATOR__EXPRESSION);
-
- stringValueEClass = createEClass(STRING_VALUE);
- createEAttribute(stringValueEClass, STRING_VALUE__VALUE);
-
- booleanValueEClass = createEClass(BOOLEAN_VALUE);
- createEAttribute(booleanValueEClass, BOOLEAN_VALUE__TRUE);
- }
-
- /**
- * <!-- 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
- XMLTypePackage theXMLTypePackage = (XMLTypePackage)EPackage.Registry.INSTANCE.getEPackage(XMLTypePackage.eNS_URI);
-
- // Add supertypes to classes
-
- // Initialize classes and features; add operations and parameters
- initEClass(listOfValuesEClass, ListOfValues.class, "ListOfValues", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEReference(getListOfValues_Entries(), theXMLTypePackage.getSimpleAnyType(), null, "entries", null, 0, -1, ListOfValues.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
- initEClass(setGeneratorEClass, SetGenerator.class, "SetGenerator", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEAttribute(getSetGenerator_Algorithm(), ecorePackage.getEString(), "algorithm", null, 0, 1, SetGenerator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getSetGenerator_Expression(), ecorePackage.getEString(), "expression", null, 0, 1, SetGenerator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
- initEClass(stringValueEClass, StringValue.class, "StringValue", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEAttribute(getStringValue_Value(), ecorePackage.getEString(), "value", null, 1, 1, StringValue.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
- initEClass(booleanValueEClass, BooleanValue.class, "BooleanValue", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEAttribute(getBooleanValue_True(), ecorePackage.getEBoolean(), "true", null, 1, 1, BooleanValue.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
- // Create resource
- createResource(eNS_URI);
-
- // Create annotations
- // http:///org/eclipse/emf/ecore/util/ExtendedMetaData
- createExtendedMetaDataAnnotations();
- }
-
- /**
- * Initializes the annotations for <b>http:///org/eclipse/emf/ecore/util/ExtendedMetaData</b>.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected void createExtendedMetaDataAnnotations() {
- String source = "http:///org/eclipse/emf/ecore/util/ExtendedMetaData"; //$NON-NLS-1$
- addAnnotation
- (getListOfValues_Entries(),
- source,
- new String[] {
- "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
- "name", "item" //$NON-NLS-1$ //$NON-NLS-2$
- });
- addAnnotation
- (getSetGenerator_Algorithm(),
- source,
- new String[] {
- "kind", "element" //$NON-NLS-1$ //$NON-NLS-2$
- });
- addAnnotation
- (getSetGenerator_Expression(),
- source,
- new String[] {
- "kind", "element" //$NON-NLS-1$ //$NON-NLS-2$
- });
- addAnnotation
- (stringValueEClass,
- source,
- new String[] {
- "kind", "simple" //$NON-NLS-1$ //$NON-NLS-2$
- });
- addAnnotation
- (getStringValue_Value(),
- source,
- new String[] {
- "kind", "simple" //$NON-NLS-1$ //$NON-NLS-2$
- });
- addAnnotation
- (booleanValueEClass,
- source,
- new String[] {
- "kind", "simple" //$NON-NLS-1$ //$NON-NLS-2$
- });
- addAnnotation
- (getBooleanValue_True(),
- source,
- new String[] {
- "kind", "simple" //$NON-NLS-1$ //$NON-NLS-2$
- });
- }
-
-} //TraitTypesPackageImpl
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/traittypes/traittypes/internal/util/TraitTypesAdapterFactory.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/traittypes/traittypes/internal/util/TraitTypesAdapterFactory.java
deleted file mode 100644
index 34b63d0..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/traittypes/traittypes/internal/util/TraitTypesAdapterFactory.java
+++ /dev/null
@@ -1,179 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: TraitTypesAdapterFactory.java,v 1.7 2010/04/27 17:40:11 gkessler Exp $
- */
-package org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.internal.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.jst.jsf.common.metadata.traittypes.traittypes.BooleanValue;
-import org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.ListOfValues;
-import org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.SetGenerator;
-import org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.StringValue;
-import org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.TraitTypesPackage;
-
-/**
- * <!-- 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.jst.jsf.common.metadata.traittypes.traittypes.TraitTypesPackage
- * @generated
- */
-public class TraitTypesAdapterFactory extends AdapterFactoryImpl {
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public static final String copyright = "Copyright (c) 2007 Oracle Corporation"; //$NON-NLS-1$
-
- /**
- * The cached model package.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected static TraitTypesPackage modelPackage;
-
- /**
- * Creates an instance of the adapter factory.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public TraitTypesAdapterFactory() {
- if (modelPackage == null) {
- modelPackage = TraitTypesPackage.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 TraitTypesSwitch modelSwitch =
- new TraitTypesSwitch() {
- public Object caseListOfValues(ListOfValues object) {
- return createListOfValuesAdapter();
- }
- public Object caseSetGenerator(SetGenerator object) {
- return createSetGeneratorAdapter();
- }
- public Object caseStringValue(StringValue object) {
- return createStringValueAdapter();
- }
- public Object caseBooleanValue(BooleanValue object) {
- return createBooleanValueAdapter();
- }
- 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.jst.jsf.common.metadata.traittypes.traittypes.ListOfValues <em>List Of Values</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.jst.jsf.common.metadata.traittypes.traittypes.ListOfValues
- * @generated
- */
- public Adapter createListOfValuesAdapter() {
- return null;
- }
-
- /**
- * Creates a new adapter for an object of class '{@link org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.SetGenerator <em>Set Generator</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.jst.jsf.common.metadata.traittypes.traittypes.SetGenerator
- * @generated
- */
- public Adapter createSetGeneratorAdapter() {
- return null;
- }
-
- /**
- * Creates a new adapter for an object of class '{@link org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.StringValue <em>String Value</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.jst.jsf.common.metadata.traittypes.traittypes.StringValue
- * @generated
- */
- public Adapter createStringValueAdapter() {
- return null;
- }
-
- /**
- * Creates a new adapter for an object of class '{@link org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.BooleanValue <em>Boolean Value</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.jst.jsf.common.metadata.traittypes.traittypes.BooleanValue
- * @generated
- */
- public Adapter createBooleanValueAdapter() {
- 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;
- }
-
-} //TraitTypesAdapterFactory
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/traittypes/traittypes/internal/util/TraitTypesResourceFactoryImpl.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/traittypes/traittypes/internal/util/TraitTypesResourceFactoryImpl.java
deleted file mode 100644
index a7deeae..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/traittypes/traittypes/internal/util/TraitTypesResourceFactoryImpl.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: TraitTypesResourceFactoryImpl.java,v 1.5 2010/04/27 17:40:11 gkessler Exp $
- */
-package org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.internal.util;
-
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.impl.ResourceFactoryImpl;
-import org.eclipse.emf.ecore.xmi.XMLResource;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Resource Factory</b> associated with the package.
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.internal.util.TraitTypesResourceImpl
- * @generated
- */
-public class TraitTypesResourceFactoryImpl extends ResourceFactoryImpl {
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public static final String copyright = "Copyright (c) 2007 Oracle Corporation"; //$NON-NLS-1$
-
- /**
- * Creates an instance of the resource factory.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public TraitTypesResourceFactoryImpl() {
- super();
- }
-
- /**
- * Creates an instance of the resource.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public Resource createResource(URI uri) {
- XMLResource result = new TraitTypesResourceImpl(uri);
- result.getDefaultSaveOptions().put(XMLResource.OPTION_EXTENDED_META_DATA, Boolean.TRUE);
- result.getDefaultLoadOptions().put(XMLResource.OPTION_EXTENDED_META_DATA, Boolean.TRUE);
-
- result.getDefaultSaveOptions().put(XMLResource.OPTION_SCHEMA_LOCATION, Boolean.TRUE);
-
- result.getDefaultLoadOptions().put(XMLResource.OPTION_USE_ENCODED_ATTRIBUTE_STYLE, Boolean.TRUE);
- result.getDefaultSaveOptions().put(XMLResource.OPTION_USE_ENCODED_ATTRIBUTE_STYLE, Boolean.TRUE);
-
- result.getDefaultLoadOptions().put(XMLResource.OPTION_USE_LEXICAL_HANDLER, Boolean.TRUE);
- return result;
- }
-
-} //TraitTypesResourceFactoryImpl
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/traittypes/traittypes/internal/util/TraitTypesResourceImpl.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/traittypes/traittypes/internal/util/TraitTypesResourceImpl.java
deleted file mode 100644
index 1498996..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/traittypes/traittypes/internal/util/TraitTypesResourceImpl.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: TraitTypesResourceImpl.java,v 1.5 2010/04/27 17:40:11 gkessler Exp $
- */
-package org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.internal.util;
-
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.xmi.impl.XMLResourceImpl;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Resource </b> associated with the package.
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.internal.util.TraitTypesResourceFactoryImpl
- * @generated
- */
-public class TraitTypesResourceImpl extends XMLResourceImpl {
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public static final String copyright = "Copyright (c) 2007 Oracle Corporation"; //$NON-NLS-1$
-
- /**
- * Creates an instance of the resource.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param uri the URI of the new resource.
- * @generated
- */
- public TraitTypesResourceImpl(URI uri) {
- super(uri);
- }
-
-} //TraitTypesResourceImpl
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/traittypes/traittypes/internal/util/TraitTypesSwitch.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/traittypes/traittypes/internal/util/TraitTypesSwitch.java
deleted file mode 100644
index a3548f1..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/traittypes/traittypes/internal/util/TraitTypesSwitch.java
+++ /dev/null
@@ -1,206 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: TraitTypesSwitch.java,v 1.10 2010/04/27 17:40:11 gkessler Exp $
- */
-package org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.internal.util;
-
-import java.util.List;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.BooleanValue;
-import org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.ListOfValues;
-import org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.SetGenerator;
-import org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.StringValue;
-import org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.TraitTypesPackage;
-
-/**
- * <!-- 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.jst.jsf.common.metadata.traittypes.traittypes.TraitTypesPackage
- * @generated
- */
-public class TraitTypesSwitch {
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public static final String copyright = "Copyright (c) 2007 Oracle Corporation"; //$NON-NLS-1$
-
- /**
- * The cached model package
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected static TraitTypesPackage modelPackage;
-
- /**
- * Creates an instance of the switch.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public TraitTypesSwitch() {
- if (modelPackage == null) {
- modelPackage = TraitTypesPackage.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 -->
- * @param theEObject
- * <!-- 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 -->
- * @param theEClass
- * @param theEObject
- * <!-- 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);
- }
- 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 -->
- * @param classifierID
- * @param theEObject
- * <!-- 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 TraitTypesPackage.LIST_OF_VALUES: {
- ListOfValues listOfValues = (ListOfValues)theEObject;
- Object result = caseListOfValues(listOfValues);
- if (result == null) result = defaultCase(theEObject);
- return result;
- }
- case TraitTypesPackage.SET_GENERATOR: {
- SetGenerator setGenerator = (SetGenerator)theEObject;
- Object result = caseSetGenerator(setGenerator);
- if (result == null) result = defaultCase(theEObject);
- return result;
- }
- case TraitTypesPackage.STRING_VALUE: {
- StringValue stringValue = (StringValue)theEObject;
- Object result = caseStringValue(stringValue);
- if (result == null) result = defaultCase(theEObject);
- return result;
- }
- case TraitTypesPackage.BOOLEAN_VALUE: {
- BooleanValue booleanValue = (BooleanValue)theEObject;
- Object result = caseBooleanValue(booleanValue);
- if (result == null) result = defaultCase(theEObject);
- return result;
- }
- default: return defaultCase(theEObject);
- }
- }
-
- /**
- * Returns the result of interpreting the object as an instance of '<em>List Of Values</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>List Of Values</em>'.
- * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
- * @generated
- */
- public Object caseListOfValues(ListOfValues object) {
- return null;
- }
-
- /**
- * Returns the result of interpreting the object as an instance of '<em>Set Generator</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>Set Generator</em>'.
- * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
- * @generated
- */
- public Object caseSetGenerator(SetGenerator object) {
- return null;
- }
-
- /**
- * Returns the result of interpreting the object as an instance of '<em>String Value</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>String Value</em>'.
- * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
- * @generated
- */
- public Object caseStringValue(StringValue object) {
- return null;
- }
-
- /**
- * Returns the result of interpreting the object as an instance of '<em>Boolean Value</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>Boolean Value</em>'.
- * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
- * @generated
- */
- public Object caseBooleanValue(BooleanValue 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;
- }
-
-} //TraitTypesSwitch
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/traittypes/traittypes/internal/util/TraitTypesXMLProcessor.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/traittypes/traittypes/internal/util/TraitTypesXMLProcessor.java
deleted file mode 100644
index f65ad6b..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/traittypes/traittypes/internal/util/TraitTypesXMLProcessor.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: TraitTypesXMLProcessor.java,v 1.6 2010/04/27 17:40:11 gkessler Exp $
- */
-package org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.internal.util;
-
-import java.util.Map;
-
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.xmi.util.XMLProcessor;
-import org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.TraitTypesPackage;
-
-/**
- * This class contains helper methods to serialize and deserialize XML documents
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class TraitTypesXMLProcessor extends XMLProcessor {
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public static final String copyright = "Copyright (c) 2007 Oracle Corporation"; //$NON-NLS-1$
-
-
- /**
- * Public constructor to instantiate the helper.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public TraitTypesXMLProcessor() {
- super((EPackage.Registry.INSTANCE));
- TraitTypesPackage.eINSTANCE.eClass();
- }
-
- /**
- * Register for "*" and "xml" file extensions the TraitTypesResourceFactoryImpl factory.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected Map getRegistrations() {
- if (registrations == null) {
- super.getRegistrations();
- registrations.put(XML_EXTENSION, new TraitTypesResourceFactoryImpl());
- registrations.put(STAR_EXTENSION, new TraitTypesResourceFactoryImpl());
- }
- return registrations;
- }
-
-} //TraitTypesXMLProcessor
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/traittypes/traittypes/package-info.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/traittypes/traittypes/package-info.java
deleted file mode 100644
index 76e2245..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/traittypes/traittypes/package-info.java
+++ /dev/null
@@ -1,17 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Oracle 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:
- * Oracle - initial API and implementation
- *
- ********************************************************************************/
-
-/**
- * Common meta-data traits.
- * <p><b>Provisional API - subject to change</b></p>
- */
-package org.eclipse.jst.jsf.common.metadata.traittypes.traittypes;
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/sets/AxiomaticSet.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/sets/AxiomaticSet.java
deleted file mode 100644
index 8bc2881..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/sets/AxiomaticSet.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2007 Oracle Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Oracle Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.common.sets;
-
-import java.util.Set;
-
-/**
- * A java.util.Set with the basic mathematic set axioms of
- * extensionality (equality), union, intersection,
- * relative complement (set subtraction) and empty (already
- * supported by Set).
- *
- * <p><b>Provisional API - subject to change</b></p>
- *
- * @author cbateman
- *
- */
-public interface AxiomaticSet extends Set
-{
- /**
- * Implementations should aim to provide O(mn) time cost
- * where n is the number of elements in this set and
- * m is the cost to check membership of an element in this
- * set in toSet. When a set is itself a member of a set,
- * the implementation must call isEquivalent on those subsets
- * recursively.
- *
- * @param toSet
- *
- * @return true iff this set is equivalent toSet. Note
- * that extensionality holds that two sets are equivalent
- * if and only if they contain exactly the same elements.
- *
- *
- */
- boolean isEquivalent(AxiomaticSet toSet);
-
- /**
- * @param set
- * @return the axiomatic union of this set with set
- */
- AxiomaticSet union(AxiomaticSet set);
-
-
- /**
- * @param set
- * @return the axiomatic intersection of this set with set
- */
- AxiomaticSet intersect(AxiomaticSet set);
-
- /**
- * @param set
- * @return convenience method that must be equivalent to
- * (this.intersect(set).isEmpty())
- */
- boolean isDisjoint(AxiomaticSet set);
-
- /**
- * The set constructed by the removing the intersection
- * of this with set from this. The set will contain all
- * elements in this that are not in set.
- *
- * Eqivalence: this - set
- *
- * @param set
- * @return the relative complement or theoretic difference of
- * set from this
- */
- AxiomaticSet subtract(AxiomaticSet set);
-
- /**
- * @return the first element in the set. There is no guarantee which element
- * will be chosen, but the call should always return the same element of the set
- * for multiple invocations on the same set. Generally this is a convience method
- * for when the set only contains one element.
- *
- * @throws java.util.NoSuchElementException if the set is empty.
- */
- Object getFirstElement();
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/sets/AxiomaticSetUtil.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/sets/AxiomaticSetUtil.java
deleted file mode 100644
index baf9f8d..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/sets/AxiomaticSetUtil.java
+++ /dev/null
@@ -1,109 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2007 Oracle Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Oracle Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.common.sets;
-
-import java.util.Iterator;
-import java.util.Set;
-
-/**
- * Generic (unoptimized) utilities for doing set operations.
- *
- * <p><b>Provisional API - subject to change</b></p>
- *
- * @author cbateman
- *
- */
-public class AxiomaticSetUtil
-{
- /**
- * Creates the union of firstSet and secondSet in newSet.
- * @param newSet
- * @param firstSet
- * @param secondSet
- */
- public static void union(AxiomaticSet newSet, AxiomaticSet firstSet, AxiomaticSet secondSet)
- {
- newSet.addAll(firstSet);
- newSet.addAll(secondSet);
- }
-
- /**
- * Creates an intersection of firstSet and secondSet in newSet
- * @param newSet
- * @param firstSet
- * @param secondSet
- */
- public static void intersect(AxiomaticSet newSet, AxiomaticSet firstSet, AxiomaticSet secondSet)
- {
- // minor optimization: always iterate through the smaller of the
- // two sets. This way we iterate through the smallest number
- // of elements
- Iterator it = null;
- Set testSet = null;
- // if other set smaller, get its iterator
- if (secondSet.size() < firstSet.size())
- {
- it = secondSet.iterator();
- // test set is other set
- testSet = firstSet;
- }
- // first set is smaller or same
- else
- {
- it = firstSet.iterator();
- testSet = secondSet;
- }
-
- while (it.hasNext())
- {
- Object member = it.next();
- if (testSet.contains(member))
- {
- newSet.add(member);
- }
- }
- }
-
- /**
- * @param firstSet
- * @param secondSet
- * @return true firstSet and secondSet have no common elements (their intersection is empty)
- */
- public static boolean isDisjoint(AxiomaticSet firstSet, AxiomaticSet secondSet)
- {
- return firstSet.intersect(secondSet).isEmpty();
- }
-
- /**
- * @param firstOperand
- * @param secondOperand
- * @return the set formed by removing the intersection of firstOperand and secondOperand
- * from firstOperand, leaving only those elements in firstOperand that are not in secondOperand
- */
- public static AxiomaticSet subtract(
- AxiomaticSet firstOperand, AxiomaticSet secondOperand)
- {
- ConcreteAxiomaticSet relativeComplement = new ConcreteAxiomaticSet();
-
- // iterate through firstOperand and add each element to the result
- // set that is not in secondOperand
- for (final Iterator it = firstOperand.iterator(); it.hasNext();)
- {
- Object member = it.next();
- if (!secondOperand.contains(member))
- {
- relativeComplement.add(member);
- }
- }
-
- return relativeComplement;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/sets/ConcreteAxiomaticSet.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/sets/ConcreteAxiomaticSet.java
deleted file mode 100644
index b82c03f..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/sets/ConcreteAxiomaticSet.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2007 Oracle Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Oracle Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.common.sets;
-
-import java.util.HashSet;
-
-/**
- * Implements a simple axiomatic set based on a hashset
- *
- * <p><b>Provisional API - subject to change</b></p>
- *
- * @author cbateman
- *
- */
-public class ConcreteAxiomaticSet extends HashSet implements AxiomaticSet {
-
- /**
- * serial version id
- */
- private static final long serialVersionUID = 7094728081135008203L;
-
- public AxiomaticSet intersect(AxiomaticSet set) {
- AxiomaticSet intersection = new ConcreteAxiomaticSet();
- AxiomaticSetUtil.intersect(intersection, this, set);
- return intersection;
- }
-
- public boolean isEquivalent(AxiomaticSet toSet) {
- return equals(toSet);
- }
-
- public AxiomaticSet union(AxiomaticSet set) {
- AxiomaticSet union = new ConcreteAxiomaticSet();
- AxiomaticSetUtil.union(union, this, set);
- return union;
- }
-
- public boolean isDisjoint(AxiomaticSet set) {
- return AxiomaticSetUtil.isDisjoint(this, set);
- }
-
- public Object getFirstElement() {
- return iterator().next();
- }
-
- public AxiomaticSet subtract(AxiomaticSet set) {
- return AxiomaticSetUtil.subtract(this, set);
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/sets/NodeSet.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/sets/NodeSet.java
deleted file mode 100644
index 146b833..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/sets/NodeSet.java
+++ /dev/null
@@ -1,131 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2007 Oracle Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Oracle Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.common.sets;
-
-import java.util.AbstractSet;
-import java.util.Iterator;
-import java.util.NoSuchElementException;
-
-import org.w3c.dom.NodeList;
-
-/**
- * A set backed by a W3C NodeList so as to avoid copying. Note that operations
- * that return new sets still invoke a copy. Also, membership operations
- * require O(n) time. This should generally used for sets that are assumed to be
- * small where O(n) search time will be small compared to doing a full copy.
- *
- * This set is immutable (mutation methods throw exceptions)
- *
- * <p><b>Provisional API - subject to change</b></p>
- *
- * @author cbateman
- *
- */
-public class NodeSet extends AbstractSet implements AxiomaticSet
-{
- private NodeList _data;
-
- /**
- * @param data -- wrap the actual data source
- */
- public NodeSet(NodeList data)
- {
- _data = data;
- }
-
- public Iterator iterator() {
- return new Iterator()
- {
- private int pos = 0;
-
- public boolean hasNext() {
- return pos < _data.getLength();
- }
-
- public Object next() {
- return _data.item(pos++);
- }
-
- public void remove() {
- throw new UnsupportedOperationException();
- }
-
- };
- }
-
- public int size() {
- return _data.getLength();
- }
-
- public AxiomaticSet intersect(AxiomaticSet set) {
- ConcreteAxiomaticSet newSet = new ConcreteAxiomaticSet();
- AxiomaticSetUtil.intersect(newSet, this, set);
- return newSet;
- }
-
- public boolean isEquivalent(AxiomaticSet toSet) {
- if (this == toSet)
- {
- return true;
- }
-
- if (toSet instanceof NodeSet
- && ((NodeSet)toSet)._data == this._data)
- {
- return true;
- }
-
- // if different sizes, false
- if (toSet.size() != size())
- {
- return false;
- }
-
- // otherwise, compare item by item
- // Iterator through me with the hope that look ups
- // are more efficent in toSet
- for (Iterator it = iterator(); it.hasNext();)
- {
- Object obj = it.next();
-
- if (!toSet.contains(obj))
- {
- // fail fase on membership mismatch
- return false;
- }
- }
-
- // if we get to here then the item by item match succeeded
- return true;
- }
-
- public AxiomaticSet union(AxiomaticSet set) {
- ConcreteAxiomaticSet newSet = new ConcreteAxiomaticSet();
- AxiomaticSetUtil.union(newSet, this, set);
- return newSet;
- }
-
- public boolean isDisjoint(AxiomaticSet set) {
- return AxiomaticSetUtil.isDisjoint(this, set);
- }
-
- public Object getFirstElement() {
- if (_data.getLength()>0)
- {
- return _data.item(0);
- }
- throw new NoSuchElementException("Set is empty"); //$NON-NLS-1$
- }
-
- public AxiomaticSet subtract(AxiomaticSet set) {
- return AxiomaticSetUtil.subtract(this, set);
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/sets/constraint/AbstractMemberConstraint.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/sets/constraint/AbstractMemberConstraint.java
deleted file mode 100644
index d71ebf0..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/sets/constraint/AbstractMemberConstraint.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2007 Oracle Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Oracle Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.common.sets.constraint;
-
-import org.eclipse.emf.common.util.Diagnostic;
-import org.eclipse.jst.jsf.common.sets.AxiomaticSet;
-
-/**
- * A set constraint that is specific to members of the set.
- *
- * <p><b>Provisional API - subject to change</b></p>
- *
- * @author cbateman
- *
- */
-public class AbstractMemberConstraint extends AbstractSetConstraint {
-
- public Diagnostic isSatisfied(AxiomaticSet set) {
- return null;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/sets/constraint/AbstractSetConstraint.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/sets/constraint/AbstractSetConstraint.java
deleted file mode 100644
index f176a37..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/sets/constraint/AbstractSetConstraint.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2007 Oracle Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Oracle Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.common.sets.constraint;
-
-import org.eclipse.emf.common.util.Diagnostic;
-import org.eclipse.jst.jsf.common.sets.AxiomaticSet;
-
-/**
- * Super-class of all axiomatic set constraints.
- *
- * A set constraint applies one or more pre-conditions on a set
- * and returns a diagnostic that flags whether or not the set
- * satisfies that constraint or not.
- *
- * <p><b>Provisional API - subject to change</b></p>
- *
- * @author cbateman
- *
- */
-public abstract class AbstractSetConstraint
-{
- /**
- * The following post-conditions must hold:
- *
- * 1) if the set satisfies the constraint with no caveats,
- * the returned diagnostic must in turn satisfy
- * Diagnostic.getSeverity() == Diagnostic.OK
- *
- * 2) if the set does not satisfy the constraint, the returned diagnostic
- * must satisfy Diagnostic.getSeverity() == Diagnostic.ERROR
- *
- * 3) if the set strictly satisfies the constraint but the constraint includes
- * parameters that can only be heuristically applied, the constraint may choose
- * to return a diagnostic where Diagnostic.getSeverity() == Diagnostic.WARNING
- *
- * The diagnostic returned should _never_ have any other severity but OK, ERROR or WARNING
- *
- * Algorithmically:
- *
- * Constraint is satisfied can be tested by Diagnostic.getSeverity() != ERROR
- * Constraint is not satisfied can be tested by Diagnostic.getSeverity() == ERROR
- *
- * @param set
- * @return a diagnostic object that contains information about whether
- * or not the constraint is satisfied for set.
- * <b>MUST NOT RETURN NULL</b>
- */
- public abstract Diagnostic isSatisfied(AxiomaticSet set);
-
- /**
- * Convenience method
- *
- * @param set
- * @return true if the constraint is satisfied for set
- */
- public final boolean passesConstraint(AxiomaticSet set)
- {
- return isSatisfied(set).getSeverity() != Diagnostic.ERROR;
- }
-
- /**
- * Convenience method
- *
- * @param set
- * @return true if the constraint is <b>not</b> satisfied for set
- */
- public final boolean failsConstraint(AxiomaticSet set)
- {
- return !passesConstraint(set);
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/sets/constraint/package-info.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/sets/constraint/package-info.java
deleted file mode 100644
index 94a9016..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/sets/constraint/package-info.java
+++ /dev/null
@@ -1,17 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Oracle 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:
- * Oracle - initial API and implementation
- *
- ********************************************************************************/
-
-/**
- * Classes for creating validation constraints on sets.
- * <p><b>Provisional API - subject to change</b></p>
- */
-package org.eclipse.jst.jsf.common.sets.constraint;
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/sets/mapping/AbstractObjectInjectiveSetMapping.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/sets/mapping/AbstractObjectInjectiveSetMapping.java
deleted file mode 100644
index 8c2d5b5..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/sets/mapping/AbstractObjectInjectiveSetMapping.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2007 Oracle Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Oracle Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.common.sets.mapping;
-
-import java.util.Iterator;
-
-import org.eclipse.jst.jsf.common.sets.AxiomaticSet;
-import org.eclipse.jst.jsf.common.sets.ConcreteAxiomaticSet;
-
-/**
- * Super-class of all ObjectInjectiveSetMapping.
- *
- * <p><b>Provisional API - subject to change</b></p>
- *
- * @author cbateman
- *
- */
-public abstract class AbstractObjectInjectiveSetMapping implements
- ObjectInjectiveSetMapping {
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.jsf.common.sets.mapping.ObjectInjectiveSetMapping#mapIterator(org.eclipse.jst.jsf.common.sets.AxiomaticSet)
- */
- public Iterator mapIterator(final AxiomaticSet set)
- {
- return new Iterator()
- {
- final Iterator setIterator = set.iterator();
-
- public boolean hasNext()
- {
- return setIterator.hasNext();
- }
-
- public Object next()
- {
- return map(setIterator.next());
- }
-
- public void remove()
- {
- throw new UnsupportedOperationException("cannot modify iterator"); //$NON-NLS-1$
- }
- };
- }
-
- /**
- * @param element
- * @return the result object from the mapping on element
- */
- public abstract Object map(Object element);
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.jsf.common.sets.mapping.AxiomaticSetMapping#map(org.eclipse.jst.jsf.common.sets.AxiomaticSet)
- */
- public final AxiomaticSet map(AxiomaticSet set) {
- AxiomaticSet resultSet = new ConcreteAxiomaticSet();
-
- for (final Iterator it = mapIterator(set); it.hasNext();)
- {
- resultSet.add(it.next());
- }
-
- return resultSet;
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/sets/mapping/AxiomaticSetMapping.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/sets/mapping/AxiomaticSetMapping.java
deleted file mode 100644
index d6ab1ff..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/sets/mapping/AxiomaticSetMapping.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2007 Oracle Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Oracle Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.common.sets.mapping;
-
-import org.eclipse.jst.jsf.common.sets.AxiomaticSet;
-
-/**
- * Defines an axiomatic mapping from set to another. In formal notation, this may
- * also be defined as a "function" or a "proposition".
- *
- * Applying the map method can be seen as being equivalent to:
- *
- * AxiomaticSetMapping: set -> map(set)
- *
- * <p><b>Provisional API - subject to change</b></p>
- *
- * @author cbateman
- *
- */
-public interface AxiomaticSetMapping
-{
- /**
- * @param set
- * @return the new set resulting from applying the map to set
- */
- AxiomaticSet map(AxiomaticSet set);
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/sets/mapping/ObjectInjectiveSetMapping.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/sets/mapping/ObjectInjectiveSetMapping.java
deleted file mode 100644
index ce33eec..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/sets/mapping/ObjectInjectiveSetMapping.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2007 Oracle Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Oracle Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.common.sets.mapping;
-
-import java.util.Iterator;
-
-import org.eclipse.jst.jsf.common.sets.AxiomaticSet;
-
-/**
- * A type of axiomatic set mapping that operates injectively on the input
- * set to create its result set. Note that the injection (one-to-oneness)
- * of the mapping is based on Java objects and not on the value of the object.
- * Therefore, the result set is not guaranteed to be injective on the basis
- * of value.
- *
- * For example, consider a set of integers:
- *
- * X = {new Integer(4), new Integer(6), new Integer(9)}
- *
- * an ObjectInjectiveSetMapping may be defined that maps this set
- * to a result based on:
- *
- * map(x) = new Boolean(x < 8) for all x in X
- *
- * An ObjectiveInjectiveSetMapping result set would look like this:
- *
- * map(X) = {new Boolean(true), new Boolean(true), new Boolean(false)}
- *
- * Note that boolean TRUE maps twice, so based on the value of the set members,
- * the mapping is not injective. However, each Java object in X maps to a
- * distinct Java object in map(X)
- *
- * This interface should not be implemented by clients. Clients should
- * sub-class AbstractObjectInjectiveSetMapping to avoid future API breakage.
- *
- * <p><b>Provisional API - subject to change</b></p>
- *
- * @author cbateman
- *
- */
-public interface ObjectInjectiveSetMapping extends AxiomaticSetMapping
-{
- /**
- * This method optimizes the case where a client wants to apply some
- * mapping or constraint to each element of a set until a particular
- * condition applies and then stop.
- *
- * Mapping's that implement this
- * interface should generally implement their map(set) method as:
- *
- * for (Iterator it = mapIterator(set); it.hasNext();)
- * {
- * result.add(doMapping(it.next));
- * }
- *
- * @param set
- * @return an iterator that allows a client to apply the mapping
- * one element of set at a time. The iterator is immutable and should
- * throw UnsupportedOperationException if remove() is called.
- */
- public Iterator mapIterator(AxiomaticSet set);
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/sets/mapping/package-info.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/sets/mapping/package-info.java
deleted file mode 100644
index 8a7dacc..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/sets/mapping/package-info.java
+++ /dev/null
@@ -1,17 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Oracle 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:
- * Oracle - initial API and implementation
- *
- ********************************************************************************/
-
-/**
- * Classes for creating member mappings between sets.
- * <p><b>Provisional API - subject to change</b></p>
- */
-package org.eclipse.jst.jsf.common.sets.mapping;
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/sets/package-info.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/sets/package-info.java
deleted file mode 100644
index 7448837..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/sets/package-info.java
+++ /dev/null
@@ -1,17 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Oracle 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:
- * Oracle - initial API and implementation
- *
- ********************************************************************************/
-
-/**
- * Axiomatic Sets framework.
- * <p><b>Provisional API - subject to change</b></p>
- */
-package org.eclipse.jst.jsf.common.sets;
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/util/JDTBeanIntrospector.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/util/JDTBeanIntrospector.java
deleted file mode 100644
index 5175158..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/util/JDTBeanIntrospector.java
+++ /dev/null
@@ -1,217 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 Oracle 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:
- * Cameron Bateman/Oracle - initial API and implementation
- *
- ********************************************************************************/
-package org.eclipse.jst.jsf.common.util;
-
-import java.beans.Introspector;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.jdt.core.Flags;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.ITypeHierarchy;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.core.Signature;
-import org.eclipse.jst.jsf.common.JSFCommonPlugin;
-
-/**
- * A class that does bean introspection on a JDT IType
- *
- * This functionality is not meant to replace runtime bean
- * introspection. Rather, it is meant to provide a
- * more "lightweight" (in terms of class loading as well as
- * error handling of bean instantiation out of context) way
- * to determine a bean's properties at design time.
- *
- * This class may not be sub-classed by clients.
- *
- * @author cbateman
- *
- */
-public class JDTBeanIntrospector
-{
- private final static String GET_PREFIX = "get"; //$NON-NLS-1$
- private final static String SET_PREFIX = "set"; //$NON-NLS-1$
- private final static String IS_PREFIX = "is"; //$NON-NLS-1$
-
- private final IType _type;
- private final HashMap<String, String> _resolvedSignatures;
-
- /**
- * @param type
- */
- public JDTBeanIntrospector(IType type)
- {
- _type = type;
- _resolvedSignatures = new HashMap<String, String>();
- }
-
- /**
- * @return an map of all properties with the property names
- * as keys and the values being JDTBeanProperty objects representing
- * the properties.
- */
- public Map<String, JDTBeanProperty> getProperties()
- {
- _resolvedSignatures.clear();
-
- final Map<String, JDTBeanProperty> propertiesWorkingCopy =
- new HashMap<String, JDTBeanProperty>();
- final IMethod[] methods = getAllMethods();
-
- for (int i = 0; i < methods.length; i++)
- {
- final IMethod method = methods[i];
-
- try
- {
- processPropertyMethod(method, propertiesWorkingCopy);
- }
- catch (JavaModelException jme)
- {
- // log and then proceed to next method
- JSFCommonPlugin.log(jme, "Error processing IMethod for bean property info"); //$NON-NLS-1$
- }
- }
-
- final Map properties = new HashMap();
-
- for (Entry<String, JDTBeanProperty> entry : propertiesWorkingCopy.entrySet())
- {
- final String key = entry.getKey();
- JDTBeanPropertyWorkingCopy wcopy = (JDTBeanPropertyWorkingCopy) entry.getValue();
- properties.put(key, wcopy.toValueObject());
- }
-
- return properties;
- }
-
- private void processPropertyMethod(IMethod method, Map<String, JDTBeanProperty> properties) throws JavaModelException
- {
- // to be a bean method, it must not a constructor, must be public
- // and must not be static
- if (!method.isConstructor()
- && ( Flags.isPublic(method.getFlags())
- || _type.isInterface())
- && !Flags.isStatic(method.getFlags()))
- {
- final String methodName = method.getElementName();
- final String returnType = method.getReturnType();
-
- // either starts with get or is boolean and starts with is
-
- // is access must start with 'is', have a boolean return type and no parameters
- final boolean startsWithIs = methodName.startsWith(IS_PREFIX)
- && Signature.SIG_BOOLEAN.equals(returnType)
- && method.getNumberOfParameters() == 0
- && methodName.length() > IS_PREFIX.length();
-
- // get accessor must start with 'get', have no parameters and return non-void
- final boolean startsWithGet = (methodName.startsWith(GET_PREFIX)
- && method.getNumberOfParameters() == 0)
- && !Signature.SIG_VOID.equals(returnType)
- && methodName.length() > GET_PREFIX.length();
-
- // mutator must start with 'set' and have one parameter and a void return type
- final boolean startsWithSet = methodName.startsWith(SET_PREFIX)
- && method.getNumberOfParameters() == 1
- && Signature.SIG_VOID.equals(returnType)
- && methodName.length() > SET_PREFIX.length();
-
- if (startsWithGet || startsWithSet || startsWithIs)
- {
- final String propertyName =
- Introspector.decapitalize(methodName.substring(startsWithIs ? 2 : 3));
-
- JDTBeanPropertyWorkingCopy workingCopy =
- (JDTBeanPropertyWorkingCopy) properties.get(propertyName);
-
- if (workingCopy == null)
- {
- workingCopy = new JDTBeanPropertyWorkingCopy(_type, _resolvedSignatures);
- properties.put(propertyName, workingCopy);
- }
-
- if (startsWithIs)
- {
- workingCopy.setIsGetter(method);
- }
- else if (startsWithGet)
- {
- workingCopy.setGetter(method);
- }
- else if (startsWithSet)
- {
- workingCopy.addSetter(method);
- }
- }
- }
- }
-
- /**
- * @return all methods for the type including inherited ones
- */
- public IMethod[] getAllMethods()
- {
- IMethod[] methods = new IMethod[0];
-
- try
- {
- // type not resolved so don't proceed
- if (_type != null)
- {
- // TODO: type hierarchy is potentially expensive, should
- // cache once and listen for changes
- ITypeHierarchy hierarchy = _type.newSupertypeHierarchy(new NullProgressMonitor());
-
- methods = getAllMethods(hierarchy, _type);
- }
- }
- catch(JavaModelException jme)
- {
- JSFCommonPlugin.log(jme, "Error getting type information for bean"); //$NON-NLS-1$
- }
-
- return methods;
- }
-
- /**
- * @param typeHierarchy
- * @param type
- * @return all methods of the type and it's super types
- */
- private static IMethod[] getAllMethods(final ITypeHierarchy typeHierarchy, final IType type)
- {
- final List<IMethod> methods = new ArrayList<IMethod>();
- final IType[] superTypes = typeHierarchy.getAllSuperclasses(type);
- final IType[] closure = new IType[superTypes.length+1];
- closure[0] = type;
- System.arraycopy(superTypes, 0, closure, 1, superTypes.length);
-
- for (int i = 0; i < closure.length; i++)
- {
- try {
- final IType superType = closure[i];
- methods.addAll(Arrays.asList(superType.getMethods()));
- } catch (JavaModelException e) {
- JSFCommonPlugin.log(e, "Error getting super type information for bean"); //$NON-NLS-1$
- }
- }
-
- return methods.toArray(new IMethod[methods.size()]);
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/util/JDTBeanProperty.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/util/JDTBeanProperty.java
deleted file mode 100644
index a43bd72..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/util/JDTBeanProperty.java
+++ /dev/null
@@ -1,253 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 Oracle 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:
- * Cameron Bateman/Oracle - initial API and implementation
- *
- ********************************************************************************/
-package org.eclipse.jst.jsf.common.util;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.core.Signature;
-import org.eclipse.jst.jsf.common.JSFCommonPlugin;
-
-/**
- * Represents a single bean property backed by JDT data
- *
- * This class may not be sub-classed by clients.
- *
- * @author cbateman
- *
- */
-public class JDTBeanProperty
-{
- /**
- * the IMethod for the accessor (either is or get)
- */
- private IMethod _getter;
-
- /**
- * the IMethod for a "set" accessor method
- */
- private IMethod _setter;
-
- /**
- * The IType that this property belongs to
- */
- protected final IType _type;
-
- /**
- * @param type
- */
- protected JDTBeanProperty(IType type)
- {
- _type = type;
- }
-
- /**
- * @return true if this property is readable
- */
- public boolean isReadable()
- {
- return _getter != null;
- }
-
- /**
- * @return true if this property is writable
- */
- public boolean isWritable()
- {
- return _setter != null;
- }
-
-
- /**
- * @return the get accessor IMethod or null if none
- */
- public IMethod getGetter() {
- return _getter;
- }
-
-
-
- /**
- * Set the get accessor IMethod
- * @param getter -- may be null to indicate none
- */
- void setGetter(IMethod getter) {
- _getter = getter;
- }
-
-
- /**
- * @return the set mutator IMethod or null if none
- */
- public IMethod getSetter() {
- return _setter;
- }
-
- /**
- * @param setter
- */
- void setSetter(IMethod setter) {
- _setter = setter;
- }
-
- /**
- * @return the IType for this property's type or null if it
- * cannot determined. Note that null does not necessarily indicate an error
- * since some types like arrays of things do not have corresponding JDT IType's
- * If typeSignature represents an array, the base element IType is returned
- * if possible
- */
- public IType getType()
- {
- final String typeSignature = Signature.getElementType(getTypeSignature());
- return TypeUtil.resolveType(_type, typeSignature);
- }
-
- /**
- * @return the number of array nesting levels in typeSignature.
- * Returns 0 if not an array.
- */
- public int getArrayCount()
- {
- final String sig = getTypeSignature();
- if (sig == null)
- return 0;
- return Signature.getArrayCount(sig);
- }
-
- /**
- * @return true if property is an enum type, false otherwise or if cannot be resolved
- */
- public boolean isEnumType()
- {
- return TypeUtil.isEnumType(getType());
- }
-
- /**
- * Fully equivalent to:
- *
- * getTypeSignature(true)
- *
- * @return the fully resolved (if possible) type signature for
- * the property or null if unable to determine.
- *
- * NOTE: this is the "type erasure" signature, so any type parameters
- * will be removed and only the raw type signature will be returned.
- */
- public String getTypeSignature()
- {
- return getTypeSignature(true);
- }
-
-
- /**
- * @param eraseTypeParameters if true, the returned type has type parameters
- * erased. If false, template types are resolved.
- *
- * @see org.eclipse.jst.jsf.common.util.TypeUtil#resolveTypeSignature(IType, String, boolean)
- * for more information on how specific kinds of unresolved generics are resolved
- *
- * @return the fully resolved (if possible) type signature for
- * the property or null if unable to determine.
- */
- public String getTypeSignature(boolean eraseTypeParameters)
- {
- try
- {
- String unResolvedSig = getUnresolvedType();
- return TypeUtil.resolveTypeSignature(_type, unResolvedSig, eraseTypeParameters);
- }
- catch (JavaModelException jme)
- {
- JSFCommonPlugin.log(jme, "Error resolving bean property type signature"); //$NON-NLS-1$
- return null;
- }
- }
-
- /**
- * For example, if this property was formed from: List<String> getListOfStrings()
- * then the list would consist of the signature "Ljava.lang.String;". All
- * nested type paramters are resolved
- *
- * @see org.eclipse.jst.jsf.common.util.TypeUtil#resolveTypeSignature(IType, String, boolean)
- * for more information on how specific kinds of unresolved generics are resolved
- *
- * @return a list of type signatures (fully resolved if possible)
- * of this property's bounding type parameters.
- */
- public List<String> getTypeParameterSignatures()
- {
- List<String> signatures = new ArrayList<String>();
-
- try
- {
- final String[] typeParameters = Signature.getTypeArguments(getUnresolvedType());
- //System.err.println(getUnresolvedType());
- for (String parameter : typeParameters)
- {
- //System.out.println(parameter);
- signatures.add(TypeUtil.resolveTypeSignature(_type, parameter, false));
- }
- }
- catch (JavaModelException jme)
- {
- JSFCommonPlugin.log(jme, "Error resolving bean property type signature"); //$NON-NLS-1$
- // fall-through and return empty array
- }
-
- return signatures;
- }
-
-// public Map<String, String> getTypeParameterSignatureMap()
-// {
-// Map<String, String> signatures = new HashMap<String, String>();
-//
-// try
-// {
-// final String[] typeParameters = Signature.getTypeArguments(getUnresolvedType());
-//
-// for (String parameter : typeParameters)
-// {
-// signatures.add(TypeUtil.resolveTypeSignature(_type, parameter, false));
-// }
-// }
-// catch (JavaModelException jme)
-// {
-// JSFCommonPlugin.log(jme, "Error resolving bean property type signature"); //$NON-NLS-1$
-// // fall-through and return empty array
-// }
-//
-// return signatures;
-// }
-
- private String getUnresolvedType() throws JavaModelException
- {
- String typeSig = null;
-
- // first decide which method to use; getter always gets precendence
- if (_getter != null)
- {
- typeSig = _getter.getReturnType();
- }
- // TODO: if no getter or setter could we have been created?
- // use setter
- else
- {
- typeSig = _setter.getParameterTypes()[0];
- }
-
- return typeSig;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/util/JDTBeanPropertyWorkingCopy.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/util/JDTBeanPropertyWorkingCopy.java
deleted file mode 100644
index 4179f09..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/util/JDTBeanPropertyWorkingCopy.java
+++ /dev/null
@@ -1,193 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2007 Oracle Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Oracle Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.common.util;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jst.jsf.common.JSFCommonPlugin;
-
-/**
- * A writable version of the JDTBeanProperty object
- *
- * This class may not be sub-classed by clients
- *
- * @author cbateman
- *
- */
-public class JDTBeanPropertyWorkingCopy extends JDTBeanProperty
-{
- private final List _setters;
-
- /**
- * the IMethod for the boolean "is" accessor method
- */
- private IMethod _isGetter;
-
- private final Map<String, String> _resolvedSignatureMap;
-
- /**
- * @param type
- * @param resolvedSignatureMap
- */
- public JDTBeanPropertyWorkingCopy(IType type, Map<String, String> resolvedSignatureMap)
- {
- super(type);
- _setters = new ArrayList();
- _resolvedSignatureMap = resolvedSignatureMap;
- }
- /**
- * Constructor
- * @param type
- */
- public JDTBeanPropertyWorkingCopy(IType type)
- {
- super(type);
- _setters = new ArrayList();
- _resolvedSignatureMap = new HashMap<String, String>();
- }
-
- /**
- * @return the bean properties spawned from this working copy
- * Normally, there is only one property in the array, however,
- * since this working copy represents all properties with the same
- * name, there could be multiple properties since setters can
- * be overloaded by name and could result in zero or one readable
- * properties plus zero or more write-only properties with the same
- * name. I can't see anywhere in the spec that covers this
- * boundary case
- */
- public JDTBeanProperty toValueObject()
- {
- // if the isGetter is present that it takes precedence
- // over the the normal getter
- IMethod getter = getIsGetter() != null ?
- getIsGetter() : getGetter();
- IMethod matchedSetter = null;
-
- if (getter != null)
- {
- matchedSetter = determineMatchedSetter(getter);
- }
- // if there's no getter than pick any setter: there
- // are bigger problem when there's no getter than
- // ambiguous setters
- else if (_setters.size() > 0)
- {
- matchedSetter = (IMethod) _setters.get(0);
- }
-
- JDTBeanProperty beanProp = new JDTBeanProperty(_type);
- beanProp.setGetter(getter);
- beanProp.setSetter(matchedSetter);
- return beanProp;
-
- }
-
- private IMethod determineMatchedSetter(IMethod getter)
- {
- IMethod matchedSetter = null;
-
- // if there are no setters, there is no point in proceeding
- if (_setters.size() < 1)
- {
- return null;
- }
-
- try
- {
- final String getterSig = getResolvedSignature(_type, getter.getReturnType());
- FIND_MATCHING_SETTER:for
- (final Iterator it = _setters.iterator(); it.hasNext();)
- {
- final IMethod setter = (IMethod) it.next();
- assert (setter.getNumberOfParameters() == 1);
- final String paramSig =
- getResolvedSignature
- (_type,setter.getParameterTypes()[0]);
-
- if (paramSig.equals(getterSig))
- {
- // we've found our match since only one
- // setter with the same name as the getter
- // can have the same matching type for a
- // single arg method
- matchedSetter = setter;
- break FIND_MATCHING_SETTER;
- }
- }
- }
- catch (JavaModelException jme)
- {
- JSFCommonPlugin.log(jme, "Error determining getter return type, bean properties analysis may be inaccurate"); //$NON-NLS-1$
- }
-
- return matchedSetter;
- }
-
- //@Override
- public void setGetter(IMethod getter) {
- super.setGetter(getter);
- }
-
- /**
- * @param isGetter
- */
- public void setIsGetter(IMethod isGetter) {
- _isGetter = isGetter;
- }
-
- /**
- * @param setter
- */
- public void addSetter(IMethod setter) {
- if (setter != null
- && setter.getNumberOfParameters() == 1)
- {
- _setters.add(setter);
- }
- }
-
- /**
- * Not supported on working copy. This is synthetically generated
- * on toValueObject()
- * @return nothing; throws exception
- */
- public final IMethod getSetter()
- {
- throw new UnsupportedOperationException("Setter not calculated in working copy. Call toValueObject().getSetter()"); //$NON-NLS-1$
- }
-
- /**
- * @return the "is" getter method or null if not found
- */
- public IMethod getIsGetter() {
- return _isGetter;
- }
-
- private String getResolvedSignature(final IType type, final String unresolved)
- {
- String resolved = _resolvedSignatureMap.get(unresolved);
-
- if (resolved == null)
- {
- resolved = TypeUtil.resolveTypeSignature(_type, unresolved);
- _resolvedSignatureMap.put(unresolved, resolved);
- }
- return resolved;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/util/TypeUtil.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/util/TypeUtil.java
deleted file mode 100644
index 8a465d8..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/util/TypeUtil.java
+++ /dev/null
@@ -1,597 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Oracle 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:
- * Cameron Bateman/Oracle - initial API and implementation
- *
- ********************************************************************************/
-
-package org.eclipse.jst.jsf.common.util;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.jdt.core.IField;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.ITypeParameter;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.core.Signature;
-import org.eclipse.jst.jsf.common.JSFCommonPlugin;
-import org.eclipse.jst.jsf.common.internal.types.TypeConstants;
-import org.eclipse.jst.jsf.common.internal.types.TypeInfoCache;
-
-/**
- * Utility for handling IType's and type signatures
- *
- * Class is static and cannot be extended or instantiated.
- *
- * @author cbateman
- *
- */
-public final class TypeUtil
-{
- static IType resolveType(final IType owningType, final String typeSignature)
- {
- // if type signature is already resolved then simply look it up
- if (typeSignature.charAt(0) == Signature.C_RESOLVED
- || (Signature.getTypeSignatureKind(typeSignature) == Signature.BASE_TYPE_SIGNATURE)
- || (Signature.getTypeSignatureKind(typeSignature) == Signature.ARRAY_TYPE_SIGNATURE
- && Signature.getElementType(typeSignature).charAt(0) == Signature.C_RESOLVED))
- {
- IType type = null;
-
- try
- {
- type = owningType.getJavaProject().
- findType(getFullyQualifiedName(typeSignature));
- }
- catch (JavaModelException jme)
- {
- // do nothing; return type == null;
- }
-
- return type;
- }
-
-
- return resolveTypeRelative(owningType, typeSignature);
- }
-
- /**
- * Fully equivalent to:
- *
- * #resolveTypeSignature(owningType, typeSignature, true)
- *
- * If resolved, type signature has generic type parameters erased (absent).
- *
- * @param owningType
- * @param typeSignature
- * @return the resolved type signature for typeSignature in owningType or
- * typeSignature unchanged if cannot resolve.
- */
- public static String resolveTypeSignature(final IType owningType, final String typeSignature)
- {
- return resolveTypeSignature(owningType, typeSignature, true);
- }
-
- /**
- * Resolve typeSignature in the context of owningType. This method will return
- * a type erased signture if eraseTypeParameters == true and will attempt to
- * resolve and include parameters if eraseTypeParamters == false
- *
- * NOTE: special rules apply to the way unresolved type parameters and wildcards
- * are resolved:
- *
- * 1) If a fully unresolved type parameter is found, then it will be replaced with Ljava.lang.Object;
- *
- * i.e. List<T> -> Ljava.util.List<Ljava.lang.Object;>; for any unresolved T.
- *
- * 2) Any bounded wildcard will be replaced by the bound:
- *
- * i.e. List<? extends String> -> Ljava.util.List<Ljava.lang.String;>;
- * i.e. List<? super String> -> Ljava.util.List<Ljava.lang.String;>;
- *
- * Note limitation here: bounds that use 'super' will take the "best case" scenario that the list
- * type is of that type.
- *
- * 3) The unbounded wildcard will be replaced by Ljava.lang.Object;
- *
- * i.e. List<?> -> Ljava.util.List<Ljava.lang.Object;>;
- *
- *
- * The reason for this substition is to return the most accurate reasonable approximation
- * of the type within what is known by owningType
- *
- * @param owningType
- * @param typeSignature
- * @param eraseTypeParameters if set to false, type parameters are resolved included
- * in the signature
- * @return the resolved type signature for typeSignature in owningType or
- * typeSignature unchanged if cannot resolve.
- */
- public static String resolveTypeSignature(final IType owningType, final String typeSignature, boolean eraseTypeParameters)
- {
- final int sigKind = Signature.getTypeSignatureKind(typeSignature);
-
- switch (sigKind)
- {
- case Signature.BASE_TYPE_SIGNATURE:
- return typeSignature;
-
- case Signature.ARRAY_TYPE_SIGNATURE:
- {
- final String elementType = Signature.getElementType(typeSignature);
-
- if (Signature.getTypeSignatureKind(elementType) == Signature.BASE_TYPE_SIGNATURE)
- {
- return typeSignature;
- }
-
- final String resolvedElementType = resolveSignatureRelative(owningType, elementType, eraseTypeParameters);
- String resultType = ""; //$NON-NLS-1$
- for (int i = 0; i < Signature.getArrayCount(typeSignature);i++)
- {
- resultType+=Signature.C_ARRAY;
- }
-
- return resultType+resolvedElementType;
- }
-
- case Signature.TYPE_VARIABLE_SIGNATURE:
- return resolveSignatureRelative(owningType, typeSignature, eraseTypeParameters);
-
- case Signature.CLASS_TYPE_SIGNATURE:
- return resolveSignatureRelative(owningType, typeSignature, eraseTypeParameters);
-
- case Signature.WILDCARD_TYPE_SIGNATURE:
- // strip the wildcard and try again. Too bad Signature doesn't seem to have a method
- // for this
- if (typeSignature.charAt(0) == Signature.C_STAR)
- {
- return TypeConstants.TYPE_JAVAOBJECT;
- }
- return resolveTypeSignature(owningType, typeSignature.substring(1), eraseTypeParameters);
-
- case Signature.CAPTURE_TYPE_SIGNATURE:
- // strip the capture and try again
- return resolveTypeSignature(owningType, Signature.removeCapture(typeSignature), eraseTypeParameters);
-// case Signature.TYPE_VARIABLE_SIGNATURE:
-// resolveSignatureRelative(owningType, typeSignature, eraseTypeParameters);
-
- default:
- return typeSignature;
- }
- }
-
- /**
- * @param owningType -- type relative to which typeSignature will be resolved
- * @param typeSignature -- non-array type signature
- * @return the resolved type signature if possible or typeSignature if not
- */
- private static String resolveSignatureRelative(final IType owningType, final String typeSignature, final boolean eraseTypeParameters)
- {
- // if already fully resolved, return the input
- if (typeSignature.charAt(0) == Signature.C_RESOLVED)
- {
- return typeSignature;
- }
-
- List<String> typeParameters = new ArrayList<String>();
-
- IType resolvedType = resolveTypeRelative(owningType, typeSignature);
-
- if (resolvedType != null)
- {
- if (!eraseTypeParameters)
- {
- // ensure that type parameters are resolved recursively
- for (String typeParam : Signature.getTypeArguments(typeSignature))
- {
- typeParam = Signature.removeCapture(typeParam);
- // check and remove bound wildcarding (extends/super/?)
- if (Signature.getTypeSignatureKind(typeParam) == Signature.WILDCARD_TYPE_SIGNATURE)
- {
- // convert ? to Object, strip extends/super
- if (typeParam.charAt(0) == Signature.C_STAR)
- {
- typeParam = TypeConstants.TYPE_JAVAOBJECT;
- }
- else
- {
- typeParam = typeParam.substring(1);
- }
- }
- final String resolvedParameter =
- resolveSignatureRelative(
- // use the enclosing type,
- // *not* the resolved type because
- // we need to resolve in that context
- owningType,
- typeParam, eraseTypeParameters);
- typeParameters.add(resolvedParameter);
- }
- }
-
- final String resolvedTypeSignature =
- Signature.createTypeSignature
- (resolvedType.getFullyQualifiedName(), true);
-
-
- if (typeParameters.size() > 0 && !eraseTypeParameters)
- {
- StringBuffer sb = new StringBuffer(resolvedTypeSignature);
-
- if (sb.charAt(sb.length()-1) == ';')
- {
- sb = sb.delete(sb.length()-1, sb.length());
- }
-
- sb.append("<"); //$NON-NLS-1$
- for(String param : typeParameters)
- {
- //System.out.println("type param: "+resolvedType.getTypeParameter(param));
- sb.append(param);
- }
-
- // replace the dangling ',' with the closing ">"
- sb.append(">;"); //$NON-NLS-1$
- return sb.toString();
- }
-
- return resolvedTypeSignature;
- }
-
- if (Signature.getTypeSignatureKind(typeSignature) ==
- Signature.CLASS_TYPE_SIGNATURE
- || Signature.getTypeSignatureKind(typeSignature)
- == Signature.TYPE_VARIABLE_SIGNATURE)
- {
- // if we are unable to resolve, check to see if the owning type has
- // a parameter by this name
- ITypeParameter typeParam = owningType.getTypeParameter(Signature.getSignatureSimpleName(typeSignature));
-
- // if we have a type parameter and it hasn't been resolved to a type,
- // then assume it is a method template placeholder (i.e. T in ArrayList).
- // at runtime these unresolved parameter variables are effectively
- // turned into Object's. For example, think List.add(E o). At runtime,
- // E will behave exactly like java.lang.Object in that signature
- if (typeParam.exists())
- {
- return TypeConstants.TYPE_JAVAOBJECT;
- }
-
- // TODO: is there a better way to handle a failure to resolve
- // than just garbage out?
- //JSFCommonPlugin.log(new Exception("Failed to resolve type: "+typeSignature), "Failed to resolve type: "+typeSignature); //$NON-NLS-1$ //$NON-NLS-2$
- }
-
- return typeSignature;
- }
-
- private static IType resolveTypeRelative(final IType owningType, final String typeSignature)
- {
- final String fullName = getFullyQualifiedName(typeSignature);
-
- IType resolvedType = null;
-
- try
- {
- // TODO: this call is only supported on sourceTypes!
- String[][] resolved = owningType.resolveType(fullName);
-
- if (resolved != null && resolved.length > 0)
- {
- resolvedType = owningType.getJavaProject().findType(resolved[0][0], resolved[0][1]);
- }
- else
- {
- resolvedType = resolveInParents(owningType, fullName);
- }
- }
- catch (JavaModelException jme)
- {
- // do nothing; newType == null
- }
-
- return resolvedType;
- }
-
- /**
- * @param type
- * @return a type signature for a type
- */
- public static String getSignature(IType type)
- {
- final String fullyQualifiedName = type.getFullyQualifiedName();
- return Signature.createTypeSignature(fullyQualifiedName, true);
- }
-
-
- /**
- * @param owner
- * @param unresolvedSignature
- * @return the resolved method signature for unresolvedSignature in owner
- */
- public static String resolveMethodSignature(final IType owner,
- final String unresolvedSignature)
- {
-
- final String unresolvedSignatureNormalized =
- unresolvedSignature.replaceAll("/", "."); //$NON-NLS-1$ //$NON-NLS-2$
-
- // get the list of parameters
- final String[] parameters =
- Signature.getParameterTypes(unresolvedSignatureNormalized);
-
- for (int i = 0; i < parameters.length; i++)
- {
- // try to full resolve the type
- parameters[i] = resolveTypeSignature(owner, parameters[i]);
- }
-
- // resolve return type
- final String resolvedReturn =
- resolveTypeSignature(owner,
- Signature.getReturnType(unresolvedSignatureNormalized));
-
- return Signature.createMethodSignature(parameters, resolvedReturn);
- }
-
- /**
- * @param typeSignature
- * @return a fully qualified Java class name from a type signature
- * i.e. Ljava.lang.String; -> java.lang.String
- */
- public static String getFullyQualifiedName(final String typeSignature)
- {
- final String packageName = Signature.getSignatureQualifier(typeSignature);
- final String typeName = Signature.getSignatureSimpleName(typeSignature);
- return "".equals(packageName) ? typeName : packageName + "." + typeName; //$NON-NLS-1$//$NON-NLS-2$
- }
-
- private static IType resolveInParents(IType childType, String fullyQualifiedName)
- throws JavaModelException
- {
- IType resolvedType = null;
-
- final TypeInfoCache typeInfoCache = TypeInfoCache.getInstance();
- IType[] superTypes = typeInfoCache.getCachedSupertypes(childType);
- if (superTypes == null) {
- superTypes = typeInfoCache.cacheSupertypesFor(childType);
- }
-
- String[][] resolved;
-
- LOOP_UNTIL_FIRST_MATCH:
- for (int i = 0; i < superTypes.length; i++)
- {
- final IType type = superTypes[i];
-
- resolved = type.resolveType(fullyQualifiedName);
-
- if (resolved != null && resolved.length > 0)
- {
- resolvedType = childType.getJavaProject().findType(resolved[0][0], resolved[0][1]);
- break LOOP_UNTIL_FIRST_MATCH;
- }
- }
-
- return resolvedType;
- }
-
- /**
- * Attempts to get a Java IType for a fully qualified signature. Note that
- * generic type arguments are generally ignored by JDT when doing such
- * look ups.
- *
- * @param javaProject the project context inside which to resolve the type
- * @param fullyResolvedTypeSignature a fully resolved type signature
- * @return the IType if resolved, null otherwise
- */
- public static IType resolveType(final IJavaProject javaProject, final String fullyResolvedTypeSignature)
- {
- String fullyQualifiedName = getFullyQualifiedName(fullyResolvedTypeSignature);
- fullyQualifiedName = Signature.getTypeErasure(fullyQualifiedName);
- try {
- return javaProject.findType(fullyQualifiedName);
- } catch (JavaModelException e) {
- // accessible problem
- JSFCommonPlugin.log(e);
- return null;
- }
- }
-
- /**
- * @param type
- * @param typeParamSignature -- must be a Type Variable Signature
- * @param typeArguments
- * @return the signature for the type argument in typeArguments that matches the
- * named typeParamSignature in type.
- * @throws IllegalArgumentException if typeParamSignature is not valid
- *
- * For example, given type for java.util.Map, typeParamSignature == "V" and
- * typeArguments = {Ljava.util.String;, Lcom.test.Blah;}, the result would be
- * the typeArgument that matches "V", which is "Lcom.test.Blah;}
- *
- * returns null if the match cannot be found.
- */
- public static String matchTypeParameterToArgument(final IType type, final String typeParamSignature, final List<String> typeArguments)
- {
- if (Signature.getTypeSignatureKind(typeParamSignature) != Signature.TYPE_VARIABLE_SIGNATURE)
- {
- throw new IllegalArgumentException();
- }
-
- try
- {
- ITypeParameter[] typeParams = type.getTypeParameters();
-
- for (int pos = 0; pos < typeParams.length; pos++)
- {
- if (typeParams[pos].getElementName().equals(Signature.getSignatureSimpleName(typeParamSignature)))
- {
- if (pos < typeArguments.size())
- {
- // TODO: should typeArguments.size ever != typeParams.length?
- return typeArguments.get(pos);
- }
- }
- }
- }
- catch (JavaModelException e)
- {
- JSFCommonPlugin.log(e);
- }
-
- return null;
- }
-
- /**
- * @param type
- * @param fieldName
- * @return true if fieldName is a member of type. Note that if type is java.lang.Enum
- * then this will always return true since we cannot know what fields the instance has (it could be any enum)
- */
- public static boolean isEnumMember(final IType type, final String fieldName)
- {
- try
- {
- if (type == null || !isEnumType(type))
- {
- throw new IllegalArgumentException("type must be non-null and isEnum()==true"); //$NON-NLS-1$
- }
-
- if (fieldName == null)
- {
- throw new IllegalArgumentException("fieldName must be non-null"); //$NON-NLS-1$
- }
-
- // if type is the java.lang.Enum, always true
- if (TypeConstants.TYPE_ENUM_BASE.equals(Signature.createTypeSignature(type.getFullyQualifiedName(), true)))
- {
- return true;
- }
-
- final IField field = type.getField(fieldName);
-
- if (field.exists() && field.isEnumConstant())
- {
- return true;
- }
- }
- catch (JavaModelException jme)
- {
- // fall through and return false
- }
-
- return false;
- }
-
- /**
- * @param typeSig1 the type signature of the first enum. Must be non-null, fully resolved enum type.
- * @param typeSig2 the type signature of the second enum. Must be non-null, fully resolved enum type.
- *
- * @return true if typeSig1.compareTo(typeSig2) is a legal operation (won't throw a CCE)
- */
- public static boolean isEnumsCompareCompatible(final String typeSig1, final String typeSig2)
- {
- if (typeSig1 == null || typeSig2 == null)
- {
- throw new IllegalArgumentException("args must not be null"); //$NON-NLS-1$
- }
-
- if (Signature.getTypeSignatureKind(typeSig1) != Signature.CLASS_TYPE_SIGNATURE
- || Signature.getTypeSignatureKind(typeSig2) != Signature.CLASS_TYPE_SIGNATURE)
- {
- throw new IllegalArgumentException("args must be resolved class types"); //$NON-NLS-1$
- }
-
- // if one or the other is the raw enum type, then they *may* be comparable; we don't know
- if (TypeConstants.TYPE_ENUM_BASE.equals(typeSig1)
- || TypeConstants.TYPE_ENUM_BASE.equals(typeSig2))
- {
- return true;
- }
-
- // TODO: support the case of enum base type with generic type argument
-
- // only comparable if is the same class
- return typeSig1.equals(typeSig2);
- }
-
- /**
- * @param typeSig1 the type signature of the first enum. Must be non-null, fully resolved enum type.
- * @param typeSig2 the type signature of the second enum. Must be non-null, fully resolved enum type.
- * @return true if instances typeSig1 and typeSig2 can never be equal due
- * their being definitively different enum types
- */
- public static boolean canNeverBeEqual(final String typeSig1, final String typeSig2)
- {
- if (typeSig1 == null || typeSig2 == null)
- {
- throw new IllegalArgumentException("args must not be null"); //$NON-NLS-1$
- }
-
- if (Signature.getTypeSignatureKind(typeSig1) != Signature.CLASS_TYPE_SIGNATURE
- || Signature.getTypeSignatureKind(typeSig2) != Signature.CLASS_TYPE_SIGNATURE)
- {
- throw new IllegalArgumentException("args must be resolved class types"); //$NON-NLS-1$
- }
-
- // if either one is the base enum type, then we can't be sure
- if (TypeConstants.TYPE_ENUM_BASE.equals(typeSig1)
- || TypeConstants.TYPE_ENUM_BASE.equals(typeSig2))
- {
- return false;
- }
-
- // if they are definitely not the same enum types, then their values
- // can never be equal
- return !typeSig1.equals(typeSig2);
- }
-
-
- /**
- * NOTE: we diverge from IType.isEnum() because we also return true if the base type
- * is a java.lang.Enum since we consider this to be "any enumeration type" whereas JDT considers
- * it merely a class since it doesn't use an "enum" keyword declaration.
- * @param type
- * @return true if type is an enum type or is java.lang.Enum
- */
- static boolean isEnumType(IType type)
- {
- if (type == null)
- {
- return false;
- }
-
- // check if it's the enumeration base type
- if (TypeConstants.TYPE_ENUM_BASE.equals(Signature.createTypeSignature(type.getFullyQualifiedName(), true)))
- {
- return true;
- }
-
- try
- {
- return type.isEnum();
- }
- catch (JavaModelException jme)
- {
- // log and fallthrough to return false
- JSFCommonPlugin.log(jme, "Problem resolving isEnum"); //$NON-NLS-1$
- }
-
- // if unresolved assume false
- return false;
- }
-
- private TypeUtil()
- {
- // no external instantiation
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/util/package-info.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/util/package-info.java
deleted file mode 100644
index 239a125..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/util/package-info.java
+++ /dev/null
@@ -1,16 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Oracle 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:
- * Oracle - initial API and implementation
- *
- ********************************************************************************/
-
-/**
- * Common utility classes.
- */
-package org.eclipse.jst.jsf.common.util;
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/webxml/WebXmlUpdater.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/webxml/WebXmlUpdater.java
deleted file mode 100644
index e3261ea..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/webxml/WebXmlUpdater.java
+++ /dev/null
@@ -1,251 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2008 Oracle Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Oracle Corporation - initial API and implementation
- *******************************************************************************/
-
-
-package org.eclipse.jst.jsf.common.webxml;
-
-
-import java.util.List;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.jst.j2ee.model.IModelProvider;
-import org.eclipse.jst.j2ee.model.ModelProviderManager;
-import org.eclipse.jst.javaee.web.WebApp;
-import org.eclipse.jst.jsf.common.webxml.internal.AbstractWebXmlUpdater;
-import org.eclipse.jst.jsf.common.webxml.internal.WebXmlUpdaterForJ2EE;
-import org.eclipse.jst.jsf.common.webxml.internal.WebXmlUpdaterForJavaEE;
-
-
-/**
- * Facade for web.xml updater classes WebXmlUpdaterForJavaEE,
- * WebXmlUpdaterForJ2EE, and AbstractWebXmlUpdater. Utility class to make
- * editing web.xml easy.
- *
- * @author Debajit Adhikary
- *
- */
-public class WebXmlUpdater
-{
- private final IProject project;
- private final IProgressMonitor monitor;
- private final AbstractWebXmlUpdater updater;
- private final IModelProvider provider;
-
- /**
- * @param project
- * @param monitor
- */
- public WebXmlUpdater (final IProject project,
- final IProgressMonitor monitor)
- {
- this.project = project;
- this.monitor = monitor;
- this.provider = ModelProviderManager.getModelProvider(project);
- this.updater = initUpdater();
- }
-
-
- /**
- * @return WebApp object associated with this WebXmlUpdater object
- */
- public WebApp getWebAppForJavaEE ()
- {
- return (WebApp) updater.getWebApp();
- }
-
-
- /**
- * @return WebApp object associated with this WebXmlUpdater object
- */
- public org.eclipse.jst.j2ee.webapplication.WebApp getWebAppForJ2EE ()
- {
- return (org.eclipse.jst.j2ee.webapplication.WebApp) updater.getWebApp();
- }
-
-
- /**
- * @return Provider object for the webapp this WebXmlUpdater is associated
- * with. This may be used by clients to perform additional complex
- * updates to web.xml using getProvider.modify(new Runnable(), ...)
- */
- public IModelProvider getProvider()
- {
- return provider;
- }
-
-
- /**
- * @return True if this webapp is a Java EE app.
- */
- public boolean isJavaEEWebapp ()
- {
- return updater instanceof WebXmlUpdaterForJavaEE;
- }
-
-
- /**
- * @return True if this webapp is a J2EE app
- */
- public boolean isJ2EEWebapp ()
- {
- return updater instanceof WebXmlUpdaterForJ2EE;
- }
-
-
- /**
- * @param servletName
- * @param servletClass
- * @param loadOnStartup
- */
- public void addServlet (final String servletName,
- final String servletClass,
- final String loadOnStartup)
- {
- updater.addServlet(servletName, servletClass, loadOnStartup);
- }
-
-
- /**
- * @param servletClassName
- */
- public void removeServlet (final String servletClassName)
- {
- updater.removeServlet(servletClassName);
- }
-
-
- /**
- * @param servletName
- * @param servletClass
- * @param urlPattern
- */
- public void addServletMapping (final String servletName,
- final String servletClass,
- final String urlPattern)
- {
- updater.addServletMapping(servletName, servletClass, urlPattern);
- }
-
-
- /**
- * @param filterName
- * @param filterClass
- */
- public void addFilter (final String filterName,
- final String filterClass)
- {
- updater.addFilter(filterName, filterClass);
- }
-
-
- /**
- * @param filterName
- */
- public void removeFilter (final String filterName)
- {
- updater.removeFilter(filterName);
- }
-
-
- /**
- * @param filterName
- * @param filterClass
- * @param servletName
- */
- public void addFilterMapping (final String filterName,
- final String filterClass,
- final String servletName)
- {
- updater.addFilterMapping(filterName, filterClass, servletName);
- }
-
-
- /**
- * @param paramName
- * Name of context param
- * @return Value of given context param.
- */
- public String getContextParamValue (final String paramName)
- {
- return updater.getContextParamValue(paramName);
- }
-
-
- /**
- * @param paramName
- * Name of context param
- * @param valuesDelimiterRegex
- * Delimiter string for values
- * @return Values of given context param as a list. This is useful when the
- * multiple values are demarcated by a delimiter string.
- *
- */
- public List<String> getContextParamValuesAsList (final String paramName,
- final String valuesDelimiterRegex)
- {
- return updater.getContextParamValuesAsList(paramName, valuesDelimiterRegex);
- }
-
-
- /**
- * Sets the value of the given context param name to the given value. If
- * paramName is not found, a new context-param is created with the given
- * paramName and paramValue.
- *
- * @param paramName
- * @param paramValue
- */
- public void setContextParamValue (final String paramName,
- final String paramValue)
- {
- updater.setContextParamValue(paramName, paramValue);
- }
-
-
- /**
- * @param paramName
- * @param paramValue
- * @param description
- */
- public void addContextParam (final String paramName,
- final String paramValue,
- final String description)
- {
- updater.addContextParam(paramName, paramValue, description);
- }
-
-
- /**
- * @param listenerClass
- */
- public void addListener (final String listenerClass)
- {
- updater.addListener(listenerClass);
- }
-
-
- private AbstractWebXmlUpdater initUpdater()
- {
- final Object webAppObj = ModelProviderManager.getModelProvider(project).getModelObject();
-
- if (webAppObj != null)
- {
- if (webAppObj instanceof WebApp) // Java EE
- return new WebXmlUpdaterForJavaEE(webAppObj, project, getProvider(), monitor);
- else if (webAppObj instanceof org.eclipse.jst.j2ee.webapplication.WebApp) // J2EE
- return new WebXmlUpdaterForJ2EE(webAppObj, project, getProvider(), monitor);
- }
-
- // Control should never come here
- throw new IllegalArgumentException("Unable to resolve WebApp object for updating web.xml"); //$NON-NLS-1$
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/webxml/WebXmlUtils.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/webxml/WebXmlUtils.java
deleted file mode 100644
index 48d2250..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/webxml/WebXmlUtils.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2008 Oracle Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Oracle Corporation - initial API and implementation
- *******************************************************************************/
-
-
-package org.eclipse.jst.jsf.common.webxml;
-
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-
-
-/**
- * Web.xml utilities.
- *
- * @author Debajit Adhikary
- *
- */
-public class WebXmlUtils
-{
- /**
- * Path to deployment descriptor of webapp
- */
- public static final IPath WEB_XML_PATH = new Path("WEB-INF").append("web.xml"); //$NON-NLS-1$ //$NON-NLS-2$
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/webxml/WebXmlUtilsForJ2EE.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/webxml/WebXmlUtilsForJ2EE.java
deleted file mode 100644
index 6354dc8..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/webxml/WebXmlUtilsForJ2EE.java
+++ /dev/null
@@ -1,615 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2008 Oracle Corporation and others. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: Oracle Corporation - initial API and implementation
- *******************************************************************************/
-
-
-package org.eclipse.jst.jsf.common.webxml;
-
-
-import java.util.Arrays;
-import java.util.List;
-
-import org.eclipse.jst.j2ee.common.CommonFactory;
-import org.eclipse.jst.j2ee.common.Description;
-import org.eclipse.jst.j2ee.common.Listener;
-import org.eclipse.jst.j2ee.common.ParamValue;
-import org.eclipse.jst.j2ee.webapplication.Filter;
-import org.eclipse.jst.j2ee.webapplication.FilterMapping;
-import org.eclipse.jst.j2ee.webapplication.Servlet;
-import org.eclipse.jst.j2ee.webapplication.ServletMapping;
-import org.eclipse.jst.j2ee.webapplication.ServletType;
-import org.eclipse.jst.j2ee.webapplication.WebApp;
-import org.eclipse.jst.j2ee.webapplication.WebapplicationFactory;
-import org.eclipse.jst.j2ee.webapplication.internal.impl.ServletTypeImpl;
-
-
-/**
- * Web.xml editing utilities for J2EE (Servlet 2.4 and lower versions).
- *
- * @author Debajit Adhikary
- *
- */
-public class WebXmlUtilsForJ2EE
-{
- /**
- * @param webapp
- * @param servletName
- * @param servletClass
- * @param loadOnStartup
- */
- public static void addServlet (final WebApp webapp,
- final String servletName,
- final String servletClass,
- final String loadOnStartup)
- {
- if (existsServlet(webapp, servletName, servletClass))
- return;
-
- // Create new servlet
-
- final Servlet servlet = WebapplicationFactory.eINSTANCE.createServlet();
- servlet.setServletName(servletName);
- servlet.setLoadOnStartup(new Integer(loadOnStartup));
-
- final ServletType servletType = WebapplicationFactory.eINSTANCE.createServletType();
- servletType.setClassName(servletClass);
- servlet.setWebType(servletType);
-
- webapp.getServlets().add(servlet);
- }
-
-
- /**
- * @param webapp
- * @param servletName
- * @param servletClass
- * @return true if the specified servlet is declared for use in webapp
- */
- public static boolean existsServlet (final WebApp webapp,
- final String servletName,
- final String servletClass)
- {
- return findServlet(webapp, servletName, servletClass) != null;
- }
-
-
- /**
- * @param webapp
- * Webapp in which to look for
- * @param servletName
- * Servlet name
- * @param servletClass
- * Servlet class
- *
- * @return The servlet containing the specified servlet-name and
- * servlet-class in web.xml
- */
- public static Servlet findServlet (final WebApp webapp,
- final String servletName,
- final String servletClass)
- {
- for (final Object s : webapp.getServlets())
- {
- final Servlet servlet = (Servlet) s;
- if (servlet.getServletName().equals(servletName)
- && ((ServletType) servlet.getWebType()).getClassName().equals(servletClass))
- {
- return servlet;
- }
- }
-
- return null;
- }
-
-
- /**
- * @param webApp
- * @param servletClassName
- * @return the servlet or null if not found
- */
- public static Servlet findServlet (final WebApp webApp,
- final String servletClassName)
- {
- for (final Object servlet : webApp.getServlets())
- {
- final org.eclipse.jst.j2ee.webapplication.Servlet j2eeServlet = (org.eclipse.jst.j2ee.webapplication.Servlet) servlet;
- final String servletClass = ((ServletTypeImpl) j2eeServlet.getWebType()).getClassName();
- if (servletClass.equals(servletClassName))
- return j2eeServlet;
- }
- return null;
- }
-
-
- /**
- * @param webapp
- * @param servletName
- * @return the servlet or null if not found
- */
- public static Servlet findServletByName (final WebApp webapp,
- final String servletName)
- {
- for (final Object s : webapp.getServlets())
- {
- final Servlet servlet = (Servlet) s;
- if (servlet.getServletName().trim().equals(servletName))
- return servlet;
- }
-
- return null;
- }
-
-
- /**
- * @param webApp
- * @param servlet
- */
- public static void removeServlet (final WebApp webApp,
- final Servlet servlet)
- {
- webApp.getServlets().remove(servlet);
- }
-
-
- /**
- * @param webapp
- * @param servletName
- * @param servletClass
- * @param urlPattern
- */
- public static void addServletMapping (final WebApp webapp,
- final String servletName,
- final String servletClass,
- final String urlPattern)
- {
- if (existsServletMapping(webapp, servletName, urlPattern))
- return;
-
- final Servlet servlet = findServlet(webapp, servletName, servletClass);
- if (servlet == null)
- throw new IllegalArgumentException("Cannot create servlet mapping with servlet name \"" //$NON-NLS-1$
- + servletName + "\" and URL pattern \"" //$NON-NLS-1$
- + urlPattern + "\". No corresponding servlet is defined."); //$NON-NLS-1$
-
- final ServletMapping servletMapping = WebapplicationFactory.eINSTANCE.createServletMapping();
- servletMapping.setServlet(servlet);
- servletMapping.setName(servletName);
- servletMapping.setUrlPattern(urlPattern);
-
- webapp.getServletMappings().add(servletMapping);
- }
-
-
- /**
- * @param webapp
- * @param servletName
- * @param urlPattern
- * @return true if the servlet mapping exists
- */
- public static boolean existsServletMapping (final WebApp webapp,
- final String servletName,
- final String urlPattern)
- {
- return findServletMapping(webapp, servletName, urlPattern) != null;
- }
-
-
- /**
- * @param webapp
- * @param servletName
- * @param urlPattern
- * @return the servlet mapping
- */
- public static ServletMapping findServletMapping (final WebApp webapp,
- final String servletName,
- final String urlPattern)
- {
- for (final Object mapping : webapp.getServletMappings())
- {
- final ServletMapping servletMapping = (ServletMapping) mapping;
- if (servletMapping.getName().equals(servletName)
- && servletMapping.getUrlPattern().equals(urlPattern))
- {
- return servletMapping;
- }
- }
-
- return null;
- }
-
-
- /**
- * @param webApp
- * @param servlet
- */
- public static void removeServletMappings (final WebApp webApp,
- final Servlet servlet)
- {
- final List mappings = webApp.getServletMappings();
- String servletName = servlet.getServletName();
-
- if (servletName != null)
- {
- servletName = servletName.trim();
- for (int i = mappings.size() - 1; i >= 0; --i)
- {
- final ServletMapping mapping = (ServletMapping) mappings.get(i);
- if (mapping != null && mapping.getServlet().getServletName() != null
- && mapping.getServlet().getServletName().trim().equals(servletName))
- {
- mappings.remove(mapping);
- }
- }
- }
- }
-
-
- /**
- * @param webapp
- * @param filterName
- * @param filterClass
- */
- public static void addFilter (final WebApp webapp,
- final String filterName,
- final String filterClass)
- {
- if (existsFilter(webapp, filterName, filterClass))
- return;
-
- webapp.getFilters().add(createFilter(filterName, filterClass));
- }
-
-
- /**
- * @param filterName
- * @param filterClass
- * @return the filter or null if not found.
- */
- public static Filter createFilter (final String filterName,
- final String filterClass)
- {
- final Filter filter = WebapplicationFactory.eINSTANCE.createFilter();
- filter.setName(filterName);
- filter.setFilterClassName(filterClass);
- return filter;
- }
-
-
- /**
- * @param webapp
- * @param filterName
- * @param filterClass
- * @return true if the filter exists.
- */
- public static boolean existsFilter (final WebApp webapp,
- final String filterName,
- final String filterClass)
- {
- return findFilter(webapp, filterName, filterClass) != null;
- }
-
-
- /**
- * @param webapp
- * @param filterName
- * @param filterClass
- * @return the filter or null if not found.
- */
- public static Filter findFilter (final WebApp webapp,
- final String filterName,
- final String filterClass)
- {
- for (final Object f : webapp.getFilters())
- {
- final Filter filter = (Filter) f;
- if (filter.getName().trim().equals(filterName)
- && filter.getFilterClassName().trim().equals(filterClass))
- {
- return filter;
- }
- }
-
- return null;
- }
-
-
- /**
- * @param webApp
- * @param filterClassName
- * @return the filter or null if not found.
- */
- public static Filter findFilter (final WebApp webApp,
- final String filterClassName)
- {
- for (final Object filter : webApp.getFilters())
- {
- if (((Filter) filter).getFilterClassName().trim().equals(filterClassName))
- return (Filter) filter;
- }
-
- return null;
- }
-
-
- /**
- * @param webapp
- * @param filterName
- * @param filterClass
- * @param servletName
- */
- public static void addFilterMapping (final WebApp webapp,
- final String filterName,
- final String filterClass,
- final String servletName)
- {
- if (existsFilterMapping(webapp, filterName, servletName))
- return;
-
-
- // Find corresponding filter
- final Filter filter = findFilter(webapp, filterName, filterClass);
- if (filter == null)
- throw new IllegalArgumentException("Cannot create filter mapping with filter name \"" //$NON-NLS-1$
- + filterName + "\" and servlet name \"" //$NON-NLS-1$
- + servletName + "\". No corresponding filter is defined."); //$NON-NLS-1$
-
-
- // Find corresponding servlet
- final Servlet servlet = findServletByName(webapp, servletName);
- if (servlet == null)
- throw new IllegalArgumentException("Cannot create filter mapping with filter name \"" //$NON-NLS-1$
- + filterName + "\" and servlet name \"" //$NON-NLS-1$
- + servletName + "\". No corresponding servlet is defined."); //$NON-NLS-1$
-
-
- // Create new filter mapping
- final FilterMapping filterMapping = WebapplicationFactory.eINSTANCE.createFilterMapping();
- filterMapping.setFilter(filter);
- filterMapping.setServlet(servlet);
- filterMapping.setServletName(servletName);
-
- webapp.getFilterMappings().add(filterMapping);
- }
-
-
- /**
- * @param webapp
- * @param filterName
- * @param servletName
- * @return true if the filter mapping exists
- */
- public static boolean existsFilterMapping (final WebApp webapp,
- final String filterName,
- final String servletName)
- {
- return findFilterMapping(webapp, filterName, servletName) != null;
- }
-
-
- /**
- * @param webapp
- * @param filterName
- * @param servletName
- * @return the filter mapping or null if it doesn't exist.
- */
- public static FilterMapping findFilterMapping (final WebApp webapp,
- final String filterName,
- final String servletName)
- {
- for (final Object fm : webapp.getFilterMappings())
- {
- final FilterMapping filterMapping = (FilterMapping) fm;
-
- if (filterMapping.getFilter().getName().trim().equals(filterName)
- && filterMapping.getServletName().equals(servletName))
- {
- return filterMapping;
- }
- }
-
- return null;
- }
-
-
- /**
- * @param webApp
- * @param paramName
- * @param paramValue
- * @param description
- */
- public static void addContextParam (final WebApp webApp,
- final String paramName,
- final String paramValue,
- final String description)
- {
- if (existsContextParam(webApp, paramName, paramValue))
- return;
-
- webApp.getContextParams().add(createContextParam(paramName, paramValue, description));
- }
-
-
- /**
- * @param paramName
- * @param paramValue
- * @param descriptionString
- * @return the param value or null if doesn't exist
- */
- public static ParamValue createContextParam (final String paramName,
- final String paramValue,
- final String descriptionString)
- {
- final ParamValue param = CommonFactory.eINSTANCE.createParamValue();
- param.setName(paramName);
- param.setValue(paramValue);
-
- if (descriptionString != null)
- {
- final Description description = CommonFactory.eINSTANCE.createDescription();
- description.setValue(descriptionString);
- param.getDescriptions().add(description);
- }
-
- return param;
- }
-
-
- /**
- * @param webApp
- * @param paramName
- * @param paramValue
- * @return true if the context param exists.
- */
- public static boolean existsContextParam (final WebApp webApp,
- final String paramName,
- final String paramValue)
- {
- return findContextParam(webApp, paramName, paramValue) != null;
- }
-
-
- /**
- * @param webApp
- * @param paramName
- * @param paramValue
- * @return the param value or null if not found
- */
- public static ParamValue findContextParam (final WebApp webApp,
- final String paramName,
- final String paramValue)
- {
- for (final Object param : webApp.getContextParams())
- {
- final ParamValue contextParam = (ParamValue) param;
- if (contextParam.getName().equals(paramName)
- && contextParam.getValue().equals(paramValue))
- {
- return contextParam;
- }
- }
-
- return null;
- }
-
-
- /**
- * @param webApp
- * @param paramName
- * @return the param value or null if not found
- */
- public static String getContextParamValue (final WebApp webApp,
- final String paramName)
- {
- for (final Object param : webApp.getContextParams())
- {
- final ParamValue contextParam = (ParamValue) param;
- if (contextParam.getName().equals(paramName))
- {
- return contextParam.getValue();
- }
- }
-
- return null;
- }
-
-
- /**
- * @param webApp
- * @param paramName Name of context param
- * @param valuesDelimiterRegex
- * @return Values of the given context param as a list
- */
- public static List<String> getContextParamValuesAsList (final WebApp webApp,
- final String paramName,
- final String valuesDelimiterRegex)
- {
- final String valuesString = getContextParamValue(webApp, paramName);
- return Arrays.asList(valuesString.split(valuesDelimiterRegex));
- }
-
-
- /**
- * Updates the value of a context param if it exists. Otherwise, adds this
- * as a new context param.
- *
- * @param webApp
- * @param paramName
- * @param paramValue
- */
- public static void setContextParamValue (final WebApp webApp,
- final String paramName,
- final String paramValue)
- {
- ParamValue contextParam = null;
-
- for (final Object p : webApp.getContextParams())
- {
- final ParamValue param = (ParamValue) p;
- if (param.getName().equals(paramName))
- {
- contextParam = param;
- break;
- }
- }
-
- if (contextParam == null)
- {
- webApp.getContextParams().add(createContextParam(paramName, paramValue, null));
- }
- else
- {
- contextParam.setValue(paramValue);
- }
- }
-
-
- /**
- * @param webapp
- * @param listenerClass
- */
- public static void addListener (final WebApp webapp,
- final String listenerClass)
- {
- if (existsListener(webapp, listenerClass))
- return;
-
- // Create new listener
- final Listener listener = CommonFactory.eINSTANCE.createListener();
- listener.setListenerClassName(listenerClass);
-
- webapp.getListeners().add(listener);
- }
-
-
- /**
- * @param webapp
- * @param listenerClass
- * @return true if the listener exists
- */
- public static boolean existsListener (final WebApp webapp,
- final String listenerClass)
- {
- return findListener(webapp, listenerClass) != null;
- }
-
-
- /**
- * @param webapp
- * @param listenerClass
- * @return the listener or null if not found
- */
- public static Listener findListener (final WebApp webapp,
- final String listenerClass)
- {
- for (final Object listener : webapp.getListeners())
- if (((Listener) listener).getListenerClassName().equals(listenerClass))
- return (Listener) listener;
-
- return null;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/webxml/WebXmlUtilsForJavaEE.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/webxml/WebXmlUtilsForJavaEE.java
deleted file mode 100644
index 6a3d597..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/webxml/WebXmlUtilsForJavaEE.java
+++ /dev/null
@@ -1,610 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2008 Oracle Corporation and others. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: Oracle Corporation - initial API and implementation
- *******************************************************************************/
-
-
-package org.eclipse.jst.jsf.common.webxml;
-
-import java.util.Arrays;
-import java.util.List;
-
-import org.eclipse.jst.javaee.core.Description;
-import org.eclipse.jst.javaee.core.JavaeeFactory;
-import org.eclipse.jst.javaee.core.Listener;
-import org.eclipse.jst.javaee.core.ParamValue;
-import org.eclipse.jst.javaee.core.UrlPatternType;
-import org.eclipse.jst.javaee.web.Filter;
-import org.eclipse.jst.javaee.web.FilterMapping;
-import org.eclipse.jst.javaee.web.Servlet;
-import org.eclipse.jst.javaee.web.ServletMapping;
-import org.eclipse.jst.javaee.web.WebApp;
-import org.eclipse.jst.javaee.web.WebFactory;
-
-
-/**
- * Web.xml editing utilities for Java EE.
- *
- * @author Debajit Adhikary
- *
- */
-public class WebXmlUtilsForJavaEE
-{
- /**
- * @param webapp
- * @param servletName
- * @param servletClass
- * @param loadOnStartup
- */
- public static void addServlet (final WebApp webapp,
- final String servletName,
- final String servletClass,
- final String loadOnStartup)
- {
- if (existsServlet(webapp, servletName, servletClass))
- return;
-
- // Create new servlet
- final Servlet servlet = WebFactory.eINSTANCE.createServlet();
- servlet.setServletName(servletName);
- servlet.setServletClass(servletClass);
- servlet.setLoadOnStartup(loadOnStartup);
-
- webapp.getServlets().add(servlet);
- }
-
-
- /**
- * @param webapp
- * @param servletName
- * @param servletClass
- * @return true if the servlet exists.
- */
- public static boolean existsServlet (final WebApp webapp,
- final String servletName,
- final String servletClass)
- {
- return findServlet(webapp, servletName, servletClass) != null;
- }
-
-
- /**
- * @param webapp
- * @param servletName
- * @param servletClass
- * @return the servlet or null if not found.
- */
- public static Servlet findServlet (final WebApp webapp,
- final String servletName,
- final String servletClass)
- {
- for (final Object s : webapp.getServlets())
- {
- final Servlet servlet = (Servlet) s;
- if (servlet.getServletName().equals(servletName) && servlet.getServletClass().equals(servletClass))
- {
- return servlet;
- }
- }
-
- return null;
- }
-
-
- /**
- * @param servletName
- * @param webApp
- * @return the servlet or null if not found.
- */
- public static Servlet findServlet (final String servletName,
- final WebApp webApp)
- {
- for (final Object servlet : webApp.getServlets())
- {
- if (((Servlet) servlet).getServletClass().trim().equals(servletName))
- return (Servlet) servlet;
- }
-
- return null;
- }
-
-
- /**
- * @param webApp
- * @param servlet
- */
- public static void removeServlet (final WebApp webApp,
- final Servlet servlet)
- {
- webApp.getServlets().remove(servlet);
- }
-
-
- /**
- * @param webApp
- * @param servletName
- * @param servletClass
- * @param urlPatternString
- */
- public static void addServletMapping (final WebApp webApp,
- final String servletName,
- final String servletClass,
- final String urlPatternString)
- {
- if (existsServletMapping(webApp, servletName, urlPatternString))
- return;
-
- // Create new servlet mapping.
- final ServletMapping servletMapping = WebFactory.eINSTANCE.createServletMapping();
- servletMapping.setServletName(servletName);
- servletMapping.getUrlPatterns().add(createUrlPattern(urlPatternString));
-
- webApp.getServletMappings().add(servletMapping);
- }
-
-
- /**
- * @param webApp
- * @param servletName
- * @param urlPatternString
- * @return true if the servlet mapping exists.
- */
- public static boolean existsServletMapping (final WebApp webApp,
- final String servletName,
- final String urlPatternString)
- {
- return findServletMapping(webApp, servletName, urlPatternString) != null;
- }
-
-
- /**
- * @param webApp
- * @param servletName
- * @param urlPatternString
- * @return the servlet mapping or null if doesn't exist.
- */
- public static ServletMapping findServletMapping (final WebApp webApp,
- final String servletName,
- final String urlPatternString)
- {
- for (final Object mapping : webApp.getServletMappings())
- {
- final ServletMapping servletMappingToCheck = (ServletMapping) mapping;
- if (servletMappingToCheck.getServletName().trim().equals(servletName))
- {
- // We found a servlet with the same name. Check for urls
- for (final Object pattern : servletMappingToCheck.getUrlPatterns())
- if (((UrlPatternType) pattern).getValue().equals(urlPatternString))
- return servletMappingToCheck;
- }
- }
-
- return null;
- }
-
- /**
- * @param webApp
- * @param servlet
- */
- public static void removeServletMappings (final WebApp webApp,
- final Servlet servlet)
- {
- final List mappings = webApp.getServletMappings();
- String servletName = servlet.getServletName();
-
- if (servletName != null)
- {
- servletName = servletName.trim();
- for (int i = mappings.size() - 1; i >= 0; --i)
- {
- final ServletMapping mapping = (ServletMapping) mappings.get(i);
- if (mapping != null && mapping.getServletName() != null && mapping.getServletName().trim().equals(servletName))
- {
- mappings.remove(mapping);
- }
- }
- }
- }
-
-
- /**
- * @param webapp
- * @param filterName
- * @param filterClass
- */
- public static void addFilter (final WebApp webapp,
- final String filterName,
- final String filterClass)
- {
- if (existsFilter(webapp, filterName, filterClass))
- return;
-
- webapp.getFilters().add(createFilter(filterName, filterClass));
- }
-
-
- /**
- * @param filterName
- * @param filterClass
- * @return the filter or null if it doesn't exist.
- */
- public static Filter createFilter (final String filterName,
- final String filterClass)
- {
- final Filter filter = WebFactory.eINSTANCE.createFilter();
- filter.setFilterName(filterName);
- filter.setFilterClass(filterClass);
- return filter;
- }
-
-
- /**
- * @param webapp
- * @param filterName
- * @param filterClass
- * @return true if the filter exists.
- */
- public static boolean existsFilter (final WebApp webapp,
- final String filterName,
- final String filterClass)
- {
- return findFilter(webapp, filterName, filterClass) != null;
- }
-
-
- /**
- * @param webapp
- * @param filterName
- * @param filterClass
- * @return the filter or null if not found.
- */
- public static Filter findFilter (final WebApp webapp,
- final String filterName,
- final String filterClass)
- {
- for (final Object f : webapp.getFilters())
- {
- final Filter filter = (Filter) f;
- if (filter.getFilterName().trim().equals(filterName) && filter.getFilterClass().trim().equals(filterClass))
- {
- return filter;
- }
- }
-
- return null;
- }
-
-
- /**
- * @param webApp
- * @param filterClassName
- * @return the filter or null if not found.
- */
- public static Filter findFilter (final WebApp webApp,
- final String filterClassName)
- {
- for (final Object filter : webApp.getFilters())
- {
- if (((Filter) filter).getFilterClass().trim().equals(filterClassName))
- return (Filter) filter;
- }
-
- return null;
- }
-
-
- /**
- * @param webApp
- * @param filter
- */
- public static void removeFilter (final WebApp webApp,
- final Filter filter)
- {
- webApp.getFilters().remove(filter);
- }
-
-
- /**
- * @param webapp
- * @param filterName
- * @param servletName
- */
- public static void addFilterMapping (final WebApp webapp,
- final String filterName,
- final String servletName)
- {
- if (existsFilterMapping(webapp, filterName, servletName))
- return;
-
- webapp.getFilterMappings().add(createFilterMapping(filterName, servletName));
- }
-
-
- /**
- * @param filterName
- * @param servletName
- * @return the filter mapping or null if not found.
- */
- public static FilterMapping createFilterMapping (final String filterName,
- final String servletName)
- {
- final FilterMapping filterMapping = WebFactory.eINSTANCE.createFilterMapping();
- filterMapping.setFilterName(filterName);
- filterMapping.getServletNames().add(servletName);
-
- return filterMapping;
- }
-
-
- /**
- * @param webapp
- * @param filterName
- * @param servletName
- * @return true if the filter mapping exists.
- */
- public static boolean existsFilterMapping (final WebApp webapp,
- final String filterName,
- final String servletName)
- {
- return findFilterMapping(webapp, filterName, servletName) != null;
- }
-
-
- /**
- * @param webapp
- * @param filterName
- * @param servletName
- * @return the filter mapping or null.
- */
- public static FilterMapping findFilterMapping (final WebApp webapp,
- final String filterName,
- final String servletName)
- {
- for (final Object fm : webapp.getFilterMappings())
- {
- final FilterMapping filterMapping = (FilterMapping) fm;
-
- if (filterMapping.getFilterName().trim().equals(filterName) && filterMapping.getServletNames().contains(servletName))
- {
- return filterMapping;
- }
- }
-
- return null;
- }
-
-
- /**
- * @param webApp
- * @param filter
- */
- public static void removeFilterMappings (final WebApp webApp,
- final Filter filter)
- {
- final List mappings = webApp.getFilterMappings();
- String filterName = filter.getFilterName();
-
- if (filterName != null)
- {
- filterName = filterName.trim();
- for (int i = mappings.size() - 1; i >= 0; --i)
- {
- final FilterMapping mapping = (FilterMapping) mappings.get(i);
- if (mapping != null && mapping.getFilterName() != null && mapping.getFilterName().trim().equals(filterName))
- {
- mappings.remove(mapping);
- }
- }
- }
- }
-
-
- /**
- * @param webApp
- * @param paramName
- * @param paramValue
- * @param description
- */
- public static void addContextParam (final WebApp webApp,
- final String paramName,
- final String paramValue,
- final String description)
- {
- if (existsContextParam(webApp, paramName, paramValue))
- return;
-
- webApp.getContextParams().add(createContextParam(paramName, paramValue, description));
- }
-
-
- /**
- * @param paramName
- * @param paramValue
- * @param descriptionString
- * @return the param value or null if not found.
- */
- public static ParamValue createContextParam (final String paramName,
- final String paramValue,
- final String descriptionString)
- {
- final ParamValue param = JavaeeFactory.eINSTANCE.createParamValue();
- param.setParamName(paramName);
- param.setParamValue(paramValue);
-
- if (descriptionString != null)
- {
- final Description description = JavaeeFactory.eINSTANCE.createDescription();
- description.setValue(descriptionString);
- param.getDescriptions().add(description);
- }
-
-
- return param;
- }
-
-
- /**
- * @param webApp
- * @param paramName
- * @param paramValue
- * @return true if the context param exists.
- */
- public static boolean existsContextParam (final WebApp webApp,
- final String paramName,
- final String paramValue)
- {
- return findContextParam(webApp, paramName, paramValue) != null;
- }
-
-
- /**
- * @param webApp
- * @param paramName
- * @param paramValue
- * @return the param value or null if not found.
- */
- public static ParamValue findContextParam (final WebApp webApp,
- final String paramName,
- final String paramValue)
- {
- for (final Object param : webApp.getContextParams())
- {
- final ParamValue contextParam = (ParamValue) param;
- if (contextParam.getParamName().equals(paramName) && contextParam.getParamValue().equals(paramValue))
- return contextParam;
- }
-
- return null;
- }
-
-
- /**
- * @param webApp
- * @param paramName Name of context param
- * @return Value of the given context param
- */
- public static String getContextParamValue (final WebApp webApp,
- final String paramName)
- {
- for (final Object param : webApp.getContextParams())
- {
- final ParamValue contextParam = (ParamValue) param;
- if (contextParam.getParamName().equals(paramName))
- return contextParam.getParamValue();
- }
-
- return null;
- }
-
-
- /**
- * @param webApp
- * @param paramName Name of context param
- * @param valuesDelimiterRegex
- * @return Values of the given context param as a list
- */
- public static List<String> getContextParamValuesAsList (final WebApp webApp,
- final String paramName,
- final String valuesDelimiterRegex)
- {
- final String valueString = getContextParamValue(webApp, paramName);
- return Arrays.asList(valueString.split(valuesDelimiterRegex));
- }
-
-
- /**
- * Updates the value of a context param if it exists. Otherwise, adds this
- * as a new context param.
- *
- * @param webApp
- * @param paramName
- * @param paramValue
- */
- public static void setContextParamValue (final WebApp webApp,
- final String paramName,
- final String paramValue)
- {
- ParamValue contextParam = null;
-
- for (final Object p : webApp.getContextParams())
- {
- final ParamValue param = (ParamValue) p;
- if (param.getParamName().equals(paramName))
- {
- contextParam = param;
- break;
- }
- }
-
- if (contextParam == null)
- {
- webApp.getContextParams().add(createContextParam(paramName, paramValue, null));
- }
- else
- {
- contextParam.setParamValue(paramValue);
- }
- }
-
-
- /**
- * @param webapp
- * @param listenerClass
- */
- public static void addListener (final WebApp webapp,
- final String listenerClass)
- {
- if (existsListener(webapp, listenerClass))
- return;
-
- // Create new listener
- final Listener listener = JavaeeFactory.eINSTANCE.createListener();
- listener.setListenerClass(listenerClass);
-
- webapp.getListeners().add(listener);
- }
-
-
- /**
- * @param webapp
- * @param listenerClass
- * @return true if the listener exists.
- */
- public static boolean existsListener (final WebApp webapp,
- final String listenerClass)
- {
- return findListener(webapp, listenerClass) != null;
- }
-
-
- /**
- * @param webapp
- * @param listenerClass
- * @return the listener or null if not found.
- */
- public static Listener findListener (final WebApp webapp,
- final String listenerClass)
- {
- for (final Object listener : webapp.getListeners())
- if (((Listener) listener).getListenerClass().equals(listenerClass))
- return (Listener) listener;
-
- return null;
- }
-
-
- /**
- * @param urlPatternString
- * @return the UrlPattern or null.
- */
- public static UrlPatternType createUrlPattern (final String urlPatternString)
- {
- final UrlPatternType urlPattern = JavaeeFactory.eINSTANCE.createUrlPatternType();
- urlPattern.setValue(urlPatternString);
- return urlPattern;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/webxml/internal/AbstractWebXmlUpdater.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/webxml/internal/AbstractWebXmlUpdater.java
deleted file mode 100644
index b298bb7..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/webxml/internal/AbstractWebXmlUpdater.java
+++ /dev/null
@@ -1,174 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2008 Oracle Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Oracle Corporation - initial API and implementation
- *******************************************************************************/
-
-
-package org.eclipse.jst.jsf.common.webxml.internal;
-
-
-import java.util.List;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.jst.j2ee.model.IModelProvider;
-
-
-/**
- * Abstract class to define web-xml editing interface. Users may use the
- * WebXmlUpdater facade class for convenient web.xml editing.
- *
- * @author Debajit Adhikary
- *
- */
-public abstract class AbstractWebXmlUpdater
-{
- /**
- * the web app object. JavaEE has own type and J2EE has another. They are not object compatible.
- */
- protected final Object webAppObj;
- /**
- * the project
- */
- protected final IProject project;
- /**
- * the model provider used to modify the model
- */
- protected final IModelProvider provider;
- /**
- * the progress monitor
- */
- protected final IProgressMonitor monitor;
-
-
- /**
- * @param webAppObj
- * @param project
- * @param provider
- * @param monitor
- */
- public AbstractWebXmlUpdater (final Object webAppObj,
- final IProject project,
- final IModelProvider provider,
- final IProgressMonitor monitor)
- {
- this.webAppObj = webAppObj;
- this.project = project;
- this.provider = provider;
- this.monitor = monitor;
- }
-
-
- /**
- * @param servletName
- * @param servletClass
- * @param loadOnStartup
- */
- public abstract void addServlet (final String servletName,
- final String servletClass,
- final String loadOnStartup);
-
-
- /**
- * @param servletName
- * @param servletClass
- * @param urlPattern
- */
- public abstract void addServletMapping (final String servletName,
- final String servletClass,
- final String urlPattern);
-
-
- /**
- * Removes a servlet and its associated mappings from web.xml.
- *
- * @param servletClassName
- * Fully qualified classname of servlet class to remove.
- */
- public abstract void removeServlet (final String servletClassName);
-
-
- /**
- * @param filterName
- * @param filterClass
- */
- public abstract void addFilter (final String filterName,
- final String filterClass);
-
-
- /**
- * Removes a filter and its associated mappings from web.xml.
- *
- * @param filterName
- */
- public abstract void removeFilter (final String filterName);
-
-
- /**
- * @param filterName
- * @param filterClass
- * @param servletName
- */
- public abstract void addFilterMapping (final String filterName,
- final String filterClass,
- final String servletName);
-
- /**
- * @param paramName
- * Name of context param
- * @return Value of given context param.
- */
- public abstract String getContextParamValue (final String paramName);
-
-
- /**
- * @param paramName
- * Name of context param
- * @param valuesDelimiterRegex
- * Delimiter string for values
- * @return Values of given context param as a list. This is useful when the
- * multiple values are demarcated by a delimiter string.
- */
- public abstract List<String> getContextParamValuesAsList (final String paramName,
- final String valuesDelimiterRegex);
-
-
- /**
- * Sets the value of the given context param name to the given value. If
- * paramName is not found, a new context-param is created with the given
- * paramName and paramValue.
- *
- * @param paramName
- * @param paramValue
- */
- public abstract void setContextParamValue (final String paramName,
- final String paramValue);
-
-
- /**
- * @param paramName
- * @param paramValue
- * @param description
- */
- public abstract void addContextParam (final String paramName,
- final String paramValue,
- final String description);
-
-
- /**
- * @param listenerClass
- */
- public abstract void addListener (final String listenerClass);
-
-
- /**
- * @return The WebApp object associated with this updater
- */
- public abstract Object getWebApp ();
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/webxml/internal/WebXmlUpdaterForJ2EE.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/webxml/internal/WebXmlUpdaterForJ2EE.java
deleted file mode 100644
index 2d4ba29..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/webxml/internal/WebXmlUpdaterForJ2EE.java
+++ /dev/null
@@ -1,161 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2009 Oracle Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Oracle Corporation - initial API and implementation
- *******************************************************************************/
-
-
-package org.eclipse.jst.jsf.common.webxml.internal;
-
-import java.util.List;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.jst.j2ee.model.IModelProvider;
-import org.eclipse.jst.j2ee.webapplication.Filter;
-import org.eclipse.jst.j2ee.webapplication.Servlet;
-import org.eclipse.jst.j2ee.webapplication.WebApp;
-import org.eclipse.jst.jsf.common.webxml.WebXmlUtils;
-import org.eclipse.jst.jsf.common.webxml.WebXmlUtilsForJ2EE;
-import org.eclipse.jst.jsf.common.webxml.internal.operations.ContextParamAdderForJ2EE;
-import org.eclipse.jst.jsf.common.webxml.internal.operations.FilterAdderForJ2EE;
-import org.eclipse.jst.jsf.common.webxml.internal.operations.FilterMapperAdderForJ2EE;
-import org.eclipse.jst.jsf.common.webxml.internal.operations.FilterRemoverForJavaEE;
-import org.eclipse.jst.jsf.common.webxml.internal.operations.ListenerAdderForJ2EE;
-import org.eclipse.jst.jsf.common.webxml.internal.operations.ServletAdderForJ2EE;
-import org.eclipse.jst.jsf.common.webxml.internal.operations.ServletMappingAdderForJ2EE;
-import org.eclipse.jst.jsf.common.webxml.internal.operations.ServletRemoverForJavaEE;
-
-
-/**
- * @author Debajit Adhikary
- *
- */
-public class WebXmlUpdaterForJ2EE extends AbstractWebXmlUpdater
-{
- private final WebApp webApp;
-
-
- /**
- * @param webAppObj
- * @param project
- * @param provider
- * @param monitor
- */
- public WebXmlUpdaterForJ2EE (final Object webAppObj,
- final IProject project,
- final IModelProvider provider,
- final IProgressMonitor monitor)
- {
- super(webAppObj, project, provider, monitor);
- this.webApp = (WebApp) webAppObj;
- }
-
-
- @Override
- public void addServlet (final String servletName,
- final String servletClass,
- final String loadOnStartup)
- {
- provider.modify(new ServletAdderForJ2EE(project, servletName, servletClass, loadOnStartup), WebXmlUtils.WEB_XML_PATH);
- }
-
-
- @Override
- public void addServletMapping (final String servletName,
- final String servletClass,
- final String urlPattern)
- {
- provider.modify(new ServletMappingAdderForJ2EE(project, servletName, servletClass, urlPattern), WebXmlUtils.WEB_XML_PATH);
- }
-
- // TODO: needs fixing
- @Override
- public void removeServlet (final String servletClassName)
- {
- final Servlet servlet = WebXmlUtilsForJ2EE.findServlet(webApp, servletClassName);
- if (servlet == null)
- throw new IllegalArgumentException("Cannot find servlet named \"" + servletClassName + "\""); //$NON-NLS-1$//$NON-NLS-2$
-
- provider.modify(new ServletRemoverForJavaEE(project, servletClassName), WebXmlUtils.WEB_XML_PATH);
- }
-
-
- @Override
- public void addFilter (final String filterName,
- final String filterClass)
- {
- provider.modify(new FilterAdderForJ2EE(project, filterName, filterClass), WebXmlUtils.WEB_XML_PATH);
- }
-
-
- @Override
- public void removeFilter (final String filterClassName)
- {
- final Filter filter = WebXmlUtilsForJ2EE.findFilter(webApp, filterClassName);
- if (filter == null)
- throw new IllegalArgumentException("Cannot find filter named \"" + filterClassName + "\""); //$NON-NLS-1$//$NON-NLS-2$
-
- provider.modify(new FilterRemoverForJavaEE(project, filterClassName), WebXmlUtils.WEB_XML_PATH);
- }
-
-
- @Override
- public void addFilterMapping (final String filterName,
- final String filterClass,
- final String servletName)
- {
- provider.modify(new FilterMapperAdderForJ2EE(project, filterName, filterClass, servletName), WebXmlUtils.WEB_XML_PATH);
- }
-
-
- @Override
- public String getContextParamValue (final String paramName)
- {
- return WebXmlUtilsForJ2EE.getContextParamValue(webApp, paramName);
- }
-
-
- @Override
- public List<String> getContextParamValuesAsList(String paramName, String valuesDelimiterRegex)
- {
- return WebXmlUtilsForJ2EE.getContextParamValuesAsList(webApp, paramName, valuesDelimiterRegex);
- }
-
-
- @Override
- public void setContextParamValue(String paramName, String paramValue)
- {
- WebXmlUtilsForJ2EE.setContextParamValue(webApp, paramName, paramValue);
- }
-
-
- @Override
-
- public void addContextParam (final String paramName,
- final String paramValue,
- final String description)
- {
- provider.modify(new ContextParamAdderForJ2EE(project, paramName, paramValue, description), WebXmlUtils.WEB_XML_PATH);
- }
-
-
- @Override
- public void addListener (final String listenerClass)
- {
- provider.modify(new ListenerAdderForJ2EE(project, listenerClass), WebXmlUtils.WEB_XML_PATH);
- }
-
-
- @Override
- public Object getWebApp()
- {
- return webApp;
- }
-}
-
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/webxml/internal/WebXmlUpdaterForJavaEE.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/webxml/internal/WebXmlUpdaterForJavaEE.java
deleted file mode 100644
index ee79863..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/webxml/internal/WebXmlUpdaterForJavaEE.java
+++ /dev/null
@@ -1,163 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2009 Oracle Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Oracle Corporation - initial API and implementation
- *******************************************************************************/
-
-
-package org.eclipse.jst.jsf.common.webxml.internal;
-
-import static org.eclipse.jst.jsf.common.webxml.WebXmlUtilsForJavaEE.findFilter;
-import static org.eclipse.jst.jsf.common.webxml.WebXmlUtilsForJavaEE.findServlet;
-
-import java.util.List;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.jst.j2ee.model.IModelProvider;
-import org.eclipse.jst.javaee.web.Filter;
-import org.eclipse.jst.javaee.web.Servlet;
-import org.eclipse.jst.javaee.web.WebApp;
-import org.eclipse.jst.jsf.common.webxml.WebXmlUtils;
-import org.eclipse.jst.jsf.common.webxml.WebXmlUtilsForJavaEE;
-import org.eclipse.jst.jsf.common.webxml.internal.operations.ContextParamAdderForJavaEE;
-import org.eclipse.jst.jsf.common.webxml.internal.operations.FilterAdderForJavaEE;
-import org.eclipse.jst.jsf.common.webxml.internal.operations.FilterMapperAdderForJavaEE;
-import org.eclipse.jst.jsf.common.webxml.internal.operations.FilterRemoverForJavaEE;
-import org.eclipse.jst.jsf.common.webxml.internal.operations.ListenerAdderForJavaEE;
-import org.eclipse.jst.jsf.common.webxml.internal.operations.ServletAdderForJavaEE;
-import org.eclipse.jst.jsf.common.webxml.internal.operations.ServletMappingAdderForJavaEE;
-import org.eclipse.jst.jsf.common.webxml.internal.operations.ServletRemoverForJavaEE;
-
-
-/**
- * @author Debajit Adhikary
- *
- */
-public class WebXmlUpdaterForJavaEE extends AbstractWebXmlUpdater
-{
- private final WebApp webApp;
-
-
- /**
- * @param webAppObj
- * @param project
- * @param provider
- * @param monitor
- */
- public WebXmlUpdaterForJavaEE (final Object webAppObj,
- final IProject project,
- final IModelProvider provider,
- final IProgressMonitor monitor)
- {
- super(webAppObj, project, provider, monitor);
- this.webApp = (WebApp) webAppObj;
- }
-
-
- @Override
- public void addServlet (final String servletName,
- final String servletClass,
- final String loadOnStartup)
- {
- provider.modify(new ServletAdderForJavaEE(project, servletName, servletClass, loadOnStartup), WebXmlUtils.WEB_XML_PATH);
- }
-
-
- @Override
- public void removeServlet (final String servletClassName)
- {
- final Servlet servlet = findServlet(servletClassName, webApp);
- if (servlet == null)
- throw new IllegalArgumentException("Cannot find servlet named \"" + servletClassName + "\""); //$NON-NLS-1$//$NON-NLS-2$
-
- provider.modify(new ServletRemoverForJavaEE(project, servletClassName), WebXmlUtils.WEB_XML_PATH);
- }
-
-
- @Override
- public void addServletMapping (final String servletName,
- final String servletClass,
- final String urlPattern)
- {
- provider.modify(new ServletMappingAdderForJavaEE(project, servletName, servletClass, urlPattern), WebXmlUtils.WEB_XML_PATH);
- }
-
-
- @Override
- public void addFilter (final String filterName,
- final String filterClass)
- {
- provider.modify(new FilterAdderForJavaEE(project, filterName, filterClass), WebXmlUtils.WEB_XML_PATH);
- }
-
-
- @Override
- public void removeFilter (final String filterClassName)
- {
- final Filter filter = findFilter(webApp, filterClassName);
- if (filter == null)
- throw new IllegalArgumentException("Cannot find filter named \"" + filterClassName + "\""); //$NON-NLS-1$//$NON-NLS-2$
-
- provider.modify(new FilterRemoverForJavaEE(project, filterClassName), WebXmlUtils.WEB_XML_PATH);
- }
-
-
- @Override
- public void addFilterMapping (final String filterName,
- final String filterClass,
- final String servletName)
- {
- provider.modify(new FilterMapperAdderForJavaEE(project, filterName, servletName), WebXmlUtils.WEB_XML_PATH);
- }
-
-
- @Override
- public String getContextParamValue (final String paramName)
- {
- return WebXmlUtilsForJavaEE.getContextParamValue(webApp, paramName);
- }
-
-
- @Override
- public List<String> getContextParamValuesAsList (final String paramName,
- final String valuesDelimiterRegex)
- {
- return WebXmlUtilsForJavaEE.getContextParamValuesAsList(webApp, paramName, valuesDelimiterRegex);
- }
-
-
- @Override
- public void setContextParamValue(String paramName, String paramValue)
- {
- WebXmlUtilsForJavaEE.setContextParamValue(webApp, paramName, paramValue);
- }
-
-
- @Override
- public void addContextParam (final String paramName,
- final String paramValue,
- final String description)
- {
- provider.modify(new ContextParamAdderForJavaEE(project, paramName, paramValue, description), WebXmlUtils.WEB_XML_PATH);
- }
-
-
- @Override
- public void addListener (final String listenerClass)
- {
- provider.modify(new ListenerAdderForJavaEE(project, listenerClass), WebXmlUtils.WEB_XML_PATH);
- }
-
-
- @Override
- public Object getWebApp()
- {
- return webApp;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/webxml/internal/operations/ContextParamAdderForJ2EE.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/webxml/internal/operations/ContextParamAdderForJ2EE.java
deleted file mode 100644
index 1ea49e4..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/webxml/internal/operations/ContextParamAdderForJ2EE.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2008 Oracle Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Oracle Corporation - initial API and implementation
- *******************************************************************************/
-
-
-package org.eclipse.jst.jsf.common.webxml.internal.operations;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jst.j2ee.model.ModelProviderManager;
-import org.eclipse.jst.j2ee.webapplication.WebApp;
-import org.eclipse.jst.jsf.common.webxml.WebXmlUtilsForJ2EE;
-
-
-/**
- * Runnable to add a context-param to web.xml.
- *
- * @author Debajit Adhikary
- *
- */
-public class ContextParamAdderForJ2EE implements Runnable
-{
- private final IProject project;
- private final String paramName;
- private final String paramValue;
- private final String description;
-
-
- /**
- * @param project
- * @param paramName
- * @param paramValue
- * @param description
- */
- public ContextParamAdderForJ2EE (final IProject project,
- final String paramName,
- final String paramValue,
- final String description)
- {
- this.project = project;
- this.paramName = paramName;
- this.paramValue = paramValue;
- this.description = description;
- }
-
-
- public void run ()
- {
- final WebApp webApp = (WebApp) ModelProviderManager.getModelProvider(project).getModelObject();
-
- WebXmlUtilsForJ2EE.addContextParam(webApp, paramName, paramValue, description);
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/webxml/internal/operations/ContextParamAdderForJavaEE.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/webxml/internal/operations/ContextParamAdderForJavaEE.java
deleted file mode 100644
index 7b9aae7..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/webxml/internal/operations/ContextParamAdderForJavaEE.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2008 Oracle Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Oracle Corporation - initial API and implementation
- *******************************************************************************/
-
-
-package org.eclipse.jst.jsf.common.webxml.internal.operations;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jst.j2ee.model.ModelProviderManager;
-import org.eclipse.jst.javaee.web.WebApp;
-import org.eclipse.jst.jsf.common.webxml.WebXmlUtilsForJavaEE;
-
-
-/**
- * Runnable to add a context-param to web.xml.
- *
- * @author Debajit Adhikary
- *
- */
-public class ContextParamAdderForJavaEE implements Runnable
-{
- private final IProject project;
- private final String paramName;
- private final String paramValue;
- private final String description;
-
-
- /**
- * @param project
- * @param paramName
- * @param paramValue
- * @param description
- */
- public ContextParamAdderForJavaEE (final IProject project,
- final String paramName,
- final String paramValue,
- final String description)
- {
- this.project = project;
- this.paramName = paramName;
- this.paramValue = paramValue;
- this.description = description;
- }
-
-
- public void run ()
- {
- final WebApp webApp = (WebApp) ModelProviderManager.getModelProvider(project).getModelObject();
-
- WebXmlUtilsForJavaEE.addContextParam(webApp, paramName, paramValue, description);
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/webxml/internal/operations/FilterAdderForJ2EE.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/webxml/internal/operations/FilterAdderForJ2EE.java
deleted file mode 100644
index d1ad0f9..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/webxml/internal/operations/FilterAdderForJ2EE.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2008 Oracle Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Oracle Corporation - initial API and implementation
- *******************************************************************************/
-
-
-package org.eclipse.jst.jsf.common.webxml.internal.operations;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jst.j2ee.model.ModelProviderManager;
-import org.eclipse.jst.j2ee.webapplication.WebApp;
-import org.eclipse.jst.jsf.common.webxml.WebXmlUtilsForJ2EE;
-
-
-/**
- * Runnable to add a filter to web.xml.
- *
- * @author Debajit Adhikary
- *
- */
-public class FilterAdderForJ2EE implements Runnable
-{
- private final IProject project;
- private final String filterName;
- private final String filterClass;
-
-
- /**
- * @param project
- * @param filterName
- * @param filterClass
- */
- public FilterAdderForJ2EE (final IProject project,
- final String filterName,
- final String filterClass)
- {
- this.project = project;
- this.filterName = filterName;
- this.filterClass = filterClass;
- }
-
-
- public void run ()
- {
- final WebApp webApp = (WebApp) ModelProviderManager.getModelProvider(project).getModelObject();
-
- WebXmlUtilsForJ2EE.addFilter(webApp, filterName, filterClass);
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/webxml/internal/operations/FilterAdderForJavaEE.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/webxml/internal/operations/FilterAdderForJavaEE.java
deleted file mode 100644
index 9faa067..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/webxml/internal/operations/FilterAdderForJavaEE.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2008 Oracle Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Oracle Corporation - initial API and implementation
- *******************************************************************************/
-
-
-package org.eclipse.jst.jsf.common.webxml.internal.operations;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jst.j2ee.model.ModelProviderManager;
-import org.eclipse.jst.javaee.web.WebApp;
-import org.eclipse.jst.jsf.common.webxml.WebXmlUtilsForJavaEE;
-
-
-/**
- * Runnable to add a filter to web.xml.
- *
- * @author Debajit Adhikary
- *
- */
-public class FilterAdderForJavaEE implements Runnable
-{
- private final IProject project;
- private final String filterName;
- private final String filterClass;
-
-
- /**
- * @param project
- * @param filterName
- * @param filterClass
- */
- public FilterAdderForJavaEE (final IProject project,
- final String filterName,
- final String filterClass)
- {
- this.project = project;
- this.filterName = filterName;
- this.filterClass = filterClass;
- }
-
-
- public void run ()
- {
- final WebApp webApp = (WebApp) ModelProviderManager.getModelProvider(project).getModelObject();
-
- WebXmlUtilsForJavaEE.addFilter(webApp, filterName, filterClass);
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/webxml/internal/operations/FilterMapperAdderForJ2EE.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/webxml/internal/operations/FilterMapperAdderForJ2EE.java
deleted file mode 100644
index 7dd02a8..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/webxml/internal/operations/FilterMapperAdderForJ2EE.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2008 Oracle Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Oracle Corporation - initial API and implementation
- *******************************************************************************/
-
-
-package org.eclipse.jst.jsf.common.webxml.internal.operations;
-
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jst.j2ee.model.ModelProviderManager;
-import org.eclipse.jst.j2ee.webapplication.WebApp;
-import org.eclipse.jst.jsf.common.webxml.WebXmlUtilsForJ2EE;
-
-
-/**
- * Runnable to add a filter-mapping to web.xml.
- *
- * @author Debajit Adhikary
- *
- */
-public class FilterMapperAdderForJ2EE implements Runnable
-{
- private final IProject project;
- private final String filterName;
- private final String filterClass;
- private final String servletName;
-
-
- /**
- * @param project
- * @param filterName
- * @param filterClass
- * @param servletName
- */
- public FilterMapperAdderForJ2EE (final IProject project,
- final String filterName,
- final String filterClass,
- final String servletName)
- {
- this.project = project;
- this.filterName = filterName;
- this.filterClass = filterClass;
- this.servletName = servletName;
- }
-
-
- public void run ()
- {
- final WebApp webApp = (WebApp) ModelProviderManager.getModelProvider(project).getModelObject();
-
- WebXmlUtilsForJ2EE.addFilterMapping(webApp, filterName, filterClass, servletName);
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/webxml/internal/operations/FilterMapperAdderForJavaEE.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/webxml/internal/operations/FilterMapperAdderForJavaEE.java
deleted file mode 100644
index 5fa9f49..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/webxml/internal/operations/FilterMapperAdderForJavaEE.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2008 Oracle Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Oracle Corporation - initial API and implementation
- *******************************************************************************/
-
-
-package org.eclipse.jst.jsf.common.webxml.internal.operations;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jst.j2ee.model.ModelProviderManager;
-import org.eclipse.jst.javaee.web.WebApp;
-import org.eclipse.jst.jsf.common.webxml.WebXmlUtilsForJavaEE;
-
-
-/**
- * Runnable to add a filter-mapping to web.xml.
- *
- * @author Debajit Adhikary
- *
- */
-public class FilterMapperAdderForJavaEE implements Runnable
-{
- private final IProject project;
- private final String filterName;
- private final String servletName;
-
-
- /**
- * @param project
- * @param filterName
- * @param servletName
- */
- public FilterMapperAdderForJavaEE (final IProject project,
- final String filterName,
- final String servletName)
- {
- this.project = project;
- this.filterName = filterName;
- this.servletName = servletName;
- }
-
-
- public void run ()
- {
- final WebApp webApp = (WebApp) ModelProviderManager.getModelProvider(project).getModelObject();
-
- WebXmlUtilsForJavaEE.addFilterMapping(webApp, filterName, servletName);
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/webxml/internal/operations/FilterRemoverForJavaEE.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/webxml/internal/operations/FilterRemoverForJavaEE.java
deleted file mode 100644
index 68bd2f7..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/webxml/internal/operations/FilterRemoverForJavaEE.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2008 Oracle Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Oracle Corporation - initial API and implementation
- *******************************************************************************/
-
-
-package org.eclipse.jst.jsf.common.webxml.internal.operations;
-
-
-import static org.eclipse.jst.jsf.common.webxml.WebXmlUtilsForJavaEE.findFilter;
-import static org.eclipse.jst.jsf.common.webxml.WebXmlUtilsForJavaEE.removeFilter;
-import static org.eclipse.jst.jsf.common.webxml.WebXmlUtilsForJavaEE.removeFilterMappings;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jst.j2ee.model.ModelProviderManager;
-import org.eclipse.jst.javaee.web.Filter;
-import org.eclipse.jst.javaee.web.WebApp;
-
-
-/**
- * Removes a filter and its associated mappings from web.xml
- *
- * @author Debajit Adhikary
- *
- */
-public class FilterRemoverForJavaEE implements Runnable
-{
- private final IProject project;
- private final String filterClassName;
-
-
- /**
- * @param project
- * @param filterClassName
- */
- public FilterRemoverForJavaEE (final IProject project,
- final String filterClassName)
- {
- this.project = project;
- this.filterClassName = filterClassName;
- }
-
-
- public void run ()
- {
- final WebApp webApp = (WebApp) ModelProviderManager.getModelProvider(project).getModelObject();
- final Filter filter = findFilter(webApp, filterClassName);
-
- removeFilterMappings(webApp, filter);
- removeFilter(webApp, filter);
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/webxml/internal/operations/ListenerAdderForJ2EE.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/webxml/internal/operations/ListenerAdderForJ2EE.java
deleted file mode 100644
index 25c7020..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/webxml/internal/operations/ListenerAdderForJ2EE.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2008 Oracle Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Oracle Corporation - initial API and implementation
- *******************************************************************************/
-
-
-package org.eclipse.jst.jsf.common.webxml.internal.operations;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jst.j2ee.model.ModelProviderManager;
-import org.eclipse.jst.j2ee.webapplication.WebApp;
-import org.eclipse.jst.jsf.common.webxml.WebXmlUtilsForJ2EE;
-
-
-/**
- * Runnable to add a listener to web.xml.
- *
- * @author Debajit Adhikary
- *
- */
-public class ListenerAdderForJ2EE implements Runnable
-{
- private final IProject project;
- private final String listenerClass;
-
-
- /**
- * @param project
- * @param listenerClass
- */
- public ListenerAdderForJ2EE (final IProject project,
- final String listenerClass)
- {
- this.project = project;
- this.listenerClass = listenerClass;
- }
-
-
- public void run ()
- {
- final WebApp webApp = (WebApp) ModelProviderManager.getModelProvider(project).getModelObject();
-
- WebXmlUtilsForJ2EE.addListener(webApp, listenerClass);
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/webxml/internal/operations/ListenerAdderForJavaEE.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/webxml/internal/operations/ListenerAdderForJavaEE.java
deleted file mode 100644
index ea8c600..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/webxml/internal/operations/ListenerAdderForJavaEE.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2008 Oracle Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Oracle Corporation - initial API and implementation
- *******************************************************************************/
-
-
-package org.eclipse.jst.jsf.common.webxml.internal.operations;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jst.j2ee.model.ModelProviderManager;
-import org.eclipse.jst.javaee.web.WebApp;
-import org.eclipse.jst.jsf.common.webxml.WebXmlUtilsForJavaEE;
-
-
-/**
- * Runnable to add a listener to web.xml.
- *
- * @author Debajit Adhikary
- *
- */
-public class ListenerAdderForJavaEE implements Runnable
-{
- private final IProject project;
- private final String listenerClass;
-
-
- /**
- * @param project
- * @param listenerClass
- */
- public ListenerAdderForJavaEE (final IProject project,
- final String listenerClass)
- {
- this.project = project;
- this.listenerClass = listenerClass;
- }
-
-
- public void run ()
- {
- final WebApp webApp = (WebApp) ModelProviderManager.getModelProvider(project).getModelObject();
-
- WebXmlUtilsForJavaEE.addListener(webApp, listenerClass);
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/webxml/internal/operations/ServletAdderForJ2EE.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/webxml/internal/operations/ServletAdderForJ2EE.java
deleted file mode 100644
index 2626fed..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/webxml/internal/operations/ServletAdderForJ2EE.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2008 Oracle Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Oracle Corporation - initial API and implementation
- *******************************************************************************/
-
-
-package org.eclipse.jst.jsf.common.webxml.internal.operations;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jst.j2ee.model.ModelProviderManager;
-import org.eclipse.jst.j2ee.webapplication.WebApp;
-import org.eclipse.jst.jsf.common.webxml.WebXmlUtilsForJ2EE;
-
-
-/**
- * Runnable to add a servlet to web.xml.
- *
- * @author Debajit Adhikary
- *
- */
-public class ServletAdderForJ2EE implements Runnable
-{
- private final IProject project;
- private final String servletName;
- private final String servletClass;
- private final String loadOnStartup;
-
-
- /**
- * @param project
- * @param servletName
- * @param servletClass
- * @param loadOnStartup
- */
- public ServletAdderForJ2EE (final IProject project,
- final String servletName,
- final String servletClass,
- final String loadOnStartup)
- {
- this.project = project;
- this.servletName = servletName;
- this.servletClass = servletClass;
- this.loadOnStartup = loadOnStartup;
- }
-
-
- public void run ()
- {
- final WebApp webApp = (WebApp) ModelProviderManager.getModelProvider(project).getModelObject();
-
- WebXmlUtilsForJ2EE.addServlet(webApp, servletName, servletClass, loadOnStartup);
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/webxml/internal/operations/ServletAdderForJavaEE.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/webxml/internal/operations/ServletAdderForJavaEE.java
deleted file mode 100644
index fd324a3..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/webxml/internal/operations/ServletAdderForJavaEE.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2008 Oracle Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Oracle Corporation - initial API and implementation
- *******************************************************************************/
-
-
-package org.eclipse.jst.jsf.common.webxml.internal.operations;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jst.j2ee.model.ModelProviderManager;
-import org.eclipse.jst.javaee.web.WebApp;
-import org.eclipse.jst.jsf.common.webxml.WebXmlUtilsForJavaEE;
-
-
-/**
- * Runnable to add a servlet to web.xml.
- *
- * @author Debajit Adhikary
- *
- */
-public class ServletAdderForJavaEE implements Runnable
-{
- private final IProject project;
- private final String servletName;
- private final String servletClass;
- private final String loadOnStartup;
-
-
- /**
- * @param project
- * @param servletName
- * @param servletClass
- * @param loadOnStartup
- */
- public ServletAdderForJavaEE (final IProject project,
- final String servletName,
- final String servletClass,
- final String loadOnStartup)
- {
- this.project = project;
- this.servletName = servletName;
- this.servletClass = servletClass;
- this.loadOnStartup = loadOnStartup;
- }
-
-
- public void run ()
- {
- final WebApp webApp = (WebApp) ModelProviderManager.getModelProvider(project).getModelObject();
-
- WebXmlUtilsForJavaEE.addServlet(webApp, servletName, servletClass, loadOnStartup);
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/webxml/internal/operations/ServletMappingAdderForJ2EE.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/webxml/internal/operations/ServletMappingAdderForJ2EE.java
deleted file mode 100644
index d5bf752..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/webxml/internal/operations/ServletMappingAdderForJ2EE.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2008 Oracle Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Oracle Corporation - initial API and implementation
- *******************************************************************************/
-
-
-package org.eclipse.jst.jsf.common.webxml.internal.operations;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jst.j2ee.model.ModelProviderManager;
-import org.eclipse.jst.j2ee.webapplication.WebApp;
-import org.eclipse.jst.jsf.common.webxml.WebXmlUtilsForJ2EE;
-
-
-/**
- * Runnable to add a servlet-mapping to web.xml.
- *
- * @author Debajit Adhikary
- *
- */
-public class ServletMappingAdderForJ2EE implements Runnable
-{
- private final IProject project;
- private final String servletName;
- private final String servletClass;
- private final String urlPatternString;
-
-
- /**
- * @param project
- * @param servletName
- * @param servletClass
- * @param urlPatternString
- */
- public ServletMappingAdderForJ2EE (final IProject project,
- final String servletName,
- final String servletClass,
- final String urlPatternString)
- {
- this.project = project;
- this.servletName = servletName;
- this.servletClass = servletClass;
- this.urlPatternString = urlPatternString;
- }
-
-
- public void run ()
- {
- final WebApp webApp = (WebApp) ModelProviderManager.getModelProvider(project).getModelObject();
-
- WebXmlUtilsForJ2EE.addServletMapping(webApp, servletName, servletClass, urlPatternString);
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/webxml/internal/operations/ServletMappingAdderForJavaEE.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/webxml/internal/operations/ServletMappingAdderForJavaEE.java
deleted file mode 100644
index 16fe084..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/webxml/internal/operations/ServletMappingAdderForJavaEE.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2008 Oracle Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Oracle Corporation - initial API and implementation
- *******************************************************************************/
-
-
-package org.eclipse.jst.jsf.common.webxml.internal.operations;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jst.j2ee.model.ModelProviderManager;
-import org.eclipse.jst.javaee.web.WebApp;
-import org.eclipse.jst.jsf.common.webxml.WebXmlUtilsForJavaEE;
-
-
-/**
- * Runnable to add a servlet-mapping to web.xml.
- *
- * @author Debajit Adhikary
- *
- */
-public class ServletMappingAdderForJavaEE implements Runnable
-{
- private final IProject project;
- private final String servletName;
- private final String servletClass;
- private final String urlPatternString;
-
-
- /**
- * @param project
- * @param servletName
- * @param servletClass
- * @param urlPatternString
- */
- public ServletMappingAdderForJavaEE (final IProject project,
- final String servletName,
- final String servletClass,
- final String urlPatternString)
- {
- this.project = project;
- this.servletName = servletName;
- this.servletClass = servletClass;
- this.urlPatternString = urlPatternString;
- }
-
-
- public void run ()
- {
- final WebApp webApp = (WebApp) ModelProviderManager.getModelProvider(project).getModelObject();
-
- WebXmlUtilsForJavaEE.addServletMapping(webApp, servletName, servletClass, urlPatternString);
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/webxml/internal/operations/ServletRemoverForJ2EE.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/webxml/internal/operations/ServletRemoverForJ2EE.java
deleted file mode 100644
index 9134a9a..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/webxml/internal/operations/ServletRemoverForJ2EE.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2008 Oracle Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Oracle Corporation - initial API and implementation
- *******************************************************************************/
-
-
-package org.eclipse.jst.jsf.common.webxml.internal.operations;
-
-import static org.eclipse.jst.jsf.common.webxml.WebXmlUtilsForJ2EE.findServlet;
-import static org.eclipse.jst.jsf.common.webxml.WebXmlUtilsForJ2EE.removeServlet;
-import static org.eclipse.jst.jsf.common.webxml.WebXmlUtilsForJ2EE.removeServletMappings;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jst.j2ee.model.ModelProviderManager;
-import org.eclipse.jst.j2ee.webapplication.Servlet;
-import org.eclipse.jst.j2ee.webapplication.WebApp;
-
-
-/**
- * Removes a servlet and its associated mappings from web.xml.
- *
- * @author Debajit Adhikary
- *
- */
-public class ServletRemoverForJ2EE implements Runnable
-{
- private final IProject project;
- private final String servletClassName;
-
-
- /**
- * @param project
- * @param servletClassName
- */
- public ServletRemoverForJ2EE (final IProject project,
- final String servletClassName)
- {
- this.project = project;
- this.servletClassName = servletClassName;
- }
-
-
- public void run ()
- {
- final WebApp webApp = (WebApp) ModelProviderManager.getModelProvider(project).getModelObject();
- final Servlet servlet = findServlet(webApp, servletClassName);
-
- removeServletMappings(webApp, servlet);
- removeServlet(webApp, servlet);
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/webxml/internal/operations/ServletRemoverForJavaEE.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/webxml/internal/operations/ServletRemoverForJavaEE.java
deleted file mode 100644
index baf6cd0..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/webxml/internal/operations/ServletRemoverForJavaEE.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2008 Oracle Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Oracle Corporation - initial API and implementation
- *******************************************************************************/
-
-
-package org.eclipse.jst.jsf.common.webxml.internal.operations;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jst.j2ee.model.ModelProviderManager;
-import org.eclipse.jst.javaee.web.Servlet;
-import org.eclipse.jst.javaee.web.WebApp;
-import org.eclipse.jst.jsf.common.webxml.WebXmlUtilsForJavaEE;
-
-
-/**
- * Removes a servlet and its associated mappings from web.xml
- *
- * @author Debajit Adhikary
- *
- */
-public class ServletRemoverForJavaEE implements Runnable
-{
- private final IProject project;
- private final String servletClassName;
-
-
- /**
- * @param project
- * @param servletClassName
- */
- public ServletRemoverForJavaEE (final IProject project,
- final String servletClassName)
- {
- this.project = project;
- this.servletClassName = servletClassName;
- }
-
-
- public void run ()
- {
- final WebApp webApp = (WebApp) ModelProviderManager.getModelProvider(project).getModelObject();
- final Servlet servlet = WebXmlUtilsForJavaEE.findServlet(servletClassName, webApp);
-
- WebXmlUtilsForJavaEE.removeServletMappings(webApp, servlet);
- WebXmlUtilsForJavaEE.removeServlet(webApp, servlet);
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/AbstractDelegatingFactory.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/AbstractDelegatingFactory.java
deleted file mode 100644
index 2a88ad6..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/AbstractDelegatingFactory.java
+++ /dev/null
@@ -1,140 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Oracle 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:
- * Cameron Bateman/Oracle - initial API and implementation
- *
- ********************************************************************************/
-
-package org.eclipse.jst.jsf.context;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.List;
-import java.util.concurrent.CopyOnWriteArrayList;
-
-import org.eclipse.core.runtime.IAdaptable;
-
-/**
- * An abstract implementation of the IDelegatingFactory interface
- *
- * Clients may extend this class.
- *
- * @author cbateman
- *
- */
-public abstract class AbstractDelegatingFactory implements IDelegatingFactory
-{
-
- /* instance attributes */
-
- /**
- * the list of registered factory delegates
- */
- protected final CopyOnWriteArrayList<IAdaptable> _delegates;
-
- private final List<Class> _supportedDelegates;
-
- /**
- * @param supportedDelegateTypes
- * -- populates the list of classes used by the isValidDelegate
- * contract
- */
- protected AbstractDelegatingFactory(final Class[] supportedDelegateTypes)
- {
- _delegates = new CopyOnWriteArrayList<IAdaptable>();
-
- final List<Class> supportedTypes = new ArrayList<Class>();
- supportedTypes.addAll(Arrays.asList(supportedDelegateTypes));
- _supportedDelegates = Collections.unmodifiableList(supportedTypes);
- }
-
- /**
- * @see org.eclipse.jst.jsf.context.IDelegatingFactory#addFactoryDelegate(org.eclipse.core.runtime.IAdaptable)
- */
- public final void addFactoryDelegate(final IAdaptable delegate)
- {
- if (isValidDelegate(delegate))
- {
- synchronized(_delegates)
- {
- _delegates.addIfAbsent(delegate);
- if (_delegates.size() > 1)
- {
- List<IAdaptable> delegates = new ArrayList<IAdaptable>(_delegates);
-
- Collections.sort(delegates, new Comparator()
- {
- public int compare(Object delegate1, Object delegate2)
- {
- final Class<?> clazz1 = delegate1.getClass();
- final Class<?> clazz2 = delegate2.getClass();
-
- Package package1 = clazz1.getPackage();
- Package package2 = clazz2.getPackage();
- boolean package1IsOSS = package1.getName().startsWith("org.eclipse.jst"); //$NON-NLS-1$
- boolean package2IsOSS = package2.getName().startsWith("org.eclipse.jst"); //$NON-NLS-1$
-
- if (package1IsOSS && !package2IsOSS)
- {
- // sort the oss one after the non-oss one
- return 1;
- }
- else if (!package1IsOSS && package2IsOSS)
- {
- return -1;
- }
-
- // otherwise they are either both oss or both non-oss, so just
- // sort canonically by name.
- return clazz1.getName().compareTo(clazz2.getName());
- }
- });
- _delegates.clear();
- _delegates.addAll(delegates);
- }
- }
- }
- }
-
- /**
- * @see org.eclipse.jst.jsf.context.IDelegatingFactory#removeFactoryDelegate(org.eclipse.core.runtime.IAdaptable)
- */
- public final boolean removeFactoryDelegate(final IAdaptable delegate)
- {
- return _delegates.remove(delegate);
- }
-
- /**
- * @see org.eclipse.jst.jsf.context.IDelegatingFactory#getValidDelegateTypes()
- */
- public final List<Class> getValidDelegateTypes()
- {
- return _supportedDelegates;
- }
-
- /**
- * @see org.eclipse.jst.jsf.context.IDelegatingFactory#isValidDelegate(org.eclipse.core.runtime.IAdaptable)
- */
- public final boolean isValidDelegate(final IAdaptable delegate)
- {
- for (final Class clazz : _supportedDelegates)
- {
- // if the delegate supports one of the valid delegate classes
- // via adaptation, then it is a valid delegate
- if (delegate.getAdapter(clazz) != null)
- {
- return true;
- }
- }
-
- // if no found, delegate is not supported
- return false;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/AbstractDocumentContext.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/AbstractDocumentContext.java
deleted file mode 100644
index 9dad348..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/AbstractDocumentContext.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Oracle 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:
- * Cameron Bateman/Oracle - initial API and implementation
- *
- ********************************************************************************/
-
-package org.eclipse.jst.jsf.context;
-
-
-/**
- * A convenience super-type for all context instances that implement
- * IDocumentContext or one of its sub-types.
- *
- *
- * @author cbateman
- *
- */
-public abstract class AbstractDocumentContext implements IDocumentContext {
-
- /**
- * @see org.eclipse.core.runtime.IAdaptable#getAdapter(java.lang.Class)
- */
- public Object getAdapter(Class adapterClass)
- {
- if (adapterClass.equals(IDocumentContext.class))
- {
- return this;
- }
- else if (adapterClass.equals(IModelContext.class))
- {
- return this;
- }
-
- return null;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/IDelegatingFactory.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/IDelegatingFactory.java
deleted file mode 100644
index 6e91576..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/IDelegatingFactory.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Oracle 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:
- * Cameron Bateman/Oracle - initial API and implementation
- *
- ********************************************************************************/
-
-package org.eclipse.jst.jsf.context;
-
-import java.util.List;
-
-import org.eclipse.core.runtime.IAdaptable;
-
-/**
- * Defines a type of factory that can have delegate factories to help it
- * create an appropriate instance type. The general contract for implementors
- * is:
- *
- * 1) You must follow the isValidDelegate contract.
- * 2) You should try to create an instance yourself and only delegate
- * if cannot do it yourself. Deviations from this rule must be
- * clearly documented to ensure clients understand how the factory works.
- *
- * Clients may NOT implement this interface.
- * Extend AbstractDelegatingFactory instead.
- *
- * @author cbateman
- *
- */
-public interface IDelegatingFactory
-{
- /** -- Delegates */
- /** If this factory is asked to construct but does not know how to,
- * it will ask each of its registered delegates to do so in the order
- * they were added.
- */
-
- /**
- * Adds delgate to the end of the list of factory delegates if the list
- * does not already contain it.
- *
- * @param delegate
- * @throws ClassCastException if delegate does not implement an expected
- * interface. Each implementor can define what delegates are valid
- * based on the isValidDelegate() and getValidDelegates contracts
- */
- void addFactoryDelegate(IAdaptable delegate);
-
-
- /**
- * @param delegate
- * @return true if delegate was removed, false if delegate wasn't in
- * the list of delegates
- */
- boolean removeFactoryDelegate(IAdaptable delegate);
-
- /**
- * @return a list of Class objects that represent the interfaces
- * that may be passed to addFactoryDelegate. Implementor should
- * return at least one supported class.
- */
- List<Class> getValidDelegateTypes();
-
-
- /**
- * The return value of this method should conform to the following contract:
- *
- * Let v = getValidDelegates. Then isValidDelegate should return true
- * only if the set of v contains a Class for which delegate.getAdapter(Class)
- * returns a non-null value.
- *
- * @param delegate
- * @return true if delegate is supported, false otherwise.
- */
- boolean isValidDelegate(IAdaptable delegate);
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/IDocumentContext.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/IDocumentContext.java
deleted file mode 100644
index fe7d033..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/IDocumentContext.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Oracle 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:
- * Cameron Bateman/Oracle - initial API and implementation
- *
- ********************************************************************************/
-
-package org.eclipse.jst.jsf.context;
-
-/**
- * Encapsulates runtime context in a JFace IDocument model
- *
- * Clients may NOT implement this interface directly but may sub-class
- * Extend AbstractDocumentContext instead.
-
- * @author cbateman
- *
- */
-public interface IDocumentContext extends IModelContext
-{
- // TODO: might make sense to have a getDocument() accessor here
- // currently empty
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/IModelContext.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/IModelContext.java
deleted file mode 100644
index 1ace325..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/IModelContext.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Oracle 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:
- * Cameron Bateman/Oracle - initial API and implementation
- *
- ********************************************************************************/
-
-package org.eclipse.jst.jsf.context;
-
-import org.eclipse.core.runtime.IAdaptable;
-
-/**
- * Encapsulates the current runtime context in some model.
- *
- * This interface may be sub-classed but not implemented directly
- */
-public interface IModelContext extends IAdaptable
-{
- // current empty
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/package-info.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/package-info.java
deleted file mode 100644
index f31d0b2..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/package-info.java
+++ /dev/null
@@ -1,16 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Oracle 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:
- * Oracle - initial API and implementation
- *
- ********************************************************************************/
-
-/**
- * Model context framework.
- */
-package org.eclipse.jst.jsf.context;
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/resolver/AbstractContextResolver.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/resolver/AbstractContextResolver.java
deleted file mode 100644
index d7b8c7c..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/resolver/AbstractContextResolver.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2007 Oracle Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Oracle Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.context.resolver;
-
-import org.eclipse.jst.jsf.context.IModelContext;
-
-/**
- * The super-class of all context resolver impls.
- *
- * @author cbateman
- *
- */
-public abstract class AbstractContextResolver implements IContextResolver {
-
- public abstract boolean canResolveContext(IModelContext modelContext);
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/resolver/AbstractDocumentContextResolver.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/resolver/AbstractDocumentContextResolver.java
deleted file mode 100644
index 3571dc4..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/resolver/AbstractDocumentContextResolver.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2007 Oracle Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Oracle Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.context.resolver;
-
-import org.eclipse.jst.jsf.context.IModelContext;
-
-/**
- * The parent of all IDocumentContextResolver implementations.
- *
- * @author cbateman
- *
- */
-public abstract class AbstractDocumentContextResolver implements
- IDocumentContextResolver {
-
- public abstract boolean canResolveContext(IModelContext modelContext);
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/resolver/IContextResolver.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/resolver/IContextResolver.java
deleted file mode 100644
index 4471cab..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/resolver/IContextResolver.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Oracle 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:
- * Cameron Bateman/Oracle - initial API and implementation
- *
- ********************************************************************************/
-package org.eclipse.jst.jsf.context.resolver;
-
-import org.eclipse.jst.jsf.context.IModelContext;
-
-/**
- * Super type of all context resolvers.
- *
- * May be sub-classed but should not be implemented directly.
- * Use AbstractContextResolver to implement.
- *
- * @author cbateman
- *
- */
-public interface IContextResolver
-{
- /**
- * @param modelContext
- * @return true if this resolver can resolve context information
- * based on this context
- */
- boolean canResolveContext(IModelContext modelContext);
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/resolver/IDocumentContextResolver.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/resolver/IDocumentContextResolver.java
deleted file mode 100644
index 0191c3f..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/resolver/IDocumentContextResolver.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Oracle 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:
- * Cameron Bateman/Oracle - initial API and implementation
- *
- ********************************************************************************/
-
-package org.eclipse.jst.jsf.context.resolver;
-
-/**
- * The super-interface for all context resolvers that are related
- * to IDocumentContext's.
- *
- * This interface may NOT be implemented by clients directly but may be sub-classed.
- * Use AbstractDocumentContextResolver for implementation.
- *
- * @author cbateman
- *
- */
-public interface IDocumentContextResolver extends IContextResolver
-{
- // currently empty
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/resolver/package-info.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/resolver/package-info.java
deleted file mode 100644
index 27cb48d..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/resolver/package-info.java
+++ /dev/null
@@ -1,16 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Oracle 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:
- * Oracle - initial API and implementation
- *
- ********************************************************************************/
-
-/**
- * Context resolver framework.
- */
-package org.eclipse.jst.jsf.context.resolver;
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/resolver/structureddocument/IDOMContextResolver.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/resolver/structureddocument/IDOMContextResolver.java
deleted file mode 100644
index 4677bc8..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/resolver/structureddocument/IDOMContextResolver.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Oracle 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:
- * Cameron Bateman/Oracle - initial API and implementation
- *
- ********************************************************************************/
-
-package org.eclipse.jst.jsf.context.resolver.structureddocument;
-
-import org.eclipse.jst.jsf.context.resolver.IDocumentContextResolver;
-import org.w3c.dom.Document;
-import org.w3c.dom.Node;
-
-/**
- * Defines a type of context resolver used to resolve the current context
- * in the XML DOM context.
- *
- * This interface may be sub-classed or implemented by clients
- *
- * @author cbateman
- *
- */
-public interface IDOMContextResolver extends IDocumentContextResolver
-{
- /**
- * @return the complete DOM Document for this context or null if it
- * cannot be resolved.
- */
- Document getDOMDocument();
-
- /**
- * @return the node which the current context is pointing to.
- * If document context is on an attribute will return that attribute
- */
- Node getNode();
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/resolver/structureddocument/IMetadataContextResolver.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/resolver/structureddocument/IMetadataContextResolver.java
deleted file mode 100644
index 12e9987..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/resolver/structureddocument/IMetadataContextResolver.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Oracle 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:
- * Cameron Bateman/Oracle - initial API and implementation
- *
- ********************************************************************************/
-
-package org.eclipse.jst.jsf.context.resolver.structureddocument;
-
-import java.util.List;
-
-import org.eclipse.jst.jsf.context.resolver.IDocumentContextResolver;
-
-/**
- * Resolves meta-data for a particular context
- *
- * This interface may sub-classed or implemented by clients
- *
- * @author cbateman
- *
- */
-public interface IMetadataContextResolver extends IDocumentContextResolver
-{
- /**
- * @param key
- * @return a list of one or more String values associated with key
- * for the current context location.
- */
- List getPropertyValue(String key);
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/resolver/structureddocument/IStructuredDocumentContextResolverFactory.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/resolver/structureddocument/IStructuredDocumentContextResolverFactory.java
deleted file mode 100644
index 1727b2f..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/resolver/structureddocument/IStructuredDocumentContextResolverFactory.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Oracle 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:
- * Cameron Bateman/Oracle - initial API and implementation
- *
- ********************************************************************************/
-
-package org.eclipse.jst.jsf.context.resolver.structureddocument;
-
-import org.eclipse.jst.jsf.context.resolver.structureddocument.internal.ITextRegionContextResolver;
-import org.eclipse.jst.jsf.context.resolver.structureddocument.internal.impl.StructuredDocumentContextResolverFactory;
-import org.eclipse.jst.jsf.context.structureddocument.IStructuredDocumentContext;
-
-
-/**
- * A factory for creating context resolvers that work with structured
- * document contexts
- *
- * This factory may be used but not implemented or extended by clients.
- * TODO:
- * Note that getTextRegionResolver() will be moved to to an internal factory
- * interface and should not be considered part of the provisional API
- *
- * @author cbateman
- *
- */
-public interface IStructuredDocumentContextResolverFactory
-{
-
- /**
- * The global instance of the factory
- */
- public static final IStructuredDocumentContextResolverFactory INSTANCE = StructuredDocumentContextResolverFactory.getInstance();
-
- /**
- * @param context
- * @return a resolver capable of resolving information in context or null
- * if one cannot be created.
- */
- IDOMContextResolver getDOMContextResolver(IStructuredDocumentContext context);
-
- /**
- * **Non-WTP Clients: this method should not be considered API**
- *
- * @param context
- * @return a resolver capable of resolving information in the context or
- * null if one cannot be created
- */
- ITextRegionContextResolver getTextRegionResolver(IStructuredDocumentContext context);
-
- /**
- * @param context
- * @return a resolver capable of resolving information in the context or
- * null if one cannot be created
- */
- IWorkspaceContextResolver getWorkspaceContextResolver(IStructuredDocumentContext context);
-
- /**
- * @param context
- * @return a resolver capable of resolving information in the context
- * or null one cannot be created
- */
- ITaglibContextResolver getTaglibContextResolver(IStructuredDocumentContext context);
-
- /**
- * @param context
- * @return a resolver capable of resolving information in the context
- * or null if one cannot be created
- */
- IMetadataContextResolver getMetadataContextResolver(IStructuredDocumentContext context);
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/resolver/structureddocument/ITaglibContextResolver.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/resolver/structureddocument/ITaglibContextResolver.java
deleted file mode 100644
index 34c4b6f..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/resolver/structureddocument/ITaglibContextResolver.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Oracle 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:
- * Cameron Bateman/Oracle - initial API and implementation
- *
- ********************************************************************************/
-
-package org.eclipse.jst.jsf.context.resolver.structureddocument;
-
-import org.eclipse.jst.jsf.context.resolver.IDocumentContextResolver;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-/**
- * Defines a context resolver that resolves tag library information
- * for a particular context.
- *
- * This interface may be sub-classed or implemented by clients
- *
- * @author cbateman
- *
- */
-public interface ITaglibContextResolver extends IDocumentContextResolver
-{
- /**
- * @param node
- * @return the URI corresponding to the taglib that defines the
- * node in the context document or null if it cannot be found
- */
- String getTagURIForNodeName(Node node);
-
- /**
- * @param uri
- * @return the tag prefix used in the context document for
- * the provided uri or null if it cannot be found.
- */
- String getTagPrefixForURI(String uri);
-
- /**
- * A list all tags in the document context that are called
- * tagName defined in the namespace indicated by uri
- *
- * @param uri
- * @param tagName
- * @return a (possibly empty) list of tags -- must never
- * be null. Indicate none found with an empty list.
- */
- NodeList getTagsByNamespaceURI(String uri, String tagName);
-
- /**
- * @param node
- * @return true if node has a tag library associated with it in this context
- */
- public boolean hasTag(Node node);
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/resolver/structureddocument/IWorkspaceContextResolver.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/resolver/structureddocument/IWorkspaceContextResolver.java
deleted file mode 100644
index 9a9f399..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/resolver/structureddocument/IWorkspaceContextResolver.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Oracle 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:
- * Cameron Bateman/Oracle - initial API and implementation
- *
- ********************************************************************************/
-
-package org.eclipse.jst.jsf.context.resolver.structureddocument;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.jst.jsf.context.resolver.IDocumentContextResolver;
-
-/**
- * A resolver to determine the current context within the Eclipse
- * workspace.
- *
- * This interface may be sub-classed or implemented by clients
- *
- * @author cbateman
- *
- */
-public interface IWorkspaceContextResolver extends IDocumentContextResolver
-{
- /**
- * @return the project that contains the document context
- * or null if it cannot be determined
- */
- IProject getProject();
-
- /**
- * @return the resource that contains the document context
- * or null if it cannot be determined.
- * This should normally be an IFile.
- */
- IResource getResource();
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/resolver/structureddocument/internal/IStructuredDocumentContextResolverFactory2.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/resolver/structureddocument/internal/IStructuredDocumentContextResolverFactory2.java
deleted file mode 100644
index 4244d33..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/resolver/structureddocument/internal/IStructuredDocumentContextResolverFactory2.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2008 Oracle Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Oracle Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.context.resolver.structureddocument.internal;
-
-import org.eclipse.jst.jsf.context.resolver.structureddocument.IStructuredDocumentContextResolverFactory;
-import org.eclipse.jst.jsf.context.resolver.structureddocument.ITaglibContextResolver;
-import org.eclipse.jst.jsf.context.structureddocument.IStructuredDocumentContext;
-
-/**
- * An additional factory interface for context resolvers.
- *
- * @author cbateman
- *
- */
-public interface IStructuredDocumentContextResolverFactory2 extends
- IStructuredDocumentContextResolverFactory
-{
- /**
- * The global instance of the factory
- */
- public static final IStructuredDocumentContextResolverFactory2 INSTANCE =
- (IStructuredDocumentContextResolverFactory2) IStructuredDocumentContextResolverFactory.INSTANCE;
-
- /**
- * Same as getTaglibContextResolver but checks delegate factory first.
- *
- * @param context
- * @return a resolver capable of resolving information in the context
- * or null one cannot be created
- */
- ITaglibContextResolver getTaglibContextResolverFromDelegates(IStructuredDocumentContext context);
-
- /**
- * @param <T> resolver type
- * @param context
- * @param clazz
- * @return resolver of type T
- */
- <T> T getResolver(IStructuredDocumentContext context, Class<T> clazz);
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/resolver/structureddocument/internal/ITextRegionContextResolver.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/resolver/structureddocument/internal/ITextRegionContextResolver.java
deleted file mode 100644
index aca8435..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/resolver/structureddocument/internal/ITextRegionContextResolver.java
+++ /dev/null
@@ -1,128 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Oracle 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:
- * Cameron Bateman/Oracle - initial API and implementation
- *
- ********************************************************************************/
-
-package org.eclipse.jst.jsf.context.resolver.structureddocument.internal;
-
-import org.eclipse.jst.jsf.context.resolver.IDocumentContextResolver;
-import org.eclipse.jst.jsf.context.structureddocument.IStructuredDocumentContext;
-
-/**
- * Defines a resolver that can resolve context information in the
- * structured document region context.
- *
- * Unless otherwise stated, the context region is the most specific
- * region (leaf) in which the current context is contained.
- *
- * Note: this interface may use internal/provisional types.
- *
- * @author cbateman
- *
- */
-public interface ITextRegionContextResolver extends IDocumentContextResolver
-{
- /**
- * @return the text for the context region
- */
- String getRegionText();
-
- /**
- * @return the document relative offset of the start of the region
- * in which the context in is contained or -1 if the offset cannot be determined.
- */
- int getStartOffset();
-
- /**
- * @return the document relative offset of the end of the region
- * in which the context is contained or -1 if the offset cannot be determined
- */
- int getEndOffset();
-
- /**
- * @return the length of the most specific region in which the context
- * is contained or -1 if the length cannot be determined.
- */
- int getLength();
-
- /**
- * @return the most specific TextRegion type for the current context
- */
- String getRegionType();
-
- /**
- * @return the path to the most specific TextRegtion for the current context
- * note that this does not include the actual region for the current region.
- * That is returned by getRegionType().
- *
- */
- String[] getRegionTypePath();
-
-
- /**
- * The offset into the structured document will be set to be
- * the start offset of the previous region
- *
- * @return a context for the previous sibling of this context's
- * text region parent or null if no previous sibling exists
- */
- IStructuredDocumentContext getPreviousContext();
-
- /**
- * The offset into the structured document will be set to be
- * the start offset of the next region
- *
- * @return a context for the next sibling of this context's
- * text region parent or null if no next sibling exists
- */
- IStructuredDocumentContext getNextContext();
-
- /**
- * Relative path works backwards from the current context. So if the
- * path to current context is /a/b/c/d/e then:
- *
- * matchesRelative({"e"}) == true
- * matchesRelative({"d", "e"}) == true
- * matchesRelative({"c", "d", "e"}) == true
- * matchesRelative({"b", "c", "d", "e"}) == true
- * matchesRelative({"a", "b", "c", "d", "e"}) == true
- *
- * because in every case the path matches working backward from the current
- * context
- *
- * but
- *
- * matchesRelative({a}) == false because context/.. == e not a
- *
- * TODO: what does path = new String[0] mean?
- *
- * @param path
- * @return true if the relative path matches the path to the current context
- * working relative to the current context.
- */
- boolean matchesRelative(String[] path);
-
- /**
- * Absolute path works forward from the root of the document to the
- * current context. So if the path to the current context is /a/b/c/d/e then:
- *
- * matchesAbsolute({"a", "b", "c", "d", "e"}) == true
- *
- * but
- *
- * matchesAbsolute({"b", "c", "d", "e"}) == true because starting from the root
- * you cannot follow /b/c/d/e to the context.
- *
- * @param path
- * @return true if the absolute path from the root of the document
- * matches the current context
- */
- boolean matchesAbsolute(String[] path);
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/resolver/structureddocument/internal/ResolverUtil.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/resolver/structureddocument/internal/ResolverUtil.java
deleted file mode 100644
index fda4dbc..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/resolver/structureddocument/internal/ResolverUtil.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2008 Oracle Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Oracle Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.context.resolver.structureddocument.internal;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jst.jsf.context.resolver.structureddocument.IStructuredDocumentContextResolverFactory;
-import org.eclipse.jst.jsf.context.resolver.structureddocument.IWorkspaceContextResolver;
-import org.eclipse.jst.jsf.context.structureddocument.IStructuredDocumentContext;
-import org.eclipse.jst.jsf.context.structureddocument.IStructuredDocumentContextFactory;
-
-/**
- * Internal convenience class to simplify regularly repeated tasks
- * @author cbateman
- *
- */
-public final class ResolverUtil
-{
- /**
- * This method will generally only work if the document is an
- * IStructuredDocument.
- *
- * @param document
- * @return the IFile corresponding to document or null if not applicable.
- *
- */
- public static IFile getFileForDocument(final IDocument document)
- {
- final IStructuredDocumentContext context =
- IStructuredDocumentContextFactory.INSTANCE.getContext(document,
- -1);
-
- if (context != null)
- {
- final IWorkspaceContextResolver wkResolver =
- IStructuredDocumentContextResolverFactory.INSTANCE
- .getWorkspaceContextResolver(context);
-
- if (wkResolver != null)
- {
- final IResource res = wkResolver.getResource();
-
- if (res instanceof IFile)
- {
- return (IFile) res;
- }
- }
- }
- return null;
- }
-
- private ResolverUtil()
- {
- // no instantiation
- throw new UnsupportedOperationException();
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/resolver/structureddocument/internal/impl/DOMContextResolver.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/resolver/structureddocument/internal/impl/DOMContextResolver.java
deleted file mode 100644
index 76d7593..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/resolver/structureddocument/internal/impl/DOMContextResolver.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Oracle 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:
- * Cameron Bateman/Oracle - initial API and implementation
- *
- ********************************************************************************/
-
-package org.eclipse.jst.jsf.context.resolver.structureddocument.internal.impl;
-
-import org.eclipse.jst.jsf.context.IModelContext;
-import org.eclipse.jst.jsf.context.resolver.structureddocument.IDOMContextResolver;
-import org.eclipse.jst.jsf.context.structureddocument.IStructuredDocumentContext;
-import org.eclipse.wst.sse.core.internal.provisional.IndexedRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-import org.w3c.dom.Document;
-import org.w3c.dom.Node;
-
-/**
- * Resolves DOM-related information in the provided context
- *
- * @author cbateman
- *
- */
-class DOMContextResolver implements IDOMContextResolver
-{
- private final IStructuredDocumentContext _context;
- //private ITextRegionContextResolver _regionResolver; // null; lazy initialized if needed
-
- DOMContextResolver(IStructuredDocumentContext context)
- {
- _context = context;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.jsf.context.resolver.structureddocument.IDOMContextResolver#getDOMDocument()
- */
- public Document getDOMDocument()
- {
- return StructuredDocumentResolverUtil.getDOMDocument((IStructuredDocument)_context.getStructuredDocument());
- }
-
- public Node getNode()
- {
- IndexedRegion region = StructuredDocumentResolverUtil.getIndexedRegion((IStructuredDocument) _context.getStructuredDocument(), _context.getDocumentPosition());
-
- if (region instanceof Node)
- {
- return (Node) region;
- }
-
- return null;
- }
-
-
- public boolean canResolveContext(IModelContext modelContext)
- {
- return modelContext.getAdapter(IStructuredDocumentContext.class) != null;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/resolver/structureddocument/internal/impl/MetadataContextResolver.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/resolver/structureddocument/internal/impl/MetadataContextResolver.java
deleted file mode 100644
index a1022e8..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/resolver/structureddocument/internal/impl/MetadataContextResolver.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Oracle 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:
- * Cameron Bateman/Oracle - initial API and implementation
- *
- ********************************************************************************/
-
-package org.eclipse.jst.jsf.context.resolver.structureddocument.internal.impl;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jst.jsf.common.metadata.Trait;
-import org.eclipse.jst.jsf.common.metadata.internal.TraitValueHelper;
-import org.eclipse.jst.jsf.common.metadata.query.ITaglibDomainMetaDataModelContext;
-import org.eclipse.jst.jsf.common.metadata.query.TaglibDomainMetaDataQueryHelper;
-import org.eclipse.jst.jsf.context.IModelContext;
-import org.eclipse.jst.jsf.context.resolver.structureddocument.IMetadataContextResolver;
-import org.eclipse.jst.jsf.context.resolver.structureddocument.ITaglibContextResolver;
-import org.eclipse.jst.jsf.context.resolver.structureddocument.internal.IStructuredDocumentContextResolverFactory2;
-import org.eclipse.jst.jsf.context.structureddocument.IStructuredDocumentContext;
-import org.w3c.dom.Attr;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-
-/**
- * A default implementation of meta-data context resolver
- *
- * @author cbateman
- *
- */
-class MetadataContextResolver implements IMetadataContextResolver
-{
- private final IStructuredDocumentContext _context;
- private final IStructuredDocumentContextResolverFactory2 _factory;
-
- /**
- * @param factory
- * @param context
- */
- public MetadataContextResolver(final IStructuredDocumentContextResolverFactory2 factory,
- final IStructuredDocumentContext context)
- {
- _factory = factory;
- _context = context;
- }
-
- public List getPropertyValue(final String key)
- {
- final DOMContextResolver domResolver = new DOMContextResolver(_context);
- final WorkspaceContextResolver wsResolver = new WorkspaceContextResolver(_context);
- final ITaglibContextResolver tagResolver =
- _factory.getTaglibContextResolverFromDelegates(_context);
- final Node curNode = domResolver.getNode();
-
- if (curNode instanceof Attr)
- {
- final Attr attribute = (Attr) curNode;
- final Element element = attribute.getOwnerElement();
- final String uri = tagResolver.getTagURIForNodeName(element);
- final IProject project = wsResolver.getProject();
-
- final ITaglibDomainMetaDataModelContext mdContext = TaglibDomainMetaDataQueryHelper.createMetaDataModelContext(project, uri);
- Trait trait = TaglibDomainMetaDataQueryHelper.getTrait(mdContext, element.getLocalName()+"/"+attribute.getLocalName(), key); //$NON-NLS-1$
- if( trait != null )
- {
- return TraitValueHelper.getValueAsListOfStrings(trait);
- }
-
- }
- else if (curNode instanceof Element)
- {
- final Element element = (Element) curNode;
- final String uri = tagResolver.getTagURIForNodeName(element);
- final IProject project = wsResolver.getProject();
-
- final ITaglibDomainMetaDataModelContext mdContext = TaglibDomainMetaDataQueryHelper.createMetaDataModelContext(project, uri);
- Trait trait = TaglibDomainMetaDataQueryHelper.getTrait(mdContext, element.getLocalName(), key);
- if( trait != null )
- {
- return TraitValueHelper.getValueAsListOfStrings(trait);
- }
- }
-
- return Collections.EMPTY_LIST;
- }
-
- public boolean canResolveContext(IModelContext modelContext) {
- return (modelContext.getAdapter(IStructuredDocumentContext.class) != null);
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/resolver/structureddocument/internal/impl/StructuredDocumentContextResolverFactory.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/resolver/structureddocument/internal/impl/StructuredDocumentContextResolverFactory.java
deleted file mode 100644
index a12d3a9..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/resolver/structureddocument/internal/impl/StructuredDocumentContextResolverFactory.java
+++ /dev/null
@@ -1,349 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Oracle 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:
- * Cameron Bateman/Oracle - initial API and implementation
- *
- ********************************************************************************/
-
-package org.eclipse.jst.jsf.context.resolver.structureddocument.internal.impl;
-
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.jst.jsf.context.AbstractDelegatingFactory;
-import org.eclipse.jst.jsf.context.resolver.structureddocument.IDOMContextResolver;
-import org.eclipse.jst.jsf.context.resolver.structureddocument.IMetadataContextResolver;
-import org.eclipse.jst.jsf.context.resolver.structureddocument.IStructuredDocumentContextResolverFactory;
-import org.eclipse.jst.jsf.context.resolver.structureddocument.ITaglibContextResolver;
-import org.eclipse.jst.jsf.context.resolver.structureddocument.IWorkspaceContextResolver;
-import org.eclipse.jst.jsf.context.resolver.structureddocument.internal.IStructuredDocumentContextResolverFactory2;
-import org.eclipse.jst.jsf.context.resolver.structureddocument.internal.ITextRegionContextResolver;
-import org.eclipse.jst.jsf.context.structureddocument.IStructuredDocumentContext;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-
-/**
- * Implements a factory for creating context resolvers for structured document
- * contexts.
- *
- * @author cbateman
- *
- */
-public class StructuredDocumentContextResolverFactory extends
-AbstractDelegatingFactory implements
-IStructuredDocumentContextResolverFactory, IStructuredDocumentContextResolverFactory2
-{
- /* static attributes */
- private static StructuredDocumentContextResolverFactory INSTANCE;
-
- /**
- * @return an instance (possibly shared) of the this factory
- */
- public synchronized static StructuredDocumentContextResolverFactory getInstance()
- {
- if (INSTANCE == null)
- {
- INSTANCE = new StructuredDocumentContextResolverFactory();
- }
-
- return INSTANCE;
- }
-
- /**
- * Constructor
- */
- protected StructuredDocumentContextResolverFactory()
- {
- super(new Class[]
- { IStructuredDocumentContextResolverFactory.class });
- }
-
- /**
- * @see org.eclipse.jst.jsf.context.resolver.structureddocument.IStructuredDocumentContextResolverFactory#getDOMContextResolver(org.eclipse.jst.jsf.context.structureddocument.IStructuredDocumentContext)
- */
- public IDOMContextResolver getDOMContextResolver(
- final IStructuredDocumentContext context)
- {
- IDOMContextResolver resolver = internalGetDOMResolver(context);
-
- if (resolver == null)
- {
- resolver = delegateGetDOMResolver(context);
- }
-
- return resolver;
- }
-
- private IDOMContextResolver internalGetDOMResolver(
- final IStructuredDocumentContext context)
- {
- if (context.getStructuredDocument() instanceof IStructuredDocument)
- {
- return new DOMContextResolver(context);
- }
-
- return null;
- }
-
- private IDOMContextResolver delegateGetDOMResolver(
- final IStructuredDocumentContext context)
- {
- synchronized (_delegates)
- {
- for (final IAdaptable adaptable : _delegates)
- {
-
- final IStructuredDocumentContextResolverFactory delegateFactory = (IStructuredDocumentContextResolverFactory) adaptable
- .getAdapter(IStructuredDocumentContextResolverFactory.class);
-
- if (delegateFactory != null)
- {
- final IDOMContextResolver contextResolver = delegateFactory
- .getDOMContextResolver(context);
-
- if (contextResolver != null)
- {
- return contextResolver;
- }
- }
- }
-
- return null;
- }
- }
-
- /**
- * @see org.eclipse.jst.jsf.context.resolver.structureddocument.IStructuredDocumentContextResolverFactory#getTextRegionResolver(org.eclipse.jst.jsf.context.structureddocument.IStructuredDocumentContext)
- */
- public ITextRegionContextResolver getTextRegionResolver(
- final IStructuredDocumentContext context)
- {
- ITextRegionContextResolver resolver = internalGetTextRegionResolver(context);
-
- if (resolver == null)
- {
- resolver = delegateGetTextRegionResolver(context);
- }
-
- return resolver;
- }
-
- private ITextRegionContextResolver internalGetTextRegionResolver(
- final IStructuredDocumentContext context)
- {
- if (context.getStructuredDocument() instanceof IStructuredDocument)
- {
- return new TextRegionContextResolver(context);
- }
-
- return null;
- }
-
- private ITextRegionContextResolver delegateGetTextRegionResolver(
- final IStructuredDocumentContext context)
- {
- synchronized (_delegates)
- {
- for (final Object element : _delegates)
- {
- final IStructuredDocumentContextResolverFactory delegateFactory = (IStructuredDocumentContextResolverFactory) ((IAdaptable) element)
- .getAdapter(IStructuredDocumentContextResolverFactory.class);
- final ITextRegionContextResolver contextResolver = delegateFactory
- .getTextRegionResolver(context);
-
- if (contextResolver != null)
- {
- return contextResolver;
- }
- }
-
- return null;
- }
- }
-
- public IWorkspaceContextResolver getWorkspaceContextResolver(
- final IStructuredDocumentContext context)
- {
- IWorkspaceContextResolver resolver = internalGetWorkspaceContextResolver(context);
-
- if (resolver == null)
- {
- resolver = delegateGetWorkspaceContextResolver(context);
- }
-
- return resolver;
-
- }
-
- private IWorkspaceContextResolver internalGetWorkspaceContextResolver(
- final IStructuredDocumentContext context)
- {
- if (context.getStructuredDocument() instanceof IStructuredDocument)
- {
- return new WorkspaceContextResolver(context);
- }
-
- return null;
- }
-
- private IWorkspaceContextResolver delegateGetWorkspaceContextResolver(
- final IStructuredDocumentContext context)
- {
- synchronized (_delegates)
- {
- for (final Object element : _delegates)
- {
- final IStructuredDocumentContextResolverFactory delegateFactory = (IStructuredDocumentContextResolverFactory) ((IAdaptable) element)
- .getAdapter(IStructuredDocumentContextResolverFactory.class);
- final IWorkspaceContextResolver contextResolver = delegateFactory
- .getWorkspaceContextResolver(context);
-
- if (contextResolver != null)
- {
- return contextResolver;
- }
- }
-
- return null;
- }
- }
-
- public ITaglibContextResolver getTaglibContextResolver(
- final IStructuredDocumentContext context)
- {
- // check the delegats first
- ITaglibContextResolver resolver = internalGetTaglibContextResolver(context);
-
- if (resolver == null)
- {
- resolver = delegateGetTaglibContextResolver(context);
- }
-
- return resolver;
- }
-
- public ITaglibContextResolver getTaglibContextResolverFromDelegates(
- final IStructuredDocumentContext context)
- {
- // check the delegats first
- ITaglibContextResolver resolver = delegateGetTaglibContextResolver(context);
-
- if (resolver == null)
- {
- resolver = internalGetTaglibContextResolver(context);
- }
-
- return resolver;
- }
-
- private ITaglibContextResolver internalGetTaglibContextResolver(
- final IStructuredDocumentContext context)
- {
- // always delegate. No defaults.
- return null;
- }
-
- private ITaglibContextResolver delegateGetTaglibContextResolver(
- final IStructuredDocumentContext context)
- {
- synchronized (_delegates)
- {
- for (final IAdaptable adapter : _delegates)
- {
- final IStructuredDocumentContextResolverFactory delegateFactory =
- (IStructuredDocumentContextResolverFactory) adapter
- .getAdapter(IStructuredDocumentContextResolverFactory.class);
-
- if (delegateFactory != null)
- {
- final ITaglibContextResolver contextResolver = delegateFactory
- .getTaglibContextResolver(context);
-
- if (contextResolver != null)
- {
- return contextResolver;
- }
- }
- }
-
- return null;
- }
- }
-
- public IMetadataContextResolver getMetadataContextResolver(
- final IStructuredDocumentContext context)
- {
- IMetadataContextResolver resolver = internalGetMetadataContextResolver(context);
-
- if (resolver == null)
- {
- resolver = delegateGetMetadataContextResolver(context);
- }
-
- return resolver;
- }
-
- private IMetadataContextResolver internalGetMetadataContextResolver(
- final IStructuredDocumentContext context)
- {
- if (context.getStructuredDocument() instanceof IStructuredDocument)
- {
- return new MetadataContextResolver(this, context);
- }
-
- return null;
- }
-
- private IMetadataContextResolver delegateGetMetadataContextResolver(
- final IStructuredDocumentContext context)
- {
- synchronized (_delegates)
- {
- for (final Object element : _delegates)
- {
- final IStructuredDocumentContextResolverFactory delegateFactory = (IStructuredDocumentContextResolverFactory) ((IAdaptable) element)
- .getAdapter(IStructuredDocumentContextResolverFactory.class);
- final IMetadataContextResolver contextResolver = delegateFactory
- .getMetadataContextResolver(context);
-
- if (contextResolver != null)
- {
- return contextResolver;
- }
- }
-
- return null;
- }
- }
-
- public <T> T getResolver(final IStructuredDocumentContext context, final Class<T> clazz) {
-
- {
- synchronized (_delegates)
- {
- for (final IAdaptable adapter : _delegates)
- {
- final IStructuredDocumentContextResolverFactory delegateFactory =
- (IStructuredDocumentContextResolverFactory) adapter
- .getAdapter(IStructuredDocumentContextResolverFactory.class);
-
- if (delegateFactory != null
- && delegateFactory instanceof IStructuredDocumentContextResolverFactory2)
- {
- final IStructuredDocumentContextResolverFactory2 contextResolverFactory = (IStructuredDocumentContextResolverFactory2)delegateFactory;
- final T contextResolver = contextResolverFactory.getResolver(context, clazz);
- if (contextResolver != null)
- {
- return contextResolver;
- }
- }
- }
-
- return null;
- }
- }
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/resolver/structureddocument/internal/impl/StructuredDocumentResolverUtil.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/resolver/structureddocument/internal/impl/StructuredDocumentResolverUtil.java
deleted file mode 100644
index 9a4a780..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/resolver/structureddocument/internal/impl/StructuredDocumentResolverUtil.java
+++ /dev/null
@@ -1,126 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Oracle 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:
- * Cameron Bateman/Oracle - initial API and implementation
- *
- ********************************************************************************/
-
-package org.eclipse.jst.jsf.context.resolver.structureddocument.internal.impl;
-
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.sse.core.internal.provisional.IndexedRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMAttr;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMDocument;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMElement;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-
-/**
- * @author cbateman
- *
- * Defines common utility methods for document resolvers
- */
-final class StructuredDocumentResolverUtil
-{
- static IDOMDocument getDOMDocument(IStructuredDocument document)
- {
- IStructuredModel model = getStructuredModel(document);
-
- try
- {
- if (model instanceof IDOMModel)
- {
- return ((IDOMModel)model).getDocument();
- }
- }
- finally
- {
- if (model != null)
- {
- model.releaseFromRead();
- }
- }
-
- return null;
- }
-
- static IndexedRegion getIndexedRegion(final IStructuredDocument document, final int documentOffset)
- {
- // C.B: most of this logic was copied from ContentAssistUtils.getNodeAt
- // I chose to copy rather than just call that because ContentAssistUtils is
- // internal
- IStructuredModel model = getStructuredModel(document);
- IndexedRegion region = null;
- if (model != null)
- {
- try
- {
- int lastOffset = documentOffset;
- region = model.getIndexedRegion(documentOffset);
- while (region == null && lastOffset >= 0) {
- lastOffset--;
- region = model.getIndexedRegion(lastOffset);
- }
-
- // now we assume we have an element. But our context may be
- // on an attribute in that node, so we need to check
- if (region instanceof IDOMElement)
- {
- IDOMElement domElement = (IDOMElement) region;
-
- NamedNodeMap attributes = domElement.getAttributes();
-
- for (int i = 0; i < attributes.getLength(); i++)
- {
- Node attrNode = attributes.item(i);
-
- if (attrNode instanceof IDOMAttr)
- {
- IDOMAttr attr = (IDOMAttr) attrNode;
-
- if (documentOffset >= attr.getStartOffset()
- && documentOffset < attr.getEndOffset())
- {
- region = attr;
- break;
- }
- }
- }
- }
- }
- finally
- {
- model.releaseFromRead();
- }
- }
-
- return region;
- }
-
- /**
- * @param document
- * @return a structured model or null if one cannot be opened for document.
- * Note: the caller is responsible for releasing the instance of structured
- * model that gets returned.
- */
- private static IStructuredModel getStructuredModel(IStructuredDocument document)
- {
- IModelManager modelManager = StructuredModelManager.getModelManager();
-
- if (modelManager != null)
- {
- return StructuredModelManager.getModelManager().getModelForRead(document);
- }
-
- return null;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/resolver/structureddocument/internal/impl/TaglibContextResolver.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/resolver/structureddocument/internal/impl/TaglibContextResolver.java
deleted file mode 100644
index 4b10c02..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/resolver/structureddocument/internal/impl/TaglibContextResolver.java
+++ /dev/null
@@ -1,163 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Oracle 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:
- * Cameron Bateman/Oracle - initial API and implementation
- *
- ********************************************************************************/
-
-package org.eclipse.jst.jsf.context.resolver.structureddocument.internal.impl;
-
-import java.util.Iterator;
-
-import org.eclipse.jst.jsf.common.internal.JSPUtil;
-import org.eclipse.jst.jsf.context.IModelContext;
-import org.eclipse.jst.jsf.context.resolver.structureddocument.ITaglibContextResolver;
-import org.eclipse.jst.jsf.context.structureddocument.IStructuredDocumentContext;
-import org.eclipse.jst.jsp.core.internal.contentmodel.TaglibController;
-import org.eclipse.jst.jsp.core.internal.contentmodel.tld.TLDCMDocumentManager;
-import org.eclipse.jst.jsp.core.internal.contentmodel.tld.TaglibTracker;
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-import org.w3c.dom.Attr;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-/**
- * TODO: this resolver only applies to structured documents that can have
- * taglibs (I think only JSPs). Should we move a different package?
- * Default taglib context resolver
- *
- * @author cbateman
- * @deprecated Use ViewBasedTaglibResolver instead. This impl will be removed
- * post-Helios.
- */
-class TaglibContextResolver implements ITaglibContextResolver
-{
- private final IStructuredDocumentContext _context;
-
- TaglibContextResolver(IStructuredDocumentContext context)
- {
- _context = context;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.jsf.context.resolver.structureddocument.ITaglibContextResolver#getTagPrefixForURI(java.lang.String)
- */
- public String getTagPrefixForURI(String uri)
- {
- return null;
- }
-
- public boolean hasTag(final Node node)
- {
- Node checkNode = node;
-
- if (node instanceof Attr)
- {
- checkNode = ((Attr)node).getOwnerElement();
- }
-
- return getTracker(checkNode) != null;
- }
-
- private TaglibTracker getTracker(Node node)
- {
- final String prefix = node.getPrefix();
-
- final TLDCMDocumentManager docMgr =
- TaglibController.getTLDCMDocumentManager(_context.getStructuredDocument());
-
- // if there's no prefix, there's no way to id the tag library
- // TODO: is this always true? need to consult spec
- // similar problem if couldn't load docMgr
- if (prefix == null
- || docMgr == null)
- {
- return null;
- }
-
- for (final Iterator it = docMgr.getTaglibTrackers().iterator(); it.hasNext();)
- {
- final TaglibTracker tracker = (TaglibTracker) it.next();
-
- if (prefix.equals(tracker.getPrefix()))
- {
- return tracker;
- }
- }
-
- return null;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.jsf.context.resolver.structureddocument.ITaglibContextResolver#getTagURIForNodeName(org.w3c.dom.Node)
- */
- public String getTagURIForNodeName(final Node node)
- {
- Node checkNode = node;
-
- if (node instanceof Attr)
- {
- checkNode = ((Attr)node).getOwnerElement();
- }
-
- final TaglibTracker tracker = getTracker(checkNode);
-
- if (tracker != null)
- {
- return tracker.getURI();
- }
-
-
- return null;
- }
-
-
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.jsf.context.resolver.structureddocument.ITaglibContextResolver#getTagsByNamespaceURI(java.lang.String, java.lang.String)
- */
- public NodeList getTagsByNamespaceURI(String uri, String tagName)
- {
- //Document domDoc = new DOMContextResolver(_context).getDOMDocument();
- return null;
-
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.jsf.context.resolver.IContextResolver#canResolveContext(org.eclipse.jst.jsf.context.IModelContext)
- */
- public boolean canResolveContext(IModelContext modelContext)
- {
- // must be a JSP page
- Object adapter = modelContext.getAdapter(IStructuredDocumentContext.class);
-
- if (adapter instanceof IStructuredDocumentContext)
- {
- IStructuredDocumentContext context =
- (IStructuredDocumentContext) adapter;
- IStructuredModel smodel = null;
-
- try
- {
- smodel = StructuredModelManager.getModelManager().getModelForRead((IStructuredDocument)context.getStructuredDocument());
- return JSPUtil.isJSPContentType(smodel.getContentTypeIdentifier());
- }
- finally
- {
- if (smodel != null)
- {
- smodel.releaseFromRead();
- }
- }
- }
-
- return false;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/resolver/structureddocument/internal/impl/TextRegionContextResolver.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/resolver/structureddocument/internal/impl/TextRegionContextResolver.java
deleted file mode 100644
index 9cf0f21..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/resolver/structureddocument/internal/impl/TextRegionContextResolver.java
+++ /dev/null
@@ -1,295 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Oracle 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:
- * Cameron Bateman/Oracle - initial API and implementation
- *
- ********************************************************************************/
-
-package org.eclipse.jst.jsf.context.resolver.structureddocument.internal.impl;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.jst.jsf.context.IModelContext;
-import org.eclipse.jst.jsf.context.resolver.structureddocument.internal.ITextRegionContextResolver;
-import org.eclipse.jst.jsf.context.structureddocument.IStructuredDocumentContext;
-import org.eclipse.jst.jsf.context.structureddocument.IStructuredDocumentContextFactory;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegionCollection;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegionList;
-
-/*package*/ class TextRegionContextResolver implements ITextRegionContextResolver {
-
- private final IStructuredDocumentContext _context;
-
- /*package*/ TextRegionContextResolver(IStructuredDocumentContext context)
- {
- _context = context;
- }
-
-
- /**
- * @see org.eclipse.jst.jsf.context.resolver.structureddocument.internal.ITextRegionContextResolver#getRegionText()
- */
- public String getRegionText()
- {
- final ITextRegionCollection parent = getParentRegion();
- String text = null;
-
- if (parent != null)
- {
- ITextRegion me = parent.getRegionAtCharacterOffset(_context.getDocumentPosition());
- text = parent.getText(me);
- }
-
- return text;
- }
-
-
- /**
- * @see org.eclipse.jst.jsf.context.resolver.structureddocument.internal.ITextRegionContextResolver#getEndOffset()
- */
- public int getEndOffset() {
- final ITextRegionCollection parent = getParentRegion();
- int endOffset = -1;
- if (parent != null)
- {
- ITextRegion me = parent.getRegionAtCharacterOffset(_context.getDocumentPosition());
- endOffset = parent.getEndOffset(me);
- }
-
- return endOffset;
- }
-
-
- /**
- * @see org.eclipse.jst.jsf.context.resolver.structureddocument.internal.ITextRegionContextResolver#getLength()
- */
- public int getLength() {
- final ITextRegionCollection parent = getParentRegion();
- int length = -1;
- if (parent != null)
- {
- ITextRegion me = parent.getRegionAtCharacterOffset(_context.getDocumentPosition());
- length = me.getLength();
- }
-
- return length;
-
- }
-
-
- /**
- * @see org.eclipse.jst.jsf.context.resolver.structureddocument.internal.ITextRegionContextResolver#getStartOffset()
- */
- public int getStartOffset()
- {
- final ITextRegionCollection parent = getParentRegion();
- int startOffset = -1;
- if (parent != null)
- {
- ITextRegion me = parent.getRegionAtCharacterOffset(_context.getDocumentPosition());
- startOffset = parent.getStartOffset(me);
- }
-
- return startOffset;
- }
-
- /**
- * @see org.eclipse.jst.jsf.context.resolver.structureddocument.internal.ITextRegionContextResolver#getRegionType()
- */
- public String getRegionType()
- {
- final ITextRegionCollection parent = getParentRegion();
- String regionType = null;
-
- if (parent != null)
- {
- ITextRegion me = parent.getRegionAtCharacterOffset(_context.getDocumentPosition());
-
- if (me != null)
- {
- regionType = me.getType();
- }
- }
-
- return regionType;
- }
-
- /**
- * @see org.eclipse.jst.jsf.context.resolver.structureddocument.internal.ITextRegionContextResolver#getRegionTypePath()
- */
- public String[] getRegionTypePath() {
- final ITextRegion[] path = createPathToContext();
- final String[] typePath = new String[path.length];
-
- for (int i = 0; i < path.length; i++)
- {
- typePath[i] = path[i].getType();
- }
-
- return typePath;
- }
-
- /**
- * @see org.eclipse.jst.jsf.context.resolver.structureddocument.internal.ITextRegionContextResolver#getNextContext()
- */
- public IStructuredDocumentContext getNextContext()
- {
- ITextRegionCollection parent = getParentRegion();
- IStructuredDocumentContext newContext = null;
-
- if (parent != null)
- {
- final ITextRegion me = parent.getRegionAtCharacterOffset(_context.getDocumentPosition());
- ITextRegionList regions = parent.getRegions();
- ITextRegion nextRegion = null;
- for (final Iterator it = regions.iterator(); it.hasNext();)
- {
- if (it.next() == me
- && it.hasNext())
- {
- nextRegion = (ITextRegion) it.next();
- }
- }
-
- if (nextRegion != null)
- {
- // use the first position offset in the next region
- final int documentPosition = parent.getStartOffset(nextRegion);
- newContext =
- IStructuredDocumentContextFactory.INSTANCE.getContext(_context.getStructuredDocument(), documentPosition);
- }
- }
-
- return newContext;
- }
-
-
- /**
- * @see org.eclipse.jst.jsf.context.resolver.structureddocument.internal.ITextRegionContextResolver#getPreviousContext()
- */
- public IStructuredDocumentContext getPreviousContext()
- {
- ITextRegionCollection parent = getParentRegion();
- IStructuredDocumentContext newContext = null;
-
- if (parent != null)
- {
- final ITextRegion me = parent.getRegionAtCharacterOffset(_context.getDocumentPosition());
- ITextRegionList regions = parent.getRegions();
- final Iterator it = regions.iterator();
- ITextRegion prevRegion = null;
- ITextRegion nextRegion = null;
-
- SEARCH_LOOP: while (it.hasNext())
- {
- nextRegion = (ITextRegion) it.next();
-
- if (nextRegion == me)
- {
- break SEARCH_LOOP;
- }
-
- prevRegion = nextRegion;
- }
-
- if (prevRegion != null)
- {
- // use the last position offset in the prev region
- final int documentPosition = parent.getStartOffset(prevRegion);
- newContext =
- IStructuredDocumentContextFactory.INSTANCE.getContext(_context.getStructuredDocument(), documentPosition);
- }
- }
-
- return newContext;
- }
-
- private ITextRegionCollection getParentRegion()
- {
- final ITextRegion[] path = createPathToContext();
- ITextRegionCollection parent = null;
-
- if (path.length > 0)
- {
- parent = (ITextRegionCollection) path[path.length-1];
- }
-
- return parent;
- }
-
- /**
- * @see org.eclipse.jst.jsf.context.resolver.structureddocument.internal.ITextRegionContextResolver#matchesRelative(java.lang.String[])
- */
- public boolean matchesRelative(String[] path) {
- final ITextRegion[] myPath = createPathToContext();
- return matchPath(myPath, path);
- }
-
- /**
- * @see org.eclipse.jst.jsf.context.resolver.structureddocument.internal.ITextRegionContextResolver#matchesAbsolute(java.lang.String[])
- */
- public boolean matchesAbsolute(String[] path)
- {
- final ITextRegion[] myPath = createPathToContext();
- // only works if myPath and path are the same length
- return (myPath.length == path.length)
- && matchPath(myPath, path);
- }
-
- private boolean matchPath(ITextRegion[] myPath, String[] path)
- {
- boolean matches = false;
-
- // only makes sense if path is a containing subset of myPath
- if (path.length <= myPath.length)
- {
- matches = true;
- SEARCH_LOOP:
- for (int i = 1; i <= path.length; i++)
- {
- if (!path[path.length-i].equals(myPath[myPath.length-i].getType()))
- {
- matches = false;
- break SEARCH_LOOP;
- }
- }
- }
-
- return matches;
- }
-
- /**
- * @see org.eclipse.jst.jsf.context.resolver.IContextResolver#canResolveContext(org.eclipse.jst.jsf.context.IModelContext)
- */
- public boolean canResolveContext(IModelContext modelContext)
- {
- return (modelContext.getAdapter(IStructuredDocumentContext.class) != null);
- }
-
- private ITextRegion[] createPathToContext()
- {
- final List regionPath = new ArrayList();
-
- final IStructuredDocument doc = (IStructuredDocument) _context.getStructuredDocument();
-
- ITextRegion container = doc.getRegionAtCharacterOffset(_context.getDocumentPosition());
-
- while(container != null
- && container instanceof ITextRegionCollection)
- {
- regionPath.add(container);
- container = ((ITextRegionCollection)container).getRegionAtCharacterOffset(_context.getDocumentPosition());
- }
-
- return (ITextRegion[]) regionPath.toArray(new ITextRegion[0]);
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/resolver/structureddocument/internal/impl/WorkspaceContextResolver.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/resolver/structureddocument/internal/impl/WorkspaceContextResolver.java
deleted file mode 100644
index cb63630..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/resolver/structureddocument/internal/impl/WorkspaceContextResolver.java
+++ /dev/null
@@ -1,135 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Oracle 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:
- * Cameron Bateman/Oracle - initial API and implementation
- *
- ********************************************************************************/
-
-package org.eclipse.jst.jsf.context.resolver.structureddocument.internal.impl;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jst.jsf.context.IModelContext;
-import org.eclipse.jst.jsf.context.resolver.structureddocument.IWorkspaceContextResolver;
-import org.eclipse.jst.jsf.context.structureddocument.IStructuredDocumentContext;
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-
-/**
- *
- * @author cbateman
- *
- */
-/*package*/ class WorkspaceContextResolver implements IWorkspaceContextResolver
-{
- private final IStructuredDocumentContext _context;
-
- /*package*/WorkspaceContextResolver(IStructuredDocumentContext context)
- {
- _context = context;
- }
-
- /**
- * @see org.eclipse.jst.jsf.context.resolver.structureddocument.IWorkspaceContextResolver#getProject()
- */
- public IProject getProject()
- {
- // copied from ModelManagerImpl (with some rework by C.B.)
- final String path = getPath();
-
- if (path == null)
- {
- return null;
- }
-
- // TOODO needs rework for linked resources
- IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
- IPath iPath = new Path(path);
- if (iPath.isAbsolute())
- {
- String projectName = iPath.segment(0);
-
- IProject projects[] = root.getProjects();
-
- for (int i = 0; i < projects.length; i++)
- {
- IProject project = projects[i];
-
- if (project.isOpen()
- && projectName.equals(project.getFullPath().segment(0)))
- {
- return project; //
- }
- }
- }
-
- return null;
- }
-
- public IResource getResource()
- {
- IProject project = getProject();
-
- if (project != null)
- {
- final String path = getPath();
-
- if (path != null)
- {
- final IPath iPath = new Path(path);
- if (iPath.isAbsolute())
- {
- return project.getFile(iPath.removeFirstSegments(1));
- }
- }
- }
- return null;
- }
-
- private String getPath()
- {
- IStructuredModel model = null;
-
- try
- {
- model = StructuredModelManager.getModelManager().getExistingModelForRead(_context.getStructuredDocument());
-
- if (model == null)
- return null;
- String path = model.getBaseLocation();
- if (path == null || path.length() == 0)
- {
- Object id = model.getId();
- if (id == null)
- return null;
- path = id.toString();
- }
-
- return path;
- }
- finally
- {
- if (model != null)
- {
- model.releaseFromRead();
- }
- }
- }
-
- /**
- * @see org.eclipse.jst.jsf.context.resolver.IContextResolver#canResolveContext(org.eclipse.jst.jsf.context.IModelContext)
- */
- public boolean canResolveContext(IModelContext modelContext)
- {
- return (modelContext.getAdapter(IStructuredDocumentContext.class) != null);
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/resolver/structureddocument/package-info.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/resolver/structureddocument/package-info.java
deleted file mode 100644
index 5389821..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/resolver/structureddocument/package-info.java
+++ /dev/null
@@ -1,16 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Oracle 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:
- * Oracle - initial API and implementation
- *
- ********************************************************************************/
-
-/**
- * Context resolvers for contexts based on SSE structured documents.
- */
-package org.eclipse.jst.jsf.context.resolver.structureddocument;
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/structureddocument/AbstractStructuredDocumentContext.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/structureddocument/AbstractStructuredDocumentContext.java
deleted file mode 100644
index b431d48..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/structureddocument/AbstractStructuredDocumentContext.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Oracle 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:
- * Cameron Bateman/Oracle - initial API and implementation
- *
- ********************************************************************************/
-
-package org.eclipse.jst.jsf.context.structureddocument;
-
-import org.eclipse.jst.jsf.context.AbstractDocumentContext;
-
-/**
- * A convenience abstract super-class for context implementing
- * the IStructuredDocumentContext interface
- *
- * Class may be sub-classed by clients
- *
- * @author cbateman
- *
- */
-public abstract class AbstractStructuredDocumentContext extends AbstractDocumentContext
- implements IStructuredDocumentContext
-{
- /**
- * @see org.eclipse.jst.jsf.context.AbstractDocumentContext#getAdapter(java.lang.Class)
- */
- public Object getAdapter(Class adapterClass)
- {
- if (adapterClass.equals(IStructuredDocumentContext.class))
- {
- return this;
- }
-
- return super.getAdapter(adapterClass);
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/structureddocument/AbstractStructuredDocumentContextFactory.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/structureddocument/AbstractStructuredDocumentContextFactory.java
deleted file mode 100644
index 054fc71..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/structureddocument/AbstractStructuredDocumentContextFactory.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2007 Oracle Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Oracle Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.context.structureddocument;
-
-import org.eclipse.jst.jsf.context.AbstractDelegatingFactory;
-
-/**
- * Abstract implementation of IStructuredDocumentContextFactory that must be used
- * by all implementers of new factories for document contexts.
- *
- * @author cbateman
- *
- */
-public abstract class AbstractStructuredDocumentContextFactory extends AbstractDelegatingFactory {
-
- /**
- * @param supportedDelegateTypes
- */
- protected AbstractStructuredDocumentContextFactory(Class[] supportedDelegateTypes)
- {
- super(supportedDelegateTypes);
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/structureddocument/IStructuredDocumentContext.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/structureddocument/IStructuredDocumentContext.java
deleted file mode 100644
index 2cf5328..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/structureddocument/IStructuredDocumentContext.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Oracle 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:
- * Cameron Bateman/Oracle - initial API and implementation
- *
- ********************************************************************************/
-
-package org.eclipse.jst.jsf.context.structureddocument;
-
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jst.jsf.context.IDocumentContext;
-
-/**
- * Encapsulates runtime context in an SSE IStructuredDocument
- * @author cbateman
- *
- * Interface must NOT be implemented by clients.
- * Implementers should sub-class AbstractStructuredDocumentContext
- *
- */
-public interface IStructuredDocumentContext extends IDocumentContext
-{
- /**
- * @return the text viewer whose context we are in
- */
- IDocument getStructuredDocument();
- /**
- * @return the document position within the text viewer's context
- * where we are.
- */
- int getDocumentPosition();
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/structureddocument/IStructuredDocumentContextFactory.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/structureddocument/IStructuredDocumentContextFactory.java
deleted file mode 100644
index d9412dc..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/structureddocument/IStructuredDocumentContextFactory.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Oracle 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:
- * Cameron Bateman/Oracle - initial API and implementation
- *
- ********************************************************************************/
-
-package org.eclipse.jst.jsf.context.structureddocument;
-
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.ITextViewer;
-import org.eclipse.jst.jsf.context.structureddocument.internal.impl.StructuredDocumentContextFactory;
-import org.w3c.dom.Node;
-
-
-/**
- * A factory method for constructing context objects related to
- * SSE structured documents.
- *
- * May be sub-classed or implemented by clients
- *
- * @author cbateman
- *
- */
-public interface IStructuredDocumentContextFactory
-{
- /**
- * The default singleton instance of the factory
- */
- public static final IStructuredDocumentContextFactory INSTANCE =
- StructuredDocumentContextFactory.getInstance();
-
- /**
- *
- * @param textViewer -- the text viewer where the context exists
- * @param documentPosition -- the absolute position of the context relative to textViewer
- * @return a context for a given text viewer and document position within the
- * document model of that text viewer or null if one cannot be determined.
- */
- IStructuredDocumentContext getContext(ITextViewer textViewer, int documentPosition);
-
- /**
- * @param document -- the document
- * @param documentPosition -- the absolute position of the context relative to the document
- * @return a context for the document model or null if one cannot be determined
- */
- IStructuredDocumentContext getContext(IDocument document, int documentPosition);
-
- /**
- * @param document -- the document model
- * @param node -- the DOM node within the document
- * @return a context for the document model and dom node or null if one cannot
- * be determined
- */
- IStructuredDocumentContext getContext(IDocument document, Node node);
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/structureddocument/IStructuredDocumentContextFactory2.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/structureddocument/IStructuredDocumentContextFactory2.java
deleted file mode 100644
index 6e77741..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/structureddocument/IStructuredDocumentContextFactory2.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Oracle 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:
- * Oracle - initial API and implementation
- *
- ********************************************************************************/
-package org.eclipse.jst.jsf.context.structureddocument;
-
-import org.eclipse.jst.jsf.context.structureddocument.internal.impl.StructuredDocumentContextFactory;
-import org.w3c.dom.Element;
-
-/**
- * A factory method for constructing context objects related to
- * SSE structured documents.
- *
- * May be sub-classed or implemented by clients
- *
- */
-public interface IStructuredDocumentContextFactory2 extends
- IStructuredDocumentContextFactory {
-
- /**
- * The default singleton instance of the factory
- */
- public static final IStructuredDocumentContextFactory2 INSTANCE =
- StructuredDocumentContextFactory.getInstance();
-
- /**
- * @param element -- org.w3c.Element
- * @return a context for the element or if null if one cannot be determined.
- */
- IStructuredDocumentContext getContext(Element element);
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/structureddocument/internal/impl/DefaultStructuredDocumentContext.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/structureddocument/internal/impl/DefaultStructuredDocumentContext.java
deleted file mode 100644
index f4526e7..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/structureddocument/internal/impl/DefaultStructuredDocumentContext.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Oracle 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:
- * Cameron Bateman/Oracle - initial API and implementation
- *
- ********************************************************************************/
-
-package org.eclipse.jst.jsf.context.structureddocument.internal.impl;
-
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jst.jsf.context.structureddocument.AbstractStructuredDocumentContext;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-
-/*package*/ class DefaultStructuredDocumentContext extends AbstractStructuredDocumentContext
-{
- private final IStructuredDocument _structuredDocument;
- private final int _documentPosition;
-
- /*package*/ DefaultStructuredDocumentContext(IStructuredDocument structuredDocument, int documentPosition)
- {
- _structuredDocument = structuredDocument;
- _documentPosition = documentPosition;
- }
-
- public int getDocumentPosition()
- {
- return _documentPosition;
- }
-
- public IDocument getStructuredDocument()
- {
- return _structuredDocument;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/structureddocument/internal/impl/StructuredDocumentContextFactory.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/structureddocument/internal/impl/StructuredDocumentContextFactory.java
deleted file mode 100644
index 89f24f6..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/structureddocument/internal/impl/StructuredDocumentContextFactory.java
+++ /dev/null
@@ -1,270 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Oracle 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:
- * Cameron Bateman/Oracle - initial API and implementation
- *
- ********************************************************************************/
-
-package org.eclipse.jst.jsf.context.structureddocument.internal.impl;
-
-import java.util.Iterator;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.ITextViewer;
-import org.eclipse.jst.jsf.context.structureddocument.AbstractStructuredDocumentContextFactory;
-import org.eclipse.jst.jsf.context.structureddocument.IStructuredDocumentContext;
-import org.eclipse.jst.jsf.context.structureddocument.IStructuredDocumentContextFactory;
-import org.eclipse.jst.jsf.context.structureddocument.IStructuredDocumentContextFactory2;
-import org.eclipse.wst.sse.core.internal.provisional.IndexedRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-import org.eclipse.wst.sse.ui.internal.StructuredTextViewer;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMAttr;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-
-/**
- * @author cbateman
- *
- */
-public class StructuredDocumentContextFactory extends AbstractStructuredDocumentContextFactory
- implements IStructuredDocumentContextFactory, IStructuredDocumentContextFactory2
-{
- /* static attributes */
- private static StructuredDocumentContextFactory INSTANCE;
-
- /**
- * @param supportedDelegateTypes
- */
- public StructuredDocumentContextFactory(Class[] supportedDelegateTypes)
- {
- super(supportedDelegateTypes);
- }
-
- /**
- * @return an instance (possibly shared) of the this factory
- */
- public synchronized static StructuredDocumentContextFactory getInstance()
- {
- if (INSTANCE == null)
- {
- INSTANCE = new StructuredDocumentContextFactory();
- }
-
- return INSTANCE;
- }
-
-
- /**
- * Construct the factory
- */
- protected StructuredDocumentContextFactory()
- {
- super(new Class[] {IStructuredDocumentContextFactory.class});
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.jsf.context.structureddocument.IStructuredDocumentContextFactory#getContext(org.eclipse.jface.text.ITextViewer, int)
- */
- public final IStructuredDocumentContext getContext(ITextViewer textViewer, int documentPosition)
- {
- // first see if I know how to make one
- IStructuredDocumentContext context = internalGetContext(textViewer, documentPosition);
-
- // if I don't know, ask my delegates
- if (context == null)
- {
- context = delegateGetContext(textViewer, documentPosition);
- }
-
- return context;
- }
-
- private IStructuredDocumentContext internalGetContext(ITextViewer textViewer, int documentPosition)
- {
- if (textViewer instanceof StructuredTextViewer)
- {
- IDocument document = ((StructuredTextViewer)textViewer).getDocument();
- return internalGetContext(document, documentPosition);
- }
-
- return null;
- }
-
- private IStructuredDocumentContext internalGetContext(IDocument document, int documentPosition)
- {
- if (document instanceof IStructuredDocument)
- {
- return new DefaultStructuredDocumentContext((IStructuredDocument)document, documentPosition);
- }
-
- return null;
- }
-
- private IStructuredDocumentContext delegateGetContext(ITextViewer textViewer, int documentPosition)
- {
- synchronized(_delegates)
- {
- for (final Iterator it = _delegates.iterator(); it.hasNext();)
- {
- IStructuredDocumentContextFactory delegateFactory = (IStructuredDocumentContextFactory) ((IAdaptable) it.next()).getAdapter(IStructuredDocumentContextFactory.class);
- IStructuredDocumentContext context = delegateFactory.getContext(textViewer, documentPosition);
-
- if (context != null)
- {
- return context;
- }
- }
-
- return null;
- }
- }
-
- /**
- * @see org.eclipse.jst.jsf.context.structureddocument.IStructuredDocumentContextFactory#getContext(org.eclipse.jface.text.IDocument, int)
- */
- public IStructuredDocumentContext getContext(IDocument document, int documentPosition) {
- // first see if I know how to make one
- IStructuredDocumentContext context = internalGetContext(document, documentPosition);
-
- // if I don't know, ask my delegates
- if (context == null)
- {
- context = delegateGetContext(document, documentPosition);
- }
-
- return context;
- }
-
- private IStructuredDocumentContext delegateGetContext(IDocument document, int documentPosition)
- {
- synchronized(_delegates)
- {
- for (final Iterator it = _delegates.iterator(); it.hasNext();)
- {
- IStructuredDocumentContextFactory delegateFactory = (IStructuredDocumentContextFactory) ((IAdaptable) it.next()).getAdapter(IStructuredDocumentContextFactory.class);
- IStructuredDocumentContext context = delegateFactory.getContext(document, documentPosition);
-
- if (context != null)
- {
- return context;
- }
- }
-
- return null;
- }
- }
-
- public IStructuredDocumentContext getContext(IDocument document, Node node)
- {
- // first see if I know how to make one
- IStructuredDocumentContext context = internalGetContext(document, node);
-
- // if I don't know, ask my delegates
- if (context == null)
- {
- context = delegateGetContext(document, node);
- }
-
- return context;
-
- }
-
-
-
- private IStructuredDocumentContext internalGetContext(IDocument document, Node node)
- {
- if (document instanceof IStructuredDocument)
- {
- final IStructuredDocument sDoc = (IStructuredDocument) document;
- if (node instanceof IndexedRegion)
- {
- final int position = ((IndexedRegion)node).getStartOffset();
- return new DefaultStructuredDocumentContext(sDoc, position);
- }
- else if (node instanceof IDOMAttr)
- {
- IDOMAttr attr = (IDOMAttr) node;
- final int position = attr.getValueRegionStartOffset();
- return new DefaultStructuredDocumentContext(sDoc, position);
- }
- }
-
- return null;
- }
-
- private IStructuredDocumentContext delegateGetContext(IDocument document, Node node)
- {
- synchronized(_delegates)
- {
- for (final Iterator it = _delegates.iterator(); it.hasNext();)
- {
- IStructuredDocumentContextFactory delegateFactory = (IStructuredDocumentContextFactory) ((IAdaptable) it.next()).getAdapter(IStructuredDocumentContextFactory.class);
- IStructuredDocumentContext context = delegateFactory.getContext(document, node);
-
- if (context != null)
- {
- return context;
- }
- }
-
- return null;
- }
- }
-
- public IStructuredDocumentContext getContext(Element element)
- {
- // first see if I know how to make one
- IStructuredDocumentContext context = internalGetContext(element);
-
- // if I don't know, ask my delegates
- if (context == null)
- {
- context = delegateGetContext(element);
- }
-
- return context;
-
- }
-
- private IStructuredDocumentContext internalGetContext(Element element) {
- if (element instanceof IDOMNode){
- final IDOMNode node = (IDOMNode)element;
- final IStructuredDocument sDoc = node.getStructuredDocument();
- final int position = node.getStartOffset();
-
- return new DefaultStructuredDocumentContext(sDoc, position);
- }
-
- return null;
- }
-
- private IStructuredDocumentContext delegateGetContext(Element element) {
- synchronized(_delegates)
- {
- for (final Iterator it = _delegates.iterator(); it.hasNext();)
- {
- IStructuredDocumentContextFactory2 delegateFactory = (IStructuredDocumentContextFactory2) ((IAdaptable) it.next()).getAdapter(IStructuredDocumentContextFactory2.class);
- if (delegateFactory != null)
- {
- IStructuredDocumentContext context = delegateFactory.getContext(element);
-
- if (context != null)
- {
- return context;
- }
- }
- }
-
- return null;
- }
- }
-
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/structureddocument/package-info.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/structureddocument/package-info.java
deleted file mode 100644
index cc51534..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/structureddocument/package-info.java
+++ /dev/null
@@ -1,16 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Oracle 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:
- * Oracle - initial API and implementation
- *
- ********************************************************************************/
-
-/**
- * Model context for SSE structured documents.
- */
-package org.eclipse.jst.jsf.context.structureddocument;
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/ERuntimeSource.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/ERuntimeSource.java
deleted file mode 100644
index 902e20d..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/ERuntimeSource.java
+++ /dev/null
@@ -1,236 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Oracle 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:
- * Cameron Bateman/Oracle - initial API and implementation
- *
- ********************************************************************************/
-package org.eclipse.jst.jsf.context.symbol;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.emf.common.util.AbstractEnumerator;
-
-/**
- * <!-- begin-user-doc -->
- * Enumerates the possible sources of an instance symbol
- * at runtime. In the default implementation these can
- * be: from the built-in variables, from the managed bean
- * facility, and those defined in tags. This information
- * is provided to allow the VariableResolver to resolve
- * conflicts when instance symbols come from more than one
- * source.
- *
- * <p><b>Provisional API - subject to change</b></p>
- *
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.jsf.context.symbol.SymbolPackage#getERuntimeSource()
- * @model
- * @generated
- */
-public final class ERuntimeSource extends AbstractEnumerator {
- /**
- * @generated NOT
- */
- private static final long serialVersionUID = 1L;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public static final String copyright = "Copyright 2006 Oracle"; //$NON-NLS-1$
-
- /**
- * The '<em><b>BUILT IN SYMBOL</b></em>' literal value.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of '<em><b>BUILT IN SYMBOL</b></em>' literal object isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @see #BUILT_IN_SYMBOL_LITERAL
- * @model
- * @generated
- * @ordered
- */
- public static final int BUILT_IN_SYMBOL = 0;
-
- /**
- * The '<em><b>MANAGED BEAN SYMBOL</b></em>' literal value.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of '<em><b>MANAGED BEAN SYMBOL</b></em>' literal object isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @see #MANAGED_BEAN_SYMBOL_LITERAL
- * @model
- * @generated
- * @ordered
- */
- public static final int MANAGED_BEAN_SYMBOL = 1;
-
- /**
- * The '<em><b>TAG INSTANTIATED SYMBOL</b></em>' literal value.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of '<em><b>TAG INSTANTIATED SYMBOL</b></em>' literal object isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @see #TAG_INSTANTIATED_SYMBOL_LITERAL
- * @model
- * @generated
- * @ordered
- */
- public static final int TAG_INSTANTIATED_SYMBOL = 2;
-
- /**
- * The '<em><b>OTHER</b></em>' literal value.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of '<em><b>OTHER</b></em>' literal object isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @see #OTHER_LITERAL
- * @model
- * @generated
- * @ordered
- */
- public static final int OTHER = 3;
-
- /**
- * The '<em><b>BUILT IN SYMBOL</b></em>' literal object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #BUILT_IN_SYMBOL
- * @generated
- * @ordered
- */
- public static final ERuntimeSource BUILT_IN_SYMBOL_LITERAL = new ERuntimeSource(BUILT_IN_SYMBOL, "BUILT_IN_SYMBOL", "BUILT_IN_SYMBOL"); //$NON-NLS-1$ //$NON-NLS-2$
-
- /**
- * The '<em><b>MANAGED BEAN SYMBOL</b></em>' literal object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #MANAGED_BEAN_SYMBOL
- * @generated
- * @ordered
- */
- public static final ERuntimeSource MANAGED_BEAN_SYMBOL_LITERAL = new ERuntimeSource(MANAGED_BEAN_SYMBOL, "MANAGED_BEAN_SYMBOL", "MANAGED_BEAN_SYMBOL"); //$NON-NLS-1$ //$NON-NLS-2$
-
- /**
- * The '<em><b>TAG INSTANTIATED SYMBOL</b></em>' literal object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #TAG_INSTANTIATED_SYMBOL
- * @generated
- * @ordered
- */
- public static final ERuntimeSource TAG_INSTANTIATED_SYMBOL_LITERAL = new ERuntimeSource(TAG_INSTANTIATED_SYMBOL, "TAG_INSTANTIATED_SYMBOL", "TAG_INSTANTIATED_SYMBOL"); //$NON-NLS-1$ //$NON-NLS-2$
-
- /**
- * The '<em><b>OTHER</b></em>' literal object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #OTHER
- * @generated
- * @ordered
- */
- public static final ERuntimeSource OTHER_LITERAL = new ERuntimeSource(OTHER, "OTHER", "OTHER"); //$NON-NLS-1$ //$NON-NLS-2$
-
- /**
- * An array of all the '<em><b>ERuntime Source</b></em>' enumerators.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private static final ERuntimeSource[] VALUES_ARRAY =
- new ERuntimeSource[] {
- BUILT_IN_SYMBOL_LITERAL,
- MANAGED_BEAN_SYMBOL_LITERAL,
- TAG_INSTANTIATED_SYMBOL_LITERAL,
- OTHER_LITERAL,
- };
-
- /**
- * A public read-only list of all the '<em><b>ERuntime Source</b></em>' enumerators.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public static final List VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
-
- /**
- * Returns the '<em><b>ERuntime Source</b></em>' literal with the specified literal value.
- * <!-- begin-user-doc -->
- * @param literal
- * @return the enumeration for a string literal representation
- * <!-- end-user-doc -->
- * @generated
- */
- public static ERuntimeSource get(String literal) {
- for (int i = 0; i < VALUES_ARRAY.length; ++i) {
- ERuntimeSource result = VALUES_ARRAY[i];
- if (result.toString().equals(literal)) {
- return result;
- }
- }
- return null;
- }
-
- /**
- * Returns the '<em><b>ERuntime Source</b></em>' literal with the specified name.
- * <!-- begin-user-doc -->
- * @param name
- * @return the enumeration for the name of the literal value
- * <!-- end-user-doc -->
- * @generated
- */
- public static ERuntimeSource getByName(String name) {
- for (int i = 0; i < VALUES_ARRAY.length; ++i) {
- ERuntimeSource result = VALUES_ARRAY[i];
- if (result.getName().equals(name)) {
- return result;
- }
- }
- return null;
- }
-
- /**
- * Returns the '<em><b>ERuntime Source</b></em>' literal with the specified integer value.
- * <!-- begin-user-doc -->
- * @param value
- * @return the enumeration for it's integral value
- * <!-- end-user-doc -->
- * @generated
- */
- public static ERuntimeSource get(int value) {
- switch (value) {
- case BUILT_IN_SYMBOL: return BUILT_IN_SYMBOL_LITERAL;
- case MANAGED_BEAN_SYMBOL: return MANAGED_BEAN_SYMBOL_LITERAL;
- case TAG_INSTANTIATED_SYMBOL: return TAG_INSTANTIATED_SYMBOL_LITERAL;
- case OTHER: return OTHER_LITERAL;
- }
- return null;
- }
-
- /**
- * Only this class can construct instances.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private ERuntimeSource(int value, String name, String literal) {
- super(value, name, literal);
- }
-
-} //ERuntimeSource
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/IBeanInstanceSymbol.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/IBeanInstanceSymbol.java
deleted file mode 100644
index a1ddd36..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/IBeanInstanceSymbol.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Oracle 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:
- * Cameron Bateman/Oracle - initial API and implementation
- *
- ********************************************************************************/
-
-package org.eclipse.jst.jsf.context.symbol;
-
-import org.eclipse.emf.common.util.EList;
-
-/**
- * <!-- begin-user-doc -->
- * An instance of a java bean
- *
- * <p><b>Provisional API - subject to change</b></p>
- * <!-- end-user-doc -->
- *
- * @author cbateman
- * @model
- */
-public interface IBeanInstanceSymbol extends IInstanceSymbol, IDescribedInDetail {
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- String copyright = "Copyright 2006 Oracle"; //$NON-NLS-1$
-
- /**
- * Returns the value of the '<em><b>Properties</b></em>' reference list.
- * The list contents are of type {@link org.eclipse.jst.jsf.context.symbol.IBeanPropertySymbol}.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Properties</em>' reference list isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @return the value of the '<em>Properties</em>' reference list.
- * @see org.eclipse.jst.jsf.context.symbol.SymbolPackage#getIBeanInstanceSymbol_Properties()
- * @model type="org.eclipse.jst.jsf.context.symbol.IBeanPropertySymbol" changeable="false" volatile="true"
- * @generated
- */
- EList getProperties();
-
- /**
- * Returns the value of the '<em><b>Methods</b></em>' reference list.
- * The list contents are of type {@link org.eclipse.jst.jsf.context.symbol.IBeanMethodSymbol}.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Methods</em>' reference list isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @return the value of the '<em>Methods</em>' reference list.
- * @see org.eclipse.jst.jsf.context.symbol.SymbolPackage#getIBeanInstanceSymbol_Methods()
- * @model type="org.eclipse.jst.jsf.context.symbol.IBeanMethodSymbol" changeable="false" volatile="true"
- * @generated
- */
- EList getMethods();
-
- /**
- * <!-- begin-user-doc -->
- * This is a convenience method equivalent to to (IJavaTypeDescriptor2) getTypeDescriptor
- * @return the type descriptor cast to a java descriptor
- * <!-- end-user-doc -->
- * @model kind="operation"
- * @generated
- */
- IJavaTypeDescriptor2 getJavaTypeDescriptor();
-
- /**
- * <!-- begin-user-doc -->
- * Convenience method equivalent to setTypeDescriptor((IJavaTypeDescriptor2) typeDesc)s
- * @param newTypeDescriptor
- * <!-- end-user-doc -->
- * @model
- * @generated
- */
- void setJavaTypeDescriptor(IJavaTypeDescriptor2 newTypeDescriptor);
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/IBeanMethodSymbol.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/IBeanMethodSymbol.java
deleted file mode 100644
index 271a936..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/IBeanMethodSymbol.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Oracle 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:
- * Cameron Bateman/Oracle - initial API and implementation
- *
- ********************************************************************************/
-package org.eclipse.jst.jsf.context.symbol;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>IBean Method Symbol</b></em>'.
- * <p><b>Provisional API - subject to change</b></p>
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- * <li>{@link org.eclipse.jst.jsf.context.symbol.IBeanMethodSymbol#getOwner <em>Owner</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.jsf.context.symbol.SymbolPackage#getIBeanMethodSymbol()
- * @model
- * @generated
- */
-public interface IBeanMethodSymbol extends IDescribedInDetail, IMethodSymbol {
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- String copyright = "Copyright 2006 Oracle"; //$NON-NLS-1$
-
- /**
- * Returns the value of the '<em><b>Owner</b></em>' reference.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Owner</em>' reference isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @return the value of the '<em>Owner</em>' reference.
- * @see #setOwner(IJavaTypeDescriptor2)
- * @see org.eclipse.jst.jsf.context.symbol.SymbolPackage#getIBeanMethodSymbol_Owner()
- * @model
- * @generated
- */
- IJavaTypeDescriptor2 getOwner();
-
- /**
- * Sets the value of the '{@link org.eclipse.jst.jsf.context.symbol.IBeanMethodSymbol#getOwner <em>Owner</em>}' reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Owner</em>' reference.
- * @see #getOwner()
- * @generated
- */
- void setOwner(IJavaTypeDescriptor2 value);
-
-} // IBeanMethodSymbol
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/IBeanPropertySymbol.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/IBeanPropertySymbol.java
deleted file mode 100644
index 3fb6f88..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/IBeanPropertySymbol.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Oracle 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:
- * Cameron Bateman/Oracle - initial API and implementation
- *
- ********************************************************************************/
-
-package org.eclipse.jst.jsf.context.symbol;
-
-/**
- *
- * <!-- begin-user-doc -->
- * A property of a bean
- *
- * <p><b>Provisional API - subject to change</b></p>
- * <!-- end-user-doc -->
- *
- * @author cbateman
- * @model
- */
-public interface IBeanPropertySymbol extends IPropertySymbol, IDescribedInDetail {
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- String copyright = "Copyright 2006 Oracle"; //$NON-NLS-1$
-
- /**
- * @return the bean that owns this property
- * @model
- */
- IJavaTypeDescriptor2 getOwner();
-
- /**
- * Sets the value of the '{@link org.eclipse.jst.jsf.context.symbol.IBeanPropertySymbol#getOwner <em>Owner</em>}' reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Owner</em>' reference.
- * @see #getOwner()
- * @generated
- */
- void setOwner(IJavaTypeDescriptor2 value);
-
- /**
- * @return true if the bean has getter for this property
- * @model
- */
- boolean isReadable();
-
- /**
- * @return true if the bean has a setter fot this property
- * @model
- */
- boolean isWritable();
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/IBoundedJavaTypeDescriptor.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/IBoundedJavaTypeDescriptor.java
deleted file mode 100644
index 7340267..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/IBoundedJavaTypeDescriptor.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.jst.jsf.context.symbol;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>IBounded Java Type Descriptor</b></em>'.
- *
- * <p><b>Provisional API - subject to change</b></p>
- * <!-- end-user-doc -->
- *
- *
- * @see org.eclipse.jst.jsf.context.symbol.SymbolPackage#getIBoundedJavaTypeDescriptor()
- * @model
- * @generated
- */
-public interface IBoundedJavaTypeDescriptor extends IJavaTypeDescriptor2, IBoundedTypeDescriptor {
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- String copyright = "Copyright 2006 Oracle"; //$NON-NLS-1$
-
-} // IBoundedJavaTypeDescriptor
\ No newline at end of file
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/IBoundedListTypeDescriptor.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/IBoundedListTypeDescriptor.java
deleted file mode 100644
index ebd153c..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/IBoundedListTypeDescriptor.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.jst.jsf.context.symbol;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>IBounded List Type Descriptor</b></em>'.
- *
- * <p><b>Provisional API - subject to change</b></p>
- * <!-- end-user-doc -->
- *
- *
- * @see org.eclipse.jst.jsf.context.symbol.SymbolPackage#getIBoundedListTypeDescriptor()
- * @model
- * @generated
- */
-public interface IBoundedListTypeDescriptor extends IListTypeDescriptor, IBoundedTypeDescriptor {
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- String copyright = "Copyright 2006 Oracle"; //$NON-NLS-1$
-
-} // IBoundedListTypeDescriptor
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/IBoundedMapTypeDescriptor.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/IBoundedMapTypeDescriptor.java
deleted file mode 100644
index f54c12e..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/IBoundedMapTypeDescriptor.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.jst.jsf.context.symbol;
-
-
-/**
- * <!-- begin-user-doc -->
- * Describes a IMapTypeDescriptor for which the possible keyed values are
- * unbounded for some set of possible value types. For example, a managed
- * bean that implements Map, is unconstrained for all values in Java 1.4 and
- * for whatever the template value type is in Java5.
- *
- * <p><b>Provisional API - subject to change</b></p>
- * <!-- end-user-doc -->
- *
- *
- * @see org.eclipse.jst.jsf.context.symbol.SymbolPackage#getIBoundedMapTypeDescriptor()
- * @model
- * @generated
- */
-public interface IBoundedMapTypeDescriptor extends IMapTypeDescriptor, IBoundedTypeDescriptor {
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- String copyright = "Copyright 2006 Oracle"; //$NON-NLS-1$
-
-} // IBoundedMapTypeDescriptor
\ No newline at end of file
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/IBoundedTypeDescriptor.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/IBoundedTypeDescriptor.java
deleted file mode 100644
index ea92d5a..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/IBoundedTypeDescriptor.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.jst.jsf.context.symbol;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>IBounded Type Descriptor</b></em>'.
- *
- * <p><b>Provisional API - subject to change</b></p>
- * <!-- end-user-doc -->
- *
- *
- * @see org.eclipse.jst.jsf.context.symbol.SymbolPackage#getIBoundedTypeDescriptor()
- * @model interface="true" abstract="true"
- * @generated
- */
-public interface IBoundedTypeDescriptor extends ITypeDescriptor {
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- String copyright = "Copyright 2006 Oracle"; //$NON-NLS-1$
-
- /**
- * <!-- begin-user-doc -->
- * @param typeSignature
- * @return true if this type can have unbounded property key for the
- * indicated type. For example, a Java 1.4 Map could potentially have
- * a value of any time for a particular key, so this method would always return
- * true. However a Java5 Map<String, String> would only return true if
- * typeSignature is-a String.
- * <!-- end-user-doc -->
- * @model
- * @generated
- */
- boolean isUnboundedForType(String typeSignature);
-
- /**
- * <!-- begin-user-doc -->
- * @param name
- * @param typeSignature
- * @return a symbol corresponding to the property of this type desc
- * with name called 'name' of type 'typeSignature'. Must return null if
- * isPropNameUnconstrainedForType returns false for 'typeSignature'.
- * Generally should return something meaningful (even if just an
- * object) when isPropNameUnconstrainedForType returns true.
- * <!-- end-user-doc -->
- * @model
- * @generated
- */
- ISymbol getUnboundedProperty(Object name, String typeSignature);
-
-} // IBoundedTypeDescriptor
\ No newline at end of file
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/IComponentSymbol.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/IComponentSymbol.java
deleted file mode 100644
index 7cad1c9..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/IComponentSymbol.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Oracle 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:
- * Cameron Bateman/Oracle - initial API and implementation
- *
- ********************************************************************************/
-package org.eclipse.jst.jsf.context.symbol;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>IComponent Symbol</b></em>'.
- *
- * <p><b>Provisional API - subject to change</b></p>
- * <!-- end-user-doc -->
- *
- *
- * @see org.eclipse.jst.jsf.context.symbol.SymbolPackage#getIComponentSymbol()
- * @model
- * @generated
- */
-public interface IComponentSymbol extends IInstanceSymbol, IDescribedInDetail {
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- String copyright = "Copyright 2006 Oracle"; //$NON-NLS-1$
-
-} // IComponentSymbol
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/IDescribedInDetail.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/IDescribedInDetail.java
deleted file mode 100644
index 9fb2818..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/IDescribedInDetail.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Oracle 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:
- * Cameron Bateman/Oracle - initial API and implementation
- *
- ********************************************************************************/
-
-package org.eclipse.jst.jsf.context.symbol;
-
-
-/**
- * Tags a symbol that has a detailed, user-readable description
- *
- * <p><b>Provisional API - subject to change</b></p>
- *
- * @author cbateman
- *
- */
-public interface IDescribedInDetail {
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->s
- * @generated
- */
- String copyright = "Copyright 2006 Oracle"; //$NON-NLS-1$
-
- /**
- * @return the detailed description
- * @model
- */
- String getDetailedDescription();
-
- /**
- * @param detailedDescription
- * @model
- */
- void setDetailedDescription(String detailedDescription);
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/IInstanceSymbol.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/IInstanceSymbol.java
deleted file mode 100644
index d1e883d..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/IInstanceSymbol.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Oracle 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:
- * Cameron Bateman/Oracle - initial API and implementation
- *
- ********************************************************************************/
-
-package org.eclipse.jst.jsf.context.symbol;
-
-/**
- * <!-- begin-user-doc -->
- * A symbol that represents an instance of something, typically
- * a variable.
- *
- * <p><b>Provisional API - subject to change</b></p>
- * <!-- end-user-doc -->
- * @author cbateman
- * @model
- */
-public interface IInstanceSymbol extends IObjectSymbol {
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- String copyright = "Copyright 2006 Oracle"; //$NON-NLS-1$
-
- /**
- * @return the type descriptor for this instance
- * @model
- */
- ITypeDescriptor getTypeDescriptor();
- /**
- * Returns the value of the '<em><b>Type Resolved</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Type Resolved</em>' attribute isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @return the value of the '<em>Type Resolved</em>' attribute.
- * @see org.eclipse.jst.jsf.context.symbol.SymbolPackage#getIInstanceSymbol_TypeResolved()
- * @model changeable="false" volatile="true"
- * @generated
- */
- boolean isTypeResolved();
-
- /**
- * Returns the value of the '<em><b>Runtime Source</b></em>' attribute.
- * The default value is <code>"TAG_INSTANTIATED_SYMBOL"</code>.
- * The literals are from the enumeration {@link org.eclipse.jst.jsf.context.symbol.ERuntimeSource}.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Runtime Source</em>' attribute isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @return the value of the '<em>Runtime Source</em>' attribute.
- * @see org.eclipse.jst.jsf.context.symbol.ERuntimeSource
- * @see #setRuntimeSource(ERuntimeSource)
- * @see org.eclipse.jst.jsf.context.symbol.SymbolPackage#getIInstanceSymbol_RuntimeSource()
- * @model default="TAG_INSTANTIATED_SYMBOL"
- * @generated
- */
- ERuntimeSource getRuntimeSource();
-
- /**
- * Sets the value of the '{@link org.eclipse.jst.jsf.context.symbol.IInstanceSymbol#getRuntimeSource <em>Runtime Source</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Runtime Source</em>' attribute.
- * @see org.eclipse.jst.jsf.context.symbol.ERuntimeSource
- * @see #getRuntimeSource()
- * @generated
- */
- void setRuntimeSource(ERuntimeSource value);
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/IJavaSymbol.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/IJavaSymbol.java
deleted file mode 100644
index fa167ad..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/IJavaSymbol.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Oracle 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:
- * Cameron Bateman/Oracle - initial API and implementation
- *
- ********************************************************************************/
-
-package org.eclipse.jst.jsf.context.symbol;
-
-import org.eclipse.jdt.core.IJavaElement;
-
-/**
- * <!-- begin-user-doc -->
- * Represents a symbol that has meaning within Java's context. This may
- * be the name of a type, an instance, method etc.
- *
- * <p><b>Provisional API - subject to change</b></p>
- * <!-- end-user-doc -->
- * @author cbateman
- * @model
- */
-public interface IJavaSymbol extends ISymbol {
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- String copyright = "Copyright 2006 Oracle"; //$NON-NLS-1$
-
- /**
- * A IJavaElement may not exist for a symbol if it is synthetic at
- * design time but will be bound to a Java symbol at runtime. An
- * example is a managed bean instance in JSF. JDT can provide no
- * design-time meta-data for the symbol because it won't have
- * a Java representation until the containing JSP is compiled.
- *
- * @return JDT's java element for this symbol or null if one doesn't
- * exist.
- * @model
- */
- IJavaElement getJavaElement();
- /**
- * Sets the value of the '{@link org.eclipse.jst.jsf.context.symbol.IJavaSymbol#getJavaElement <em>Java Element</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Java Element</em>' attribute.
- * @see #getJavaElement()
- * @generated
- */
- void setJavaElement(IJavaElement value);
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/IJavaTypeDescriptor2.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/IJavaTypeDescriptor2.java
deleted file mode 100644
index 1919289..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/IJavaTypeDescriptor2.java
+++ /dev/null
@@ -1,144 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Oracle 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:
- * Cameron Bateman/Oracle - initial API and implementation
- *
- ********************************************************************************/
-package org.eclipse.jst.jsf.context.symbol;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.jdt.core.IType;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>IJava Type Descriptor2</b></em>'.
- *
- * <p><b>Provisional API - subject to change</b></p>
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- * <li>{@link org.eclipse.jst.jsf.context.symbol.IJavaTypeDescriptor2#getType <em>Type</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.context.symbol.IJavaTypeDescriptor2#getBeanProperties <em>Bean Properties</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.context.symbol.IJavaTypeDescriptor2#getBeanMethods <em>Bean Methods</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.context.symbol.IJavaTypeDescriptor2#getArrayCount <em>Array Count</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.jsf.context.symbol.SymbolPackage#getIJavaTypeDescriptor2()
- * @model
- * @generated
- */
-public interface IJavaTypeDescriptor2 extends ITypeDescriptor {
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- String copyright = "Copyright 2006 Oracle"; //$NON-NLS-1$
-
- /**
- * Returns the value of the '<em><b>Type</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Type</em>' attribute isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @return the value of the '<em>Type</em>' attribute.
- * @see #setType(IType)
- * @see org.eclipse.jst.jsf.context.symbol.SymbolPackage#getIJavaTypeDescriptor2_Type()
- * @model dataType="org.eclipse.jst.jsf.context.symbol.IType"
- * @generated
- */
- IType getType();
-
- /**
- * Sets the value of the '{@link org.eclipse.jst.jsf.context.symbol.IJavaTypeDescriptor2#getType <em>Type</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Type</em>' attribute.
- * @see #getType()
- * @generated
- */
- void setType(IType value);
-
- /**
- * Returns the value of the '<em><b>Bean Properties</b></em>' reference list.
- * The list contents are of type {@link org.eclipse.jst.jsf.context.symbol.IBeanPropertySymbol}.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Bean Properties</em>' reference list isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @return the value of the '<em>Bean Properties</em>' reference list.
- * @see org.eclipse.jst.jsf.context.symbol.SymbolPackage#getIJavaTypeDescriptor2_BeanProperties()
- * @model type="org.eclipse.jst.jsf.context.symbol.IBeanPropertySymbol" volatile="true"
- * @generated
- */
- EList getBeanProperties();
-
- /**
- * Returns the value of the '<em><b>Bean Methods</b></em>' reference list.
- * The list contents are of type {@link org.eclipse.jst.jsf.context.symbol.IBeanPropertySymbol}.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Bean Methods</em>' reference list isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @return the value of the '<em>Bean Methods</em>' reference list.
- * @see org.eclipse.jst.jsf.context.symbol.SymbolPackage#getIJavaTypeDescriptor2_BeanMethods()
- * @model type="org.eclipse.jst.jsf.context.symbol.IBeanPropertySymbol" volatile="true"
- * @generated
- */
- EList getBeanMethods();
-
- /**
- * Returns the value of the '<em><b>Array Count</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Array Count</em>' attribute isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @return the value of the '<em>Array Count</em>' attribute.
- * @see #setArrayCount(int)
- * @see org.eclipse.jst.jsf.context.symbol.SymbolPackage#getIJavaTypeDescriptor2_ArrayCount()
- * @model
- * @generated
- */
- int getArrayCount();
-
- /**
- * Sets the value of the '{@link org.eclipse.jst.jsf.context.symbol.IJavaTypeDescriptor2#getArrayCount <em>Array Count</em>}' attribute.
- * <!-- begin-user-doc -->
- * records the array nesting of the type. IType doesn't encapsulate
- * array types. So if this type is an array then type will represent
- * the base element and this value will be > 0. If not an array, then
- * _arrayCount is always 0.
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Array Count</em>' attribute.
- * @see #getArrayCount()
- * @generated
- */
- void setArrayCount(int value);
-
- /**
- * <!-- begin-user-doc -->
- * @param resolvedTypeSignature
- * @return the resolved type or null.
- * <!-- end-user-doc -->
- * @model dataType="org.eclipse.jst.jsf.context.symbol.IType"
- * @generated
- */
- IType resolveType(String resolvedTypeSignature);
-
-} // IJavaTypeDescriptor2
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/IListTypeDescriptor.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/IListTypeDescriptor.java
deleted file mode 100644
index c4b4586..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/IListTypeDescriptor.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.jst.jsf.context.symbol;
-
-import org.eclipse.emf.common.util.EList;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>IList Type Descriptor</b></em>'.
- *
- * <p><b>Provisional API - subject to change</b></p>
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- * <li>{@link org.eclipse.jst.jsf.context.symbol.IListTypeDescriptor#getListSource <em>List Source</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.jsf.context.symbol.SymbolPackage#getIListTypeDescriptor()
- * @model
- * @generated
- */
-public interface IListTypeDescriptor extends ITypeDescriptor {
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- String copyright = "Copyright 2006 Oracle"; //$NON-NLS-1$
-
- /**
- * Returns the value of the '<em><b>List Source</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>List Source</em>' attribute isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @return the value of the '<em>List Source</em>' attribute.
- * @see #setListSource(EList)
- * @see org.eclipse.jst.jsf.context.symbol.SymbolPackage#getIListTypeDescriptor_ListSource()
- * @model many="false"
- * @generated
- */
- EList getListSource();
-
- /**
- * Sets the value of the '{@link org.eclipse.jst.jsf.context.symbol.IListTypeDescriptor#getListSource <em>List Source</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>List Source</em>' attribute.
- * @see #getListSource()
- * @generated
- */
- void setListSource(EList value);
-
-} // IListTypeDescriptor
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/IMapTypeDescriptor.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/IMapTypeDescriptor.java
deleted file mode 100644
index d991b72..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/IMapTypeDescriptor.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Oracle 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:
- * Cameron Bateman/Oracle - initial API and implementation
- *
- ********************************************************************************/
-package org.eclipse.jst.jsf.context.symbol;
-
-import java.util.Map;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>IMap Type Descriptor</b></em>'.
- *
- * <p><b>Provisional API - subject to change</b></p>
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- * <li>{@link org.eclipse.jst.jsf.context.symbol.IMapTypeDescriptor#getMapSource <em>Map Source</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.context.symbol.IMapTypeDescriptor#isImmutable <em>Immutable</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.jsf.context.symbol.SymbolPackage#getIMapTypeDescriptor()
- * @model
- * @generated
- */
-public interface IMapTypeDescriptor extends ITypeDescriptor {
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- String copyright = "Copyright 2006 Oracle"; //$NON-NLS-1$
-
- /**
- * Returns the value of the '<em><b>Map Source</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Map Source</em>' attribute isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @return the value of the '<em>Map Source</em>' attribute.
- * @see #setMapSource(Map)
- * @see org.eclipse.jst.jsf.context.symbol.SymbolPackage#getIMapTypeDescriptor_MapSource()
- * @model
- * @generated
- */
- Map getMapSource();
-
- /**
- * Sets the value of the '{@link org.eclipse.jst.jsf.context.symbol.IMapTypeDescriptor#getMapSource <em>Map Source</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Map Source</em>' attribute.
- * @see #getMapSource()
- * @generated
- */
- void setMapSource(Map value);
-
- /**
- * Returns the value of the '<em><b>Immutable</b></em>' attribute.
- * The default value is <code>"true"</code>.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Immutable</em>' attribute isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @return the value of the '<em>Immutable</em>' attribute.
- * @see #setImmutable(boolean)
- * @see org.eclipse.jst.jsf.context.symbol.SymbolPackage#getIMapTypeDescriptor_Immutable()
- * @model default="true"
- * @generated
- */
- boolean isImmutable();
-
- /**
- * Sets the value of the '{@link org.eclipse.jst.jsf.context.symbol.IMapTypeDescriptor#isImmutable <em>Immutable</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Immutable</em>' attribute.
- * @see #isImmutable()
- * @generated
- */
- void setImmutable(boolean value);
-
-} // IMapTypeDescriptor
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/IMethodSymbol.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/IMethodSymbol.java
deleted file mode 100644
index 45ee82c..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/IMethodSymbol.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Oracle 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:
- * Cameron Bateman/Oracle - initial API and implementation
- *
- ********************************************************************************/
-package org.eclipse.jst.jsf.context.symbol;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>IMethod Symbol</b></em>'.
- *
- * <p><b>Provisional API - subject to change</b></p>
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- * <li>{@link org.eclipse.jst.jsf.context.symbol.IMethodSymbol#getSignature <em>Signature</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.jsf.context.symbol.SymbolPackage#getIMethodSymbol()
- * @model
- * @generated
- */
-public interface IMethodSymbol extends ISymbol {
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- String copyright = "Copyright 2006 Oracle"; //$NON-NLS-1$
-
- /**
- * Returns the value of the '<em><b>Signature</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Signature</em>' attribute isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @return the value of the '<em>Signature</em>' attribute.
- * @see #setSignature(String)
- * @see org.eclipse.jst.jsf.context.symbol.SymbolPackage#getIMethodSymbol_Signature()
- * @model
- * @generated
- */
- String getSignature();
-
- /**
- * Sets the value of the '{@link org.eclipse.jst.jsf.context.symbol.IMethodSymbol#getSignature <em>Signature</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Signature</em>' attribute.
- * @see #getSignature()
- * @generated
- */
- void setSignature(String value);
-
-} // IMethodSymbol
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/IObjectSymbol.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/IObjectSymbol.java
deleted file mode 100644
index 34fee43..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/IObjectSymbol.java
+++ /dev/null
@@ -1,161 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Oracle 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:
- * Cameron Bateman/Oracle - initial API and implementation
- *
- ********************************************************************************/
-package org.eclipse.jst.jsf.context.symbol;
-
-import org.eclipse.emf.common.util.EList;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>IObject Symbol</b></em>'.
- *
- * <p><b>Provisional API - subject to change</b></p>
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- * <li>{@link org.eclipse.jst.jsf.context.symbol.IObjectSymbol#getTypeDescriptor <em>Type Descriptor</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.context.symbol.IObjectSymbol#isReadable <em>Readable</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.context.symbol.IObjectSymbol#isWritable <em>Writable</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.jsf.context.symbol.SymbolPackage#getIObjectSymbol()
- * @model interface="true" abstract="true"
- * @generated
- */
-public interface IObjectSymbol extends ISymbol {
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- String copyright = "Copyright 2006 Oracle"; //$NON-NLS-1$
-
- /**
- * Returns the value of the '<em><b>Type Descriptor</b></em>' reference.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Type Descriptor</em>' reference isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @return the value of the '<em>Type Descriptor</em>' reference.
- * @see #setTypeDescriptor(ITypeDescriptor)
- * @see org.eclipse.jst.jsf.context.symbol.SymbolPackage#getIObjectSymbol_TypeDescriptor()
- * @model
- * @generated
- */
- ITypeDescriptor getTypeDescriptor();
-
- /**
- * Sets the value of the '{@link org.eclipse.jst.jsf.context.symbol.IObjectSymbol#getTypeDescriptor <em>Type Descriptor</em>}' reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Type Descriptor</em>' reference.
- * @see #getTypeDescriptor()
- * @generated
- */
- void setTypeDescriptor(ITypeDescriptor value);
-
- /**
- * Returns the value of the '<em><b>Readable</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Readable</em>' attribute isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @return the value of the '<em>Readable</em>' attribute.
- * @see #setReadable(boolean)
- * @see org.eclipse.jst.jsf.context.symbol.SymbolPackage#getIObjectSymbol_Readable()
- * @model
- * @generated
- */
- boolean isReadable();
-
- /**
- * Sets the value of the '{@link org.eclipse.jst.jsf.context.symbol.IObjectSymbol#isReadable <em>Readable</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Readable</em>' attribute.
- * @see #isReadable()
- * @generated
- */
- void setReadable(boolean value);
-
- /**
- * Returns the value of the '<em><b>Writable</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Writable</em>' attribute isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @return the value of the '<em>Writable</em>' attribute.
- * @see #setWritable(boolean)
- * @see org.eclipse.jst.jsf.context.symbol.SymbolPackage#getIObjectSymbol_Writable()
- * @model
- * @generated
- */
- boolean isWritable();
-
- /**
- * Sets the value of the '{@link org.eclipse.jst.jsf.context.symbol.IObjectSymbol#isWritable <em>Writable</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Writable</em>' attribute.
- * @see #isWritable()
- * @generated
- */
- void setWritable(boolean value);
-
- /**
- * <!-- begin-user-doc -->
- * @param typeSignature
- * @return true if this object can be coerced (is an instanceof) the type
- * specified in the fully qualified typeSignature
- * <!-- end-user-doc -->
- * @model
- * @generated
- */
- boolean supportsCoercion(String typeSignature);
-
- /**
- * <!-- begin-user-doc -->
- * @param typeSignature
- * @return a type descriptor supporting a class cast of this object to
- * the request typeSignature, or null if such a cast is not supported.
- * Returns non-null iff supportsCoercion(typeSignature) == false
- * <!-- end-user-doc -->
- * @model
- * @generated
- */
- ITypeDescriptor coerce(String typeSignature);
-
- /**
- * <!-- begin-user-doc -->
- * @param methodName
- * @param methodArguments
- * @param symbolName
- * @return a symbol resulting from calling the call or null if can't be determined.
- * Generally, the symbolName should be used for the getName() value of the returned
- * symbol, although implementers are not bound to this if a more meaningful value
- * can be calculated.
- * <!-- end-user-doc -->
- * @model methodArgumentsType="org.eclipse.jst.jsf.common.internal.types.ValueType" methodArgumentsDataType="org.eclipse.jst.jsf.context.symbol.ValueType" methodArgumentsMany="true"
- * @generated
- */
- ISymbol call(String methodName, EList methodArguments, String symbolName);
-
-} // IObjectSymbol
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/IPropertySymbol.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/IPropertySymbol.java
deleted file mode 100644
index ea757ee..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/IPropertySymbol.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Oracle 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:
- * Cameron Bateman/Oracle - initial API and implementation
- *
- ********************************************************************************/
-package org.eclipse.jst.jsf.context.symbol;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>IProperty Symbol</b></em>'.
- *
- * <p><b>Provisional API - subject to change</b></p>
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- * <li>{@link org.eclipse.jst.jsf.context.symbol.IPropertySymbol#isIntermediate <em>Intermediate</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.jsf.context.symbol.SymbolPackage#getIPropertySymbol()
- * @model
- * @generated
- */
-public interface IPropertySymbol extends IObjectSymbol {
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- String copyright = "Copyright 2006 Oracle"; //$NON-NLS-1$
-
- /**
- * Returns the value of the '<em><b>Intermediate</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Intermediate</em>' attribute isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @return the value of the '<em>Intermediate</em>' attribute.
- * @see #setIntermediate(boolean)
- * @see org.eclipse.jst.jsf.context.symbol.SymbolPackage#getIPropertySymbol_Intermediate()
- * @model
- * @generated
- */
- boolean isIntermediate();
-
- /**
- * Sets the value of the '{@link org.eclipse.jst.jsf.context.symbol.IPropertySymbol#isIntermediate <em>Intermediate</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Intermediate</em>' attribute.
- * @see #isIntermediate()
- * @generated
- */
- void setIntermediate(boolean value);
-
-} // IPropertySymbol
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/ISymbol.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/ISymbol.java
deleted file mode 100644
index 20a56c4..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/ISymbol.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Oracle 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:
- * Cameron Bateman/Oracle - initial API and implementation
- *
- ********************************************************************************/
-
-package org.eclipse.jst.jsf.context.symbol;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * An entity that represents a meaningful named value in some context.
- * Typically these represent programming language variables, properties and methods.
- *
- * <p><b>Provisional API - subject to change</b></p>
- * <!-- end-user-doc -->
- * @author cbateman
- * @model
- */
-public interface ISymbol extends EObject {
- /**
- * Singleton for an empty array of ISymbols
- */
- final ISymbol[] EMPTY_SYMBOL_ARRAY = new ISymbol[0];
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- String copyright = "Copyright 2006 Oracle"; //$NON-NLS-1$
-
- /**
- * @return the symbol's name
- * @model
- */
- String getName();
- /**
- * Sets the value of the '{@link org.eclipse.jst.jsf.context.symbol.ISymbol#getName <em>Name</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Name</em>' attribute.
- * @see #getName()
- * @generated
- */
- void setName(String value);
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/ITypeDescriptor.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/ITypeDescriptor.java
deleted file mode 100644
index 4be180f..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/ITypeDescriptor.java
+++ /dev/null
@@ -1,264 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Oracle 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:
- * Cameron Bateman/Oracle - initial API and implementation
- *
- ********************************************************************************/
-
-package org.eclipse.jst.jsf.context.symbol;
-
-import org.eclipse.emf.common.util.EList;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IType;
-
-/**
- * <!-- begin-user-doc -->
- * A generic descriptor for symbol information
- *
- * <p><b>Provisional API - subject to change</b></p>
- * <!-- end-user-doc -->
- * @author cbateman
- * @model
- */
-public interface ITypeDescriptor extends EObject {
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- String copyright = "Copyright 2006 Oracle"; //$NON-NLS-1$
-
- /**
- * Returns the value of the '<em><b>Properties</b></em>' reference list.
- * The list contents are of type {@link org.eclipse.jst.jsf.context.symbol.IPropertySymbol}.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Properties</em>' reference list isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @return the value of the '<em>Properties</em>' reference list.
- * @see org.eclipse.jst.jsf.context.symbol.SymbolPackage#getITypeDescriptor_Properties()
- * @model type="org.eclipse.jst.jsf.context.symbol.IPropertySymbol" volatile="true"
- * @generated
- */
- EList getProperties();
-
- /**
- * Returns the value of the '<em><b>Type Signature</b></em>' attribute.
- * The default value is <code>""</code>.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Type Signature</em>' attribute isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @return the value of the '<em>Type Signature</em>' attribute.
- * @see org.eclipse.jst.jsf.context.symbol.SymbolPackage#getITypeDescriptor_TypeSignature()
- * @model default="" changeable="false" volatile="true"
- * @generated
- */
- String getTypeSignature();
-
- /**
- * Returns the value of the '<em><b>Super Type Signatures</b></em>' attribute list.
- * The list contents are of type {@link java.lang.String}.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Super Type Signatures</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>Super Type Signatures</em>' attribute list.
- * @see org.eclipse.jst.jsf.context.symbol.SymbolPackage#getITypeDescriptor_SuperTypeSignatures()
- * @model type="java.lang.String" volatile="true"
- * @generated
- */
- EList getSuperTypeSignatures();
-
- /**
- * Returns the value of the '<em><b>Interface Type Signatures</b></em>' attribute list.
- * The list contents are of type {@link java.lang.String}.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Interface Type Signatures</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>Interface Type Signatures</em>' attribute list.
- * @see org.eclipse.jst.jsf.context.symbol.SymbolPackage#getITypeDescriptor_InterfaceTypeSignatures()
- * @model type="java.lang.String" volatile="true"
- * @generated
- */
- EList getInterfaceTypeSignatures();
-
- /**
- * Returns the value of the '<em><b>Type Signature Delegate</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Type Signature Delegate</em>' attribute isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @return the value of the '<em>Type Signature Delegate</em>' attribute.
- * @see #setTypeSignatureDelegate(String)
- * @see org.eclipse.jst.jsf.context.symbol.SymbolPackage#getITypeDescriptor_TypeSignatureDelegate()
- * @model
- * @generated
- */
- String getTypeSignatureDelegate();
-
- /**
- * Sets the value of the '{@link org.eclipse.jst.jsf.context.symbol.ITypeDescriptor#getTypeSignatureDelegate <em>Type Signature Delegate</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Type Signature Delegate</em>' attribute.
- * @see #getTypeSignatureDelegate()
- * @generated
- */
- void setTypeSignatureDelegate(String value);
-
- /**
- * Returns the value of the '<em><b>Methods</b></em>' reference list.
- * The list contents are of type {@link org.eclipse.jst.jsf.context.symbol.IMethodSymbol}.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Methods</em>' reference list isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @return the value of the '<em>Methods</em>' reference list.
- * @see org.eclipse.jst.jsf.context.symbol.SymbolPackage#getITypeDescriptor_Methods()
- * @model type="org.eclipse.jst.jsf.context.symbol.IMethodSymbol" volatile="true"
- * @generated
- */
- EList getMethods();
-
- /**
- * Returns the value of the '<em><b>Type Parameter Signatures</b></em>' attribute list.
- * The list contents are of type {@link java.lang.String}.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Type Parameter Signatures</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>Type Parameter Signatures</em>' attribute list.
- * @see org.eclipse.jst.jsf.context.symbol.SymbolPackage#getITypeDescriptor_TypeParameterSignatures()
- * @model type="java.lang.String" unique="false" transient="true"
- * @generated
- */
- EList getTypeParameterSignatures();
-
- /**
- * Returns the value of the '<em><b>Jdt Context</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Jdt Context</em>' attribute isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @return the value of the '<em>Jdt Context</em>' attribute.
- * @see #setJdtContext(IJavaElement)
- * @see org.eclipse.jst.jsf.context.symbol.SymbolPackage#getITypeDescriptor_JdtContext()
- * @model dataType="org.eclipse.jst.jsf.context.symbol.IJavaElement"
- * @generated
- */
- IJavaElement getJdtContext();
-
- /**
- * Sets the value of the '{@link org.eclipse.jst.jsf.context.symbol.ITypeDescriptor#getJdtContext <em>Jdt Context</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Jdt Context</em>' attribute.
- * @see #getJdtContext()
- * @generated
- */
- void setJdtContext(IJavaElement value);
-
- /**
- * Returns the value of the '<em><b>Enum Type</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Enum Type</em>' attribute isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @return the value of the '<em>Enum Type</em>' attribute.
- * @see #setEnumType(boolean)
- * @see org.eclipse.jst.jsf.context.symbol.SymbolPackage#getITypeDescriptor_EnumType()
- * @model
- * @generated
- */
- boolean isEnumType();
-
- /**
- * Sets the value of the '{@link org.eclipse.jst.jsf.context.symbol.ITypeDescriptor#isEnumType <em>Enum Type</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Enum Type</em>' attribute.
- * @see #isEnumType()
- * @generated
- */
- void setEnumType(boolean value);
-
- /**
- * <!-- begin-user-doc -->
- * @param typeSignature
- * @return true if the type descriptor's underlying type would resolve true == (type instanceof typeSignature)
- *
- * <!-- end-user-doc -->
- * @model
- * @generated
- */
- boolean instanceOf(String typeSignature);
-
- /**
- * <!-- begin-user-doc -->
- * @return true iff this type is an array of something
- * <!-- end-user-doc -->
- * @model kind="operation"
- * @generated
- */
- boolean isArray();
-
- /**
- * <!-- begin-user-doc -->
- * @return a symbol representing an element of this array. May
- * throw an exception or return null if isArray() == false
- * <!-- end-user-doc -->
- * @model kind="operation"
- * @generated
- */
- IObjectSymbol getArrayElement();
-
- /**
- * <!-- begin-user-doc -->
- * @param resolvedTypeSignature
- * @return the IType for resolvedTypeSignature or null if can't be resolved
- * <!-- end-user-doc -->
- * @model dataType="org.eclipse.jst.jsf.context.symbol.IType"
- * @generated
- */
- IType resolveType(String resolvedTypeSignature);
-
- /**
- * <!-- begin-user-doc -->
- * @param methodName
- * @param methodArgs
- * @param symbolName
- * @return a symbol or null if not handling
- * <!-- end-user-doc -->
- * @model methodArgsType="java.lang.String" methodArgsMany="true"
- * @generated
- */
- ISymbol calculateSyntheticCall(String methodName, EList methodArgs, String symbolName);
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/InitializedSymbolFactory.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/InitializedSymbolFactory.java
deleted file mode 100644
index 50a30a0..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/InitializedSymbolFactory.java
+++ /dev/null
@@ -1,241 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Oracle 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:
- * Matthias Fuessel -- extracted from https://bugs.eclipse.org/bugs/show_bug.cgi?id=215461
- * Cameron Bateman/Oracle - integrated.
- *
- ********************************************************************************/
-
-package org.eclipse.jst.jsf.context.symbol;
-
-import java.util.Arrays;
-import java.util.Collections;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.core.Signature;
-import org.eclipse.jst.jsf.common.internal.types.TypeConstants;
-import org.eclipse.jst.jsf.common.internal.types.ValueType;
-import org.eclipse.jst.jsf.common.util.TypeUtil;
-
-/**
- * Creates purpose-built symbols and descriptors fully initialized (unlike the
- * EMF factory that simply creates empty instances.
- *
- * This class is for convenience only and should not do anything that clients
- * could not do by hand (though with more work).
- *
- * Clients may use or subclass.
- *
- * @author cbateman
- *
- */
-public class InitializedSymbolFactory
-{
- /**
- * If fullyQualifiedClass can be resolved to an IType, then a bean instance
- * symbol will be created. If the type cannot be resolved, then
- * createUnknownInstanceSymbol is called with the type descriptor on the
- * returned symbol forced to fullyQualifiedClass.
- *
- * @param project
- * @param fullyQualifiedClass
- * @param symbolName
- * @param source
- * @return a symbol
- */
- public final ISymbol createBeanOrUnknownInstanceSymbol(
- final IProject project, final String fullyQualifiedClass,
- final String symbolName, final ERuntimeSource source)
- {
- final IJavaProject javaProject = JavaCore.create(project);
- try
- {
- final IType type = javaProject.findType(fullyQualifiedClass);
-
- // TODO: this is a high-bred since it consists of a java instance
- // but also has properties we can populate at designtime such as
- // the maps. Need to add the second part
- if (type != null)
- {
- final IJavaTypeDescriptor2 typeDesc = SymbolFactory.eINSTANCE
- .createIJavaTypeDescriptor2();
- typeDesc.setType(type);
- final IBeanInstanceSymbol facesContextVar = SymbolFactory.eINSTANCE
- .createIBeanInstanceSymbol();
- facesContextVar.setTypeDescriptor(typeDesc);
- facesContextVar.setName(symbolName);
- facesContextVar.setRuntimeSource(source);
- return facesContextVar;
- }
- }
- catch (final JavaModelException jme)
- {
- // fall-through and fail with unresolved map
- }
-
- final ISymbol symbol = createUnknownInstanceSymbol(symbolName, source);
- ((IInstanceSymbol) symbol)
- .getTypeDescriptor()
- .setTypeSignatureDelegate(
- Signature
- .createTypeSignature(fullyQualifiedClass, true));
-
- return symbol;
- }
-
- /**
- * @param symbolName
- * @param source
- * @return a symbol for a variable of unknown type
- */
- public final IComponentSymbol createUnknownComponentSymbol(
- final String symbolName, final ERuntimeSource source)
- {
- final IComponentSymbol symbol = SymbolFactory.eINSTANCE
- .createIComponentSymbol();
- populateUnknownInstanceSymbol(symbol, symbolName, source);
- return symbol;
- }
-
- /**
- * @param symbolName
- * @param source
- * @return the unknown instance symbol as an IInstanceSymbol
- */
- public final IInstanceSymbol createUnknownInstanceSymbol(
- final String symbolName, final ERuntimeSource source)
- {
- final IInstanceSymbol symbol = SymbolFactory.eINSTANCE
- .createIInstanceSymbol();
- populateUnknownInstanceSymbol(symbol, symbolName, source);
- return symbol;
- }
-
- /**
- * @param name
- * may NOT be null.
- * @param typeDesc
- * may NOT be null.
- * @param description
- * may be null
- * @return a component symbol using the java type descriptor
- * @throws IllegalArgumentException
- * if non-null argument is null
- */
- public final IComponentSymbol createJavaComponentSymbol(final String name,
- final IJavaTypeDescriptor2 typeDesc, final String description)
- {
- if (name == null || typeDesc == null)
- {
- throw new IllegalArgumentException(
- "name and typeDesc must not be null"); //$NON-NLS-1$
- }
-
- final IComponentSymbol symbol = SymbolFactory.eINSTANCE
- .createIComponentSymbol();
- symbol.setName(name);
- symbol.setTypeDescriptor(typeDesc);
- symbol.setRuntimeSource(ERuntimeSource.TAG_INSTANTIATED_SYMBOL_LITERAL);
- return symbol;
- }
-
- /**
- * @param name
- * @param valueType
- * @param description
- * @param javaProject
- * @return an IComponentSymbol that uses valueType to derive the type
- * of its type descriptor
- */
- public final IComponentSymbol createJavaComponentSymbol(final String name,
- final ValueType valueType, final String description,
- final IJavaProject javaProject)
- {
- final IJavaTypeDescriptor2 typeDesc = createTypeDescriptorFromSignature(
- valueType.getSignature(), javaProject);
- return createJavaComponentSymbol(name, typeDesc, description);
- }
-
- private void populateUnknownInstanceSymbol(final IInstanceSymbol symbol,
- final String symbolName, final ERuntimeSource source)
- {
- final IMapTypeDescriptor typeDesc = SymbolFactory.eINSTANCE
- .createIBoundedMapTypeDescriptor();
- // empty map source
- typeDesc.setMapSource(Collections.emptyMap());
- symbol.setName(symbolName);
- symbol.setTypeDescriptor(typeDesc);
- symbol.setRuntimeSource(source);
- }
-
- /**
- * @param type
- * @return the signature of the element type of a collection/array,
- * <code>null</code>, if untyped Collection or no container type
- * at all.
- */
- public final String getElementSignatureFromContainerType(ValueType type)
- {
- if (type.isArray())
- {
- // TODO full signature
- String signature = type.getSignature();
- int arrayCount = Signature.getArrayCount(signature);
- String elementSig = Signature.getElementType(signature);
- return Signature.createArraySignature(elementSig, arrayCount - 1);
- }
- if (type.isInstanceOf(TypeConstants.TYPE_COLLECTION))
- {
- final String[] typeArguments = type.getTypeArguments();
- if (typeArguments.length > 0)
- {
- return typeArguments[0];
- }
- }
- return null;
- }
-
- /**
- * @param signature
- * @param javaProject
- * @return a java type descriptor based on the fully qualified type
- * specified by signature using javaProject as the lookup classpath.
- * If the IType for signature cannot be found, the descriptor's
- * typeSignatureDelegate will be used.
- */
- public final IJavaTypeDescriptor2 createTypeDescriptorFromSignature(
- final String signature, final IJavaProject javaProject)
- {
- final String elementType = Signature.getElementType(signature);
-
- IJavaTypeDescriptor2 desc = SymbolFactory.eINSTANCE
- .createIJavaTypeDescriptor2();
- final int arrayCount = Signature.getArrayCount(signature);
- if (arrayCount > 0)
- {
- desc.setArrayCount(arrayCount);
- }
-
- IType type = TypeUtil.resolveType(javaProject, elementType);
- if (type != null)
- {
- desc.setType(type);
- }
- else
- {
- desc.setTypeSignatureDelegate(Signature.getTypeErasure(signature));
- }
- desc.getTypeParameterSignatures().addAll(
- Arrays.asList(Signature.getTypeArguments(signature)));
- return desc;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/SymbolFactory.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/SymbolFactory.java
deleted file mode 100644
index 830b296..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/SymbolFactory.java
+++ /dev/null
@@ -1,177 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Oracle 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:
- * Cameron Bateman/Oracle - initial API and implementation
- *
- ********************************************************************************/
-package org.eclipse.jst.jsf.context.symbol;
-
-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.
- *
- * <p><b>Provisional API - subject to change</b></p>
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.jsf.context.symbol.SymbolPackage
- * @generated
- */
-public interface SymbolFactory extends EFactory {
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- String copyright = "Copyright 2006 Oracle"; //$NON-NLS-1$
-
- /**
- * The singleton instance of the factory.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- SymbolFactory eINSTANCE = org.eclipse.jst.jsf.context.symbol.internal.impl.SymbolFactoryImpl.init();
-
- /**
- * Returns a new object of class '<em>IBean Instance Symbol</em>'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return a new object of class '<em>IBean Instance Symbol</em>'.
- * @generated
- */
- IBeanInstanceSymbol createIBeanInstanceSymbol();
-
- /**
- * Returns a new object of class '<em>IBean Property Symbol</em>'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return a new object of class '<em>IBean Property Symbol</em>'.
- * @generated
- */
- IBeanPropertySymbol createIBeanPropertySymbol();
-
- /**
- * Returns a new object of class '<em>IInstance Symbol</em>'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return a new object of class '<em>IInstance Symbol</em>'.
- * @generated
- */
- IInstanceSymbol createIInstanceSymbol();
-
- /**
- * Returns a new object of class '<em>IJava Symbol</em>'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return a new object of class '<em>IJava Symbol</em>'.
- * @generated
- */
- IJavaSymbol createIJavaSymbol();
-
- /**
- * Returns a new object of class '<em>IJava Type Descriptor2</em>'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return a new object of class '<em>IJava Type Descriptor2</em>'.
- * @generated
- */
- IJavaTypeDescriptor2 createIJavaTypeDescriptor2();
-
- /**
- * Returns a new object of class '<em>IBean Method Symbol</em>'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return a new object of class '<em>IBean Method Symbol</em>'.
- * @generated
- */
- IBeanMethodSymbol createIBeanMethodSymbol();
-
- /**
- * Returns a new object of class '<em>IComponent Symbol</em>'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return a new object of class '<em>IComponent Symbol</em>'.
- * @generated
- */
- IComponentSymbol createIComponentSymbol();
-
- /**
- * Returns a new object of class '<em>IProperty Symbol</em>'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return a new object of class '<em>IProperty Symbol</em>'.
- * @generated
- */
- IPropertySymbol createIPropertySymbol();
-
- /**
- * Returns a new object of class '<em>IMap Type Descriptor</em>'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return a new object of class '<em>IMap Type Descriptor</em>'.
- * @generated
- */
- IMapTypeDescriptor createIMapTypeDescriptor();
-
- /**
- * Returns a new object of class '<em>IMethod Symbol</em>'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return a new object of class '<em>IMethod Symbol</em>'.
- * @generated
- */
- IMethodSymbol createIMethodSymbol();
-
- /**
- * Returns a new object of class '<em>IBounded Map Type Descriptor</em>'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return a new object of class '<em>IBounded Map Type Descriptor</em>'.
- * @generated
- */
- IBoundedMapTypeDescriptor createIBoundedMapTypeDescriptor();
-
- /**
- * Returns a new object of class '<em>IBounded Java Type Descriptor</em>'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return a new object of class '<em>IBounded Java Type Descriptor</em>'.
- * @generated
- */
- IBoundedJavaTypeDescriptor createIBoundedJavaTypeDescriptor();
-
- /**
- * Returns a new object of class '<em>IList Type Descriptor</em>'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return a new object of class '<em>IList Type Descriptor</em>'.
- * @generated
- */
- IListTypeDescriptor createIListTypeDescriptor();
-
- /**
- * Returns a new object of class '<em>IBounded List Type Descriptor</em>'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return a new object of class '<em>IBounded List Type Descriptor</em>'.
- * @generated
- */
- IBoundedListTypeDescriptor createIBoundedListTypeDescriptor();
-
- /**
- * Returns the package supported by this factory.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the package supported by this factory.
- * @generated
- */
- SymbolPackage getSymbolPackage();
-
-} //SymbolFactory
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/SymbolPackage.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/SymbolPackage.java
deleted file mode 100644
index 8f799fc..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/SymbolPackage.java
+++ /dev/null
@@ -1,2674 +0,0 @@
-/**
- * Copyright 2006 Oracle
- *
- * $Id: SymbolPackage.java,v 1.10 2008/11/18 22:24:37 gkessler Exp $
- */
-package org.eclipse.jst.jsf.context.symbol;
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EDataType;
-import org.eclipse.emf.ecore.EEnum;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EReference;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Package</b> for the model.
- * It contains accessors for the meta objects to represent
- * <ul>
- * <li>each class,</li>
- * <li>each feature of each class,</li>
- * <li>each enum,</li>
- * <li>and each data type</li>
- * </ul>
- *
- * <p><b>Provisional API - subject to change</b></p>
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.jsf.context.symbol.SymbolFactory
- * @model kind="package"
- * @generated
- */
-public interface SymbolPackage extends EPackage {
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- String copyright = "Copyright 2006 Oracle"; //$NON-NLS-1$
-
- /**
- * The package name.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- String eNAME = "symbol"; //$NON-NLS-1$
-
- /**
- * The package namespace URI.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- String eNS_URI = "http:///org/eclipse/jst/jsf/context/symbol.ecore"; //$NON-NLS-1$
-
- /**
- * The package namespace name.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- String eNS_PREFIX = "org.eclipse.jst.jsf.context.symbol"; //$NON-NLS-1$
-
- /**
- * The singleton instance of the package.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- SymbolPackage eINSTANCE = org.eclipse.jst.jsf.context.symbol.internal.impl.SymbolPackageImpl.init();
-
- /**
- * The meta object id for the '{@link org.eclipse.jst.jsf.context.symbol.ISymbol <em>ISymbol</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.jsf.context.symbol.ISymbol
- * @see org.eclipse.jst.jsf.context.symbol.internal.impl.SymbolPackageImpl#getISymbol()
- * @generated
- */
- int ISYMBOL = 4;
-
- /**
- * The feature id for the '<em><b>Name</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int ISYMBOL__NAME = 0;
-
- /**
- * The number of structural features of the '<em>ISymbol</em>' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int ISYMBOL_FEATURE_COUNT = 1;
-
- /**
- * The meta object id for the '{@link org.eclipse.jst.jsf.context.symbol.IObjectSymbol <em>IObject Symbol</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.jsf.context.symbol.IObjectSymbol
- * @see org.eclipse.jst.jsf.context.symbol.internal.impl.SymbolPackageImpl#getIObjectSymbol()
- * @generated
- */
- int IOBJECT_SYMBOL = 13;
-
- /**
- * The feature id for the '<em><b>Name</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int IOBJECT_SYMBOL__NAME = ISYMBOL__NAME;
-
- /**
- * The feature id for the '<em><b>Type Descriptor</b></em>' reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int IOBJECT_SYMBOL__TYPE_DESCRIPTOR = ISYMBOL_FEATURE_COUNT + 0;
-
- /**
- * The feature id for the '<em><b>Readable</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int IOBJECT_SYMBOL__READABLE = ISYMBOL_FEATURE_COUNT + 1;
-
- /**
- * The feature id for the '<em><b>Writable</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int IOBJECT_SYMBOL__WRITABLE = ISYMBOL_FEATURE_COUNT + 2;
-
- /**
- * The number of structural features of the '<em>IObject Symbol</em>' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int IOBJECT_SYMBOL_FEATURE_COUNT = ISYMBOL_FEATURE_COUNT + 3;
-
- /**
- * The meta object id for the '{@link org.eclipse.jst.jsf.context.symbol.internal.impl.IInstanceSymbolImpl <em>IInstance Symbol</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.jsf.context.symbol.internal.impl.IInstanceSymbolImpl
- * @see org.eclipse.jst.jsf.context.symbol.internal.impl.SymbolPackageImpl#getIInstanceSymbol()
- * @generated
- */
- int IINSTANCE_SYMBOL = 2;
-
- /**
- * The feature id for the '<em><b>Name</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int IINSTANCE_SYMBOL__NAME = IOBJECT_SYMBOL__NAME;
-
- /**
- * The feature id for the '<em><b>Type Descriptor</b></em>' reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int IINSTANCE_SYMBOL__TYPE_DESCRIPTOR = IOBJECT_SYMBOL__TYPE_DESCRIPTOR;
-
- /**
- * The feature id for the '<em><b>Readable</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int IINSTANCE_SYMBOL__READABLE = IOBJECT_SYMBOL__READABLE;
-
- /**
- * The feature id for the '<em><b>Writable</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int IINSTANCE_SYMBOL__WRITABLE = IOBJECT_SYMBOL__WRITABLE;
-
- /**
- * The feature id for the '<em><b>Type Resolved</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int IINSTANCE_SYMBOL__TYPE_RESOLVED = IOBJECT_SYMBOL_FEATURE_COUNT + 0;
-
- /**
- * The feature id for the '<em><b>Runtime Source</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int IINSTANCE_SYMBOL__RUNTIME_SOURCE = IOBJECT_SYMBOL_FEATURE_COUNT + 1;
-
- /**
- * The number of structural features of the '<em>IInstance Symbol</em>' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int IINSTANCE_SYMBOL_FEATURE_COUNT = IOBJECT_SYMBOL_FEATURE_COUNT + 2;
-
- /**
- * The meta object id for the '{@link org.eclipse.jst.jsf.context.symbol.internal.impl.IBeanInstanceSymbolImpl <em>IBean Instance Symbol</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.jsf.context.symbol.internal.impl.IBeanInstanceSymbolImpl
- * @see org.eclipse.jst.jsf.context.symbol.internal.impl.SymbolPackageImpl#getIBeanInstanceSymbol()
- * @generated
- */
- int IBEAN_INSTANCE_SYMBOL = 0;
-
- /**
- * The feature id for the '<em><b>Name</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int IBEAN_INSTANCE_SYMBOL__NAME = IINSTANCE_SYMBOL__NAME;
-
- /**
- * The feature id for the '<em><b>Type Descriptor</b></em>' reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int IBEAN_INSTANCE_SYMBOL__TYPE_DESCRIPTOR = IINSTANCE_SYMBOL__TYPE_DESCRIPTOR;
-
- /**
- * The feature id for the '<em><b>Readable</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int IBEAN_INSTANCE_SYMBOL__READABLE = IINSTANCE_SYMBOL__READABLE;
-
- /**
- * The feature id for the '<em><b>Writable</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int IBEAN_INSTANCE_SYMBOL__WRITABLE = IINSTANCE_SYMBOL__WRITABLE;
-
- /**
- * The feature id for the '<em><b>Type Resolved</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int IBEAN_INSTANCE_SYMBOL__TYPE_RESOLVED = IINSTANCE_SYMBOL__TYPE_RESOLVED;
-
- /**
- * The feature id for the '<em><b>Runtime Source</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int IBEAN_INSTANCE_SYMBOL__RUNTIME_SOURCE = IINSTANCE_SYMBOL__RUNTIME_SOURCE;
-
- /**
- * The feature id for the '<em><b>Properties</b></em>' reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int IBEAN_INSTANCE_SYMBOL__PROPERTIES = IINSTANCE_SYMBOL_FEATURE_COUNT + 0;
-
- /**
- * The feature id for the '<em><b>Methods</b></em>' reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int IBEAN_INSTANCE_SYMBOL__METHODS = IINSTANCE_SYMBOL_FEATURE_COUNT + 1;
-
- /**
- * The number of structural features of the '<em>IBean Instance Symbol</em>' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int IBEAN_INSTANCE_SYMBOL_FEATURE_COUNT = IINSTANCE_SYMBOL_FEATURE_COUNT + 2;
-
- /**
- * The meta object id for the '{@link org.eclipse.jst.jsf.context.symbol.internal.impl.IPropertySymbolImpl <em>IProperty Symbol</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.jsf.context.symbol.internal.impl.IPropertySymbolImpl
- * @see org.eclipse.jst.jsf.context.symbol.internal.impl.SymbolPackageImpl#getIPropertySymbol()
- * @generated
- */
- int IPROPERTY_SYMBOL = 10;
-
- /**
- * The feature id for the '<em><b>Name</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int IPROPERTY_SYMBOL__NAME = IOBJECT_SYMBOL__NAME;
-
- /**
- * The feature id for the '<em><b>Type Descriptor</b></em>' reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int IPROPERTY_SYMBOL__TYPE_DESCRIPTOR = IOBJECT_SYMBOL__TYPE_DESCRIPTOR;
-
- /**
- * The feature id for the '<em><b>Readable</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int IPROPERTY_SYMBOL__READABLE = IOBJECT_SYMBOL__READABLE;
-
- /**
- * The feature id for the '<em><b>Writable</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int IPROPERTY_SYMBOL__WRITABLE = IOBJECT_SYMBOL__WRITABLE;
-
- /**
- * The feature id for the '<em><b>Intermediate</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int IPROPERTY_SYMBOL__INTERMEDIATE = IOBJECT_SYMBOL_FEATURE_COUNT + 0;
-
- /**
- * The number of structural features of the '<em>IProperty Symbol</em>' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int IPROPERTY_SYMBOL_FEATURE_COUNT = IOBJECT_SYMBOL_FEATURE_COUNT + 1;
-
- /**
- * The meta object id for the '{@link org.eclipse.jst.jsf.context.symbol.internal.impl.IBeanPropertySymbolImpl <em>IBean Property Symbol</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.jsf.context.symbol.internal.impl.IBeanPropertySymbolImpl
- * @see org.eclipse.jst.jsf.context.symbol.internal.impl.SymbolPackageImpl#getIBeanPropertySymbol()
- * @generated
- */
- int IBEAN_PROPERTY_SYMBOL = 1;
-
- /**
- * The feature id for the '<em><b>Name</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int IBEAN_PROPERTY_SYMBOL__NAME = IPROPERTY_SYMBOL__NAME;
-
- /**
- * The feature id for the '<em><b>Type Descriptor</b></em>' reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int IBEAN_PROPERTY_SYMBOL__TYPE_DESCRIPTOR = IPROPERTY_SYMBOL__TYPE_DESCRIPTOR;
-
- /**
- * The feature id for the '<em><b>Readable</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int IBEAN_PROPERTY_SYMBOL__READABLE = IPROPERTY_SYMBOL__READABLE;
-
- /**
- * The feature id for the '<em><b>Writable</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int IBEAN_PROPERTY_SYMBOL__WRITABLE = IPROPERTY_SYMBOL__WRITABLE;
-
- /**
- * The feature id for the '<em><b>Intermediate</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int IBEAN_PROPERTY_SYMBOL__INTERMEDIATE = IPROPERTY_SYMBOL__INTERMEDIATE;
-
- /**
- * The feature id for the '<em><b>Owner</b></em>' reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int IBEAN_PROPERTY_SYMBOL__OWNER = IPROPERTY_SYMBOL_FEATURE_COUNT + 0;
-
- /**
- * The number of structural features of the '<em>IBean Property Symbol</em>' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int IBEAN_PROPERTY_SYMBOL_FEATURE_COUNT = IPROPERTY_SYMBOL_FEATURE_COUNT + 1;
-
- /**
- * The meta object id for the '{@link org.eclipse.jst.jsf.context.symbol.internal.impl.IJavaSymbolImpl <em>IJava Symbol</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.jsf.context.symbol.internal.impl.IJavaSymbolImpl
- * @see org.eclipse.jst.jsf.context.symbol.internal.impl.SymbolPackageImpl#getIJavaSymbol()
- * @generated
- */
- int IJAVA_SYMBOL = 3;
-
- /**
- * The feature id for the '<em><b>Name</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int IJAVA_SYMBOL__NAME = ISYMBOL__NAME;
-
- /**
- * The feature id for the '<em><b>Java Element</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int IJAVA_SYMBOL__JAVA_ELEMENT = ISYMBOL_FEATURE_COUNT + 0;
-
- /**
- * The number of structural features of the '<em>IJava Symbol</em>' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int IJAVA_SYMBOL_FEATURE_COUNT = ISYMBOL_FEATURE_COUNT + 1;
-
- /**
- * The meta object id for the '{@link org.eclipse.jst.jsf.context.symbol.internal.impl.ITypeDescriptorImpl <em>IType Descriptor</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.jsf.context.symbol.internal.impl.ITypeDescriptorImpl
- * @see org.eclipse.jst.jsf.context.symbol.internal.impl.SymbolPackageImpl#getITypeDescriptor()
- * @generated
- */
- int ITYPE_DESCRIPTOR = 5;
-
- /**
- * The feature id for the '<em><b>Properties</b></em>' reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int ITYPE_DESCRIPTOR__PROPERTIES = 0;
-
- /**
- * The feature id for the '<em><b>Type Signature</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int ITYPE_DESCRIPTOR__TYPE_SIGNATURE = 1;
-
- /**
- * The feature id for the '<em><b>Super Type Signatures</b></em>' attribute list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int ITYPE_DESCRIPTOR__SUPER_TYPE_SIGNATURES = 2;
-
- /**
- * The feature id for the '<em><b>Interface Type Signatures</b></em>' attribute list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int ITYPE_DESCRIPTOR__INTERFACE_TYPE_SIGNATURES = 3;
-
- /**
- * The feature id for the '<em><b>Type Signature Delegate</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int ITYPE_DESCRIPTOR__TYPE_SIGNATURE_DELEGATE = 4;
-
- /**
- * The feature id for the '<em><b>Methods</b></em>' reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int ITYPE_DESCRIPTOR__METHODS = 5;
-
- /**
- * The feature id for the '<em><b>Type Parameter Signatures</b></em>' attribute list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int ITYPE_DESCRIPTOR__TYPE_PARAMETER_SIGNATURES = 6;
-
- /**
- * The feature id for the '<em><b>Jdt Context</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int ITYPE_DESCRIPTOR__JDT_CONTEXT = 7;
-
- /**
- * The feature id for the '<em><b>Enum Type</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int ITYPE_DESCRIPTOR__ENUM_TYPE = 8;
-
- /**
- * The number of structural features of the '<em>IType Descriptor</em>' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int ITYPE_DESCRIPTOR_FEATURE_COUNT = 9;
-
- /**
- * The meta object id for the '{@link org.eclipse.jst.jsf.context.symbol.IDescribedInDetail <em>IDescribed In Detail</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.jsf.context.symbol.IDescribedInDetail
- * @see org.eclipse.jst.jsf.context.symbol.internal.impl.SymbolPackageImpl#getIDescribedInDetail()
- * @generated
- */
- int IDESCRIBED_IN_DETAIL = 6;
-
- /**
- * The number of structural features of the '<em>IDescribed In Detail</em>' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int IDESCRIBED_IN_DETAIL_FEATURE_COUNT = 0;
-
- /**
- * The meta object id for the '{@link org.eclipse.jst.jsf.context.symbol.internal.impl.IJavaTypeDescriptor2Impl <em>IJava Type Descriptor2</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.jsf.context.symbol.internal.impl.IJavaTypeDescriptor2Impl
- * @see org.eclipse.jst.jsf.context.symbol.internal.impl.SymbolPackageImpl#getIJavaTypeDescriptor2()
- * @generated
- */
- int IJAVA_TYPE_DESCRIPTOR2 = 7;
-
- /**
- * The feature id for the '<em><b>Properties</b></em>' reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int IJAVA_TYPE_DESCRIPTOR2__PROPERTIES = ITYPE_DESCRIPTOR__PROPERTIES;
-
- /**
- * The feature id for the '<em><b>Type Signature</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int IJAVA_TYPE_DESCRIPTOR2__TYPE_SIGNATURE = ITYPE_DESCRIPTOR__TYPE_SIGNATURE;
-
- /**
- * The feature id for the '<em><b>Super Type Signatures</b></em>' attribute list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int IJAVA_TYPE_DESCRIPTOR2__SUPER_TYPE_SIGNATURES = ITYPE_DESCRIPTOR__SUPER_TYPE_SIGNATURES;
-
- /**
- * The feature id for the '<em><b>Interface Type Signatures</b></em>' attribute list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int IJAVA_TYPE_DESCRIPTOR2__INTERFACE_TYPE_SIGNATURES = ITYPE_DESCRIPTOR__INTERFACE_TYPE_SIGNATURES;
-
- /**
- * The feature id for the '<em><b>Type Signature Delegate</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int IJAVA_TYPE_DESCRIPTOR2__TYPE_SIGNATURE_DELEGATE = ITYPE_DESCRIPTOR__TYPE_SIGNATURE_DELEGATE;
-
- /**
- * The feature id for the '<em><b>Methods</b></em>' reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int IJAVA_TYPE_DESCRIPTOR2__METHODS = ITYPE_DESCRIPTOR__METHODS;
-
- /**
- * The feature id for the '<em><b>Type Parameter Signatures</b></em>' attribute list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int IJAVA_TYPE_DESCRIPTOR2__TYPE_PARAMETER_SIGNATURES = ITYPE_DESCRIPTOR__TYPE_PARAMETER_SIGNATURES;
-
- /**
- * The feature id for the '<em><b>Jdt Context</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int IJAVA_TYPE_DESCRIPTOR2__JDT_CONTEXT = ITYPE_DESCRIPTOR__JDT_CONTEXT;
-
- /**
- * The feature id for the '<em><b>Enum Type</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int IJAVA_TYPE_DESCRIPTOR2__ENUM_TYPE = ITYPE_DESCRIPTOR__ENUM_TYPE;
-
- /**
- * The feature id for the '<em><b>Type</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int IJAVA_TYPE_DESCRIPTOR2__TYPE = ITYPE_DESCRIPTOR_FEATURE_COUNT + 0;
-
- /**
- * The feature id for the '<em><b>Bean Properties</b></em>' reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int IJAVA_TYPE_DESCRIPTOR2__BEAN_PROPERTIES = ITYPE_DESCRIPTOR_FEATURE_COUNT + 1;
-
- /**
- * The feature id for the '<em><b>Bean Methods</b></em>' reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int IJAVA_TYPE_DESCRIPTOR2__BEAN_METHODS = ITYPE_DESCRIPTOR_FEATURE_COUNT + 2;
-
- /**
- * The feature id for the '<em><b>Array Count</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int IJAVA_TYPE_DESCRIPTOR2__ARRAY_COUNT = ITYPE_DESCRIPTOR_FEATURE_COUNT + 3;
-
- /**
- * The number of structural features of the '<em>IJava Type Descriptor2</em>' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int IJAVA_TYPE_DESCRIPTOR2_FEATURE_COUNT = ITYPE_DESCRIPTOR_FEATURE_COUNT + 4;
-
- /**
- * The meta object id for the '{@link org.eclipse.jst.jsf.context.symbol.internal.impl.IBeanMethodSymbolImpl <em>IBean Method Symbol</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.jsf.context.symbol.internal.impl.IBeanMethodSymbolImpl
- * @see org.eclipse.jst.jsf.context.symbol.internal.impl.SymbolPackageImpl#getIBeanMethodSymbol()
- * @generated
- */
- int IBEAN_METHOD_SYMBOL = 8;
-
- /**
- * The feature id for the '<em><b>Name</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int IBEAN_METHOD_SYMBOL__NAME = IDESCRIBED_IN_DETAIL_FEATURE_COUNT + 0;
-
- /**
- * The feature id for the '<em><b>Signature</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int IBEAN_METHOD_SYMBOL__SIGNATURE = IDESCRIBED_IN_DETAIL_FEATURE_COUNT + 1;
-
- /**
- * The feature id for the '<em><b>Owner</b></em>' reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int IBEAN_METHOD_SYMBOL__OWNER = IDESCRIBED_IN_DETAIL_FEATURE_COUNT + 2;
-
- /**
- * The number of structural features of the '<em>IBean Method Symbol</em>' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int IBEAN_METHOD_SYMBOL_FEATURE_COUNT = IDESCRIBED_IN_DETAIL_FEATURE_COUNT + 3;
-
- /**
- * The meta object id for the '{@link org.eclipse.jst.jsf.context.symbol.internal.impl.IComponentSymbolImpl <em>IComponent Symbol</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.jsf.context.symbol.internal.impl.IComponentSymbolImpl
- * @see org.eclipse.jst.jsf.context.symbol.internal.impl.SymbolPackageImpl#getIComponentSymbol()
- * @generated
- */
- int ICOMPONENT_SYMBOL = 9;
-
- /**
- * The feature id for the '<em><b>Name</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int ICOMPONENT_SYMBOL__NAME = IINSTANCE_SYMBOL__NAME;
-
- /**
- * The feature id for the '<em><b>Type Descriptor</b></em>' reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int ICOMPONENT_SYMBOL__TYPE_DESCRIPTOR = IINSTANCE_SYMBOL__TYPE_DESCRIPTOR;
-
- /**
- * The feature id for the '<em><b>Readable</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int ICOMPONENT_SYMBOL__READABLE = IINSTANCE_SYMBOL__READABLE;
-
- /**
- * The feature id for the '<em><b>Writable</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int ICOMPONENT_SYMBOL__WRITABLE = IINSTANCE_SYMBOL__WRITABLE;
-
- /**
- * The feature id for the '<em><b>Type Resolved</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int ICOMPONENT_SYMBOL__TYPE_RESOLVED = IINSTANCE_SYMBOL__TYPE_RESOLVED;
-
- /**
- * The feature id for the '<em><b>Runtime Source</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int ICOMPONENT_SYMBOL__RUNTIME_SOURCE = IINSTANCE_SYMBOL__RUNTIME_SOURCE;
-
- /**
- * The number of structural features of the '<em>IComponent Symbol</em>' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int ICOMPONENT_SYMBOL_FEATURE_COUNT = IINSTANCE_SYMBOL_FEATURE_COUNT + 0;
-
- /**
- * The meta object id for the '{@link org.eclipse.jst.jsf.context.symbol.internal.impl.IMapTypeDescriptorImpl <em>IMap Type Descriptor</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.jsf.context.symbol.internal.impl.IMapTypeDescriptorImpl
- * @see org.eclipse.jst.jsf.context.symbol.internal.impl.SymbolPackageImpl#getIMapTypeDescriptor()
- * @generated
- */
- int IMAP_TYPE_DESCRIPTOR = 11;
-
- /**
- * The feature id for the '<em><b>Properties</b></em>' reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int IMAP_TYPE_DESCRIPTOR__PROPERTIES = ITYPE_DESCRIPTOR__PROPERTIES;
-
- /**
- * The feature id for the '<em><b>Type Signature</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int IMAP_TYPE_DESCRIPTOR__TYPE_SIGNATURE = ITYPE_DESCRIPTOR__TYPE_SIGNATURE;
-
- /**
- * The feature id for the '<em><b>Super Type Signatures</b></em>' attribute list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int IMAP_TYPE_DESCRIPTOR__SUPER_TYPE_SIGNATURES = ITYPE_DESCRIPTOR__SUPER_TYPE_SIGNATURES;
-
- /**
- * The feature id for the '<em><b>Interface Type Signatures</b></em>' attribute list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int IMAP_TYPE_DESCRIPTOR__INTERFACE_TYPE_SIGNATURES = ITYPE_DESCRIPTOR__INTERFACE_TYPE_SIGNATURES;
-
- /**
- * The feature id for the '<em><b>Type Signature Delegate</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int IMAP_TYPE_DESCRIPTOR__TYPE_SIGNATURE_DELEGATE = ITYPE_DESCRIPTOR__TYPE_SIGNATURE_DELEGATE;
-
- /**
- * The feature id for the '<em><b>Methods</b></em>' reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int IMAP_TYPE_DESCRIPTOR__METHODS = ITYPE_DESCRIPTOR__METHODS;
-
- /**
- * The feature id for the '<em><b>Type Parameter Signatures</b></em>' attribute list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int IMAP_TYPE_DESCRIPTOR__TYPE_PARAMETER_SIGNATURES = ITYPE_DESCRIPTOR__TYPE_PARAMETER_SIGNATURES;
-
- /**
- * The feature id for the '<em><b>Jdt Context</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int IMAP_TYPE_DESCRIPTOR__JDT_CONTEXT = ITYPE_DESCRIPTOR__JDT_CONTEXT;
-
- /**
- * The feature id for the '<em><b>Enum Type</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int IMAP_TYPE_DESCRIPTOR__ENUM_TYPE = ITYPE_DESCRIPTOR__ENUM_TYPE;
-
- /**
- * The feature id for the '<em><b>Map Source</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int IMAP_TYPE_DESCRIPTOR__MAP_SOURCE = ITYPE_DESCRIPTOR_FEATURE_COUNT + 0;
-
- /**
- * The feature id for the '<em><b>Immutable</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int IMAP_TYPE_DESCRIPTOR__IMMUTABLE = ITYPE_DESCRIPTOR_FEATURE_COUNT + 1;
-
- /**
- * The number of structural features of the '<em>IMap Type Descriptor</em>' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int IMAP_TYPE_DESCRIPTOR_FEATURE_COUNT = ITYPE_DESCRIPTOR_FEATURE_COUNT + 2;
-
- /**
- * The meta object id for the '{@link org.eclipse.jst.jsf.context.symbol.internal.impl.IMethodSymbolImpl <em>IMethod Symbol</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.jsf.context.symbol.internal.impl.IMethodSymbolImpl
- * @see org.eclipse.jst.jsf.context.symbol.internal.impl.SymbolPackageImpl#getIMethodSymbol()
- * @generated
- */
- int IMETHOD_SYMBOL = 12;
-
- /**
- * The feature id for the '<em><b>Name</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int IMETHOD_SYMBOL__NAME = ISYMBOL__NAME;
-
- /**
- * The feature id for the '<em><b>Signature</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int IMETHOD_SYMBOL__SIGNATURE = ISYMBOL_FEATURE_COUNT + 0;
-
- /**
- * The number of structural features of the '<em>IMethod Symbol</em>' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int IMETHOD_SYMBOL_FEATURE_COUNT = ISYMBOL_FEATURE_COUNT + 1;
-
- /**
- * The meta object id for the '{@link org.eclipse.jst.jsf.context.symbol.IBoundedTypeDescriptor <em>IBounded Type Descriptor</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.jsf.context.symbol.IBoundedTypeDescriptor
- * @see org.eclipse.jst.jsf.context.symbol.internal.impl.SymbolPackageImpl#getIBoundedTypeDescriptor()
- * @generated
- */
- int IBOUNDED_TYPE_DESCRIPTOR = 14;
-
- /**
- * The feature id for the '<em><b>Properties</b></em>' reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int IBOUNDED_TYPE_DESCRIPTOR__PROPERTIES = ITYPE_DESCRIPTOR__PROPERTIES;
-
- /**
- * The feature id for the '<em><b>Type Signature</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int IBOUNDED_TYPE_DESCRIPTOR__TYPE_SIGNATURE = ITYPE_DESCRIPTOR__TYPE_SIGNATURE;
-
- /**
- * The feature id for the '<em><b>Super Type Signatures</b></em>' attribute list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int IBOUNDED_TYPE_DESCRIPTOR__SUPER_TYPE_SIGNATURES = ITYPE_DESCRIPTOR__SUPER_TYPE_SIGNATURES;
-
- /**
- * The feature id for the '<em><b>Interface Type Signatures</b></em>' attribute list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int IBOUNDED_TYPE_DESCRIPTOR__INTERFACE_TYPE_SIGNATURES = ITYPE_DESCRIPTOR__INTERFACE_TYPE_SIGNATURES;
-
- /**
- * The feature id for the '<em><b>Type Signature Delegate</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int IBOUNDED_TYPE_DESCRIPTOR__TYPE_SIGNATURE_DELEGATE = ITYPE_DESCRIPTOR__TYPE_SIGNATURE_DELEGATE;
-
- /**
- * The feature id for the '<em><b>Methods</b></em>' reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int IBOUNDED_TYPE_DESCRIPTOR__METHODS = ITYPE_DESCRIPTOR__METHODS;
-
- /**
- * The feature id for the '<em><b>Type Parameter Signatures</b></em>' attribute list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int IBOUNDED_TYPE_DESCRIPTOR__TYPE_PARAMETER_SIGNATURES = ITYPE_DESCRIPTOR__TYPE_PARAMETER_SIGNATURES;
-
- /**
- * The feature id for the '<em><b>Jdt Context</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int IBOUNDED_TYPE_DESCRIPTOR__JDT_CONTEXT = ITYPE_DESCRIPTOR__JDT_CONTEXT;
-
- /**
- * The feature id for the '<em><b>Enum Type</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int IBOUNDED_TYPE_DESCRIPTOR__ENUM_TYPE = ITYPE_DESCRIPTOR__ENUM_TYPE;
-
- /**
- * The number of structural features of the '<em>IBounded Type Descriptor</em>' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int IBOUNDED_TYPE_DESCRIPTOR_FEATURE_COUNT = ITYPE_DESCRIPTOR_FEATURE_COUNT + 0;
-
- /**
- * The meta object id for the '{@link org.eclipse.jst.jsf.context.symbol.internal.impl.IBoundedMapTypeDescriptorImpl <em>IBounded Map Type Descriptor</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.jsf.context.symbol.internal.impl.IBoundedMapTypeDescriptorImpl
- * @see org.eclipse.jst.jsf.context.symbol.internal.impl.SymbolPackageImpl#getIBoundedMapTypeDescriptor()
- * @generated
- */
- int IBOUNDED_MAP_TYPE_DESCRIPTOR = 15;
-
- /**
- * The feature id for the '<em><b>Properties</b></em>' reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int IBOUNDED_MAP_TYPE_DESCRIPTOR__PROPERTIES = IMAP_TYPE_DESCRIPTOR__PROPERTIES;
-
- /**
- * The feature id for the '<em><b>Type Signature</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int IBOUNDED_MAP_TYPE_DESCRIPTOR__TYPE_SIGNATURE = IMAP_TYPE_DESCRIPTOR__TYPE_SIGNATURE;
-
- /**
- * The feature id for the '<em><b>Super Type Signatures</b></em>' attribute list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int IBOUNDED_MAP_TYPE_DESCRIPTOR__SUPER_TYPE_SIGNATURES = IMAP_TYPE_DESCRIPTOR__SUPER_TYPE_SIGNATURES;
-
- /**
- * The feature id for the '<em><b>Interface Type Signatures</b></em>' attribute list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int IBOUNDED_MAP_TYPE_DESCRIPTOR__INTERFACE_TYPE_SIGNATURES = IMAP_TYPE_DESCRIPTOR__INTERFACE_TYPE_SIGNATURES;
-
- /**
- * The feature id for the '<em><b>Type Signature Delegate</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int IBOUNDED_MAP_TYPE_DESCRIPTOR__TYPE_SIGNATURE_DELEGATE = IMAP_TYPE_DESCRIPTOR__TYPE_SIGNATURE_DELEGATE;
-
- /**
- * The feature id for the '<em><b>Methods</b></em>' reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int IBOUNDED_MAP_TYPE_DESCRIPTOR__METHODS = IMAP_TYPE_DESCRIPTOR__METHODS;
-
- /**
- * The feature id for the '<em><b>Type Parameter Signatures</b></em>' attribute list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int IBOUNDED_MAP_TYPE_DESCRIPTOR__TYPE_PARAMETER_SIGNATURES = IMAP_TYPE_DESCRIPTOR__TYPE_PARAMETER_SIGNATURES;
-
- /**
- * The feature id for the '<em><b>Jdt Context</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int IBOUNDED_MAP_TYPE_DESCRIPTOR__JDT_CONTEXT = IMAP_TYPE_DESCRIPTOR__JDT_CONTEXT;
-
- /**
- * The feature id for the '<em><b>Enum Type</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int IBOUNDED_MAP_TYPE_DESCRIPTOR__ENUM_TYPE = IMAP_TYPE_DESCRIPTOR__ENUM_TYPE;
-
- /**
- * The feature id for the '<em><b>Map Source</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int IBOUNDED_MAP_TYPE_DESCRIPTOR__MAP_SOURCE = IMAP_TYPE_DESCRIPTOR__MAP_SOURCE;
-
- /**
- * The feature id for the '<em><b>Immutable</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int IBOUNDED_MAP_TYPE_DESCRIPTOR__IMMUTABLE = IMAP_TYPE_DESCRIPTOR__IMMUTABLE;
-
- /**
- * The number of structural features of the '<em>IBounded Map Type Descriptor</em>' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int IBOUNDED_MAP_TYPE_DESCRIPTOR_FEATURE_COUNT = IMAP_TYPE_DESCRIPTOR_FEATURE_COUNT + 0;
-
- /**
- * The meta object id for the '{@link org.eclipse.jst.jsf.context.symbol.internal.impl.IBoundedJavaTypeDescriptorImpl <em>IBounded Java Type Descriptor</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.jsf.context.symbol.internal.impl.IBoundedJavaTypeDescriptorImpl
- * @see org.eclipse.jst.jsf.context.symbol.internal.impl.SymbolPackageImpl#getIBoundedJavaTypeDescriptor()
- * @generated
- */
- int IBOUNDED_JAVA_TYPE_DESCRIPTOR = 16;
-
- /**
- * The feature id for the '<em><b>Properties</b></em>' reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int IBOUNDED_JAVA_TYPE_DESCRIPTOR__PROPERTIES = IJAVA_TYPE_DESCRIPTOR2__PROPERTIES;
-
- /**
- * The feature id for the '<em><b>Type Signature</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int IBOUNDED_JAVA_TYPE_DESCRIPTOR__TYPE_SIGNATURE = IJAVA_TYPE_DESCRIPTOR2__TYPE_SIGNATURE;
-
- /**
- * The feature id for the '<em><b>Super Type Signatures</b></em>' attribute list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int IBOUNDED_JAVA_TYPE_DESCRIPTOR__SUPER_TYPE_SIGNATURES = IJAVA_TYPE_DESCRIPTOR2__SUPER_TYPE_SIGNATURES;
-
- /**
- * The feature id for the '<em><b>Interface Type Signatures</b></em>' attribute list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int IBOUNDED_JAVA_TYPE_DESCRIPTOR__INTERFACE_TYPE_SIGNATURES = IJAVA_TYPE_DESCRIPTOR2__INTERFACE_TYPE_SIGNATURES;
-
- /**
- * The feature id for the '<em><b>Type Signature Delegate</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int IBOUNDED_JAVA_TYPE_DESCRIPTOR__TYPE_SIGNATURE_DELEGATE = IJAVA_TYPE_DESCRIPTOR2__TYPE_SIGNATURE_DELEGATE;
-
- /**
- * The feature id for the '<em><b>Methods</b></em>' reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int IBOUNDED_JAVA_TYPE_DESCRIPTOR__METHODS = IJAVA_TYPE_DESCRIPTOR2__METHODS;
-
- /**
- * The feature id for the '<em><b>Type Parameter Signatures</b></em>' attribute list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int IBOUNDED_JAVA_TYPE_DESCRIPTOR__TYPE_PARAMETER_SIGNATURES = IJAVA_TYPE_DESCRIPTOR2__TYPE_PARAMETER_SIGNATURES;
-
- /**
- * The feature id for the '<em><b>Jdt Context</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int IBOUNDED_JAVA_TYPE_DESCRIPTOR__JDT_CONTEXT = IJAVA_TYPE_DESCRIPTOR2__JDT_CONTEXT;
-
- /**
- * The feature id for the '<em><b>Enum Type</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int IBOUNDED_JAVA_TYPE_DESCRIPTOR__ENUM_TYPE = IJAVA_TYPE_DESCRIPTOR2__ENUM_TYPE;
-
- /**
- * The feature id for the '<em><b>Type</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int IBOUNDED_JAVA_TYPE_DESCRIPTOR__TYPE = IJAVA_TYPE_DESCRIPTOR2__TYPE;
-
- /**
- * The feature id for the '<em><b>Bean Properties</b></em>' reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int IBOUNDED_JAVA_TYPE_DESCRIPTOR__BEAN_PROPERTIES = IJAVA_TYPE_DESCRIPTOR2__BEAN_PROPERTIES;
-
- /**
- * The feature id for the '<em><b>Bean Methods</b></em>' reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int IBOUNDED_JAVA_TYPE_DESCRIPTOR__BEAN_METHODS = IJAVA_TYPE_DESCRIPTOR2__BEAN_METHODS;
-
- /**
- * The feature id for the '<em><b>Array Count</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int IBOUNDED_JAVA_TYPE_DESCRIPTOR__ARRAY_COUNT = IJAVA_TYPE_DESCRIPTOR2__ARRAY_COUNT;
-
- /**
- * The number of structural features of the '<em>IBounded Java Type Descriptor</em>' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int IBOUNDED_JAVA_TYPE_DESCRIPTOR_FEATURE_COUNT = IJAVA_TYPE_DESCRIPTOR2_FEATURE_COUNT + 0;
-
- /**
- * The meta object id for the '{@link org.eclipse.jst.jsf.context.symbol.internal.impl.IListTypeDescriptorImpl <em>IList Type Descriptor</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.jsf.context.symbol.internal.impl.IListTypeDescriptorImpl
- * @see org.eclipse.jst.jsf.context.symbol.internal.impl.SymbolPackageImpl#getIListTypeDescriptor()
- * @generated
- */
- int ILIST_TYPE_DESCRIPTOR = 17;
-
- /**
- * The feature id for the '<em><b>Properties</b></em>' reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int ILIST_TYPE_DESCRIPTOR__PROPERTIES = ITYPE_DESCRIPTOR__PROPERTIES;
-
- /**
- * The feature id for the '<em><b>Type Signature</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int ILIST_TYPE_DESCRIPTOR__TYPE_SIGNATURE = ITYPE_DESCRIPTOR__TYPE_SIGNATURE;
-
- /**
- * The feature id for the '<em><b>Super Type Signatures</b></em>' attribute list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int ILIST_TYPE_DESCRIPTOR__SUPER_TYPE_SIGNATURES = ITYPE_DESCRIPTOR__SUPER_TYPE_SIGNATURES;
-
- /**
- * The feature id for the '<em><b>Interface Type Signatures</b></em>' attribute list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int ILIST_TYPE_DESCRIPTOR__INTERFACE_TYPE_SIGNATURES = ITYPE_DESCRIPTOR__INTERFACE_TYPE_SIGNATURES;
-
- /**
- * The feature id for the '<em><b>Type Signature Delegate</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int ILIST_TYPE_DESCRIPTOR__TYPE_SIGNATURE_DELEGATE = ITYPE_DESCRIPTOR__TYPE_SIGNATURE_DELEGATE;
-
- /**
- * The feature id for the '<em><b>Methods</b></em>' reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int ILIST_TYPE_DESCRIPTOR__METHODS = ITYPE_DESCRIPTOR__METHODS;
-
- /**
- * The feature id for the '<em><b>Type Parameter Signatures</b></em>' attribute list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int ILIST_TYPE_DESCRIPTOR__TYPE_PARAMETER_SIGNATURES = ITYPE_DESCRIPTOR__TYPE_PARAMETER_SIGNATURES;
-
- /**
- * The feature id for the '<em><b>Jdt Context</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int ILIST_TYPE_DESCRIPTOR__JDT_CONTEXT = ITYPE_DESCRIPTOR__JDT_CONTEXT;
-
- /**
- * The feature id for the '<em><b>Enum Type</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int ILIST_TYPE_DESCRIPTOR__ENUM_TYPE = ITYPE_DESCRIPTOR__ENUM_TYPE;
-
- /**
- * The feature id for the '<em><b>List Source</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int ILIST_TYPE_DESCRIPTOR__LIST_SOURCE = ITYPE_DESCRIPTOR_FEATURE_COUNT + 0;
-
- /**
- * The number of structural features of the '<em>IList Type Descriptor</em>' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int ILIST_TYPE_DESCRIPTOR_FEATURE_COUNT = ITYPE_DESCRIPTOR_FEATURE_COUNT + 1;
-
- /**
- * The meta object id for the '{@link org.eclipse.jst.jsf.context.symbol.internal.impl.IBoundedListTypeDescriptorImpl <em>IBounded List Type Descriptor</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.jsf.context.symbol.internal.impl.IBoundedListTypeDescriptorImpl
- * @see org.eclipse.jst.jsf.context.symbol.internal.impl.SymbolPackageImpl#getIBoundedListTypeDescriptor()
- * @generated
- */
- int IBOUNDED_LIST_TYPE_DESCRIPTOR = 18;
-
- /**
- * The feature id for the '<em><b>Properties</b></em>' reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int IBOUNDED_LIST_TYPE_DESCRIPTOR__PROPERTIES = ILIST_TYPE_DESCRIPTOR__PROPERTIES;
-
- /**
- * The feature id for the '<em><b>Type Signature</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int IBOUNDED_LIST_TYPE_DESCRIPTOR__TYPE_SIGNATURE = ILIST_TYPE_DESCRIPTOR__TYPE_SIGNATURE;
-
- /**
- * The feature id for the '<em><b>Super Type Signatures</b></em>' attribute list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int IBOUNDED_LIST_TYPE_DESCRIPTOR__SUPER_TYPE_SIGNATURES = ILIST_TYPE_DESCRIPTOR__SUPER_TYPE_SIGNATURES;
-
- /**
- * The feature id for the '<em><b>Interface Type Signatures</b></em>' attribute list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int IBOUNDED_LIST_TYPE_DESCRIPTOR__INTERFACE_TYPE_SIGNATURES = ILIST_TYPE_DESCRIPTOR__INTERFACE_TYPE_SIGNATURES;
-
- /**
- * The feature id for the '<em><b>Type Signature Delegate</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int IBOUNDED_LIST_TYPE_DESCRIPTOR__TYPE_SIGNATURE_DELEGATE = ILIST_TYPE_DESCRIPTOR__TYPE_SIGNATURE_DELEGATE;
-
- /**
- * The feature id for the '<em><b>Methods</b></em>' reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int IBOUNDED_LIST_TYPE_DESCRIPTOR__METHODS = ILIST_TYPE_DESCRIPTOR__METHODS;
-
- /**
- * The feature id for the '<em><b>Type Parameter Signatures</b></em>' attribute list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int IBOUNDED_LIST_TYPE_DESCRIPTOR__TYPE_PARAMETER_SIGNATURES = ILIST_TYPE_DESCRIPTOR__TYPE_PARAMETER_SIGNATURES;
-
- /**
- * The feature id for the '<em><b>Jdt Context</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int IBOUNDED_LIST_TYPE_DESCRIPTOR__JDT_CONTEXT = ILIST_TYPE_DESCRIPTOR__JDT_CONTEXT;
-
- /**
- * The feature id for the '<em><b>Enum Type</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int IBOUNDED_LIST_TYPE_DESCRIPTOR__ENUM_TYPE = ILIST_TYPE_DESCRIPTOR__ENUM_TYPE;
-
- /**
- * The feature id for the '<em><b>List Source</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int IBOUNDED_LIST_TYPE_DESCRIPTOR__LIST_SOURCE = ILIST_TYPE_DESCRIPTOR__LIST_SOURCE;
-
- /**
- * The number of structural features of the '<em>IBounded List Type Descriptor</em>' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int IBOUNDED_LIST_TYPE_DESCRIPTOR_FEATURE_COUNT = ILIST_TYPE_DESCRIPTOR_FEATURE_COUNT + 0;
-
- /**
- * The meta object id for the '{@link org.eclipse.jst.jsf.context.symbol.ERuntimeSource <em>ERuntime Source</em>}' enum.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.jsf.context.symbol.ERuntimeSource
- * @see org.eclipse.jst.jsf.context.symbol.internal.impl.SymbolPackageImpl#getERuntimeSource()
- * @generated
- */
- int ERUNTIME_SOURCE = 19;
-
- /**
- * The meta object id for the '<em>IType</em>' data type.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jdt.core.IType
- * @see org.eclipse.jst.jsf.context.symbol.internal.impl.SymbolPackageImpl#getIType()
- * @generated
- */
- int ITYPE = 20;
-
- /**
- * The meta object id for the '<em>IJava Element</em>' data type.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jdt.core.IJavaElement
- * @see org.eclipse.jst.jsf.context.symbol.internal.impl.SymbolPackageImpl#getIJavaElement()
- * @generated
- */
- int IJAVA_ELEMENT = 21;
-
- /**
- * The meta object id for the '<em>Value Type</em>' data type.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.jsf.common.internal.types.ValueType
- * @see org.eclipse.jst.jsf.context.symbol.internal.impl.SymbolPackageImpl#getValueType()
- * @generated
- */
- int VALUE_TYPE = 22;
-
-
- /**
- * Returns the meta object for class '{@link org.eclipse.jst.jsf.context.symbol.IBeanInstanceSymbol <em>IBean Instance Symbol</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for class '<em>IBean Instance Symbol</em>'.
- * @see org.eclipse.jst.jsf.context.symbol.IBeanInstanceSymbol
- * @generated
- */
- EClass getIBeanInstanceSymbol();
-
- /**
- * Returns the meta object for the reference list '{@link org.eclipse.jst.jsf.context.symbol.IBeanInstanceSymbol#getProperties <em>Properties</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the reference list '<em>Properties</em>'.
- * @see org.eclipse.jst.jsf.context.symbol.IBeanInstanceSymbol#getProperties()
- * @see #getIBeanInstanceSymbol()
- * @generated
- */
- EReference getIBeanInstanceSymbol_Properties();
-
- /**
- * Returns the meta object for the reference list '{@link org.eclipse.jst.jsf.context.symbol.IBeanInstanceSymbol#getMethods <em>Methods</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the reference list '<em>Methods</em>'.
- * @see org.eclipse.jst.jsf.context.symbol.IBeanInstanceSymbol#getMethods()
- * @see #getIBeanInstanceSymbol()
- * @generated
- */
- EReference getIBeanInstanceSymbol_Methods();
-
- /**
- * Returns the meta object for class '{@link org.eclipse.jst.jsf.context.symbol.IBeanPropertySymbol <em>IBean Property Symbol</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for class '<em>IBean Property Symbol</em>'.
- * @see org.eclipse.jst.jsf.context.symbol.IBeanPropertySymbol
- * @generated
- */
- EClass getIBeanPropertySymbol();
-
- /**
- * Returns the meta object for the reference '{@link org.eclipse.jst.jsf.context.symbol.IBeanPropertySymbol#getOwner <em>Owner</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the reference '<em>Owner</em>'.
- * @see org.eclipse.jst.jsf.context.symbol.IBeanPropertySymbol#getOwner()
- * @see #getIBeanPropertySymbol()
- * @generated
- */
- EReference getIBeanPropertySymbol_Owner();
-
- /**
- * Returns the meta object for class '{@link org.eclipse.jst.jsf.context.symbol.IInstanceSymbol <em>IInstance Symbol</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for class '<em>IInstance Symbol</em>'.
- * @see org.eclipse.jst.jsf.context.symbol.IInstanceSymbol
- * @generated
- */
- EClass getIInstanceSymbol();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jst.jsf.context.symbol.IInstanceSymbol#isTypeResolved <em>Type Resolved</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Type Resolved</em>'.
- * @see org.eclipse.jst.jsf.context.symbol.IInstanceSymbol#isTypeResolved()
- * @see #getIInstanceSymbol()
- * @generated
- */
- EAttribute getIInstanceSymbol_TypeResolved();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jst.jsf.context.symbol.IInstanceSymbol#getRuntimeSource <em>Runtime Source</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Runtime Source</em>'.
- * @see org.eclipse.jst.jsf.context.symbol.IInstanceSymbol#getRuntimeSource()
- * @see #getIInstanceSymbol()
- * @generated
- */
- EAttribute getIInstanceSymbol_RuntimeSource();
-
- /**
- * Returns the meta object for class '{@link org.eclipse.jst.jsf.context.symbol.IJavaSymbol <em>IJava Symbol</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for class '<em>IJava Symbol</em>'.
- * @see org.eclipse.jst.jsf.context.symbol.IJavaSymbol
- * @generated
- */
- EClass getIJavaSymbol();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jst.jsf.context.symbol.IJavaSymbol#getJavaElement <em>Java Element</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Java Element</em>'.
- * @see org.eclipse.jst.jsf.context.symbol.IJavaSymbol#getJavaElement()
- * @see #getIJavaSymbol()
- * @generated
- */
- EAttribute getIJavaSymbol_JavaElement();
-
- /**
- * Returns the meta object for class '{@link org.eclipse.jst.jsf.context.symbol.ISymbol <em>ISymbol</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for class '<em>ISymbol</em>'.
- * @see org.eclipse.jst.jsf.context.symbol.ISymbol
- * @generated
- */
- EClass getISymbol();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jst.jsf.context.symbol.ISymbol#getName <em>Name</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Name</em>'.
- * @see org.eclipse.jst.jsf.context.symbol.ISymbol#getName()
- * @see #getISymbol()
- * @generated
- */
- EAttribute getISymbol_Name();
-
- /**
- * Returns the meta object for class '{@link org.eclipse.jst.jsf.context.symbol.ITypeDescriptor <em>IType Descriptor</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for class '<em>IType Descriptor</em>'.
- * @see org.eclipse.jst.jsf.context.symbol.ITypeDescriptor
- * @generated
- */
- EClass getITypeDescriptor();
-
- /**
- * Returns the meta object for the reference list '{@link org.eclipse.jst.jsf.context.symbol.ITypeDescriptor#getProperties <em>Properties</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the reference list '<em>Properties</em>'.
- * @see org.eclipse.jst.jsf.context.symbol.ITypeDescriptor#getProperties()
- * @see #getITypeDescriptor()
- * @generated
- */
- EReference getITypeDescriptor_Properties();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jst.jsf.context.symbol.ITypeDescriptor#getTypeSignature <em>Type Signature</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Type Signature</em>'.
- * @see org.eclipse.jst.jsf.context.symbol.ITypeDescriptor#getTypeSignature()
- * @see #getITypeDescriptor()
- * @generated
- */
- EAttribute getITypeDescriptor_TypeSignature();
-
- /**
- * Returns the meta object for the attribute list '{@link org.eclipse.jst.jsf.context.symbol.ITypeDescriptor#getSuperTypeSignatures <em>Super Type Signatures</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute list '<em>Super Type Signatures</em>'.
- * @see org.eclipse.jst.jsf.context.symbol.ITypeDescriptor#getSuperTypeSignatures()
- * @see #getITypeDescriptor()
- * @generated
- */
- EAttribute getITypeDescriptor_SuperTypeSignatures();
-
- /**
- * Returns the meta object for the attribute list '{@link org.eclipse.jst.jsf.context.symbol.ITypeDescriptor#getInterfaceTypeSignatures <em>Interface Type Signatures</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute list '<em>Interface Type Signatures</em>'.
- * @see org.eclipse.jst.jsf.context.symbol.ITypeDescriptor#getInterfaceTypeSignatures()
- * @see #getITypeDescriptor()
- * @generated
- */
- EAttribute getITypeDescriptor_InterfaceTypeSignatures();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jst.jsf.context.symbol.ITypeDescriptor#getTypeSignatureDelegate <em>Type Signature Delegate</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Type Signature Delegate</em>'.
- * @see org.eclipse.jst.jsf.context.symbol.ITypeDescriptor#getTypeSignatureDelegate()
- * @see #getITypeDescriptor()
- * @generated
- */
- EAttribute getITypeDescriptor_TypeSignatureDelegate();
-
- /**
- * Returns the meta object for the reference list '{@link org.eclipse.jst.jsf.context.symbol.ITypeDescriptor#getMethods <em>Methods</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the reference list '<em>Methods</em>'.
- * @see org.eclipse.jst.jsf.context.symbol.ITypeDescriptor#getMethods()
- * @see #getITypeDescriptor()
- * @generated
- */
- EReference getITypeDescriptor_Methods();
-
- /**
- * Returns the meta object for the attribute list '{@link org.eclipse.jst.jsf.context.symbol.ITypeDescriptor#getTypeParameterSignatures <em>Type Parameter Signatures</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute list '<em>Type Parameter Signatures</em>'.
- * @see org.eclipse.jst.jsf.context.symbol.ITypeDescriptor#getTypeParameterSignatures()
- * @see #getITypeDescriptor()
- * @generated
- */
- EAttribute getITypeDescriptor_TypeParameterSignatures();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jst.jsf.context.symbol.ITypeDescriptor#getJdtContext <em>Jdt Context</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Jdt Context</em>'.
- * @see org.eclipse.jst.jsf.context.symbol.ITypeDescriptor#getJdtContext()
- * @see #getITypeDescriptor()
- * @generated
- */
- EAttribute getITypeDescriptor_JdtContext();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jst.jsf.context.symbol.ITypeDescriptor#isEnumType <em>Enum Type</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Enum Type</em>'.
- * @see org.eclipse.jst.jsf.context.symbol.ITypeDescriptor#isEnumType()
- * @see #getITypeDescriptor()
- * @generated
- */
- EAttribute getITypeDescriptor_EnumType();
-
- /**
- * Returns the meta object for class '{@link org.eclipse.jst.jsf.context.symbol.IDescribedInDetail <em>IDescribed In Detail</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for class '<em>IDescribed In Detail</em>'.
- * @see org.eclipse.jst.jsf.context.symbol.IDescribedInDetail
- * @generated
- */
- EClass getIDescribedInDetail();
-
- /**
- * Returns the meta object for class '{@link org.eclipse.jst.jsf.context.symbol.IJavaTypeDescriptor2 <em>IJava Type Descriptor2</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for class '<em>IJava Type Descriptor2</em>'.
- * @see org.eclipse.jst.jsf.context.symbol.IJavaTypeDescriptor2
- * @generated
- */
- EClass getIJavaTypeDescriptor2();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jst.jsf.context.symbol.IJavaTypeDescriptor2#getType <em>Type</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Type</em>'.
- * @see org.eclipse.jst.jsf.context.symbol.IJavaTypeDescriptor2#getType()
- * @see #getIJavaTypeDescriptor2()
- * @generated
- */
- EAttribute getIJavaTypeDescriptor2_Type();
-
- /**
- * Returns the meta object for the reference list '{@link org.eclipse.jst.jsf.context.symbol.IJavaTypeDescriptor2#getBeanProperties <em>Bean Properties</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the reference list '<em>Bean Properties</em>'.
- * @see org.eclipse.jst.jsf.context.symbol.IJavaTypeDescriptor2#getBeanProperties()
- * @see #getIJavaTypeDescriptor2()
- * @generated
- */
- EReference getIJavaTypeDescriptor2_BeanProperties();
-
- /**
- * Returns the meta object for the reference list '{@link org.eclipse.jst.jsf.context.symbol.IJavaTypeDescriptor2#getBeanMethods <em>Bean Methods</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the reference list '<em>Bean Methods</em>'.
- * @see org.eclipse.jst.jsf.context.symbol.IJavaTypeDescriptor2#getBeanMethods()
- * @see #getIJavaTypeDescriptor2()
- * @generated
- */
- EReference getIJavaTypeDescriptor2_BeanMethods();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jst.jsf.context.symbol.IJavaTypeDescriptor2#getArrayCount <em>Array Count</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Array Count</em>'.
- * @see org.eclipse.jst.jsf.context.symbol.IJavaTypeDescriptor2#getArrayCount()
- * @see #getIJavaTypeDescriptor2()
- * @generated
- */
- EAttribute getIJavaTypeDescriptor2_ArrayCount();
-
- /**
- * Returns the meta object for class '{@link org.eclipse.jst.jsf.context.symbol.IBeanMethodSymbol <em>IBean Method Symbol</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for class '<em>IBean Method Symbol</em>'.
- * @see org.eclipse.jst.jsf.context.symbol.IBeanMethodSymbol
- * @generated
- */
- EClass getIBeanMethodSymbol();
-
- /**
- * Returns the meta object for the reference '{@link org.eclipse.jst.jsf.context.symbol.IBeanMethodSymbol#getOwner <em>Owner</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the reference '<em>Owner</em>'.
- * @see org.eclipse.jst.jsf.context.symbol.IBeanMethodSymbol#getOwner()
- * @see #getIBeanMethodSymbol()
- * @generated
- */
- EReference getIBeanMethodSymbol_Owner();
-
- /**
- * Returns the meta object for class '{@link org.eclipse.jst.jsf.context.symbol.IComponentSymbol <em>IComponent Symbol</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for class '<em>IComponent Symbol</em>'.
- * @see org.eclipse.jst.jsf.context.symbol.IComponentSymbol
- * @generated
- */
- EClass getIComponentSymbol();
-
- /**
- * Returns the meta object for class '{@link org.eclipse.jst.jsf.context.symbol.IPropertySymbol <em>IProperty Symbol</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for class '<em>IProperty Symbol</em>'.
- * @see org.eclipse.jst.jsf.context.symbol.IPropertySymbol
- * @generated
- */
- EClass getIPropertySymbol();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jst.jsf.context.symbol.IPropertySymbol#isIntermediate <em>Intermediate</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Intermediate</em>'.
- * @see org.eclipse.jst.jsf.context.symbol.IPropertySymbol#isIntermediate()
- * @see #getIPropertySymbol()
- * @generated
- */
- EAttribute getIPropertySymbol_Intermediate();
-
- /**
- * Returns the meta object for class '{@link org.eclipse.jst.jsf.context.symbol.IMapTypeDescriptor <em>IMap Type Descriptor</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for class '<em>IMap Type Descriptor</em>'.
- * @see org.eclipse.jst.jsf.context.symbol.IMapTypeDescriptor
- * @generated
- */
- EClass getIMapTypeDescriptor();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jst.jsf.context.symbol.IMapTypeDescriptor#getMapSource <em>Map Source</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Map Source</em>'.
- * @see org.eclipse.jst.jsf.context.symbol.IMapTypeDescriptor#getMapSource()
- * @see #getIMapTypeDescriptor()
- * @generated
- */
- EAttribute getIMapTypeDescriptor_MapSource();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jst.jsf.context.symbol.IMapTypeDescriptor#isImmutable <em>Immutable</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Immutable</em>'.
- * @see org.eclipse.jst.jsf.context.symbol.IMapTypeDescriptor#isImmutable()
- * @see #getIMapTypeDescriptor()
- * @generated
- */
- EAttribute getIMapTypeDescriptor_Immutable();
-
- /**
- * Returns the meta object for class '{@link org.eclipse.jst.jsf.context.symbol.IMethodSymbol <em>IMethod Symbol</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for class '<em>IMethod Symbol</em>'.
- * @see org.eclipse.jst.jsf.context.symbol.IMethodSymbol
- * @generated
- */
- EClass getIMethodSymbol();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jst.jsf.context.symbol.IMethodSymbol#getSignature <em>Signature</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Signature</em>'.
- * @see org.eclipse.jst.jsf.context.symbol.IMethodSymbol#getSignature()
- * @see #getIMethodSymbol()
- * @generated
- */
- EAttribute getIMethodSymbol_Signature();
-
- /**
- * Returns the meta object for class '{@link org.eclipse.jst.jsf.context.symbol.IObjectSymbol <em>IObject Symbol</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for class '<em>IObject Symbol</em>'.
- * @see org.eclipse.jst.jsf.context.symbol.IObjectSymbol
- * @generated
- */
- EClass getIObjectSymbol();
-
- /**
- * Returns the meta object for the reference '{@link org.eclipse.jst.jsf.context.symbol.IObjectSymbol#getTypeDescriptor <em>Type Descriptor</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the reference '<em>Type Descriptor</em>'.
- * @see org.eclipse.jst.jsf.context.symbol.IObjectSymbol#getTypeDescriptor()
- * @see #getIObjectSymbol()
- * @generated
- */
- EReference getIObjectSymbol_TypeDescriptor();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jst.jsf.context.symbol.IObjectSymbol#isReadable <em>Readable</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Readable</em>'.
- * @see org.eclipse.jst.jsf.context.symbol.IObjectSymbol#isReadable()
- * @see #getIObjectSymbol()
- * @generated
- */
- EAttribute getIObjectSymbol_Readable();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jst.jsf.context.symbol.IObjectSymbol#isWritable <em>Writable</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Writable</em>'.
- * @see org.eclipse.jst.jsf.context.symbol.IObjectSymbol#isWritable()
- * @see #getIObjectSymbol()
- * @generated
- */
- EAttribute getIObjectSymbol_Writable();
-
- /**
- * Returns the meta object for class '{@link org.eclipse.jst.jsf.context.symbol.IBoundedTypeDescriptor <em>IBounded Type Descriptor</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for class '<em>IBounded Type Descriptor</em>'.
- * @see org.eclipse.jst.jsf.context.symbol.IBoundedTypeDescriptor
- * @generated
- */
- EClass getIBoundedTypeDescriptor();
-
- /**
- * Returns the meta object for class '{@link org.eclipse.jst.jsf.context.symbol.IBoundedMapTypeDescriptor <em>IBounded Map Type Descriptor</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for class '<em>IBounded Map Type Descriptor</em>'.
- * @see org.eclipse.jst.jsf.context.symbol.IBoundedMapTypeDescriptor
- * @generated
- */
- EClass getIBoundedMapTypeDescriptor();
-
- /**
- * Returns the meta object for class '{@link org.eclipse.jst.jsf.context.symbol.IBoundedJavaTypeDescriptor <em>IBounded Java Type Descriptor</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for class '<em>IBounded Java Type Descriptor</em>'.
- * @see org.eclipse.jst.jsf.context.symbol.IBoundedJavaTypeDescriptor
- * @generated
- */
- EClass getIBoundedJavaTypeDescriptor();
-
- /**
- * Returns the meta object for class '{@link org.eclipse.jst.jsf.context.symbol.IListTypeDescriptor <em>IList Type Descriptor</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for class '<em>IList Type Descriptor</em>'.
- * @see org.eclipse.jst.jsf.context.symbol.IListTypeDescriptor
- * @generated
- */
- EClass getIListTypeDescriptor();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jst.jsf.context.symbol.IListTypeDescriptor#getListSource <em>List Source</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>List Source</em>'.
- * @see org.eclipse.jst.jsf.context.symbol.IListTypeDescriptor#getListSource()
- * @see #getIListTypeDescriptor()
- * @generated
- */
- EAttribute getIListTypeDescriptor_ListSource();
-
- /**
- * Returns the meta object for class '{@link org.eclipse.jst.jsf.context.symbol.IBoundedListTypeDescriptor <em>IBounded List Type Descriptor</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for class '<em>IBounded List Type Descriptor</em>'.
- * @see org.eclipse.jst.jsf.context.symbol.IBoundedListTypeDescriptor
- * @generated
- */
- EClass getIBoundedListTypeDescriptor();
-
- /**
- * Returns the meta object for enum '{@link org.eclipse.jst.jsf.context.symbol.ERuntimeSource <em>ERuntime Source</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for enum '<em>ERuntime Source</em>'.
- * @see org.eclipse.jst.jsf.context.symbol.ERuntimeSource
- * @generated
- */
- EEnum getERuntimeSource();
-
- /**
- * Returns the meta object for data type '{@link org.eclipse.jdt.core.IType <em>IType</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for data type '<em>IType</em>'.
- * @see org.eclipse.jdt.core.IType
- * @model instanceClass="org.eclipse.jdt.core.IType"
- * @generated
- */
- EDataType getIType();
-
- /**
- * Returns the meta object for data type '{@link org.eclipse.jdt.core.IJavaElement <em>IJava Element</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for data type '<em>IJava Element</em>'.
- * @see org.eclipse.jdt.core.IJavaElement
- * @model instanceClass="org.eclipse.jdt.core.IJavaElement"
- * @generated
- */
- EDataType getIJavaElement();
-
- /**
- * Returns the meta object for data type '{@link org.eclipse.jst.jsf.common.internal.types.ValueType <em>Value Type</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for data type '<em>Value Type</em>'.
- * @see org.eclipse.jst.jsf.common.internal.types.ValueType
- * @model instanceClass="org.eclipse.jst.jsf.common.internal.types.ValueType"
- * @generated
- */
- EDataType getValueType();
-
- /**
- * 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
- */
- SymbolFactory getSymbolFactory();
-
- /**
- * <!-- 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
- */
- @SuppressWarnings("hiding")
- interface Literals {
- /**
- * The meta object literal for the '{@link org.eclipse.jst.jsf.context.symbol.internal.impl.IBeanInstanceSymbolImpl <em>IBean Instance Symbol</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.jsf.context.symbol.internal.impl.IBeanInstanceSymbolImpl
- * @see org.eclipse.jst.jsf.context.symbol.internal.impl.SymbolPackageImpl#getIBeanInstanceSymbol()
- * @generated
- */
- EClass IBEAN_INSTANCE_SYMBOL = eINSTANCE.getIBeanInstanceSymbol();
-
- /**
- * The meta object literal for the '<em><b>Properties</b></em>' reference list feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EReference IBEAN_INSTANCE_SYMBOL__PROPERTIES = eINSTANCE.getIBeanInstanceSymbol_Properties();
-
- /**
- * The meta object literal for the '<em><b>Methods</b></em>' reference list feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EReference IBEAN_INSTANCE_SYMBOL__METHODS = eINSTANCE.getIBeanInstanceSymbol_Methods();
-
- /**
- * The meta object literal for the '{@link org.eclipse.jst.jsf.context.symbol.internal.impl.IBeanPropertySymbolImpl <em>IBean Property Symbol</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.jsf.context.symbol.internal.impl.IBeanPropertySymbolImpl
- * @see org.eclipse.jst.jsf.context.symbol.internal.impl.SymbolPackageImpl#getIBeanPropertySymbol()
- * @generated
- */
- EClass IBEAN_PROPERTY_SYMBOL = eINSTANCE.getIBeanPropertySymbol();
-
- /**
- * The meta object literal for the '<em><b>Owner</b></em>' reference feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EReference IBEAN_PROPERTY_SYMBOL__OWNER = eINSTANCE.getIBeanPropertySymbol_Owner();
-
- /**
- * The meta object literal for the '{@link org.eclipse.jst.jsf.context.symbol.internal.impl.IInstanceSymbolImpl <em>IInstance Symbol</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.jsf.context.symbol.internal.impl.IInstanceSymbolImpl
- * @see org.eclipse.jst.jsf.context.symbol.internal.impl.SymbolPackageImpl#getIInstanceSymbol()
- * @generated
- */
- EClass IINSTANCE_SYMBOL = eINSTANCE.getIInstanceSymbol();
-
- /**
- * The meta object literal for the '<em><b>Type Resolved</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EAttribute IINSTANCE_SYMBOL__TYPE_RESOLVED = eINSTANCE.getIInstanceSymbol_TypeResolved();
-
- /**
- * The meta object literal for the '<em><b>Runtime Source</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EAttribute IINSTANCE_SYMBOL__RUNTIME_SOURCE = eINSTANCE.getIInstanceSymbol_RuntimeSource();
-
- /**
- * The meta object literal for the '{@link org.eclipse.jst.jsf.context.symbol.internal.impl.IJavaSymbolImpl <em>IJava Symbol</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.jsf.context.symbol.internal.impl.IJavaSymbolImpl
- * @see org.eclipse.jst.jsf.context.symbol.internal.impl.SymbolPackageImpl#getIJavaSymbol()
- * @generated
- */
- EClass IJAVA_SYMBOL = eINSTANCE.getIJavaSymbol();
-
- /**
- * The meta object literal for the '<em><b>Java Element</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EAttribute IJAVA_SYMBOL__JAVA_ELEMENT = eINSTANCE.getIJavaSymbol_JavaElement();
-
- /**
- * The meta object literal for the '{@link org.eclipse.jst.jsf.context.symbol.ISymbol <em>ISymbol</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.jsf.context.symbol.ISymbol
- * @see org.eclipse.jst.jsf.context.symbol.internal.impl.SymbolPackageImpl#getISymbol()
- * @generated
- */
- EClass ISYMBOL = eINSTANCE.getISymbol();
-
- /**
- * The meta object literal for the '<em><b>Name</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EAttribute ISYMBOL__NAME = eINSTANCE.getISymbol_Name();
-
- /**
- * The meta object literal for the '{@link org.eclipse.jst.jsf.context.symbol.internal.impl.ITypeDescriptorImpl <em>IType Descriptor</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.jsf.context.symbol.internal.impl.ITypeDescriptorImpl
- * @see org.eclipse.jst.jsf.context.symbol.internal.impl.SymbolPackageImpl#getITypeDescriptor()
- * @generated
- */
- EClass ITYPE_DESCRIPTOR = eINSTANCE.getITypeDescriptor();
-
- /**
- * The meta object literal for the '<em><b>Properties</b></em>' reference list feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EReference ITYPE_DESCRIPTOR__PROPERTIES = eINSTANCE.getITypeDescriptor_Properties();
-
- /**
- * The meta object literal for the '<em><b>Type Signature</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EAttribute ITYPE_DESCRIPTOR__TYPE_SIGNATURE = eINSTANCE.getITypeDescriptor_TypeSignature();
-
- /**
- * The meta object literal for the '<em><b>Super Type Signatures</b></em>' attribute list feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EAttribute ITYPE_DESCRIPTOR__SUPER_TYPE_SIGNATURES = eINSTANCE.getITypeDescriptor_SuperTypeSignatures();
-
- /**
- * The meta object literal for the '<em><b>Interface Type Signatures</b></em>' attribute list feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EAttribute ITYPE_DESCRIPTOR__INTERFACE_TYPE_SIGNATURES = eINSTANCE.getITypeDescriptor_InterfaceTypeSignatures();
-
- /**
- * The meta object literal for the '<em><b>Type Signature Delegate</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EAttribute ITYPE_DESCRIPTOR__TYPE_SIGNATURE_DELEGATE = eINSTANCE.getITypeDescriptor_TypeSignatureDelegate();
-
- /**
- * The meta object literal for the '<em><b>Methods</b></em>' reference list feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EReference ITYPE_DESCRIPTOR__METHODS = eINSTANCE.getITypeDescriptor_Methods();
-
- /**
- * The meta object literal for the '<em><b>Type Parameter Signatures</b></em>' attribute list feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EAttribute ITYPE_DESCRIPTOR__TYPE_PARAMETER_SIGNATURES = eINSTANCE.getITypeDescriptor_TypeParameterSignatures();
-
- /**
- * The meta object literal for the '<em><b>Jdt Context</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EAttribute ITYPE_DESCRIPTOR__JDT_CONTEXT = eINSTANCE.getITypeDescriptor_JdtContext();
-
- /**
- * The meta object literal for the '<em><b>Enum Type</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EAttribute ITYPE_DESCRIPTOR__ENUM_TYPE = eINSTANCE.getITypeDescriptor_EnumType();
-
- /**
- * The meta object literal for the '{@link org.eclipse.jst.jsf.context.symbol.IDescribedInDetail <em>IDescribed In Detail</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.jsf.context.symbol.IDescribedInDetail
- * @see org.eclipse.jst.jsf.context.symbol.internal.impl.SymbolPackageImpl#getIDescribedInDetail()
- * @generated
- */
- EClass IDESCRIBED_IN_DETAIL = eINSTANCE.getIDescribedInDetail();
-
- /**
- * The meta object literal for the '{@link org.eclipse.jst.jsf.context.symbol.internal.impl.IJavaTypeDescriptor2Impl <em>IJava Type Descriptor2</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.jsf.context.symbol.internal.impl.IJavaTypeDescriptor2Impl
- * @see org.eclipse.jst.jsf.context.symbol.internal.impl.SymbolPackageImpl#getIJavaTypeDescriptor2()
- * @generated
- */
- EClass IJAVA_TYPE_DESCRIPTOR2 = eINSTANCE.getIJavaTypeDescriptor2();
-
- /**
- * The meta object literal for the '<em><b>Type</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EAttribute IJAVA_TYPE_DESCRIPTOR2__TYPE = eINSTANCE.getIJavaTypeDescriptor2_Type();
-
- /**
- * The meta object literal for the '<em><b>Bean Properties</b></em>' reference list feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EReference IJAVA_TYPE_DESCRIPTOR2__BEAN_PROPERTIES = eINSTANCE.getIJavaTypeDescriptor2_BeanProperties();
-
- /**
- * The meta object literal for the '<em><b>Bean Methods</b></em>' reference list feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EReference IJAVA_TYPE_DESCRIPTOR2__BEAN_METHODS = eINSTANCE.getIJavaTypeDescriptor2_BeanMethods();
-
- /**
- * The meta object literal for the '<em><b>Array Count</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EAttribute IJAVA_TYPE_DESCRIPTOR2__ARRAY_COUNT = eINSTANCE.getIJavaTypeDescriptor2_ArrayCount();
-
- /**
- * The meta object literal for the '{@link org.eclipse.jst.jsf.context.symbol.internal.impl.IBeanMethodSymbolImpl <em>IBean Method Symbol</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.jsf.context.symbol.internal.impl.IBeanMethodSymbolImpl
- * @see org.eclipse.jst.jsf.context.symbol.internal.impl.SymbolPackageImpl#getIBeanMethodSymbol()
- * @generated
- */
- EClass IBEAN_METHOD_SYMBOL = eINSTANCE.getIBeanMethodSymbol();
-
- /**
- * The meta object literal for the '<em><b>Owner</b></em>' reference feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EReference IBEAN_METHOD_SYMBOL__OWNER = eINSTANCE.getIBeanMethodSymbol_Owner();
-
- /**
- * The meta object literal for the '{@link org.eclipse.jst.jsf.context.symbol.internal.impl.IComponentSymbolImpl <em>IComponent Symbol</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.jsf.context.symbol.internal.impl.IComponentSymbolImpl
- * @see org.eclipse.jst.jsf.context.symbol.internal.impl.SymbolPackageImpl#getIComponentSymbol()
- * @generated
- */
- EClass ICOMPONENT_SYMBOL = eINSTANCE.getIComponentSymbol();
-
- /**
- * The meta object literal for the '{@link org.eclipse.jst.jsf.context.symbol.internal.impl.IPropertySymbolImpl <em>IProperty Symbol</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.jsf.context.symbol.internal.impl.IPropertySymbolImpl
- * @see org.eclipse.jst.jsf.context.symbol.internal.impl.SymbolPackageImpl#getIPropertySymbol()
- * @generated
- */
- EClass IPROPERTY_SYMBOL = eINSTANCE.getIPropertySymbol();
-
- /**
- * The meta object literal for the '<em><b>Intermediate</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EAttribute IPROPERTY_SYMBOL__INTERMEDIATE = eINSTANCE.getIPropertySymbol_Intermediate();
-
- /**
- * The meta object literal for the '{@link org.eclipse.jst.jsf.context.symbol.internal.impl.IMapTypeDescriptorImpl <em>IMap Type Descriptor</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.jsf.context.symbol.internal.impl.IMapTypeDescriptorImpl
- * @see org.eclipse.jst.jsf.context.symbol.internal.impl.SymbolPackageImpl#getIMapTypeDescriptor()
- * @generated
- */
- EClass IMAP_TYPE_DESCRIPTOR = eINSTANCE.getIMapTypeDescriptor();
-
- /**
- * The meta object literal for the '<em><b>Map Source</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EAttribute IMAP_TYPE_DESCRIPTOR__MAP_SOURCE = eINSTANCE.getIMapTypeDescriptor_MapSource();
-
- /**
- * The meta object literal for the '<em><b>Immutable</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EAttribute IMAP_TYPE_DESCRIPTOR__IMMUTABLE = eINSTANCE.getIMapTypeDescriptor_Immutable();
-
- /**
- * The meta object literal for the '{@link org.eclipse.jst.jsf.context.symbol.internal.impl.IMethodSymbolImpl <em>IMethod Symbol</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.jsf.context.symbol.internal.impl.IMethodSymbolImpl
- * @see org.eclipse.jst.jsf.context.symbol.internal.impl.SymbolPackageImpl#getIMethodSymbol()
- * @generated
- */
- EClass IMETHOD_SYMBOL = eINSTANCE.getIMethodSymbol();
-
- /**
- * The meta object literal for the '<em><b>Signature</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EAttribute IMETHOD_SYMBOL__SIGNATURE = eINSTANCE.getIMethodSymbol_Signature();
-
- /**
- * The meta object literal for the '{@link org.eclipse.jst.jsf.context.symbol.IObjectSymbol <em>IObject Symbol</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.jsf.context.symbol.IObjectSymbol
- * @see org.eclipse.jst.jsf.context.symbol.internal.impl.SymbolPackageImpl#getIObjectSymbol()
- * @generated
- */
- EClass IOBJECT_SYMBOL = eINSTANCE.getIObjectSymbol();
-
- /**
- * The meta object literal for the '<em><b>Type Descriptor</b></em>' reference feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EReference IOBJECT_SYMBOL__TYPE_DESCRIPTOR = eINSTANCE.getIObjectSymbol_TypeDescriptor();
-
- /**
- * The meta object literal for the '<em><b>Readable</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EAttribute IOBJECT_SYMBOL__READABLE = eINSTANCE.getIObjectSymbol_Readable();
-
- /**
- * The meta object literal for the '<em><b>Writable</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EAttribute IOBJECT_SYMBOL__WRITABLE = eINSTANCE.getIObjectSymbol_Writable();
-
- /**
- * The meta object literal for the '{@link org.eclipse.jst.jsf.context.symbol.IBoundedTypeDescriptor <em>IBounded Type Descriptor</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.jsf.context.symbol.IBoundedTypeDescriptor
- * @see org.eclipse.jst.jsf.context.symbol.internal.impl.SymbolPackageImpl#getIBoundedTypeDescriptor()
- * @generated
- */
- EClass IBOUNDED_TYPE_DESCRIPTOR = eINSTANCE.getIBoundedTypeDescriptor();
-
- /**
- * The meta object literal for the '{@link org.eclipse.jst.jsf.context.symbol.internal.impl.IBoundedMapTypeDescriptorImpl <em>IBounded Map Type Descriptor</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.jsf.context.symbol.internal.impl.IBoundedMapTypeDescriptorImpl
- * @see org.eclipse.jst.jsf.context.symbol.internal.impl.SymbolPackageImpl#getIBoundedMapTypeDescriptor()
- * @generated
- */
- EClass IBOUNDED_MAP_TYPE_DESCRIPTOR = eINSTANCE.getIBoundedMapTypeDescriptor();
-
- /**
- * The meta object literal for the '{@link org.eclipse.jst.jsf.context.symbol.internal.impl.IBoundedJavaTypeDescriptorImpl <em>IBounded Java Type Descriptor</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.jsf.context.symbol.internal.impl.IBoundedJavaTypeDescriptorImpl
- * @see org.eclipse.jst.jsf.context.symbol.internal.impl.SymbolPackageImpl#getIBoundedJavaTypeDescriptor()
- * @generated
- */
- EClass IBOUNDED_JAVA_TYPE_DESCRIPTOR = eINSTANCE.getIBoundedJavaTypeDescriptor();
-
- /**
- * The meta object literal for the '{@link org.eclipse.jst.jsf.context.symbol.internal.impl.IListTypeDescriptorImpl <em>IList Type Descriptor</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.jsf.context.symbol.internal.impl.IListTypeDescriptorImpl
- * @see org.eclipse.jst.jsf.context.symbol.internal.impl.SymbolPackageImpl#getIListTypeDescriptor()
- * @generated
- */
- EClass ILIST_TYPE_DESCRIPTOR = eINSTANCE.getIListTypeDescriptor();
-
- /**
- * The meta object literal for the '<em><b>List Source</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EAttribute ILIST_TYPE_DESCRIPTOR__LIST_SOURCE = eINSTANCE.getIListTypeDescriptor_ListSource();
-
- /**
- * The meta object literal for the '{@link org.eclipse.jst.jsf.context.symbol.internal.impl.IBoundedListTypeDescriptorImpl <em>IBounded List Type Descriptor</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.jsf.context.symbol.internal.impl.IBoundedListTypeDescriptorImpl
- * @see org.eclipse.jst.jsf.context.symbol.internal.impl.SymbolPackageImpl#getIBoundedListTypeDescriptor()
- * @generated
- */
- EClass IBOUNDED_LIST_TYPE_DESCRIPTOR = eINSTANCE.getIBoundedListTypeDescriptor();
-
- /**
- * The meta object literal for the '{@link org.eclipse.jst.jsf.context.symbol.ERuntimeSource <em>ERuntime Source</em>}' enum.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.jsf.context.symbol.ERuntimeSource
- * @see org.eclipse.jst.jsf.context.symbol.internal.impl.SymbolPackageImpl#getERuntimeSource()
- * @generated
- */
- EEnum ERUNTIME_SOURCE = eINSTANCE.getERuntimeSource();
-
- /**
- * The meta object literal for the '<em>IType</em>' data type.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jdt.core.IType
- * @see org.eclipse.jst.jsf.context.symbol.internal.impl.SymbolPackageImpl#getIType()
- * @generated
- */
- EDataType ITYPE = eINSTANCE.getIType();
-
- /**
- * The meta object literal for the '<em>IJava Element</em>' data type.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jdt.core.IJavaElement
- * @see org.eclipse.jst.jsf.context.symbol.internal.impl.SymbolPackageImpl#getIJavaElement()
- * @generated
- */
- EDataType IJAVA_ELEMENT = eINSTANCE.getIJavaElement();
-
- /**
- * The meta object literal for the '<em>Value Type</em>' data type.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.jsf.common.internal.types.ValueType
- * @see org.eclipse.jst.jsf.context.symbol.internal.impl.SymbolPackageImpl#getValueType()
- * @generated
- */
- EDataType VALUE_TYPE = eINSTANCE.getValueType();
-
- }
-
-} //SymbolPackage
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/impl/IBeanInstanceSymbolImpl.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/impl/IBeanInstanceSymbolImpl.java
deleted file mode 100644
index 4124126..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/impl/IBeanInstanceSymbolImpl.java
+++ /dev/null
@@ -1,248 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Oracle 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:
- * Cameron Bateman/Oracle - initial API and implementation
- *
- ********************************************************************************/
-package org.eclipse.jst.jsf.context.symbol.internal.impl;
-
-import java.util.HashMap;
-
-import org.eclipse.emf.common.util.BasicEList;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.jst.jsf.common.internal.types.TypeConstants;
-import org.eclipse.jst.jsf.context.symbol.IBeanInstanceSymbol;
-import org.eclipse.jst.jsf.context.symbol.IBoundedListTypeDescriptor;
-import org.eclipse.jst.jsf.context.symbol.IBoundedMapTypeDescriptor;
-import org.eclipse.jst.jsf.context.symbol.IJavaTypeDescriptor2;
-import org.eclipse.jst.jsf.context.symbol.ISymbol;
-import org.eclipse.jst.jsf.context.symbol.ITypeDescriptor;
-import org.eclipse.jst.jsf.context.symbol.SymbolFactory;
-import org.eclipse.jst.jsf.context.symbol.SymbolPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>IBean Instance Symbol</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- * <li>{@link org.eclipse.jst.jsf.context.symbol.internal.impl.IBeanInstanceSymbolImpl#getProperties <em>Properties</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.context.symbol.internal.impl.IBeanInstanceSymbolImpl#getMethods <em>Methods</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class IBeanInstanceSymbolImpl extends IInstanceSymbolImpl implements IBeanInstanceSymbol {
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @SuppressWarnings("hiding")
- public static final String copyright = "Copyright 2006 Oracle"; //$NON-NLS-1$
-
- /**
- * A detailed description (human readable) about this instance symbol
- */
- protected String _detailedDescription = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected IBeanInstanceSymbolImpl() {
- super();
- }
-
- /**
- * <!-- begin-user-doc -->
- * @return the EClass
- * <!-- end-user-doc -->
- * @generated
- */
- protected EClass eStaticClass() {
- return SymbolPackage.Literals.IBEAN_INSTANCE_SYMBOL;
- }
-
- /**
- * <!-- begin-user-doc -->
- * @return the list of bean properties
- * <!-- end-user-doc -->
- * @generated NOT
- */
- public EList getProperties()
- {
- return getJavaTypeDescriptor().getBeanProperties();
- }
-
- /**
- * <!-- begin-user-doc -->
- * @return the list of methods
- * <!-- end-user-doc -->
- * @generated NOT
- */
- public EList getMethods() {
- return getJavaTypeDescriptor().getBeanMethods();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated NOT
- */
- public IJavaTypeDescriptor2 getJavaTypeDescriptor() {
- return (IJavaTypeDescriptor2) getTypeDescriptor();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated NOT
- */
- public void setJavaTypeDescriptor(IJavaTypeDescriptor2 newTypeDescriptor) {
- setTypeDescriptor(newTypeDescriptor);
- }
-
- /**
- * <!-- begin-user-doc -->
- * @param featureID
- * @param resolve
- * @param coreType
- * @return the object related to featureID
- * <!-- end-user-doc -->
- * @generated
- */
- public Object eGet(int featureID, boolean resolve, boolean coreType) {
- switch (featureID) {
- case SymbolPackage.IBEAN_INSTANCE_SYMBOL__PROPERTIES:
- return getProperties();
- case SymbolPackage.IBEAN_INSTANCE_SYMBOL__METHODS:
- return getMethods();
- }
- return super.eGet(featureID, resolve, coreType);
- }
-
- /**
- * <!-- begin-user-doc -->
- * @param featureID
- * @return whether the corresponding feature is set
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean eIsSet(int featureID) {
- switch (featureID) {
- case SymbolPackage.IBEAN_INSTANCE_SYMBOL__PROPERTIES:
- return !getProperties().isEmpty();
- case SymbolPackage.IBEAN_INSTANCE_SYMBOL__METHODS:
- return !getMethods().isEmpty();
- }
- return super.eIsSet(featureID);
- }
-
- public String getDetailedDescription()
- {
- return _detailedDescription;
- }
-
- public void setDetailedDescription(String detailedDescription)
- {
- this._detailedDescription = detailedDescription;
- }
-
- /**
- * @see org.eclipse.jst.jsf.context.symbol.internal.impl.IInstanceSymbolImpl#isTypeResolved()
- * @generated NOT
- */
- // @Override
- public boolean isTypeResolved()
- {
- return getJavaTypeDescriptor() != null;
- }
-
- /**
- * @see org.eclipse.jst.jsf.context.symbol.internal.impl.IInstanceSymbolImpl#setTypeDescriptor(org.eclipse.jst.jsf.context.symbol.ITypeDescriptor)
- * @generated NOT
- */
- public void setTypeDescriptor(ITypeDescriptor newTypeDescriptor)
- {
- if (newTypeDescriptor instanceof IJavaTypeDescriptor2)
- {
- super.setTypeDescriptor(newTypeDescriptor);
- }
- else
- {
- throw new IllegalArgumentException("Bean instance symbol requires a IJavaTypeDescriptor2"); //$NON-NLS-1$
- }
- }
-
- public boolean isReadable()
- {
- // beans always readable
- return true;
- }
-
- public boolean isWritable()
- {
- // beans not writable
- return false;
- }
-
- public void setReadable(boolean value) {
- // do nothing
- }
-
- public void setWritable(boolean value) {
- // do nothing
- }
-
- /*
- * @generated NOT
- */
- public ITypeDescriptor coerce(String typeSignature)
- {
- if (supportsCoercion(typeSignature))
- {
- if (TypeConstants.TYPE_MAP.equals(typeSignature))
- {
- IBoundedMapTypeDescriptor mapDesc =
- SymbolFactory.eINSTANCE.createIBoundedMapTypeDescriptor();
- // bean maps are generally writable
- mapDesc.setImmutable(true);
- mapDesc.setMapSource(new HashMap()); // give it an empty map
- return mapDesc;
- }
- else if (TypeConstants.TYPE_LIST.equals(typeSignature))
- {
- IBoundedListTypeDescriptor listDesc =
- SymbolFactory.eINSTANCE.createIBoundedListTypeDescriptor();
-
- // bean maps are generally writable
- listDesc.setListSource(new BasicEList()); // give it an empty list
- return listDesc;
- }
- }
-
- return null;
- }
-
- /** (non-Javadoc)
- * @see org.eclipse.jst.jsf.context.symbol.internal.impl.IPropertySymbolImpl#call(java.lang.String, org.eclipse.emf.common.util.EList, java.lang.String)
- *
- * @generated NOT
- */
- public ISymbol call(String methodName, EList methodArguments,
- String symbolName)
- {
- return Util.call(methodName, methodArguments, symbolName, getTypeDescriptor());
- }
-
-} //IBeanInstanceSymbolImpl
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/impl/IBeanMethodSymbolImpl.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/impl/IBeanMethodSymbolImpl.java
deleted file mode 100644
index 03606b4..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/impl/IBeanMethodSymbolImpl.java
+++ /dev/null
@@ -1,378 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Oracle 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:
- * Cameron Bateman/Oracle - initial API and implementation
- *
- ********************************************************************************/
-package org.eclipse.jst.jsf.context.symbol.internal.impl;
-
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.Signature;
-import org.eclipse.jst.jsf.context.symbol.IBeanMethodSymbol;
-import org.eclipse.jst.jsf.context.symbol.IJavaTypeDescriptor2;
-import org.eclipse.jst.jsf.context.symbol.IMethodSymbol;
-import org.eclipse.jst.jsf.context.symbol.ISymbol;
-import org.eclipse.jst.jsf.context.symbol.SymbolPackage;
-
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>IBean Method Symbol</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- * <li>{@link org.eclipse.jst.jsf.context.symbol.internal.impl.IBeanMethodSymbolImpl#getName <em>Name</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.context.symbol.internal.impl.IBeanMethodSymbolImpl#getSignature <em>Signature</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.context.symbol.internal.impl.IBeanMethodSymbolImpl#getOwner <em>Owner</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class IBeanMethodSymbolImpl extends EObjectImpl implements IBeanMethodSymbol {
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public static final String copyright = "Copyright 2006 Oracle"; //$NON-NLS-1$
-
- /**
- * The default value of the '{@link #getName() <em>Name</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getName()
- * @generated
- * @ordered
- */
- protected static final String NAME_EDEFAULT = null;
-
- /**
- * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getName()
- * @generated
- * @ordered
- */
- protected String name = NAME_EDEFAULT;
-
- /**
- * The default value of the '{@link #getSignature() <em>Signature</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getSignature()
- * @generated
- * @ordered
- */
- protected static final String SIGNATURE_EDEFAULT = null;
-
- /**
- * The cached value of the '{@link #getSignature() <em>Signature</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getSignature()
- * @generated
- * @ordered
- */
- protected String signature = SIGNATURE_EDEFAULT;
-
- /**
- * The cached value of the '{@link #getOwner() <em>Owner</em>}' reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getOwner()
- * @generated
- * @ordered
- */
- protected IJavaTypeDescriptor2 owner = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected IBeanMethodSymbolImpl() {
- super();
- }
-
- /**
- * <!-- begin-user-doc -->
- * @return the static eclass
- * <!-- end-user-doc -->
- * @generated
- */
- protected EClass eStaticClass() {
- return SymbolPackage.Literals.IBEAN_METHOD_SYMBOL;
- }
-
- /**
- * <!-- begin-user-doc -->
- * @return the name of the method symbol
- * <!-- end-user-doc -->
- * @generated
- */
- public String getName() {
- return name;
- }
-
- /**
- * <!-- begin-user-doc -->
- * @param newName
- * <!-- end-user-doc -->
- * @generated
- */
- public void setName(String newName) {
- String oldName = name;
- name = newName;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, SymbolPackage.IBEAN_METHOD_SYMBOL__NAME, oldName, name));
- }
-
- /**
- * <!-- begin-user-doc -->
- * @return the signature in JVM/JDT form
- * <!-- end-user-doc -->
- * @generated
- */
- public String getSignature() {
- return signature;
- }
-
- /**
- * <!-- begin-user-doc -->
- * @param newSignature
- * <!-- end-user-doc -->
- * @generated
- */
- public void setSignature(String newSignature) {
- String oldSignature = signature;
- signature = newSignature;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, SymbolPackage.IBEAN_METHOD_SYMBOL__SIGNATURE, oldSignature, signature));
- }
-
- /**
- * <!-- begin-user-doc -->
- * @return the java type descriptor that owns this symbol
- * <!-- end-user-doc -->
- * @generated
- */
- public IJavaTypeDescriptor2 getOwner() {
- if (owner != null && owner.eIsProxy()) {
- InternalEObject oldOwner = (InternalEObject)owner;
- owner = (IJavaTypeDescriptor2)eResolveProxy(oldOwner);
- if (owner != oldOwner) {
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.RESOLVE, SymbolPackage.IBEAN_METHOD_SYMBOL__OWNER, oldOwner, owner));
- }
- }
- return owner;
- }
-
- /**
- * <!-- begin-user-doc -->
- * @return the java type descriptor that derives this symbol
- * <!-- end-user-doc -->
- * @generated
- */
- public IJavaTypeDescriptor2 basicGetOwner() {
- return owner;
- }
-
- /**
- * <!-- begin-user-doc -->
- * @param newOwner
- * <!-- end-user-doc -->
- * @generated
- */
- public void setOwner(IJavaTypeDescriptor2 newOwner) {
- IJavaTypeDescriptor2 oldOwner = owner;
- owner = newOwner;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, SymbolPackage.IBEAN_METHOD_SYMBOL__OWNER, oldOwner, owner));
- }
-
- /**
- * <!-- begin-user-doc -->
- * @param featureID
- * @param resolve
- * @param coreType
- * @return the feature object for featureID
- * <!-- end-user-doc -->
- * @generated
- */
- public Object eGet(int featureID, boolean resolve, boolean coreType) {
- switch (featureID) {
- case SymbolPackage.IBEAN_METHOD_SYMBOL__NAME:
- return getName();
- case SymbolPackage.IBEAN_METHOD_SYMBOL__SIGNATURE:
- return getSignature();
- case SymbolPackage.IBEAN_METHOD_SYMBOL__OWNER:
- if (resolve) return getOwner();
- return basicGetOwner();
- }
- return super.eGet(featureID, resolve, coreType);
- }
-
- /**
- * <!-- begin-user-doc -->
- * @param featureID
- * @param newValue
- * <!-- end-user-doc -->
- * @generated
- */
- public void eSet(int featureID, Object newValue) {
- switch (featureID) {
- case SymbolPackage.IBEAN_METHOD_SYMBOL__NAME:
- setName((String)newValue);
- return;
- case SymbolPackage.IBEAN_METHOD_SYMBOL__SIGNATURE:
- setSignature((String)newValue);
- return;
- case SymbolPackage.IBEAN_METHOD_SYMBOL__OWNER:
- setOwner((IJavaTypeDescriptor2)newValue);
- return;
- }
- super.eSet(featureID, newValue);
- }
-
- /**
- * <!-- begin-user-doc -->
- * @param featureID
- * <!-- end-user-doc -->
- * @generated
- */
- public void eUnset(int featureID) {
- switch (featureID) {
- case SymbolPackage.IBEAN_METHOD_SYMBOL__NAME:
- setName(NAME_EDEFAULT);
- return;
- case SymbolPackage.IBEAN_METHOD_SYMBOL__SIGNATURE:
- setSignature(SIGNATURE_EDEFAULT);
- return;
- case SymbolPackage.IBEAN_METHOD_SYMBOL__OWNER:
- setOwner((IJavaTypeDescriptor2)null);
- return;
- }
- super.eUnset(featureID);
- }
-
- /**
- * <!-- begin-user-doc -->
- * @param featureID
- * @return true if the feature has been set
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean eIsSet(int featureID) {
- switch (featureID) {
- case SymbolPackage.IBEAN_METHOD_SYMBOL__NAME:
- return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
- case SymbolPackage.IBEAN_METHOD_SYMBOL__SIGNATURE:
- return SIGNATURE_EDEFAULT == null ? signature != null : !SIGNATURE_EDEFAULT.equals(signature);
- case SymbolPackage.IBEAN_METHOD_SYMBOL__OWNER:
- return owner != null;
- }
- return super.eIsSet(featureID);
- }
-
- /**
- * <!-- begin-user-doc -->
- * @param derivedFeatureID
- * @param baseClass
- * @return the feature id
- * <!-- end-user-doc -->
- * @generated
- */
- public int eBaseStructuralFeatureID(int derivedFeatureID, Class baseClass) {
- if (baseClass == ISymbol.class) {
- switch (derivedFeatureID) {
- case SymbolPackage.IBEAN_METHOD_SYMBOL__NAME: return SymbolPackage.ISYMBOL__NAME;
- default: return -1;
- }
- }
- if (baseClass == IMethodSymbol.class) {
- switch (derivedFeatureID) {
- case SymbolPackage.IBEAN_METHOD_SYMBOL__SIGNATURE: return SymbolPackage.IMETHOD_SYMBOL__SIGNATURE;
- default: return -1;
- }
- }
- return super.eBaseStructuralFeatureID(derivedFeatureID, baseClass);
- }
-
- /**
- * <!-- begin-user-doc -->
- * @param baseFeatureID
- * @param baseClass
- * @return the feature id
- * <!-- end-user-doc -->
- * @generated
- */
- public int eDerivedStructuralFeatureID(int baseFeatureID, Class baseClass) {
- if (baseClass == ISymbol.class) {
- switch (baseFeatureID) {
- case SymbolPackage.ISYMBOL__NAME: return SymbolPackage.IBEAN_METHOD_SYMBOL__NAME;
- default: return -1;
- }
- }
- if (baseClass == IMethodSymbol.class) {
- switch (baseFeatureID) {
- case SymbolPackage.IMETHOD_SYMBOL__SIGNATURE: return SymbolPackage.IBEAN_METHOD_SYMBOL__SIGNATURE;
- default: return -1;
- }
- }
- return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass);
- }
-
- /**
- * <!-- begin-user-doc -->
- * @return the default string representation
- * <!-- end-user-doc -->
- * @generated
- */
- public String toString() {
- if (eIsProxy()) return super.toString();
-
- StringBuffer result = new StringBuffer(super.toString());
- result.append(" (name: "); //$NON-NLS-1$
- result.append(name);
- result.append(", signature: "); //$NON-NLS-1$
- result.append(signature);
- result.append(')');
- return result.toString();
- }
-
- public String getDetailedDescription() {
- StringBuffer descBuffer = new StringBuffer("<p><b>"); //$NON-NLS-1$
- descBuffer.append(Messages.getString("IBeanMethodSymbolImpl.DetailDesc")); //$NON-NLS-1$
- descBuffer.append("</b> "); //$NON-NLS-1$
- descBuffer.append(Signature.toString(signature, getName(), null, false, true)).append("</p>"); //$NON-NLS-1$
- IMethod method = JavaUtil.findCorrespondingMethod(this);
- if (method != null) {
- String javadoc = JavaUtil.getMethodJavadoc(method);
- if (javadoc != null) {
- descBuffer.append("<p>").append(javadoc).append("</p>"); //$NON-NLS-1$ //$NON-NLS-2$
- }
- }
- return descBuffer.toString();
- }
-
- public void setDetailedDescription(String detailedDescription) {
- throw new UnsupportedOperationException("Detailed Description is derived on property symbols"); //$NON-NLS-1$
- }
-
-
-} //IBeanMethodSymbolImpl
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/impl/IBeanPropertySymbolImpl.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/impl/IBeanPropertySymbolImpl.java
deleted file mode 100644
index be6a2aa..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/impl/IBeanPropertySymbolImpl.java
+++ /dev/null
@@ -1,354 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Oracle 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:
- * Cameron Bateman/Oracle - initial API and implementation
- *
- ********************************************************************************/
-package org.eclipse.jst.jsf.context.symbol.internal.impl;
-
-import java.util.HashMap;
-
-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.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.Signature;
-import org.eclipse.jst.jsf.common.internal.types.TypeConstants;
-import org.eclipse.jst.jsf.common.util.JDTBeanProperty;
-import org.eclipse.jst.jsf.context.symbol.IBeanPropertySymbol;
-import org.eclipse.jst.jsf.context.symbol.IBoundedListTypeDescriptor;
-import org.eclipse.jst.jsf.context.symbol.IBoundedMapTypeDescriptor;
-import org.eclipse.jst.jsf.context.symbol.IJavaTypeDescriptor2;
-import org.eclipse.jst.jsf.context.symbol.ISymbol;
-import org.eclipse.jst.jsf.context.symbol.ITypeDescriptor;
-import org.eclipse.jst.jsf.context.symbol.SymbolFactory;
-import org.eclipse.jst.jsf.context.symbol.SymbolPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>IBean Property Symbol</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- * <li>{@link org.eclipse.jst.jsf.context.symbol.internal.impl.IBeanPropertySymbolImpl#getOwner <em>Owner</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class IBeanPropertySymbolImpl extends IPropertySymbolImpl implements IBeanPropertySymbol {
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @SuppressWarnings("hiding")
- public static final String copyright = "Copyright 2006 Oracle"; //$NON-NLS-1$
-
-
- /**
- * The cached value of the '{@link #getOwner() <em>Owner</em>}' reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getOwner()
- * @generated
- * @ordered
- */
- protected IJavaTypeDescriptor2 owner = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected IBeanPropertySymbolImpl() {
- super();
- }
-
- /**
- * <!-- begin-user-doc -->
- * @return the static class
- * <!-- end-user-doc -->
- * @generated
- */
- protected EClass eStaticClass() {
- return SymbolPackage.Literals.IBEAN_PROPERTY_SYMBOL;
- }
-
- /**
- * <!-- begin-user-doc -->
- * @return the owner's type descriptor
- * <!-- end-user-doc -->
- * @generated
- */
- public IJavaTypeDescriptor2 getOwner() {
- if (owner != null && owner.eIsProxy()) {
- InternalEObject oldOwner = (InternalEObject)owner;
- owner = (IJavaTypeDescriptor2)eResolveProxy(oldOwner);
- if (owner != oldOwner) {
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.RESOLVE, SymbolPackage.IBEAN_PROPERTY_SYMBOL__OWNER, oldOwner, owner));
- }
- }
- return owner;
- }
-
- /**
- * <!-- begin-user-doc -->
- * @return the java type descriptor for this instance
- * <!-- end-user-doc -->
- * @generated
- */
- public IJavaTypeDescriptor2 basicGetOwner() {
- return owner;
- }
-
- /**
- * <!-- begin-user-doc -->
- * @param newOwner
- * <!-- end-user-doc -->
- * @generated
- */
- public void setOwner(IJavaTypeDescriptor2 newOwner) {
- IJavaTypeDescriptor2 oldOwner = owner;
- owner = newOwner;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, SymbolPackage.IBEAN_PROPERTY_SYMBOL__OWNER, oldOwner, owner));
- }
-
- /**
- * <!-- begin-user-doc -->
- * @param featureID
- * @param resolve
- * @param coreType
- * @return the value for the featureID
- * <!-- end-user-doc -->
- * @generated
- */
- public Object eGet(int featureID, boolean resolve, boolean coreType) {
- switch (featureID) {
- case SymbolPackage.IBEAN_PROPERTY_SYMBOL__OWNER:
- if (resolve) return getOwner();
- return basicGetOwner();
- }
- return super.eGet(featureID, resolve, coreType);
- }
-
- /**
- * <!-- begin-user-doc -->
- * @param featureID
- * @param newValue
- * <!-- end-user-doc -->
- * @generated
- */
- public void eSet(int featureID, Object newValue) {
- switch (featureID) {
- case SymbolPackage.IBEAN_PROPERTY_SYMBOL__OWNER:
- setOwner((IJavaTypeDescriptor2)newValue);
- return;
- }
- super.eSet(featureID, newValue);
- }
-
- /**
- * <!-- begin-user-doc -->
- * @param featureID
- * <!-- end-user-doc -->
- * @generated
- */
- public void eUnset(int featureID) {
- switch (featureID) {
- case SymbolPackage.IBEAN_PROPERTY_SYMBOL__OWNER:
- setOwner((IJavaTypeDescriptor2)null);
- return;
- }
- super.eUnset(featureID);
- }
-
- /**
- * <!-- begin-user-doc -->
- * @param featureID
- * @return true if the feature is set
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean eIsSet(int featureID) {
- switch (featureID) {
- case SymbolPackage.IBEAN_PROPERTY_SYMBOL__OWNER:
- return owner != null;
- }
- return super.eIsSet(featureID);
- }
-
- public String getDetailedDescription()
- {
- return createDetailedDescription();
- }
-
- public void setDetailedDescription(String detailedDescription)
- {
- throw new UnsupportedOperationException("Detailed Description is derived on property symbols"); //$NON-NLS-1$
- }
-
- /**
- * @generated NOT
- */
- public ITypeDescriptor coerce(final String typeSignature)
- {
- // ensure that we have an erased version
- final String erasedTypeSignature = Signature.getTypeErasure(typeSignature);
-
- if (supportsCoercion(typeSignature))
- {
- if (TypeConstants.TYPE_MAP.equals(erasedTypeSignature))
- {
- IBoundedMapTypeDescriptor mapDesc =
- SymbolFactory.eINSTANCE.createIBoundedMapTypeDescriptor();
- // bean maps are generally writable
- mapDesc.setImmutable(true);
- mapDesc.setMapSource(new HashMap()); // give it an empty map
- return mapDesc;
- }
- else if (TypeConstants.TYPE_LIST.equals(erasedTypeSignature))
- {
- IBoundedListTypeDescriptor listDesc =
- SymbolFactory.eINSTANCE.createIBoundedListTypeDescriptor();
- listDesc.setJdtContext(deriveBestJdtContext());
-
- // bean maps are generally writable
- return listDesc;
- }
- }
-
- return null;
-
- }
-
- /**
- * @return the derived jdt element
- * @generated NOT
- */
- private IJavaElement deriveBestJdtContext()
- {
- IJavaElement contextElement = null;
- if (getTypeDescriptor() instanceof IJavaTypeDescriptor2)
- {
- contextElement =
- ((IJavaTypeDescriptor2)getTypeDescriptor()).getType();
- }
-
- if (contextElement == null)
- {
- contextElement = getTypeDescriptor().getJdtContext();
- }
-
- return contextElement;
- }
-
- /** (non-Javadoc)
- * @see org.eclipse.jst.jsf.context.symbol.internal.impl.IPropertySymbolImpl#call(java.lang.String, org.eclipse.emf.common.util.EList, java.lang.String)
- *
- * @generated NOT
- */
- public ISymbol call(String methodName, EList methodArguments,
- String symbolName)
- {
- return Util.call(methodName, methodArguments, symbolName, getTypeDescriptor());
- }
-
-
-// private List convertArgsToSignatures(List methodArgs)
-// {
-// List args = new ArrayList();
-//
-// for (final Iterator it = methodArgs.iterator(); it.hasNext();)
-// {
-// Object arg = it.next();
-// String className = arg.getClass().getName();
-// String resolvedName = Signature.createTypeSignature(className, true);
-// args.add(resolvedName);
-// }
-//
-// return args;
-// }
-
- /**
- * @generated NOT
- */
- public boolean supportsCoercion(String typeSignature) {
- // first check that our type descriptor even thinks it is
- // an instanceof this type
- if (getTypeDescriptor().instanceOf(typeSignature))
- {
- // for java bean instances, we need to minimally support
- // Map, List and Array to conform to the basic spec
- // for JSF EL
- if (TypeConstants.TYPE_MAP.equals(Signature.getTypeErasure(typeSignature)))
- {
- return true;
- }
- else if (TypeConstants.TYPE_LIST.equals(Signature.getTypeErasure(typeSignature)))
- {
- return true;
- }
- }
-
- // otherwise, not supported
- return false;
- }
-
- /**
- * @return the detail description
- * @generated NOT
- */
- private String createDetailedDescription()
- {
- StringBuffer additionalInfo = new StringBuffer("<p><b>"); //$NON-NLS-1$
- ITypeDescriptor typeDescriptor_ = getTypeDescriptor();
- if (typeDescriptor_ != null) {
- additionalInfo.append(Messages.getString("IBeanPropertySymbolImpl.Type")); //$NON-NLS-1$
- additionalInfo.append("</b>"); //$NON-NLS-1$
- additionalInfo.append(Signature.toString(typeDescriptor_.getTypeSignature()));
- }
- additionalInfo.append("</p>"); //$NON-NLS-1$
- additionalInfo.append("<p><b>"); //$NON-NLS-1$
-
- additionalInfo.append(Messages.getString("IBeanPropertySymbolImpl.Access")); //$NON-NLS-1$
- additionalInfo.append("</b>"); //$NON-NLS-1$
- if (isReadable() && isWritable()) {
- additionalInfo.append(Messages.getString("IBeanPropertySymbolImpl.read_write")); //$NON-NLS-1$
- } else if (isReadable()) {
- additionalInfo.append(Messages.getString("IBeanPropertySymbolImpl.readonly")); //$NON-NLS-1$
- } else if (isWritable()) {
- additionalInfo.append(Messages.getString("IBeanPropertySymbolImpl.writeonly")); //$NON-NLS-1$
- } else {
- additionalInfo.append(Messages.getString("IBeanPropertySymbolImpl.none")); //$NON-NLS-1$
- }
- additionalInfo.append("</p>"); //$NON-NLS-1$
- JDTBeanProperty property = JavaUtil.findCorrespondingJDTProperty(this);
- if (property != null) {
- String javaDoc = null;
- if (property.getGetter() != null) {
- javaDoc = JavaUtil.getMethodJavadoc(property.getGetter());
- }
- if (javaDoc == null && property.getSetter() != null) {
- javaDoc = JavaUtil.getMethodJavadoc(property.getSetter());
- }
- if (javaDoc != null) {
- additionalInfo.append("<p>").append(javaDoc).append("</p>"); //$NON-NLS-1$ //$NON-NLS-2$
- }
- }
-
- return additionalInfo.toString();
- }
-
-} //IBeanPropertySymbolImpl
-
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/impl/IBoundedJavaTypeDescriptorImpl.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/impl/IBoundedJavaTypeDescriptorImpl.java
deleted file mode 100644
index af1f404..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/impl/IBoundedJavaTypeDescriptorImpl.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: IBoundedJavaTypeDescriptorImpl.java,v 1.8 2007/10/01 04:29:44 cbateman Exp $
- */
-package org.eclipse.jst.jsf.context.symbol.internal.impl;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.jdt.core.Signature;
-import org.eclipse.jst.jsf.common.internal.types.TypeConstants;
-import org.eclipse.jst.jsf.context.symbol.IBoundedJavaTypeDescriptor;
-import org.eclipse.jst.jsf.context.symbol.IPropertySymbol;
-import org.eclipse.jst.jsf.context.symbol.ISymbol;
-import org.eclipse.jst.jsf.context.symbol.SymbolFactory;
-import org.eclipse.jst.jsf.context.symbol.SymbolPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>IBounded Java Type Descriptor</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * </p>
- *
- * @generated
- */
-public class IBoundedJavaTypeDescriptorImpl extends IJavaTypeDescriptor2Impl implements IBoundedJavaTypeDescriptor {
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @SuppressWarnings("hiding")
- public static final String copyright = "Copyright 2006 Oracle"; //$NON-NLS-1$
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected IBoundedJavaTypeDescriptorImpl() {
- super();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected EClass eStaticClass() {
- return SymbolPackage.Literals.IBOUNDED_JAVA_TYPE_DESCRIPTOR;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated NOT
- */
- public boolean isUnboundedForType(String typeSignature) {
- // TODO: for now, return true if the type is a resolved object
- // need to add support for template checking (Java5) and
- // decide what to do with unresolved (Q) type signatures
- return typeSignature != null
- && typeSignature.startsWith(Character.toString(Signature.C_RESOLVED));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated NOT
- */
- public ISymbol getUnboundedProperty(Object name, String typeSignature) {
- ISymbol retValue = null;
-
- if (isUnboundedForType(typeSignature))
- {
- IPropertySymbol propSymbol = SymbolFactory.eINSTANCE.createIPropertySymbol();
- // TODO: there is a possible problem here for non-string keyed maps
- propSymbol.setName(name.toString());
- propSymbol.setReadable(true);
- IBoundedJavaTypeDescriptor typeDesc =
- SymbolFactory.eINSTANCE.createIBoundedJavaTypeDescriptor();
-
- typeDesc.setTypeSignatureDelegate(TypeConstants.TYPE_JAVAOBJECT);
- propSymbol.setTypeDescriptor(typeDesc);
- retValue = propSymbol;
- }
-
- return retValue;
- }
-
- public ISymbol calculateSyntheticCall(String methodName, EList methodArgs,
- String symbolName)
- {
- return getUnboundedProperty(symbolName, TypeConstants.TYPE_JAVAOBJECT);
- }
-} //IBoundedJavaTypeDescriptorImpl
\ No newline at end of file
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/impl/IBoundedListTypeDescriptorImpl.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/impl/IBoundedListTypeDescriptorImpl.java
deleted file mode 100644
index e6cb34b..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/impl/IBoundedListTypeDescriptorImpl.java
+++ /dev/null
@@ -1,259 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: IBoundedListTypeDescriptorImpl.java,v 1.6 2007/10/01 04:29:44 cbateman Exp $
- */
-package org.eclipse.jst.jsf.context.symbol.internal.impl;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.core.Signature;
-import org.eclipse.jst.jsf.common.JSFCommonPlugin;
-import org.eclipse.jst.jsf.common.internal.types.TypeConstants;
-import org.eclipse.jst.jsf.common.util.JDTBeanIntrospector;
-import org.eclipse.jst.jsf.common.util.TypeUtil;
-import org.eclipse.jst.jsf.context.symbol.IBoundedListTypeDescriptor;
-import org.eclipse.jst.jsf.context.symbol.IJavaTypeDescriptor2;
-import org.eclipse.jst.jsf.context.symbol.IPropertySymbol;
-import org.eclipse.jst.jsf.context.symbol.ISymbol;
-import org.eclipse.jst.jsf.context.symbol.ITypeDescriptor;
-import org.eclipse.jst.jsf.context.symbol.SymbolFactory;
-import org.eclipse.jst.jsf.context.symbol.SymbolPackage;
-
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>IBounded List Type Descriptor</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * </p>
- *
- * @generated
- */
-public class IBoundedListTypeDescriptorImpl extends IListTypeDescriptorImpl implements IBoundedListTypeDescriptor {
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @SuppressWarnings("hiding")
- public static final String copyright = "Copyright 2006 Oracle"; //$NON-NLS-1$
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected IBoundedListTypeDescriptorImpl() {
- super();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected EClass eStaticClass() {
- return SymbolPackage.Literals.IBOUNDED_LIST_TYPE_DESCRIPTOR;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated NOT
- */
- public boolean isUnboundedForType(String typeSignature)
- {
- // type signature must be a boxed integer
- // TODO: at this level, do we need to deal with coercion to
- // other integer types? list.get() takes an integer...
- return typeSignature != null && TypeConstants.TYPE_BOXED_INTEGER.equals(typeSignature);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated NOT
- */
- public ISymbol getUnboundedProperty(Object name, String typeSignature) {
- ISymbol retValue = null;
-
- if (isUnboundedForType(typeSignature)
- && name instanceof Number)
- {
- // get integer value
- int offset = ((Number)name).intValue();
-
- // first see if we have it in our map source
- // TODO: retValue = getFromMap(name.toString());
-
- if (retValue == null)
- {
- IPropertySymbol propSymbol = SymbolFactory.eINSTANCE.createIPropertySymbol();
- // TODO: there is a possible problem here for non-string keyed maps
- propSymbol.setName(name.toString());
- propSymbol.setReadable(true);
- propSymbol.setTypeDescriptor(getBoundsTypeDescriptor(offset));
- retValue = propSymbol;
- }
- }
-
- return retValue;
- }
-
- /**
- * <!-- begin-user-doc -->
- * @param methodName
- * @param methodArguments
- * @param symbolName
- * @return a symbol representing the return value of the method
- * <!-- end-user-doc -->
- * @generated NOT
- */
- public ISymbol call(String methodName, EList methodArguments, String symbolName)
- {
- ISymbol result = null;
- final IType type = resolveType(getTypeSignature());
-
- if (type != null)
- {
- final JDTBeanIntrospector introspector =
- new JDTBeanIntrospector(type);
-
- final IMethod callMethod =
- matchMethod(methodName, methodArguments, introspector.getAllMethods());
-
- if (callMethod != null)
- {
- try
- {
- // resolve the method's return type; don't erase parameters
- final String retTypeSignature =
- TypeUtil.resolveTypeSignature
- (type, callMethod.getReturnType(), false) ;
-
- final IPropertySymbol propSymbol =
- SymbolFactory.eINSTANCE.createIPropertySymbol();
-
- // TODO: there is a possible problem here for non-string keyed maps
- propSymbol.setName(symbolName);
- propSymbol.setReadable(true);
- IJavaTypeDescriptor2 typeDesc =
- SymbolFactory.eINSTANCE.createIJavaTypeDescriptor2();
-
- typeDesc.setArrayCount(Signature.getArrayCount(retTypeSignature));
-
- // may be null
- typeDesc.setType(resolveType(retTypeSignature));
- typeDesc.setTypeSignatureDelegate(retTypeSignature);
- propSymbol.setTypeDescriptor(typeDesc);
- result = propSymbol;
- }
- catch (JavaModelException e)
- {
- JSFCommonPlugin.log(e);
- // fall-through and return null result
- }
- }
- }
-
- return result;
- }
-
- private IMethod matchMethod(String name, List methodArguments, IMethod[] allMethods)
- {
- final List argSigs = convertArgsToSignatures(methodArguments);
- IMethod matchedMethod = null;
-
- for (int i = 0; i < allMethods.length; i++)
- {
- final IMethod method = allMethods[i];
-
- // check for names and argument count match
- if (method.getParameterTypes().length == argSigs.size()
- && method.getElementName().equals(name))
- {
- String[] methods = method.getParameterTypes();
- // need to verify argument matches
- boolean isMatched = true;
- CHECK_ARGUMENTS: for (int j = 0; j < methods.length; j++)
- {
- if (!methods[j].equals(argSigs.get(j)))
- {
- // not a match
- isMatched = false;
- break CHECK_ARGUMENTS;
- }
- }
-
- if (isMatched)
- {
- return method;
- }
- }
- }
-
- return matchedMethod;
- }
-
- private List convertArgsToSignatures(List methodArgs)
- {
- List args = new ArrayList();
-
- for (final Iterator it = methodArgs.iterator(); it.hasNext();)
- {
- Object arg = it.next();
- String className = arg.getClass().getName();
- String resolvedName = Signature.createTypeSignature(className, true);
- args.add(resolvedName);
- }
-
- return args;
- }
-
- /**
- * @return the ITypeDescriptor for this List's element type (bound type).
- * Defaults to java.lang.Object if no bounds or can't resolve bounds
- *
- * @generated NOT
- */
- private ITypeDescriptor getBoundsTypeDescriptor(int offset)
- {
- IJavaTypeDescriptor2 typeDesc = null;
-
- List typeParameters = getTypeParameterSignatures();
-
- // if no bounds at all, then default to bounded java object
- if (typeParameters.size() == 0)
- {
- typeDesc =
- SymbolFactory.eINSTANCE.createIBoundedJavaTypeDescriptor();
-
- typeDesc.setTypeSignatureDelegate(TypeConstants.TYPE_JAVAOBJECT);
- }
- else
- {
- // TODO: there should only be exactly one on a list...
- final String elementType = (String) typeParameters.get(0);
-
- typeDesc =
- SymbolFactory.eINSTANCE.createIJavaTypeDescriptor2();
-
- typeDesc.setArrayCount(Signature.getArrayCount(elementType));
-
- // may be null
- typeDesc.setType(resolveType(elementType));
- typeDesc.setTypeSignatureDelegate(elementType);
- }
-
- return typeDesc;
- }
-} //IBoundedListTypeDescriptorImpl
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/impl/IBoundedMapTypeDescriptorImpl.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/impl/IBoundedMapTypeDescriptorImpl.java
deleted file mode 100644
index 1989995..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/impl/IBoundedMapTypeDescriptorImpl.java
+++ /dev/null
@@ -1,139 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: IBoundedMapTypeDescriptorImpl.java,v 1.7 2007/10/01 04:29:44 cbateman Exp $
- */
-package org.eclipse.jst.jsf.context.symbol.internal.impl;
-
-import java.util.Iterator;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.jdt.core.Signature;
-import org.eclipse.jst.jsf.common.internal.types.TypeConstants;
-import org.eclipse.jst.jsf.common.internal.types.ValueType;
-import org.eclipse.jst.jsf.context.symbol.IBoundedJavaTypeDescriptor;
-import org.eclipse.jst.jsf.context.symbol.IBoundedMapTypeDescriptor;
-import org.eclipse.jst.jsf.context.symbol.IPropertySymbol;
-import org.eclipse.jst.jsf.context.symbol.ISymbol;
-import org.eclipse.jst.jsf.context.symbol.SymbolFactory;
-import org.eclipse.jst.jsf.context.symbol.SymbolPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>IBounded Map Type Descriptor</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * </p>
- *
- * @generated
- */
-public class IBoundedMapTypeDescriptorImpl extends IMapTypeDescriptorImpl implements IBoundedMapTypeDescriptor {
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @SuppressWarnings("hiding")
- public static final String copyright = "Copyright 2006 Oracle"; //$NON-NLS-1$
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected IBoundedMapTypeDescriptorImpl() {
- super();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected EClass eStaticClass() {
- return SymbolPackage.Literals.IBOUNDED_MAP_TYPE_DESCRIPTOR;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated NOT
- */
- public boolean isUnboundedForType(String typeSignature) {
- // TODO: for now, return true if the type is a resolved object
- // need to add support for template checking (Java5) and
- // decide what to do with unresolved (Q) type signatures
- return typeSignature != null
- && typeSignature.startsWith(Character.toString(Signature.C_RESOLVED));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated NOT
- */
- public ISymbol getUnboundedProperty(Object name, String typeSignature) {
- ISymbol retValue = null;
-
- if (isUnboundedForType(typeSignature))
- {
- // first see if we have it in our map source
- retValue = getFromMap(name.toString());
-
- if (retValue == null)
- {
- IPropertySymbol propSymbol = SymbolFactory.eINSTANCE.createIPropertySymbol();
- // TODO: there is a possible problem here for non-string keyed maps
- propSymbol.setName(name.toString());
- propSymbol.setReadable(true);
- IBoundedJavaTypeDescriptor typeDesc =
- SymbolFactory.eINSTANCE.createIBoundedJavaTypeDescriptor();
-
- typeDesc.setTypeSignatureDelegate(TypeConstants.TYPE_JAVAOBJECT);
- propSymbol.setTypeDescriptor(typeDesc);
- retValue = propSymbol;
- }
- }
-
- return retValue;
-
- }
-
- /**
- * @see org.eclipse.jst.jsf.context.symbol.internal.impl.ITypeDescriptorImpl#calculateSyntheticCall(java.lang.String, org.eclipse.emf.common.util.EList, java.lang.String)
- * @generated NOT
- */
- public ISymbol calculateSyntheticCall(String methodName, EList methodArgs,
- String symbolName) {
- if ("get".equals(methodName) //$NON-NLS-1$
- && methodArgs.size() == 1)
- {
- return getUnboundedProperty(symbolName, ((ValueType) methodArgs.get(0)).getSignature());
- }
-
- // default is return null
- return null;
- }
-
-
- /**
- * @generated NOT
- */
- private ISymbol getFromMap(final String name)
- {
- for (final Iterator it = getProperties().iterator(); it.hasNext();)
- {
- ISymbol symbol = (ISymbol) it.next();
-
- if (symbol.getName().equals(name))
- {
- return symbol;
- }
- }
-
- return null;
- }
-
-} //IBoundedMapTypeDescriptorImpl
\ No newline at end of file
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/impl/IComponentSymbolImpl.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/impl/IComponentSymbolImpl.java
deleted file mode 100644
index 15a592e..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/impl/IComponentSymbolImpl.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Oracle 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:
- * Cameron Bateman/Oracle - initial API and implementation
- *
- ********************************************************************************/
-package org.eclipse.jst.jsf.context.symbol.internal.impl;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.jst.jsf.context.symbol.IComponentSymbol;
-import org.eclipse.jst.jsf.context.symbol.ITypeDescriptor;
-import org.eclipse.jst.jsf.context.symbol.SymbolPackage;
-
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>IComponent Symbol</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * </p>
- *
- * @generated
- */
-public class IComponentSymbolImpl extends IInstanceSymbolImpl implements IComponentSymbol {
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @SuppressWarnings("hiding")
- public static final String copyright = "Copyright 2006 Oracle"; //$NON-NLS-1$
-
- /**
- * A human readable description of this symbol
- */
- protected String _detailedDescription = null;
-
- /**
- * true if this component symbol is readable
- */
- protected boolean _isReadable = READABLE_EDEFAULT;
-
- /**
- * true if this component symbol is writable
- */
- protected boolean _isWritable = WRITABLE_EDEFAULT;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected IComponentSymbolImpl() {
- super();
- }
-
- /**
- * <!-- begin-user-doc -->
- * @return the static class
- * <!-- end-user-doc -->
- * @generated
- */
- protected EClass eStaticClass() {
- return SymbolPackage.Literals.ICOMPONENT_SYMBOL;
- }
-
- public String getDetailedDescription() {
- return _detailedDescription;
- }
-
- public void setDetailedDescription(String detailedDescription) {
- _detailedDescription = detailedDescription;
- }
-
- /**
- * @generated NOT
- */
- public ITypeDescriptor coerce(String typeSignature) {
- // TODO:
- return getTypeDescriptor();
- }
-
- /**
- * @generated NOT
- */
- public boolean supportsCoercion(String typeSignature) {
- // TODO:
- if (getTypeDescriptor().instanceOf(typeSignature))
- {
- return true;
- }
- return false;
- }
-} //IComponentSymbolImpl
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/impl/IInstanceSymbolImpl.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/impl/IInstanceSymbolImpl.java
deleted file mode 100644
index bc868c5..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/impl/IInstanceSymbolImpl.java
+++ /dev/null
@@ -1,499 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Oracle 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:
- * Cameron Bateman/Oracle - initial API and implementation
- *
- ********************************************************************************/
-package org.eclipse.jst.jsf.context.symbol.internal.impl;
-
-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.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.jst.jsf.common.internal.types.TypeConstants;
-import org.eclipse.jst.jsf.context.symbol.ERuntimeSource;
-import org.eclipse.jst.jsf.context.symbol.IInstanceSymbol;
-import org.eclipse.jst.jsf.context.symbol.ISymbol;
-import org.eclipse.jst.jsf.context.symbol.ITypeDescriptor;
-import org.eclipse.jst.jsf.context.symbol.SymbolPackage;
-
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>IInstance Symbol</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- * <li>{@link org.eclipse.jst.jsf.context.symbol.internal.impl.IInstanceSymbolImpl#getName <em>Name</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.context.symbol.internal.impl.IInstanceSymbolImpl#getTypeDescriptor <em>Type Descriptor</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.context.symbol.internal.impl.IInstanceSymbolImpl#isReadable <em>Readable</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.context.symbol.internal.impl.IInstanceSymbolImpl#isWritable <em>Writable</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.context.symbol.internal.impl.IInstanceSymbolImpl#isTypeResolved <em>Type Resolved</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.context.symbol.internal.impl.IInstanceSymbolImpl#getRuntimeSource <em>Runtime Source</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class IInstanceSymbolImpl extends EObjectImpl implements IInstanceSymbol {
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public static final String copyright = "Copyright 2006 Oracle"; //$NON-NLS-1$
-
- /**
- * The default value of the '{@link #getName() <em>Name</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getName()
- * @generated
- * @ordered
- */
- protected static final String NAME_EDEFAULT = null;
-
- /**
- * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getName()
- * @generated
- * @ordered
- */
- protected String name = NAME_EDEFAULT;
-
- /**
- * The cached value of the '{@link #getTypeDescriptor() <em>Type Descriptor</em>}' reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getTypeDescriptor()
- * @generated
- * @ordered
- */
- protected ITypeDescriptor typeDescriptor = null;
-
- /**
- * The default value of the '{@link #isReadable() <em>Readable</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #isReadable()
- * @generated NOT
- * @ordered
- */
- protected static final boolean READABLE_EDEFAULT = true;
-
- /**
- * The cached value of the '{@link #isReadable() <em>Readable</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #isReadable()
- * @generated
- * @ordered
- */
- protected boolean readable = READABLE_EDEFAULT;
-
- /**
- * The default value of the '{@link #isWritable() <em>Writable</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #isWritable()
- * @generated
- * @ordered
- */
- protected static final boolean WRITABLE_EDEFAULT = false;
-
- /**
- * The cached value of the '{@link #isWritable() <em>Writable</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #isWritable()
- * @generated
- * @ordered
- */
- protected boolean writable = WRITABLE_EDEFAULT;
-
- /**
- * The default value of the '{@link #isTypeResolved() <em>Type Resolved</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #isTypeResolved()
- * @generated
- * @ordered
- */
- protected static final boolean TYPE_RESOLVED_EDEFAULT = false;
-
- /**
- * The default value of the '{@link #getRuntimeSource() <em>Runtime Source</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getRuntimeSource()
- * @generated
- * @ordered
- */
- protected static final ERuntimeSource RUNTIME_SOURCE_EDEFAULT = ERuntimeSource.TAG_INSTANTIATED_SYMBOL_LITERAL;
-
- /**
- * The cached value of the '{@link #getRuntimeSource() <em>Runtime Source</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getRuntimeSource()
- * @generated
- * @ordered
- */
- protected ERuntimeSource runtimeSource = RUNTIME_SOURCE_EDEFAULT;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected IInstanceSymbolImpl() {
- super();
- }
-
- /**
- * <!-- begin-user-doc -->
- * @return the static class
- * <!-- end-user-doc -->
- * @generated
- */
- protected EClass eStaticClass() {
- return SymbolPackage.Literals.IINSTANCE_SYMBOL;
- }
-
- /**
- * <!-- begin-user-doc -->
- * @return the symbol name
- * <!-- end-user-doc -->
- * @generated
- */
- public String getName() {
- return name;
- }
-
- /**
- * <!-- begin-user-doc -->
- * @param newName
- * <!-- end-user-doc -->
- * @generated
- */
- public void setName(String newName) {
- String oldName = name;
- name = newName;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, SymbolPackage.IINSTANCE_SYMBOL__NAME, oldName, name));
- }
-
- /**
- * <!-- begin-user-doc -->
- * @return the type descriptor for this instance
- * <!-- end-user-doc -->
- * @generated
- */
- public ITypeDescriptor getTypeDescriptor() {
- if (typeDescriptor != null && typeDescriptor.eIsProxy()) {
- InternalEObject oldTypeDescriptor = (InternalEObject)typeDescriptor;
- typeDescriptor = (ITypeDescriptor)eResolveProxy(oldTypeDescriptor);
- if (typeDescriptor != oldTypeDescriptor) {
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.RESOLVE, SymbolPackage.IINSTANCE_SYMBOL__TYPE_DESCRIPTOR, oldTypeDescriptor, typeDescriptor));
- }
- }
- return typeDescriptor;
- }
-
- /**
- * <!-- begin-user-doc -->
- * @return the instance type
- * <!-- end-user-doc -->
- * @generated
- */
- public ITypeDescriptor basicGetTypeDescriptor() {
- return typeDescriptor;
- }
-
- /**
- * <!-- begin-user-doc -->
- * @param newTypeDescriptor
- * <!-- end-user-doc -->
- * @generated
- */
- public void setTypeDescriptor(ITypeDescriptor newTypeDescriptor) {
- ITypeDescriptor oldTypeDescriptor = typeDescriptor;
- typeDescriptor = newTypeDescriptor;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, SymbolPackage.IINSTANCE_SYMBOL__TYPE_DESCRIPTOR, oldTypeDescriptor, typeDescriptor));
- }
-
- /**
- * <!-- begin-user-doc -->
- * @return true if instance symbol is readable
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean isReadable() {
- return readable;
- }
-
- /**
- * <!-- begin-user-doc -->
- * @param newReadable
- * <!-- end-user-doc -->
- * @generated
- */
- public void setReadable(boolean newReadable) {
- boolean oldReadable = readable;
- readable = newReadable;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, SymbolPackage.IINSTANCE_SYMBOL__READABLE, oldReadable, readable));
- }
-
- /**
- * <!-- begin-user-doc -->
- * @return true if instance is writable.
- *
- * Normally, instances should not be
- * considered writable, since the VariableResolver has no setter, however
- * this is included to allow for unforeseen cases that may require an
- * instance symbol to appear to be writable
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean isWritable() {
- return writable;
- }
-
- /**
- * <!-- begin-user-doc -->
- * @param newWritable
- * <!-- end-user-doc -->
- * @generated
- */
- public void setWritable(boolean newWritable) {
- boolean oldWritable = writable;
- writable = newWritable;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, SymbolPackage.IINSTANCE_SYMBOL__WRITABLE, oldWritable, writable));
- }
-
- /**
- * <!-- begin-user-doc -->
- * @return true if the type descriptor has been resolved for this symbol
- * <!-- end-user-doc -->
- * @generated NOT
- */
- public boolean isTypeResolved()
- {
- return getTypeDescriptor() != null;
- }
-
- /**
- * <!-- begin-user-doc -->
- * @return return the symbol's runtime source
- * <!-- end-user-doc -->
- * @generated
- */
- public ERuntimeSource getRuntimeSource() {
- return runtimeSource;
- }
-
- /**
- * <!-- begin-user-doc -->
- * @param newRuntimeSource
- * <!-- end-user-doc -->
- * @generated
- */
- public void setRuntimeSource(ERuntimeSource newRuntimeSource) {
- ERuntimeSource oldRuntimeSource = runtimeSource;
- runtimeSource = newRuntimeSource == null ? RUNTIME_SOURCE_EDEFAULT : newRuntimeSource;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, SymbolPackage.IINSTANCE_SYMBOL__RUNTIME_SOURCE, oldRuntimeSource, runtimeSource));
- }
-
- /**
- * @generated NOT
- */
- public boolean supportsCoercion(String typeSignature)
- {
- // first check that our type descriptor even thinks it is
- // an instanceof this type
- if (getTypeDescriptor().instanceOf(typeSignature))
- {
- // for java bean instances, we need to minimally support
- // Map, List and Array to conform to the basic spec
- // for JSF EL
- if (TypeConstants.TYPE_MAP.equals(typeSignature))
- {
- return true;
- }
- else if (TypeConstants.TYPE_LIST.equals(typeSignature)
- /*TODO: || isArray*/)
- {
- return true;
- }
- }
-
- // otherwise, not supported
- return false;
- }
-
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated NOT
- */
- public ITypeDescriptor coerce(String typeSignature) {
- // TODO:
- return getTypeDescriptor();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated NOT
- */
- public ISymbol call(String methodName, EList methodArguments, String symbolName) {
- return Util.call(methodName,methodArguments,symbolName,getTypeDescriptor());
- }
-
- /**
- * <!-- begin-user-doc -->
- * @param featureID
- * @param resolve
- * @param coreType
- * @return the value for the featureID
- * <!-- end-user-doc -->
- * @generated
- */
- public Object eGet(int featureID, boolean resolve, boolean coreType) {
- switch (featureID) {
- case SymbolPackage.IINSTANCE_SYMBOL__NAME:
- return getName();
- case SymbolPackage.IINSTANCE_SYMBOL__TYPE_DESCRIPTOR:
- if (resolve) return getTypeDescriptor();
- return basicGetTypeDescriptor();
- case SymbolPackage.IINSTANCE_SYMBOL__READABLE:
- return isReadable() ? Boolean.TRUE : Boolean.FALSE;
- case SymbolPackage.IINSTANCE_SYMBOL__WRITABLE:
- return isWritable() ? Boolean.TRUE : Boolean.FALSE;
- case SymbolPackage.IINSTANCE_SYMBOL__TYPE_RESOLVED:
- return isTypeResolved() ? Boolean.TRUE : Boolean.FALSE;
- case SymbolPackage.IINSTANCE_SYMBOL__RUNTIME_SOURCE:
- return getRuntimeSource();
- }
- return super.eGet(featureID, resolve, coreType);
- }
-
- /**
- * <!-- begin-user-doc -->
- * @param featureID
- * @param newValue
- * <!-- end-user-doc -->
- * @generated
- */
- public void eSet(int featureID, Object newValue) {
- switch (featureID) {
- case SymbolPackage.IINSTANCE_SYMBOL__NAME:
- setName((String)newValue);
- return;
- case SymbolPackage.IINSTANCE_SYMBOL__TYPE_DESCRIPTOR:
- setTypeDescriptor((ITypeDescriptor)newValue);
- return;
- case SymbolPackage.IINSTANCE_SYMBOL__READABLE:
- setReadable(((Boolean)newValue).booleanValue());
- return;
- case SymbolPackage.IINSTANCE_SYMBOL__WRITABLE:
- setWritable(((Boolean)newValue).booleanValue());
- return;
- case SymbolPackage.IINSTANCE_SYMBOL__RUNTIME_SOURCE:
- setRuntimeSource((ERuntimeSource)newValue);
- return;
- }
- super.eSet(featureID, newValue);
- }
-
- /**
- * <!-- begin-user-doc -->
- * @param featureID
- * <!-- end-user-doc -->
- * @generated
- */
- public void eUnset(int featureID) {
- switch (featureID) {
- case SymbolPackage.IINSTANCE_SYMBOL__NAME:
- setName(NAME_EDEFAULT);
- return;
- case SymbolPackage.IINSTANCE_SYMBOL__TYPE_DESCRIPTOR:
- setTypeDescriptor((ITypeDescriptor)null);
- return;
- case SymbolPackage.IINSTANCE_SYMBOL__READABLE:
- setReadable(READABLE_EDEFAULT);
- return;
- case SymbolPackage.IINSTANCE_SYMBOL__WRITABLE:
- setWritable(WRITABLE_EDEFAULT);
- return;
- case SymbolPackage.IINSTANCE_SYMBOL__RUNTIME_SOURCE:
- setRuntimeSource(RUNTIME_SOURCE_EDEFAULT);
- return;
- }
- super.eUnset(featureID);
- }
-
- /**
- * <!-- begin-user-doc -->
- * @param featureID
- * @return true if the feature has been set
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean eIsSet(int featureID) {
- switch (featureID) {
- case SymbolPackage.IINSTANCE_SYMBOL__NAME:
- return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
- case SymbolPackage.IINSTANCE_SYMBOL__TYPE_DESCRIPTOR:
- return typeDescriptor != null;
- case SymbolPackage.IINSTANCE_SYMBOL__READABLE:
- return readable != READABLE_EDEFAULT;
- case SymbolPackage.IINSTANCE_SYMBOL__WRITABLE:
- return writable != WRITABLE_EDEFAULT;
- case SymbolPackage.IINSTANCE_SYMBOL__TYPE_RESOLVED:
- return isTypeResolved() != TYPE_RESOLVED_EDEFAULT;
- case SymbolPackage.IINSTANCE_SYMBOL__RUNTIME_SOURCE:
- return runtimeSource != RUNTIME_SOURCE_EDEFAULT;
- }
- return super.eIsSet(featureID);
- }
-
- /**
- * <!-- begin-user-doc -->
- * @return the string representation
- * <!-- end-user-doc -->
- * @generated
- */
- public String toString() {
- if (eIsProxy()) return super.toString();
-
- StringBuffer result = new StringBuffer(super.toString());
- result.append(" (name: "); //$NON-NLS-1$
- result.append(name);
- result.append(", readable: "); //$NON-NLS-1$
- result.append(readable);
- result.append(", writable: "); //$NON-NLS-1$
- result.append(writable);
- result.append(", runtimeSource: "); //$NON-NLS-1$
- result.append(runtimeSource);
- result.append(')');
- return result.toString();
- }
-
-} //IInstanceSymbolImpl
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/impl/IJavaSymbolImpl.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/impl/IJavaSymbolImpl.java
deleted file mode 100644
index 32d8de6..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/impl/IJavaSymbolImpl.java
+++ /dev/null
@@ -1,241 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Oracle 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:
- * Cameron Bateman/Oracle - initial API and implementation
- *
- ********************************************************************************/
-package org.eclipse.jst.jsf.context.symbol.internal.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.jdt.core.IJavaElement;
-import org.eclipse.jst.jsf.context.symbol.IJavaSymbol;
-import org.eclipse.jst.jsf.context.symbol.SymbolPackage;
-
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>IJava Symbol</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- * <li>{@link org.eclipse.jst.jsf.context.symbol.internal.impl.IJavaSymbolImpl#getName <em>Name</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.context.symbol.internal.impl.IJavaSymbolImpl#getJavaElement <em>Java Element</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class IJavaSymbolImpl extends EObjectImpl implements IJavaSymbol {
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public static final String copyright = "Copyright 2006 Oracle"; //$NON-NLS-1$
-
- /**
- * The default value of the '{@link #getName() <em>Name</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getName()
- * @generated
- * @ordered
- */
- protected static final String NAME_EDEFAULT = null;
-
- /**
- * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getName()
- * @generated
- * @ordered
- */
- protected String name = NAME_EDEFAULT;
-
- /**
- * The default value of the '{@link #getJavaElement() <em>Java Element</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getJavaElement()
- * @generated
- * @ordered
- */
- protected static final IJavaElement JAVA_ELEMENT_EDEFAULT = null;
-
- /**
- * The cached value of the '{@link #getJavaElement() <em>Java Element</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getJavaElement()
- * @generated
- * @ordered
- */
- protected IJavaElement javaElement = JAVA_ELEMENT_EDEFAULT;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected IJavaSymbolImpl() {
- super();
- }
-
- /**
- * <!-- begin-user-doc -->
- * @return the static eclass
- * <!-- end-user-doc -->
- * @generated
- */
- protected EClass eStaticClass() {
- return SymbolPackage.Literals.IJAVA_SYMBOL;
- }
-
- /**
- * <!-- begin-user-doc -->
- * @return the symbol name
- * <!-- end-user-doc -->
- * @generated
- */
- public String getName() {
- return name;
- }
-
- /**
- * <!-- begin-user-doc -->
- * @param newName
- * <!-- end-user-doc -->
- * @generated
- */
- public void setName(String newName) {
- String oldName = name;
- name = newName;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, SymbolPackage.IJAVA_SYMBOL__NAME, oldName, name));
- }
-
- /**
- * <!-- begin-user-doc -->
- * @return the IJavaElement associated with this symbol
- * <!-- end-user-doc -->
- * @generated
- */
- public IJavaElement getJavaElement() {
- return javaElement;
- }
-
- /**
- * <!-- begin-user-doc -->
- * @param newJavaElement
- * <!-- end-user-doc -->
- * @generated
- */
- public void setJavaElement(IJavaElement newJavaElement) {
- IJavaElement oldJavaElement = javaElement;
- javaElement = newJavaElement;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, SymbolPackage.IJAVA_SYMBOL__JAVA_ELEMENT, oldJavaElement, javaElement));
- }
-
- /**
- * <!-- begin-user-doc -->
- * @param featureID
- * @param resolve
- * @param coreType
- * @return the feature
- * <!-- end-user-doc -->
- * @generated
- */
- public Object eGet(int featureID, boolean resolve, boolean coreType) {
- switch (featureID) {
- case SymbolPackage.IJAVA_SYMBOL__NAME:
- return getName();
- case SymbolPackage.IJAVA_SYMBOL__JAVA_ELEMENT:
- return getJavaElement();
- }
- return super.eGet(featureID, resolve, coreType);
- }
-
- /**
- * <!-- begin-user-doc -->
- * @param featureID
- * @param newValue
- * <!-- end-user-doc -->
- * @generated
- */
- public void eSet(int featureID, Object newValue) {
- switch (featureID) {
- case SymbolPackage.IJAVA_SYMBOL__NAME:
- setName((String)newValue);
- return;
- case SymbolPackage.IJAVA_SYMBOL__JAVA_ELEMENT:
- setJavaElement((IJavaElement)newValue);
- return;
- }
- super.eSet(featureID, newValue);
- }
-
- /**
- * <!-- begin-user-doc -->
- * @param featureID
- * <!-- end-user-doc -->
- * @generated
- */
- public void eUnset(int featureID) {
- switch (featureID) {
- case SymbolPackage.IJAVA_SYMBOL__NAME:
- setName(NAME_EDEFAULT);
- return;
- case SymbolPackage.IJAVA_SYMBOL__JAVA_ELEMENT:
- setJavaElement(JAVA_ELEMENT_EDEFAULT);
- return;
- }
- super.eUnset(featureID);
- }
-
- /**
- * <!-- begin-user-doc -->
- * @param featureID
- * @return true if featureID's feature has been set
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean eIsSet(int featureID) {
- switch (featureID) {
- case SymbolPackage.IJAVA_SYMBOL__NAME:
- return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
- case SymbolPackage.IJAVA_SYMBOL__JAVA_ELEMENT:
- return JAVA_ELEMENT_EDEFAULT == null ? javaElement != null : !JAVA_ELEMENT_EDEFAULT.equals(javaElement);
- }
- return super.eIsSet(featureID);
- }
-
- /**
- * <!-- begin-user-doc -->
- * @return the default string representation
- * <!-- end-user-doc -->
- * @generated
- */
- public String toString() {
- if (eIsProxy()) return super.toString();
-
- StringBuffer result = new StringBuffer(super.toString());
- result.append(" (name: "); //$NON-NLS-1$
- result.append(name);
- result.append(", javaElement: "); //$NON-NLS-1$
- result.append(javaElement);
- result.append(')');
- return result.toString();
- }
-
-} //IJavaSymbolImpl
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/impl/IJavaTypeDescriptor2Impl.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/impl/IJavaTypeDescriptor2Impl.java
deleted file mode 100644
index 573f228..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/impl/IJavaTypeDescriptor2Impl.java
+++ /dev/null
@@ -1,679 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Oracle 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:
- * Cameron Bateman/Oracle - initial API and implementation
- *
- ********************************************************************************/
-package org.eclipse.jst.jsf.context.symbol.internal.impl;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-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.impl.ENotificationImpl;
-import org.eclipse.jdt.core.Flags;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.core.Signature;
-import org.eclipse.jst.jsf.common.JSFCommonPlugin;
-import org.eclipse.jst.jsf.common.internal.types.TypeInfoCache;
-import org.eclipse.jst.jsf.common.util.JDTBeanIntrospector;
-import org.eclipse.jst.jsf.common.util.JDTBeanProperty;
-import org.eclipse.jst.jsf.common.util.TypeUtil;
-import org.eclipse.jst.jsf.context.symbol.IBeanMethodSymbol;
-import org.eclipse.jst.jsf.context.symbol.IBeanPropertySymbol;
-import org.eclipse.jst.jsf.context.symbol.IJavaTypeDescriptor2;
-import org.eclipse.jst.jsf.context.symbol.IObjectSymbol;
-import org.eclipse.jst.jsf.context.symbol.IPropertySymbol;
-import org.eclipse.jst.jsf.context.symbol.SymbolFactory;
-import org.eclipse.jst.jsf.context.symbol.SymbolPackage;
-
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>IJava Type Descriptor2</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- * <li>{@link org.eclipse.jst.jsf.context.symbol.internal.impl.IJavaTypeDescriptor2Impl#getType <em>Type</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.context.symbol.internal.impl.IJavaTypeDescriptor2Impl#getBeanProperties <em>Bean Properties</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.context.symbol.internal.impl.IJavaTypeDescriptor2Impl#getBeanMethods <em>Bean Methods</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.context.symbol.internal.impl.IJavaTypeDescriptor2Impl#getArrayCount <em>Array Count</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class IJavaTypeDescriptor2Impl extends ITypeDescriptorImpl implements IJavaTypeDescriptor2 {
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @SuppressWarnings("hiding")
- public static final String copyright = "Copyright 2006 Oracle"; //$NON-NLS-1$
-
- /**
- * The default value of the '{@link #getType() <em>Type</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getType()
- * @generated
- * @ordered
- */
- protected static final IType TYPE_EDEFAULT = null;
-
- /**
- * The cached value of the '{@link #getType() <em>Type</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getType()
- * @generated
- * @ordered
- */
- protected IType type = TYPE_EDEFAULT;
-
- /**
- * The default value of the '{@link #getArrayCount() <em>Array Count</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getArrayCount()
- * @generated
- * @ordered
- */
- protected static final int ARRAY_COUNT_EDEFAULT = 0;
-
- /**
- * The cached value of the '{@link #getArrayCount() <em>Array Count</em>}' attribute.
- * <!-- begin-user-doc -->
- * records the array nesting of the type. IType doesn't encapsulate
- * array types. So if this type is an array then type will represent
- * the base element and this value will be > 0. If not an array, then
- * _arrayCount is always 0.
- * <!-- end-user-doc -->
- * @see #getArrayCount()
- * @generated
- * @ordered
- */
- protected int arrayCount = ARRAY_COUNT_EDEFAULT;
-
- /**
- * The default value of the '{@link #getJdtContext() <em>Jdt Context</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getJdtContext()
- * @generated
- * @ordered
- */
- @SuppressWarnings("hiding")
- protected static final IJavaElement JDT_CONTEXT_EDEFAULT = null;
-
- /**
- * The cached value of the '{@link #getJdtContext() <em>Jdt Context</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getJdtContext()
- * @generated
- * @ordered
- */
- @SuppressWarnings("hiding")
- protected IJavaElement jdtContext = JDT_CONTEXT_EDEFAULT;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected IJavaTypeDescriptor2Impl() {
- super();
- }
-
- /**
- * <!-- begin-user-doc -->
- * @return the static class
- * <!-- end-user-doc -->
- * @generated
- */
- protected EClass eStaticClass() {
- return SymbolPackage.Literals.IJAVA_TYPE_DESCRIPTOR2;
- }
-
- /**
- * <!-- begin-user-doc -->
- * @return the JDT type descriptor; if type is an array then this type
- * represent's the array base type only
- * <!-- end-user-doc -->
- * @generated
- */
- public IType getType() {
- return type;
- }
-
- /**
- * <!-- begin-user-doc -->
- * @param newType
- * <!-- end-user-doc -->
- * @generated
- */
- public void setType(IType newType) {
- IType oldType = type;
- type = newType;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, SymbolPackage.IJAVA_TYPE_DESCRIPTOR2__TYPE, oldType, type));
- }
-
- /**
- * @see org.eclipse.jst.jsf.context.symbol.internal.impl.ITypeDescriptorImpl#getInterfaceTypeSignatures()
- * @generated NOT
- */
- public EList getInterfaceTypeSignatures()
- {
- EList interfaces = new BasicEList();
-
- IType type_ = getType();
-
- if (type_ != null)
- {
- final TypeInfoCache typeInfoCache = TypeInfoCache.getInstance();
- IType[] interfaceTypes = typeInfoCache.getCachedInterfaceTypes(type_);
- if (interfaceTypes == null) {
- interfaceTypes = typeInfoCache.cacheInterfaceTypesFor(type_);
- }
- copySignatures(interfaces, interfaceTypes);
- }
-
- return interfaces;
- }
-
- /**
- * @see org.eclipse.jst.jsf.context.symbol.internal.impl.ITypeDescriptorImpl#getSuperTypeSignatures()
- * @generated NOT
- */
- public EList getSuperTypeSignatures()
- {
- EList interfaces = new BasicEList();
-
- IType type_ = getType();
-
- if (type_ != null)
- {
- final TypeInfoCache typeInfoCache = TypeInfoCache.getInstance();
- IType[] interfaceTypes = typeInfoCache.getCachedSupertypes(type_);
-
- if (interfaceTypes == null)
- {
- interfaceTypes = typeInfoCache.cacheSupertypesFor(type_);
- }
- copySignatures(interfaces, interfaceTypes);
- }
-
- return interfaces;
- }
-
-
- private void copySignatures(List list, IType[] types)
- {
- if (types != null)
- {
- for (int i = 0; i < types.length; i++)
- {
- final IType type_ = types[i];
- final String signature = TypeUtil.getSignature(type_);
-
- if (signature != null)
- {
- list.add(signature);
- }
- }
- }
- }
-
- public EList getProperties()
- {
- return getBeanProperties();
- }
-
-
- public EList getMethods()
- {
- return getBeanMethods();
- }
-
- /**
- * <!-- begin-user-doc -->
- * @return the bean props for this java type
- * <!-- end-user-doc -->
- * @generated NOT
- */
- public EList getBeanProperties()
- {
- TypeInfoCache typeInfoCache = TypeInfoCache.getInstance();
- IBeanPropertySymbol[] properties = typeInfoCache.getCachedPropertySymbols(type);
- Collection propertyColl;
- if (properties == null) {
- propertyColl = getPropertiesInternal();
- properties = (IBeanPropertySymbol[]) propertyColl.toArray(new IBeanPropertySymbol[propertyColl.size()]);
- typeInfoCache.cachePropertySymbols(type, properties);
- }
- else
- {
- propertyColl = new ArrayList(properties.length);
- Collections.addAll(propertyColl, (Object[])properties);
- }
- BasicEList list = new BasicEList(propertyColl);
- return list;
- }
-
- /**
- * <!-- begin-user-doc -->
- * @return the bean methods for this type
- * <!-- end-user-doc -->
- * @generated NOT
- */
- public EList getBeanMethods() {
- TypeInfoCache typeInfoCache = TypeInfoCache.getInstance();
- IBeanMethodSymbol[] methods = typeInfoCache.getCachedMethodSymbols(type);
- Collection methodColl;
- if (methods == null)
- {
- methodColl = getMethodsInternal();
- methods = (IBeanMethodSymbol[]) methodColl.toArray(new IBeanMethodSymbol[methodColl.size()]);
- typeInfoCache.cacheMethodSymbols(type, methods);
- } else {
- methodColl = new ArrayList(methods.length);
- Collections.addAll(methodColl, (Object[])methods);
- }
- BasicEList list = new BasicEList(methodColl);
- return list;
- }
-
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public int getArrayCount() {
- return arrayCount;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setArrayCount(int newArrayCount) {
- int oldArrayCount = arrayCount;
- arrayCount = newArrayCount;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, SymbolPackage.IJAVA_TYPE_DESCRIPTOR2__ARRAY_COUNT, oldArrayCount, arrayCount));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public IJavaElement getJdtContext() {
- return jdtContext;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setJdtContext(IJavaElement newJdtContext) {
- IJavaElement oldJdtContext = jdtContext;
- jdtContext = newJdtContext;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, SymbolPackage.IJAVA_TYPE_DESCRIPTOR2__JDT_CONTEXT, oldJdtContext, jdtContext));
- }
-
- /**
- * <!-- begin-user-doc -->
- *
- * Tries to load an IType for a fully resolved (i.e. starts with L not Q)
- * type signature using the current jdtContext.
- *
- * @return the resolved IType or null if none could be resolved.
- *
- * <!-- end-user-doc -->
- * @generated NOT
- */
- public IType resolveType(String resolvedTypeSignature)
- {
- IType resolvedType = null;
-
- // we need to obtain an IJavaProject within which to resolve
- // the type.
- IJavaProject project = null;
-
- // first, see if we have an IType
- if (getType() != null)
- {
- // optimize: if the type sig is my type sig, then return getType()
- if (resolvedTypeSignature.equals(getTypeSignature()))
- {
- resolvedType = getType();
- }
- else
- {
- project = getType().getJavaProject();
-
- if (project != null)
- {
- resolvedType = TypeUtil.resolveType(project, resolvedTypeSignature);
- }
- }
- }
-
- // if not, see if a jdtContext hint has been set
- if (resolvedType == null && getJdtContext() != null)
- {
- resolvedType = super.resolveType(resolvedTypeSignature);
- }
-
- return resolvedType;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public Object eGet(int featureID, boolean resolve, boolean coreType) {
- switch (featureID) {
- case SymbolPackage.IJAVA_TYPE_DESCRIPTOR2__TYPE:
- return getType();
- case SymbolPackage.IJAVA_TYPE_DESCRIPTOR2__BEAN_PROPERTIES:
- return getBeanProperties();
- case SymbolPackage.IJAVA_TYPE_DESCRIPTOR2__BEAN_METHODS:
- return getBeanMethods();
- case SymbolPackage.IJAVA_TYPE_DESCRIPTOR2__ARRAY_COUNT:
- return Integer.valueOf(getArrayCount());
- }
- return super.eGet(featureID, resolve, coreType);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void eSet(int featureID, Object newValue) {
- switch (featureID) {
- case SymbolPackage.IJAVA_TYPE_DESCRIPTOR2__TYPE:
- setType((IType)newValue);
- return;
- case SymbolPackage.IJAVA_TYPE_DESCRIPTOR2__BEAN_PROPERTIES:
- getBeanProperties().clear();
- getBeanProperties().addAll((Collection)newValue);
- return;
- case SymbolPackage.IJAVA_TYPE_DESCRIPTOR2__BEAN_METHODS:
- getBeanMethods().clear();
- getBeanMethods().addAll((Collection)newValue);
- return;
- case SymbolPackage.IJAVA_TYPE_DESCRIPTOR2__ARRAY_COUNT:
- setArrayCount(((Integer)newValue).intValue());
- return;
- }
- super.eSet(featureID, newValue);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void eUnset(int featureID) {
- switch (featureID) {
- case SymbolPackage.IJAVA_TYPE_DESCRIPTOR2__TYPE:
- setType(TYPE_EDEFAULT);
- return;
- case SymbolPackage.IJAVA_TYPE_DESCRIPTOR2__BEAN_PROPERTIES:
- getBeanProperties().clear();
- return;
- case SymbolPackage.IJAVA_TYPE_DESCRIPTOR2__BEAN_METHODS:
- getBeanMethods().clear();
- return;
- case SymbolPackage.IJAVA_TYPE_DESCRIPTOR2__ARRAY_COUNT:
- setArrayCount(ARRAY_COUNT_EDEFAULT);
- return;
- }
- super.eUnset(featureID);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean eIsSet(int featureID) {
- switch (featureID) {
- case SymbolPackage.IJAVA_TYPE_DESCRIPTOR2__TYPE:
- return TYPE_EDEFAULT == null ? type != null : !TYPE_EDEFAULT.equals(type);
- case SymbolPackage.IJAVA_TYPE_DESCRIPTOR2__BEAN_PROPERTIES:
- return !getBeanProperties().isEmpty();
- case SymbolPackage.IJAVA_TYPE_DESCRIPTOR2__BEAN_METHODS:
- return !getBeanMethods().isEmpty();
- case SymbolPackage.IJAVA_TYPE_DESCRIPTOR2__ARRAY_COUNT:
- return arrayCount != ARRAY_COUNT_EDEFAULT;
- }
- return super.eIsSet(featureID);
- }
-
- public boolean isArray()
- {
- return getArrayCount() > 0;
- }
-
- /**
- * @generated NOT
- */
- public IObjectSymbol getArrayElement()
- {
- if (isArray())
- {
- final String typeSignature = getTypeSignature();
- final int arrayCount_ = Signature.getArrayCount(typeSignature);
- final String baseType = Signature.getElementType(typeSignature);
- final String elementTypeSignature = Signature.createArraySignature(baseType, arrayCount_-1);
-
- final IJavaTypeDescriptor2 elementTypeDesc =
- SymbolFactory.eINSTANCE.createIJavaTypeDescriptor2();
- final String fullyQualifiedElementType = TypeUtil.getFullyQualifiedName(baseType);
-
- IType elementType = null;
-
- try
- {
- IType myType = getType();
- if (myType != null)
- {
- elementType = getType().getJavaProject()
- .findType(fullyQualifiedElementType);
- }
- }
- catch (JavaModelException e)
- {
- // suppress
- }
-
- if (elementType != null)
- {
- elementTypeDesc.setType(elementType);
- }
- else
- {
- elementTypeDesc.setTypeSignatureDelegate(elementTypeSignature);
- }
-
- elementTypeDesc.setArrayCount(Signature.getArrayCount(elementTypeSignature));
-
- IPropertySymbol newPropertySymbol =
- SymbolFactory.eINSTANCE.createIPropertySymbol();
- newPropertySymbol.setTypeDescriptor(elementTypeDesc);
- newPropertySymbol.setWritable(true);
- newPropertySymbol.setReadable(true);
- newPropertySymbol.setName(fullyQualifiedElementType);
- return newPropertySymbol;
- }
-
- return null;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.jsf.context.symbol.internal.impl.ITypeDescriptorImpl#getTypeSignature()
- * @generated NOT
- */
- public String getTypeSignature()
- {
- if (getType() == null)
- {
- if (eIsSet(SymbolPackage.IJAVA_TYPE_DESCRIPTOR2__TYPE_SIGNATURE_DELEGATE))
- {
- return getTypeSignatureDelegate();
- }
-
- return null;
- }
-
- // make sure to array type nesting if using IType
- return Signature.createArraySignature(
- TypeUtil.getSignature(getType()), getArrayCount());
- }
-
- private Collection getPropertiesInternal()
- {
- // if I'm an array then I have no bean properties
- if (isArray())
- {
- return Collections.EMPTY_LIST;
- }
-
- final JDTBeanIntrospector introspector =
- new JDTBeanIntrospector(getType());
-
- final Map<String, JDTBeanProperty> properties = introspector.getProperties();
-
- final Collection calculatedProps = new ArrayList(properties.size());
-
- for (final Iterator<Map.Entry<String, JDTBeanProperty>> it = properties.entrySet().iterator(); it.hasNext();)
- {
- Map.Entry<String, JDTBeanProperty> entry = it.next();
- final String propertyName = entry.getKey();
- final JDTBeanProperty property = entry.getValue();
-
- final IBeanPropertySymbol workingCopy =
- SymbolFactory.eINSTANCE.createIBeanPropertySymbol();
- workingCopy.setName(propertyName);
- workingCopy.setOwner(this);
-
- final IJavaTypeDescriptor2 workingCopyDesc =
- SymbolFactory.eINSTANCE.createIJavaTypeDescriptor2();
- workingCopy.setTypeDescriptor(workingCopyDesc);
- workingCopy.setReadable(property.isReadable());
- workingCopy.setWritable(property.isWritable());
-
- workingCopyDesc.setArrayCount(property.getArrayCount());
- workingCopyDesc.getTypeParameterSignatures().addAll(property.getTypeParameterSignatures());
- workingCopyDesc.setEnumType(property.isEnumType());
-
- final IType newType = property.getType();
- final String signature = property.getTypeSignature();
-
- if (newType != null)
- {
- workingCopyDesc.setType(newType);
- }
- else
- {
- workingCopyDesc.setTypeSignatureDelegate(signature);
- }
-
- calculatedProps.add(workingCopy);
- }
-
- return calculatedProps;
- }
-
- private Collection getMethodsInternal()
- {
- JDTBeanIntrospector introspector =
- new JDTBeanIntrospector(getType());
-
- IMethod[] methods = introspector.getAllMethods();
-
- List methodSymbols = new ArrayList();
-
- for (int i = 0; i < methods.length; i++)
- {
- IMethod method = methods[i];
-
- try
- {
- // to be a bean method, it must not a constructor, must be public
- // and must not be static
- if (!method.isConstructor()
- && Flags.isPublic(method.getFlags())
- && !Flags.isStatic(method.getFlags()))
- {
- String methodName = method.getElementName();
- IBeanMethodSymbol workingCopy = SymbolFactory.eINSTANCE.createIBeanMethodSymbol();
- workingCopy.setName(methodName);
- workingCopy.setOwner(this);
- workingCopy.setSignature(TypeUtil.
- resolveMethodSignature
- (getType(),
- method.getSignature()));
- methodSymbols.add(workingCopy);
- }
- }
- catch (JavaModelException jme)
- {
- // error reading meta-data. Skip to next one
- JSFCommonPlugin.log(jme);
- }
- }
-
- return methodSymbols;
- }
-
-
- /**
- * <!-- begin-user-doc -->
- * @return the default string rep
- * <!-- end-user-doc -->
- * @generated
- */
- public String toString() {
- if (eIsProxy()) return super.toString();
-
- StringBuffer result = new StringBuffer(super.toString());
- result.append(" (type: "); //$NON-NLS-1$
- result.append(type);
- result.append(", arrayCount: "); //$NON-NLS-1$
- result.append(arrayCount);
- result.append(')');
- return result.toString();
- }
-
-} //IJavaTypeDescriptor2Impl
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/impl/IListTypeDescriptorImpl.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/impl/IListTypeDescriptorImpl.java
deleted file mode 100644
index 7046cee..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/impl/IListTypeDescriptorImpl.java
+++ /dev/null
@@ -1,207 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: IListTypeDescriptorImpl.java,v 1.5 2007/10/01 04:29:44 cbateman Exp $
- */
-package org.eclipse.jst.jsf.context.symbol.internal.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.common.util.ECollections;
-import org.eclipse.emf.common.util.EList;
-
-import org.eclipse.emf.ecore.EClass;
-
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
-import org.eclipse.jst.jsf.common.internal.types.TypeConstants;
-import org.eclipse.jst.jsf.context.symbol.IListTypeDescriptor;
-import org.eclipse.jst.jsf.context.symbol.SymbolPackage;
-
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>IList Type Descriptor</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- * <li>{@link org.eclipse.jst.jsf.context.symbol.internal.impl.IListTypeDescriptorImpl#getListSource <em>List Source</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class IListTypeDescriptorImpl extends ITypeDescriptorImpl implements IListTypeDescriptor {
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @SuppressWarnings("hiding")
- public static final String copyright = "Copyright 2006 Oracle"; //$NON-NLS-1$
-
- /**
- * The default value of the '{@link #getListSource() <em>List Source</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getListSource()
- * @generated
- * @ordered
- */
- protected static final EList LIST_SOURCE_EDEFAULT = null;
-
- /**
- * The cached value of the '{@link #getListSource() <em>List Source</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getListSource()
- * @generated
- * @ordered
- */
- protected EList listSource = LIST_SOURCE_EDEFAULT;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected IListTypeDescriptorImpl() {
- super();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected EClass eStaticClass() {
- return SymbolPackage.Literals.ILIST_TYPE_DESCRIPTOR;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EList getListSource() {
- return listSource;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setListSource(EList newListSource) {
- EList oldListSource = listSource;
- listSource = newListSource;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, SymbolPackage.ILIST_TYPE_DESCRIPTOR__LIST_SOURCE, oldListSource, listSource));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public Object eGet(int featureID, boolean resolve, boolean coreType) {
- switch (featureID) {
- case SymbolPackage.ILIST_TYPE_DESCRIPTOR__LIST_SOURCE:
- return getListSource();
- }
- return super.eGet(featureID, resolve, coreType);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void eSet(int featureID, Object newValue) {
- switch (featureID) {
- case SymbolPackage.ILIST_TYPE_DESCRIPTOR__LIST_SOURCE:
- setListSource((EList)newValue);
- return;
- }
- super.eSet(featureID, newValue);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void eUnset(int featureID) {
- switch (featureID) {
- case SymbolPackage.ILIST_TYPE_DESCRIPTOR__LIST_SOURCE:
- setListSource(LIST_SOURCE_EDEFAULT);
- return;
- }
- super.eUnset(featureID);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean eIsSet(int featureID) {
- switch (featureID) {
- case SymbolPackage.ILIST_TYPE_DESCRIPTOR__LIST_SOURCE:
- return LIST_SOURCE_EDEFAULT == null ? listSource != null : !LIST_SOURCE_EDEFAULT.equals(listSource);
- }
- 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(" (listSource: "); //$NON-NLS-1$
- result.append(listSource);
- result.append(')');
- return result.toString();
- }
-
- /*
- * @generated NOT
- */
- public EList getInterfaceTypeSignatures() {
- return ECollections.EMPTY_ELIST;
- }
-
- public EList getMethods()
- {
- // TODO: should this return the methods on a List?
- return ECollections.EMPTY_ELIST;
- }
-
- public EList getProperties()
- {
- // TODO: a list has no properties as such. What to do here?
- return ECollections.EMPTY_ELIST;
- }
-
- /**
- * @generated NOT
- */
- public EList getSuperTypeSignatures() {
- return ECollections.EMPTY_ELIST;
- }
-
- /**
- * @generated NOT
- */
- public String getTypeSignature()
- {
- return TypeConstants.TYPE_LIST;
- }
-
-} //IListTypeDescriptorImpl
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/impl/IMapSourceInfo.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/impl/IMapSourceInfo.java
deleted file mode 100644
index a5de579..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/impl/IMapSourceInfo.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package org.eclipse.jst.jsf.context.symbol.internal.impl;
-
-/**
- * Information about the map source used by the IMapTypeDescriptor
- *
- */
-public interface IMapSourceInfo
-{
-
- /**
- * @param key
- * @return true if the map source has changed since key was last set
- */
- boolean hasChanged(final Object key);
-
- /**
- * The key is used in the standard HashMap way.
- *
- * @param key
- * @return the cached value for the key.
- */
- Object getCachedValue(final Object key);
- /**
- * Add cached value for key.
- *
- * @param key
- * @param value
- */
- void putCachedValue(final Object key, final Object value);
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/impl/IMapTypeDescriptorImpl.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/impl/IMapTypeDescriptorImpl.java
deleted file mode 100644
index eb99902..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/impl/IMapTypeDescriptorImpl.java
+++ /dev/null
@@ -1,464 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Oracle 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:
- * Cameron Bateman/Oracle - initial API and implementation
- *
- ********************************************************************************/
-package org.eclipse.jst.jsf.context.symbol.internal.impl;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.StringTokenizer;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.BasicEList;
-import org.eclipse.emf.common.util.ECollections;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.Signature;
-import org.eclipse.jst.jsf.common.internal.types.TypeConstants;
-import org.eclipse.jst.jsf.context.symbol.IInstanceSymbol;
-import org.eclipse.jst.jsf.context.symbol.IJavaTypeDescriptor2;
-import org.eclipse.jst.jsf.context.symbol.IMapTypeDescriptor;
-import org.eclipse.jst.jsf.context.symbol.IObjectSymbol;
-import org.eclipse.jst.jsf.context.symbol.IPropertySymbol;
-import org.eclipse.jst.jsf.context.symbol.ITypeDescriptor;
-import org.eclipse.jst.jsf.context.symbol.SymbolFactory;
-import org.eclipse.jst.jsf.context.symbol.SymbolPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>IMap Type Descriptor</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- * <li>{@link org.eclipse.jst.jsf.context.symbol.internal.impl.IMapTypeDescriptorImpl#getMapSource <em>Map Source</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.context.symbol.internal.impl.IMapTypeDescriptorImpl#isImmutable <em>Immutable</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class IMapTypeDescriptorImpl extends ITypeDescriptorImpl implements IMapTypeDescriptor {
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @SuppressWarnings("hiding")
- public static final String copyright = "Copyright 2006 Oracle"; //$NON-NLS-1$
-
- /**
- * The default value of the '{@link #getMapSource() <em>Map Source</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getMapSource()
- * @generated
- * @ordered
- */
- protected static final Map MAP_SOURCE_EDEFAULT = null;
-
- /**
- * The cached value of the '{@link #getMapSource() <em>Map Source</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getMapSource()
- * @generated
- * @ordered
- */
- protected Map mapSource = MAP_SOURCE_EDEFAULT;
-
- /**
- * The default value of the '{@link #isImmutable() <em>Immutable</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #isImmutable()
- * @generated
- * @ordered
- */
- protected static final boolean IMMUTABLE_EDEFAULT = true;
-
- private static final Object MAP_TYPE_DESCRIPTOR_PROP_KEY = new Object();
-
- /**
- * The cached value of the '{@link #isImmutable() <em>Immutable</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #isImmutable()
- * @generated
- * @ordered
- */
- protected boolean immutable = IMMUTABLE_EDEFAULT;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected IMapTypeDescriptorImpl() {
- super();
- }
-
- /**
- * <!-- begin-user-doc -->
- * @return the static eClass
- * <!-- end-user-doc -->
- * @generated
- */
- protected EClass eStaticClass() {
- return SymbolPackage.Literals.IMAP_TYPE_DESCRIPTOR;
- }
-
- /**
- * <!-- begin-user-doc -->
- * @return the map source
- * <!-- end-user-doc -->
- * @generated
- */
- public Map getMapSource() {
- return mapSource;
- }
-
- /**
- * <!-- begin-user-doc -->
- * @param newMapSource
- * <!-- end-user-doc -->
- * @generated
- */
- public void setMapSource(Map newMapSource) {
- Map oldMapSource = mapSource;
- mapSource = newMapSource;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, SymbolPackage.IMAP_TYPE_DESCRIPTOR__MAP_SOURCE, oldMapSource, mapSource));
- }
-
- /**
- * <!-- begin-user-doc -->
- * @return true if this map is immutable as defined in the java.util.Map
- * interface.
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean isImmutable() {
- return immutable;
- }
-
- /**
- * <!-- begin-user-doc -->
- * @param newImmutable
- * <!-- end-user-doc -->
- * @generated
- */
- public void setImmutable(boolean newImmutable) {
- boolean oldImmutable = immutable;
- immutable = newImmutable;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, SymbolPackage.IMAP_TYPE_DESCRIPTOR__IMMUTABLE, oldImmutable, immutable));
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.jsf.context.symbol.internal.impl.ITypeDescriptorImpl#getTypeSignature()
- * @generated NOT
- */
- public String getTypeSignature()
- {
- // if the delegate has been set, use it
- if (eIsSet(SymbolPackage.IMAP_TYPE_DESCRIPTOR__TYPE_SIGNATURE_DELEGATE))
- {
- return getTypeSignatureDelegate();
- }
-
- // otherwise use Map
- return TypeConstants.TYPE_MAP;
- }
-
- public EList getInterfaceTypeSignatures() {
- return ECollections.EMPTY_ELIST;
- }
-
- public EList getSuperTypeSignatures() {
- return ECollections.EMPTY_ELIST;
- }
-
- /**
- * @see org.eclipse.jst.jsf.context.symbol.internal.impl.ITypeDescriptorImpl#getProperties()
- */
- public EList getProperties()
- {
- final BasicEList list = new BasicEList();
- final Map source = getMapSource();
- if (source instanceof IMapSourceInfo)
- {
- if (!((IMapSourceInfo) source).hasChanged(MAP_TYPE_DESCRIPTOR_PROP_KEY))
- {
- EList cachedList = (EList) ((IMapSourceInfo)source).getCachedValue(MAP_TYPE_DESCRIPTOR_PROP_KEY);
-
- if (cachedList != null)
- {
- return cachedList;
- }
- }
- }
- final Map segmentMap = processSegments(source);
- list.addAll(segmentMap.values());
-
- if (source instanceof IMapSourceInfo)
- {
- ((IMapSourceInfo)source).putCachedValue(MAP_TYPE_DESCRIPTOR_PROP_KEY, list);
- }
- return list;
- }
-
- public EList getMethods()
- {
- // TODO: should this return the methods on a Map?
- return ECollections.EMPTY_ELIST;
- }
-
- /**
- * @generated NOT
- */
- public IObjectSymbol getArrayElement()
- {
- return null;
- }
-
- /**
- * @generated NOT
- */
- public boolean isArray()
- {
- // a map is never an array
- return false;
- }
-
- private Map processSegments(final Map source)
- {
- final Map segmentMap = new HashMap();
- final Set<Map.Entry<String, Object>> entrySet = source.entrySet();
- for (final Map.Entry<String, Object> entry : entrySet)
- {
-
- final String key = entry.getKey();
- final String segments[] = fastTokenSplit(key);
- if (segments.length == 0)
- {
- continue;
- }
- IPropertySymbol property = (IPropertySymbol) segmentMap
- .get(segments[0]);
-
- if (property == null)
- {
- final Object propValue = entry.getValue();
- property = SymbolFactory.eINSTANCE.createIPropertySymbol();
- property.setName(segments[0]);
- ITypeDescriptor typeDesc = null;
-
- // TODO: need wrapper object to rationalize
- if (propValue != null)
- {
- if (propValue instanceof IType)
- {
- typeDesc = SymbolFactory.eINSTANCE
- .createIJavaTypeDescriptor2();
- ((IJavaTypeDescriptor2) typeDesc)
- .setType((IType) propValue);
- } else if (propValue instanceof IInstanceSymbol)
- {
- typeDesc = ((IInstanceSymbol) propValue)
- .getTypeDescriptor();
- } else if (propValue instanceof IPropertySymbol)
- {
- typeDesc = ((IPropertySymbol) propValue)
- .getTypeDescriptor();
- } else
- {
- final String className = propValue.getClass().getName();
- final String typeSignature = Signature
- .createTypeSignature(className, true);
- typeDesc = SymbolFactory.eINSTANCE
- .createIMapTypeDescriptor();
- ((IMapTypeDescriptor) typeDesc)
- .setMapSource(new HashMap());
- ((IMapTypeDescriptor) typeDesc)
- .setTypeSignatureDelegate(typeSignature);
- // inherit this descriptor's mutability
- ((IMapTypeDescriptor) typeDesc)
- .setImmutable(isImmutable());
- property.setIntermediate(true); // set the property as
- // intermediate until we
- // find out different
- }
-
- property.setTypeDescriptor(typeDesc);
- property.setReadable(true);
- // is only writable if map is not immutable
- property.setWritable(!isImmutable());
- }
-
- segmentMap.put(segments[0], property);
- }
-
- final ITypeDescriptor typeDesc = property.getTypeDescriptor();
-
- if (typeDesc instanceof IMapTypeDescriptor)
- {
- if (segments.length == 1)
- {
- // TODO: not always allowed
- // ((IMapTypeDescriptor)typeDesc).getMapSource().put(null,
- // source.get(key));
- // property is more than simply intermediate
- property.setIntermediate(false);
- } else
- {
- ((IMapTypeDescriptor) typeDesc).getMapSource().put(
- key.substring(key.indexOf('.') + 1),
- entry.getValue());
- }
- }
- }
-
- return segmentMap;
- }
-
- /**
- * Based on measurements, this beats Pattern.split by 15-30% even with
- * a pre-compiled pattern.
- *
- * @param splitValue
- * @return the array of strings split by the '.' token
- */
- private static String[] fastTokenSplit(final String splitValue)
- {
- if (splitValue == null || splitValue.length() == 0)
- {
- return new String[0];
- }
- if (splitValue.indexOf('.') > -1)
- {
- return tokenizerSplit(splitValue);
- }
- return new String[] {splitValue};
- }
-
- private static String[] tokenizerSplit(final String splitValue)
- {
- StringTokenizer stringTokenizer = new StringTokenizer(splitValue, "."); //$NON-NLS-1$
- // initialize to a large size, since we're just going to truncate
- // it once at the end and want to reduce the chance of resize during
- // the loop.
- final List<String> splitValues = new ArrayList<String>(32);
-
- while (stringTokenizer.hasMoreTokens())
- {
- splitValues.add(stringTokenizer.nextToken());
- }
-
- return splitValues.toArray(new String[0]);
- }
-
- /**
- * <!-- begin-user-doc -->
- * @param featureID
- * @param resolve
- * @param coreType
- * @return the object for the feature id
- * <!-- end-user-doc -->
- * @generated
- */
- public Object eGet(int featureID, boolean resolve, boolean coreType) {
- switch (featureID) {
- case SymbolPackage.IMAP_TYPE_DESCRIPTOR__MAP_SOURCE:
- return getMapSource();
- case SymbolPackage.IMAP_TYPE_DESCRIPTOR__IMMUTABLE:
- return isImmutable() ? Boolean.TRUE : Boolean.FALSE;
- }
- return super.eGet(featureID, resolve, coreType);
- }
-
- /**
- * <!-- begin-user-doc -->
- * @param featureID
- * @param newValue
- * <!-- end-user-doc -->
- * @generated
- */
- public void eSet(int featureID, Object newValue) {
- switch (featureID) {
- case SymbolPackage.IMAP_TYPE_DESCRIPTOR__MAP_SOURCE:
- setMapSource((Map)newValue);
- return;
- case SymbolPackage.IMAP_TYPE_DESCRIPTOR__IMMUTABLE:
- setImmutable(((Boolean)newValue).booleanValue());
- return;
- }
- super.eSet(featureID, newValue);
- }
-
- /**
- * <!-- begin-user-doc -->
- * @param featureID
- * <!-- end-user-doc -->
- * @generated
- */
- public void eUnset(int featureID) {
- switch (featureID) {
- case SymbolPackage.IMAP_TYPE_DESCRIPTOR__MAP_SOURCE:
- setMapSource(MAP_SOURCE_EDEFAULT);
- return;
- case SymbolPackage.IMAP_TYPE_DESCRIPTOR__IMMUTABLE:
- setImmutable(IMMUTABLE_EDEFAULT);
- return;
- }
- super.eUnset(featureID);
- }
-
- /**
- * <!-- begin-user-doc -->
- * @param featureID
- * @return true if is set
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean eIsSet(int featureID) {
- switch (featureID) {
- case SymbolPackage.IMAP_TYPE_DESCRIPTOR__MAP_SOURCE:
- return MAP_SOURCE_EDEFAULT == null ? mapSource != null : !MAP_SOURCE_EDEFAULT.equals(mapSource);
- case SymbolPackage.IMAP_TYPE_DESCRIPTOR__IMMUTABLE:
- return immutable != IMMUTABLE_EDEFAULT;
- }
- return super.eIsSet(featureID);
- }
-
- /**
- * <!-- begin-user-doc -->
- * @return the string representation
- * <!-- end-user-doc -->
- * @generated
- */
- public String toString() {
- if (eIsProxy()) return super.toString();
-
- StringBuffer result = new StringBuffer(super.toString());
- result.append(" (mapSource: "); //$NON-NLS-1$
- result.append(mapSource);
- result.append(", immutable: "); //$NON-NLS-1$
- result.append(immutable);
- result.append(')');
- return result.toString();
- }
-
-} //IMapTypeDescriptorImpl
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/impl/IMethodSymbolImpl.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/impl/IMethodSymbolImpl.java
deleted file mode 100644
index 2e9a75e..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/impl/IMethodSymbolImpl.java
+++ /dev/null
@@ -1,239 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Oracle 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:
- * Cameron Bateman/Oracle - initial API and implementation
- *
- ********************************************************************************/
-package org.eclipse.jst.jsf.context.symbol.internal.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.jst.jsf.context.symbol.IMethodSymbol;
-import org.eclipse.jst.jsf.context.symbol.SymbolPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>IMethod Symbol</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- * <li>{@link org.eclipse.jst.jsf.context.symbol.internal.impl.IMethodSymbolImpl#getName <em>Name</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.context.symbol.internal.impl.IMethodSymbolImpl#getSignature <em>Signature</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class IMethodSymbolImpl extends EObjectImpl implements IMethodSymbol {
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public static final String copyright = "Copyright 2006 Oracle"; //$NON-NLS-1$
-
- /**
- * The default value of the '{@link #getName() <em>Name</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getName()
- * @generated
- * @ordered
- */
- protected static final String NAME_EDEFAULT = null;
-
- /**
- * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getName()
- * @generated
- * @ordered
- */
- protected String name = NAME_EDEFAULT;
-
- /**
- * The default value of the '{@link #getSignature() <em>Signature</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getSignature()
- * @generated
- * @ordered
- */
- protected static final String SIGNATURE_EDEFAULT = null;
-
- /**
- * The cached value of the '{@link #getSignature() <em>Signature</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getSignature()
- * @generated
- * @ordered
- */
- protected String signature = SIGNATURE_EDEFAULT;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected IMethodSymbolImpl() {
- super();
- }
-
- /**
- * <!-- begin-user-doc -->
- * @return the static eclass
- * <!-- end-user-doc -->
- * @generated
- */
- protected EClass eStaticClass() {
- return SymbolPackage.Literals.IMETHOD_SYMBOL;
- }
-
- /**
- * <!-- begin-user-doc -->
- * @return the method name
- * <!-- end-user-doc -->
- * @generated
- */
- public String getName() {
- return name;
- }
-
- /**
- * <!-- begin-user-doc -->
- * @param newName
- * <!-- end-user-doc -->
- * @generated
- */
- public void setName(String newName) {
- String oldName = name;
- name = newName;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, SymbolPackage.IMETHOD_SYMBOL__NAME, oldName, name));
- }
-
- /**
- * <!-- begin-user-doc -->
- * @return the method signature in JVM/JDT form
- * <!-- end-user-doc -->
- * @generated
- */
- public String getSignature() {
- return signature;
- }
-
- /**
- * <!-- begin-user-doc -->
- * @param newSignature
- * <!-- end-user-doc -->
- * @generated
- */
- public void setSignature(String newSignature) {
- String oldSignature = signature;
- signature = newSignature;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, SymbolPackage.IMETHOD_SYMBOL__SIGNATURE, oldSignature, signature));
- }
-
- /**
- * <!-- begin-user-doc -->
- * @param featureID
- * @param resolve
- * @param coreType
- * @return the property as a feature object
- * <!-- end-user-doc -->
- * @generated
- */
- public Object eGet(int featureID, boolean resolve, boolean coreType) {
- switch (featureID) {
- case SymbolPackage.IMETHOD_SYMBOL__NAME:
- return getName();
- case SymbolPackage.IMETHOD_SYMBOL__SIGNATURE:
- return getSignature();
- }
- return super.eGet(featureID, resolve, coreType);
- }
-
- /**
- * <!-- begin-user-doc -->
- * @param featureID
- * @param newValue
- * <!-- end-user-doc -->
- * @generated
- */
- public void eSet(int featureID, Object newValue) {
- switch (featureID) {
- case SymbolPackage.IMETHOD_SYMBOL__NAME:
- setName((String)newValue);
- return;
- case SymbolPackage.IMETHOD_SYMBOL__SIGNATURE:
- setSignature((String)newValue);
- return;
- }
- super.eSet(featureID, newValue);
- }
-
- /**
- * <!-- begin-user-doc -->
- * @param featureID
- * <!-- end-user-doc -->
- * @generated
- */
- public void eUnset(int featureID) {
- switch (featureID) {
- case SymbolPackage.IMETHOD_SYMBOL__NAME:
- setName(NAME_EDEFAULT);
- return;
- case SymbolPackage.IMETHOD_SYMBOL__SIGNATURE:
- setSignature(SIGNATURE_EDEFAULT);
- return;
- }
- super.eUnset(featureID);
- }
-
- /**
- * <!-- begin-user-doc -->
- * @param featureID
- * @return true if the feature has been set
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean eIsSet(int featureID) {
- switch (featureID) {
- case SymbolPackage.IMETHOD_SYMBOL__NAME:
- return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
- case SymbolPackage.IMETHOD_SYMBOL__SIGNATURE:
- return SIGNATURE_EDEFAULT == null ? signature != null : !SIGNATURE_EDEFAULT.equals(signature);
- }
- return super.eIsSet(featureID);
- }
-
- /**
- * <!-- begin-user-doc -->
- * @return the raw string representation
- * <!-- end-user-doc -->
- * @generated
- */
- public String toString() {
- if (eIsProxy()) return super.toString();
-
- StringBuffer result = new StringBuffer(super.toString());
- result.append(" (name: "); //$NON-NLS-1$
- result.append(name);
- result.append(", signature: "); //$NON-NLS-1$
- result.append(signature);
- result.append(')');
- return result.toString();
- }
-
-} //IMethodSymbolImpl
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/impl/IPropertySymbolImpl.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/impl/IPropertySymbolImpl.java
deleted file mode 100644
index 64d314e..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/impl/IPropertySymbolImpl.java
+++ /dev/null
@@ -1,469 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Oracle 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:
- * Cameron Bateman/Oracle - initial API and implementation
- *
- ********************************************************************************/
-package org.eclipse.jst.jsf.context.symbol.internal.impl;
-
-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.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.jst.jsf.context.symbol.IPropertySymbol;
-import org.eclipse.jst.jsf.context.symbol.ISymbol;
-import org.eclipse.jst.jsf.context.symbol.ITypeDescriptor;
-import org.eclipse.jst.jsf.context.symbol.SymbolPackage;
-
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>IProperty Symbol</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- * <li>{@link org.eclipse.jst.jsf.context.symbol.internal.impl.IPropertySymbolImpl#getName <em>Name</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.context.symbol.internal.impl.IPropertySymbolImpl#getTypeDescriptor <em>Type Descriptor</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.context.symbol.internal.impl.IPropertySymbolImpl#isReadable <em>Readable</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.context.symbol.internal.impl.IPropertySymbolImpl#isWritable <em>Writable</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.context.symbol.internal.impl.IPropertySymbolImpl#isIntermediate <em>Intermediate</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class IPropertySymbolImpl extends EObjectImpl implements IPropertySymbol {
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public static final String copyright = "Copyright 2006 Oracle"; //$NON-NLS-1$
-
- /**
- * The default value of the '{@link #getName() <em>Name</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getName()
- * @generated
- * @ordered
- */
- protected static final String NAME_EDEFAULT = null;
-
- /**
- * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getName()
- * @generated
- * @ordered
- */
- protected String name = NAME_EDEFAULT;
-
- /**
- * The cached value of the '{@link #getTypeDescriptor() <em>Type Descriptor</em>}' reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getTypeDescriptor()
- * @generated
- * @ordered
- */
- protected ITypeDescriptor typeDescriptor = null;
-
-
- /**
- * Set to true if this property symbol is readable
- */
- protected boolean isReadable = READABLE_EDEFAULT;
-
- /**
- * Set to true if this property symbol is writable
- */
- protected boolean isWritable = WRITABLE_EDEFAULT;
-
- /**
- * The default value of the '{@link #isReadable() <em>Readable</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #isReadable()
- * @generated
- * @ordered
- */
- protected static final boolean READABLE_EDEFAULT = false;
-
- /**
- * The cached value of the '{@link #isReadable() <em>Readable</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #isReadable()
- * @generated
- * @ordered
- */
- protected boolean readable = READABLE_EDEFAULT;
-
- /**
- * The default value of the '{@link #isWritable() <em>Writable</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #isWritable()
- * @generated
- * @ordered
- */
- protected static final boolean WRITABLE_EDEFAULT = false;
-
- /**
- * The cached value of the '{@link #isWritable() <em>Writable</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #isWritable()
- * @generated
- * @ordered
- */
- protected boolean writable = WRITABLE_EDEFAULT;
-
- /**
- * The default value of the '{@link #isIntermediate() <em>Intermediate</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #isIntermediate()
- * @generated
- * @ordered
- */
- protected static final boolean INTERMEDIATE_EDEFAULT = false;
-
- /**
- * The cached value of the '{@link #isIntermediate() <em>Intermediate</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #isIntermediate()
- * @generated
- * @ordered
- */
- protected boolean intermediate = INTERMEDIATE_EDEFAULT;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected IPropertySymbolImpl() {
- super();
- }
-
- /**
- * <!-- begin-user-doc -->
- * @return the static eClass
- * <!-- end-user-doc -->
- * @generated
- */
- protected EClass eStaticClass() {
- return SymbolPackage.Literals.IPROPERTY_SYMBOL;
- }
-
- /**
- * <!-- begin-user-doc -->
- * @return return the property name
- * <!-- end-user-doc -->
- * @generated
- */
- public String getName() {
- return name;
- }
-
- /**
- * <!-- begin-user-doc -->
- * @param newName the new name of the property
- * <!-- end-user-doc -->
- * @generated
- */
- public void setName(String newName) {
- String oldName = name;
- name = newName;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, SymbolPackage.IPROPERTY_SYMBOL__NAME, oldName, name));
- }
-
- /**
- * <!-- begin-user-doc -->
- * @return the property's type descriptor ?? can be null ??
- * <!-- end-user-doc -->
- * @generated
- */
- public ITypeDescriptor getTypeDescriptor() {
- if (typeDescriptor != null && typeDescriptor.eIsProxy()) {
- InternalEObject oldTypeDescriptor = (InternalEObject)typeDescriptor;
- typeDescriptor = (ITypeDescriptor)eResolveProxy(oldTypeDescriptor);
- if (typeDescriptor != oldTypeDescriptor) {
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.RESOLVE, SymbolPackage.IPROPERTY_SYMBOL__TYPE_DESCRIPTOR, oldTypeDescriptor, typeDescriptor));
- }
- }
- return typeDescriptor;
- }
-
- /**
- * <!-- begin-user-doc -->
- * @return the type descriptor
- * <!-- end-user-doc -->
- * @generated
- */
- public ITypeDescriptor basicGetTypeDescriptor() {
- return typeDescriptor;
- }
-
- /**
- * <!-- begin-user-doc -->
- * @param newTypeDescriptor
- * <!-- end-user-doc -->
- * @generated
- */
- public void setTypeDescriptor(ITypeDescriptor newTypeDescriptor) {
- ITypeDescriptor oldTypeDescriptor = typeDescriptor;
- typeDescriptor = newTypeDescriptor;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, SymbolPackage.IPROPERTY_SYMBOL__TYPE_DESCRIPTOR, oldTypeDescriptor, typeDescriptor));
- }
-
- /**
- * <!-- begin-user-doc -->
- * @return true if property is readable
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean isReadable() {
- return readable;
- }
-
- /**
- * <!-- begin-user-doc -->
- * @param newReadable
- * <!-- end-user-doc -->
- * @generated
- */
- public void setReadable(boolean newReadable) {
- boolean oldReadable = readable;
- readable = newReadable;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, SymbolPackage.IPROPERTY_SYMBOL__READABLE, oldReadable, readable));
- }
-
- /**
- * <!-- begin-user-doc -->
- * @return true if property is writable
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean isWritable() {
- return writable;
- }
-
- /**
- * <!-- begin-user-doc -->
- * @param newWritable
- * <!-- end-user-doc -->
- * @generated
- */
- public void setWritable(boolean newWritable) {
- boolean oldWritable = writable;
- writable = newWritable;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, SymbolPackage.IPROPERTY_SYMBOL__WRITABLE, oldWritable, writable));
- }
-
- /**
- * <!-- begin-user-doc -->
- * @return true if this property is intermediate and has no value of it's own
- * besides as a path to it's own properties. This is used to support the
- * situation in JSF where a map-based property can have dots in it (i.e.
- * a loadBundle key my.property) and so creates a (discouraged) ambiguous
- * situation where a property like #{x.y.z) really corresponds to a key
- * "y.z" in a property file pointed to by "x" instead of there being an
- * actual y property on x that has value in and of itself (in this case
- * "#{x.y}" is invalid even though "#{x.y.z}" is valid).
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean isIntermediate() {
- return intermediate;
- }
-
- /**
- * <!-- begin-user-doc -->
- * @param newIntermediate
- * <!-- end-user-doc -->
- * @generated
- */
- public void setIntermediate(boolean newIntermediate) {
- boolean oldIntermediate = intermediate;
- intermediate = newIntermediate;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, SymbolPackage.IPROPERTY_SYMBOL__INTERMEDIATE, oldIntermediate, intermediate));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated NOT
- */
- public boolean supportsCoercion(String typeSignature) {
- // TODO: for now, not supported on generic properties
- return false;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated NOT
- */
- public ITypeDescriptor coerce(String typeSignature)
- {
- // TODO: for now, no generic property type coercion
- return getTypeDescriptor();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public ISymbol call(String methodName, EList methodArguments, String symbolName) {
- // TODO: implement this method
- // Ensure that you remove @generated or mark it @generated NOT
- throw new UnsupportedOperationException();
- }
-
- /**
- * <!-- begin-user-doc -->
- * @param featureID
- * @param resolve
- * @param coreType
- * @return the eObject for the featureID
- * <!-- end-user-doc -->
- * @generated
- */
- public Object eGet(int featureID, boolean resolve, boolean coreType) {
- switch (featureID) {
- case SymbolPackage.IPROPERTY_SYMBOL__NAME:
- return getName();
- case SymbolPackage.IPROPERTY_SYMBOL__TYPE_DESCRIPTOR:
- if (resolve) return getTypeDescriptor();
- return basicGetTypeDescriptor();
- case SymbolPackage.IPROPERTY_SYMBOL__READABLE:
- return isReadable() ? Boolean.TRUE : Boolean.FALSE;
- case SymbolPackage.IPROPERTY_SYMBOL__WRITABLE:
- return isWritable() ? Boolean.TRUE : Boolean.FALSE;
- case SymbolPackage.IPROPERTY_SYMBOL__INTERMEDIATE:
- return isIntermediate() ? Boolean.TRUE : Boolean.FALSE;
- }
- return super.eGet(featureID, resolve, coreType);
- }
-
- /**
- * <!-- begin-user-doc -->
- * @param featureID -- set the feature
- * @param newValue
- * <!-- end-user-doc -->
- * @generated
- */
- public void eSet(int featureID, Object newValue) {
- switch (featureID) {
- case SymbolPackage.IPROPERTY_SYMBOL__NAME:
- setName((String)newValue);
- return;
- case SymbolPackage.IPROPERTY_SYMBOL__TYPE_DESCRIPTOR:
- setTypeDescriptor((ITypeDescriptor)newValue);
- return;
- case SymbolPackage.IPROPERTY_SYMBOL__READABLE:
- setReadable(((Boolean)newValue).booleanValue());
- return;
- case SymbolPackage.IPROPERTY_SYMBOL__WRITABLE:
- setWritable(((Boolean)newValue).booleanValue());
- return;
- case SymbolPackage.IPROPERTY_SYMBOL__INTERMEDIATE:
- setIntermediate(((Boolean)newValue).booleanValue());
- return;
- }
- super.eSet(featureID, newValue);
- }
-
- /**
- * <!-- begin-user-doc -->
- * @param featureID -- unset the feature
- * <!-- end-user-doc -->
- * @generated
- */
- public void eUnset(int featureID) {
- switch (featureID) {
- case SymbolPackage.IPROPERTY_SYMBOL__NAME:
- setName(NAME_EDEFAULT);
- return;
- case SymbolPackage.IPROPERTY_SYMBOL__TYPE_DESCRIPTOR:
- setTypeDescriptor((ITypeDescriptor)null);
- return;
- case SymbolPackage.IPROPERTY_SYMBOL__READABLE:
- setReadable(READABLE_EDEFAULT);
- return;
- case SymbolPackage.IPROPERTY_SYMBOL__WRITABLE:
- setWritable(WRITABLE_EDEFAULT);
- return;
- case SymbolPackage.IPROPERTY_SYMBOL__INTERMEDIATE:
- setIntermediate(INTERMEDIATE_EDEFAULT);
- return;
- }
- super.eUnset(featureID);
- }
-
- /**
- * <!-- begin-user-doc -->
- * @param featureID
- * @return true if is set
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean eIsSet(int featureID) {
- switch (featureID) {
- case SymbolPackage.IPROPERTY_SYMBOL__NAME:
- return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
- case SymbolPackage.IPROPERTY_SYMBOL__TYPE_DESCRIPTOR:
- return typeDescriptor != null;
- case SymbolPackage.IPROPERTY_SYMBOL__READABLE:
- return readable != READABLE_EDEFAULT;
- case SymbolPackage.IPROPERTY_SYMBOL__WRITABLE:
- return writable != WRITABLE_EDEFAULT;
- case SymbolPackage.IPROPERTY_SYMBOL__INTERMEDIATE:
- return intermediate != INTERMEDIATE_EDEFAULT;
- }
- return super.eIsSet(featureID);
- }
-
- /**
- * <!-- begin-user-doc -->
- * @return the string representation
- * <!-- end-user-doc -->
- * @generated
- */
- public String toString() {
- if (eIsProxy()) return super.toString();
-
- StringBuffer result = new StringBuffer(super.toString());
- result.append(" (name: "); //$NON-NLS-1$
- result.append(name);
- result.append(", readable: "); //$NON-NLS-1$
- result.append(readable);
- result.append(", writable: "); //$NON-NLS-1$
- result.append(writable);
- result.append(", intermediate: "); //$NON-NLS-1$
- result.append(intermediate);
- result.append(')');
- return result.toString();
- }
-
-} //IPropertySymbolImpl
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/impl/ITypeDescriptorImpl.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/impl/ITypeDescriptorImpl.java
deleted file mode 100644
index b23a303..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/impl/ITypeDescriptorImpl.java
+++ /dev/null
@@ -1,521 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Oracle 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:
- * Cameron Bateman/Oracle - initial API and implementation
- *
- ********************************************************************************/
-package org.eclipse.jst.jsf.context.symbol.internal.impl;
-
-import java.util.Collection;
-import java.util.Iterator;
-
-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.EDataTypeEList;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.Signature;
-import org.eclipse.jst.jsf.common.util.TypeUtil;
-import org.eclipse.jst.jsf.context.symbol.IObjectSymbol;
-import org.eclipse.jst.jsf.context.symbol.ISymbol;
-import org.eclipse.jst.jsf.context.symbol.ITypeDescriptor;
-import org.eclipse.jst.jsf.context.symbol.SymbolPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>IType Descriptor</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- * <li>{@link org.eclipse.jst.jsf.context.symbol.internal.impl.ITypeDescriptorImpl#getProperties <em>Properties</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.context.symbol.internal.impl.ITypeDescriptorImpl#getTypeSignature <em>Type Signature</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.context.symbol.internal.impl.ITypeDescriptorImpl#getSuperTypeSignatures <em>Super Type Signatures</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.context.symbol.internal.impl.ITypeDescriptorImpl#getInterfaceTypeSignatures <em>Interface Type Signatures</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.context.symbol.internal.impl.ITypeDescriptorImpl#getTypeSignatureDelegate <em>Type Signature Delegate</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.context.symbol.internal.impl.ITypeDescriptorImpl#getMethods <em>Methods</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public abstract class ITypeDescriptorImpl extends EObjectImpl implements ITypeDescriptor {
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public static final String copyright = "Copyright 2006 Oracle"; //$NON-NLS-1$
-
- /**
- * The default value of the '{@link #getTypeSignature() <em>Type Signature</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getTypeSignature()
- * @generated
- * @ordered
- */
- protected static final String TYPE_SIGNATURE_EDEFAULT = ""; //$NON-NLS-1$
-
- /**
- * The default value of the '{@link #getTypeSignatureDelegate() <em>Type Signature Delegate</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getTypeSignatureDelegate()
- * @generated
- * @ordered
- */
- protected static final String TYPE_SIGNATURE_DELEGATE_EDEFAULT = null;
-
- /**
- * The cached value of the '{@link #getTypeSignatureDelegate() <em>Type Signature Delegate</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getTypeSignatureDelegate()
- * @generated
- * @ordered
- */
- protected String typeSignatureDelegate = TYPE_SIGNATURE_DELEGATE_EDEFAULT;
-
- /**
- * The cached value of the '{@link #getTypeParameterSignatures() <em>Type Parameter Signatures</em>}' attribute list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getTypeParameterSignatures()
- * @generated
- * @ordered
- */
- protected EList typeParameterSignatures;
-
- /**
- * The default value of the '{@link #getJdtContext() <em>Jdt Context</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getJdtContext()
- * @generated
- * @ordered
- */
- protected static final IJavaElement JDT_CONTEXT_EDEFAULT = null;
-
- /**
- * The cached value of the '{@link #getJdtContext() <em>Jdt Context</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getJdtContext()
- * @generated
- * @ordered
- */
- protected IJavaElement jdtContext = JDT_CONTEXT_EDEFAULT;
-
- /**
- * The default value of the '{@link #isEnumType() <em>Enum Type</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #isEnumType()
- * @generated
- * @ordered
- */
- protected static final boolean ENUM_TYPE_EDEFAULT = false;
-
- /**
- * The cached value of the '{@link #isEnumType() <em>Enum Type</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #isEnumType()
- * @generated
- * @ordered
- */
- protected boolean enumType = ENUM_TYPE_EDEFAULT;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected ITypeDescriptorImpl() {
- super();
- }
-
- /**
- * <!-- begin-user-doc -->
- * @return the static class
- * <!-- end-user-doc -->
- * @generated
- */
- protected EClass eStaticClass() {
- return SymbolPackage.Literals.ITYPE_DESCRIPTOR;
- }
-
- /**
- * <!-- begin-user-doc -->
- * @return get properties for this type
- * <!-- end-user-doc -->
- * @generated NOT
- */
- public abstract EList getProperties();
-
- /**
- * <!-- begin-user-doc -->
- * @return the type signature in JVM/JDT signature form
- * <!-- end-user-doc -->
- * @generated NOT
- */
- public abstract String getTypeSignature();
-
- /**
- * <!-- begin-user-doc -->
- * @return the list of super types
- * <!-- end-user-doc -->
- * @generated NOT
- */
- public abstract EList getSuperTypeSignatures();
-
- /**
- * <!-- begin-user-doc -->
- * @return the list of implemented interfaces
- * <!-- end-user-doc -->
- * @generated NOT
- */
- public abstract EList getInterfaceTypeSignatures();
-
- /**
- * <!-- begin-user-doc -->
- * @return the type signature delegate. The descriptor may choose to use
- * this delegate it if it is set and it cannot derive this information
- * from other properties
- * <!-- end-user-doc -->
- * @generated
- */
- public String getTypeSignatureDelegate() {
- return typeSignatureDelegate;
- }
-
- /**
- * <!-- begin-user-doc -->
- * @param newTypeSignatureDelegate
- * <!-- end-user-doc -->
- * @generated
- */
- public void setTypeSignatureDelegate(String newTypeSignatureDelegate) {
- String oldTypeSignatureDelegate = typeSignatureDelegate;
- typeSignatureDelegate = newTypeSignatureDelegate;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, SymbolPackage.ITYPE_DESCRIPTOR__TYPE_SIGNATURE_DELEGATE, oldTypeSignatureDelegate, typeSignatureDelegate));
- }
-
- /**
- * <!-- begin-user-doc -->
- * @return the methods for this type or empty list if none exist
- * <!-- end-user-doc -->
- * @generated NOT
- */
- public abstract EList getMethods();
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EList getTypeParameterSignatures() {
- if (typeParameterSignatures == null) {
- typeParameterSignatures = new EDataTypeEList(String.class, this, SymbolPackage.ITYPE_DESCRIPTOR__TYPE_PARAMETER_SIGNATURES);
- }
- return typeParameterSignatures;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public IJavaElement getJdtContext() {
- return jdtContext;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setJdtContext(IJavaElement newJdtContext) {
- IJavaElement oldJdtContext = jdtContext;
- jdtContext = newJdtContext;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, SymbolPackage.ITYPE_DESCRIPTOR__JDT_CONTEXT, oldJdtContext, jdtContext));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean isEnumType() {
- return enumType;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setEnumType(boolean newEnumType) {
- boolean oldEnumType = enumType;
- enumType = newEnumType;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, SymbolPackage.ITYPE_DESCRIPTOR__ENUM_TYPE, oldEnumType, enumType));
- }
-
- /**
- * <!-- begin-user-doc -->
- * Note about generics:
- *
- * This call mimics the runtime instanceOf to the degree possible.
- * Therefore, any type parameters (<...>) in typeSignature will be
- * deleted using Signature.getTypeErasure() since this data won't be
- * available at runtime.
- * <!-- end-user-doc -->
- * @generated NOT
- */
- public boolean instanceOf(final String typeSignature)
- {
- final String typeErasedSignature = Signature.getTypeErasure(typeSignature);
-
- if (Signature.getTypeErasure(getTypeSignature()) != null
- && Signature.getTypeErasure(getTypeSignature()).equals(typeErasedSignature))
- {
- return true;
- }
-
- for (final Iterator it = getSuperTypeSignatures().iterator(); it.hasNext();)
- {
- final String superType = (String) it.next();
-
- if (Signature.getTypeErasure(superType).equals(typeErasedSignature))
- {
- return true;
- }
- }
-
- for (final Iterator it = getInterfaceTypeSignatures().iterator(); it.hasNext();)
- {
- final String superType = (String) it.next();
-
- if (Signature.getTypeErasure(superType).equals(typeErasedSignature))
- {
- return true;
- }
- }
-
- return false;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated NOT
- */
- public boolean isArray()
- {
- return Signature.getArrayCount(getTypeSignature()) > 0;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated NOT
- */
- public IObjectSymbol getArrayElement()
- {
- if (isArray())
- {
- // sub-class of ITypeDescriptor must implement this if they which to provide
- // array element support
- throw new UnsupportedOperationException("Base type descriptor does not support this function"); //$NON-NLS-1$
- }
-
- // shouldn't be called if not an array
- return null;
- }
-
- /**
- /**
- * <!-- begin-user-doc -->
- *
- * Tries to load an IType for a fully resolved (i.e. starts with L not Q)
- * type signature using the current jdtContext.
- *
- * @return the resolved IType or null if none could be resolved.
- *
- * <!-- end-user-doc -->
- * @generated NOT
- */
- public IType resolveType(String resolvedTypeSignature)
- {
- // we need to obtain an IJavaProject within which to resolve
- // the type.
- IJavaProject project = null;
-
- // see if a jdtContext hint has been set
- if (getJdtContext() != null)
- {
- project = getJdtContext().getJavaProject();
- }
-
- if (project != null)
- {
- return TypeUtil.resolveType(project, resolvedTypeSignature);
- }
-
- return null;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated NOT
- */
- public ISymbol calculateSyntheticCall(String methodName, EList methodArgs, String symbolName) {
- // sub-classes need only implement if they have something meaningful
- // the want to do here
- // by default return null to indicate this type descriptor doesn't
- // wish to handle calls
- return null;
- }
-
- /**
- * <!-- begin-user-doc -->
- * @param featureID
- * @param resolve
- * @param coreType
- * @return get the feature
- * <!-- end-user-doc -->
- * @generated
- */
- public Object eGet(int featureID, boolean resolve, boolean coreType) {
- switch (featureID) {
- case SymbolPackage.ITYPE_DESCRIPTOR__PROPERTIES:
- return getProperties();
- case SymbolPackage.ITYPE_DESCRIPTOR__TYPE_SIGNATURE:
- return getTypeSignature();
- case SymbolPackage.ITYPE_DESCRIPTOR__SUPER_TYPE_SIGNATURES:
- return getSuperTypeSignatures();
- case SymbolPackage.ITYPE_DESCRIPTOR__INTERFACE_TYPE_SIGNATURES:
- return getInterfaceTypeSignatures();
- case SymbolPackage.ITYPE_DESCRIPTOR__TYPE_SIGNATURE_DELEGATE:
- return getTypeSignatureDelegate();
- case SymbolPackage.ITYPE_DESCRIPTOR__METHODS:
- return getMethods();
- }
- return super.eGet(featureID, resolve, coreType);
- }
-
- /**
- * <!-- begin-user-doc -->
- * @param featureID
- * @param newValue
- * <!-- end-user-doc -->
- * @generated
- */
- public void eSet(int featureID, Object newValue) {
- switch (featureID) {
- case SymbolPackage.ITYPE_DESCRIPTOR__PROPERTIES:
- getProperties().clear();
- getProperties().addAll((Collection)newValue);
- return;
- case SymbolPackage.ITYPE_DESCRIPTOR__SUPER_TYPE_SIGNATURES:
- getSuperTypeSignatures().clear();
- getSuperTypeSignatures().addAll((Collection)newValue);
- return;
- case SymbolPackage.ITYPE_DESCRIPTOR__INTERFACE_TYPE_SIGNATURES:
- getInterfaceTypeSignatures().clear();
- getInterfaceTypeSignatures().addAll((Collection)newValue);
- return;
- case SymbolPackage.ITYPE_DESCRIPTOR__TYPE_SIGNATURE_DELEGATE:
- setTypeSignatureDelegate((String)newValue);
- return;
- case SymbolPackage.ITYPE_DESCRIPTOR__METHODS:
- getMethods().clear();
- getMethods().addAll((Collection)newValue);
- return;
- }
- super.eSet(featureID, newValue);
- }
-
- /**
- * <!-- begin-user-doc -->
- * @param featureID
- * <!-- end-user-doc -->
- * @generated
- */
- public void eUnset(int featureID) {
- switch (featureID) {
- case SymbolPackage.ITYPE_DESCRIPTOR__PROPERTIES:
- getProperties().clear();
- return;
- case SymbolPackage.ITYPE_DESCRIPTOR__SUPER_TYPE_SIGNATURES:
- getSuperTypeSignatures().clear();
- return;
- case SymbolPackage.ITYPE_DESCRIPTOR__INTERFACE_TYPE_SIGNATURES:
- getInterfaceTypeSignatures().clear();
- return;
- case SymbolPackage.ITYPE_DESCRIPTOR__TYPE_SIGNATURE_DELEGATE:
- setTypeSignatureDelegate(TYPE_SIGNATURE_DELEGATE_EDEFAULT);
- return;
- case SymbolPackage.ITYPE_DESCRIPTOR__METHODS:
- getMethods().clear();
- return;
- }
- super.eUnset(featureID);
- }
-
- /**
- * <!-- begin-user-doc -->
- * @param featureID
- * @return true if feature has been set
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean eIsSet(int featureID) {
- switch (featureID) {
- case SymbolPackage.ITYPE_DESCRIPTOR__PROPERTIES:
- return !getProperties().isEmpty();
- case SymbolPackage.ITYPE_DESCRIPTOR__TYPE_SIGNATURE:
- return TYPE_SIGNATURE_EDEFAULT == null ? getTypeSignature() != null : !TYPE_SIGNATURE_EDEFAULT.equals(getTypeSignature());
- case SymbolPackage.ITYPE_DESCRIPTOR__SUPER_TYPE_SIGNATURES:
- return !getSuperTypeSignatures().isEmpty();
- case SymbolPackage.ITYPE_DESCRIPTOR__INTERFACE_TYPE_SIGNATURES:
- return !getInterfaceTypeSignatures().isEmpty();
- case SymbolPackage.ITYPE_DESCRIPTOR__TYPE_SIGNATURE_DELEGATE:
- return TYPE_SIGNATURE_DELEGATE_EDEFAULT == null ? typeSignatureDelegate != null : !TYPE_SIGNATURE_DELEGATE_EDEFAULT.equals(typeSignatureDelegate);
- case SymbolPackage.ITYPE_DESCRIPTOR__METHODS:
- return !getMethods().isEmpty();
- }
- return super.eIsSet(featureID);
- }
-
- /**
- * <!-- begin-user-doc -->
- * @return the debug string format of the type signature
- * <!-- end-user-doc -->
- * @generated
- */
- public String toString() {
- if (eIsProxy()) return super.toString();
-
- StringBuffer result = new StringBuffer(super.toString());
- result.append(" (typeSignatureDelegate: "); //$NON-NLS-1$
- result.append(typeSignatureDelegate);
- result.append(')');
- return result.toString();
- }
-} //ITypeDescriptorImpl
-
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/impl/JavaUtil.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/impl/JavaUtil.java
deleted file mode 100644
index d635375..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/impl/JavaUtil.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2007 Oracle Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Oracle Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.context.symbol.internal.impl;
-
-import java.io.IOException;
-import java.io.Reader;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.ui.JavadocContentAccess;
-import org.eclipse.jst.jsf.common.JSFCommonPlugin;
-import org.eclipse.jst.jsf.common.util.JDTBeanIntrospector;
-import org.eclipse.jst.jsf.common.util.JDTBeanProperty;
-import org.eclipse.jst.jsf.common.util.TypeUtil;
-import org.eclipse.jst.jsf.context.symbol.IBeanMethodSymbol;
-import org.eclipse.jst.jsf.context.symbol.IBeanPropertySymbol;
-
-/**
- * Utility class for accessing jdt elements for jsf el symbols
- */
-public class JavaUtil {
-
- private JavaUtil() {
- // utility class
- }
-
- /**
- * @param method
- * @return the javadoc text for the given method. Will return null if no javadoc is found
- */
- public static String getMethodJavadoc(final IMethod method) {
- try {
- final Reader contentReader = JavadocContentAccess.getHTMLContentReader(method, true, true);
- if (contentReader != null) {
- return read(contentReader);
- }
- } catch (final JavaModelException e) {
- JSFCommonPlugin.log(IStatus.WARNING, "error reading javadoc for method '" + method.getElementName() + "'.", e); //$NON-NLS-1$ //$NON-NLS-2$
- }
- return null;
- }
-
- private static String read(final Reader rd) {
- final StringBuffer buffer= new StringBuffer();
- final char[] readBuffer= new char[2048];
-
- try {
- int n= rd.read(readBuffer);
- while (n > 0) {
- buffer.append(readBuffer, 0, n);
- n= rd.read(readBuffer);
- }
- return buffer.toString();
- } catch (final IOException x) {
- // should not happen, but otherwise simply ignore
- }
-
- return null;
- }
-
- /**
- * @param symbol - the method symbol to look for
- * @return the IMethod for the given method symbol. Will return <code>null</code>, if none is found.
- */
- public static IMethod findCorrespondingMethod(final IBeanMethodSymbol symbol) {
- final IType type = symbol.getOwner().getType();
- final JDTBeanIntrospector introspector = new JDTBeanIntrospector(type);
- final IMethod[] methods = introspector.getAllMethods();
- for (final IMethod method : methods) {
- if (method.getElementName().equals(symbol.getName())) {
- try {
- final String currentMethodsSignature = TypeUtil.resolveMethodSignature(method.getDeclaringType(),
- method.getSignature());
- if (currentMethodsSignature.equals(symbol.getSignature())) {
- return method;
- }
- } catch (final JavaModelException e) {
- JSFCommonPlugin.log(IStatus.WARNING, "error determining for method '" //$NON-NLS-1$
- + method.getElementName() + "'.", e); //$NON-NLS-1$
- }
- }
- }
- return null;
- }
-
- /**
- * @param propertySymbol - the property symbol to look for
- * @return a JDTBeanProperty for the given property symbol
- */
- public static JDTBeanProperty findCorrespondingJDTProperty(final IBeanPropertySymbol propertySymbol) {
- final JDTBeanIntrospector introspector = new JDTBeanIntrospector(propertySymbol.getOwner().getType());
- return introspector.getProperties().get(propertySymbol.getName());
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/impl/Messages.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/impl/Messages.java
deleted file mode 100644
index f731e4b..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/impl/Messages.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2008 Oracle Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Oracle Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.context.symbol.internal.impl;
-
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-/*package*/ class Messages
-{
- private static final String BUNDLE_NAME = "org.eclipse.jst.jsf.context.symbol.internal.impl.messages"; //$NON-NLS-1$
-
- private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle
- .getBundle(BUNDLE_NAME);
-
- private Messages()
- {
- // no external instantiation
- }
-
- public static String getString(String key)
- {
- try
- {
- return RESOURCE_BUNDLE.getString(key);
- }
- catch (MissingResourceException e)
- {
- return '!' + key + '!';
- }
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/impl/SymbolFactoryImpl.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/impl/SymbolFactoryImpl.java
deleted file mode 100644
index 75c59b8..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/impl/SymbolFactoryImpl.java
+++ /dev/null
@@ -1,426 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Oracle 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:
- * Cameron Bateman/Oracle - initial API and implementation
- *
- ********************************************************************************/
-package org.eclipse.jst.jsf.context.symbol.internal.impl;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EDataType;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.impl.EFactoryImpl;
-import org.eclipse.emf.ecore.plugin.EcorePlugin;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jst.jsf.common.internal.types.ValueType;
-import org.eclipse.jst.jsf.context.symbol.ERuntimeSource;
-import org.eclipse.jst.jsf.context.symbol.IBeanInstanceSymbol;
-import org.eclipse.jst.jsf.context.symbol.IBeanMethodSymbol;
-import org.eclipse.jst.jsf.context.symbol.IBeanPropertySymbol;
-import org.eclipse.jst.jsf.context.symbol.IBoundedJavaTypeDescriptor;
-import org.eclipse.jst.jsf.context.symbol.IBoundedListTypeDescriptor;
-import org.eclipse.jst.jsf.context.symbol.IBoundedMapTypeDescriptor;
-import org.eclipse.jst.jsf.context.symbol.IComponentSymbol;
-import org.eclipse.jst.jsf.context.symbol.IInstanceSymbol;
-import org.eclipse.jst.jsf.context.symbol.IJavaSymbol;
-import org.eclipse.jst.jsf.context.symbol.IJavaTypeDescriptor2;
-import org.eclipse.jst.jsf.context.symbol.IListTypeDescriptor;
-import org.eclipse.jst.jsf.context.symbol.IMapTypeDescriptor;
-import org.eclipse.jst.jsf.context.symbol.IMethodSymbol;
-import org.eclipse.jst.jsf.context.symbol.IPropertySymbol;
-import org.eclipse.jst.jsf.context.symbol.SymbolFactory;
-import org.eclipse.jst.jsf.context.symbol.SymbolPackage;
-
-
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model <b>Factory</b>.
- * <!-- end-user-doc -->
- * @generated
- */
-public class SymbolFactoryImpl extends EFactoryImpl implements SymbolFactory {
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public static final String copyright = "Copyright 2006 Oracle"; //$NON-NLS-1$
-
- /**
- * Creates the default factory implementation.
- * <!-- begin-user-doc -->
- * @return the SymbolFactory
- * <!-- end-user-doc -->
- * @generated
- */
- public static SymbolFactory init() {
- try {
- SymbolFactory theSymbolFactory = (SymbolFactory)EPackage.Registry.INSTANCE.getEFactory("http:///org/eclipse/jst/jsf/context/symbol.ecore"); //$NON-NLS-1$
- if (theSymbolFactory != null) {
- return theSymbolFactory;
- }
- }
- catch (Exception exception) {
- EcorePlugin.INSTANCE.log(exception);
- }
- return new SymbolFactoryImpl();
- }
-
- /**
- * Creates an instance of the factory.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public SymbolFactoryImpl() {
- super();
- }
-
- /**
- * <!-- begin-user-doc -->
- * @param eClass
- * @return the model instace for the model class
- * <!-- end-user-doc -->
- * @generated
- */
- public EObject create(EClass eClass) {
- switch (eClass.getClassifierID()) {
- case SymbolPackage.IBEAN_INSTANCE_SYMBOL: return createIBeanInstanceSymbol();
- case SymbolPackage.IBEAN_PROPERTY_SYMBOL: return createIBeanPropertySymbol();
- case SymbolPackage.IINSTANCE_SYMBOL: return createIInstanceSymbol();
- case SymbolPackage.IJAVA_SYMBOL: return createIJavaSymbol();
- case SymbolPackage.IJAVA_TYPE_DESCRIPTOR2: return createIJavaTypeDescriptor2();
- case SymbolPackage.IBEAN_METHOD_SYMBOL: return createIBeanMethodSymbol();
- case SymbolPackage.ICOMPONENT_SYMBOL: return createIComponentSymbol();
- case SymbolPackage.IPROPERTY_SYMBOL: return createIPropertySymbol();
- case SymbolPackage.IMAP_TYPE_DESCRIPTOR: return createIMapTypeDescriptor();
- case SymbolPackage.IMETHOD_SYMBOL: return createIMethodSymbol();
- case SymbolPackage.IBOUNDED_MAP_TYPE_DESCRIPTOR: return createIBoundedMapTypeDescriptor();
- case SymbolPackage.IBOUNDED_JAVA_TYPE_DESCRIPTOR: return createIBoundedJavaTypeDescriptor();
- case SymbolPackage.ILIST_TYPE_DESCRIPTOR: return createIListTypeDescriptor();
- case SymbolPackage.IBOUNDED_LIST_TYPE_DESCRIPTOR: return createIBoundedListTypeDescriptor();
- default:
- throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$
- }
- }
-
- /**
- * <!-- begin-user-doc -->
- * @param eDataType
- * @param initialValue
- * @return an object constructed from the initialValue string
- * <!-- end-user-doc -->
- * @generated
- */
- public Object createFromString(EDataType eDataType, String initialValue) {
- switch (eDataType.getClassifierID()) {
- case SymbolPackage.ERUNTIME_SOURCE:
- return createERuntimeSourceFromString(eDataType, initialValue);
- case SymbolPackage.ITYPE:
- return createITypeFromString(eDataType, initialValue);
- case SymbolPackage.IJAVA_ELEMENT:
- return createIJavaElementFromString(eDataType, initialValue);
- default:
- throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$
- }
- }
-
- /**
- * <!-- begin-user-doc -->
- * @param eDataType
- * @param instanceValue
- * @return the string equivelent of eDataType for the instance
- * <!-- end-user-doc -->
- * @generated
- */
- public String convertToString(EDataType eDataType, Object instanceValue) {
- switch (eDataType.getClassifierID()) {
- case SymbolPackage.ERUNTIME_SOURCE:
- return convertERuntimeSourceToString(eDataType, instanceValue);
- case SymbolPackage.ITYPE:
- return convertITypeToString(eDataType, instanceValue);
- case SymbolPackage.IJAVA_ELEMENT:
- return convertIJavaElementToString(eDataType, instanceValue);
- default:
- throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$
- }
- }
-
- /**
- * <!-- begin-user-doc -->
- * @return a new bean instance symbol
- * <!-- end-user-doc -->
- * @generated
- */
- public IBeanInstanceSymbol createIBeanInstanceSymbol() {
- IBeanInstanceSymbolImpl iBeanInstanceSymbol = new IBeanInstanceSymbolImpl();
- return iBeanInstanceSymbol;
- }
-
- /**
- * <!-- begin-user-doc -->
- * @return a new bean property symbol
- * <!-- end-user-doc -->
- * @generated
- */
- public IBeanPropertySymbol createIBeanPropertySymbol() {
- IBeanPropertySymbolImpl iBeanPropertySymbol = new IBeanPropertySymbolImpl();
- return iBeanPropertySymbol;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public IInstanceSymbol createIInstanceSymbol() {
- IInstanceSymbolImpl iInstanceSymbol = new IInstanceSymbolImpl();
- return iInstanceSymbol;
- }
-
- /**
- * <!-- begin-user-doc -->
- * @return a new java symbol
- * <!-- end-user-doc -->
- * @generated
- */
- public IJavaSymbol createIJavaSymbol() {
- IJavaSymbolImpl iJavaSymbol = new IJavaSymbolImpl();
- return iJavaSymbol;
- }
-
- /**
- * <!-- begin-user-doc -->
- * @return a new java type descriptor
- * <!-- end-user-doc -->
- * @generated
- */
- public IJavaTypeDescriptor2 createIJavaTypeDescriptor2() {
- IJavaTypeDescriptor2Impl iJavaTypeDescriptor2 = new IJavaTypeDescriptor2Impl();
- return iJavaTypeDescriptor2;
- }
-
- /**
- * <!-- begin-user-doc -->
- * @return a new bean method symbol
- * <!-- end-user-doc -->
- * @generated
- */
- public IBeanMethodSymbol createIBeanMethodSymbol() {
- IBeanMethodSymbolImpl iBeanMethodSymbol = new IBeanMethodSymbolImpl();
- return iBeanMethodSymbol;
- }
-
- /**
- * <!-- begin-user-doc -->
- * @return a new component derived symbol
- * <!-- end-user-doc -->
- * @generated
- */
- public IComponentSymbol createIComponentSymbol() {
- IComponentSymbolImpl iComponentSymbol = new IComponentSymbolImpl();
- return iComponentSymbol;
- }
-
- /**
- * <!-- begin-user-doc -->
- * @return a new property symbol
- * <!-- end-user-doc -->
- * @generated
- */
- public IPropertySymbol createIPropertySymbol() {
- IPropertySymbolImpl iPropertySymbol = new IPropertySymbolImpl();
- return iPropertySymbol;
- }
-
- /**
- * <!-- begin-user-doc -->
- * @return create map type descriptor
- * <!-- end-user-doc -->
- * @generated
- */
- public IMapTypeDescriptor createIMapTypeDescriptor() {
- IMapTypeDescriptorImpl iMapTypeDescriptor = new IMapTypeDescriptorImpl();
- return iMapTypeDescriptor;
- }
-
- /**
- * <!-- begin-user-doc -->
- * @return the method symbol
- * <!-- end-user-doc -->
- * @generated
- */
- public IMethodSymbol createIMethodSymbol() {
- IMethodSymbolImpl iMethodSymbol = new IMethodSymbolImpl();
- return iMethodSymbol;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public IBoundedMapTypeDescriptor createIBoundedMapTypeDescriptor() {
- IBoundedMapTypeDescriptorImpl iBoundedMapTypeDescriptor = new IBoundedMapTypeDescriptorImpl();
- return iBoundedMapTypeDescriptor;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public IBoundedJavaTypeDescriptor createIBoundedJavaTypeDescriptor() {
- IBoundedJavaTypeDescriptorImpl iBoundedJavaTypeDescriptor = new IBoundedJavaTypeDescriptorImpl();
- return iBoundedJavaTypeDescriptor;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public IListTypeDescriptor createIListTypeDescriptor() {
- IListTypeDescriptorImpl iListTypeDescriptor = new IListTypeDescriptorImpl();
- return iListTypeDescriptor;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public IBoundedListTypeDescriptor createIBoundedListTypeDescriptor() {
- IBoundedListTypeDescriptorImpl iBoundedListTypeDescriptor = new IBoundedListTypeDescriptorImpl();
- return iBoundedListTypeDescriptor;
- }
-
- /**
- * <!-- begin-user-doc -->
- * @param eDataType
- * @param initialValue
- * @return
- * <!-- end-user-doc -->
- * @generated
- */
- public ERuntimeSource createERuntimeSourceFromString(EDataType eDataType, String initialValue) {
- ERuntimeSource result = ERuntimeSource.get(initialValue);
- if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- return result;
- }
-
- /**
- * <!-- begin-user-doc -->
- * @param eDataType
- * @param instanceValue
- * @return the converted runtime source
- * <!-- end-user-doc -->
- * @generated
- */
- public String convertERuntimeSourceToString(EDataType eDataType, Object instanceValue) {
- return instanceValue == null ? null : instanceValue.toString();
- }
-
- /**
- * <!-- begin-user-doc -->
- * @param eDataType
- * @param initialValue
- * @return
- * <!-- end-user-doc -->
- * @generated
- */
- public IType createITypeFromString(EDataType eDataType, String initialValue) {
- return (IType)super.createFromString(eDataType, initialValue);
- }
-
- /**
- * <!-- begin-user-doc -->
- * @param eDataType
- * @param instanceValue
- * @return the converted string
- * <!-- end-user-doc -->
- * @generated
- */
- public String convertITypeToString(EDataType eDataType, Object instanceValue) {
- return super.convertToString(eDataType, instanceValue);
- }
-
- /**
- * <!-- begin-user-doc -->
- * @param eDataType
- * @param initialValue
- * @return return the java element
- * <!-- end-user-doc -->
- * @generated
- */
- public IJavaElement createIJavaElementFromString(EDataType eDataType, String initialValue) {
- return (IJavaElement)super.createFromString(eDataType, initialValue);
- }
-
- /**
- * <!-- begin-user-doc -->
- * @param eDataType
- * @param instanceValue
- * @return the converted string
- * <!-- end-user-doc -->
- * @generated
- */
- public String convertIJavaElementToString(EDataType eDataType, Object instanceValue) {
- return super.convertToString(eDataType, instanceValue);
- }
-
- /**
- * <!-- begin-user-doc -->
- * @param eDataType
- * @param initialValue
- * @return the value type for the data type
- * <!-- end-user-doc -->
- * @generated
- */
- public ValueType createValueTypeFromString(EDataType eDataType, String initialValue) {
- return (ValueType)super.createFromString(eDataType, initialValue);
- }
-
- /**
- * <!-- begin-user-doc -->
- * @param eDataType
- * @param instanceValue
- * @return the string for the value type
- * <!-- end-user-doc -->
- * @generated
- */
- public String convertValueTypeToString(EDataType eDataType, Object instanceValue) {
- return super.convertToString(eDataType, instanceValue);
- }
-
- /**
- * <!-- begin-user-doc -->
- * @return the symbol package
- * <!-- end-user-doc -->
- * @generated
- */
- public SymbolPackage getSymbolPackage() {
- return (SymbolPackage)getEPackage();
- }
-
- /**
- * <!-- begin-user-doc -->
- * @return get the symbol package
- * <!-- end-user-doc -->
- * @deprecated
- * @generated
- */
- public static SymbolPackage getPackage() {
- return SymbolPackage.eINSTANCE;
- }
-
-} //SymbolFactoryImpl
-
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/impl/SymbolPackageImpl.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/impl/SymbolPackageImpl.java
deleted file mode 100644
index bcb6cca..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/impl/SymbolPackageImpl.java
+++ /dev/null
@@ -1,1032 +0,0 @@
-/**
- * Copyright 2006 Oracle
- *
- * $Id: SymbolPackageImpl.java,v 1.8 2008/11/18 22:24:43 gkessler Exp $
- */
-package org.eclipse.jst.jsf.context.symbol.internal.impl;
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EDataType;
-import org.eclipse.emf.ecore.EEnum;
-import org.eclipse.emf.ecore.EOperation;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EReference;
-
-import org.eclipse.emf.ecore.impl.EPackageImpl;
-
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IType;
-
-import org.eclipse.jst.jsf.common.internal.types.ValueType;
-
-import org.eclipse.jst.jsf.context.symbol.ERuntimeSource;
-import org.eclipse.jst.jsf.context.symbol.IBeanInstanceSymbol;
-import org.eclipse.jst.jsf.context.symbol.IBeanMethodSymbol;
-import org.eclipse.jst.jsf.context.symbol.IBeanPropertySymbol;
-import org.eclipse.jst.jsf.context.symbol.IBoundedJavaTypeDescriptor;
-import org.eclipse.jst.jsf.context.symbol.IBoundedListTypeDescriptor;
-import org.eclipse.jst.jsf.context.symbol.IBoundedMapTypeDescriptor;
-import org.eclipse.jst.jsf.context.symbol.IBoundedTypeDescriptor;
-import org.eclipse.jst.jsf.context.symbol.IComponentSymbol;
-import org.eclipse.jst.jsf.context.symbol.IDescribedInDetail;
-import org.eclipse.jst.jsf.context.symbol.IInstanceSymbol;
-import org.eclipse.jst.jsf.context.symbol.IJavaSymbol;
-import org.eclipse.jst.jsf.context.symbol.IJavaTypeDescriptor2;
-import org.eclipse.jst.jsf.context.symbol.IListTypeDescriptor;
-import org.eclipse.jst.jsf.context.symbol.IMapTypeDescriptor;
-import org.eclipse.jst.jsf.context.symbol.IMethodSymbol;
-import org.eclipse.jst.jsf.context.symbol.IObjectSymbol;
-import org.eclipse.jst.jsf.context.symbol.IPropertySymbol;
-import org.eclipse.jst.jsf.context.symbol.ISymbol;
-import org.eclipse.jst.jsf.context.symbol.ITypeDescriptor;
-import org.eclipse.jst.jsf.context.symbol.SymbolFactory;
-import org.eclipse.jst.jsf.context.symbol.SymbolPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model <b>Package</b>.
- * <!-- end-user-doc -->
- * @generated
- */
-public class SymbolPackageImpl extends EPackageImpl implements SymbolPackage {
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public static final String copyright = "Copyright 2006 Oracle"; //$NON-NLS-1$
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private EClass iBeanInstanceSymbolEClass = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private EClass iBeanPropertySymbolEClass = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private EClass iInstanceSymbolEClass = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private EClass iJavaSymbolEClass = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private EClass iSymbolEClass = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private EClass iTypeDescriptorEClass = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private EClass iDescribedInDetailEClass = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private EClass iJavaTypeDescriptor2EClass = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private EClass iBeanMethodSymbolEClass = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private EClass iComponentSymbolEClass = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private EClass iPropertySymbolEClass = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private EClass iMapTypeDescriptorEClass = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private EClass iMethodSymbolEClass = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private EClass iObjectSymbolEClass = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private EClass iBoundedTypeDescriptorEClass = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private EClass iBoundedMapTypeDescriptorEClass = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private EClass iBoundedJavaTypeDescriptorEClass = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private EClass iListTypeDescriptorEClass = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private EClass iBoundedListTypeDescriptorEClass = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private EEnum eRuntimeSourceEEnum = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private EDataType iTypeEDataType = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private EDataType iJavaElementEDataType = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private EDataType valueTypeEDataType = 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.jst.jsf.context.symbol.SymbolPackage#eNS_URI
- * @see #init()
- * @generated
- */
- private SymbolPackageImpl() {
- super(eNS_URI, SymbolFactory.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 -->
- * @return the symbols package
- * <!-- end-user-doc -->
- * @see #eNS_URI
- * @see #createPackageContents()
- * @see #initializePackageContents()
- * @generated
- */
- public static SymbolPackage init() {
- if (isInited) return (SymbolPackage)EPackage.Registry.INSTANCE.getEPackage(SymbolPackage.eNS_URI);
-
- // Obtain or create and register package
- SymbolPackageImpl theSymbolPackage = (SymbolPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(eNS_URI) instanceof SymbolPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(eNS_URI) : new SymbolPackageImpl());
-
- isInited = true;
-
- // Create package meta-data objects
- theSymbolPackage.createPackageContents();
-
- // Initialize created meta-data
- theSymbolPackage.initializePackageContents();
-
- // Mark meta-data to indicate it can't be changed
- theSymbolPackage.freeze();
-
- return theSymbolPackage;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EClass getIBeanInstanceSymbol() {
- return iBeanInstanceSymbolEClass;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EReference getIBeanInstanceSymbol_Properties() {
- return (EReference)iBeanInstanceSymbolEClass.getEStructuralFeatures().get(0);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EReference getIBeanInstanceSymbol_Methods() {
- return (EReference)iBeanInstanceSymbolEClass.getEStructuralFeatures().get(1);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EClass getIBeanPropertySymbol() {
- return iBeanPropertySymbolEClass;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EReference getIBeanPropertySymbol_Owner() {
- return (EReference)iBeanPropertySymbolEClass.getEStructuralFeatures().get(0);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EClass getIInstanceSymbol() {
- return iInstanceSymbolEClass;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getIInstanceSymbol_TypeResolved() {
- return (EAttribute)iInstanceSymbolEClass.getEStructuralFeatures().get(0);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getIInstanceSymbol_RuntimeSource() {
- return (EAttribute)iInstanceSymbolEClass.getEStructuralFeatures().get(1);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EClass getIJavaSymbol() {
- return iJavaSymbolEClass;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getIJavaSymbol_JavaElement() {
- return (EAttribute)iJavaSymbolEClass.getEStructuralFeatures().get(0);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EClass getISymbol() {
- return iSymbolEClass;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getISymbol_Name() {
- return (EAttribute)iSymbolEClass.getEStructuralFeatures().get(0);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EClass getITypeDescriptor() {
- return iTypeDescriptorEClass;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EReference getITypeDescriptor_Properties() {
- return (EReference)iTypeDescriptorEClass.getEStructuralFeatures().get(0);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getITypeDescriptor_TypeSignature() {
- return (EAttribute)iTypeDescriptorEClass.getEStructuralFeatures().get(1);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getITypeDescriptor_SuperTypeSignatures() {
- return (EAttribute)iTypeDescriptorEClass.getEStructuralFeatures().get(2);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getITypeDescriptor_InterfaceTypeSignatures() {
- return (EAttribute)iTypeDescriptorEClass.getEStructuralFeatures().get(3);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getITypeDescriptor_TypeSignatureDelegate() {
- return (EAttribute)iTypeDescriptorEClass.getEStructuralFeatures().get(4);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EReference getITypeDescriptor_Methods() {
- return (EReference)iTypeDescriptorEClass.getEStructuralFeatures().get(5);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getITypeDescriptor_TypeParameterSignatures() {
- return (EAttribute)iTypeDescriptorEClass.getEStructuralFeatures().get(6);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getITypeDescriptor_JdtContext() {
- return (EAttribute)iTypeDescriptorEClass.getEStructuralFeatures().get(7);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getITypeDescriptor_EnumType() {
- return (EAttribute)iTypeDescriptorEClass.getEStructuralFeatures().get(8);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EClass getIDescribedInDetail() {
- return iDescribedInDetailEClass;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EClass getIJavaTypeDescriptor2() {
- return iJavaTypeDescriptor2EClass;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getIJavaTypeDescriptor2_Type() {
- return (EAttribute)iJavaTypeDescriptor2EClass.getEStructuralFeatures().get(0);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EReference getIJavaTypeDescriptor2_BeanProperties() {
- return (EReference)iJavaTypeDescriptor2EClass.getEStructuralFeatures().get(1);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EReference getIJavaTypeDescriptor2_BeanMethods() {
- return (EReference)iJavaTypeDescriptor2EClass.getEStructuralFeatures().get(2);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getIJavaTypeDescriptor2_ArrayCount() {
- return (EAttribute)iJavaTypeDescriptor2EClass.getEStructuralFeatures().get(3);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EClass getIBeanMethodSymbol() {
- return iBeanMethodSymbolEClass;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EReference getIBeanMethodSymbol_Owner() {
- return (EReference)iBeanMethodSymbolEClass.getEStructuralFeatures().get(0);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EClass getIComponentSymbol() {
- return iComponentSymbolEClass;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EClass getIPropertySymbol() {
- return iPropertySymbolEClass;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getIPropertySymbol_Intermediate() {
- return (EAttribute)iPropertySymbolEClass.getEStructuralFeatures().get(0);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EClass getIMapTypeDescriptor() {
- return iMapTypeDescriptorEClass;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getIMapTypeDescriptor_MapSource() {
- return (EAttribute)iMapTypeDescriptorEClass.getEStructuralFeatures().get(0);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getIMapTypeDescriptor_Immutable() {
- return (EAttribute)iMapTypeDescriptorEClass.getEStructuralFeatures().get(1);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EClass getIMethodSymbol() {
- return iMethodSymbolEClass;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getIMethodSymbol_Signature() {
- return (EAttribute)iMethodSymbolEClass.getEStructuralFeatures().get(0);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EClass getIObjectSymbol() {
- return iObjectSymbolEClass;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EReference getIObjectSymbol_TypeDescriptor() {
- return (EReference)iObjectSymbolEClass.getEStructuralFeatures().get(0);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getIObjectSymbol_Readable() {
- return (EAttribute)iObjectSymbolEClass.getEStructuralFeatures().get(1);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getIObjectSymbol_Writable() {
- return (EAttribute)iObjectSymbolEClass.getEStructuralFeatures().get(2);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EClass getIBoundedTypeDescriptor() {
- return iBoundedTypeDescriptorEClass;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EClass getIBoundedMapTypeDescriptor() {
- return iBoundedMapTypeDescriptorEClass;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EClass getIBoundedJavaTypeDescriptor() {
- return iBoundedJavaTypeDescriptorEClass;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EClass getIListTypeDescriptor() {
- return iListTypeDescriptorEClass;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getIListTypeDescriptor_ListSource() {
- return (EAttribute)iListTypeDescriptorEClass.getEStructuralFeatures().get(0);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EClass getIBoundedListTypeDescriptor() {
- return iBoundedListTypeDescriptorEClass;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EEnum getERuntimeSource() {
- return eRuntimeSourceEEnum;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EDataType getIType() {
- return iTypeEDataType;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EDataType getIJavaElement() {
- return iJavaElementEDataType;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EDataType getValueType() {
- return valueTypeEDataType;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public SymbolFactory getSymbolFactory() {
- return (SymbolFactory)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
- iBeanInstanceSymbolEClass = createEClass(IBEAN_INSTANCE_SYMBOL);
- createEReference(iBeanInstanceSymbolEClass, IBEAN_INSTANCE_SYMBOL__PROPERTIES);
- createEReference(iBeanInstanceSymbolEClass, IBEAN_INSTANCE_SYMBOL__METHODS);
-
- iBeanPropertySymbolEClass = createEClass(IBEAN_PROPERTY_SYMBOL);
- createEReference(iBeanPropertySymbolEClass, IBEAN_PROPERTY_SYMBOL__OWNER);
-
- iInstanceSymbolEClass = createEClass(IINSTANCE_SYMBOL);
- createEAttribute(iInstanceSymbolEClass, IINSTANCE_SYMBOL__TYPE_RESOLVED);
- createEAttribute(iInstanceSymbolEClass, IINSTANCE_SYMBOL__RUNTIME_SOURCE);
-
- iJavaSymbolEClass = createEClass(IJAVA_SYMBOL);
- createEAttribute(iJavaSymbolEClass, IJAVA_SYMBOL__JAVA_ELEMENT);
-
- iSymbolEClass = createEClass(ISYMBOL);
- createEAttribute(iSymbolEClass, ISYMBOL__NAME);
-
- iTypeDescriptorEClass = createEClass(ITYPE_DESCRIPTOR);
- createEReference(iTypeDescriptorEClass, ITYPE_DESCRIPTOR__PROPERTIES);
- createEAttribute(iTypeDescriptorEClass, ITYPE_DESCRIPTOR__TYPE_SIGNATURE);
- createEAttribute(iTypeDescriptorEClass, ITYPE_DESCRIPTOR__SUPER_TYPE_SIGNATURES);
- createEAttribute(iTypeDescriptorEClass, ITYPE_DESCRIPTOR__INTERFACE_TYPE_SIGNATURES);
- createEAttribute(iTypeDescriptorEClass, ITYPE_DESCRIPTOR__TYPE_SIGNATURE_DELEGATE);
- createEReference(iTypeDescriptorEClass, ITYPE_DESCRIPTOR__METHODS);
- createEAttribute(iTypeDescriptorEClass, ITYPE_DESCRIPTOR__TYPE_PARAMETER_SIGNATURES);
- createEAttribute(iTypeDescriptorEClass, ITYPE_DESCRIPTOR__JDT_CONTEXT);
- createEAttribute(iTypeDescriptorEClass, ITYPE_DESCRIPTOR__ENUM_TYPE);
-
- iDescribedInDetailEClass = createEClass(IDESCRIBED_IN_DETAIL);
-
- iJavaTypeDescriptor2EClass = createEClass(IJAVA_TYPE_DESCRIPTOR2);
- createEAttribute(iJavaTypeDescriptor2EClass, IJAVA_TYPE_DESCRIPTOR2__TYPE);
- createEReference(iJavaTypeDescriptor2EClass, IJAVA_TYPE_DESCRIPTOR2__BEAN_PROPERTIES);
- createEReference(iJavaTypeDescriptor2EClass, IJAVA_TYPE_DESCRIPTOR2__BEAN_METHODS);
- createEAttribute(iJavaTypeDescriptor2EClass, IJAVA_TYPE_DESCRIPTOR2__ARRAY_COUNT);
-
- iBeanMethodSymbolEClass = createEClass(IBEAN_METHOD_SYMBOL);
- createEReference(iBeanMethodSymbolEClass, IBEAN_METHOD_SYMBOL__OWNER);
-
- iComponentSymbolEClass = createEClass(ICOMPONENT_SYMBOL);
-
- iPropertySymbolEClass = createEClass(IPROPERTY_SYMBOL);
- createEAttribute(iPropertySymbolEClass, IPROPERTY_SYMBOL__INTERMEDIATE);
-
- iMapTypeDescriptorEClass = createEClass(IMAP_TYPE_DESCRIPTOR);
- createEAttribute(iMapTypeDescriptorEClass, IMAP_TYPE_DESCRIPTOR__MAP_SOURCE);
- createEAttribute(iMapTypeDescriptorEClass, IMAP_TYPE_DESCRIPTOR__IMMUTABLE);
-
- iMethodSymbolEClass = createEClass(IMETHOD_SYMBOL);
- createEAttribute(iMethodSymbolEClass, IMETHOD_SYMBOL__SIGNATURE);
-
- iObjectSymbolEClass = createEClass(IOBJECT_SYMBOL);
- createEReference(iObjectSymbolEClass, IOBJECT_SYMBOL__TYPE_DESCRIPTOR);
- createEAttribute(iObjectSymbolEClass, IOBJECT_SYMBOL__READABLE);
- createEAttribute(iObjectSymbolEClass, IOBJECT_SYMBOL__WRITABLE);
-
- iBoundedTypeDescriptorEClass = createEClass(IBOUNDED_TYPE_DESCRIPTOR);
-
- iBoundedMapTypeDescriptorEClass = createEClass(IBOUNDED_MAP_TYPE_DESCRIPTOR);
-
- iBoundedJavaTypeDescriptorEClass = createEClass(IBOUNDED_JAVA_TYPE_DESCRIPTOR);
-
- iListTypeDescriptorEClass = createEClass(ILIST_TYPE_DESCRIPTOR);
- createEAttribute(iListTypeDescriptorEClass, ILIST_TYPE_DESCRIPTOR__LIST_SOURCE);
-
- iBoundedListTypeDescriptorEClass = createEClass(IBOUNDED_LIST_TYPE_DESCRIPTOR);
-
- // Create enums
- eRuntimeSourceEEnum = createEEnum(ERUNTIME_SOURCE);
-
- // Create data types
- iTypeEDataType = createEDataType(ITYPE);
- iJavaElementEDataType = createEDataType(IJAVA_ELEMENT);
- valueTypeEDataType = createEDataType(VALUE_TYPE);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private boolean isInitialized = false;
-
- /**
- * Complete the initialization of the package and its meta-model. This
- * method is guarded to have no affect on any invocation but its first.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void initializePackageContents() {
- if (isInitialized) return;
- isInitialized = true;
-
- // Initialize package
- setName(eNAME);
- setNsPrefix(eNS_PREFIX);
- setNsURI(eNS_URI);
-
- // Add supertypes to classes
- iBeanInstanceSymbolEClass.getESuperTypes().add(this.getIInstanceSymbol());
- iBeanInstanceSymbolEClass.getESuperTypes().add(this.getIDescribedInDetail());
- iBeanPropertySymbolEClass.getESuperTypes().add(this.getIPropertySymbol());
- iBeanPropertySymbolEClass.getESuperTypes().add(this.getIDescribedInDetail());
- iInstanceSymbolEClass.getESuperTypes().add(this.getIObjectSymbol());
- iJavaSymbolEClass.getESuperTypes().add(this.getISymbol());
- iJavaTypeDescriptor2EClass.getESuperTypes().add(this.getITypeDescriptor());
- iBeanMethodSymbolEClass.getESuperTypes().add(this.getIDescribedInDetail());
- iBeanMethodSymbolEClass.getESuperTypes().add(this.getIMethodSymbol());
- iComponentSymbolEClass.getESuperTypes().add(this.getIInstanceSymbol());
- iComponentSymbolEClass.getESuperTypes().add(this.getIDescribedInDetail());
- iPropertySymbolEClass.getESuperTypes().add(this.getIObjectSymbol());
- iMapTypeDescriptorEClass.getESuperTypes().add(this.getITypeDescriptor());
- iMethodSymbolEClass.getESuperTypes().add(this.getISymbol());
- iObjectSymbolEClass.getESuperTypes().add(this.getISymbol());
- iBoundedTypeDescriptorEClass.getESuperTypes().add(this.getITypeDescriptor());
- iBoundedMapTypeDescriptorEClass.getESuperTypes().add(this.getIMapTypeDescriptor());
- iBoundedMapTypeDescriptorEClass.getESuperTypes().add(this.getIBoundedTypeDescriptor());
- iBoundedJavaTypeDescriptorEClass.getESuperTypes().add(this.getIJavaTypeDescriptor2());
- iBoundedJavaTypeDescriptorEClass.getESuperTypes().add(this.getIBoundedTypeDescriptor());
- iListTypeDescriptorEClass.getESuperTypes().add(this.getITypeDescriptor());
- iBoundedListTypeDescriptorEClass.getESuperTypes().add(this.getIListTypeDescriptor());
- iBoundedListTypeDescriptorEClass.getESuperTypes().add(this.getIBoundedTypeDescriptor());
-
- // Initialize classes and features; add operations and parameters
- initEClass(iBeanInstanceSymbolEClass, IBeanInstanceSymbol.class, "IBeanInstanceSymbol", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEReference(getIBeanInstanceSymbol_Properties(), this.getIBeanPropertySymbol(), null, "properties", null, 0, -1, IBeanInstanceSymbol.class, !IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getIBeanInstanceSymbol_Methods(), this.getIBeanMethodSymbol(), null, "methods", null, 0, -1, IBeanInstanceSymbol.class, !IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
- addEOperation(iBeanInstanceSymbolEClass, this.getIJavaTypeDescriptor2(), "getJavaTypeDescriptor", 0, 1); //$NON-NLS-1$
-
- EOperation op = addEOperation(iBeanInstanceSymbolEClass, null, "setJavaTypeDescriptor"); //$NON-NLS-1$
- addEParameter(op, this.getIJavaTypeDescriptor2(), "newTypeDescriptor", 0, 1); //$NON-NLS-1$
-
- initEClass(iBeanPropertySymbolEClass, IBeanPropertySymbol.class, "IBeanPropertySymbol", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEReference(getIBeanPropertySymbol_Owner(), this.getIJavaTypeDescriptor2(), null, "owner", null, 0, 1, IBeanPropertySymbol.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
- initEClass(iInstanceSymbolEClass, IInstanceSymbol.class, "IInstanceSymbol", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEAttribute(getIInstanceSymbol_TypeResolved(), ecorePackage.getEBoolean(), "typeResolved", null, 0, 1, IInstanceSymbol.class, !IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getIInstanceSymbol_RuntimeSource(), this.getERuntimeSource(), "runtimeSource", "TAG_INSTANTIATED_SYMBOL", 0, 1, IInstanceSymbol.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
-
- initEClass(iJavaSymbolEClass, IJavaSymbol.class, "IJavaSymbol", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEAttribute(getIJavaSymbol_JavaElement(), this.getIJavaElement(), "javaElement", null, 0, 1, IJavaSymbol.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
- initEClass(iSymbolEClass, ISymbol.class, "ISymbol", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEAttribute(getISymbol_Name(), ecorePackage.getEString(), "name", null, 0, 1, ISymbol.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
- initEClass(iTypeDescriptorEClass, ITypeDescriptor.class, "ITypeDescriptor", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEReference(getITypeDescriptor_Properties(), this.getIPropertySymbol(), null, "properties", null, 0, -1, ITypeDescriptor.class, !IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getITypeDescriptor_TypeSignature(), ecorePackage.getEString(), "typeSignature", "", 0, 1, ITypeDescriptor.class, !IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
- initEAttribute(getITypeDescriptor_SuperTypeSignatures(), ecorePackage.getEString(), "superTypeSignatures", null, 0, -1, ITypeDescriptor.class, !IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getITypeDescriptor_InterfaceTypeSignatures(), ecorePackage.getEString(), "interfaceTypeSignatures", null, 0, -1, ITypeDescriptor.class, !IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getITypeDescriptor_TypeSignatureDelegate(), ecorePackage.getEString(), "typeSignatureDelegate", null, 0, 1, ITypeDescriptor.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getITypeDescriptor_Methods(), this.getIMethodSymbol(), null, "methods", null, 0, -1, ITypeDescriptor.class, !IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getITypeDescriptor_TypeParameterSignatures(), ecorePackage.getEString(), "typeParameterSignatures", null, 0, -1, ITypeDescriptor.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getITypeDescriptor_JdtContext(), this.getIJavaElement(), "jdtContext", null, 0, 1, ITypeDescriptor.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getITypeDescriptor_EnumType(), ecorePackage.getEBoolean(), "enumType", null, 0, 1, ITypeDescriptor.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
- op = addEOperation(iTypeDescriptorEClass, ecorePackage.getEBoolean(), "instanceOf", 0, 1); //$NON-NLS-1$
- addEParameter(op, ecorePackage.getEString(), "typeSignature", 0, 1); //$NON-NLS-1$
-
- addEOperation(iTypeDescriptorEClass, ecorePackage.getEBoolean(), "isArray", 0, 1); //$NON-NLS-1$
-
- addEOperation(iTypeDescriptorEClass, this.getIObjectSymbol(), "getArrayElement", 0, 1); //$NON-NLS-1$
-
- op = addEOperation(iTypeDescriptorEClass, this.getIType(), "resolveType", 0, 1); //$NON-NLS-1$
- addEParameter(op, ecorePackage.getEString(), "resolvedTypeSignature", 0, 1); //$NON-NLS-1$
-
- op = addEOperation(iTypeDescriptorEClass, this.getISymbol(), "calculateSyntheticCall", 0, 1); //$NON-NLS-1$
- addEParameter(op, ecorePackage.getEString(), "methodName", 0, 1); //$NON-NLS-1$
- addEParameter(op, this.getValueType(), "methodArgs", 0, -1); //$NON-NLS-1$
- addEParameter(op, ecorePackage.getEString(), "symbolName", 0, 1); //$NON-NLS-1$
-
- initEClass(iDescribedInDetailEClass, IDescribedInDetail.class, "IDescribedInDetail", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-
- initEClass(iJavaTypeDescriptor2EClass, IJavaTypeDescriptor2.class, "IJavaTypeDescriptor2", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEAttribute(getIJavaTypeDescriptor2_Type(), this.getIType(), "type", null, 0, 1, IJavaTypeDescriptor2.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getIJavaTypeDescriptor2_BeanProperties(), this.getIBeanPropertySymbol(), null, "beanProperties", null, 0, -1, IJavaTypeDescriptor2.class, !IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getIJavaTypeDescriptor2_BeanMethods(), this.getIBeanPropertySymbol(), null, "beanMethods", null, 0, -1, IJavaTypeDescriptor2.class, !IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getIJavaTypeDescriptor2_ArrayCount(), ecorePackage.getEInt(), "arrayCount", null, 0, 1, IJavaTypeDescriptor2.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
- initEClass(iBeanMethodSymbolEClass, IBeanMethodSymbol.class, "IBeanMethodSymbol", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEReference(getIBeanMethodSymbol_Owner(), this.getIJavaTypeDescriptor2(), null, "owner", null, 0, 1, IBeanMethodSymbol.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
- initEClass(iComponentSymbolEClass, IComponentSymbol.class, "IComponentSymbol", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-
- initEClass(iPropertySymbolEClass, IPropertySymbol.class, "IPropertySymbol", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEAttribute(getIPropertySymbol_Intermediate(), ecorePackage.getEBoolean(), "intermediate", null, 0, 1, IPropertySymbol.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
- initEClass(iMapTypeDescriptorEClass, IMapTypeDescriptor.class, "IMapTypeDescriptor", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEAttribute(getIMapTypeDescriptor_MapSource(), ecorePackage.getEMap(), "mapSource", null, 0, 1, IMapTypeDescriptor.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getIMapTypeDescriptor_Immutable(), ecorePackage.getEBoolean(), "immutable", "true", 0, 1, IMapTypeDescriptor.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
-
- initEClass(iMethodSymbolEClass, IMethodSymbol.class, "IMethodSymbol", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEAttribute(getIMethodSymbol_Signature(), ecorePackage.getEString(), "signature", null, 0, 1, IMethodSymbol.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
- initEClass(iObjectSymbolEClass, IObjectSymbol.class, "IObjectSymbol", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEReference(getIObjectSymbol_TypeDescriptor(), this.getITypeDescriptor(), null, "typeDescriptor", null, 0, 1, IObjectSymbol.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getIObjectSymbol_Readable(), ecorePackage.getEBoolean(), "readable", null, 0, 1, IObjectSymbol.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getIObjectSymbol_Writable(), ecorePackage.getEBoolean(), "writable", null, 0, 1, IObjectSymbol.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
- op = addEOperation(iObjectSymbolEClass, ecorePackage.getEBoolean(), "supportsCoercion", 0, 1); //$NON-NLS-1$
- addEParameter(op, ecorePackage.getEString(), "typeSignature", 0, 1); //$NON-NLS-1$
-
- op = addEOperation(iObjectSymbolEClass, this.getITypeDescriptor(), "coerce", 0, 1); //$NON-NLS-1$
- addEParameter(op, ecorePackage.getEString(), "typeSignature", 0, 1); //$NON-NLS-1$
-
- op = addEOperation(iObjectSymbolEClass, this.getISymbol(), "call", 0, 1); //$NON-NLS-1$
- addEParameter(op, ecorePackage.getEString(), "methodName", 0, 1); //$NON-NLS-1$
- addEParameter(op, this.getValueType(), "methodArguments", 0, -1); //$NON-NLS-1$
- addEParameter(op, ecorePackage.getEString(), "symbolName", 0, 1); //$NON-NLS-1$
-
- initEClass(iBoundedTypeDescriptorEClass, IBoundedTypeDescriptor.class, "IBoundedTypeDescriptor", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-
- op = addEOperation(iBoundedTypeDescriptorEClass, ecorePackage.getEBoolean(), "isUnboundedForType", 0, 1); //$NON-NLS-1$
- addEParameter(op, ecorePackage.getEString(), "typeSignature", 0, 1); //$NON-NLS-1$
-
- op = addEOperation(iBoundedTypeDescriptorEClass, this.getISymbol(), "getUnboundedProperty", 0, 1); //$NON-NLS-1$
- addEParameter(op, ecorePackage.getEJavaObject(), "name", 0, 1); //$NON-NLS-1$
- addEParameter(op, ecorePackage.getEString(), "typeSignature", 0, 1); //$NON-NLS-1$
-
- initEClass(iBoundedMapTypeDescriptorEClass, IBoundedMapTypeDescriptor.class, "IBoundedMapTypeDescriptor", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-
- initEClass(iBoundedJavaTypeDescriptorEClass, IBoundedJavaTypeDescriptor.class, "IBoundedJavaTypeDescriptor", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-
- initEClass(iListTypeDescriptorEClass, IListTypeDescriptor.class, "IListTypeDescriptor", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEAttribute(getIListTypeDescriptor_ListSource(), ecorePackage.getEEList(), "listSource", null, 0, 1, IListTypeDescriptor.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
- initEClass(iBoundedListTypeDescriptorEClass, IBoundedListTypeDescriptor.class, "IBoundedListTypeDescriptor", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-
- // Initialize enums and add enum literals
- initEEnum(eRuntimeSourceEEnum, ERuntimeSource.class, "ERuntimeSource"); //$NON-NLS-1$
- addEEnumLiteral(eRuntimeSourceEEnum, ERuntimeSource.BUILT_IN_SYMBOL_LITERAL);
- addEEnumLiteral(eRuntimeSourceEEnum, ERuntimeSource.MANAGED_BEAN_SYMBOL_LITERAL);
- addEEnumLiteral(eRuntimeSourceEEnum, ERuntimeSource.TAG_INSTANTIATED_SYMBOL_LITERAL);
- addEEnumLiteral(eRuntimeSourceEEnum, ERuntimeSource.OTHER_LITERAL);
-
- // Initialize data types
- initEDataType(iTypeEDataType, IType.class, "IType", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEDataType(iJavaElementEDataType, IJavaElement.class, "IJavaElement", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEDataType(valueTypeEDataType, ValueType.class, "ValueType", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-
- // Create resource
- createResource(eNS_URI);
- }
-
-} //SymbolPackageImpl
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/impl/Util.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/impl/Util.java
deleted file mode 100644
index 0c2f288..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/impl/Util.java
+++ /dev/null
@@ -1,191 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 Oracle 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:
- * Cameron Bateman/Oracle - initial API and implementation
- *
- ********************************************************************************/
-package org.eclipse.jst.jsf.context.symbol.internal.impl;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.core.Signature;
-import org.eclipse.jst.jsf.common.JSFCommonPlugin;
-import org.eclipse.jst.jsf.common.internal.types.TypeConstants;
-import org.eclipse.jst.jsf.common.internal.types.ValueType;
-import org.eclipse.jst.jsf.common.util.JDTBeanIntrospector;
-import org.eclipse.jst.jsf.common.util.TypeUtil;
-import org.eclipse.jst.jsf.context.symbol.IJavaTypeDescriptor2;
-import org.eclipse.jst.jsf.context.symbol.IPropertySymbol;
-import org.eclipse.jst.jsf.context.symbol.ISymbol;
-import org.eclipse.jst.jsf.context.symbol.ITypeDescriptor;
-import org.eclipse.jst.jsf.context.symbol.SymbolFactory;
-
-final class Util
-{
- static ISymbol call(String methodName, EList methodArguments,
- String symbolName, ITypeDescriptor typeDesc)
- {
- // first, see if the type descriptor wants to handle the call
- ISymbol result = typeDesc.calculateSyntheticCall(methodName, methodArguments, symbolName);
-
- final IType type= typeDesc.resolveType(typeDesc.getTypeSignature());
-
- // if the type is resolved and the typeDesc didn't already handle
- // the call then do this the hard way...
- if (type != null && result == null)
- {
- final JDTBeanIntrospector introspector =
- new JDTBeanIntrospector(type);
-
- final IMethod callMethod =
- Util.matchMethod(methodName, methodArguments, introspector.getAllMethods(),typeDesc.getTypeParameterSignatures());
-
- if (callMethod != null)
- {
- try
- {
- // resolve the method's return type; don't erase parameters
- String retTypeSignature = callMethod.getReturnType();
-
- // if we have a type variable, try to parameter match it
- if (Signature.getTypeSignatureKind(retTypeSignature) == Signature.TYPE_VARIABLE_SIGNATURE)
- {
- retTypeSignature = TypeUtil.matchTypeParameterToArgument
- (type
- , retTypeSignature, typeDesc.getTypeParameterSignatures());
-
- if (retTypeSignature == null)
- {
- retTypeSignature = TypeConstants.TYPE_JAVAOBJECT;
- }
- }
- // otherwise, try and resolve it in type
- else
- {
- retTypeSignature = TypeUtil.resolveTypeSignature
- (type, callMethod.getReturnType(), false);
- }
-
- final IPropertySymbol propSymbol =
- SymbolFactory.eINSTANCE.createIPropertySymbol();
-
- // TODO: there is a possible problem here for non-string keyed maps
- propSymbol.setName(symbolName);
- propSymbol.setReadable(true);
-
- {
- IJavaTypeDescriptor2 newTypeDesc = null;
-
- if (retTypeSignature.equals(TypeConstants.TYPE_JAVAOBJECT))
- {
- newTypeDesc = SymbolFactory.eINSTANCE.createIBoundedJavaTypeDescriptor();
- }
- else
- {
- newTypeDesc = SymbolFactory.eINSTANCE.createIJavaTypeDescriptor2();
- }
-
- newTypeDesc.setArrayCount(Signature.getArrayCount(retTypeSignature));
-
- // may be null
- newTypeDesc.setType(typeDesc.resolveType(retTypeSignature));
- newTypeDesc.setTypeSignatureDelegate(retTypeSignature);
- propSymbol.setTypeDescriptor(newTypeDesc);
- }
-
- result = propSymbol;
- }
- catch (JavaModelException e)
- {
- JSFCommonPlugin.log(e);
- // fall-through and return null result
- }
- }
- }
-
- return result;
- }
-
- static IMethod matchMethod(String methodName, List methodArguments, IMethod[] allMethods, List typeParameterSignatures)
- {
-// final List argSigs = convertArgsToSignatures(methodArguments);
- IMethod matchedMethod = null;
-
- for (int i = 0; i < allMethods.length; i++)
- {
- final IMethod method = allMethods[i];
-
- // check for names and argument count match
- if (method.getParameterTypes().length == methodArguments.size()
- && method.getElementName().equals(methodName))
- {
- List<String> methods = resolveMethodParameters(method, typeParameterSignatures);
-
- // need to verify argument matches
- boolean isMatched = true;
- CHECK_ARGUMENTS: for (int j = 0; j < methods.size(); j++)
- {
- final ValueType valueType = (ValueType) methodArguments.get(j);
-
- // if the parameters match, or if the method expects an object
- // and we have a class
- // TODO: there are some cases not supported here like:
- // - method name overloading
- // - autoboxing primitives
- // - certain kinds of parameterized args
- if (!methods.get(j).equals(valueType.getSignature())
- && !(methods.get(j).equals(TypeConstants.TYPE_JAVAOBJECT)
- && Signature.getTypeSignatureKind(valueType.getSignature())==Signature.CLASS_TYPE_SIGNATURE))
- {
- // not a match
- isMatched = false;
- break CHECK_ARGUMENTS;
- }
- }
-
- if (isMatched)
- {
- return method;
- }
- }
- }
-
- return matchedMethod;
- }
-
- static List<String> resolveMethodParameters(IMethod method, List typeParametersSignatures)
- {
- List<String> resolved = new ArrayList<String>();
- String[] parameterTypes = method.getParameterTypes();
- for (String parameter : parameterTypes)
- {
- parameter = TypeUtil.resolveTypeSignature(method.getDeclaringType()
- , parameter, false);
-
- if (Signature.getTypeSignatureKind(parameter) == Signature.TYPE_VARIABLE_SIGNATURE)
- {
- parameter = TypeUtil.matchTypeParameterToArgument
- (method.getDeclaringType(), parameter, typeParametersSignatures);
- }
-
- if (parameter == null)
- {
- parameter = TypeConstants.TYPE_JAVAOBJECT;
- }
-
- resolved.add(parameter);
- }
-
- return resolved;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/impl/messages.properties b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/impl/messages.properties
deleted file mode 100644
index c8ed3b4..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/impl/messages.properties
+++ /dev/null
@@ -1,18 +0,0 @@
-###############################################################################
-# Copyright (c) 2001, 2008 Oracle Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# Oracle Corporation - initial API and implementation
-###############################################################################
-IBeanMethodSymbolImpl.DetailDesc=Signature:
-IBeanPropertySymbolImpl.Access=Access:
-IBeanPropertySymbolImpl.hiding=hiding
-IBeanPropertySymbolImpl.none=none
-IBeanPropertySymbolImpl.read_write=read/write
-IBeanPropertySymbolImpl.readonly=read-only
-IBeanPropertySymbolImpl.Type=Type:
-IBeanPropertySymbolImpl.writeonly=write-only
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/provider/IBeanInstanceSymbolItemProvider.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/provider/IBeanInstanceSymbolItemProvider.java
deleted file mode 100644
index ee8e4b9..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/provider/IBeanInstanceSymbolItemProvider.java
+++ /dev/null
@@ -1,219 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Oracle 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:
- * Cameron Bateman/Oracle - initial API and implementation
- *
- ********************************************************************************/
-package org.eclipse.jst.jsf.context.symbol.internal.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.ui.provider.ExtendedImageRegistry;
-import org.eclipse.jface.text.contentassist.ICompletionProposal;
-import org.eclipse.jst.jsf.common.JSFCommonPlugin;
-import org.eclipse.jst.jsf.context.symbol.IBeanInstanceSymbol;
-import org.eclipse.jst.jsf.context.symbol.SymbolPackage;
-import org.eclipse.jst.jsf.context.symbol.provider.IContentProposalProvider;
-import org.eclipse.swt.graphics.Image;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.jst.jsf.context.symbol.IBeanInstanceSymbol} object.
- * <!-- begin-user-doc -->
- * @extends IContentProposalProvider
- * <!-- end-user-doc -->
- * @generated
- */
-public class IBeanInstanceSymbolItemProvider
- extends IInstanceSymbolItemProvider
- implements
- IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, IContentProposalProvider
-{
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @SuppressWarnings("hiding")
- public static final String copyright = "Copyright 2006 Oracle"; //$NON-NLS-1$
-
- /**
- * This constructs an instance from a factory and a notifier.
- * <!-- begin-user-doc -->
- * @param adapterFactory
- * <!-- end-user-doc -->
- * @generated
- */
- public IBeanInstanceSymbolItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This returns the property descriptors for the adapted class.
- * <!-- begin-user-doc -->
- * @param object
- * @return
- * <!-- end-user-doc -->
- * @generated
- */
- public List getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
-
- addPropertiesPropertyDescriptor(object);
- addMethodsPropertyDescriptor(object);
- }
- return itemPropertyDescriptors;
- }
-
- /**
- * This adds a property descriptor for the Properties feature.
- * <!-- begin-user-doc -->
- * @param object
- * <!-- end-user-doc -->
- * @generated
- */
- protected void addPropertiesPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_IBeanInstanceSymbol_properties_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_IBeanInstanceSymbol_properties_feature", "_UI_IBeanInstanceSymbol_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- SymbolPackage.Literals.IBEAN_INSTANCE_SYMBOL__PROPERTIES,
- false,
- false,
- false,
- null,
- null,
- null));
- }
-
- /**
- * This adds a property descriptor for the Methods feature.
- * <!-- begin-user-doc -->
- * @param object
- * <!-- end-user-doc -->
- * @generated
- */
- protected void addMethodsPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_IBeanInstanceSymbol_methods_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_IBeanInstanceSymbol_methods_feature", "_UI_IBeanInstanceSymbol_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- SymbolPackage.Literals.IBEAN_INSTANCE_SYMBOL__METHODS,
- false,
- false,
- false,
- null,
- null,
- null));
- }
-
- /**
- * This returns IBeanInstanceSymbol.gif.
- * <!-- begin-user-doc -->
- * @param object
- * @return the image associated with object or null if not found
- * <!-- end-user-doc -->
- * @generated
- */
- public Object getImage(Object object) {
- return overlayImage(object, getResourceLocator().getImage("full/obj16/IBeanInstanceSymbol")); //$NON-NLS-1$
- }
-
- /**
- * This returns the label text for the adapted class.
- * <!-- begin-user-doc -->
- * @param object
- * @return the text label associated with object or null if not found
- * <!-- end-user-doc -->
- * @generated NOT
- */
- public String getText(Object object) {
- String label = ((IBeanInstanceSymbol)object).getName();
- return label == null || label.length() == 0 ?
- getString("_UI_IBeanInstanceSymbol_type") : //$NON-NLS-1$
- label;
- }
-
- /**
- * This handles model notifications by calling {@link #updateChildren(Notification)} to update any cached
- * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged(Notification)}.
- * <!-- begin-user-doc -->
- * @param notification
- * <!-- end-user-doc -->
- * @generated
- */
- public void notifyChanged(Notification notification) {
- updateChildren(notification);
- super.notifyChanged(notification);
- }
-
- /**
- * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
- * describing all of the children that can be created under this object.
- * <!-- begin-user-doc -->
- * @param newChildDescriptors
- * @param object
- * <!-- 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 -->
- * @return the resource locator
- * <!-- end-user-doc -->
- * @generated
- */
- public ResourceLocator getResourceLocator() {
- return JSFCommonPlugin.INSTANCE;
- }
-
- /**
- * @param target_
- * @param proposalFactory
- * @return a completion proposal for target at offset
- */
- public ICompletionProposal[] getProposals(Object target_,
- IProposalCreationFactory proposalFactory)
- {
- IBeanInstanceSymbol symbol = (IBeanInstanceSymbol) target_;
-
- final String replacementText = symbol.getName();
- final String displayText = getText(symbol);
- final String additionalText = symbol.getDetailedDescription();
- final Image displayImage =
- ExtendedImageRegistry.getInstance().getImage(getImage(symbol));
-
- return new ICompletionProposal[]
- {
- proposalFactory.createProposal(replacementText,
- displayText,
- additionalText,
- displayImage,
- target_)
- };
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/provider/IBeanMethodSymbolItemProvider.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/provider/IBeanMethodSymbolItemProvider.java
deleted file mode 100644
index ed4eaae..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/provider/IBeanMethodSymbolItemProvider.java
+++ /dev/null
@@ -1,254 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Oracle 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:
- * Cameron Bateman/Oracle - initial API and implementation
- *
- ********************************************************************************/
-package org.eclipse.jst.jsf.context.symbol.internal.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.emf.edit.ui.provider.ExtendedImageRegistry;
-import org.eclipse.jface.text.contentassist.ICompletionProposal;
-import org.eclipse.jst.jsf.common.JSFCommonPlugin;
-import org.eclipse.jst.jsf.context.symbol.IBeanMethodSymbol;
-import org.eclipse.jst.jsf.context.symbol.SymbolPackage;
-import org.eclipse.jst.jsf.context.symbol.provider.IContentProposalProvider;
-import org.eclipse.swt.graphics.Image;
-
-
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.jst.jsf.context.symbol.IBeanMethodSymbol} object.
- * <!-- begin-user-doc -->
- * @extends IContentProposalProvider
- * <!-- end-user-doc -->
- * @generated
- */
-public class IBeanMethodSymbolItemProvider
- extends ItemProviderAdapter
- implements
- IEditingDomainItemProvider,
- IStructuredItemContentProvider,
- ITreeItemContentProvider,
- IItemLabelProvider,
- IItemPropertySource,
- IContentProposalProvider {
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public static final String copyright = "Copyright 2006 Oracle"; //$NON-NLS-1$
-
- /**
- * This constructs an instance from a factory and a notifier.
- * <!-- begin-user-doc -->
- * @param adapterFactory
- * <!-- end-user-doc -->
- * @generated
- */
- public IBeanMethodSymbolItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This returns the property descriptors for the adapted class.
- * <!-- begin-user-doc -->
- * @param object
- * @return the list of property descriptors
- * <!-- end-user-doc -->
- * @generated
- */
- public List getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
-
- addNamePropertyDescriptor(object);
- addSignaturePropertyDescriptor(object);
- addOwnerPropertyDescriptor(object);
- }
- return itemPropertyDescriptors;
- }
-
- /**
- * This adds a property descriptor for the Name feature.
- * <!-- begin-user-doc -->
- * @param object
- * <!-- end-user-doc -->
- * @generated
- */
- protected void addNamePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_ISymbol_name_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_ISymbol_name_feature", "_UI_ISymbol_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- SymbolPackage.Literals.ISYMBOL__NAME,
- true,
- false,
- false,
- ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
- null,
- null));
- }
-
- /**
- * This adds a property descriptor for the Signature feature.
- * <!-- begin-user-doc -->
- * @param object
- * <!-- end-user-doc -->
- * @generated
- */
- protected void addSignaturePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_IMethodSymbol_signature_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_IMethodSymbol_signature_feature", "_UI_IMethodSymbol_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- SymbolPackage.Literals.IMETHOD_SYMBOL__SIGNATURE,
- true,
- false,
- false,
- ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
- null,
- null));
- }
-
- /**
- * This adds a property descriptor for the Owner feature.
- * <!-- begin-user-doc -->
- * @param object
- * <!-- end-user-doc -->
- * @generated
- */
- protected void addOwnerPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_IBeanMethodSymbol_owner_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_IBeanMethodSymbol_owner_feature", "_UI_IBeanMethodSymbol_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- SymbolPackage.Literals.IBEAN_METHOD_SYMBOL__OWNER,
- true,
- false,
- false,
- null,
- null,
- null));
- }
-
- /**
- * This returns IBeanMethodSymbol.gif.
- * <!-- begin-user-doc -->
- * @param object
- * @return the image associated with object or null if no found
- * <!-- end-user-doc -->
- * @generated
- */
- public Object getImage(Object object) {
- return overlayImage(object, getResourceLocator().getImage("full/obj16/IBeanMethodSymbol")); //$NON-NLS-1$
- }
-
- /**
- * This returns the label text for the adapted class.
- * <!-- begin-user-doc -->
- * @param object
- * @return the text label associated with label or null if not found
- * <!-- end-user-doc -->
- * @generated NOT
- */
- public String getText(Object object) {
- String label = ((IBeanMethodSymbol)object).getName();
- return label == null || label.length() == 0 ?
- getString("_UI_IBeanMethodSymbol_type") : //$NON-NLS-1$
- label;
- }
-
- /**
- * This handles model notifications by calling {@link #updateChildren(Notification)} to update any cached
- * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged(Notification)}.
- * <!-- begin-user-doc -->
- * @param notification
- * <!-- end-user-doc -->
- * @generated
- */
- public void notifyChanged(Notification notification) {
- updateChildren(notification);
-
- switch (notification.getFeatureID(IBeanMethodSymbol.class)) {
- case SymbolPackage.IBEAN_METHOD_SYMBOL__NAME:
- case SymbolPackage.IBEAN_METHOD_SYMBOL__SIGNATURE:
- fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
- return;
- }
- super.notifyChanged(notification);
- }
-
- /**
- * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
- * describing all of the children that can be created under this object.
- * <!-- begin-user-doc -->
- * @param newChildDescriptors
- * @param object
- * <!-- 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 -->
- * @return the resource locator
- * <!-- end-user-doc -->
- * @generated
- */
- public ResourceLocator getResourceLocator() {
- return JSFCommonPlugin.INSTANCE;
- }
-
- public ICompletionProposal[] getProposals(Object target_,
- IProposalCreationFactory proposalFactory)
- {
- IBeanMethodSymbol symbol = (IBeanMethodSymbol) target_;
-
- final String replacementText = symbol.getName();
- final String displayText = getText(target_);
- final String additionalText = symbol.getDetailedDescription();
- final Image displayImage =
- ExtendedImageRegistry.getInstance().getImage(getImage(symbol));
-
- return new ICompletionProposal[]
- {
- proposalFactory.createProposal(replacementText,
- displayText,
- additionalText,
- displayImage,
- target_)
- };
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/provider/IBeanPropertySymbolItemProvider.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/provider/IBeanPropertySymbolItemProvider.java
deleted file mode 100644
index cc27144..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/provider/IBeanPropertySymbolItemProvider.java
+++ /dev/null
@@ -1,196 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Oracle 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:
- * Cameron Bateman/Oracle - initial API and implementation
- *
- ********************************************************************************/
-package org.eclipse.jst.jsf.context.symbol.internal.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.jst.jsf.common.JSFCommonPlugin;
-import org.eclipse.jst.jsf.context.symbol.IBeanPropertySymbol;
-import org.eclipse.jst.jsf.context.symbol.ITypeDescriptor;
-import org.eclipse.jst.jsf.context.symbol.SymbolPackage;
-import org.eclipse.jst.jsf.context.symbol.provider.IContentProposalProvider;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.jst.jsf.context.symbol.IBeanPropertySymbol} object.
- * <!-- begin-user-doc -->
- * @extends IContentProposalProvider
- * <!-- end-user-doc -->
- * @generated
- */
-public class IBeanPropertySymbolItemProvider
- extends IPropertySymbolItemProvider
- implements
- IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, IContentProposalProvider
-{
- private static final String PROPERTY_SYMBOL_WO = "full/obj16/IBeanPropertySymbol_wo"; //$NON-NLS-1$
- private static final String PROPERTY_SYMBOL_RO = "full/obj16/IBeanPropertySymbol_ro"; //$NON-NLS-1$
- private static final String PROPERTY_SYMBOL_RW = "full/obj16/IBeanPropertySymbol_rw"; //$NON-NLS-1$
- private static final String PROPERTY_SYMBOL_WO_INDEXABLE = "full/obj16/IBeanPropertySymbol_wo_indexable"; //$NON-NLS-1$
- private static final String PROPERTY_SYMBOL_RO_INDEXABLE = "full/obj16/IBeanPropertySymbol_ro_indexable"; //$NON-NLS-1$
- private static final String PROPERTY_SYMBOL_RW_INDEXABLE = "full/obj16/IBeanPropertySymbol_rw_indexable"; //$NON-NLS-1$
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @SuppressWarnings("hiding")
- public static final String copyright = "Copyright 2006 Oracle"; //$NON-NLS-1$
-
- /**
- * This constructs an instance from a factory and a notifier.
- * <!-- begin-user-doc -->
- * @param adapterFactory
- * @extends IContentProposalProvider
- * <!-- end-user-doc -->
- * @generated
- */
- public IBeanPropertySymbolItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This returns the property descriptors for the adapted class.
- * <!-- begin-user-doc -->
- * @param object
- * @return the list of property descriptors
- * <!-- end-user-doc -->
- * @generated
- */
- public List getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
-
- addOwnerPropertyDescriptor(object);
- }
- return itemPropertyDescriptors;
- }
-
- /**
- * This adds a property descriptor for the Owner feature.
- * <!-- begin-user-doc -->
- * @param object
- * <!-- end-user-doc -->
- * @generated
- */
- protected void addOwnerPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_IBeanPropertySymbol_owner_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_IBeanPropertySymbol_owner_feature", "_UI_IBeanPropertySymbol_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- SymbolPackage.Literals.IBEAN_PROPERTY_SYMBOL__OWNER,
- true,
- false,
- false,
- null,
- null,
- null));
- }
-
- /**
- * This returns IBeanPropertySymbol.gif.
- * <!-- begin-user-doc -->
- * @param object
- * @return the image associated with object or null if not found
- * <!-- end-user-doc -->
- * @generated NOT
- */
- public Object getImage(Object object) {
- IBeanPropertySymbol propertySymbol = (IBeanPropertySymbol) object;
- String imageFile = null;
- ITypeDescriptor typeDescriptor = propertySymbol.getTypeDescriptor();
- if (typeDescriptor != null && (typeDescriptor.isArray() || typeDescriptor.instanceOf("Ljava.util.List;") || typeDescriptor.instanceOf("Ljava.util.Map;"))) { //$NON-NLS-1$ //$NON-NLS-2$
- // property is somehow "indexable" by int/String:
- if (propertySymbol.isReadable() && propertySymbol.isWritable()) {
- imageFile = PROPERTY_SYMBOL_RW_INDEXABLE;
- } else if (propertySymbol.isReadable()) {
- imageFile = PROPERTY_SYMBOL_RO_INDEXABLE;
- } else if (propertySymbol.isWritable()) {
- imageFile = PROPERTY_SYMBOL_WO_INDEXABLE;
- }
- } else {
- if (propertySymbol.isReadable() && propertySymbol.isWritable()) {
- imageFile = PROPERTY_SYMBOL_RW;
- } else if (propertySymbol.isReadable()) {
- imageFile = PROPERTY_SYMBOL_RO;
- } else if (propertySymbol.isWritable()) {
- imageFile = PROPERTY_SYMBOL_WO;
- }
- }
- return imageFile == null? null : overlayImage(object, getResourceLocator().getImage(imageFile));
- }
-
- /**
- * This returns the label text for the adapted class.
- * <!-- begin-user-doc -->
- * @param object
- * @return the text label associated with object
- * <!-- end-user-doc -->
- * @generated
- */
- public String getText(Object object) {
- String label = ((IBeanPropertySymbol)object).getName();
- return label == null || label.length() == 0 ?
- getString("_UI_IBeanPropertySymbol_type") : //$NON-NLS-1$
- getString("_UI_IBeanPropertySymbol_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
- }
-
- /**
- * This handles model notifications by calling {@link #updateChildren(Notification)} to update any cached
- * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged(Notification)}.
- * <!-- begin-user-doc -->
- * @param notification
- * <!-- end-user-doc -->
- * @generated
- */
- public void notifyChanged(Notification notification) {
- updateChildren(notification);
- super.notifyChanged(notification);
- }
-
- /**
- * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
- * describing all of the children that can be created under this object.
- * <!-- begin-user-doc -->
- * @param newChildDescriptors
- * @param object
- * <!-- 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 -->
- * @return the resource locator
- * <!-- end-user-doc -->
- * @generated
- */
- public ResourceLocator getResourceLocator() {
- return JSFCommonPlugin.INSTANCE;
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/provider/IBoundedJavaTypeDescriptorItemProvider.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/provider/IBoundedJavaTypeDescriptorItemProvider.java
deleted file mode 100644
index 1c85e05..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/provider/IBoundedJavaTypeDescriptorItemProvider.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: IBoundedJavaTypeDescriptorItemProvider.java,v 1.7 2007/10/01 04:29:43 cbateman Exp $
- */
-package org.eclipse.jst.jsf.context.symbol.internal.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.jst.jsf.common.JSFCommonPlugin;
-import org.eclipse.jst.jsf.context.symbol.IBoundedJavaTypeDescriptor;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.jst.jsf.context.symbol.IBoundedJavaTypeDescriptor} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class IBoundedJavaTypeDescriptorItemProvider
- extends IJavaTypeDescriptor2ItemProvider
- implements
- IEditingDomainItemProvider,
- IStructuredItemContentProvider,
- ITreeItemContentProvider,
- IItemLabelProvider,
- IItemPropertySource {
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @SuppressWarnings("hiding")
- public static final String copyright = "Copyright 2006 Oracle"; //$NON-NLS-1$
-
- /**
- * This constructs an instance from a factory and a notifier.
- * <!-- begin-user-doc -->
- * @param adapterFactory
- * <!-- end-user-doc -->
- * @generated
- */
- public IBoundedJavaTypeDescriptorItemProvider(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 IBoundedJavaTypeDescriptor.gif.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public Object getImage(Object object) {
- return overlayImage(object, getResourceLocator().getImage("full/obj16/IBoundedJavaTypeDescriptor")); //$NON-NLS-1$
- }
-
- /**
- * This returns the label text for the adapted class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public String getText(Object object) {
- String label = ((IBoundedJavaTypeDescriptor)object).getTypeSignature();
- return label == null || label.length() == 0 ?
- getString("_UI_IBoundedJavaTypeDescriptor_type") : //$NON-NLS-1$
- getString("_UI_IBoundedJavaTypeDescriptor_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
- }
-
- /**
- * This handles model notifications by calling {@link #updateChildren(Notification)} to update any cached
- * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged(Notification)}.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void notifyChanged(Notification notification) {
- updateChildren(notification);
- super.notifyChanged(notification);
- }
-
- /**
- * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
- * describing all of the children that can be created under this object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
- }
-
- /**
- * Return the resource locator for this item provider's resources.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public ResourceLocator getResourceLocator() {
- return JSFCommonPlugin.INSTANCE;
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/provider/IBoundedListTypeDescriptorItemProvider.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/provider/IBoundedListTypeDescriptorItemProvider.java
deleted file mode 100644
index 4bee1ad..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/provider/IBoundedListTypeDescriptorItemProvider.java
+++ /dev/null
@@ -1,136 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 Oracle 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:
- * Cameron Bateman/Oracle - initial API and implementation
- *
- ********************************************************************************/
-package org.eclipse.jst.jsf.context.symbol.internal.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.common.util.ResourceLocator;
-
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-
-import org.eclipse.jst.jsf.common.JSFCommonPlugin;
-
-import org.eclipse.jst.jsf.context.symbol.IBoundedListTypeDescriptor;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.jst.jsf.context.symbol.IBoundedListTypeDescriptor} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class IBoundedListTypeDescriptorItemProvider
- extends IListTypeDescriptorItemProvider
- implements
- IEditingDomainItemProvider,
- IStructuredItemContentProvider,
- ITreeItemContentProvider,
- IItemLabelProvider,
- IItemPropertySource {
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @SuppressWarnings("hiding")
- public static final String copyright = "Copyright 2006 Oracle"; //$NON-NLS-1$
-
- /**
- * This constructs an instance from a factory and a notifier.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param adapterFactory
- * @generated
- */
- public IBoundedListTypeDescriptorItemProvider(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 IBoundedListTypeDescriptor.gif.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public Object getImage(Object object) {
- return overlayImage(object, getResourceLocator().getImage("full/obj16/IBoundedListTypeDescriptor")); //$NON-NLS-1$
- }
-
- /**
- * This returns the label text for the adapted class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public String getText(Object object) {
- String label = ((IBoundedListTypeDescriptor)object).getTypeSignature();
- return label == null || label.length() == 0 ?
- getString("_UI_IBoundedListTypeDescriptor_type") : //$NON-NLS-1$
- getString("_UI_IBoundedListTypeDescriptor_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
- }
-
- /**
- * This handles model notifications by calling {@link #updateChildren(Notification)} to update any cached
- * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged(Notification)}.
- * <!-- 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);
- }
-
- /**
- * Return the resource locator for this item provider's resources.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public ResourceLocator getResourceLocator() {
- return JSFCommonPlugin.INSTANCE;
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/provider/IBoundedMapTypeDescriptorItemProvider.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/provider/IBoundedMapTypeDescriptorItemProvider.java
deleted file mode 100644
index 02b1a24..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/provider/IBoundedMapTypeDescriptorItemProvider.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: IBoundedMapTypeDescriptorItemProvider.java,v 1.7 2007/10/01 04:29:43 cbateman Exp $
- */
-package org.eclipse.jst.jsf.context.symbol.internal.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.jst.jsf.common.JSFCommonPlugin;
-import org.eclipse.jst.jsf.context.symbol.IBoundedMapTypeDescriptor;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.jst.jsf.context.symbol.IBoundedMapTypeDescriptor} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class IBoundedMapTypeDescriptorItemProvider
- extends IMapTypeDescriptorItemProvider
- implements
- IEditingDomainItemProvider,
- IStructuredItemContentProvider,
- ITreeItemContentProvider,
- IItemLabelProvider,
- IItemPropertySource {
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @SuppressWarnings("hiding")
- public static final String copyright = "Copyright 2006 Oracle"; //$NON-NLS-1$
-
- /**
- * This constructs an instance from a factory and a notifier.
- * <!-- begin-user-doc -->
- * @param adapterFactory
- * <!-- end-user-doc -->
- * @generated
- */
- public IBoundedMapTypeDescriptorItemProvider(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 IBoundedMapTypeDescriptor.gif.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public Object getImage(Object object) {
- return overlayImage(object, getResourceLocator().getImage("full/obj16/IBoundedMapTypeDescriptor")); //$NON-NLS-1$
- }
-
- /**
- * This returns the label text for the adapted class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public String getText(Object object) {
- String label = ((IBoundedMapTypeDescriptor)object).getTypeSignature();
- return label == null || label.length() == 0 ?
- getString("_UI_IBoundedMapTypeDescriptor_type") : //$NON-NLS-1$
- getString("_UI_IBoundedMapTypeDescriptor_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
- }
-
- /**
- * This handles model notifications by calling {@link #updateChildren(Notification)} to update any cached
- * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged(Notification)}.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void notifyChanged(Notification notification) {
- updateChildren(notification);
- super.notifyChanged(notification);
- }
-
- /**
- * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
- * describing all of the children that can be created under this object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
- }
-
- /**
- * Return the resource locator for this item provider's resources.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public ResourceLocator getResourceLocator() {
- return JSFCommonPlugin.INSTANCE;
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/provider/IComponentSymbolItemProvider.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/provider/IComponentSymbolItemProvider.java
deleted file mode 100644
index 96b04f7..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/provider/IComponentSymbolItemProvider.java
+++ /dev/null
@@ -1,169 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Oracle 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:
- * Cameron Bateman/Oracle - initial API and implementation
- *
- ********************************************************************************/
-package org.eclipse.jst.jsf.context.symbol.internal.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.ui.provider.ExtendedImageRegistry;
-import org.eclipse.jface.text.contentassist.ICompletionProposal;
-import org.eclipse.jst.jsf.common.JSFCommonPlugin;
-import org.eclipse.jst.jsf.context.symbol.IComponentSymbol;
-import org.eclipse.jst.jsf.context.symbol.provider.IContentProposalProvider;
-import org.eclipse.swt.graphics.Image;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.jst.jsf.context.symbol.IComponentSymbol} object.
- * <!-- begin-user-doc -->
- * @extends IContentProposalProvider
- * <!-- end-user-doc -->
- * @generated
- */
-public class IComponentSymbolItemProvider
- extends IInstanceSymbolItemProvider
- implements
- IEditingDomainItemProvider,
- IStructuredItemContentProvider,
- ITreeItemContentProvider,
- IItemLabelProvider,
- IItemPropertySource,
- IContentProposalProvider
-{
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @SuppressWarnings("hiding")
- public static final String copyright = "Copyright 2006 Oracle"; //$NON-NLS-1$
-
- /**
- * This constructs an instance from a factory and a notifier.
- * <!-- begin-user-doc -->
- * @param adapterFactory
- * <!-- end-user-doc -->
- * @generated
- */
- public IComponentSymbolItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This returns the property descriptors for the adapted class.
- * <!-- begin-user-doc -->
- * @param object
- * @return the property descriptor list
- * <!-- end-user-doc -->
- * @generated
- */
- public List getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
-
- }
- return itemPropertyDescriptors;
- }
-
- /**
- * This returns IComponentSymbol.gif.
- * <!-- begin-user-doc -->
- * @param object
- * @return the image associated with object or null if not found
- * <!-- end-user-doc -->
- * @generated
- */
- public Object getImage(Object object) {
- return overlayImage(object, getResourceLocator().getImage("full/obj16/IComponentSymbol")); //$NON-NLS-1$
- }
-
- /**
- * This returns the label text for the adapted class.
- * <!-- begin-user-doc -->
- * @param object
- * @return the text label for object or null if not found
- * <!-- end-user-doc -->
- * @generated NOT
- */
- public String getText(Object object) {
- String label = ((IComponentSymbol)object).getName();
- return label == null || label.length() == 0 ?
- getString("_UI_IComponentSymbol_type") : //$NON-NLS-1$
- label;
- }
-
- /**
- * This handles model notifications by calling {@link #updateChildren(Notification)} to update any cached
- * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged(Notification)}.
- * <!-- begin-user-doc -->
- * @param notification
- * <!-- end-user-doc -->
- * @generated
- */
- public void notifyChanged(Notification notification) {
- updateChildren(notification);
- super.notifyChanged(notification);
- }
-
- /**
- * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
- * describing all of the children that can be created under this object.
- * <!-- begin-user-doc -->
- * @param newChildDescriptors
- * @param object
- * <!-- 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 -->
- * @return the resource locator
- * <!-- end-user-doc -->
- * @generated
- */
- public ResourceLocator getResourceLocator() {
- return JSFCommonPlugin.INSTANCE;
- }
-
- public ICompletionProposal[] getProposals(Object target_,
- IProposalCreationFactory proposalFactory)
- {
- IComponentSymbol symbol = (IComponentSymbol) target_;
-
- final String replacementText = symbol.getName();
- final String displayText = getText(symbol);
- final String additionalText = symbol.getDetailedDescription();
- final Image displayImage =
- ExtendedImageRegistry.getInstance().getImage(getImage(symbol));
-
- return new ICompletionProposal[]
- {
- proposalFactory.createProposal(replacementText,
- displayText,
- additionalText,
- displayImage,
- target_)
- };
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/provider/IInstanceSymbolItemProvider.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/provider/IInstanceSymbolItemProvider.java
deleted file mode 100644
index 155bfb1..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/provider/IInstanceSymbolItemProvider.java
+++ /dev/null
@@ -1,329 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Oracle 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:
- * Cameron Bateman/Oracle - initial API and implementation
- *
- ********************************************************************************/
-package org.eclipse.jst.jsf.context.symbol.internal.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.emf.edit.ui.provider.ExtendedImageRegistry;
-import org.eclipse.jface.text.contentassist.ICompletionProposal;
-import org.eclipse.jst.jsf.common.JSFCommonPlugin;
-import org.eclipse.jst.jsf.context.symbol.IInstanceSymbol;
-import org.eclipse.jst.jsf.context.symbol.SymbolPackage;
-import org.eclipse.jst.jsf.context.symbol.provider.IContentProposalProvider;
-import org.eclipse.swt.graphics.Image;
-
-
-
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.jst.jsf.context.symbol.IInstanceSymbol} object.
- * <!-- begin-user-doc -->
- * @extends IContentProposalProvider
- * <!-- end-user-doc -->
- * @generated
- */
-public class IInstanceSymbolItemProvider
- extends ItemProviderAdapter
- implements
- IEditingDomainItemProvider,
- IStructuredItemContentProvider,
- ITreeItemContentProvider,
- IItemLabelProvider,
- IItemPropertySource,
- IContentProposalProvider {
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public static final String copyright = "Copyright 2006 Oracle"; //$NON-NLS-1$
-
- /**
- * This constructs an instance from a factory and a notifier.
- * <!-- begin-user-doc -->
- * @param adapterFactory
- * <!-- end-user-doc -->
- * @generated
- */
- public IInstanceSymbolItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This returns the property descriptors for the adapted class.
- * <!-- begin-user-doc -->
- * @param object
- * @return the EMF property descriptors
- * <!-- end-user-doc -->
- * @generated
- */
- public List getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
-
- addNamePropertyDescriptor(object);
- addTypeDescriptorPropertyDescriptor(object);
- addReadablePropertyDescriptor(object);
- addWritablePropertyDescriptor(object);
- addTypeResolvedPropertyDescriptor(object);
- addRuntimeSourcePropertyDescriptor(object);
- }
- return itemPropertyDescriptors;
- }
-
- /**
- * This adds a property descriptor for the Name feature.
- * <!-- begin-user-doc -->
- * @param object
- * <!-- end-user-doc -->
- * @generated
- */
- protected void addNamePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_ISymbol_name_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_ISymbol_name_feature", "_UI_ISymbol_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- SymbolPackage.Literals.ISYMBOL__NAME,
- true,
- false,
- false,
- ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
- null,
- null));
- }
-
- /**
- * This adds a property descriptor for the Type Descriptor feature.
- * <!-- begin-user-doc -->
- * @param object
- * <!-- end-user-doc -->
- * @generated
- */
- protected void addTypeDescriptorPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_IObjectSymbol_typeDescriptor_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_IObjectSymbol_typeDescriptor_feature", "_UI_IObjectSymbol_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- SymbolPackage.Literals.IOBJECT_SYMBOL__TYPE_DESCRIPTOR,
- true,
- false,
- true,
- null,
- null,
- null));
- }
-
- /**
- * This adds a property descriptor for the Readable feature.
- * <!-- begin-user-doc -->
- * @param object
- * <!-- end-user-doc -->
- * @generated
- */
- protected void addReadablePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_IObjectSymbol_readable_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_IObjectSymbol_readable_feature", "_UI_IObjectSymbol_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- SymbolPackage.Literals.IOBJECT_SYMBOL__READABLE,
- true,
- false,
- false,
- ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,
- null,
- null));
- }
-
- /**
- * This adds a property descriptor for the Writable feature.
- * <!-- begin-user-doc -->
- * @param object
- * <!-- end-user-doc -->
- * @generated
- */
- protected void addWritablePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_IObjectSymbol_writable_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_IObjectSymbol_writable_feature", "_UI_IObjectSymbol_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- SymbolPackage.Literals.IOBJECT_SYMBOL__WRITABLE,
- true,
- false,
- false,
- ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,
- null,
- null));
- }
-
- /**
- * This adds a property descriptor for the Type Resolved feature.
- * <!-- begin-user-doc -->
- * @param object
- * <!-- end-user-doc -->
- * @generated
- */
- protected void addTypeResolvedPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_IInstanceSymbol_typeResolved_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_IInstanceSymbol_typeResolved_feature", "_UI_IInstanceSymbol_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- SymbolPackage.Literals.IINSTANCE_SYMBOL__TYPE_RESOLVED,
- false,
- false,
- false,
- ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,
- null,
- null));
- }
-
- /**
- * This adds a property descriptor for the Runtime Source feature.
- * <!-- begin-user-doc -->
- * @param object
- * <!-- end-user-doc -->
- * @generated
- */
- protected void addRuntimeSourcePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_IInstanceSymbol_runtimeSource_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_IInstanceSymbol_runtimeSource_feature", "_UI_IInstanceSymbol_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- SymbolPackage.Literals.IINSTANCE_SYMBOL__RUNTIME_SOURCE,
- true,
- false,
- false,
- ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
- null,
- null));
- }
-
- /**
- * This returns IInstanceSymbol.gif.
- * <!-- begin-user-doc -->
- * @param object
- * @return the image adaption for object
- * <!-- end-user-doc -->
- * @generated
- */
- public Object getImage(Object object) {
- return overlayImage(object, getResourceLocator().getImage("full/obj16/IInstanceSymbol")); //$NON-NLS-1$
- }
-
- /**
- * This returns the label text for the adapted class.
- * <!-- begin-user-doc -->
- * @param object
- * @return the text representation of object
- * <!-- end-user-doc -->
- * @generated NOT
- */
- public String getText(Object object) {
- String label = ((IInstanceSymbol)object).getName();
- return label == null || label.length() == 0 ?
- getString("_UI_IInstanceSymbol_type") : //$NON-NLS-1$
- label;
- }
-
- /**
- * This handles model notifications by calling {@link #updateChildren(Notification)} to update any cached
- * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged(Notification)}.
- * <!-- begin-user-doc -->
- * @param notification
- * <!-- end-user-doc -->
- * @generated
- */
- public void notifyChanged(Notification notification) {
- updateChildren(notification);
-
- switch (notification.getFeatureID(IInstanceSymbol.class)) {
- case SymbolPackage.IINSTANCE_SYMBOL__NAME:
- case SymbolPackage.IINSTANCE_SYMBOL__READABLE:
- case SymbolPackage.IINSTANCE_SYMBOL__WRITABLE:
- case SymbolPackage.IINSTANCE_SYMBOL__TYPE_RESOLVED:
- case SymbolPackage.IINSTANCE_SYMBOL__RUNTIME_SOURCE:
- fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
- return;
- }
- super.notifyChanged(notification);
- }
-
- /**
- * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
- * describing all of the children that can be created under this object.
- * <!-- begin-user-doc -->
- * @param newChildDescriptors
- * @param object
- * <!-- 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 -->
- * @return the resource locator
- * <!-- end-user-doc -->
- * @generated
- */
- public ResourceLocator getResourceLocator() {
- return JSFCommonPlugin.INSTANCE;
- }
-
- public ICompletionProposal[] getProposals(Object target_,
- IProposalCreationFactory proposalFactory)
- {
- IInstanceSymbol symbol = (IInstanceSymbol) target_;
-
- final String replacementText = symbol.getName();
- final String displayText = getText(symbol);
- //final String additionalText = symbol.getDetailedDescription();
- final Image displayImage =
- ExtendedImageRegistry.getInstance().getImage(getImage(symbol));
-
- return new ICompletionProposal[]
- {
- proposalFactory.createProposal(replacementText,
- displayText,
- null,
- displayImage,
- target_)
- };
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/provider/IJavaSymbolItemProvider.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/provider/IJavaSymbolItemProvider.java
deleted file mode 100644
index 021cd5b..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/provider/IJavaSymbolItemProvider.java
+++ /dev/null
@@ -1,204 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Oracle 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:
- * Cameron Bateman/Oracle - initial API and implementation
- *
- ********************************************************************************/
-package org.eclipse.jst.jsf.context.symbol.internal.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.jst.jsf.common.JSFCommonPlugin;
-import org.eclipse.jst.jsf.context.symbol.IJavaSymbol;
-import org.eclipse.jst.jsf.context.symbol.SymbolPackage;
-
-
-
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.jst.jsf.context.symbol.IJavaSymbol} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class IJavaSymbolItemProvider
- extends ItemProviderAdapter
- implements
- IEditingDomainItemProvider,
- IStructuredItemContentProvider,
- ITreeItemContentProvider,
- IItemLabelProvider,
- IItemPropertySource {
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public static final String copyright = "Copyright 2006 Oracle"; //$NON-NLS-1$
-
- /**
- * This constructs an instance from a factory and a notifier.
- * <!-- begin-user-doc -->
- * @param adapterFactory
- * <!-- end-user-doc -->
- * @generated
- */
- public IJavaSymbolItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This returns the property descriptors for the adapted class.
- * <!-- begin-user-doc -->
- * @param object
- * @return the list of property descriptors
- * <!-- end-user-doc -->
- * @generated
- */
- public List getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
-
- addNamePropertyDescriptor(object);
- addJavaElementPropertyDescriptor(object);
- }
- return itemPropertyDescriptors;
- }
-
- /**
- * This adds a property descriptor for the Name feature.
- * <!-- begin-user-doc -->
- * @param object
- * <!-- end-user-doc -->
- * @generated
- */
- protected void addNamePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_ISymbol_name_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_ISymbol_name_feature", "_UI_ISymbol_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- SymbolPackage.Literals.ISYMBOL__NAME,
- true,
- false,
- false,
- ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
- null,
- null));
- }
-
- /**
- * This adds a property descriptor for the Java Element feature.
- * <!-- begin-user-doc -->
- * @param object
- * <!-- end-user-doc -->
- * @generated
- */
- protected void addJavaElementPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_IJavaSymbol_javaElement_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_IJavaSymbol_javaElement_feature", "_UI_IJavaSymbol_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- SymbolPackage.Literals.IJAVA_SYMBOL__JAVA_ELEMENT,
- true,
- false,
- false,
- ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
- null,
- null));
- }
-
- /**
- * This returns IJavaSymbol.gif.
- * <!-- begin-user-doc -->
- * @param object
- * @return the image associated with object or null if not found
- * <!-- end-user-doc -->
- * @generated
- */
- public Object getImage(Object object) {
- return overlayImage(object, getResourceLocator().getImage("full/obj16/IJavaSymbol")); //$NON-NLS-1$
- }
-
- /**
- * This returns the label text for the adapted class.
- * <!-- begin-user-doc -->
- * @param object
- * @return the text label associated with object or null if no found
- * <!-- end-user-doc -->
- * @generated
- */
- public String getText(Object object) {
- String label = ((IJavaSymbol)object).getName();
- return label == null || label.length() == 0 ?
- getString("_UI_IJavaSymbol_type") : //$NON-NLS-1$
- getString("_UI_IJavaSymbol_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
- }
-
- /**
- * This handles model notifications by calling {@link #updateChildren(Notification)} to update any cached
- * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged(Notification)}.
- * <!-- begin-user-doc -->
- * @param notification
- * <!-- end-user-doc -->
- * @generated
- */
- public void notifyChanged(Notification notification) {
- updateChildren(notification);
-
- switch (notification.getFeatureID(IJavaSymbol.class)) {
- case SymbolPackage.IJAVA_SYMBOL__NAME:
- case SymbolPackage.IJAVA_SYMBOL__JAVA_ELEMENT:
- fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
- return;
- }
- super.notifyChanged(notification);
- }
-
- /**
- * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
- * describing all of the children that can be created under this object.
- * <!-- begin-user-doc -->
- * @param newChildDescriptors
- * @param object
- * <!-- 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 -->
- * @return the resource locator
- * <!-- end-user-doc -->
- * @generated
- */
- public ResourceLocator getResourceLocator() {
- return JSFCommonPlugin.INSTANCE;
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/provider/IJavaTypeDescriptor2ItemProvider.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/provider/IJavaTypeDescriptor2ItemProvider.java
deleted file mode 100644
index 201abe4..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/provider/IJavaTypeDescriptor2ItemProvider.java
+++ /dev/null
@@ -1,250 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Oracle 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:
- * Cameron Bateman/Oracle - initial API and implementation
- *
- ********************************************************************************/
-package org.eclipse.jst.jsf.context.symbol.internal.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-import org.eclipse.jst.jsf.common.JSFCommonPlugin;
-import org.eclipse.jst.jsf.context.symbol.IJavaTypeDescriptor2;
-import org.eclipse.jst.jsf.context.symbol.SymbolPackage;
-
-
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.jst.jsf.context.symbol.IJavaTypeDescriptor2} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class IJavaTypeDescriptor2ItemProvider
- extends ITypeDescriptorItemProvider
- implements
- IEditingDomainItemProvider,
- IStructuredItemContentProvider,
- ITreeItemContentProvider,
- IItemLabelProvider,
- IItemPropertySource {
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @SuppressWarnings("hiding")
- public static final String copyright = "Copyright 2006 Oracle"; //$NON-NLS-1$
-
- /**
- * This constructs an instance from a factory and a notifier.
- * <!-- begin-user-doc -->
- * @param adapterFactory
- * <!-- end-user-doc -->
- * @generated
- */
- public IJavaTypeDescriptor2ItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This returns the property descriptors for the adapted class.
- * <!-- begin-user-doc -->
- * @param object
- * @return the emf property descriptors
- * <!-- end-user-doc -->
- * @generated
- */
- public List getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
-
- addTypePropertyDescriptor(object);
- addBeanPropertiesPropertyDescriptor(object);
- addBeanMethodsPropertyDescriptor(object);
- }
- return itemPropertyDescriptors;
- }
-
- /**
- * This adds a property descriptor for the Type feature.
- * <!-- begin-user-doc -->
- * @param object
- * <!-- end-user-doc -->
- * @generated
- */
- protected void addTypePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_IJavaTypeDescriptor2_type_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_IJavaTypeDescriptor2_type_feature", "_UI_IJavaTypeDescriptor2_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- SymbolPackage.Literals.IJAVA_TYPE_DESCRIPTOR2__TYPE,
- true,
- false,
- false,
- ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
- null,
- null));
- }
-
- /**
- * This adds a property descriptor for the Bean Properties feature.
- * <!-- begin-user-doc -->
- * @param object
- * <!-- end-user-doc -->
- * @generated
- */
- protected void addBeanPropertiesPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_IJavaTypeDescriptor2_beanProperties_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_IJavaTypeDescriptor2_beanProperties_feature", "_UI_IJavaTypeDescriptor2_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- SymbolPackage.Literals.IJAVA_TYPE_DESCRIPTOR2__BEAN_PROPERTIES,
- true,
- false,
- false,
- null,
- null,
- null));
- }
-
- /**
- * This adds a property descriptor for the Bean Methods feature.
- * <!-- begin-user-doc -->
- * @param object
- * <!-- end-user-doc -->
- * @generated
- */
- protected void addBeanMethodsPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_IJavaTypeDescriptor2_beanMethods_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_IJavaTypeDescriptor2_beanMethods_feature", "_UI_IJavaTypeDescriptor2_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- SymbolPackage.Literals.IJAVA_TYPE_DESCRIPTOR2__BEAN_METHODS,
- true,
- false,
- false,
- null,
- null,
- null));
- }
-
- /**
- * This adds a property descriptor for the Array Count feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param object
- * @generated
- */
- protected void addArrayCountPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_IJavaTypeDescriptor2_arrayCount_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_IJavaTypeDescriptor2_arrayCount_feature", "_UI_IJavaTypeDescriptor2_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- SymbolPackage.Literals.IJAVA_TYPE_DESCRIPTOR2__ARRAY_COUNT,
- true,
- false,
- false,
- ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE,
- null,
- null));
- }
-
-
- /**
- * This returns IJavaTypeDescriptor2.gif.
- * <!-- begin-user-doc -->
- * @param object
- * @return the image adaption for object
- * <!-- end-user-doc -->
- * @generated
- */
- public Object getImage(Object object) {
- return overlayImage(object, getResourceLocator().getImage("full/obj16/IJavaTypeDescriptor2")); //$NON-NLS-1$
- }
-
- /**
- * This returns the label text for the adapted class.
- * <!-- begin-user-doc -->
- * @param object
- * @return the text representation of object
- * <!-- end-user-doc -->
- * @generated
- */
- public String getText(Object object) {
- String label = ((IJavaTypeDescriptor2)object).getTypeSignature();
- return label == null || label.length() == 0 ?
- getString("_UI_IJavaTypeDescriptor2_type") : //$NON-NLS-1$
- getString("_UI_IJavaTypeDescriptor2_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
- }
-
- /**
- * This handles model notifications by calling {@link #updateChildren(Notification)} to update any cached
- * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged(Notification)}.
- * <!-- begin-user-doc -->
- * @param notification
- * <!-- end-user-doc -->
- * @generated
- */
- public void notifyChanged(Notification notification) {
- updateChildren(notification);
-
- switch (notification.getFeatureID(IJavaTypeDescriptor2.class)) {
- case SymbolPackage.IJAVA_TYPE_DESCRIPTOR2__TYPE:
- fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
- return;
- }
- super.notifyChanged(notification);
- }
-
- /**
- * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
- * describing all of the children that can be created under this object.
- * <!-- begin-user-doc -->
- * @param newChildDescriptors
- * @param object
- * <!-- 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 -->
- * @return the resource locator
- * <!-- end-user-doc -->
- * @generated
- */
- public ResourceLocator getResourceLocator() {
- return JSFCommonPlugin.INSTANCE;
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/provider/IListTypeDescriptorItemProvider.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/provider/IListTypeDescriptorItemProvider.java
deleted file mode 100644
index 76d3eb3..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/provider/IListTypeDescriptorItemProvider.java
+++ /dev/null
@@ -1,170 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 Oracle 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:
- * Cameron Bateman/Oracle - initial API and implementation
- *
- ********************************************************************************/
-package org.eclipse.jst.jsf.context.symbol.internal.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.common.util.ResourceLocator;
-
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-
-import org.eclipse.jst.jsf.common.JSFCommonPlugin;
-
-import org.eclipse.jst.jsf.context.symbol.IListTypeDescriptor;
-import org.eclipse.jst.jsf.context.symbol.SymbolPackage;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.jst.jsf.context.symbol.IListTypeDescriptor} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class IListTypeDescriptorItemProvider
- extends ITypeDescriptorItemProvider
- implements
- IEditingDomainItemProvider,
- IStructuredItemContentProvider,
- ITreeItemContentProvider,
- IItemLabelProvider,
- IItemPropertySource {
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @SuppressWarnings("hiding")
- public static final String copyright = "Copyright 2006 Oracle"; //$NON-NLS-1$
-
- /**
- * This constructs an instance from a factory and a notifier.
- * <!-- begin-user-doc -->
- * @param adapterFactory
- * <!-- end-user-doc -->
- * @generated
- */
- public IListTypeDescriptorItemProvider(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);
-
- addListSourcePropertyDescriptor(object);
- }
- return itemPropertyDescriptors;
- }
-
- /**
- * This adds a property descriptor for the List Source feature.
- * <!-- begin-user-doc -->
- * @param object
- * <!-- end-user-doc -->
- * @generated
- */
- protected void addListSourcePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_IListTypeDescriptor_listSource_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_IListTypeDescriptor_listSource_feature", "_UI_IListTypeDescriptor_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- SymbolPackage.Literals.ILIST_TYPE_DESCRIPTOR__LIST_SOURCE,
- true,
- false,
- false,
- ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
- null,
- null));
- }
-
- /**
- * This returns IListTypeDescriptor.gif.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public Object getImage(Object object) {
- return overlayImage(object, getResourceLocator().getImage("full/obj16/IListTypeDescriptor")); //$NON-NLS-1$
- }
-
- /**
- * This returns the label text for the adapted class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public String getText(Object object) {
- String label = ((IListTypeDescriptor)object).getTypeSignature();
- return label == null || label.length() == 0 ?
- getString("_UI_IListTypeDescriptor_type") : //$NON-NLS-1$
- getString("_UI_IListTypeDescriptor_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
- }
-
- /**
- * This handles model notifications by calling {@link #updateChildren(Notification)} to update any cached
- * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged(Notification)}.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void notifyChanged(Notification notification) {
- updateChildren(notification);
-
- switch (notification.getFeatureID(IListTypeDescriptor.class)) {
- case SymbolPackage.ILIST_TYPE_DESCRIPTOR__LIST_SOURCE:
- 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 JSFCommonPlugin.INSTANCE;
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/provider/IMapTypeDescriptorItemProvider.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/provider/IMapTypeDescriptorItemProvider.java
deleted file mode 100644
index 165629c..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/provider/IMapTypeDescriptorItemProvider.java
+++ /dev/null
@@ -1,204 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Oracle 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:
- * Cameron Bateman/Oracle - initial API and implementation
- *
- ********************************************************************************/
-package org.eclipse.jst.jsf.context.symbol.internal.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-import org.eclipse.jst.jsf.common.JSFCommonPlugin;
-import org.eclipse.jst.jsf.context.symbol.IMapTypeDescriptor;
-import org.eclipse.jst.jsf.context.symbol.SymbolPackage;
-
-
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.jst.jsf.context.symbol.IMapTypeDescriptor} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class IMapTypeDescriptorItemProvider
- extends ITypeDescriptorItemProvider
- implements
- IEditingDomainItemProvider,
- IStructuredItemContentProvider,
- ITreeItemContentProvider,
- IItemLabelProvider,
- IItemPropertySource {
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @SuppressWarnings("hiding")
- public static final String copyright = "Copyright 2006 Oracle"; //$NON-NLS-1$
-
- /**
- * This constructs an instance from a factory and a notifier.
- * <!-- begin-user-doc -->
- * @param adapterFactory
- * <!-- end-user-doc -->
- * @generated
- */
- public IMapTypeDescriptorItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This returns the property descriptors for the adapted class.
- * <!-- begin-user-doc -->
- * @param object
- * @return the prop descriptor
- * <!-- end-user-doc -->
- * @generated
- */
- public List getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
-
- addMapSourcePropertyDescriptor(object);
- addImmutablePropertyDescriptor(object);
- }
- return itemPropertyDescriptors;
- }
-
- /**
- * This adds a property descriptor for the Map Source feature.
- * <!-- begin-user-doc -->
- * @param object
- * <!-- end-user-doc -->
- * @generated
- */
- protected void addMapSourcePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_IMapTypeDescriptor_mapSource_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_IMapTypeDescriptor_mapSource_feature", "_UI_IMapTypeDescriptor_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- SymbolPackage.Literals.IMAP_TYPE_DESCRIPTOR__MAP_SOURCE,
- true,
- false,
- false,
- ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
- null,
- null));
- }
-
- /**
- * This adds a property descriptor for the Immutable feature.
- * <!-- begin-user-doc -->
- * @param object
- * <!-- end-user-doc -->
- * @generated
- */
- protected void addImmutablePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_IMapTypeDescriptor_immutable_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_IMapTypeDescriptor_immutable_feature", "_UI_IMapTypeDescriptor_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- SymbolPackage.Literals.IMAP_TYPE_DESCRIPTOR__IMMUTABLE,
- true,
- false,
- false,
- ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,
- null,
- null));
- }
-
- /**
- * This returns IMapTypeDescriptor.gif.
- * <!-- begin-user-doc -->
- * @param object
- * @return the image adaptation of the object
- * <!-- end-user-doc -->
- * @generated
- */
- public Object getImage(Object object) {
- return overlayImage(object, getResourceLocator().getImage("full/obj16/IMapTypeDescriptor")); //$NON-NLS-1$
- }
-
- /**
- * This returns the label text for the adapted class.
- * <!-- begin-user-doc -->
- * @param object
- * @return the text rep of the object
- * <!-- end-user-doc -->
- * @generated
- */
- public String getText(Object object) {
- String label = ((IMapTypeDescriptor)object).getTypeSignature();
- return label == null || label.length() == 0 ?
- getString("_UI_IMapTypeDescriptor_type") : //$NON-NLS-1$
- getString("_UI_IMapTypeDescriptor_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
- }
-
- /**
- * This handles model notifications by calling {@link #updateChildren(Notification)} to update any cached
- * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged(Notification)}.
- * <!-- begin-user-doc -->
- * @param notification
- * <!-- end-user-doc -->
- * @generated
- */
- public void notifyChanged(Notification notification) {
- updateChildren(notification);
-
- switch (notification.getFeatureID(IMapTypeDescriptor.class)) {
- case SymbolPackage.IMAP_TYPE_DESCRIPTOR__MAP_SOURCE:
- case SymbolPackage.IMAP_TYPE_DESCRIPTOR__IMMUTABLE:
- fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
- return;
- }
- super.notifyChanged(notification);
- }
-
- /**
- * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
- * describing all of the children that can be created under this object.
- * <!-- begin-user-doc -->
- * @param newChildDescriptors
- * @param object
- * <!-- 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 -->
- * @return the resource locator
- * <!-- end-user-doc -->
- * @generated
- */
- public ResourceLocator getResourceLocator() {
- return JSFCommonPlugin.INSTANCE;
- }
-
-}
-
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/provider/IMethodSymbolItemProvider.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/provider/IMethodSymbolItemProvider.java
deleted file mode 100644
index 0d29021..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/provider/IMethodSymbolItemProvider.java
+++ /dev/null
@@ -1,201 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Oracle 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:
- * Cameron Bateman/Oracle - initial API and implementation
- *
- ********************************************************************************/
-package org.eclipse.jst.jsf.context.symbol.internal.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.jst.jsf.common.JSFCommonPlugin;
-import org.eclipse.jst.jsf.context.symbol.IMethodSymbol;
-import org.eclipse.jst.jsf.context.symbol.SymbolPackage;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.jst.jsf.context.symbol.IMethodSymbol} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class IMethodSymbolItemProvider
- extends ItemProviderAdapter
- implements
- IEditingDomainItemProvider,
- IStructuredItemContentProvider,
- ITreeItemContentProvider,
- IItemLabelProvider,
- IItemPropertySource {
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public static final String copyright = "Copyright 2006 Oracle"; //$NON-NLS-1$
-
- /**
- * This constructs an instance from a factory and a notifier.
- * <!-- begin-user-doc -->
- * @param adapterFactory
- * <!-- end-user-doc -->
- * @generated
- */
- public IMethodSymbolItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This returns the property descriptors for the adapted class.
- * <!-- begin-user-doc -->
- * @param object
- * @return the property sheet descriptors
- * <!-- end-user-doc -->
- * @generated
- */
- public List getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
-
- addNamePropertyDescriptor(object);
- addSignaturePropertyDescriptor(object);
- }
- return itemPropertyDescriptors;
- }
-
- /**
- * This adds a property descriptor for the Name feature.
- * <!-- begin-user-doc -->
- * @param object
- * <!-- end-user-doc -->
- * @generated
- */
- protected void addNamePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_ISymbol_name_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_ISymbol_name_feature", "_UI_ISymbol_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- SymbolPackage.Literals.ISYMBOL__NAME,
- true,
- false,
- false,
- ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
- null,
- null));
- }
-
- /**
- * This adds a property descriptor for the Signature feature.
- * <!-- begin-user-doc -->
- * @param object
- * <!-- end-user-doc -->
- * @generated
- */
- protected void addSignaturePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_IMethodSymbol_signature_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_IMethodSymbol_signature_feature", "_UI_IMethodSymbol_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- SymbolPackage.Literals.IMETHOD_SYMBOL__SIGNATURE,
- true,
- false,
- false,
- ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
- null,
- null));
- }
-
- /**
- * This returns IMethodSymbol.gif.
- * <!-- begin-user-doc -->
- * @param object
- * @return the image representatino of object
- * <!-- end-user-doc -->
- * @generated
- */
- public Object getImage(Object object) {
- return overlayImage(object, getResourceLocator().getImage("full/obj16/IMethodSymbol")); //$NON-NLS-1$
- }
-
- /**
- * This returns the label text for the adapted class.
- * <!-- begin-user-doc -->
- * @param object
- * @return the text represention of object
- * <!-- end-user-doc -->
- * @generated
- */
- public String getText(Object object) {
- String label = ((IMethodSymbol)object).getName();
- return label == null || label.length() == 0 ?
- getString("_UI_IMethodSymbol_type") : //$NON-NLS-1$
- getString("_UI_IMethodSymbol_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
- }
-
- /**
- * This handles model notifications by calling {@link #updateChildren(Notification)} to update any cached
- * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged(Notification)}.
- * <!-- begin-user-doc -->
- * @param notification
- * <!-- end-user-doc -->
- * @generated
- */
- public void notifyChanged(Notification notification) {
- updateChildren(notification);
-
- switch (notification.getFeatureID(IMethodSymbol.class)) {
- case SymbolPackage.IMETHOD_SYMBOL__NAME:
- case SymbolPackage.IMETHOD_SYMBOL__SIGNATURE:
- fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
- return;
- }
- super.notifyChanged(notification);
- }
-
- /**
- * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
- * describing all of the children that can be created under this object.
- * <!-- begin-user-doc -->
- * @param newChildDescriptors
- * @param object
- * <!-- 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 -->
- * @return the EMF resource locator
- * <!-- end-user-doc -->
- * @generated
- */
- public ResourceLocator getResourceLocator() {
- return JSFCommonPlugin.INSTANCE;
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/provider/IPropertySymbolItemProvider.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/provider/IPropertySymbolItemProvider.java
deleted file mode 100644
index 3958147..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/provider/IPropertySymbolItemProvider.java
+++ /dev/null
@@ -1,361 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Oracle 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:
- * Cameron Bateman/Oracle - initial API and implementation
- *
- ********************************************************************************/
-package org.eclipse.jst.jsf.context.symbol.internal.provider;
-
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Iterator;
-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.emf.edit.ui.provider.ExtendedImageRegistry;
-import org.eclipse.jface.text.contentassist.ICompletionProposal;
-import org.eclipse.jst.jsf.common.JSFCommonPlugin;
-import org.eclipse.jst.jsf.context.symbol.IDescribedInDetail;
-import org.eclipse.jst.jsf.context.symbol.IPropertySymbol;
-import org.eclipse.jst.jsf.context.symbol.SymbolPackage;
-import org.eclipse.jst.jsf.context.symbol.provider.IContentProposalProvider;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.wst.sse.ui.internal.contentassist.CustomCompletionProposal;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.jst.jsf.context.symbol.IPropertySymbol} object.
- * <!-- begin-user-doc -->
- * @extends IContentProposalProvider
- * <!-- end-user-doc -->
- * @generated
- */
-public class IPropertySymbolItemProvider
- extends ItemProviderAdapter
- implements
- IEditingDomainItemProvider,
- IStructuredItemContentProvider,
- ITreeItemContentProvider,
- IItemLabelProvider,
- IItemPropertySource,
- IContentProposalProvider{
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public static final String copyright = "Copyright 2006 Oracle"; //$NON-NLS-1$
-
- /**
- * This constructs an instance from a factory and a notifier.
- * <!-- begin-user-doc -->
- * @param adapterFactory
- * <!-- end-user-doc -->
- * @generated
- */
- public IPropertySymbolItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This returns the property descriptors for the adapted class.
- * <!-- begin-user-doc -->
- * @param object
- * @return the property descriptors
- * <!-- end-user-doc -->
- * @generated
- */
- public List getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
-
- addNamePropertyDescriptor(object);
- addTypeDescriptorPropertyDescriptor(object);
- addReadablePropertyDescriptor(object);
- addWritablePropertyDescriptor(object);
- addIntermediatePropertyDescriptor(object);
- }
- return itemPropertyDescriptors;
- }
-
- /**
- * This adds a property descriptor for the Name feature.
- * <!-- begin-user-doc -->
- * @param object
- * <!-- end-user-doc -->
- * @generated
- */
- protected void addNamePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_ISymbol_name_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_ISymbol_name_feature", "_UI_ISymbol_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- SymbolPackage.Literals.ISYMBOL__NAME,
- true,
- false,
- false,
- ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
- null,
- null));
- }
-
- /**
- * This adds a property descriptor for the Type Descriptor feature.
- * <!-- begin-user-doc -->
- * @param object
- * <!-- end-user-doc -->
- * @generated
- */
- protected void addTypeDescriptorPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_IObjectSymbol_typeDescriptor_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_IObjectSymbol_typeDescriptor_feature", "_UI_IObjectSymbol_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- SymbolPackage.Literals.IOBJECT_SYMBOL__TYPE_DESCRIPTOR,
- true,
- false,
- true,
- null,
- null,
- null));
- }
-
- /**
- * This adds a property descriptor for the Readable feature.
- * <!-- begin-user-doc -->
- * @param object
- * <!-- end-user-doc -->
- * @generated
- */
- protected void addReadablePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_IObjectSymbol_readable_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_IObjectSymbol_readable_feature", "_UI_IObjectSymbol_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- SymbolPackage.Literals.IOBJECT_SYMBOL__READABLE,
- true,
- false,
- false,
- ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,
- null,
- null));
- }
-
- /**
- * This adds a property descriptor for the Writable feature.
- * <!-- begin-user-doc -->
- * @param object
- * <!-- end-user-doc -->
- * @generated
- */
- protected void addWritablePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_IObjectSymbol_writable_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_IObjectSymbol_writable_feature", "_UI_IObjectSymbol_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- SymbolPackage.Literals.IOBJECT_SYMBOL__WRITABLE,
- true,
- false,
- false,
- ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,
- null,
- null));
- }
-
- /**
- * This adds a property descriptor for the Intermediate feature.
- * <!-- begin-user-doc -->
- * @param object
- * <!-- end-user-doc -->
- * @generated
- */
- protected void addIntermediatePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_IPropertySymbol_intermediate_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_IPropertySymbol_intermediate_feature", "_UI_IPropertySymbol_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- SymbolPackage.Literals.IPROPERTY_SYMBOL__INTERMEDIATE,
- true,
- false,
- false,
- ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,
- null,
- null));
- }
-
- /**
- * This returns IPropertySymbol.gif.
- * <!-- begin-user-doc -->
- * @param object
- * @return the image rep of object
- * <!-- end-user-doc -->
- * @generated
- */
- public Object getImage(Object object) {
- return overlayImage(object, getResourceLocator().getImage("full/obj16/IPropertySymbol")); //$NON-NLS-1$
- }
-
- /**
- * This returns the label text for the adapted class.
- * <!-- begin-user-doc -->
- * @param object
- * @return the text representation of the object
- * <!-- end-user-doc -->
- * @generated NOT
- */
- public String getText(Object object) {
- String label = ((IPropertySymbol)object).getName();
- return label == null || label.length() == 0 ?
- getString("_UI_IPropertySymbol_type") : //$NON-NLS-1$
- label;
- }
-
- /**
- * This handles model notifications by calling {@link #updateChildren(Notification)} to update any cached
- * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged(Notification)}.
- * <!-- begin-user-doc -->
- * @param notification
- * <!-- end-user-doc -->
- * @generated
- */
- public void notifyChanged(Notification notification) {
- updateChildren(notification);
-
- switch (notification.getFeatureID(IPropertySymbol.class)) {
- case SymbolPackage.IPROPERTY_SYMBOL__NAME:
- case SymbolPackage.IPROPERTY_SYMBOL__READABLE:
- case SymbolPackage.IPROPERTY_SYMBOL__WRITABLE:
- case SymbolPackage.IPROPERTY_SYMBOL__INTERMEDIATE:
- fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
- return;
- }
- super.notifyChanged(notification);
- }
-
- /**
- * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
- * describing all of the children that can be created under this object.
- * <!-- begin-user-doc -->
- * @param newChildDescriptors
- * @param object
- * <!-- 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 -->
- * @return the resource locator
- * <!-- end-user-doc -->
- * @generated
- */
- public ResourceLocator getResourceLocator() {
- return JSFCommonPlugin.INSTANCE;
- }
-
- /**
- * @see org.eclipse.emf.edit.provider.ItemProviderAdapter#getChildren(java.lang.Object)
- */
- public Collection getChildren(Object object)
- {
- final List childSymbols = new ArrayList();
- childSymbols.addAll(((IPropertySymbol)object).getTypeDescriptor().getProperties());
- return Collections.unmodifiableList(childSymbols);
- }
-
- /**
- * @see org.eclipse.jst.jsf.context.symbol.provider.IContentProposalProvider#getProposals(Object, org.eclipse.jst.jsf.context.symbol.provider.IContentProposalProvider.IProposalCreationFactory)
- */
- public ICompletionProposal[] getProposals(Object target1, IProposalCreationFactory proposalFactory)
- {
- return getProposalsInternal((IPropertySymbol) target1, proposalFactory, ""); //$NON-NLS-1$
- }
-
- private ICompletionProposal[] getProposalsInternal(IPropertySymbol symbol, IProposalCreationFactory proposalFactory, String intermediatePrefix)
- {
- final List completions = new ArrayList();
- final Image displayImage =
- ExtendedImageRegistry.getInstance().getImage(getImage(symbol));
-
- if (symbol.isIntermediate())
- {
- // see if there's something using this as intermediate completion
- List props = symbol.getTypeDescriptor().getProperties();
-
- for (final Iterator it = props.iterator(); it.hasNext();)
- {
- final IPropertySymbol propSymbol = (IPropertySymbol) it.next();
-
- if (!propSymbol.isIntermediate())
- {
- final String replacementText = "['" + intermediatePrefix + symbol.getName() + "." + propSymbol.getName() + "']"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- completions.add(proposalFactory.createProposal(
- replacementText,
- replacementText,
- null,
- displayImage, symbol));
- }
- else
- {
- completions.addAll(Arrays.asList(getProposalsInternal(propSymbol, proposalFactory, intermediatePrefix+symbol.getName()+"."))); //$NON-NLS-1$
- }
- }
- }
- else
- {
- final String replacementText = intermediatePrefix + symbol.getName();
- final String displayText = symbol.getName();
-
- completions.add(createProposal(symbol, replacementText, displayText, displayImage,
- proposalFactory));
- }
-
- return (ICompletionProposal[]) completions.toArray(new CustomCompletionProposal[0]);
-
- }
-
- private ICompletionProposal createProposal(IPropertySymbol symbol,
- final String replacementText, final String displayText,
- final Image displayImage, IProposalCreationFactory proposalFactory) {
- String additionalText = null; // TODO: put property value here where possible?
- if (symbol instanceof IDescribedInDetail) {
- additionalText = ((IDescribedInDetail) symbol).getDetailedDescription();
- }
- return proposalFactory.createProposal(
- replacementText,
- displayText,
- additionalText,
- displayImage, symbol);
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/provider/ITypeDescriptorItemProvider.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/provider/ITypeDescriptorItemProvider.java
deleted file mode 100644
index 4c34ed3..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/provider/ITypeDescriptorItemProvider.java
+++ /dev/null
@@ -1,372 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Oracle 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:
- * Cameron Bateman/Oracle - initial API and implementation
- *
- ********************************************************************************/
-package org.eclipse.jst.jsf.context.symbol.internal.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.jst.jsf.common.JSFCommonPlugin;
-import org.eclipse.jst.jsf.context.symbol.ITypeDescriptor;
-import org.eclipse.jst.jsf.context.symbol.SymbolPackage;
-
-
-
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.jst.jsf.context.symbol.ITypeDescriptor} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class ITypeDescriptorItemProvider
- extends ItemProviderAdapter
- implements
- IEditingDomainItemProvider,
- IStructuredItemContentProvider,
- ITreeItemContentProvider,
- IItemLabelProvider,
- IItemPropertySource {
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public static final String copyright = "Copyright 2006 Oracle"; //$NON-NLS-1$
-
- /**
- * This constructs an instance from a factory and a notifier.
- * <!-- begin-user-doc -->
- * @param adapterFactory
- * <!-- end-user-doc -->
- * @generated
- */
- public ITypeDescriptorItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This returns the property descriptors for the adapted class.
- * <!-- begin-user-doc -->
- * @param object
- * @return the list of property descriptors
- * <!-- end-user-doc -->
- * @generated
- */
- public List getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
-
- addPropertiesPropertyDescriptor(object);
- addTypeSignaturePropertyDescriptor(object);
- addSuperTypeSignaturesPropertyDescriptor(object);
- addInterfaceTypeSignaturesPropertyDescriptor(object);
- addTypeSignatureDelegatePropertyDescriptor(object);
- addMethodsPropertyDescriptor(object);
- }
- return itemPropertyDescriptors;
- }
-
- /**
- * This adds a property descriptor for the Properties feature.
- * <!-- begin-user-doc -->
- * @param object
- * <!-- end-user-doc -->
- * @generated
- */
- protected void addPropertiesPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_ITypeDescriptor_properties_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_ITypeDescriptor_properties_feature", "_UI_ITypeDescriptor_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- SymbolPackage.Literals.ITYPE_DESCRIPTOR__PROPERTIES,
- true,
- false,
- true,
- null,
- null,
- null));
- }
-
- /**
- * This adds a property descriptor for the Type Signature feature.
- * <!-- begin-user-doc -->
- * @param object
- * <!-- end-user-doc -->
- * @generated
- */
- protected void addTypeSignaturePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_ITypeDescriptor_typeSignature_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_ITypeDescriptor_typeSignature_feature", "_UI_ITypeDescriptor_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- SymbolPackage.Literals.ITYPE_DESCRIPTOR__TYPE_SIGNATURE,
- false,
- false,
- false,
- ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
- null,
- null));
- }
-
- /**
- * This adds a property descriptor for the Super Type Signatures feature.
- * <!-- begin-user-doc -->
- * @param object
- * <!-- end-user-doc -->
- * @generated
- */
- protected void addSuperTypeSignaturesPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_ITypeDescriptor_superTypeSignatures_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_ITypeDescriptor_superTypeSignatures_feature", "_UI_ITypeDescriptor_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- SymbolPackage.Literals.ITYPE_DESCRIPTOR__SUPER_TYPE_SIGNATURES,
- true,
- false,
- false,
- ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
- null,
- null));
- }
-
- /**
- * This adds a property descriptor for the Interface Type Signatures feature.
- * <!-- begin-user-doc -->
- * @param object
- * <!-- end-user-doc -->
- * @generated
- */
- protected void addInterfaceTypeSignaturesPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_ITypeDescriptor_interfaceTypeSignatures_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_ITypeDescriptor_interfaceTypeSignatures_feature", "_UI_ITypeDescriptor_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- SymbolPackage.Literals.ITYPE_DESCRIPTOR__INTERFACE_TYPE_SIGNATURES,
- true,
- false,
- false,
- ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
- null,
- null));
- }
-
- /**
- * This adds a property descriptor for the Type Signature Delegate feature.
- * <!-- begin-user-doc -->
- * @param object
- * <!-- end-user-doc -->
- * @generated
- */
- protected void addTypeSignatureDelegatePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_ITypeDescriptor_typeSignatureDelegate_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_ITypeDescriptor_typeSignatureDelegate_feature", "_UI_ITypeDescriptor_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- SymbolPackage.Literals.ITYPE_DESCRIPTOR__TYPE_SIGNATURE_DELEGATE,
- true,
- false,
- false,
- ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
- null,
- null));
- }
-
- /**
- * This adds a property descriptor for the Methods feature.
- * <!-- begin-user-doc -->
- * @param object
- * <!-- end-user-doc -->
- * @generated
- */
- protected void addMethodsPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_ITypeDescriptor_methods_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_ITypeDescriptor_methods_feature", "_UI_ITypeDescriptor_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- SymbolPackage.Literals.ITYPE_DESCRIPTOR__METHODS,
- true,
- false,
- true,
- null,
- null,
- null));
- }
-
- /**
- * This adds a property descriptor for the Type Parameter Signatures feature.
- * <!-- begin-user-doc -->
- * @param object
- * <!-- end-user-doc -->
- * @generated
- */
- protected void addTypeParameterSignaturesPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_ITypeDescriptor_typeParameterSignatures_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_ITypeDescriptor_typeParameterSignatures_feature", "_UI_ITypeDescriptor_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- SymbolPackage.Literals.ITYPE_DESCRIPTOR__TYPE_PARAMETER_SIGNATURES,
- true,
- false,
- false,
- ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
- null,
- null));
- }
-
- /**
- * This adds a property descriptor for the Jdt Context feature.
- * <!-- begin-user-doc -->
- * @param object
- * <!-- end-user-doc -->
- * @generated
- */
- protected void addJdtContextPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_ITypeDescriptor_jdtContext_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_ITypeDescriptor_jdtContext_feature", "_UI_ITypeDescriptor_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- SymbolPackage.Literals.ITYPE_DESCRIPTOR__JDT_CONTEXT,
- true,
- false,
- false,
- ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
- null,
- null));
- }
-
- /**
- * This adds a property descriptor for the Enum Type feature.
- * <!-- begin-user-doc -->
- * @param object
- * <!-- end-user-doc -->
- * @generated
- */
- protected void addEnumTypePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_ITypeDescriptor_enumType_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_ITypeDescriptor_enumType_feature", "_UI_ITypeDescriptor_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- SymbolPackage.Literals.ITYPE_DESCRIPTOR__ENUM_TYPE,
- true,
- false,
- false,
- ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,
- null,
- null));
- }
-
- /**
- * This returns ITypeDescriptor.gif.
- * <!-- begin-user-doc -->
- * @param object
- * @return the image associated with object or null if not found
- * <!-- end-user-doc -->
- * @generated
- */
- public Object getImage(Object object) {
- return overlayImage(object, getResourceLocator().getImage("full/obj16/ITypeDescriptor")); //$NON-NLS-1$
- }
-
- /**
- * This returns the label text for the adapted class.
- * <!-- begin-user-doc -->
- * @param object
- * @return the text label associated with object or null if not found
- * <!-- end-user-doc -->
- * @generated
- */
- public String getText(Object object) {
- String label = ((ITypeDescriptor)object).getTypeSignature();
- return label == null || label.length() == 0 ?
- getString("_UI_ITypeDescriptor_type") : //$NON-NLS-1$
- getString("_UI_ITypeDescriptor_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
- }
-
- /**
- * This handles model notifications by calling {@link #updateChildren(Notification)} to update any cached
- * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged(Notification)}.
- * <!-- begin-user-doc -->
- * @param notification
- * <!-- end-user-doc -->
- * @generated
- */
- public void notifyChanged(Notification notification) {
- updateChildren(notification);
-
- switch (notification.getFeatureID(ITypeDescriptor.class)) {
- case SymbolPackage.ITYPE_DESCRIPTOR__TYPE_SIGNATURE:
- case SymbolPackage.ITYPE_DESCRIPTOR__SUPER_TYPE_SIGNATURES:
- case SymbolPackage.ITYPE_DESCRIPTOR__INTERFACE_TYPE_SIGNATURES:
- case SymbolPackage.ITYPE_DESCRIPTOR__TYPE_SIGNATURE_DELEGATE:
- fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
- return;
- }
- super.notifyChanged(notification);
- }
-
- /**
- * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
- * describing all of the children that can be created under this object.
- * <!-- begin-user-doc -->
- * @param newChildDescriptors
- * @param object
- * <!-- 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 -->
- * @return the resource locator
- * <!-- end-user-doc -->
- * @generated
- */
- public ResourceLocator getResourceLocator() {
- return JSFCommonPlugin.INSTANCE;
- }
-
-}
-
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/provider/SymbolItemProviderAdapterFactory.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/provider/SymbolItemProviderAdapterFactory.java
deleted file mode 100644
index 6dc9171..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/provider/SymbolItemProviderAdapterFactory.java
+++ /dev/null
@@ -1,534 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Oracle 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:
- * Cameron Bateman/Oracle - initial API and implementation
- *
- ********************************************************************************/
-package org.eclipse.jst.jsf.context.symbol.internal.provider;
-
-import java.util.ArrayList;
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.edit.provider.ChangeNotifier;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
-import org.eclipse.emf.edit.provider.IChangeNotifier;
-import org.eclipse.emf.edit.provider.IDisposable;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.INotifyChangedListener;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.jst.jsf.context.symbol.internal.util.SymbolAdapterFactory;
-import org.eclipse.jst.jsf.context.symbol.provider.IContentProposalProvider;
-
-/**
- * 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 SymbolItemProviderAdapterFactory extends SymbolAdapterFactory implements ComposeableAdapterFactory, IChangeNotifier, IDisposable {
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @SuppressWarnings("hiding")
- public static final String copyright = "Copyright 2006 Oracle"; //$NON-NLS-1$
-
- /**
- * 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 -->
- * TODO: try to got to Gen function to add custom adapters
- * instead of a NOT
- * @generated NOT
- */
- public SymbolItemProviderAdapterFactory() {
- supportedTypes.add(IEditingDomainItemProvider.class);
- supportedTypes.add(IStructuredItemContentProvider.class);
- supportedTypes.add(ITreeItemContentProvider.class);
- supportedTypes.add(IItemLabelProvider.class);
- supportedTypes.add(IItemPropertySource.class);
- supportedTypes.add(IContentProposalProvider.class);
- }
-
- /**
- * This keeps track of the one adapter used for all {@link org.eclipse.jst.jsf.context.symbol.IBeanInstanceSymbol} instances.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected IBeanInstanceSymbolItemProvider iBeanInstanceSymbolItemProvider;
-
- /**
- * This creates an adapter for a {@link org.eclipse.jst.jsf.context.symbol.IBeanInstanceSymbol}.
- * <!-- begin-user-doc -->
- * @return the adapter
- * <!-- end-user-doc -->
- * @generated
- */
- public Adapter createIBeanInstanceSymbolAdapter() {
- if (iBeanInstanceSymbolItemProvider == null) {
- iBeanInstanceSymbolItemProvider = new IBeanInstanceSymbolItemProvider(this);
- }
-
- return iBeanInstanceSymbolItemProvider;
- }
-
- /**
- * This keeps track of the one adapter used for all {@link org.eclipse.jst.jsf.context.symbol.IBeanPropertySymbol} instances.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected IBeanPropertySymbolItemProvider iBeanPropertySymbolItemProvider;
-
- /**
- * This creates an adapter for a {@link org.eclipse.jst.jsf.context.symbol.IBeanPropertySymbol}.
- * <!-- begin-user-doc -->
- * @return the adapter
- * <!-- end-user-doc -->
- * @generated
- */
- public Adapter createIBeanPropertySymbolAdapter() {
- if (iBeanPropertySymbolItemProvider == null) {
- iBeanPropertySymbolItemProvider = new IBeanPropertySymbolItemProvider(this);
- }
-
- return iBeanPropertySymbolItemProvider;
- }
-
- /**
- * This keeps track of the one adapter used for all {@link org.eclipse.jst.jsf.context.symbol.IInstanceSymbol} instances.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected IInstanceSymbolItemProvider iInstanceSymbolItemProvider;
-
- /**
- * This creates an adapter for a {@link org.eclipse.jst.jsf.context.symbol.IInstanceSymbol}.
- * <!-- begin-user-doc -->
- * @return the adapter
- * <!-- end-user-doc -->
- * @generated
- */
- public Adapter createIInstanceSymbolAdapter() {
- if (iInstanceSymbolItemProvider == null) {
- iInstanceSymbolItemProvider = new IInstanceSymbolItemProvider(this);
- }
-
- return iInstanceSymbolItemProvider;
- }
-
- /**
- * This keeps track of the one adapter used for all {@link org.eclipse.jst.jsf.context.symbol.IJavaSymbol} instances.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected IJavaSymbolItemProvider iJavaSymbolItemProvider;
-
- /**
- * This creates an adapter for a {@link org.eclipse.jst.jsf.context.symbol.IJavaSymbol}.
- * <!-- begin-user-doc -->
- * @return the adapter
- * <!-- end-user-doc -->
- * @generated
- */
- public Adapter createIJavaSymbolAdapter() {
- if (iJavaSymbolItemProvider == null) {
- iJavaSymbolItemProvider = new IJavaSymbolItemProvider(this);
- }
-
- return iJavaSymbolItemProvider;
- }
-
- /**
- * This keeps track of the one adapter used for all {@link org.eclipse.jst.jsf.context.symbol.IJavaTypeDescriptor2} instances.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected IJavaTypeDescriptor2ItemProvider iJavaTypeDescriptor2ItemProvider;
-
- /**
- * This creates an adapter for a {@link org.eclipse.jst.jsf.context.symbol.IJavaTypeDescriptor2}.
- * <!-- begin-user-doc -->
- * @return the adapter
- * <!-- end-user-doc -->
- * @generated
- */
- public Adapter createIJavaTypeDescriptor2Adapter() {
- if (iJavaTypeDescriptor2ItemProvider == null) {
- iJavaTypeDescriptor2ItemProvider = new IJavaTypeDescriptor2ItemProvider(this);
- }
-
- return iJavaTypeDescriptor2ItemProvider;
- }
-
- /**
- * This keeps track of the one adapter used for all {@link org.eclipse.jst.jsf.context.symbol.IBeanMethodSymbol} instances.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected IBeanMethodSymbolItemProvider iBeanMethodSymbolItemProvider;
-
- /**
- * This creates an adapter for a {@link org.eclipse.jst.jsf.context.symbol.IBeanMethodSymbol}.
- * <!-- begin-user-doc -->
- * @return the adapter
- * <!-- end-user-doc -->
- * @generated
- */
- public Adapter createIBeanMethodSymbolAdapter() {
- if (iBeanMethodSymbolItemProvider == null) {
- iBeanMethodSymbolItemProvider = new IBeanMethodSymbolItemProvider(this);
- }
-
- return iBeanMethodSymbolItemProvider;
- }
-
- /**
- * This keeps track of the one adapter used for all {@link org.eclipse.jst.jsf.context.symbol.IComponentSymbol} instances.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected IComponentSymbolItemProvider iComponentSymbolItemProvider;
-
- /**
- * This creates an adapter for a {@link org.eclipse.jst.jsf.context.symbol.IComponentSymbol}.
- * <!-- begin-user-doc -->
- * @return the adapter
- * <!-- end-user-doc -->
- * @generated
- */
- public Adapter createIComponentSymbolAdapter() {
- if (iComponentSymbolItemProvider == null) {
- iComponentSymbolItemProvider = new IComponentSymbolItemProvider(this);
- }
-
- return iComponentSymbolItemProvider;
- }
-
- /**
- * This keeps track of the one adapter used for all {@link org.eclipse.jst.jsf.context.symbol.IPropertySymbol} instances.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected IPropertySymbolItemProvider iPropertySymbolItemProvider;
-
- /**
- * This creates an adapter for a {@link org.eclipse.jst.jsf.context.symbol.IPropertySymbol}.
- * <!-- begin-user-doc -->
- * @return the property symbol adapter
- * <!-- end-user-doc -->
- * @generated
- */
- public Adapter createIPropertySymbolAdapter() {
- if (iPropertySymbolItemProvider == null) {
- iPropertySymbolItemProvider = new IPropertySymbolItemProvider(this);
- }
-
- return iPropertySymbolItemProvider;
- }
-
- /**
- * This keeps track of the one adapter used for all {@link org.eclipse.jst.jsf.context.symbol.IMapTypeDescriptor} instances.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected IMapTypeDescriptorItemProvider iMapTypeDescriptorItemProvider;
-
- /**
- * This creates an adapter for a {@link org.eclipse.jst.jsf.context.symbol.IMapTypeDescriptor}.
- * <!-- begin-user-doc -->
- * @return the adapter
- * <!-- end-user-doc -->
- * @generated
- */
- public Adapter createIMapTypeDescriptorAdapter() {
- if (iMapTypeDescriptorItemProvider == null) {
- iMapTypeDescriptorItemProvider = new IMapTypeDescriptorItemProvider(this);
- }
-
- return iMapTypeDescriptorItemProvider;
- }
-
- /**
- * This keeps track of the one adapter used for all {@link org.eclipse.jst.jsf.context.symbol.IMethodSymbol} instances.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected IMethodSymbolItemProvider iMethodSymbolItemProvider;
-
- /**
- * This creates an adapter for a {@link org.eclipse.jst.jsf.context.symbol.IMethodSymbol}.
- * <!-- begin-user-doc -->
- * @return the adapter for method symbols
- * <!-- end-user-doc -->
- * @generated
- */
- public Adapter createIMethodSymbolAdapter() {
- if (iMethodSymbolItemProvider == null) {
- iMethodSymbolItemProvider = new IMethodSymbolItemProvider(this);
- }
-
- return iMethodSymbolItemProvider;
- }
-
- /**
- * This keeps track of the one adapter used for all {@link org.eclipse.jst.jsf.context.symbol.IBoundedMapTypeDescriptor} instances.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected IBoundedMapTypeDescriptorItemProvider iBoundedMapTypeDescriptorItemProvider;
-
- /**
- * This creates an adapter for a {@link org.eclipse.jst.jsf.context.symbol.IBoundedMapTypeDescriptor}.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public Adapter createIBoundedMapTypeDescriptorAdapter() {
- if (iBoundedMapTypeDescriptorItemProvider == null) {
- iBoundedMapTypeDescriptorItemProvider = new IBoundedMapTypeDescriptorItemProvider(this);
- }
-
- return iBoundedMapTypeDescriptorItemProvider;
- }
-
- /**
- * This keeps track of the one adapter used for all {@link org.eclipse.jst.jsf.context.symbol.IBoundedJavaTypeDescriptor} instances.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected IBoundedJavaTypeDescriptorItemProvider iBoundedJavaTypeDescriptorItemProvider;
-
- /**
- * This creates an adapter for a {@link org.eclipse.jst.jsf.context.symbol.IBoundedJavaTypeDescriptor}.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public Adapter createIBoundedJavaTypeDescriptorAdapter() {
- if (iBoundedJavaTypeDescriptorItemProvider == null) {
- iBoundedJavaTypeDescriptorItemProvider = new IBoundedJavaTypeDescriptorItemProvider(this);
- }
-
- return iBoundedJavaTypeDescriptorItemProvider;
- }
-
- /**
- * This keeps track of the one adapter used for all {@link org.eclipse.jst.jsf.context.symbol.IListTypeDescriptor} instances.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected IListTypeDescriptorItemProvider iListTypeDescriptorItemProvider;
-
- /**
- * This creates an adapter for a {@link org.eclipse.jst.jsf.context.symbol.IListTypeDescriptor}.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public Adapter createIListTypeDescriptorAdapter() {
- if (iListTypeDescriptorItemProvider == null) {
- iListTypeDescriptorItemProvider = new IListTypeDescriptorItemProvider(this);
- }
-
- return iListTypeDescriptorItemProvider;
- }
-
- /**
- * This keeps track of the one adapter used for all {@link org.eclipse.jst.jsf.context.symbol.IBoundedListTypeDescriptor} instances.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected IBoundedListTypeDescriptorItemProvider iBoundedListTypeDescriptorItemProvider;
-
- /**
- * This creates an adapter for a {@link org.eclipse.jst.jsf.context.symbol.IBoundedListTypeDescriptor}.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public Adapter createIBoundedListTypeDescriptorAdapter() {
- if (iBoundedListTypeDescriptorItemProvider == null) {
- iBoundedListTypeDescriptorItemProvider = new IBoundedListTypeDescriptorItemProvider(this);
- }
-
- return iBoundedListTypeDescriptorItemProvider;
- }
-
- /**
- * This returns the root adapter factory that contains this factory.
- * <!-- begin-user-doc -->
- * @return the adapter factory
- * <!-- 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 -->
- * @param parentAdapterFactory
- * <!-- end-user-doc -->
- * @generated
- */
- public void setParentAdapterFactory(ComposedAdapterFactory parentAdapterFactory) {
- this.parentAdapterFactory = parentAdapterFactory;
- }
-
- /**
- * <!-- begin-user-doc -->
- * @param type
- * @return true if the factory supports the adapter type
- * <!-- 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 -->
- * @param notifier
- * @param type
- * @return the adapter
- * <!-- end-user-doc -->
- * @generated
- */
- public Adapter adapt(Notifier notifier, Object type) {
- return super.adapt(notifier, this);
- }
-
- /**
- * <!-- begin-user-doc -->
- * @param object
- * @param type
- * @return the adapted object
- * <!-- 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 -->
- * @param notifyChangedListener
- * <!-- end-user-doc -->
- * @generated
- */
- public void addListener(INotifyChangedListener notifyChangedListener) {
- changeNotifier.addListener(notifyChangedListener);
- }
-
- /**
- * This removes a listener.
- * <!-- begin-user-doc -->
- * @param notifyChangedListener
- * <!-- end-user-doc -->
- * @generated
- */
- public void removeListener(INotifyChangedListener notifyChangedListener) {
- changeNotifier.removeListener(notifyChangedListener);
- }
-
- /**
- * This delegates to {@link #changeNotifier} and to {@link #parentAdapterFactory}.
- * <!-- begin-user-doc -->
- * @param notification
- * <!-- 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 (iBeanInstanceSymbolItemProvider != null) iBeanInstanceSymbolItemProvider.dispose();
- if (iBeanPropertySymbolItemProvider != null) iBeanPropertySymbolItemProvider.dispose();
- if (iInstanceSymbolItemProvider != null) iInstanceSymbolItemProvider.dispose();
- if (iJavaSymbolItemProvider != null) iJavaSymbolItemProvider.dispose();
- if (iJavaTypeDescriptor2ItemProvider != null) iJavaTypeDescriptor2ItemProvider.dispose();
- if (iBeanMethodSymbolItemProvider != null) iBeanMethodSymbolItemProvider.dispose();
- if (iComponentSymbolItemProvider != null) iComponentSymbolItemProvider.dispose();
- if (iPropertySymbolItemProvider != null) iPropertySymbolItemProvider.dispose();
- if (iMapTypeDescriptorItemProvider != null) iMapTypeDescriptorItemProvider.dispose();
- if (iMethodSymbolItemProvider != null) iMethodSymbolItemProvider.dispose();
- if (iBoundedMapTypeDescriptorItemProvider != null) iBoundedMapTypeDescriptorItemProvider.dispose();
- if (iBoundedJavaTypeDescriptorItemProvider != null) iBoundedJavaTypeDescriptorItemProvider.dispose();
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/source/UnknownTypeContextSymbolFactory.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/source/UnknownTypeContextSymbolFactory.java
deleted file mode 100644
index 4a77889..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/source/UnknownTypeContextSymbolFactory.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2008 Oracle Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Oracle Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.context.symbol.internal.source;
-
-import java.util.List;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.jst.jsf.context.symbol.ERuntimeSource;
-import org.eclipse.jst.jsf.context.symbol.ISymbol;
-import org.eclipse.jst.jsf.context.symbol.InitializedSymbolFactory;
-import org.eclipse.jst.jsf.context.symbol.source.AbstractContextSymbolFactory;
-import org.eclipse.jst.jsf.context.symbol.source.IAdditionalContextSymbolInfo;
-
-/**
- * Returns an unknown component symbol.
- *
- * @author cbateman
- *
- */
-public final class UnknownTypeContextSymbolFactory extends
-AbstractContextSymbolFactory
-{
- private final InitializedSymbolFactory _factory = new InitializedSymbolFactory();
-
- @Override
- protected ISymbol internalCreate(final String symbolName, final int scope,
- final IAdaptable context, final List problems)
- {
- return internalCreate(symbolName, scope, context, null);
- }
-
- @Override
- protected ISymbol internalCreate(final String symbolName, final int scope,
- final IAdaptable context, final List problems,
- final IAdditionalContextSymbolInfo info)
- {
- return _factory.createUnknownComponentSymbol(symbolName,
- ERuntimeSource.TAG_INSTANTIATED_SYMBOL_LITERAL);
- }
- @Override
- public boolean supports(final IAdaptable context)
- {
- return true;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/util/IMethodSymbolBasedType.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/util/IMethodSymbolBasedType.java
deleted file mode 100644
index ae764be..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/util/IMethodSymbolBasedType.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2007 Oracle Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Oracle Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.context.symbol.internal.util;
-
-import org.eclipse.jst.jsf.common.internal.types.MethodType;
-import org.eclipse.jst.jsf.context.symbol.IMethodSymbol;
-
-/**
- *
- * @author cbateman
- *
- */
-public class IMethodSymbolBasedType extends MethodType
-{
- private final IMethodSymbol _methodSymbol;
-
- /**
- * @param methodSymbol
- */
- public IMethodSymbolBasedType(IMethodSymbol methodSymbol)
- {
- super(methodSymbol.getName(), methodSymbol.getSignature());
- _methodSymbol = methodSymbol;
- }
-
- /**
- * @return the method symbol
- */
- public IMethodSymbol getSymbol()
- {
- return _methodSymbol;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/util/IObjectSymbolBasedValueType.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/util/IObjectSymbolBasedValueType.java
deleted file mode 100644
index 04fbe52..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/util/IObjectSymbolBasedValueType.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2007 Oracle Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Oracle Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.context.symbol.internal.util;
-
-import org.eclipse.jst.jsf.common.internal.types.IAssignable;
-import org.eclipse.jst.jsf.common.internal.types.ValueType;
-import org.eclipse.jst.jsf.context.symbol.IInstanceSymbol;
-import org.eclipse.jst.jsf.context.symbol.IObjectSymbol;
-import org.eclipse.jst.jsf.context.symbol.IPropertySymbol;
-import org.eclipse.jst.jsf.context.symbol.ISymbol;
-
-/**
- * A value type adapter class for IObjectSymbol's
- *
- * @author cbateman
- *
- */
-public class IObjectSymbolBasedValueType extends ValueType
-{
- private final IObjectSymbol _symbol;
-
- /**
- * @param symbol
- * @return a properly configured instance based on the sub-type of symbol.
- * Returns null if symbol is not of an appropriate IObjectSymbol type
- */
- public static IObjectSymbolBasedValueType getInstance(ISymbol symbol)
- {
- if (symbol instanceof IInstanceSymbol)
- {
- if (((IInstanceSymbol)symbol).getTypeDescriptor() != null)
- {
- return new IObjectSymbolBasedValueType((IInstanceSymbol) symbol);
- }
- }
- else if (symbol instanceof IPropertySymbol)
- {
- if (((IPropertySymbol)symbol).getTypeDescriptor() != null)
- {
- return new IObjectSymbolBasedValueType((IPropertySymbol) symbol);
- }
- }
-
- return null;
- }
-
- /**
- * Constructor for instance symbols (model objects)
- * @param symbol
- */
- public IObjectSymbolBasedValueType(final IInstanceSymbol symbol)
- {
- this(symbol.getTypeDescriptor().getTypeSignature(),
- (String[])symbol.getTypeDescriptor().getTypeParameterSignatures().toArray(EMPTY_STRING_ARRAY),
- (String[])symbol.getTypeDescriptor().getSuperTypeSignatures().toArray(EMPTY_STRING_ARRAY),
- (String[])symbol.getTypeDescriptor().getInterfaceTypeSignatures().toArray(EMPTY_STRING_ARRAY),
- symbol.getTypeDescriptor().isEnumType(),
- IAssignable.ASSIGNMENT_TYPE_RHS /* variables are not assignable */
- , symbol);
- }
-
- /**
- * Constructor for property symbols
- *
- * @param symbol
- */
- public IObjectSymbolBasedValueType(final IPropertySymbol symbol)
- {
- this(symbol.getTypeDescriptor().getTypeSignature(),
- (String[])symbol.getTypeDescriptor().getTypeParameterSignatures().toArray(EMPTY_STRING_ARRAY),
- (String[])symbol.getTypeDescriptor().getSuperTypeSignatures().toArray(EMPTY_STRING_ARRAY),
- (String[])symbol.getTypeDescriptor().getInterfaceTypeSignatures().toArray(EMPTY_STRING_ARRAY),
- symbol.getTypeDescriptor().isEnumType(),
- ASSIGNMENT_TYPE_NONE | (symbol.isReadable()?IAssignable.ASSIGNMENT_TYPE_RHS:ASSIGNMENT_TYPE_NONE)|(symbol.isWritable()?IAssignable.ASSIGNMENT_TYPE_LHS:ASSIGNMENT_TYPE_NONE)
- , symbol);
- }
-
- private IObjectSymbolBasedValueType(final String signature,
- final String[] typeArgs,
- final String[] superTypes,
- final String[] interfaceTypes,
- final boolean isEnumType,
- final int assignmentMask,
- final IObjectSymbol symbol)
- {
- super(signature, typeArgs, superTypes, interfaceTypes, isEnumType, assignmentMask);
- _symbol = symbol;
- }
-
- /**
- * @return the underlying IObjectSymbol
- */
- public IObjectSymbol getSymbol()
- {
- return _symbol;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/util/SymbolAdapterFactory.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/util/SymbolAdapterFactory.java
deleted file mode 100644
index dcecf36..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/util/SymbolAdapterFactory.java
+++ /dev/null
@@ -1,457 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Oracle 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:
- * Cameron Bateman/Oracle - initial API and implementation
- *
- ********************************************************************************/
-package org.eclipse.jst.jsf.context.symbol.internal.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.jst.jsf.context.symbol.IBeanInstanceSymbol;
-import org.eclipse.jst.jsf.context.symbol.IBeanMethodSymbol;
-import org.eclipse.jst.jsf.context.symbol.IBeanPropertySymbol;
-import org.eclipse.jst.jsf.context.symbol.IBoundedJavaTypeDescriptor;
-import org.eclipse.jst.jsf.context.symbol.IBoundedListTypeDescriptor;
-import org.eclipse.jst.jsf.context.symbol.IBoundedMapTypeDescriptor;
-import org.eclipse.jst.jsf.context.symbol.IBoundedTypeDescriptor;
-import org.eclipse.jst.jsf.context.symbol.IComponentSymbol;
-import org.eclipse.jst.jsf.context.symbol.IDescribedInDetail;
-import org.eclipse.jst.jsf.context.symbol.IInstanceSymbol;
-import org.eclipse.jst.jsf.context.symbol.IJavaSymbol;
-import org.eclipse.jst.jsf.context.symbol.IJavaTypeDescriptor2;
-import org.eclipse.jst.jsf.context.symbol.IListTypeDescriptor;
-import org.eclipse.jst.jsf.context.symbol.IMapTypeDescriptor;
-import org.eclipse.jst.jsf.context.symbol.IMethodSymbol;
-import org.eclipse.jst.jsf.context.symbol.IObjectSymbol;
-import org.eclipse.jst.jsf.context.symbol.IPropertySymbol;
-import org.eclipse.jst.jsf.context.symbol.ISymbol;
-import org.eclipse.jst.jsf.context.symbol.ITypeDescriptor;
-import org.eclipse.jst.jsf.context.symbol.SymbolPackage;
-
-
-
-/**
- * <!-- 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.jst.jsf.context.symbol.SymbolPackage
- * @generated
- */
-public class SymbolAdapterFactory extends AdapterFactoryImpl {
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public static final String copyright = "Copyright 2006 Oracle"; //$NON-NLS-1$
-
- /**
- * The cached model package.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected static SymbolPackage modelPackage;
-
- /**
- * Creates an instance of the adapter factory.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public SymbolAdapterFactory() {
- if (modelPackage == null) {
- modelPackage = SymbolPackage.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.
- * @param object
- * <!-- end-user-doc -->
- * @return whether this factory is applicable for the type of the object.
- * @generated
- */
- public boolean isFactoryForType(Object object) {
- if (object == modelPackage) {
- return true;
- }
- if (object instanceof EObject) {
- return ((EObject)object).eClass().getEPackage() == modelPackage;
- }
- return false;
- }
-
- /**
- * The switch the delegates to the <code>createXXX</code> methods.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected SymbolSwitch modelSwitch =
- new SymbolSwitch() {
- public Object caseIBeanInstanceSymbol(IBeanInstanceSymbol object) {
- return createIBeanInstanceSymbolAdapter();
- }
- public Object caseIBeanPropertySymbol(IBeanPropertySymbol object) {
- return createIBeanPropertySymbolAdapter();
- }
- public Object caseIInstanceSymbol(IInstanceSymbol object) {
- return createIInstanceSymbolAdapter();
- }
- public Object caseIJavaSymbol(IJavaSymbol object) {
- return createIJavaSymbolAdapter();
- }
- public Object caseISymbol(ISymbol object) {
- return createISymbolAdapter();
- }
- public Object caseITypeDescriptor(ITypeDescriptor object) {
- return createITypeDescriptorAdapter();
- }
- public Object caseIDescribedInDetail(IDescribedInDetail object) {
- return createIDescribedInDetailAdapter();
- }
- public Object caseIJavaTypeDescriptor2(IJavaTypeDescriptor2 object) {
- return createIJavaTypeDescriptor2Adapter();
- }
- public Object caseIBeanMethodSymbol(IBeanMethodSymbol object) {
- return createIBeanMethodSymbolAdapter();
- }
- public Object caseIComponentSymbol(IComponentSymbol object) {
- return createIComponentSymbolAdapter();
- }
- public Object caseIPropertySymbol(IPropertySymbol object) {
- return createIPropertySymbolAdapter();
- }
- public Object caseIMapTypeDescriptor(IMapTypeDescriptor object) {
- return createIMapTypeDescriptorAdapter();
- }
- public Object caseIMethodSymbol(IMethodSymbol object) {
- return createIMethodSymbolAdapter();
- }
- public Object caseIObjectSymbol(IObjectSymbol object) {
- return createIObjectSymbolAdapter();
- }
- public Object caseIBoundedTypeDescriptor(IBoundedTypeDescriptor object) {
- return createIBoundedTypeDescriptorAdapter();
- }
- public Object caseIBoundedMapTypeDescriptor(IBoundedMapTypeDescriptor object) {
- return createIBoundedMapTypeDescriptorAdapter();
- }
- public Object caseIBoundedJavaTypeDescriptor(IBoundedJavaTypeDescriptor object) {
- return createIBoundedJavaTypeDescriptorAdapter();
- }
- public Object caseIListTypeDescriptor(IListTypeDescriptor object) {
- return createIListTypeDescriptorAdapter();
- }
- public Object caseIBoundedListTypeDescriptor(IBoundedListTypeDescriptor object) {
- return createIBoundedListTypeDescriptorAdapter();
- }
- 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.jst.jsf.context.symbol.IBeanInstanceSymbol <em>IBean Instance Symbol</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.jst.jsf.context.symbol.IBeanInstanceSymbol
- * @generated
- */
- public Adapter createIBeanInstanceSymbolAdapter() {
- return null;
- }
-
- /**
- * Creates a new adapter for an object of class '{@link org.eclipse.jst.jsf.context.symbol.IBeanPropertySymbol <em>IBean Property Symbol</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.jst.jsf.context.symbol.IBeanPropertySymbol
- * @generated
- */
- public Adapter createIBeanPropertySymbolAdapter() {
- return null;
- }
-
- /**
- * Creates a new adapter for an object of class '{@link org.eclipse.jst.jsf.context.symbol.IInstanceSymbol <em>IInstance Symbol</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.jst.jsf.context.symbol.IInstanceSymbol
- * @generated
- */
- public Adapter createIInstanceSymbolAdapter() {
- return null;
- }
-
- /**
- * Creates a new adapter for an object of class '{@link org.eclipse.jst.jsf.context.symbol.IJavaSymbol <em>IJava Symbol</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.jst.jsf.context.symbol.IJavaSymbol
- * @generated
- */
- public Adapter createIJavaSymbolAdapter() {
- return null;
- }
-
- /**
- * Creates a new adapter for an object of class '{@link org.eclipse.jst.jsf.context.symbol.ISymbol <em>ISymbol</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.jst.jsf.context.symbol.ISymbol
- * @generated
- */
- public Adapter createISymbolAdapter() {
- return null;
- }
-
- /**
- * Creates a new adapter for an object of class '{@link org.eclipse.jst.jsf.context.symbol.ITypeDescriptor <em>IType Descriptor</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.jst.jsf.context.symbol.ITypeDescriptor
- * @generated
- */
- public Adapter createITypeDescriptorAdapter() {
- return null;
- }
-
- /**
- * Creates a new adapter for an object of class '{@link org.eclipse.jst.jsf.context.symbol.IDescribedInDetail <em>IDescribed In Detail</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.jst.jsf.context.symbol.IDescribedInDetail
- * @generated
- */
- public Adapter createIDescribedInDetailAdapter() {
- return null;
- }
-
- /**
- * Creates a new adapter for an object of class '{@link org.eclipse.jst.jsf.context.symbol.IJavaTypeDescriptor2 <em>IJava Type Descriptor2</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.jst.jsf.context.symbol.IJavaTypeDescriptor2
- * @generated
- */
- public Adapter createIJavaTypeDescriptor2Adapter() {
- return null;
- }
-
- /**
- * Creates a new adapter for an object of class '{@link org.eclipse.jst.jsf.context.symbol.IBeanMethodSymbol <em>IBean Method Symbol</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.jst.jsf.context.symbol.IBeanMethodSymbol
- * @generated
- */
- public Adapter createIBeanMethodSymbolAdapter() {
- return null;
- }
-
- /**
- * Creates a new adapter for an object of class '{@link org.eclipse.jst.jsf.context.symbol.IComponentSymbol <em>IComponent Symbol</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.jst.jsf.context.symbol.IComponentSymbol
- * @generated
- */
- public Adapter createIComponentSymbolAdapter() {
- return null;
- }
-
- /**
- * Creates a new adapter for an object of class '{@link org.eclipse.jst.jsf.context.symbol.IPropertySymbol <em>IProperty Symbol</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.jst.jsf.context.symbol.IPropertySymbol
- * @generated
- */
- public Adapter createIPropertySymbolAdapter() {
- return null;
- }
-
- /**
- * Creates a new adapter for an object of class '{@link org.eclipse.jst.jsf.context.symbol.IMapTypeDescriptor <em>IMap Type Descriptor</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.jst.jsf.context.symbol.IMapTypeDescriptor
- * @generated
- */
- public Adapter createIMapTypeDescriptorAdapter() {
- return null;
- }
-
- /**
- * Creates a new adapter for an object of class '{@link org.eclipse.jst.jsf.context.symbol.IMethodSymbol <em>IMethod Symbol</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.jst.jsf.context.symbol.IMethodSymbol
- * @generated
- */
- public Adapter createIMethodSymbolAdapter() {
- return null;
- }
-
- /**
- * Creates a new adapter for an object of class '{@link org.eclipse.jst.jsf.context.symbol.IObjectSymbol <em>IObject Symbol</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.jst.jsf.context.symbol.IObjectSymbol
- * @generated
- */
- public Adapter createIObjectSymbolAdapter() {
- return null;
- }
-
- /**
- * Creates a new adapter for an object of class '{@link org.eclipse.jst.jsf.context.symbol.IBoundedTypeDescriptor <em>IBounded Type Descriptor</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.jst.jsf.context.symbol.IBoundedTypeDescriptor
- * @generated
- */
- public Adapter createIBoundedTypeDescriptorAdapter() {
- return null;
- }
-
- /**
- * Creates a new adapter for an object of class '{@link org.eclipse.jst.jsf.context.symbol.IBoundedMapTypeDescriptor <em>IBounded Map Type Descriptor</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.jst.jsf.context.symbol.IBoundedMapTypeDescriptor
- * @generated
- */
- public Adapter createIBoundedMapTypeDescriptorAdapter() {
- return null;
- }
-
- /**
- * Creates a new adapter for an object of class '{@link org.eclipse.jst.jsf.context.symbol.IBoundedJavaTypeDescriptor <em>IBounded Java Type Descriptor</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.jst.jsf.context.symbol.IBoundedJavaTypeDescriptor
- * @generated
- */
- public Adapter createIBoundedJavaTypeDescriptorAdapter() {
- return null;
- }
-
- /**
- * Creates a new adapter for an object of class '{@link org.eclipse.jst.jsf.context.symbol.IListTypeDescriptor <em>IList Type Descriptor</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.jst.jsf.context.symbol.IListTypeDescriptor
- * @generated
- */
- public Adapter createIListTypeDescriptorAdapter() {
- return null;
- }
-
- /**
- * Creates a new adapter for an object of class '{@link org.eclipse.jst.jsf.context.symbol.IBoundedListTypeDescriptor <em>IBounded List Type Descriptor</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.jst.jsf.context.symbol.IBoundedListTypeDescriptor
- * @generated
- */
- public Adapter createIBoundedListTypeDescriptorAdapter() {
- 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;
- }
-
-} //SymbolAdapterFactory
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/util/SymbolSwitch.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/util/SymbolSwitch.java
deleted file mode 100644
index 92c7746..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/util/SymbolSwitch.java
+++ /dev/null
@@ -1,579 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Oracle 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:
- * Cameron Bateman/Oracle - initial API and implementation
- *
- ********************************************************************************/
-package org.eclipse.jst.jsf.context.symbol.internal.util;
-
-import java.util.List;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jst.jsf.context.symbol.IBeanInstanceSymbol;
-import org.eclipse.jst.jsf.context.symbol.IBeanMethodSymbol;
-import org.eclipse.jst.jsf.context.symbol.IBeanPropertySymbol;
-import org.eclipse.jst.jsf.context.symbol.IBoundedJavaTypeDescriptor;
-import org.eclipse.jst.jsf.context.symbol.IBoundedListTypeDescriptor;
-import org.eclipse.jst.jsf.context.symbol.IBoundedMapTypeDescriptor;
-import org.eclipse.jst.jsf.context.symbol.IBoundedTypeDescriptor;
-import org.eclipse.jst.jsf.context.symbol.IComponentSymbol;
-import org.eclipse.jst.jsf.context.symbol.IDescribedInDetail;
-import org.eclipse.jst.jsf.context.symbol.IInstanceSymbol;
-import org.eclipse.jst.jsf.context.symbol.IJavaSymbol;
-import org.eclipse.jst.jsf.context.symbol.IJavaTypeDescriptor2;
-import org.eclipse.jst.jsf.context.symbol.IListTypeDescriptor;
-import org.eclipse.jst.jsf.context.symbol.IMapTypeDescriptor;
-import org.eclipse.jst.jsf.context.symbol.IMethodSymbol;
-import org.eclipse.jst.jsf.context.symbol.IObjectSymbol;
-import org.eclipse.jst.jsf.context.symbol.IPropertySymbol;
-import org.eclipse.jst.jsf.context.symbol.ISymbol;
-import org.eclipse.jst.jsf.context.symbol.ITypeDescriptor;
-import org.eclipse.jst.jsf.context.symbol.SymbolPackage;
-
-
-
-/**
- * <!-- 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.jst.jsf.context.symbol.SymbolPackage
- * @generated
- */
-public class SymbolSwitch {
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public static final String copyright = "Copyright 2006 Oracle"; //$NON-NLS-1$
-
- /**
- * The cached model package
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected static SymbolPackage modelPackage;
-
- /**
- * Creates an instance of the switch.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public SymbolSwitch() {
- if (modelPackage == null) {
- modelPackage = SymbolPackage.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 -->
- * @param theEObject
- * <!-- 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 -->
- * @param theEClass
- * @param theEObject
- * <!-- 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);
- }
- 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 -->
- * @param classifierID
- * @param theEObject
- * <!-- 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 SymbolPackage.IBEAN_INSTANCE_SYMBOL: {
- IBeanInstanceSymbol iBeanInstanceSymbol = (IBeanInstanceSymbol)theEObject;
- Object result = caseIBeanInstanceSymbol(iBeanInstanceSymbol);
- if (result == null) result = caseIInstanceSymbol(iBeanInstanceSymbol);
- if (result == null) result = caseIDescribedInDetail(iBeanInstanceSymbol);
- if (result == null) result = caseIObjectSymbol(iBeanInstanceSymbol);
- if (result == null) result = caseISymbol(iBeanInstanceSymbol);
- if (result == null) result = defaultCase(theEObject);
- return result;
- }
- case SymbolPackage.IBEAN_PROPERTY_SYMBOL: {
- IBeanPropertySymbol iBeanPropertySymbol = (IBeanPropertySymbol)theEObject;
- Object result = caseIBeanPropertySymbol(iBeanPropertySymbol);
- if (result == null) result = caseIPropertySymbol(iBeanPropertySymbol);
- if (result == null) result = caseIDescribedInDetail(iBeanPropertySymbol);
- if (result == null) result = caseIObjectSymbol(iBeanPropertySymbol);
- if (result == null) result = caseISymbol(iBeanPropertySymbol);
- if (result == null) result = defaultCase(theEObject);
- return result;
- }
- case SymbolPackage.IINSTANCE_SYMBOL: {
- IInstanceSymbol iInstanceSymbol = (IInstanceSymbol)theEObject;
- Object result = caseIInstanceSymbol(iInstanceSymbol);
- if (result == null) result = caseIObjectSymbol(iInstanceSymbol);
- if (result == null) result = caseISymbol(iInstanceSymbol);
- if (result == null) result = defaultCase(theEObject);
- return result;
- }
- case SymbolPackage.IJAVA_SYMBOL: {
- IJavaSymbol iJavaSymbol = (IJavaSymbol)theEObject;
- Object result = caseIJavaSymbol(iJavaSymbol);
- if (result == null) result = caseISymbol(iJavaSymbol);
- if (result == null) result = defaultCase(theEObject);
- return result;
- }
- case SymbolPackage.ISYMBOL: {
- ISymbol iSymbol = (ISymbol)theEObject;
- Object result = caseISymbol(iSymbol);
- if (result == null) result = defaultCase(theEObject);
- return result;
- }
- case SymbolPackage.ITYPE_DESCRIPTOR: {
- ITypeDescriptor iTypeDescriptor = (ITypeDescriptor)theEObject;
- Object result = caseITypeDescriptor(iTypeDescriptor);
- if (result == null) result = defaultCase(theEObject);
- return result;
- }
- case SymbolPackage.IDESCRIBED_IN_DETAIL: {
- IDescribedInDetail iDescribedInDetail = (IDescribedInDetail)theEObject;
- Object result = caseIDescribedInDetail(iDescribedInDetail);
- if (result == null) result = defaultCase(theEObject);
- return result;
- }
- case SymbolPackage.IJAVA_TYPE_DESCRIPTOR2: {
- IJavaTypeDescriptor2 iJavaTypeDescriptor2 = (IJavaTypeDescriptor2)theEObject;
- Object result = caseIJavaTypeDescriptor2(iJavaTypeDescriptor2);
- if (result == null) result = caseITypeDescriptor(iJavaTypeDescriptor2);
- if (result == null) result = defaultCase(theEObject);
- return result;
- }
- case SymbolPackage.IBEAN_METHOD_SYMBOL: {
- IBeanMethodSymbol iBeanMethodSymbol = (IBeanMethodSymbol)theEObject;
- Object result = caseIBeanMethodSymbol(iBeanMethodSymbol);
- if (result == null) result = caseIDescribedInDetail(iBeanMethodSymbol);
- if (result == null) result = caseIMethodSymbol(iBeanMethodSymbol);
- if (result == null) result = caseISymbol(iBeanMethodSymbol);
- if (result == null) result = defaultCase(theEObject);
- return result;
- }
- case SymbolPackage.ICOMPONENT_SYMBOL: {
- IComponentSymbol iComponentSymbol = (IComponentSymbol)theEObject;
- Object result = caseIComponentSymbol(iComponentSymbol);
- if (result == null) result = caseIInstanceSymbol(iComponentSymbol);
- if (result == null) result = caseIDescribedInDetail(iComponentSymbol);
- if (result == null) result = caseIObjectSymbol(iComponentSymbol);
- if (result == null) result = caseISymbol(iComponentSymbol);
- if (result == null) result = defaultCase(theEObject);
- return result;
- }
- case SymbolPackage.IPROPERTY_SYMBOL: {
- IPropertySymbol iPropertySymbol = (IPropertySymbol)theEObject;
- Object result = caseIPropertySymbol(iPropertySymbol);
- if (result == null) result = caseIObjectSymbol(iPropertySymbol);
- if (result == null) result = caseISymbol(iPropertySymbol);
- if (result == null) result = defaultCase(theEObject);
- return result;
- }
- case SymbolPackage.IMAP_TYPE_DESCRIPTOR: {
- IMapTypeDescriptor iMapTypeDescriptor = (IMapTypeDescriptor)theEObject;
- Object result = caseIMapTypeDescriptor(iMapTypeDescriptor);
- if (result == null) result = caseITypeDescriptor(iMapTypeDescriptor);
- if (result == null) result = defaultCase(theEObject);
- return result;
- }
- case SymbolPackage.IMETHOD_SYMBOL: {
- IMethodSymbol iMethodSymbol = (IMethodSymbol)theEObject;
- Object result = caseIMethodSymbol(iMethodSymbol);
- if (result == null) result = caseISymbol(iMethodSymbol);
- if (result == null) result = defaultCase(theEObject);
- return result;
- }
- case SymbolPackage.IOBJECT_SYMBOL: {
- IObjectSymbol iObjectSymbol = (IObjectSymbol)theEObject;
- Object result = caseIObjectSymbol(iObjectSymbol);
- if (result == null) result = caseISymbol(iObjectSymbol);
- if (result == null) result = defaultCase(theEObject);
- return result;
- }
- case SymbolPackage.IBOUNDED_TYPE_DESCRIPTOR: {
- IBoundedTypeDescriptor iBoundedTypeDescriptor = (IBoundedTypeDescriptor)theEObject;
- Object result = caseIBoundedTypeDescriptor(iBoundedTypeDescriptor);
- if (result == null) result = caseITypeDescriptor(iBoundedTypeDescriptor);
- if (result == null) result = defaultCase(theEObject);
- return result;
- }
- case SymbolPackage.IBOUNDED_MAP_TYPE_DESCRIPTOR: {
- IBoundedMapTypeDescriptor iBoundedMapTypeDescriptor = (IBoundedMapTypeDescriptor)theEObject;
- Object result = caseIBoundedMapTypeDescriptor(iBoundedMapTypeDescriptor);
- if (result == null) result = caseIMapTypeDescriptor(iBoundedMapTypeDescriptor);
- if (result == null) result = caseIBoundedTypeDescriptor(iBoundedMapTypeDescriptor);
- if (result == null) result = caseITypeDescriptor(iBoundedMapTypeDescriptor);
- if (result == null) result = defaultCase(theEObject);
- return result;
- }
- case SymbolPackage.IBOUNDED_JAVA_TYPE_DESCRIPTOR: {
- IBoundedJavaTypeDescriptor iBoundedJavaTypeDescriptor = (IBoundedJavaTypeDescriptor)theEObject;
- Object result = caseIBoundedJavaTypeDescriptor(iBoundedJavaTypeDescriptor);
- if (result == null) result = caseIJavaTypeDescriptor2(iBoundedJavaTypeDescriptor);
- if (result == null) result = caseIBoundedTypeDescriptor(iBoundedJavaTypeDescriptor);
- if (result == null) result = caseITypeDescriptor(iBoundedJavaTypeDescriptor);
- if (result == null) result = defaultCase(theEObject);
- return result;
- }
- case SymbolPackage.ILIST_TYPE_DESCRIPTOR: {
- IListTypeDescriptor iListTypeDescriptor = (IListTypeDescriptor)theEObject;
- Object result = caseIListTypeDescriptor(iListTypeDescriptor);
- if (result == null) result = caseITypeDescriptor(iListTypeDescriptor);
- if (result == null) result = defaultCase(theEObject);
- return result;
- }
- case SymbolPackage.IBOUNDED_LIST_TYPE_DESCRIPTOR: {
- IBoundedListTypeDescriptor iBoundedListTypeDescriptor = (IBoundedListTypeDescriptor)theEObject;
- Object result = caseIBoundedListTypeDescriptor(iBoundedListTypeDescriptor);
- if (result == null) result = caseIListTypeDescriptor(iBoundedListTypeDescriptor);
- if (result == null) result = caseIBoundedTypeDescriptor(iBoundedListTypeDescriptor);
- if (result == null) result = caseITypeDescriptor(iBoundedListTypeDescriptor);
- if (result == null) result = defaultCase(theEObject);
- return result;
- }
- default: return defaultCase(theEObject);
- }
- }
-
- /**
- * Returns the result of interpretting the object as an instance of '<em>IBean Instance Symbol</em>'.
- * <!-- begin-user-doc -->
- * This implementation returns null;
- * returning a non-null result will terminate the switch.
- * <!-- end-user-doc -->
- * @param object the target of the switch.
- * @return the result of interpretting the object as an instance of '<em>IBean Instance Symbol</em>'.
- * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
- * @generated
- */
- public Object caseIBeanInstanceSymbol(IBeanInstanceSymbol object) {
- return null;
- }
-
- /**
- * Returns the result of interpretting the object as an instance of '<em>IBean Property Symbol</em>'.
- * <!-- begin-user-doc -->
- * This implementation returns null;
- * returning a non-null result will terminate the switch.
- * <!-- end-user-doc -->
- * @param object the target of the switch.
- * @return the result of interpretting the object as an instance of '<em>IBean Property Symbol</em>'.
- * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
- * @generated
- */
- public Object caseIBeanPropertySymbol(IBeanPropertySymbol object) {
- return null;
- }
-
- /**
- * Returns the result of interpretting the object as an instance of '<em>IInstance Symbol</em>'.
- * <!-- begin-user-doc -->
- * This implementation returns null;
- * returning a non-null result will terminate the switch.
- * <!-- end-user-doc -->
- * @param object the target of the switch.
- * @return the result of interpretting the object as an instance of '<em>IInstance Symbol</em>'.
- * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
- * @generated
- */
- public Object caseIInstanceSymbol(IInstanceSymbol object) {
- return null;
- }
-
- /**
- * Returns the result of interpretting the object as an instance of '<em>IJava Symbol</em>'.
- * <!-- begin-user-doc -->
- * This implementation returns null;
- * returning a non-null result will terminate the switch.
- * <!-- end-user-doc -->
- * @param object the target of the switch.
- * @return the result of interpretting the object as an instance of '<em>IJava Symbol</em>'.
- * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
- * @generated
- */
- public Object caseIJavaSymbol(IJavaSymbol object) {
- return null;
- }
-
- /**
- * Returns the result of interpretting the object as an instance of '<em>ISymbol</em>'.
- * <!-- begin-user-doc -->
- * This implementation returns null;
- * returning a non-null result will terminate the switch.
- * <!-- end-user-doc -->
- * @param object the target of the switch.
- * @return the result of interpretting the object as an instance of '<em>ISymbol</em>'.
- * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
- * @generated
- */
- public Object caseISymbol(ISymbol object) {
- return null;
- }
-
- /**
- * Returns the result of interpretting the object as an instance of '<em>IType Descriptor</em>'.
- * <!-- begin-user-doc -->
- * This implementation returns null;
- * returning a non-null result will terminate the switch.
- * <!-- end-user-doc -->
- * @param object the target of the switch.
- * @return the result of interpretting the object as an instance of '<em>IType Descriptor</em>'.
- * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
- * @generated
- */
- public Object caseITypeDescriptor(ITypeDescriptor object) {
- return null;
- }
-
- /**
- * Returns the result of interpretting the object as an instance of '<em>IDescribed In Detail</em>'.
- * <!-- begin-user-doc -->
- * This implementation returns null;
- * returning a non-null result will terminate the switch.
- * <!-- end-user-doc -->
- * @param object the target of the switch.
- * @return the result of interpretting the object as an instance of '<em>IDescribed In Detail</em>'.
- * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
- * @generated
- */
- public Object caseIDescribedInDetail(IDescribedInDetail object) {
- return null;
- }
-
- /**
- * Returns the result of interpretting the object as an instance of '<em>IJava Type Descriptor2</em>'.
- * <!-- begin-user-doc -->
- * This implementation returns null;
- * returning a non-null result will terminate the switch.
- * <!-- end-user-doc -->
- * @param object the target of the switch.
- * @return the result of interpretting the object as an instance of '<em>IJava Type Descriptor2</em>'.
- * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
- * @generated
- */
- public Object caseIJavaTypeDescriptor2(IJavaTypeDescriptor2 object) {
- return null;
- }
-
- /**
- * Returns the result of interpretting the object as an instance of '<em>IBean Method Symbol</em>'.
- * <!-- begin-user-doc -->
- * This implementation returns null;
- * returning a non-null result will terminate the switch.
- * <!-- end-user-doc -->
- * @param object the target of the switch.
- * @return the result of interpretting the object as an instance of '<em>IBean Method Symbol</em>'.
- * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
- * @generated
- */
- public Object caseIBeanMethodSymbol(IBeanMethodSymbol object) {
- return null;
- }
-
- /**
- * Returns the result of interpretting the object as an instance of '<em>IComponent Symbol</em>'.
- * <!-- begin-user-doc -->
- * This implementation returns null;
- * returning a non-null result will terminate the switch.
- * <!-- end-user-doc -->
- * @param object the target of the switch.
- * @return the result of interpretting the object as an instance of '<em>IComponent Symbol</em>'.
- * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
- * @generated
- */
- public Object caseIComponentSymbol(IComponentSymbol object) {
- return null;
- }
-
- /**
- * Returns the result of interpretting the object as an instance of '<em>IProperty Symbol</em>'.
- * <!-- begin-user-doc -->
- * This implementation returns null;
- * returning a non-null result will terminate the switch.
- * <!-- end-user-doc -->
- * @param object the target of the switch.
- * @return the result of interpretting the object as an instance of '<em>IProperty Symbol</em>'.
- * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
- * @generated
- */
- public Object caseIPropertySymbol(IPropertySymbol object) {
- return null;
- }
-
- /**
- * Returns the result of interpretting the object as an instance of '<em>IMap Type Descriptor</em>'.
- * <!-- begin-user-doc -->
- * This implementation returns null;
- * returning a non-null result will terminate the switch.
- * <!-- end-user-doc -->
- * @param object the target of the switch.
- * @return the result of interpretting the object as an instance of '<em>IMap Type Descriptor</em>'.
- * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
- * @generated
- */
- public Object caseIMapTypeDescriptor(IMapTypeDescriptor object) {
- return null;
- }
-
- /**
- * Returns the result of interpretting the object as an instance of '<em>IMethod Symbol</em>'.
- * <!-- begin-user-doc -->
- * This implementation returns null;
- * returning a non-null result will terminate the switch.
- * <!-- end-user-doc -->
- * @param object the target of the switch.
- * @return the result of interpretting the object as an instance of '<em>IMethod Symbol</em>'.
- * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
- * @generated
- */
- public Object caseIMethodSymbol(IMethodSymbol object) {
- return null;
- }
-
- /**
- * Returns the result of interpretting the object as an instance of '<em>IObject Symbol</em>'.
- * <!-- begin-user-doc -->
- * This implementation returns null;
- * returning a non-null result will terminate the switch.
- * <!-- end-user-doc -->
- * @param object the target of the switch.
- * @return the result of interpretting the object as an instance of '<em>IObject Symbol</em>'.
- * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
- * @generated
- */
- public Object caseIObjectSymbol(IObjectSymbol object) {
- return null;
- }
-
- /**
- * Returns the result of interpretting the object as an instance of '<em>IBounded Type Descriptor</em>'.
- * <!-- begin-user-doc -->
- * This implementation returns null;
- * returning a non-null result will terminate the switch.
- * <!-- end-user-doc -->
- * @param object the target of the switch.
- * @return the result of interpretting the object as an instance of '<em>IBounded Type Descriptor</em>'.
- * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
- * @generated
- */
- public Object caseIBoundedTypeDescriptor(IBoundedTypeDescriptor object) {
- return null;
- }
-
- /**
- * Returns the result of interpretting the object as an instance of '<em>IBounded Map Type Descriptor</em>'.
- * <!-- begin-user-doc -->
- * This implementation returns null;
- * returning a non-null result will terminate the switch.
- * <!-- end-user-doc -->
- * @param object the target of the switch.
- * @return the result of interpretting the object as an instance of '<em>IBounded Map Type Descriptor</em>'.
- * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
- * @generated
- */
- public Object caseIBoundedMapTypeDescriptor(IBoundedMapTypeDescriptor object) {
- return null;
- }
-
- /**
- * Returns the result of interpretting the object as an instance of '<em>IBounded Java Type Descriptor</em>'.
- * <!-- begin-user-doc -->
- * This implementation returns null;
- * returning a non-null result will terminate the switch.
- * <!-- end-user-doc -->
- * @param object the target of the switch.
- * @return the result of interpretting the object as an instance of '<em>IBounded Java Type Descriptor</em>'.
- * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
- * @generated
- */
- public Object caseIBoundedJavaTypeDescriptor(IBoundedJavaTypeDescriptor object) {
- return null;
- }
-
- /**
- * Returns the result of interpretting the object as an instance of '<em>IList Type Descriptor</em>'.
- * <!-- begin-user-doc -->
- * This implementation returns null;
- * returning a non-null result will terminate the switch.
- * <!-- end-user-doc -->
- * @param object the target of the switch.
- * @return the result of interpretting the object as an instance of '<em>IList Type Descriptor</em>'.
- * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
- * @generated
- */
- public Object caseIListTypeDescriptor(IListTypeDescriptor object) {
- return null;
- }
-
- /**
- * Returns the result of interpretting the object as an instance of '<em>IBounded List Type Descriptor</em>'.
- * <!-- begin-user-doc -->
- * This implementation returns null;
- * returning a non-null result will terminate the switch.
- * <!-- end-user-doc -->
- * @param object the target of the switch.
- * @return the result of interpretting the object as an instance of '<em>IBounded List Type Descriptor</em>'.
- * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
- * @generated
- */
- public Object caseIBoundedListTypeDescriptor(IBoundedListTypeDescriptor object) {
- return null;
- }
-
- /**
- * Returns the result of interpretting the object as an instance of '<em>EObject</em>'.
- * <!-- begin-user-doc -->
- * This implementation returns null;
- * returning a non-null result will terminate the switch, but this is the last case anyway.
- * <!-- end-user-doc -->
- * @param object the target of the switch.
- * @return the result of interpretting the object as an instance of '<em>EObject</em>'.
- * @see #doSwitch(org.eclipse.emf.ecore.EObject)
- * @generated
- */
- public Object defaultCase(EObject object) {
- return null;
- }
-
-} //SymbolSwitch
-
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/package-info.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/package-info.java
deleted file mode 100644
index 3e43b14..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/package-info.java
+++ /dev/null
@@ -1,18 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Oracle 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:
- * Oracle - initial API and implementation
- *
- ********************************************************************************/
-
-/**
- * EL symbols framework.
- *
- * <p><b>Provisional API - subject to change</b></p>
- */
-package org.eclipse.jst.jsf.context.symbol;
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/provider/IContentProposalProvider.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/provider/IContentProposalProvider.java
deleted file mode 100644
index b37344b..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/provider/IContentProposalProvider.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Oracle 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:
- * Cameron Bateman/Oracle - initial API and implementation
- *
- ********************************************************************************/
-
-package org.eclipse.jst.jsf.context.symbol.provider;
-
-import org.eclipse.jface.text.contentassist.ICompletionProposal;
-import org.eclipse.swt.graphics.Image;
-
-/**
- * Adapts an object to appropriate content proposal
- *
- * <p><b>Provisional API - subject to change</b></p>
- *
- * @author cbateman
- *
- */
-public interface IContentProposalProvider
-{
- /**
- * @param target
- * @param proposalFactory
- * @return an content proposal for target or null
- * if nothing appropriate can be created
- */
- ICompletionProposal[] getProposals(Object target,
- IProposalCreationFactory proposalFactory);
-
- /**
- * Implementors of the class can configure certain aspects of the returned
- * proposals
- *
- * @author cbateman
- *
- */
- public interface IProposalCreationFactory
- {
- /**
- * @param replacementText The text to be replaced
- * @param displayText The text to be displayed in the assist window
- * @param additionalText The text to be displayed in the "addition info"
- * or null
- * @param displayImage The image to be displayed or null
- * @param sourceObject The original source object. Implementors should
- * make no assumptions (i.e. always test instanceof before casting)
- * @return a configured completion proposal for the parameters
- */
- ICompletionProposal createProposal(final String replacementText,
- final String displayText,
- final String additionalText,
- final Image displayImage,
- final Object sourceObject);
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/provider/ProposalCreationFactoryAdapter.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/provider/ProposalCreationFactoryAdapter.java
deleted file mode 100644
index 588a48b..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/provider/ProposalCreationFactoryAdapter.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Oracle 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:
- * Cameron Bateman/Oracle - initial API and implementation
- *
- ********************************************************************************/
-
-package org.eclipse.jst.jsf.context.symbol.provider;
-
-import org.eclipse.jface.text.contentassist.ICompletionProposal;
-import org.eclipse.jface.text.contentassist.IContextInformation;
-import org.eclipse.jst.jsf.context.symbol.provider.IContentProposalProvider.IProposalCreationFactory;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.wst.sse.ui.internal.contentassist.CustomCompletionProposal;
-
-/**
- * Default implementation of the proposal creation factory
- *
- * <p><b>Provisional API - subject to change</b></p>
- *
- * @author cbateman
- *
- */
-public class ProposalCreationFactoryAdapter implements IProposalCreationFactory
-{
- /**
- * The absolute document offset where the replacement is to occur
- */
- protected final int _replacementOffset;
- /**
- * The number of characters to replace starting from _replaceOffset with
- * the proposal. 0 indicates insertion with no replacement
- */
- protected final int _replacementLength;
-
- /**
- * @param replacementOffset -- the absolute document offset to do the replacement
- * @param replacementLength -- the number of characters to replace or 0
- * for insert without any replacement
- */
- public ProposalCreationFactoryAdapter(final int replacementOffset,
- final int replacementLength)
- {
- _replacementOffset = replacementOffset;
- _replacementLength = replacementLength;
- }
-
- public ICompletionProposal createProposal(String replacementText,
- String displayText, String additionalText, Image displayImage,
- Object targetObject)
-
- {
- return createDefaultProposal(replacementText,
- _replacementOffset,
- _replacementLength,
- replacementText.length(),
- displayImage,
- displayText,
- null,
- additionalText,
- 1);
- }
-
- /**
- * Simple factory method for creating a default proposal
- *
- * @param replacementText
- * @param replacementOffset
- * @param replacementLength
- * @param cursorPosition
- * @param displayImage
- * @param displayText
- * @param contextInfo
- * @param additionalText
- * @param relevance
- * @return a default configuration of the completion proposal based on
- * the CustomCompletionProposal
- */
- protected static ICompletionProposal
- createDefaultProposal(final String replacementText,
- final int replacementOffset,
- final int replacementLength,
- final int cursorPosition,
- final Image displayImage,
- final String displayText,
- final IContextInformation contextInfo,
- final String additionalText,
- final int relevance)
- {
- return new CustomCompletionProposal(replacementText,
- replacementOffset,
- replacementLength,
- cursorPosition,
- displayImage,
- displayText,
- contextInfo,
- additionalText,
- relevance);
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/provider/package-info.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/provider/package-info.java
deleted file mode 100644
index c1dcf63..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/provider/package-info.java
+++ /dev/null
@@ -1,18 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Oracle 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:
- * Oracle - initial API and implementation
- *
- ********************************************************************************/
-
-/**
- * Extended providers for the EL symbols framework.
- *
- * <p><b>Provisional API - subject to change</b></p>
- */
-package org.eclipse.jst.jsf.context.symbol.provider;
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/source/AbstractContextSymbolFactory.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/source/AbstractContextSymbolFactory.java
deleted file mode 100644
index 149250c..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/source/AbstractContextSymbolFactory.java
+++ /dev/null
@@ -1,148 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Oracle 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:
- * Cameron Bateman/Oracle - initial API and implementation
- *
- ********************************************************************************/
-
-package org.eclipse.jst.jsf.context.symbol.source;
-
-import java.util.List;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.jst.jsf.common.JSFCommonPlugin;
-import org.eclipse.jst.jsf.context.symbol.ISymbol;
-
-/**
- * Must be sub-classed by all contextSymbolFactory extension point implementors
- * to create context configured symbols
- *
- * <p><b>Provisional API - subject to change</b></p>
- *
- * @author cbateman
- *
- */
-public abstract class AbstractContextSymbolFactory
-{
- /**
- * @param symbolName -- the symbol name
- * @param scope -- the scope of the symbol
- * @param context -- the context; must be supported (call supports(context))
- * @param problems -- populated with problems found during symbol construction.
- * @return a new ISymbol configured for the name, scope and context or null
- * if the arguments are invalid but some other reason a symbol cannot be created.
- * @throws IllegalArgumentException if this method is called with context
- * for which supports(context) == false or if scope does not conform
- * to exactly one of the ISymbolConstants.SYMBOL_SCOPE_* constants
- * @deprecated Use the new create method instead.
- */
- @Deprecated
- public final ISymbol create(final String symbolName, final int scope, final IAdaptable context, final List problems)
- {
- if (!supports(context))
- {
- throw new IllegalArgumentException("Unsupported context"); //$NON-NLS-1$
- }
- else if (!ISymbolConstants.isValid(scope))
- {
- throw new IllegalArgumentException("Unsupported symbol constant:"+scope); //$NON-NLS-1$
- }
-
- try
- {
- return internalCreate(symbolName, scope, context, problems, null);
- }
- catch (final Exception e)
- {
- JSFCommonPlugin.log(e, "During execution of context symbol factory: "+this.getClass().getName()); //$NON-NLS-1$
- return null;
- }
- }
-
- /**
- * The same as create(symbolName, scope, context, problems), except it calls
- * the internalCreate with additionalInfo. By default this has the same
- * effect.
- *
- * @param symbolName
- * @param scope
- * @param context
- * @param problems
- * @param additionalInfo
- * @return the new Symbol
- */
- public final ISymbol create(final String symbolName, final int scope, final IAdaptable context, final List problems, final IAdditionalContextSymbolInfo additionalInfo)
- {
- if (!supports(context))
- {
- throw new IllegalArgumentException("Unsupported context"); //$NON-NLS-1$
- }
- else if (!ISymbolConstants.isValid(scope))
- {
- throw new IllegalArgumentException("Unsupported symbol constant:"+scope); //$NON-NLS-1$
- }
-
- try
- {
- return internalCreate(symbolName, scope, context, problems, additionalInfo);
- }
- catch (final Exception e)
- {
- JSFCommonPlugin.log(e, "During execution of context symbol factory: "+this.getClass().getName()); //$NON-NLS-1$
- return null;
- }
- }
-
-
- /**
- * Use of this method is DISCOURAGED. It is preferable to move functionality
- * to the new internalCreate method and have this one call it with null.
- *
- * This method will eventually be deprecated and removed
- *
- * @param symbolName
- * @param scope
- * @param context
- * @param problems -- see problems arg on create
- * @return a new ISymbol for the name, scope and context; may return null
- * @deprecated Use the new internalCreate instead. Ignore the new
- * additionalInfo parameter if you do not need it.
- */
- @Deprecated
- protected ISymbol internalCreate(final String symbolName, final int scope, final IAdaptable context, final List problems)
- {
- // do nothing by default
- return null;
- }
-
- /**
- * NOTE: when migrating to this method, ensure that the other internalCreate
- * method in your implementation doesn't create inconsistent behaviour.
- *
- * @param symbolName
- * @param scope
- * @param context Will conform to restrictions you set out in supports().
- * @param problems CURRENTLY IGNORED.
- * @param additionalInfo May be null
- * @since 3.0
- * @return a new ISymbol for the name, scope and context, but with the option
- * to also consult additionalInfo passed by the framework. may return null.
- */
- protected ISymbol internalCreate(final String symbolName, final int scope, final IAdaptable context, final List problems, final IAdditionalContextSymbolInfo additionalInfo)
- {
- // by default, call the other internalCreate for backward compatibility.
- // implementers can override to do things with the additional info
- return internalCreate(symbolName, scope, context, problems);
- }
-
- /**
- * @param context
- * @return true if this factory supports the context
- */
- public abstract boolean supports(IAdaptable context);
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/source/AbstractSymbolSourceProviderFactory.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/source/AbstractSymbolSourceProviderFactory.java
deleted file mode 100644
index f793f81..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/source/AbstractSymbolSourceProviderFactory.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Oracle 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:
- * Cameron Bateman/Oracle - initial API and implementation
- *
- ********************************************************************************/
-
-package org.eclipse.jst.jsf.context.symbol.source;
-
-import org.eclipse.core.resources.IProject;
-
-/**
- * Default implementation of ISymbolSourceProviderFactory. Implementors may
- * sub-class or create their own separate factory class.
- *
- * <p><b>Provisional API - subject to change</b></p>
- *
- * @author cbateman
- *
- */
-public abstract class AbstractSymbolSourceProviderFactory implements
- ISymbolSourceProviderFactory
-{
- private IProject _project;
-
- /**
- * Default constructor used by extension manager to create this factory
- */
- public AbstractSymbolSourceProviderFactory()
- {
- // do nothing
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.jsf.context.symbol.source.ISymbolSourceProviderFactory#createInstance(org.eclipse.core.resources.IProject)
- */
- public final ISymbolSourceProvider createInstance(IProject project)
- {
- _project = project;
- return create(project);
- }
-
- /**
- * Override this method to do specialization of provider creation
- *
- * @param project
- * @return the symbol source provider created by the subclass
- */
- protected abstract ISymbolSourceProvider create(IProject project);
-
- /**
- * @return the IProject that this source provider is associated with.
- */
- protected final IProject getProject()
- {
- return _project;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/source/IAdditionalContextSymbolInfo.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/source/IAdditionalContextSymbolInfo.java
deleted file mode 100644
index ad069e7..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/source/IAdditionalContextSymbolInfo.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2008 Oracle Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Oracle Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.context.symbol.source;
-
-
-/**
- * Passed to AbstractContextSymbolFactory's to provide additional information.
- * All information is optional and need not be used if not needed.
- *
- * Clients may use but NOT IMPLEMENT. New methods may be added without notice.
- *
- * @author cbateman
- * @since 3.0
- *
- */
-public interface IAdditionalContextSymbolInfo
-{
- /**
- * @return a suggested symbol type signature. May be null.
- */
- String getSymbolTypeSignature();
-
- /**
- * @return the name of the attribute on the current element context that
- * contains a value expression that may be used to find type information.
- * May be null.
- *
- */
- String getValueExpressionAttributeName();
-}
\ No newline at end of file
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/source/ISymbolConstants.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/source/ISymbolConstants.java
deleted file mode 100644
index 17f36b5..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/source/ISymbolConstants.java
+++ /dev/null
@@ -1,180 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Oracle 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:
- * Cameron Bateman/Oracle - initial API and implementation
- *
- ********************************************************************************/
-
-package org.eclipse.jst.jsf.context.symbol.source;
-
-/**
- * Defines global constants for symbols
- *
- * <p><b>Provisional API - subject to change</b></p>
- *
- * @author cbateman
- *
- */
-public class ISymbolConstants {
- /**
- * Mask to indicate all request scope symbols for a particular context
- */
- public final static int SYMBOL_SCOPE_REQUEST = 1;
-
- /**
- * Mask to indicate all session scope symbols for a particular context
- */
- public final static int SYMBOL_SCOPE_SESSION = 2;
-
- /**
- * Mask to indicate all application scope symbols for a particular context
- */
- public final static int SYMBOL_SCOPE_APPLICATION = 4;
-
- /**
- * Mask to indicate all 'none' scope symbols for a particular context
- */
- public final static int SYMBOL_SCOPE_NONE = 8;
-
-//JSF2.0
- /**
- * Mask to indicate all 'view' scope symbols for a particular context
- */
- public final static int SYMBOL_SCOPE_VIEW = 16;
-
- /**
- * Mask to indicate all 'flash' scope symbols for a particular context
- */
- public final static int SYMBOL_SCOPE_FLASH = 32;
-
- /**
- * the string representation for view scope
- */
- public final static String SYMBOL_SCOPE_VIEW_STRING = "view"; //$NON-NLS-1$
-
- /**
- * the string representation for flash scope
- */
- public final static String SYMBOL_SCOPE_FLASH_STRING = "flash"; //$NON-NLS-1$
-//
-
- /**
- * All scopes
- */
- public final static int SYMBOL_SCOPE_ALL =
- SYMBOL_SCOPE_REQUEST
- | SYMBOL_SCOPE_SESSION
- | SYMBOL_SCOPE_APPLICATION
- | SYMBOL_SCOPE_NONE
- | SYMBOL_SCOPE_VIEW
- | SYMBOL_SCOPE_FLASH;
-
- /**
- * the string representation for request scope
- */
- public final static String SYMBOL_SCOPE_REQUEST_STRING = "request"; //$NON-NLS-1$
-
-
- /**
- * the string representation for session scope
- */
- public final static String SYMBOL_SCOPE_SESSION_STRING = "session"; //$NON-NLS-1$
-
- /**
- * the string representation for application scope
- */
- public final static String SYMBOL_SCOPE_APPLICATION_STRING = "application"; //$NON-NLS-1$
-
- /**
- * the string representation for none scope
- */
- public final static String SYMBOL_SCOPE_NONE_STRING = "none"; //$NON-NLS-1$
-
- /**
- * @param scope
- * @return true iff scope matches exactly one scope value (excluding ALL)
- */
- public static boolean isValid(int scope)
- {
- return scope == SYMBOL_SCOPE_APPLICATION
- || scope == SYMBOL_SCOPE_REQUEST
- || scope == SYMBOL_SCOPE_SESSION
- || scope == SYMBOL_SCOPE_NONE
- || scope == SYMBOL_SCOPE_VIEW
- || scope == SYMBOL_SCOPE_FLASH;
- }
-
- /**
- * @param scopeMask
- * @return the string representation for a scope mask or null if either
- * the mask contains more than one scope or the scope is not valid
- */
- public static String getStringForMask(final int scopeMask)
- {
- if (scopeMask == SYMBOL_SCOPE_REQUEST)
- {
- return SYMBOL_SCOPE_REQUEST_STRING;
- }
- else if (scopeMask == SYMBOL_SCOPE_SESSION)
- {
- return SYMBOL_SCOPE_SESSION_STRING;
- }
- else if (scopeMask == SYMBOL_SCOPE_APPLICATION)
- {
- return SYMBOL_SCOPE_APPLICATION_STRING;
- }
- else if (scopeMask == SYMBOL_SCOPE_NONE)
- {
- return SYMBOL_SCOPE_NONE_STRING;
- }
- else if (scopeMask == SYMBOL_SCOPE_VIEW)
- {
- return SYMBOL_SCOPE_VIEW_STRING;
- }
- else if (scopeMask == SYMBOL_SCOPE_FLASH)
- {
- return SYMBOL_SCOPE_FLASH_STRING;
- }
-
- return null;
- }
-
- /**
- * @param scopeString
- * @return the scope mask for the string or -1 if the string is not
- * one of SYMBOL_SCOPE_*_STRING
- */
- public static int getMaskForString(final String scopeString)
- {
- if (SYMBOL_SCOPE_REQUEST_STRING.equals(scopeString))
- {
- return SYMBOL_SCOPE_REQUEST;
- }
- else if (SYMBOL_SCOPE_SESSION_STRING.equals(scopeString))
- {
- return SYMBOL_SCOPE_SESSION;
- }
- else if (SYMBOL_SCOPE_APPLICATION_STRING.equals(scopeString))
- {
- return SYMBOL_SCOPE_APPLICATION;
- }
- else if (SYMBOL_SCOPE_NONE_STRING.equals(scopeString))
- {
- return SYMBOL_SCOPE_NONE;
- }
- else if (SYMBOL_SCOPE_VIEW_STRING.equals(scopeString))
- {
- return SYMBOL_SCOPE_VIEW;
- }
- else if (SYMBOL_SCOPE_FLASH_STRING.equals(scopeString))
- {
- return SYMBOL_SCOPE_FLASH;
- }
- return -1;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/source/ISymbolSourceProvider.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/source/ISymbolSourceProvider.java
deleted file mode 100644
index 96dae65..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/source/ISymbolSourceProvider.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Oracle 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:
- * Cameron Bateman/Oracle - initial API and implementation
- *
- ********************************************************************************/
-
-package org.eclipse.jst.jsf.context.symbol.source;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.jst.jsf.context.symbol.ISymbol;
-
-/**
- * Defines a provider that acts as source of symbols. The
- * implementor is usually context specific
- *
- * <p><b>Provisional API - subject to change</b></p>
- *
- * @author cbateman
- *
- */
-public interface ISymbolSourceProvider
-{
- /**
- * @param context
- * @param symbolScopeMask - a mask resulting for ORing the SYMBOL_SCOPE_*
- * constants to indicate what scopes to retrieve symbols for.
- * @return all symbols in context matching symbolScopeMask
- */
- ISymbol[] getSymbols(IAdaptable context, int symbolScopeMask);
-
- /**
- * @param prefix
- * @param context
- * @param symbolScopeMask a mask resulting for ORing the SYMBOL_SCOPE_*
- * @return the sub-set of getSymbols that conforms
- * to String.startsWith(prefix) in context matching symbolScopeMask.
- */
- ISymbol[] getSymbols(String prefix, IAdaptable context, int symbolScopeMask);
-
- /**
- * @param context
- * @return true if this provider has symbols for this context
- */
- boolean isProvider(IAdaptable context);
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/source/ISymbolSourceProviderFactory.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/source/ISymbolSourceProviderFactory.java
deleted file mode 100644
index 87b9558..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/source/ISymbolSourceProviderFactory.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Oracle 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:
- * Cameron Bateman/Oracle - initial API and implementation
- *
- ********************************************************************************/
-
-package org.eclipse.jst.jsf.context.symbol.source;
-
-import org.eclipse.core.resources.IProject;
-
-/**
- * Implemented by extensions wishing to use symbolSourceProvider extension point
- * to contribute designtime symbols to the JSF symbol resolver framework.
- *
- * Instance factory class must implement a zero-argument default constructor
- *
- * <p><b>Provisional API - subject to change</b></p>
- *
- * @author cbateman
- *
- */
-public interface ISymbolSourceProviderFactory
-{
- /**
- * @param project
- * @return a new instance of a symbol source provider for project
- */
- ISymbolSourceProvider createInstance(IProject project);
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/source/package-info.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/source/package-info.java
deleted file mode 100644
index b4a9cc7..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/source/package-info.java
+++ /dev/null
@@ -1,18 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Oracle 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:
- * Oracle - initial API and implementation
- *
- ********************************************************************************/
-
-/**
- * EL Symbols Framework Extension Point API.
- *
- * <p><b>Provisional API - subject to change</b></p>
- */
-package org.eclipse.jst.jsf.context.symbol.source;
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/.classpath b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/.classpath
deleted file mode 100644
index 304e861..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/.options b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/.options
deleted file mode 100644
index 5e3f0bc..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/.options
+++ /dev/null
@@ -1,11 +0,0 @@
-# Debugging options for the org.eclipse.jst.jsf.core
-
-# Turn on general debugging for the org.eclipse.jsf.core plugin.
-org.eclipse.jst.jsf.facelet.core/debug=false
-
-org.eclipse.jst.jsf.facelet.core/tagregistry=false
-org.eclipse.jst.jsf.facelet.core/tagregistry/changes=false
-org.eclipse.jst.jsf.facelet.core/registrymanager=false
-org.eclipse.jst.jsf.facelet.core/facetinstalldelegate=false
-org.eclipse.jst.jsf.facelet.core/facetuninstalldelegate=false
-org.eclipse.jst.jsf.facelet.core/facetchangedelegate=false
\ No newline at end of file
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/.project b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/.project
deleted file mode 100644
index 782c0aa..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.jst.jsf.facelet.core</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/.settings/org.eclipse.jdt.core.prefs b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 687a6a7..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,89 +0,0 @@
-#Fri Apr 23 14:48:17 PDT 2010
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.doc.comment.support=enabled
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.autoboxing=warning
-org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning
-org.eclipse.jdt.core.compiler.problem.deadCode=warning
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=ignore
-org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=warning
-org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled
-org.eclipse.jdt.core.compiler.problem.fieldHiding=warning
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=warning
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
-org.eclipse.jdt.core.compiler.problem.invalidJavadoc=error
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=enabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=disabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=disabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=protected
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=warning
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=warning
-org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocComments=warning
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=protected
-org.eclipse.jdt.core.compiler.problem.missingJavadocTags=warning
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=protected
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=warning
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=error
-org.eclipse.jdt.core.compiler.problem.nullReference=warning
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
-org.eclipse.jdt.core.compiler.problem.potentialNullReference=warning
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=ignore
-org.eclipse.jdt.core.compiler.problem.redundantNullCheck=warning
-org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=ignore
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=ignore
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=error
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=warning
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=error
-org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=error
-org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error
-org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.5
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/.settings/org.eclipse.pde.prefs b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/.settings/org.eclipse.pde.prefs
deleted file mode 100644
index e611bfe..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/.settings/org.eclipse.pde.prefs
+++ /dev/null
@@ -1,22 +0,0 @@
-#Fri May 30 12:02:33 PDT 2008
-compilers.f.unresolved-features=1
-compilers.f.unresolved-plugins=1
-compilers.incompatible-environment=1
-compilers.p.build=1
-compilers.p.deprecated=1
-compilers.p.discouraged-class=1
-compilers.p.internal=1
-compilers.p.missing-packages=0
-compilers.p.no-required-att=0
-compilers.p.not-externalized-att=0
-compilers.p.unknown-attribute=1
-compilers.p.unknown-class=1
-compilers.p.unknown-element=1
-compilers.p.unknown-identifier=1
-compilers.p.unknown-resource=1
-compilers.p.unresolved-ex-points=0
-compilers.p.unresolved-import=0
-compilers.s.create-docs=false
-compilers.s.doc-folder=doc
-compilers.s.open-tags=1
-eclipse.preferences.version=1
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/META-INF/MANIFEST.MF b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/META-INF/MANIFEST.MF
deleted file mode 100644
index b98f23d..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,58 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Bundle-Name.0
-Bundle-SymbolicName: org.eclipse.jst.jsf.facelet.core;singleton:=true
-Bundle-Version: 1.0.1.qualifier
-Bundle-Activator: org.eclipse.jst.jsf.facelet.core.internal.FaceletCorePlugin$Implementation
-Bundle-Localization: plugin
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.wst.common.project.facet.core,
- org.eclipse.core.resources;bundle-version="3.4.0",
- org.eclipse.wst.common.modulecore;bundle-version="1.1.103",
- org.eclipse.wst.common.frameworks;bundle-version="1.1.102",
- org.eclipse.jst.jsf.common.runtime,
- org.eclipse.jst.jsf.core,
- org.eclipse.jst.jsf.common;bundle-version="1.0.1";visibility:=reexport,
- org.eclipse.jface.text;bundle-version="3.4.0",
- org.eclipse.wst.sse.core;bundle-version="1.1.300",
- org.eclipse.wst.html.core;bundle-version="1.1.200",
- org.eclipse.jst.jsp.core;bundle-version="1.2.100",
- org.eclipse.jst.jsf.facesconfig;bundle-version="1.0.1",
- org.eclipse.emf.common;bundle-version="2.4.0",
- org.eclipse.jst.j2ee;bundle-version="1.1.105",
- org.eclipse.emf.ecore;bundle-version="2.4.0",
- org.eclipse.ui;bundle-version="3.4.0",
- org.eclipse.emf.edit.ui;bundle-version="2.4.0",
- org.eclipse.jst.j2ee.web;bundle-version="1.1.200",
- org.eclipse.wst.validation;bundle-version="1.2.0",
- org.eclipse.debug.core;bundle-version="[3.5.0,4.0.0)",
- org.eclipse.emf.ecore.xmi;bundle-version="2.5.0",
- org.eclipse.wst.xml.core;bundle-version="1.1.500",
- org.eclipse.jem.proxy;bundle-version="[2.0.300,3.0.0)",
- org.eclipse.jdt.core;bundle-version="[3.6.0,4.0.0)",
- org.eclipse.jst.j2ee.core;bundle-version="[1.2.0,2.0.0)"
-Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Export-Package: org.eclipse.jst.jsf.facelet.core.internal;x-internal:=true,
- org.eclipse.jst.jsf.facelet.core.internal.cm;x-internal:=true,
- org.eclipse.jst.jsf.facelet.core.internal.cm.addtagmd;x-friends:="org.eclipse.jst.jsf.facelet.tagsupport",
- org.eclipse.jst.jsf.facelet.core.internal.cm.addtagmd.impl;x-internal:=true,
- org.eclipse.jst.jsf.facelet.core.internal.cm.addtagmd.provider;x-internal:=true,
- org.eclipse.jst.jsf.facelet.core.internal.cm.addtagmd.util;x-internal:=true,
- org.eclipse.jst.jsf.facelet.core.internal.cm.attributevalues;x-internal:=true,
- org.eclipse.jst.jsf.facelet.core.internal.cm.strategy;x-internal:=true,
- org.eclipse.jst.jsf.facelet.core.internal.facet;x-internal:=true,
- org.eclipse.jst.jsf.facelet.core.internal.metadata;x-internal:=true,
- org.eclipse.jst.jsf.facelet.core.internal.registry;x-internal:=true,
- org.eclipse.jst.jsf.facelet.core.internal.registry.taglib;x-friends:="org.eclipse.jst.jsf.facelet.core.tests",
- org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib;x-friends:="org.eclipse.jst.jsf.facelet.core.tests",
- org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl;x-friends:="org.eclipse.jst.jsf.facelet.core.tests",
- org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.util;x-friends:="org.eclipse.jst.jsf.facelet.core.tests",
- org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0;x-internal:=true,
- org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.impl;x-internal:=true,
- org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.util;x-internal:=true,
- org.eclipse.jst.jsf.facelet.core.internal.tagmodel;x-internal:=true,
- org.eclipse.jst.jsf.facelet.core.internal.util;x-internal:=true,
- org.eclipse.jst.jsf.facelet.core.internal.validation;x-internal:=true,
- org.eclipse.jst.jsf.facelet.core.internal.view;x-internal:=true
-Bundle-Vendor: %providerName
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/about.html b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/about.html
deleted file mode 100644
index 90bd74d..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/about.html
+++ /dev/null
@@ -1,22 +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>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
-
-<p>June, 2008</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.</p>
-
-</body>
-</html>
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/about.ini b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/about.ini
deleted file mode 100644
index b20fd5b..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/about.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-aboutText = %aboutText
-featureImage = eclipse32.png
\ No newline at end of file
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/about.properties b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/about.properties
deleted file mode 100644
index e2ffbfd..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/about.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-aboutText=JSF Tools Project\n\
-\n\
-Version: 1.0.0\n\
-\n\
-(c) Copyright Eclipse contributors and others 2008. All rights reserved. \n\
-Visit http://www.eclipse.org/webtools
\ No newline at end of file
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/build.properties b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/build.properties
deleted file mode 100644
index 3612185..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/build.properties
+++ /dev/null
@@ -1,16 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
- .,\
- plugin.xml,\
- jars/,\
- plugin.properties,\
- dtd/,\
- icons/,\
- model/,\
- about.ini,\
- about.properties,\
- eclipse_update_120.jpg,\
- about.html,\
- eclipse32.png,\
- std-taglibs/
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/dtd/facelet-taglib_1_0.dtd b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/dtd/facelet-taglib_1_0.dtd
deleted file mode 100644
index 5cbf610..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/dtd/facelet-taglib_1_0.dtd
+++ /dev/null
@@ -1,36 +0,0 @@
-<!--
- Copyright 2005 Sun Microsystems, Inc. All rights reserved.
- Licensed under the Common Development and Distribution License,
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.sun.com/cddl/
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- implied. See the License for the specific language governing
- permissions and limitations under the License.
-
- $Id: facelet-taglib_1_0.dtd,v 1.1 2010/03/08 18:49:45 cbateman Exp $
--->
-
-<!ELEMENT facelet-taglib (library-class|(namespace,(tag|function)+))>
-<!ATTLIST facelet-taglib xmlns CDATA #FIXED "http://java.sun.com/JSF/Facelet">
-<!ELEMENT namespace (#PCDATA)>
-<!ELEMENT library-class (#PCDATA)>
-<!ELEMENT tag (tag-name,(handler-class|component|converter|validator|source))>
-<!ELEMENT tag-name (#PCDATA)>
-<!ELEMENT handler-class (#PCDATA)>
-<!ELEMENT component (component-type,renderer-type?,handler-class?)>
-<!ELEMENT component-type (#PCDATA)>
-<!ELEMENT renderer-type (#PCDATA)>
-<!ELEMENT converter (converter-id, handler-class?)>
-<!ELEMENT converter-id (#PCDATA)>
-<!ELEMENT validator (validator-id, handler-class?)>
-<!ELEMENT validator-id (#PCDATA)>
-<!ELEMENT source (#PCDATA)>
-<!ELEMENT function (function-name,function-class,function-signature)>
-<!ELEMENT function-name (#PCDATA)>
-<!ELEMENT function-class (#PCDATA)>
-<!ELEMENT function-signature (#PCDATA)>
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/eclipse32.png b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/eclipse32.png
deleted file mode 100644
index 568fac1..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/eclipse32.png
+++ /dev/null
Binary files differ
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/eclipse_update_120.jpg b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/eclipse_update_120.jpg
deleted file mode 100644
index bfdf708..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/eclipse_update_120.jpg
+++ /dev/null
Binary files differ
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/icons/full/obj16/AttributeData.gif b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/icons/full/obj16/AttributeData.gif
deleted file mode 100644
index c414fe9..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/icons/full/obj16/AttributeData.gif
+++ /dev/null
Binary files differ
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/icons/full/obj16/ElementData.gif b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/icons/full/obj16/ElementData.gif
deleted file mode 100644
index d92f34c..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/icons/full/obj16/ElementData.gif
+++ /dev/null
Binary files differ
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/jars/fake_el.jar b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/jars/fake_el.jar
deleted file mode 100644
index 78b04b1..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/jars/fake_el.jar
+++ /dev/null
Binary files differ
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/model/additionalTagMetadata.ecore b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/model/additionalTagMetadata.ecore
deleted file mode 100644
index 38f283a..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/model/additionalTagMetadata.ecore
+++ /dev/null
@@ -1,47 +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="addtagmd"
- nsURI="http://org.eclipse.jst.jsf.facelet.core/additionalTagMetadata.ecore" nsPrefix="addTagMD">
- <eClassifiers xsi:type="ecore:EClass" name="ElementData">
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
- <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
- <details key="kind" value="element"/>
- <details key="name" value="name"/>
- </eAnnotations>
- </eStructuralFeatures>
- <eStructuralFeatures xsi:type="ecore:EReference" name="attributes" upperBound="-1"
- eType="#//AttributeData" containment="true">
- <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
- <details key="kind" value="element"/>
- <details key="name" value="attribute"/>
- </eAnnotations>
- </eStructuralFeatures>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="AttributeData">
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
- <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
- <details key="kind" value="element"/>
- <details key="name" value="name"/>
- </eAnnotations>
- </eStructuralFeatures>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="usage" eType="#//AttributeUsage">
- <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
- <details key="kind" value="element"/>
- <details key="name" value="usage"/>
- </eAnnotations>
- </eStructuralFeatures>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="description" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
- <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
- <details key="kind" value="element"/>
- <details key="name" value="description"/>
- </eAnnotations>
- </eStructuralFeatures>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EEnum" name="AttributeUsage">
- <eLiterals name="OPTIONAL"/>
- <eLiterals name="REQUIRED" value="1"/>
- <eLiterals name="FIXED" value="2"/>
- <eLiterals name="PROHIBITED" value="3"/>
- </eClassifiers>
-</ecore:EPackage>
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/model/additionalTagMetadata.genmodel b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/model/additionalTagMetadata.genmodel
deleted file mode 100644
index b87ea5a..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/model/additionalTagMetadata.genmodel
+++ /dev/null
@@ -1,28 +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.jst.jsf.facelet.core/src" editDirectory="/org.eclipse.jst.jsf.facelet.core/src"
- modelPluginID="org.eclipse.jst.jsf.facelet.core" templateDirectory="templates"
- dynamicTemplates="true" modelName="AdditionalTagMetadata" editPluginClass="org.eclipse.jst.jsf.facelet.core.internal.FaceletCorePlugin"
- nonNLSMarkers="true" importerID="org.eclipse.emf.importer.ecore" complianceLevel="5.0"
- copyrightFields="false" language="">
- <foreignModel>additionalTagMetadata.ecore</foreignModel>
- <genPackages prefix="AddTagMD" basePackage="org.eclipse.jst.jsf.facelet.core.internal.cm"
- disposableProviderFactory="true" ecorePackage="additionalTagMetadata.ecore#/">
- <genEnums typeSafeEnumCompatible="false" ecoreEnum="additionalTagMetadata.ecore#//AttributeUsage">
- <genEnumLiterals ecoreEnumLiteral="additionalTagMetadata.ecore#//AttributeUsage/OPTIONAL"/>
- <genEnumLiterals ecoreEnumLiteral="additionalTagMetadata.ecore#//AttributeUsage/REQUIRED"/>
- <genEnumLiterals ecoreEnumLiteral="additionalTagMetadata.ecore#//AttributeUsage/FIXED"/>
- <genEnumLiterals ecoreEnumLiteral="additionalTagMetadata.ecore#//AttributeUsage/PROHIBITED"/>
- </genEnums>
- <genClasses ecoreClass="additionalTagMetadata.ecore#//ElementData">
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute additionalTagMetadata.ecore#//ElementData/name"/>
- <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference additionalTagMetadata.ecore#//ElementData/attributes"/>
- </genClasses>
- <genClasses ecoreClass="additionalTagMetadata.ecore#//AttributeData">
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute additionalTagMetadata.ecore#//AttributeData/name"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute additionalTagMetadata.ecore#//AttributeData/usage"/>
- </genClasses>
- </genPackages>
-</genmodel:GenModel>
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/model/facelet-taglib-2_0.genmodel b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/model/facelet-taglib-2_0.genmodel
deleted file mode 100644
index 26e1951..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/model/facelet-taglib-2_0.genmodel
+++ /dev/null
@@ -1,160 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<genmodel:GenModel xmi:version="2.0"
- xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
- xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/org.eclipse.jst.jsf.facelet.core/src"
- modelPluginID="org.eclipse.jst.jsf.facelet.core" modelName="Facelet-taglib-2_0"
- nonNLSMarkers="true" importerID="org.eclipse.xsd.ecore.importer" complianceLevel="5.0"
- copyrightFields="false">
- <foreignModel>facelet-taglib.xsd</foreignModel>
- <genPackages prefix="FaceletTaglib" basePackage="org.eclipse.jst.jsf.facelet.core.internal.registry.taglib"
- resource="XML" disposableProviderFactory="true" fileExtensions="taglib.xml"
- ecorePackage="faceletTaglib_2_0.ecore#/">
- <genEnums typeSafeEnumCompatible="false" ecoreEnum="faceletTaglib_2_0.ecore#//FaceletTaglibVersion">
- <genEnumLiterals ecoreEnumLiteral="faceletTaglib_2_0.ecore#//FaceletTaglibVersion/_20"/>
- </genEnums>
- <genEnums typeSafeEnumCompatible="false" ecoreEnum="faceletTaglib_2_0.ecore#//GenericBooleanBase">
- <genEnumLiterals ecoreEnumLiteral="faceletTaglib_2_0.ecore#//GenericBooleanBase/true"/>
- <genEnumLiterals ecoreEnumLiteral="faceletTaglib_2_0.ecore#//GenericBooleanBase/false"/>
- <genEnumLiterals ecoreEnumLiteral="faceletTaglib_2_0.ecore#//GenericBooleanBase/yes"/>
- <genEnumLiterals ecoreEnumLiteral="faceletTaglib_2_0.ecore#//GenericBooleanBase/no"/>
- </genEnums>
- <genDataTypes ecoreDataType="faceletTaglib_2_0.ecore#//FaceletTaglibVersionTypeObject"/>
- <genDataTypes ecoreDataType="faceletTaglib_2_0.ecore#//FullyQualifiedClassBase"/>
- <genDataTypes ecoreDataType="faceletTaglib_2_0.ecore#//JavaIdentifierBase"/>
- <genDataTypes ecoreDataType="faceletTaglib_2_0.ecore#//PathTypeBase"/>
- <genClasses ecoreClass="faceletTaglib_2_0.ecore#//Description"/>
- <genClasses ecoreClass="faceletTaglib_2_0.ecore#//DisplayName"/>
- <genClasses ecoreClass="faceletTaglib_2_0.ecore#//DocumentRoot">
- <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EAttribute faceletTaglib_2_0.ecore#//DocumentRoot/mixed"/>
- <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference faceletTaglib_2_0.ecore#//DocumentRoot/xMLNSPrefixMap"/>
- <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference faceletTaglib_2_0.ecore#//DocumentRoot/xSISchemaLocation"/>
- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference faceletTaglib_2_0.ecore#//DocumentRoot/faceletTaglib"/>
- </genClasses>
- <genClasses ecoreClass="faceletTaglib_2_0.ecore#//FaceletTaglibCanonicalName">
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute faceletTaglib_2_0.ecore#//FaceletTaglibCanonicalName/value"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute faceletTaglib_2_0.ecore#//FaceletTaglibCanonicalName/id"/>
- </genClasses>
- <genClasses ecoreClass="faceletTaglib_2_0.ecore#//FaceletTaglibExtension">
- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EAttribute faceletTaglib_2_0.ecore#//FaceletTaglibExtension/any"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute faceletTaglib_2_0.ecore#//FaceletTaglibExtension/id"/>
- </genClasses>
- <genClasses ecoreClass="faceletTaglib_2_0.ecore#//FaceletTaglibFunction">
- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference faceletTaglib_2_0.ecore#//FaceletTaglibFunction/functionName"/>
- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference faceletTaglib_2_0.ecore#//FaceletTaglibFunction/functionClass"/>
- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference faceletTaglib_2_0.ecore#//FaceletTaglibFunction/functionSignature"/>
- </genClasses>
- <genClasses ecoreClass="faceletTaglib_2_0.ecore#//FaceletTaglibTagAttribute">
- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference faceletTaglib_2_0.ecore#//FaceletTaglibTagAttribute/nameElement"/>
- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference faceletTaglib_2_0.ecore#//FaceletTaglibTagAttribute/requiredElement"/>
- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference faceletTaglib_2_0.ecore#//FaceletTaglibTagAttribute/typeElement"/>
- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference faceletTaglib_2_0.ecore#//FaceletTaglibTagAttribute/methodSignatureElement"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute faceletTaglib_2_0.ecore#//FaceletTaglibTagAttribute/id"/>
- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EAttribute faceletTaglib_2_0.ecore#//FaceletTaglibTagAttribute/name"/>
- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EAttribute faceletTaglib_2_0.ecore#//FaceletTaglibTagAttribute/required"/>
- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EAttribute faceletTaglib_2_0.ecore#//FaceletTaglibTagAttribute/type"/>
- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EAttribute faceletTaglib_2_0.ecore#//FaceletTaglibTagAttribute/methodSignature"/>
- </genClasses>
- <genClasses ecoreClass="faceletTaglib_2_0.ecore#//FaceletTaglibTagBehaviorExtension">
- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EAttribute faceletTaglib_2_0.ecore#//FaceletTaglibTagBehaviorExtension/any"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute faceletTaglib_2_0.ecore#//FaceletTaglibTagBehaviorExtension/id"/>
- </genClasses>
- <genClasses ecoreClass="faceletTaglib_2_0.ecore#//FaceletTaglibTagBehavior">
- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference faceletTaglib_2_0.ecore#//FaceletTaglibTagBehavior/behaviorId"/>
- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference faceletTaglib_2_0.ecore#//FaceletTaglibTagBehavior/handlerClass"/>
- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference faceletTaglib_2_0.ecore#//FaceletTaglibTagBehavior/behaviorExtension"/>
- </genClasses>
- <genClasses ecoreClass="faceletTaglib_2_0.ecore#//FaceletTaglibTagComponentExtension">
- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EAttribute faceletTaglib_2_0.ecore#//FaceletTaglibTagComponentExtension/any"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute faceletTaglib_2_0.ecore#//FaceletTaglibTagComponentExtension/id"/>
- </genClasses>
- <genClasses ecoreClass="faceletTaglib_2_0.ecore#//FaceletTaglibTagComponent">
- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference faceletTaglib_2_0.ecore#//FaceletTaglibTagComponent/componentType"/>
- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference faceletTaglib_2_0.ecore#//FaceletTaglibTagComponent/rendererType"/>
- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference faceletTaglib_2_0.ecore#//FaceletTaglibTagComponent/handlerClass"/>
- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference faceletTaglib_2_0.ecore#//FaceletTaglibTagComponent/componentExtension"/>
- </genClasses>
- <genClasses ecoreClass="faceletTaglib_2_0.ecore#//FaceletTaglibTagConverterExtension">
- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EAttribute faceletTaglib_2_0.ecore#//FaceletTaglibTagConverterExtension/any"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute faceletTaglib_2_0.ecore#//FaceletTaglibTagConverterExtension/id"/>
- </genClasses>
- <genClasses ecoreClass="faceletTaglib_2_0.ecore#//FaceletTaglibTagConverter">
- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference faceletTaglib_2_0.ecore#//FaceletTaglibTagConverter/converterId"/>
- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference faceletTaglib_2_0.ecore#//FaceletTaglibTagConverter/handlerClass"/>
- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference faceletTaglib_2_0.ecore#//FaceletTaglibTagConverter/converterExtension"/>
- </genClasses>
- <genClasses ecoreClass="faceletTaglib_2_0.ecore#//FaceletTaglibTagExtension">
- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EAttribute faceletTaglib_2_0.ecore#//FaceletTaglibTagExtension/any"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute faceletTaglib_2_0.ecore#//FaceletTaglibTagExtension/id"/>
- </genClasses>
- <genClasses ecoreClass="faceletTaglib_2_0.ecore#//FaceletTaglibTag">
- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference faceletTaglib_2_0.ecore#//FaceletTaglibTag/tagNameElement"/>
- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference faceletTaglib_2_0.ecore#//FaceletTaglibTag/handlerClassElement"/>
- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference faceletTaglib_2_0.ecore#//FaceletTaglibTag/behavior"/>
- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference faceletTaglib_2_0.ecore#//FaceletTaglibTag/component"/>
- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference faceletTaglib_2_0.ecore#//FaceletTaglibTag/converter"/>
- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference faceletTaglib_2_0.ecore#//FaceletTaglibTag/validator"/>
- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference faceletTaglib_2_0.ecore#//FaceletTaglibTag/source"/>
- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference faceletTaglib_2_0.ecore#//FaceletTaglibTag/attribute"/>
- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference faceletTaglib_2_0.ecore#//FaceletTaglibTag/tagExtension"/>
- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EAttribute faceletTaglib_2_0.ecore#//FaceletTaglibTag/tagName"/>
- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EAttribute faceletTaglib_2_0.ecore#//FaceletTaglibTag/handlerClass"/>
- </genClasses>
- <genClasses ecoreClass="faceletTaglib_2_0.ecore#//FaceletTaglibTagValidatorExtension">
- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EAttribute faceletTaglib_2_0.ecore#//FaceletTaglibTagValidatorExtension/any"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute faceletTaglib_2_0.ecore#//FaceletTaglibTagValidatorExtension/id"/>
- </genClasses>
- <genClasses ecoreClass="faceletTaglib_2_0.ecore#//FaceletTaglibTagValidator">
- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference faceletTaglib_2_0.ecore#//FaceletTaglibTagValidator/validatorId"/>
- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference faceletTaglib_2_0.ecore#//FaceletTaglibTagValidator/handlerClass"/>
- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference faceletTaglib_2_0.ecore#//FaceletTaglibTagValidator/validatorExtension"/>
- </genClasses>
- <genClasses ecoreClass="faceletTaglib_2_0.ecore#//FaceletTaglib">
- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference faceletTaglib_2_0.ecore#//FaceletTaglib/libraryClass"/>
- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference faceletTaglib_2_0.ecore#//FaceletTaglib/namespace"/>
- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference faceletTaglib_2_0.ecore#//FaceletTaglib/compositeLibraryName"/>
- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EAttribute faceletTaglib_2_0.ecore#//FaceletTaglib/group"/>
- <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference faceletTaglib_2_0.ecore#//FaceletTaglib/tag"/>
- <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference faceletTaglib_2_0.ecore#//FaceletTaglib/function"/>
- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference faceletTaglib_2_0.ecore#//FaceletTaglib/taglibExtension"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute faceletTaglib_2_0.ecore#//FaceletTaglib/id"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute faceletTaglib_2_0.ecore#//FaceletTaglib/version"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute faceletTaglib_2_0.ecore#//FaceletTaglib/namespaceUri"/>
- </genClasses>
- <genClasses ecoreClass="faceletTaglib_2_0.ecore#//FullyQualifiedClass"/>
- <genClasses ecoreClass="faceletTaglib_2_0.ecore#//GenericBoolean"/>
- <genClasses ecoreClass="faceletTaglib_2_0.ecore#//Icon">
- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference faceletTaglib_2_0.ecore#//Icon/smallIcon"/>
- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference faceletTaglib_2_0.ecore#//Icon/largeIcon"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute faceletTaglib_2_0.ecore#//Icon/id"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute faceletTaglib_2_0.ecore#//Icon/lang"/>
- </genClasses>
- <genClasses ecoreClass="faceletTaglib_2_0.ecore#//JavaIdentifier"/>
- <genClasses ecoreClass="faceletTaglib_2_0.ecore#//Path"/>
- <genClasses ecoreClass="faceletTaglib_2_0.ecore#//IdentifiableStringValue">
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute faceletTaglib_2_0.ecore#//IdentifiableStringValue/value"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute faceletTaglib_2_0.ecore#//IdentifiableStringValue/id"/>
- </genClasses>
- <genClasses image="false" ecoreClass="faceletTaglib_2_0.ecore#//IdentifiableLangStringValue">
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute faceletTaglib_2_0.ecore#//IdentifiableLangStringValue/lang"/>
- </genClasses>
- <genClasses image="false" ecoreClass="faceletTaglib_2_0.ecore#//UserVisibleTaglibObject">
- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference faceletTaglib_2_0.ecore#//UserVisibleTaglibObject/description"/>
- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference faceletTaglib_2_0.ecore#//UserVisibleTaglibObject/displayName"/>
- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference faceletTaglib_2_0.ecore#//UserVisibleTaglibObject/icon"/>
- <genOperations ecoreOperation="faceletTaglib_2_0.ecore#//UserVisibleTaglibObject/getDescription">
- <genParameters ecoreParameter="faceletTaglib_2_0.ecore#//UserVisibleTaglibObject/getDescription/language"/>
- <genParameters ecoreParameter="faceletTaglib_2_0.ecore#//UserVisibleTaglibObject/getDescription/separationString"/>
- </genOperations>
- <genOperations ecoreOperation="faceletTaglib_2_0.ecore#//UserVisibleTaglibObject/getDefaultDescription">
- <genParameters ecoreParameter="faceletTaglib_2_0.ecore#//UserVisibleTaglibObject/getDefaultDescription/separationString"/>
- </genOperations>
- <genOperations ecoreOperation="faceletTaglib_2_0.ecore#//UserVisibleTaglibObject/getDisplayName">
- <genParameters ecoreParameter="faceletTaglib_2_0.ecore#//UserVisibleTaglibObject/getDisplayName/language"/>
- <genParameters ecoreParameter="faceletTaglib_2_0.ecore#//UserVisibleTaglibObject/getDisplayName/separationString"/>
- </genOperations>
- <genOperations ecoreOperation="faceletTaglib_2_0.ecore#//UserVisibleTaglibObject/getDefaultDisplayName">
- <genParameters ecoreParameter="faceletTaglib_2_0.ecore#//UserVisibleTaglibObject/getDefaultDisplayName/separationString"/>
- </genOperations>
- </genClasses>
- </genPackages>
-</genmodel:GenModel>
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/model/faceletTaglib.ecore b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/model/faceletTaglib.ecore
deleted file mode 100644
index 16278c9..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/model/faceletTaglib.ecore
+++ /dev/null
@@ -1,40 +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="faceletTaglib_1_0"
- nsURI="http://org.eclipse.jst.jsf.facelet.core/faceletTaglib_1_0" nsPrefix="faceletTaglib_1_0">
- <eClassifiers xsi:type="ecore:EClass" name="FaceletLibraryClassTagLib" eSuperTypes="#//FaceletTaglibDefn">
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="libraryClass" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="FaceletXMLDefnTaglib" eSuperTypes="#//FaceletTaglibDefn">
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="namespace" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="tags" upperBound="-1" eType="#//TagDefn"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="functions" upperBound="-1"
- eType="#//FunctionDefn"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="FaceletTaglibDefn"/>
- <eClassifiers xsi:type="ecore:EClass" name="ComponentTagDefn" eSuperTypes="#//HandlerTagDefn">
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="componentType" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="rendererType" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="ValidatorTagDefn" eSuperTypes="#//HandlerTagDefn">
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="validatorId" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="ConverterTagDefn" eSuperTypes="#//HandlerTagDefn">
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="converterId" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="HandlerTagDefn" eSuperTypes="#//TagDefn">
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="handlerClass" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="SourceTagDefn" eSuperTypes="#//TagDefn">
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="source" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="TagDefn">
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="FunctionDefn">
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="functionName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="functionClass" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="functionSignature" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
- </eClassifiers>
-</ecore:EPackage>
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/model/faceletTaglib.genmodel b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/model/faceletTaglib.genmodel
deleted file mode 100644
index 21ca89d..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/model/faceletTaglib.genmodel
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<genmodel:GenModel xmi:version="2.0"
- xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
- xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/org.eclipse.jst.jsf.facelet.core/src"
- modelPluginID="org.eclipse.jst.jsf.facelet.core" modelName="FaceletTaglib" nonNLSMarkers="true"
- importerID="org.eclipse.emf.importer.ecore" complianceLevel="5.0" copyrightFields="false">
- <foreignModel>faceletTaglib.ecore</foreignModel>
- <genPackages prefix="FaceletTaglib_1_0" basePackage="org.eclipse.jst.jsf.facelet.core.internal.registry.taglib"
- disposableProviderFactory="true" ecorePackage="faceletTaglib.ecore#/">
- <genClasses ecoreClass="faceletTaglib.ecore#//FaceletLibraryClassTagLib">
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute faceletTaglib.ecore#//FaceletLibraryClassTagLib/libraryClass"/>
- </genClasses>
- <genClasses ecoreClass="faceletTaglib.ecore#//FaceletXMLDefnTaglib">
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute faceletTaglib.ecore#//FaceletXMLDefnTaglib/namespace"/>
- <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference faceletTaglib.ecore#//FaceletXMLDefnTaglib/tags"/>
- <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference faceletTaglib.ecore#//FaceletXMLDefnTaglib/functions"/>
- </genClasses>
- <genClasses ecoreClass="faceletTaglib.ecore#//FaceletTaglibDefn"/>
- <genClasses ecoreClass="faceletTaglib.ecore#//ComponentTagDefn">
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute faceletTaglib.ecore#//ComponentTagDefn/componentType"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute faceletTaglib.ecore#//ComponentTagDefn/rendererType"/>
- </genClasses>
- <genClasses ecoreClass="faceletTaglib.ecore#//ValidatorTagDefn">
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute faceletTaglib.ecore#//ValidatorTagDefn/validatorId"/>
- </genClasses>
- <genClasses ecoreClass="faceletTaglib.ecore#//ConverterTagDefn">
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute faceletTaglib.ecore#//ConverterTagDefn/converterId"/>
- </genClasses>
- <genClasses ecoreClass="faceletTaglib.ecore#//HandlerTagDefn">
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute faceletTaglib.ecore#//HandlerTagDefn/handlerClass"/>
- </genClasses>
- <genClasses ecoreClass="faceletTaglib.ecore#//SourceTagDefn">
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute faceletTaglib.ecore#//SourceTagDefn/source"/>
- </genClasses>
- <genClasses ecoreClass="faceletTaglib.ecore#//TagDefn">
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute faceletTaglib.ecore#//TagDefn/name"/>
- </genClasses>
- <genClasses ecoreClass="faceletTaglib.ecore#//FunctionDefn">
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute faceletTaglib.ecore#//FunctionDefn/functionName"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute faceletTaglib.ecore#//FunctionDefn/functionClass"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute faceletTaglib.ecore#//FunctionDefn/functionSignature"/>
- </genClasses>
- </genPackages>
-</genmodel:GenModel>
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/model/faceletTaglib_2_0.ecore b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/model/faceletTaglib_2_0.ecore
deleted file mode 100644
index 54c764f..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/model/faceletTaglib_2_0.ecore
+++ /dev/null
@@ -1,877 +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="faceletTaglib"
- nsURI="http://java.sun.com/xml/ns/javaee/web-facelettaglibrary_2_0" nsPrefix="faceletTaglib">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="

 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
 Copyright 2003-2009 Sun Microsystems, Inc. All rights reserved.
 
 The contents of this file are subject to the terms of either the
 GNU General Public License Version 2 only ("GPL") or the Common
 Development and Distribution License("CDDL") (collectively, the
 "License"). You may not use this file except in compliance with
 the License. You can obtain a copy of the License at
 https://glassfish.dev.java.net/public/CDDL+GPL.html or
 glassfish/bootstrap/legal/LICENSE.txt. See the License for the
 specific language governing permissions and limitations under the
 License.
 
 When distributing the software, include this License Header
 Notice in each file and include the License file at
 glassfish/bootstrap/legal/LICENSE.txt. Sun designates this
 particular file as subject to the "Classpath" exception as
 provided by Sun in the GPL Version 2 section of the License file
 that accompanied this code. If applicable, add the following
 below the License Header, with the fields enclosed by brackets []
 replaced by your own identifying information:
 "Portions Copyrighted [year] [name of copyright owner]"
 
 Contributor(s):
 
 If you wish your version of this file to be governed by only the
 CDDL or only the GPL Version 2, indicate your decision by adding
 "[Contributor] elects to include this software in this
 distribution under the [CDDL or GPL Version 2] license." If you
 don't indicate a single choice of license, a recipient has the
 option to distribute your version of this file under either the
 CDDL, the GPL Version 2 or to extend the choice of license to its
 licensees as provided above. However, if you add GPL Version 2
 code and therefore, elected the GPL Version 2 license, then the
 option applies only if the new code is made subject to such
 option by the copyright holder.
 
 


 <![CDATA[

 The XML Schema for the Tag Libraries in the JavaServer Faces
 Standard Facelets View Declaration Language (Facelets VDL)
 (Version 2.0).

 JSF 2.0 Facelet Tag Libraries that wish to conform to this
 schema must declare it in the following manner.

 <facelet-taglib xmlns="http://java.sun.com/xml/ns/javaee"
 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facelettaglibary_2_0.xsd"
 version="2.0">

 ...

 </facelet-taglib>

 The instance documents may indicate the published
 version of the schema using xsi:schemaLocation attribute
 for javaee namespace with the following location:

 http://java.sun.com/xml/ns/javaee/web-facelettaglibary_2_0.xsd

 ]]>

 


 


 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
 Copyright 2003-2009 Sun Microsystems, Inc. All rights reserved.
 
 The contents of this file are subject to the terms of either the
 GNU General Public License Version 2 only ("GPL") or the Common
 Development and Distribution License("CDDL") (collectively, the
 "License"). You may not use this file except in compliance with
 the License. You can obtain a copy of the License at
 https://glassfish.dev.java.net/public/CDDL+GPL.html or
 glassfish/bootstrap/legal/LICENSE.txt. See the License for the
 specific language governing permissions and limitations under the
 License.
 
 When distributing the software, include this License Header
 Notice in each file and include the License file at
 glassfish/bootstrap/legal/LICENSE.txt. Sun designates this
 particular file as subject to the "Classpath" exception as
 provided by Sun in the GPL Version 2 section of the License file
 that accompanied this code. If applicable, add the following
 below the License Header, with the fields enclosed by brackets []
 replaced by your own identifying information:
 "Portions Copyrighted [year] [name of copyright owner]"
 
 Contributor(s):
 
 If you wish your version of this file to be governed by only the
 CDDL or only the GPL Version 2, indicate your decision by adding
 "[Contributor] elects to include this software in this
 distribution under the [CDDL or GPL Version 2] license." If you
 don't indicate a single choice of license, a recipient has the
 option to distribute your version of this file under either the
 CDDL, the GPL Version 2 or to extend the choice of license to its
 licensees as provided above. However, if you add GPL Version 2
 code and therefore, elected the GPL Version 2 license, then the
 option applies only if the new code is made subject to such
 option by the copyright holder.
 
 


The following definitions that appear in the common
shareable schema(s) of J2EE deployment descriptors should be
interpreted with respect to the context they are included:

Deployment Component may indicate one of the following:
 j2ee application;
 application client;
 web application;
 enterprise bean;
 resource adapter;

Deployment File may indicate one of the following:
 ear file;
 war file;
 jar file;
 rar file;



 <div xmlns="http://www.w3.org/1999/xhtml">
 <h1>About the XML namespace</h1>

 <div class="bodytext">
 <p>
 This schema document describes the XML namespace, in a form
 suitable for import by other schema documents.
 </p>
 <p>
 See <a href="http://www.w3.org/XML/1998/namespace.html">
 http://www.w3.org/XML/1998/namespace.html</a> and
 <a href="http://www.w3.org/TR/REC-xml">
 http://www.w3.org/TR/REC-xml</a> for information 
 about this namespace.
 </p>
 <p>
 Note that local names in this namespace are intended to be
 defined only by the World Wide Web Consortium or its subgroups.
 The names currently defined in this namespace are listed below.
 They should not be used with conflicting semantics by any Working
 Group, specification, or document instance.
 </p>
 <p> 
 See further below in this document for more information about <a href="#usage">how to refer to this schema document from your own
 XSD schema documents</a> and about <a href="#nsversioning">the
 namespace-versioning policy governing this schema document</a>.
 </p>
 </div>
 </div>
 

 <div xmlns="http://www.w3.org/1999/xhtml">
 
 <h3>Father (in any context at all)</h3> 

 <div class="bodytext">
 <p>
 denotes Jon Bosak, the chair of 
 the original XML Working Group. This name is reserved by 
 the following decision of the W3C XML Plenary and 
 XML Coordination groups:
 </p>
 <blockquote>
 <p>
	In appreciation for his vision, leadership and
	dedication the W3C XML Plenary on this 10th day of
	February, 2000, reserves for Jon Bosak in perpetuity
	the XML name "xml:Father".
 </p>
 </blockquote>
 </div>
 </div>
 

 <div id="usage" xml:id="usage" xmlns="http://www.w3.org/1999/xhtml">
 <h2>
 <a name="usage">About this schema document</a>
 </h2>

 <div class="bodytext">
 <p>
 This schema defines attributes and an attribute group suitable
 for use by schemas wishing to allow <code>xml:base</code>,
 <code>xml:lang</code>, <code>xml:space</code> or
 <code>xml:id</code> attributes on elements they define.
 </p>
 <p>
 To enable this, such a schema must import this schema for
 the XML namespace, e.g. as follows:
 </p>
 <pre>
 &lt;schema . . .&gt;
 . . .
 &lt;import namespace="http://www.w3.org/XML/1998/namespace"
 schemaLocation="http://www.w3.org/2001/xml.xsd"/&gt;
 </pre>
 <p>
 or
 </p>
 <pre>
 &lt;import namespace="http://www.w3.org/XML/1998/namespace"
 schemaLocation="http://www.w3.org/2009/01/xml.xsd"/&gt;
 </pre>
 <p>
 Subsequently, qualified reference to any of the attributes or the
 group defined below will have the desired effect, e.g.
 </p>
 <pre>
 &lt;type . . .&gt;
 . . .
 &lt;attributeGroup ref="xml:specialAttrs"/&gt;
 </pre>
 <p>
 will define a type which will schema-validate an instance element
 with any of those attributes.
 </p>
 </div>
 </div>
 

 <div id="nsversioning" xml:id="nsversioning" xmlns="http://www.w3.org/1999/xhtml">
 <h2>
 <a name="nsversioning">Versioning policy for this schema document</a>
 </h2>
 <div class="bodytext">
 <p>
 In keeping with the XML Schema WG's standard versioning
 policy, this schema document will persist at
 <a href="http://www.w3.org/2009/01/xml.xsd">
 http://www.w3.org/2009/01/xml.xsd</a>.
 </p>
 <p>
 At the date of issue it can also be found at
 <a href="http://www.w3.org/2001/xml.xsd">
 http://www.w3.org/2001/xml.xsd</a>.
 </p>
 <p>
 The schema document at that URI may however change in the future,
 in order to remain compatible with the latest version of XML
 Schema itself, or with the XML namespace itself. In other words,
 if the XML Schema or XML namespaces change, the version of this
 document at <a href="http://www.w3.org/2001/xml.xsd">
 http://www.w3.org/2001/xml.xsd 
 </a> 
 will change accordingly; the version at 
 <a href="http://www.w3.org/2009/01/xml.xsd">
 http://www.w3.org/2009/01/xml.xsd 
 </a> 
 will not change.
 </p>
 <p>
 Previous dated (and unchanging) versions of this schema 
 document are at:
 </p>
 <ul>
 <li>
 <a href="http://www.w3.org/2009/01/xml.xsd">
	http://www.w3.org/2009/01/xml.xsd</a>
 </li>
 <li>
 <a href="http://www.w3.org/2007/08/xml.xsd">
	http://www.w3.org/2007/08/xml.xsd</a>
 </li>
 <li>
 <a href="http://www.w3.org/2004/10/xml.xsd">
	http://www.w3.org/2004/10/xml.xsd</a>
 </li>
 <li>
 <a href="http://www.w3.org/2001/03/xml.xsd">
	http://www.w3.org/2001/03/xml.xsd</a>
 </li>
 </ul>
 </div>
 </div>
 "/>
- </eAnnotations>
- <eClassifiers xsi:type="ecore:EClass" name="Description" eSuperTypes="#//IdentifiableLangStringValue">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="

 The description type is used by a description element to
 provide text describing the parent element. The elements
 that use this type should include any information that the
 Deployment Component's Deployment File file producer wants
 to provide to the consumer of the Deployment Component's
 Deployment File (i.e., to the Deployer). Typically, the
 tools used by such a Deployment File consumer will display
 the description when processing the parent element that
 contains the description.

 The lang attribute defines the language that the
 description is provided in. The default value is "en" (English).

 "/>
- </eAnnotations>
- <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
- <details key="name" value="descriptionType"/>
- <details key="kind" value="simple"/>
- </eAnnotations>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="DisplayName" eSuperTypes="#//IdentifiableLangStringValue">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="
 <![CDATA[

 The display-name type contains a short name that is intended
 to be displayed by tools. It is used by display-name
 elements. The display name need not be unique.

 Example:

 ...
 <display-name xml:lang="en">
 Employee Self Service
 </display-name>

 The value of the xml:lang attribute is "en" (English) by default.

 ]]>
 "/>
- </eAnnotations>
- <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
- <details key="name" value="display-nameType"/>
- <details key="kind" value="simple"/>
- </eAnnotations>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="DocumentRoot">
- <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
- <details key="name" value=""/>
- <details key="kind" value="mixed"/>
- </eAnnotations>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="mixed" unique="false" upperBound="-1"
- eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EFeatureMapEntry">
- <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
- <details key="kind" value="elementWildcard"/>
- <details key="name" value=":mixed"/>
- </eAnnotations>
- </eStructuralFeatures>
- <eStructuralFeatures xsi:type="ecore:EReference" name="xMLNSPrefixMap" upperBound="-1"
- eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EStringToStringMapEntry"
- transient="true" containment="true" resolveProxies="false">
- <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
- <details key="kind" value="attribute"/>
- <details key="name" value="xmlns:prefix"/>
- </eAnnotations>
- </eStructuralFeatures>
- <eStructuralFeatures xsi:type="ecore:EReference" name="xSISchemaLocation" upperBound="-1"
- eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EStringToStringMapEntry"
- transient="true" containment="true" resolveProxies="false">
- <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
- <details key="kind" value="attribute"/>
- <details key="name" value="xsi:schemaLocation"/>
- </eAnnotations>
- </eStructuralFeatures>
- <eStructuralFeatures xsi:type="ecore:EReference" name="faceletTaglib" upperBound="-2"
- eType="#//FaceletTaglib" volatile="true" transient="true" derived="true" containment="true"
- resolveProxies="false">
- <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
- <details key="kind" value="element"/>
- <details key="name" value="facelet-taglib"/>
- <details key="namespace" value="##targetNamespace"/>
- </eAnnotations>
- </eStructuralFeatures>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="FaceletTaglibCanonicalName">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="

 Defines the canonical name of a tag or attribute being
 defined.

 The name must conform to the lexical rules for an NCName

 "/>
- </eAnnotations>
- <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
- <details key="name" value="facelet-taglib-canonical-nameType"/>
- <details key="kind" value="simple"/>
- </eAnnotations>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="value" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//NCName">
- <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
- <details key="name" value=":0"/>
- <details key="kind" value="simple"/>
- </eAnnotations>
- </eStructuralFeatures>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="id" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//ID"
- iD="true">
- <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
- <details key="kind" value="attribute"/>
- <details key="name" value="id"/>
- </eAnnotations>
- </eStructuralFeatures>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="FaceletTaglibExtension">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="
 Extension element for facelet-taglib. It may contain
 implementation specific content.
 "/>
- </eAnnotations>
- <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
- <details key="name" value="facelet-taglib-extensionType"/>
- <details key="kind" value="elementOnly"/>
- </eAnnotations>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="any" unique="false" upperBound="-1"
- eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EFeatureMapEntry">
- <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
- <details key="kind" value="elementWildcard"/>
- <details key="wildcards" value="##any"/>
- <details key="name" value=":0"/>
- <details key="processing" value="lax"/>
- </eAnnotations>
- </eStructuralFeatures>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="id" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//ID"
- iD="true">
- <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
- <details key="kind" value="attribute"/>
- <details key="name" value="id"/>
- </eAnnotations>
- </eStructuralFeatures>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="FaceletTaglibFunction" eSuperTypes="#//UserVisibleTaglibObject">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="
 If the tag library XML file contains individual function
 declarations rather than pointing to a library-class or a
 declaring a composite-library name, the individual functions are
 enclosed in function elements.
 "/>
- </eAnnotations>
- <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
- <details key="name" value="facelet-taglib-functionType"/>
- <details key="kind" value="elementOnly"/>
- </eAnnotations>
- <eStructuralFeatures xsi:type="ecore:EReference" name="functionName" lowerBound="1"
- eType="#//IdentifiableStringValue" containment="true" resolveProxies="false">
- <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
- <details key="kind" value="element"/>
- <details key="name" value="function-name"/>
- <details key="namespace" value="##targetNamespace"/>
- </eAnnotations>
- </eStructuralFeatures>
- <eStructuralFeatures xsi:type="ecore:EReference" name="functionClass" lowerBound="1"
- eType="#//FullyQualifiedClass" containment="true" resolveProxies="false">
- <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
- <details key="kind" value="element"/>
- <details key="name" value="function-class"/>
- <details key="namespace" value="##targetNamespace"/>
- </eAnnotations>
- </eStructuralFeatures>
- <eStructuralFeatures xsi:type="ecore:EReference" name="functionSignature" lowerBound="1"
- eType="#//IdentifiableStringValue" containment="true" resolveProxies="false">
- <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
- <details key="kind" value="element"/>
- <details key="name" value="function-signature"/>
- <details key="namespace" value="##targetNamespace"/>
- </eAnnotations>
- </eStructuralFeatures>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="FaceletTaglibTagAttribute" eSuperTypes="#//UserVisibleTaglibObject">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="

 The attribute element defines an attribute for the nesting
 tag. The attribute element may have several subelements
 defining:

 description a description of the attribute

 name the name of the attribute

 required whether the attribute is required or
 optional

 type the type of the attribute

 "/>
- </eAnnotations>
- <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
- <details key="name" value="facelet-taglib-tag-attributeType"/>
- <details key="kind" value="elementOnly"/>
- </eAnnotations>
- <eStructuralFeatures xsi:type="ecore:EReference" name="nameElement" lowerBound="1"
- eType="#//FaceletTaglibCanonicalName" containment="true" resolveProxies="false">
- <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
- <details key="kind" value="element"/>
- <details key="name" value="name"/>
- <details key="namespace" value="##targetNamespace"/>
- </eAnnotations>
- </eStructuralFeatures>
- <eStructuralFeatures xsi:type="ecore:EReference" name="requiredElement" eType="#//GenericBoolean"
- containment="true" resolveProxies="false">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="

 Defines if the nesting attribute is required or
 optional.

 If not present then the default is "false", i.e
 the attribute is optional.

 "/>
- </eAnnotations>
- <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
- <details key="kind" value="element"/>
- <details key="name" value="required"/>
- <details key="namespace" value="##targetNamespace"/>
- </eAnnotations>
- </eStructuralFeatures>
- <eStructuralFeatures xsi:type="ecore:EReference" name="typeElement" eType="#//FullyQualifiedClass"
- containment="true" resolveProxies="false">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="

 Defines the Java type of the attributes
 value. If this element is omitted, the
 expected type is assumed to be
 "java.lang.Object".

 "/>
- </eAnnotations>
- <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
- <details key="kind" value="element"/>
- <details key="name" value="type"/>
- <details key="namespace" value="##targetNamespace"/>
- </eAnnotations>
- </eStructuralFeatures>
- <eStructuralFeatures xsi:type="ecore:EReference" name="methodSignatureElement"
- eType="#//IdentifiableStringValue" containment="true" resolveProxies="false">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="

 Defines the method signature for a MethodExpression-
 enabled attribute.

 "/>
- </eAnnotations>
- <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
- <details key="kind" value="element"/>
- <details key="name" value="method-signature"/>
- <details key="namespace" value="##targetNamespace"/>
- </eAnnotations>
- </eStructuralFeatures>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="id" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//ID"
- iD="true">
- <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
- <details key="kind" value="attribute"/>
- <details key="name" value="id"/>
- </eAnnotations>
- </eStructuralFeatures>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"
- volatile="true" transient="true"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="required" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
- volatile="true" transient="true"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="type" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"
- volatile="true" transient="true"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="methodSignature" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"
- volatile="true" transient="true"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="FaceletTaglibTagBehaviorExtension">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="
 Extension element for behavior. It may contain
 implementation specific content.
 "/>
- </eAnnotations>
- <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
- <details key="name" value="facelet-taglib-tag-behavior-extensionType"/>
- <details key="kind" value="elementOnly"/>
- </eAnnotations>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="any" unique="false" upperBound="-1"
- eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EFeatureMapEntry">
- <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
- <details key="kind" value="elementWildcard"/>
- <details key="wildcards" value="##any"/>
- <details key="name" value=":0"/>
- <details key="processing" value="lax"/>
- </eAnnotations>
- </eStructuralFeatures>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="id" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//ID"
- iD="true">
- <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
- <details key="kind" value="attribute"/>
- <details key="name" value="id"/>
- </eAnnotations>
- </eStructuralFeatures>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="FaceletTaglibTagBehavior" eSuperTypes="#//UserVisibleTaglibObject">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="
 Within a tag element, the behavior element encapsulates
 information specific to a JSF Behavior.
 "/>
- </eAnnotations>
- <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
- <details key="name" value="facelet-taglib-tag-behaviorType"/>
- <details key="kind" value="elementOnly"/>
- </eAnnotations>
- <eStructuralFeatures xsi:type="ecore:EReference" name="behaviorId" lowerBound="1"
- eType="#//IdentifiableStringValue" containment="true" resolveProxies="false">
- <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
- <details key="kind" value="element"/>
- <details key="name" value="behavior-id"/>
- <details key="namespace" value="##targetNamespace"/>
- </eAnnotations>
- </eStructuralFeatures>
- <eStructuralFeatures xsi:type="ecore:EReference" name="handlerClass" eType="#//FullyQualifiedClass"
- containment="true" resolveProxies="false">
- <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
- <details key="kind" value="element"/>
- <details key="name" value="handler-class"/>
- <details key="namespace" value="##targetNamespace"/>
- </eAnnotations>
- </eStructuralFeatures>
- <eStructuralFeatures xsi:type="ecore:EReference" name="behaviorExtension" upperBound="-1"
- eType="#//FaceletTaglibTagBehaviorExtension" containment="true" resolveProxies="false">
- <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
- <details key="kind" value="element"/>
- <details key="name" value="behavior-extension"/>
- <details key="namespace" value="##targetNamespace"/>
- </eAnnotations>
- </eStructuralFeatures>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="FaceletTaglibTagComponentExtension">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="
 Extension element for component It may contain
 implementation specific content.
 "/>
- </eAnnotations>
- <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
- <details key="name" value="facelet-taglib-tag-component-extensionType"/>
- <details key="kind" value="elementOnly"/>
- </eAnnotations>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="any" unique="false" upperBound="-1"
- eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EFeatureMapEntry">
- <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
- <details key="kind" value="elementWildcard"/>
- <details key="wildcards" value="##any"/>
- <details key="name" value=":0"/>
- <details key="processing" value="lax"/>
- </eAnnotations>
- </eStructuralFeatures>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="id" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//ID"
- iD="true">
- <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
- <details key="kind" value="attribute"/>
- <details key="name" value="id"/>
- </eAnnotations>
- </eStructuralFeatures>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="FaceletTaglibTagComponent" eSuperTypes="#//UserVisibleTaglibObject">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="
 Within a tag element, the component element encapsulates
 information specific to a JSF UIComponent.
 "/>
- </eAnnotations>
- <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
- <details key="name" value="facelet-taglib-tag-componentType"/>
- <details key="kind" value="elementOnly"/>
- </eAnnotations>
- <eStructuralFeatures xsi:type="ecore:EReference" name="componentType" lowerBound="1"
- eType="#//IdentifiableStringValue" containment="true" resolveProxies="false">
- <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
- <details key="kind" value="element"/>
- <details key="name" value="component-type"/>
- <details key="namespace" value="##targetNamespace"/>
- </eAnnotations>
- </eStructuralFeatures>
- <eStructuralFeatures xsi:type="ecore:EReference" name="rendererType" eType="#//IdentifiableStringValue"
- containment="true" resolveProxies="false">
- <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
- <details key="kind" value="element"/>
- <details key="name" value="renderer-type"/>
- <details key="namespace" value="##targetNamespace"/>
- </eAnnotations>
- </eStructuralFeatures>
- <eStructuralFeatures xsi:type="ecore:EReference" name="handlerClass" eType="#//FullyQualifiedClass"
- containment="true" resolveProxies="false">
- <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
- <details key="kind" value="element"/>
- <details key="name" value="handler-class"/>
- <details key="namespace" value="##targetNamespace"/>
- </eAnnotations>
- </eStructuralFeatures>
- <eStructuralFeatures xsi:type="ecore:EReference" name="componentExtension" upperBound="-1"
- eType="#//FaceletTaglibTagComponentExtension" containment="true" resolveProxies="false">
- <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
- <details key="kind" value="element"/>
- <details key="name" value="component-extension"/>
- <details key="namespace" value="##targetNamespace"/>
- </eAnnotations>
- </eStructuralFeatures>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="FaceletTaglibTagConverterExtension">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="
 Extension element for converter It may contain
 implementation specific content.
 "/>
- </eAnnotations>
- <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
- <details key="name" value="facelet-taglib-tag-converter-extensionType"/>
- <details key="kind" value="elementOnly"/>
- </eAnnotations>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="any" unique="false" upperBound="-1"
- eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EFeatureMapEntry">
- <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
- <details key="kind" value="elementWildcard"/>
- <details key="wildcards" value="##any"/>
- <details key="name" value=":0"/>
- <details key="processing" value="lax"/>
- </eAnnotations>
- </eStructuralFeatures>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="id" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//ID"
- iD="true">
- <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
- <details key="kind" value="attribute"/>
- <details key="name" value="id"/>
- </eAnnotations>
- </eStructuralFeatures>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="FaceletTaglibTagConverter" eSuperTypes="#//UserVisibleTaglibObject">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="
 Within a tag element, the converter element encapsulates
 information specific to a JSF Converter.
 "/>
- </eAnnotations>
- <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
- <details key="name" value="facelet-taglib-tag-converterType"/>
- <details key="kind" value="elementOnly"/>
- </eAnnotations>
- <eStructuralFeatures xsi:type="ecore:EReference" name="converterId" lowerBound="1"
- eType="#//IdentifiableStringValue" containment="true" resolveProxies="false">
- <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
- <details key="kind" value="element"/>
- <details key="name" value="converter-id"/>
- <details key="namespace" value="##targetNamespace"/>
- </eAnnotations>
- </eStructuralFeatures>
- <eStructuralFeatures xsi:type="ecore:EReference" name="handlerClass" eType="#//FullyQualifiedClass"
- containment="true" resolveProxies="false">
- <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
- <details key="kind" value="element"/>
- <details key="name" value="handler-class"/>
- <details key="namespace" value="##targetNamespace"/>
- </eAnnotations>
- </eStructuralFeatures>
- <eStructuralFeatures xsi:type="ecore:EReference" name="converterExtension" upperBound="-1"
- eType="#//FaceletTaglibTagConverterExtension" containment="true" resolveProxies="false">
- <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
- <details key="kind" value="element"/>
- <details key="name" value="converter-extension"/>
- <details key="namespace" value="##targetNamespace"/>
- </eAnnotations>
- </eStructuralFeatures>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="FaceletTaglibTagExtension">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="
 Extension element for tag It may contain
 implementation specific content.
 "/>
- </eAnnotations>
- <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
- <details key="name" value="facelet-taglib-tag-extensionType"/>
- <details key="kind" value="elementOnly"/>
- </eAnnotations>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="any" unique="false" upperBound="-1"
- eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EFeatureMapEntry">
- <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
- <details key="kind" value="elementWildcard"/>
- <details key="wildcards" value="##any"/>
- <details key="name" value=":0"/>
- <details key="processing" value="lax"/>
- </eAnnotations>
- </eStructuralFeatures>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="id" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//ID"
- iD="true">
- <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
- <details key="kind" value="attribute"/>
- <details key="name" value="id"/>
- </eAnnotations>
- </eStructuralFeatures>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="FaceletTaglibTag" eSuperTypes="#//UserVisibleTaglibObject">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="
 If the tag library XML file contains individual tag
 declarations rather than pointing to a library-class or a
 declaring a composite-library name, the individual tags are
 enclosed in tag elements.
 "/>
- </eAnnotations>
- <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
- <details key="name" value="facelet-taglib-tagType"/>
- <details key="kind" value="elementOnly"/>
- </eAnnotations>
- <eStructuralFeatures xsi:type="ecore:EReference" name="tagNameElement" lowerBound="1"
- eType="#//FaceletTaglibCanonicalName" containment="true" resolveProxies="false">
- <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
- <details key="kind" value="element"/>
- <details key="name" value="tag-name"/>
- <details key="namespace" value="##targetNamespace"/>
- </eAnnotations>
- </eStructuralFeatures>
- <eStructuralFeatures xsi:type="ecore:EReference" name="handlerClassElement" eType="#//FullyQualifiedClass"
- containment="true" resolveProxies="false">
- <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
- <details key="kind" value="element"/>
- <details key="name" value="handler-class"/>
- <details key="namespace" value="##targetNamespace"/>
- </eAnnotations>
- </eStructuralFeatures>
- <eStructuralFeatures xsi:type="ecore:EReference" name="behavior" eType="#//FaceletTaglibTagBehavior"
- containment="true" resolveProxies="false">
- <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
- <details key="kind" value="element"/>
- <details key="name" value="behavior"/>
- <details key="namespace" value="##targetNamespace"/>
- </eAnnotations>
- </eStructuralFeatures>
- <eStructuralFeatures xsi:type="ecore:EReference" name="component" eType="#//FaceletTaglibTagComponent"
- containment="true" resolveProxies="false">
- <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
- <details key="kind" value="element"/>
- <details key="name" value="component"/>
- <details key="namespace" value="##targetNamespace"/>
- </eAnnotations>
- </eStructuralFeatures>
- <eStructuralFeatures xsi:type="ecore:EReference" name="converter" eType="#//FaceletTaglibTagConverter"
- containment="true" resolveProxies="false">
- <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
- <details key="kind" value="element"/>
- <details key="name" value="converter"/>
- <details key="namespace" value="##targetNamespace"/>
- </eAnnotations>
- </eStructuralFeatures>
- <eStructuralFeatures xsi:type="ecore:EReference" name="validator" eType="#//FaceletTaglibTagValidator"
- containment="true" resolveProxies="false">
- <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
- <details key="kind" value="element"/>
- <details key="name" value="validator"/>
- <details key="namespace" value="##targetNamespace"/>
- </eAnnotations>
- </eStructuralFeatures>
- <eStructuralFeatures xsi:type="ecore:EReference" name="source" eType="#//IdentifiableStringValue"
- containment="true" resolveProxies="false">
- <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
- <details key="kind" value="element"/>
- <details key="name" value="source"/>
- <details key="namespace" value="##targetNamespace"/>
- </eAnnotations>
- </eStructuralFeatures>
- <eStructuralFeatures xsi:type="ecore:EReference" name="attribute" upperBound="-1"
- eType="#//FaceletTaglibTagAttribute" containment="true" resolveProxies="false">
- <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
- <details key="kind" value="element"/>
- <details key="name" value="attribute"/>
- <details key="namespace" value="##targetNamespace"/>
- </eAnnotations>
- </eStructuralFeatures>
- <eStructuralFeatures xsi:type="ecore:EReference" name="tagExtension" upperBound="-1"
- eType="#//FaceletTaglibTagExtension" containment="true" resolveProxies="false">
- <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
- <details key="kind" value="element"/>
- <details key="name" value="tag-extension"/>
- <details key="namespace" value="##targetNamespace"/>
- </eAnnotations>
- </eStructuralFeatures>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="tagName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"
- volatile="true" transient="true"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="handlerClass" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"
- volatile="true" transient="true"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="FaceletTaglibTagValidatorExtension">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="
 Extension element for validator It may contain
 implementation specific content.
 "/>
- </eAnnotations>
- <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
- <details key="name" value="facelet-taglib-tag-validator-extensionType"/>
- <details key="kind" value="elementOnly"/>
- </eAnnotations>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="any" unique="false" upperBound="-1"
- eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EFeatureMapEntry">
- <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
- <details key="kind" value="elementWildcard"/>
- <details key="wildcards" value="##any"/>
- <details key="name" value=":0"/>
- <details key="processing" value="lax"/>
- </eAnnotations>
- </eStructuralFeatures>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="id" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//ID"
- iD="true">
- <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
- <details key="kind" value="attribute"/>
- <details key="name" value="id"/>
- </eAnnotations>
- </eStructuralFeatures>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="FaceletTaglibTagValidator" eSuperTypes="#//UserVisibleTaglibObject">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="
 Within a tag element, the validator element encapsulates
 information specific to a JSF Validator.
 "/>
- </eAnnotations>
- <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
- <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
- <details key="name" value="facelet-taglib-tag-validatorType"/>
- <details key="kind" value="elementOnly"/>
- </eAnnotations>
- <details key="name" value="facelet-taglib-tag-validatorType"/>
- <details key="kind" value="elementOnly"/>
- </eAnnotations>
- <eStructuralFeatures xsi:type="ecore:EReference" name="validatorId" lowerBound="1"
- eType="#//IdentifiableStringValue" containment="true" resolveProxies="false">
- <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
- <details key="kind" value="element"/>
- <details key="name" value="validator-id"/>
- <details key="namespace" value="##targetNamespace"/>
- </eAnnotations>
- </eStructuralFeatures>
- <eStructuralFeatures xsi:type="ecore:EReference" name="handlerClass" eType="#//FullyQualifiedClass"
- containment="true" resolveProxies="false">
- <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
- <details key="kind" value="element"/>
- <details key="name" value="handler-class"/>
- <details key="namespace" value="##targetNamespace"/>
- </eAnnotations>
- </eStructuralFeatures>
- <eStructuralFeatures xsi:type="ecore:EReference" name="validatorExtension" upperBound="-1"
- eType="#//FaceletTaglibTagValidatorExtension" containment="true" resolveProxies="false">
- <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
- <details key="kind" value="element"/>
- <details key="name" value="validator-extension"/>
- <details key="namespace" value="##targetNamespace"/>
- </eAnnotations>
- </eStructuralFeatures>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="FaceletTaglib" eSuperTypes="#//UserVisibleTaglibObject">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="
 The top level XML element in a facelet tag library XML file.
 "/>
- </eAnnotations>
- <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
- <details key="name" value="facelet-taglibType"/>
- <details key="kind" value="elementOnly"/>
- </eAnnotations>
- <eStructuralFeatures xsi:type="ecore:EReference" name="libraryClass" eType="#//FullyQualifiedClass"
- containment="true" resolveProxies="false">
- <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
- <details key="kind" value="element"/>
- <details key="name" value="library-class"/>
- <details key="namespace" value="##targetNamespace"/>
- </eAnnotations>
- </eStructuralFeatures>
- <eStructuralFeatures xsi:type="ecore:EReference" name="namespace" eType="#//IdentifiableStringValue"
- containment="true" resolveProxies="false">
- <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
- <details key="kind" value="element"/>
- <details key="name" value="namespace"/>
- <details key="namespace" value="##targetNamespace"/>
- </eAnnotations>
- </eStructuralFeatures>
- <eStructuralFeatures xsi:type="ecore:EReference" name="compositeLibraryName" eType="#//FullyQualifiedClass"
- containment="true" resolveProxies="false">
- <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
- <details key="kind" value="element"/>
- <details key="name" value="composite-library-name"/>
- <details key="namespace" value="##targetNamespace"/>
- </eAnnotations>
- </eStructuralFeatures>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="group" unique="false" upperBound="-1"
- eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EFeatureMapEntry">
- <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
- <details key="kind" value="group"/>
- <details key="name" value="group:6"/>
- </eAnnotations>
- </eStructuralFeatures>
- <eStructuralFeatures xsi:type="ecore:EReference" name="tag" upperBound="-1" eType="#//FaceletTaglibTag"
- volatile="true" transient="true" derived="true" containment="true" resolveProxies="false">
- <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
- <details key="kind" value="element"/>
- <details key="name" value="tag"/>
- <details key="namespace" value="##targetNamespace"/>
- <details key="group" value="#group:6"/>
- </eAnnotations>
- </eStructuralFeatures>
- <eStructuralFeatures xsi:type="ecore:EReference" name="function" upperBound="-1"
- eType="#//FaceletTaglibFunction" volatile="true" transient="true" derived="true"
- containment="true" resolveProxies="false">
- <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
- <details key="kind" value="element"/>
- <details key="name" value="function"/>
- <details key="namespace" value="##targetNamespace"/>
- <details key="group" value="#group:6"/>
- </eAnnotations>
- </eStructuralFeatures>
- <eStructuralFeatures xsi:type="ecore:EReference" name="taglibExtension" upperBound="-1"
- eType="#//FaceletTaglibExtension" containment="true" resolveProxies="false">
- <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
- <details key="kind" value="element"/>
- <details key="name" value="taglib-extension"/>
- <details key="namespace" value="##targetNamespace"/>
- </eAnnotations>
- </eStructuralFeatures>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="id" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//ID"
- iD="true">
- <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
- <details key="kind" value="attribute"/>
- <details key="name" value="id"/>
- </eAnnotations>
- </eStructuralFeatures>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="version" lowerBound="1"
- eType="#//FaceletTaglibVersion" unsettable="true">
- <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
- <details key="kind" value="attribute"/>
- <details key="name" value="version"/>
- </eAnnotations>
- </eStructuralFeatures>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="namespaceUri" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Token"
- volatile="true" transient="true"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EEnum" name="FaceletTaglibVersion">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="
 This type contains the recognized versions of
 facelet-taglib supported.
 "/>
- </eAnnotations>
- <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
- <details key="name" value="facelet-taglib-versionType"/>
- </eAnnotations>
- <eLiterals name="_20" literal="2.0"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EDataType" name="FaceletTaglibVersionTypeObject" instanceClassName="org.eclipse.emf.common.util.Enumerator">
- <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
- <details key="name" value="facelet-taglib-versionType:Object"/>
- <details key="baseType" value="facelet-taglib-versionType"/>
- </eAnnotations>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="FullyQualifiedClass" eSuperTypes="#//IdentifiableStringValue">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="

 The elements that use this type designate the name of a
 Java class or interface. The name is in the form of a
 "binary name", as defined in the JLS. This is the form
 of name used in Class.forName(). Tools that need the
 canonical name (the name used in source code) will need
 to convert this binary name to the canonical name.

 "/>
- </eAnnotations>
- <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
- <details key="name" value="fully-qualified-classType"/>
- <details key="kind" value="simple"/>
- </eAnnotations>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EDataType" name="FullyQualifiedClassBase" instanceClassName="java.lang.String">
- <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
- <details key="name" value="fully-qualified-classType_._base"/>
- <details key="baseType" value="http://www.eclipse.org/emf/2003/XMLType#token"/>
- </eAnnotations>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="GenericBoolean" eSuperTypes="#//IdentifiableStringValue">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="

 This type defines four different values which can designate
 boolean values. This includes values yes and no which are
 not designated by xsd:boolean

 "/>
- </eAnnotations>
- <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
- <details key="name" value="generic-booleanType"/>
- <details key="kind" value="simple"/>
- </eAnnotations>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EEnum" name="GenericBooleanBase">
- <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
- <details key="name" value="generic-booleanType_._base"/>
- </eAnnotations>
- <eLiterals name="true"/>
- <eLiterals name="false" value="1"/>
- <eLiterals name="yes" value="2"/>
- <eLiterals name="no" value="3"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="Icon">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="

 The icon type contains small-icon and large-icon elements
 that specify the file names for small and large GIF, JPEG,
 or PNG icon images used to represent the parent element in a
 GUI tool.

 The xml:lang attribute defines the language that the
 icon file names are provided in. Its value is "en" (English)
 by default.

 "/>
- </eAnnotations>
- <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
- <details key="name" value="iconType"/>
- <details key="kind" value="elementOnly"/>
- </eAnnotations>
- <eStructuralFeatures xsi:type="ecore:EReference" name="smallIcon" eType="#//Path"
- containment="true" resolveProxies="false">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="
 <![CDATA[

 The small-icon element contains the name of a file
 containing a small (16 x 16) icon image. The file
 name is a relative path within the Deployment
 Component's Deployment File.

 The image may be in the GIF, JPEG, or PNG format.
 The icon can be used by tools.

 Example:

 <small-icon>employee-service-icon16x16.jpg</small-icon>

 ]]>
 "/>
- </eAnnotations>
- <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
- <details key="kind" value="element"/>
- <details key="name" value="small-icon"/>
- <details key="namespace" value="##targetNamespace"/>
- </eAnnotations>
- </eStructuralFeatures>
- <eStructuralFeatures xsi:type="ecore:EReference" name="largeIcon" eType="#//Path"
- containment="true" resolveProxies="false">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="
 <![CDATA[

 The large-icon element contains the name of a file
 containing a large
 (32 x 32) icon image. The file name is a relative
 path within the Deployment Component's Deployment
 File.

 The image may be in the GIF, JPEG, or PNG format.
 The icon can be used by tools.

 Example:

 <large-icon>employee-service-icon32x32.jpg</large-icon>

 ]]>
 "/>
- </eAnnotations>
- <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
- <details key="kind" value="element"/>
- <details key="name" value="large-icon"/>
- <details key="namespace" value="##targetNamespace"/>
- </eAnnotations>
- </eStructuralFeatures>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="id" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//ID"
- iD="true">
- <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
- <details key="kind" value="attribute"/>
- <details key="name" value="id"/>
- </eAnnotations>
- </eStructuralFeatures>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="lang" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="
 <div xmlns="http://www.w3.org/1999/xhtml">
 
 <h3>lang (as an attribute name)</h3>
 <p>
 denotes an attribute whose value
 is a language code for the natural language of the content of
 any element; its value is inherited. This name is reserved
 by virtue of its definition in the XML specification.</p>
 
 </div>
 <div xmlns="http://www.w3.org/1999/xhtml">
 <h4>Notes</h4>
 <p>
 Attempting to install the relevant ISO 2- and 3-letter
 codes as the enumerated possible values is probably never
 going to be a realistic possibility. 
 </p>
 <p>
 See BCP 47 at <a href="http://www.rfc-editor.org/rfc/bcp/bcp47.txt">
 http://www.rfc-editor.org/rfc/bcp/bcp47.txt</a>
 and the IANA language subtag registry at
 <a href="http://www.iana.org/assignments/language-subtag-registry">
 http://www.iana.org/assignments/language-subtag-registry</a>
 for further information.
 </p>
 <p>
 The union allows for the 'un-declaration' of xml:lang with
 the empty string.
 </p>
 </div>
 "/>
- </eAnnotations>
- <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
- <details key="kind" value="attribute"/>
- <details key="name" value="lang"/>
- <details key="namespace" value="http://www.w3.org/XML/1998/namespace"/>
- </eAnnotations>
- </eStructuralFeatures>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="JavaIdentifier" eSuperTypes="#//IdentifiableStringValue">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="

 The java-identifierType defines a Java identifier.
 The users of this type should further verify that
 the content does not contain Java reserved keywords.

 "/>
- </eAnnotations>
- <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
- <details key="name" value="java-identifierType"/>
- <details key="kind" value="simple"/>
- </eAnnotations>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EDataType" name="JavaIdentifierBase" instanceClassName="java.lang.String">
- <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
- <details key="name" value="java-identifierType_._base"/>
- <details key="baseType" value="http://www.eclipse.org/emf/2003/XMLType#token"/>
- <details key="pattern" value="($|_|\p{L})(\p{L}|\p{Nd}|_|$)*"/>
- </eAnnotations>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="Path" eSuperTypes="#//IdentifiableStringValue">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="

 The elements that use this type designate either a relative
 path or an absolute path starting with a "/".

 In elements that specify a pathname to a file within the
 same Deployment File, relative filenames (i.e., those not
 starting with "/") are considered relative to the root of
 the Deployment File's namespace. Absolute filenames (i.e.,
 those starting with "/") also specify names in the root of
 the Deployment File's namespace. In general, relative names
 are preferred. The exception is .war files where absolute
 names are preferred for consistency with the Servlet API.

 "/>
- </eAnnotations>
- <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
- <details key="name" value="pathType"/>
- <details key="kind" value="simple"/>
- </eAnnotations>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EDataType" name="PathTypeBase" instanceClassName="java.lang.String">
- <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
- <details key="name" value="pathType_._base"/>
- <details key="baseType" value="http://www.eclipse.org/emf/2003/XMLType#token"/>
- </eAnnotations>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="IdentifiableStringValue">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="

 This is a special string datatype that is defined by Java EE as
 a base type for defining collapsed strings. When schemas
 require trailing/leading space elimination as well as
 collapsing the existing whitespace, this base type may be
 used.

 "/>
- </eAnnotations>
- <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
- <details key="name" value="string"/>
- <details key="kind" value="simple"/>
- </eAnnotations>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="value" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Token">
- <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
- <details key="name" value=":0"/>
- <details key="kind" value="simple"/>
- </eAnnotations>
- </eStructuralFeatures>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="id" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//ID"
- iD="true">
- <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
- <details key="kind" value="attribute"/>
- <details key="name" value="id"/>
- </eAnnotations>
- </eStructuralFeatures>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="IdentifiableLangStringValue" abstract="true"
- eSuperTypes="#//IdentifiableStringValue">
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="lang" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="
 <div xmlns="http://www.w3.org/1999/xhtml">
 
 <h3>lang (as an attribute name)</h3>
 <p>
 denotes an attribute whose value
 is a language code for the natural language of the content of
 any element; its value is inherited. This name is reserved
 by virtue of its definition in the XML specification.</p>
 
 </div>
 <div xmlns="http://www.w3.org/1999/xhtml">
 <h4>Notes</h4>
 <p>
 Attempting to install the relevant ISO 2- and 3-letter
 codes as the enumerated possible values is probably never
 going to be a realistic possibility. 
 </p>
 <p>
 See BCP 47 at <a href="http://www.rfc-editor.org/rfc/bcp/bcp47.txt">
 http://www.rfc-editor.org/rfc/bcp/bcp47.txt</a>
 and the IANA language subtag registry at
 <a href="http://www.iana.org/assignments/language-subtag-registry">
 http://www.iana.org/assignments/language-subtag-registry</a>
 for further information.
 </p>
 <p>
 The union allows for the 'un-declaration' of xml:lang with
 the empty string.
 </p>
 </div>
 "/>
- </eAnnotations>
- <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
- <details key="kind" value="attribute"/>
- <details key="name" value="lang"/>
- <details key="namespace" value="http://www.w3.org/XML/1998/namespace"/>
- </eAnnotations>
- </eStructuralFeatures>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="UserVisibleTaglibObject" abstract="true">
- <eOperations name="getDescription" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="Iterates through all descriptions and returns a concatenated string of
all descriptions for the specified language.
Passing the empty string indicates descriptions with no locale.
Passing null is invalid and will cause an NPE to be thrown."/>
- </eAnnotations>
- <eParameters name="language" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
- <eParameters name="separationString" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="A string that will be used to separate each individual description after it
has been trimmed but before it is concatenated to the result."/>
- </eAnnotations>
- </eParameters>
- </eOperations>
- <eOperations name="getDefaultDescription" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="Equivalent to getDescription("")."/>
- </eAnnotations>
- <eParameters name="separationString" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="A string that will be used to separate each individual display-name after it
has been trimmed but before it is concatenated to the result."/>
- </eAnnotations>
- </eParameters>
- </eOperations>
- <eOperations name="getDisplayName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="Iterates through all display names and returns a concatenated string of
all display names for the specified language. Passing null indicates the use of the current locale.
Passing the empty string indicates descriptions with no locale."/>
- </eAnnotations>
- <eParameters name="language" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
- <eParameters name="separationString" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="A string that will be used to separate each individual display-name after it
has been trimmed but before it is concatenated to the result."/>
- </eAnnotations>
- </eParameters>
- </eOperations>
- <eOperations name="getDefaultDisplayName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="Equivalent to getDisplayName("")."/>
- </eAnnotations>
- <eParameters name="separationString" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="A string that will be used to separate each individual display-name after it
has been trimmed but before it is concatenated to the result."/>
- </eAnnotations>
- </eParameters>
- </eOperations>
- <eStructuralFeatures xsi:type="ecore:EReference" name="description" upperBound="-1"
- eType="#//Description" containment="true" resolveProxies="false">
- <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
- <details key="kind" value="element"/>
- <details key="name" value="description"/>
- <details key="namespace" value="##targetNamespace"/>
- </eAnnotations>
- </eStructuralFeatures>
- <eStructuralFeatures xsi:type="ecore:EReference" name="displayName" upperBound="-1"
- eType="#//DisplayName" containment="true" resolveProxies="false">
- <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
- <details key="kind" value="element"/>
- <details key="name" value="display-name"/>
- <details key="namespace" value="##targetNamespace"/>
- </eAnnotations>
- </eStructuralFeatures>
- <eStructuralFeatures xsi:type="ecore:EReference" name="icon" upperBound="-1" eType="#//Icon"
- containment="true" resolveProxies="false">
- <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
- <details key="kind" value="element"/>
- <details key="name" value="icon"/>
- <details key="namespace" value="##targetNamespace"/>
- </eAnnotations>
- </eStructuralFeatures>
- </eClassifiers>
-</ecore:EPackage>
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/model/namespace.ecore b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/model/namespace.ecore
deleted file mode 100644
index 4a45d26..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/model/namespace.ecore
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ecore:EPackage xmi:version="2.0"
- xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="namespace"
- nsURI="http://www.w3.org/XML/1998/namespace" nsPrefix="namespace"/>
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/model/templates/Header.javajetinc b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/model/templates/Header.javajetinc
deleted file mode 100644
index f7c8f2b..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/model/templates/Header.javajetinc
+++ /dev/null
@@ -1,10 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Oracle 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:
- * Oracle - initial API and implementation
- *******************************************************************************/
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/plugin.properties b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/plugin.properties
deleted file mode 100644
index f0b7de2..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/plugin.properties
+++ /dev/null
Binary files differ
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/plugin.xml b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/plugin.xml
deleted file mode 100644
index d17c4c5..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/plugin.xml
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.2"?>
-<plugin>
- <extension-point id="projectTaglibDescriptorFactory" name="%extension-point.name" schema="schema/testProjectTaglibDescriptorFactory.exsd"/>
- <extension
- point="org.eclipse.jst.jsf.core.tagregistry">
- <tagRegistry
- class="org.eclipse.jst.jsf.facelet.core.internal.registry.FaceletRegistryManager$MyRegistryFactory"
- description="%tagRegistry.description.0"
- id="FaceletRegistry">
- <content-type
- contentTypeId="org.eclipse.wst.html.core.htmlsource">
- </content-type>
- </tagRegistry>
- </extension>
- <extension point="org.eclipse.wst.xml.core.documentFactories">
- <factory
- type="xhtml"
- class="org.eclipse.jst.jsf.facelet.core.internal.cm.FaceletDocumentFactory">
- </factory>
- </extension>
- <extension
- point="org.eclipse.jst.jsf.core.viewhandler">
- <viewhandler
- class="org.eclipse.jst.jsf.facelet.core.internal.view.DTFaceletViewHandler"
- id="org.eclipse.jst.jsf.facelet.core.html.viewhandler">
- </viewhandler>
- </extension>
- <extension
- point="org.eclipse.emf.edit.itemProviderAdapterFactories">
- <factory
- uri = "http://org.eclipse.jst.jsf.facelet.core/additionalTagMetadata.ecore"
- class = "org.eclipse.jst.jsf.facelet.core.internal.cm.addtagmd.provider.AddTagMDItemProviderAdapterFactory"
- 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
- org.eclipse.jst.jsf.facelet.core.internal.cm.addtagmd.provider.IResourceProvider"/>
- </extension>
- <extension
- point="org.eclipse.wst.xml.core.catalogContributions">
- <catalogContribution id="default">
- <public
- publicId="-//Sun Microsystems, Inc.//DTD Facelet Taglib 1.0//EN"
- uri="dtd/facelet-taglib_1_0.dtd"
- webURL="facelet-taglib_1_0.dtd" />
- </catalogContribution>
- </extension>
-
- <extension
- point="org.eclipse.jst.jsf.core.AttributeValueRuntimeTypes">
-
- <attributeValueRuntimeType
- class="org.eclipse.jst.jsf.facelet.core.internal.cm.attributevalues.TemplateWebPathType"
- id="attributevalues.TemplateWebPathType"/>
- </extension>
-
- <extension point="org.eclipse.emf.ecore.generated_package">
- <package
- uri = "http://org.eclipse.jst.jsf.facelet.core/additionalTagMetadata.ecore"
- class = "org.eclipse.jst.jsf.facelet.core.internal.cm.addtagmd.AddTagMDPackage"
- genModel = "model/additionalTagMetadata.genmodel" />
- </extension>
- <extension
- point="org.eclipse.jst.jsf.common.domainSourceModelTypes">
- <domainSourceModelTypes
- domainId="TagLibraryDomain"
- domainSourceModelTypeId="FaceletNamespaceContentModelHandler"
- locator="org.eclipse.jst.jsf.facelet.core.internal.metadata.FaceletNamespaceMetaDataLocator"
- ordinal="3">
- </domainSourceModelTypes>
- </extension>
-
- <extension
- point="org.eclipse.jst.jsf.common.domainSourceModelTypeTranslators">
- <domainSourceModelTypeTranslator
- domainSourceModelTypeId="FaceletNamespaceContentModelHandler"
- translatorClass="org.eclipse.jst.jsf.facelet.core.internal.metadata.FaceletNamespaceMetaDataTranslator">
- </domainSourceModelTypeTranslator>
- </extension>
-
-</plugin>
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/schema/testProjectTaglibDescriptorFactory.exsd b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/schema/testProjectTaglibDescriptorFactory.exsd
deleted file mode 100644
index 48cb7e1..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/schema/testProjectTaglibDescriptorFactory.exsd
+++ /dev/null
@@ -1,102 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.jst.jsf.facelet.core" xmlns="http://www.w3.org/2001/XMLSchema">
-<annotation>
- <appInfo>
- <meta.schema plugin="org.eclipse.jst.jsf.facelet.core" id="jsfAppConfigManagerFactory" name="JSF App Config Manager Factory"/>
- </appInfo>
- <documentation>
- internal... not provisional API
- </documentation>
- </annotation>
-
- <element name="extension">
- <annotation>
- <appInfo>
- <meta.element />
- </appInfo>
- </annotation>
- <complexType>
- <sequence>
- <element ref="factory"/>
- </sequence>
- <attribute name="point" type="string" use="required">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- <attribute name="id" type="string">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- <attribute name="name" type="string">
- <annotation>
- <documentation>
-
- </documentation>
- <appInfo>
- <meta.attribute translatable="true"/>
- </appInfo>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <element name="factory">
- <complexType>
- <attribute name="class" type="string" use="required">
- <annotation>
- <documentation>
-
- </documentation>
- <appInfo>
- <meta.attribute kind="java" basedOn=":org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.IProjectTaglibDescriptorFactory"/>
- </appInfo>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <annotation>
- <appInfo>
- <meta.section type="since"/>
- </appInfo>
- <documentation>
- [Enter the first release in which this extension point appears.]
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="examples"/>
- </appInfo>
- <documentation>
- [Enter extension point usage example here.]
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="apiinfo"/>
- </appInfo>
- <documentation>
- [Enter API information here.]
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="implementation"/>
- </appInfo>
- <documentation>
- [Enter information about supplied implementation of this extension point.]
- </documentation>
- </annotation>
-
-
-</schema>
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/FaceletCorePlugin.java b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/FaceletCorePlugin.java
deleted file mode 100644
index 278fdd1..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/FaceletCorePlugin.java
+++ /dev/null
@@ -1,136 +0,0 @@
-package org.eclipse.jst.jsf.facelet.core.internal;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.emf.common.EMFPlugin;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.osgi.framework.BundleContext;
-
-/**
- * The activator class controls the plug-in life cycle
- */
-public class FaceletCorePlugin extends EMFPlugin
-{
-
- /**
- * Keep track of the singleton.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public static final FaceletCorePlugin INSTANCE = new FaceletCorePlugin();
-
- /**
- * The plug-in ID
- */
- public static final String PLUGIN_ID = "org.eclipse.jst.jsf.facelet.core"; //$NON-NLS-1$
-
- // The shared instance
- private static Implementation plugin;
-
- /**
- * Create the instance.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public FaceletCorePlugin()
- {
- super
- (new ResourceLocator []
- {
- });
- }
-
- /**
- * Returns the singleton instance of the Eclipse plugin.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the singleton instance.
- * @generated
- */
- @Override
- 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
- {
- private BundleContext context = null;
- /**
- * Creates an instance.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public Implementation()
- {
- super();
-
- // Remember the static instance.
- //
- plugin = this;
- }
-
- @Override
- public void start(BundleContext bundleContext) throws Exception
- {
- super.start(bundleContext);
- this.context = bundleContext;
- }
-
- /**
- * @return the bundle context.
- */
- public BundleContext getBundleContext()
- {
- return this.context;
- }
- }
-
-
- /**
- * Returns the shared instance
- *
- * @return the shared instance
- */
- public static Implementation getDefault()
- {
- if (plugin == null)
- {
- return new Implementation();
- }
- return plugin;
- }
-
- /**
- * @param logMessage
- * @param exception
- */
- public static void log(final String logMessage, final Throwable exception)
- {
- final IStatus status = new Status(IStatus.ERROR, PLUGIN_ID,
- logMessage, exception);
- getDefault().getLog().log(status);
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/FaceletCoreTraceOptions.java b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/FaceletCoreTraceOptions.java
deleted file mode 100644
index 70250cc..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/FaceletCoreTraceOptions.java
+++ /dev/null
@@ -1,88 +0,0 @@
-package org.eclipse.jst.jsf.facelet.core.internal;
-
-import org.eclipse.osgi.framework.debug.FrameworkDebugOptions;
-import org.eclipse.osgi.service.debug.DebugOptions;
-
-/**
- * Defines that standard runtime trace options for debugging. See .options file
- * for definitions.
- *
- * @author cbateman
- *
- */
-public final class FaceletCoreTraceOptions
-{
- /**
- * True if debug tracing is enabled. Other tracing cannot be enabled unless
- * this is enabled.
- */
- public static final boolean ENABLED;
-
- /**
- * True if the registry manager tracing is enabled
- */
- public static final boolean TRACE_REGISTRYMANAGER;
-
- /**
- * True if the facet installer is being traced.
- */
- public static final boolean TRACE_FACETINSTALLDELEGATE;
- /**
- * True if the facet uninstaller is being traced
- */
- public static final boolean TRACE_FACETUNINSTALLDELEGATE;
- /**
- * True if the base facet change delegate is being traced
- */
- public static final boolean TRACE_FACETCHANGEDELEGATE;
-
- private static final String KEY_DEBUG_ENABLED = "/debug"; //$NON-NLS-1$
-// private static final String KEY_VIEW_TAGREGISTRY = "/jsptagregistry";
-// private static final String KEY_VIEW_JSPTAGREGISTRY_CHANGES =
-// KEY_VIEW_TAGREGISTRY + "/changes";
- private static final String KEY_VIEW_REGISTRYMANAGER = "/registrymanager"; //$NON-NLS-1$
- private static final String KEY_FACETINSTALLDELEGATE = "/facetinstalldelegate"; //$NON-NLS-1$
- private static final String KEY_FACETUNINSTALLDELEGATE = "facetuninstalldelegate"; //$NON-NLS-1$
- private static final String KEY_FACETCHANGEDELEGATE = "facetchangedelegate"; //$NON-NLS-1$
-
- static
- {
- final DebugOptions debugOptions = FrameworkDebugOptions.getDefault();
-
- ENABLED = debugOptions != null
- && debugOptions.getBooleanOption(FaceletCorePlugin.PLUGIN_ID
- + KEY_DEBUG_ENABLED, false);
-
- if (ENABLED && debugOptions != null)
- {
- TRACE_REGISTRYMANAGER = debugOptions.getBooleanOption(
- FaceletCorePlugin.PLUGIN_ID + KEY_VIEW_REGISTRYMANAGER, false);
- TRACE_FACETINSTALLDELEGATE = debugOptions.getBooleanOption(
- FaceletCorePlugin.PLUGIN_ID + KEY_FACETINSTALLDELEGATE, false);
- TRACE_FACETUNINSTALLDELEGATE = debugOptions.getBooleanOption(
- FaceletCorePlugin.PLUGIN_ID + KEY_FACETUNINSTALLDELEGATE, false);
- TRACE_FACETCHANGEDELEGATE = debugOptions.getBooleanOption(
- FaceletCorePlugin.PLUGIN_ID + KEY_FACETCHANGEDELEGATE, false);
- }
- else
- {
- TRACE_REGISTRYMANAGER = false;
- TRACE_FACETINSTALLDELEGATE = false;
- TRACE_FACETUNINSTALLDELEGATE = false;
- TRACE_FACETCHANGEDELEGATE = false;
- }
- }
-
- /**
- * @param message
- */
- public static void log(final String message)
- {
- System.out.println(message);
- }
-
- private FaceletCoreTraceOptions()
- {
- // no instantiation
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/cm/AttributeCMAdapter.java b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/cm/AttributeCMAdapter.java
deleted file mode 100644
index c7b3766..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/cm/AttributeCMAdapter.java
+++ /dev/null
@@ -1,99 +0,0 @@
-package org.eclipse.jst.jsf.facelet.core.internal.cm;
-
-import java.util.Enumeration;
-
-import org.eclipse.jst.jsf.common.runtime.internal.view.model.common.ITagAttribute;
-import org.eclipse.jst.jsp.core.internal.contentmodel.tld.CMDataTypeImpl;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMAttributeDeclaration;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMDataType;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNode;
-
-/**
- * Adapts Facelet attribute date to the CM model.
- *
- * @author cbateman
- *
- */
-public class AttributeCMAdapter implements CMAttributeDeclaration
-{
- private static final String DESCRIPTION = "description"; //$NON-NLS-1$
- private final int _usage;
- private final String _name;
- private String _description;
-
- /**
- * @param name
- * @param usage
- */
- public AttributeCMAdapter(final String name, final int usage)
- {
- _name = name;
- _usage = usage;
- }
-
- /**
- * @param tagAttr
- */
- public AttributeCMAdapter(final ITagAttribute tagAttr)
- {
- this(tagAttr.getName(), tagAttr.isRequired() ? REQUIRED : OPTIONAL);
- _description = tagAttr.getDescription();
- }
-
- public String getAttrName()
- {
- return _name;
- }
-
- public CMDataType getAttrType()
- {
- return new CMDataTypeImpl(CMDataType.CDATA);
- }
-
- public String getDefaultValue()
- {
- return null;
- }
-
- public Enumeration<?> getEnumAttr()
- {
- return null;
- }
-
- public int getUsage()
- {
- return _usage;
- }
-
- public String getNodeName()
- {
- return _name;
- }
-
- public int getNodeType()
- {
- return CMNode.ATTRIBUTE_DECLARATION;
- }
-
- public Object getProperty(String propertyName)
- {
- if (DESCRIPTION.equals(propertyName))
- {
- return _description;
- }
- return null;
- }
-
- /**
- * @param description
- */
- public void setDescription(final String description)
- {
- _description = description;
- }
-
- public boolean supports(String propertyName)
- {
- return false;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/cm/CompositeTagInfo.java b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/cm/CompositeTagInfo.java
deleted file mode 100644
index ee81c1d..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/cm/CompositeTagInfo.java
+++ /dev/null
@@ -1,107 +0,0 @@
-package org.eclipse.jst.jsf.facelet.core.internal.cm;
-
-import org.eclipse.jst.jsf.common.dom.TagIdentifier;
-import org.eclipse.jst.jsf.core.internal.tld.TagIdentifierFactory;
-import org.eclipse.jst.jsf.facelet.core.internal.FaceletCorePlugin;
-import org.eclipse.jst.jsf.facelet.core.internal.cm.strategy.TagInfoStrategyComposite;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNamedNodeMap;
-
-/**
- * A tag info that composes a number of other tag infos selected from a
- * TagInfoStrategyComposite.
- *
- * @author cbateman
- *
- */
-public abstract class CompositeTagInfo extends TagInfo
-{
- private final TagInfoStrategyComposite _compositeStrategy;
- private final String _uri;
-
- /**
- * @param uri
- * @param compositeStrategy
- */
- protected CompositeTagInfo(final String uri, final TagInfoStrategyComposite compositeStrategy)
- {
- _uri = uri;
- _compositeStrategy = compositeStrategy;
- }
- @Override
- public Object getTagProperty(String tagName, String key)
- {
- final TagIdentifier tagId = TagIdentifierFactory.createJSPTagWrapper(
- _uri, tagName);
- _compositeStrategy.resetIterator();
-
- for (TagInfo tagInfo = getNextExternalInfo(tagId); tagInfo != _compositeStrategy
- .getNoResult(); tagInfo = getNextExternalInfo(tagId))
- {
- try
- {
- if (tagInfo != _compositeStrategy.getNoResult())
- {
- final Object value = tagInfo.getTagProperty(tagName, key);
-
- if (value != null)
- {
- return value;
- }
- }
-
- // fall-through
- }
- catch (final Exception e)
- {
- FaceletCorePlugin.log("During meta-data strategy", e); //$NON-NLS-1$
- }
- }
-
- return null;
-
- }
-
- /**
- * @param tagName
- * @return a named node map of known attributes for the tag, or null if not
- * found
- */
- @Override
- public CMNamedNodeMap getAttributes(String tagName)
- {
- final TagIdentifier tagId = TagIdentifierFactory.createJSPTagWrapper(
- _uri, tagName);
- _compositeStrategy.resetIterator();
-
- for (TagInfo tagInfo = getNextExternalInfo(tagId); tagInfo != _compositeStrategy
- .getNoResult(); tagInfo = getNextExternalInfo(tagId))
- {
- try
- {
- if (tagInfo != _compositeStrategy.getNoResult())
- {
- final CMNamedNodeMap nodeMap = tagInfo
- .getAttributes(tagName);
-
- if (nodeMap != null)
- {
- return nodeMap;
- }
- }
-
- // fall-through
- }
- catch (final Exception e)
- {
- FaceletCorePlugin.log("During meta-data strategy", e); //$NON-NLS-1$
- }
- }
-
- return null;
- }
-
- private TagInfo getNextExternalInfo(final TagIdentifier input)
- {
- return _compositeStrategy.perform(input);
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/cm/DocumentElementCMAdapter.java b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/cm/DocumentElementCMAdapter.java
deleted file mode 100644
index a20c5f1..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/cm/DocumentElementCMAdapter.java
+++ /dev/null
@@ -1,109 +0,0 @@
-package org.eclipse.jst.jsf.facelet.core.internal.cm;
-
-import java.util.Iterator;
-
-import org.eclipse.wst.xml.core.internal.contentmodel.CMContent;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMDataType;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNamedNodeMap;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNode;
-
-class DocumentElementCMAdapter implements CMNamedNodeMap,
- CMElementDeclaration
-{
- private final String _prefix;
- private final ElementCMAdapter _adapter;
-
- public DocumentElementCMAdapter(final ElementCMAdapter adapter, final String prefix)
- {
- _prefix = prefix;
- _adapter = adapter;
- }
-
- public int getLength()
- {
- return _adapter.getLength();
- }
-
- public CMNode getNamedItem(String name)
- {
- return _adapter.getNamedItem(name);
- }
-
- public CMNode item(int index)
- {
- return _adapter.item(index);
- }
-
- @SuppressWarnings("unchecked")
- public Iterator iterator()
- {
- return _adapter.iterator();
- }
-
- public CMNamedNodeMap getAttributes()
- {
- return _adapter.getAttributes();
- }
-
- public CMContent getContent()
- {
- return _adapter.getContent();
- }
-
- public int getContentType()
- {
- return _adapter.getContentType();
- }
-
- public CMDataType getDataType()
- {
- return _adapter.getDataType();
- }
-
- public String getElementName()
- {
- return getPrefixedName(_adapter.getElementName());
- }
-
- public CMNamedNodeMap getLocalElements()
- {
- return _adapter.getLocalElements();
- }
-
- public int getMaxOccur()
- {
- return _adapter.getMaxOccur();
- }
-
- public int getMinOccur()
- {
- return _adapter.getMinOccur();
- }
-
- public String getNodeName()
- {
- return getPrefixedName(_adapter.getNodeName());
- }
-
- private String getPrefixedName(final String name)
- {
- return _prefix + ":"+name; //$NON-NLS-1$
- }
-
- public int getNodeType()
- {
- return _adapter.getNodeType();
- }
-
- public Object getProperty(String propertyName)
- {
- return _adapter.getProperty(propertyName);
- }
-
- public boolean supports(String propertyName)
- {
- return _adapter.supports(propertyName);
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/cm/DocumentNamespaceCMAdapter.java b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/cm/DocumentNamespaceCMAdapter.java
deleted file mode 100644
index bae83f7..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/cm/DocumentNamespaceCMAdapter.java
+++ /dev/null
@@ -1,161 +0,0 @@
-package org.eclipse.jst.jsf.facelet.core.internal.cm;
-
-import java.util.Iterator;
-
-import org.eclipse.wst.xml.core.internal.contentmodel.CMDocument;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNamedNodeMap;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNamespace;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNode;
-
-/**
- * A namespace a specific to a document, where it's tag name prefix is known.
- *
- */
-class DocumentNamespaceCMAdapter implements CMNamedNodeMap, CMDocument
-{
- private final String _prefix;
- private final NamespaceCMAdapter _adapter;
-
- public DocumentNamespaceCMAdapter(final NamespaceCMAdapter adapter, final String prefix)
- {
- _prefix = prefix;
- _adapter = adapter;
- }
-
- public int getLength()
- {
- return _adapter.getLength();
- }
-
- public CMNode getNamedItem(String name)
- {
- CMNode node = _adapter.getNamedItem(name);
-
- if (node != null)
- {
- node = new DocumentElementCMAdapter((ElementCMAdapter) node,_prefix);
- }
- return node;
- }
-
- public CMNode item(int index)
- {
- CMNode item = _adapter.item(index);
-
- if (item != null)
- {
- item = new DocumentElementCMAdapter((ElementCMAdapter) item,_prefix);
- }
- return item;
- }
-
- public Iterator<?> iterator()
- {
- return new WrappingIterator(_adapter.iterator());
- }
-
- private class WrappingIterator implements Iterator<CMNode>
- {
- private Iterator<?> _it;
-
- public WrappingIterator(final Iterator<?> it)
- {
- _it = it;
- }
- public boolean hasNext()
- {
- return _it.hasNext();
- }
-
- public CMNode next()
- {
- CMNode node = (CMNode) _it.next();
- node = getNamedItem(node.getNodeName());
- return node;
- }
-
- public void remove()
- {
- throw new UnsupportedOperationException(""); //$NON-NLS-1$
- }
- }
-
- public CMNamedNodeMap getElements()
- {
- return this;
- }
-
- public CMNamedNodeMap getEntities()
- {
- //not changing entities
- return _adapter.getEntities();
- }
-
- public CMNamespace getNamespace()
- {
- return new CMNamespaceImpl(_adapter.getNamespace(), _prefix);
- }
-
- public String getNodeName()
- {
- // not changing node name
- return _adapter.getNodeName();
- }
-
- public int getNodeType()
- {
- return _adapter.getNodeType();
- }
-
- public Object getProperty(String propertyName)
- {
- return _adapter.getProperty(propertyName);
- }
-
- public boolean supports(String propertyName)
- {
- return _adapter.supports(propertyName);
- }
-
- private static class CMNamespaceImpl implements CMNamespace
- {
- private final CMNamespace _proxy;
- private final String _prefix;
-
- CMNamespaceImpl(CMNamespace proxy, final String prefix)
- {
- _proxy = proxy;
- _prefix = prefix;
- }
-
- public String getPrefix()
- {
- return _prefix;
- }
-
- public String getURI()
- {
- return _proxy.getURI();
- }
-
- public String getNodeName()
- {
- return _proxy.getNodeName();
- }
-
- public int getNodeType()
- {
- return _proxy.getNodeType();
- }
-
- public Object getProperty(String propertyName)
- {
- return _proxy.getProperty(propertyName);
- }
-
- public boolean supports(String propertyName)
- {
- return _proxy.supports(propertyName);
- }
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/cm/ElementCMAdapter.java b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/cm/ElementCMAdapter.java
deleted file mode 100644
index b38e431..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/cm/ElementCMAdapter.java
+++ /dev/null
@@ -1,147 +0,0 @@
-/**
- *
- */
-package org.eclipse.jst.jsf.facelet.core.internal.cm;
-
-import java.util.Iterator;
-
-import org.eclipse.jst.jsf.common.runtime.internal.view.model.common.ITagElement;
-import org.eclipse.jst.jsp.core.internal.contentmodel.tld.CMDataTypeImpl;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMContent;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMDataType;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNamedNodeMap;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNode;
-
-class ElementCMAdapter implements CMElementDeclaration, CMNamedNodeMap
-{
- private final ITagElement _tagElement;
- private final TagInfo _tLDTagInfo;
-
- ElementCMAdapter(final ITagElement tagElement, final TagInfo tldTagInfo)
- {
- _tagElement = tagElement;
- _tLDTagInfo = tldTagInfo;
- }
-
- public CMNamedNodeMap getAttributes()
- {
- return this;
- }
-
- public CMContent getContent()
- {
- return null;
- }
-
- public int getContentType()
- {
- return ELEMENT;
- }
-
- public CMDataType getDataType()
- {
- return new CMDataTypeImpl(CMDataType.CDATA);
- }
-
- public String getElementName()
- {
- return _tagElement.getName();
- }
-
- public CMNamedNodeMap getLocalElements()
- {
- // TODO Auto-generated method stub
- return null;
- }
-
- public int getMaxOccur()
- {
- // unbounded
- return -1;
- }
-
- public int getMinOccur()
- {
- // optional
- return 0;
- }
-
- public String getNodeName()
- {
- return _tagElement.getName();
- }
-
- public int getNodeType()
- {
- return CMNode.ELEMENT_DECLARATION;
- }
-
- public Object getProperty(final String propertyName)
- {
- return _tLDTagInfo.getTagProperty(_tagElement.getName(), propertyName);
- }
-
- public boolean supports(final String propertyName)
- {
- return false;
- }
-
- @Override
- public boolean equals(final Object obj)
- {
- if (obj instanceof ElementCMAdapter)
- {
- return ((ElementCMAdapter) obj)._tagElement.equals(_tagElement);
- }
-
- return false;
- }
-
- @Override
- public int hashCode()
- {
- return _tagElement.hashCode();
- }
-
- public int getLength()
- {
- final CMNamedNodeMap map = _tLDTagInfo.getAttributes(_tagElement.getName());
-
- if (map != null)
- {
- return map.getLength();
- }
-
- return 0;
- }
-
- public CMNode getNamedItem(final String name)
- {
- final CMNamedNodeMap map = _tLDTagInfo.getAttributes(_tagElement.getName());
-
- if (map != null)
- {
- return map.getNamedItem(name);
- }
- return null;
- }
-
- public CMNode item(final int index)
- {
- final CMNamedNodeMap map = _tLDTagInfo.getAttributes(_tagElement.getName());
-
- if (map != null)
- {
- return map.item(index);
- }
- return null;
- }
-
- public Iterator<?> iterator()
- {
- final CMNamedNodeMap map = _tLDTagInfo.getAttributes(_tagElement.getName());
- return map.iterator();
- }
-
-}
\ No newline at end of file
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/cm/ExternalTagInfo.java b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/cm/ExternalTagInfo.java
deleted file mode 100644
index f17eed3..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/cm/ExternalTagInfo.java
+++ /dev/null
@@ -1,96 +0,0 @@
-package org.eclipse.jst.jsf.facelet.core.internal.cm;
-
-import java.util.Iterator;
-import java.util.NoSuchElementException;
-
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNamedNodeMap;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNode;
-
-/**
- * Represents information about Facelets brought from external sources such as
- * the JSP tag library.
- *
- * @author cbateman
- *
- */
-public abstract class ExternalTagInfo extends TagInfo
-{
- /**
- * Single instance of the null external tag info
- */
- public static TagInfo NULL_INSTANCE = new NullExternalTagInfo();
-
- @Override
- public abstract CMNamedNodeMap getAttributes(final String tagName);
-
- @Override
- public abstract Object getTagProperty(final String tagName, final String key);
-
- /**
- * @author cbateman
- *
- */
- public static class NullExternalTagInfo extends ExternalTagInfo
- {
- private NullExternalTagInfo()
- {
- // no external instantitation
- }
-
- @Override
- public CMNamedNodeMap getAttributes(final String tagName)
- {
- return new NullCMNamedNodeMap();
- }
-
- @Override
- public Object getTagProperty(final String tagName, final String key)
- {
- // no data so always null
- return null;
- }
-
- private static class NullCMNamedNodeMap implements CMNamedNodeMap
- {
- public int getLength()
- {
- return 0;
- }
-
- public CMNode getNamedItem(final String name)
- {
- return null;
- }
-
- public CMNode item(final int index)
- {
- return null;
- }
-
- public Iterator iterator()
- {
- return new NullIterator();
- }
- }
-
- private static class NullIterator implements Iterator
- {
- public boolean hasNext()
- {
- return false;
- }
-
- public Object next()
- {
- throw new NoSuchElementException();
- }
-
- public void remove()
- {
- throw new UnsupportedOperationException(
- "can not remove regions via iterator"); //$NON-NLS-1$
- }
- }
- }
-
-}
\ No newline at end of file
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/cm/FaceletDocumentFactory.java b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/cm/FaceletDocumentFactory.java
deleted file mode 100644
index 0c806f8..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/cm/FaceletDocumentFactory.java
+++ /dev/null
@@ -1,177 +0,0 @@
-package org.eclipse.jst.jsf.facelet.core.internal.cm;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jst.jsf.common.runtime.internal.view.model.common.Namespace;
-import org.eclipse.jst.jsf.core.JSFVersion;
-import org.eclipse.jst.jsf.designtime.internal.view.model.ITagRegistry;
-import org.eclipse.jst.jsf.designtime.internal.view.model.TagRegistryFactory.TagRegistryFactoryException;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.FaceletRegistryManager.MyRegistryFactory;
-import org.eclipse.jst.jsf.facelet.core.internal.util.ViewUtil;
-import org.eclipse.jst.jsf.facelet.core.internal.util.ViewUtil.PrefixEntry;
-import org.eclipse.jst.jsp.core.internal.contentmodel.tld.CMDocumentFactoryTLD;
-import org.eclipse.jst.jsp.core.internal.contentmodel.tld.provisional.TLDDocument;
-import org.eclipse.jst.jsp.core.taglib.ITaglibRecord;
-import org.eclipse.jst.jsp.core.taglib.TaglibIndex;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMDocument;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration;
-import org.w3c.dom.Element;
-
-/**
- * Creates CMDocument framework adaptation for Facelet features.
- *
- * NOTE: this class currently caches state and is NOT THREADSAFE. Share
- * instances of this class between unowned classes at your own risk.
- *
- * @author cbateman
- *
- */
-public class FaceletDocumentFactory
-{
- private final IProject _project;
- private final Map<String, NamespaceCMAdapter> _cmDocuments;
- private final Map<String, TagInfo> _externalTagInfo;
-
- /**
- * @param project
- */
- public FaceletDocumentFactory(final IProject project)
- {
- _project = project;
- _cmDocuments = new HashMap<String, NamespaceCMAdapter>(8);
- _externalTagInfo = new HashMap<String, TagInfo>(8);
- }
-
- /**
- * @param uri
- * @param prefix
- * @return the CMDocument for the uri where prefix is used as its namespace
- * short-form (usually in the context of an XML document instance).
- */
- public CMDocument createCMDocumentForContext(final String uri,
- final String prefix)
- {
- final NamespaceCMAdapter cmDoc = getOrCreateCMDocument(_project, uri);
-
- if (cmDoc != null)
- {
- return new DocumentNamespaceCMAdapter(cmDoc, prefix);
- }
- return null;
- }
-
- /**
- * @param element
- * @return the CM model data for element or null if none.
- */
- public CMElementDeclaration createCMElementDeclaration(final Element element)
- {
- final String prefix = element.getPrefix();
- final Map<String, PrefixEntry> namespaces = ViewUtil
- .getDocumentNamespaces(element.getOwnerDocument());
- final PrefixEntry prefixEntry = namespaces.get(prefix);
-
- if (prefixEntry != null)
- {
- final CMDocument cmDoc = createCMDocumentForContext(prefixEntry
- .getUri(), prefixEntry.getPrefix());
-
- if (cmDoc != null)
- {
- return (CMElementDeclaration) cmDoc.getElements().getNamedItem(
- element.getLocalName());
- }
- }
-
- return null;
- }
-
- /**
- * @param ns
- * @return the externa tag info the namespace. May return a previously
- * cached value. If there is no cached value, then creates it.
- */
- public TagInfo getOrCreateExtraTagInfo(final String ns)
- {
- TagInfo tagInfo = _externalTagInfo.get(ns);
-
- if (tagInfo == null)
- {
- tagInfo = createExternalTagInfo(ns);
- _externalTagInfo.put(ns, tagInfo);
- }
- return tagInfo;
- }
-
- /**
- * @return a new external tag info for this namespace
- */
- private TagInfo createExternalTagInfo(final String uri)
- {
- final JSFVersion jsfVersion = JSFVersion.valueOfProject(_project);
- TagInfo tldTagInfo = null;
- if (jsfVersion != null)
- {
- if (jsfVersion.compareTo(JSFVersion.V2_0) >= 0)
- {
- tldTagInfo = new FaceletTagInfo(_project, uri);
- } else
- {
- final ITaglibRecord[] tldrecs = TaglibIndex
- .getAvailableTaglibRecords(_project.getFullPath());
- FIND_TLDRECORD: for (final ITaglibRecord rec : tldrecs)
- {
- final String matchUri = rec.getDescriptor().getURI();
- if (uri.equals(matchUri))
- {
- final CMDocumentFactoryTLD factory = new CMDocumentFactoryTLD();
- tldTagInfo = new MetadataTagInfo(_project,
- (TLDDocument) factory.createCMDocument(rec));
- break FIND_TLDRECORD;
- }
- }
-
- if (tldTagInfo == null)
- {
- tldTagInfo = new MetadataTagInfo(_project, uri);
- }
- }
- }
- return tldTagInfo;
- }
-
- private NamespaceCMAdapter getOrCreateCMDocument(final IProject project,
- final String uri)
- {
- NamespaceCMAdapter adapter = _cmDocuments.get(uri);
-
- if (adapter == null)
- {
- final MyRegistryFactory factory = new MyRegistryFactory();
-
- ITagRegistry registry;
- try
- {
- registry = factory.createTagRegistry(project);
- if (registry != null)
- {
- final Namespace ns = registry.getTagLibrary(uri);
-
- if (ns != null)
- {
- adapter = new NamespaceCMAdapter(ns, project);
- _cmDocuments.put(uri, adapter);
- }
- }
- }
- catch (final TagRegistryFactoryException e)
- {
- // fall-through
- }
- }
- return adapter;
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/cm/FaceletTagInfo.java b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/cm/FaceletTagInfo.java
deleted file mode 100644
index a9ab0fa..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/cm/FaceletTagInfo.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package org.eclipse.jst.jsf.facelet.core.internal.cm;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jst.jsf.facelet.core.internal.cm.strategy.FaceletExternalMetadataStrategy;
-import org.eclipse.jst.jsf.facelet.core.internal.cm.strategy.IExternalMetadataStrategy;
-import org.eclipse.jst.jsf.facelet.core.internal.cm.strategy.MDExternalMetadataStrategy;
-import org.eclipse.jst.jsf.facelet.core.internal.cm.strategy.TagInfoStrategyComposite;
-
-/*package*/class FaceletTagInfo extends CompositeTagInfo
-{
- public FaceletTagInfo(final IProject project, final String uri)
- {
- super(uri, createStrategy(project));
- }
-
- private static TagInfoStrategyComposite createStrategy(
- final IProject project)
- {
- final IExternalMetadataStrategy mdStrategy = MDExternalMetadataStrategy
- .create(project);
- final IExternalMetadataStrategy faceletStrategy = new FaceletExternalMetadataStrategy(
- project);
- final List<String> ids = new ArrayList<String>();
- ids.add(FaceletExternalMetadataStrategy.STRATEGY_ID);
- ids.add(MDExternalMetadataStrategy.STRATEGY_ID);
-
- final TagInfoStrategyComposite strategyComposite = new TagInfoStrategyComposite(
- ids);
- strategyComposite.addStrategy(faceletStrategy);
- strategyComposite.addStrategy(mdStrategy);
- return strategyComposite;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/cm/MetadataTagInfo.java b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/cm/MetadataTagInfo.java
deleted file mode 100644
index f8b6703..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/cm/MetadataTagInfo.java
+++ /dev/null
@@ -1,56 +0,0 @@
-package org.eclipse.jst.jsf.facelet.core.internal.cm;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jst.jsf.facelet.core.internal.cm.strategy.IExternalMetadataStrategy;
-import org.eclipse.jst.jsf.facelet.core.internal.cm.strategy.JSPExternalMetadataStrategy;
-import org.eclipse.jst.jsf.facelet.core.internal.cm.strategy.MDExternalMetadataStrategy;
-import org.eclipse.jst.jsf.facelet.core.internal.cm.strategy.TagInfoStrategyComposite;
-import org.eclipse.jst.jsp.core.internal.contentmodel.tld.provisional.TLDDocument;
-
-/**
- * An external tag info that checks first the meta-data repository and second in
- * the provided TLDDocument for data.
- *
- * @author cbateman
- *
- */
-/* package */class MetadataTagInfo extends CompositeTagInfo
-{
- private MetadataTagInfo(final IProject project, final TLDDocument doc,
- final String uri)
- {
- super(uri, createStrategy(project,doc));
- }
-
- public MetadataTagInfo(final IProject project, final String uri)
- {
- this(project, null, uri);
- }
-
- /**
- * @param project
- * @param doc
- */
- public MetadataTagInfo(final IProject project, final TLDDocument doc)
- {
- this(project, doc, doc.getUri());
- }
-
- private static TagInfoStrategyComposite createStrategy(final IProject project, final TLDDocument doc)
- {
- IExternalMetadataStrategy mdStrategy = MDExternalMetadataStrategy.create(project);
- JSPExternalMetadataStrategy jspStrategy = new JSPExternalMetadataStrategy(doc);
-
- final List<String> ids = new ArrayList<String>();
- ids.add(MDExternalMetadataStrategy.STRATEGY_ID);
- ids.add(JSPExternalMetadataStrategy.STRATEGY_ID);
-
- TagInfoStrategyComposite strategyComposite = new TagInfoStrategyComposite(ids);
- strategyComposite.addStrategy(mdStrategy);
- strategyComposite.addStrategy(jspStrategy);
- return strategyComposite;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/cm/NamespaceCMAdapter.java b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/cm/NamespaceCMAdapter.java
deleted file mode 100644
index 0732f19..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/cm/NamespaceCMAdapter.java
+++ /dev/null
@@ -1,232 +0,0 @@
-package org.eclipse.jst.jsf.facelet.core.internal.cm;
-
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.concurrent.atomic.AtomicBoolean;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jst.jsf.common.internal.managedobject.IManagedObject;
-import org.eclipse.jst.jsf.common.runtime.internal.view.model.common.ITagElement;
-import org.eclipse.jst.jsf.common.runtime.internal.view.model.common.Namespace;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMDocument;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNamedNodeMap;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNamespace;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNode;
-
-/*package*/class NamespaceCMAdapter implements CMNamedNodeMap, CMDocument, IManagedObject
-{
- private final Namespace _ns;
- private final Map<String, ElementCMAdapter> _elements;
- private final FaceletDocumentFactory _factory;
- private final AtomicBoolean _isDisposed = new AtomicBoolean(false);
-
- public NamespaceCMAdapter(final Namespace ns, final IProject project)
- {
- _ns = ns;
- _elements = new HashMap<String, ElementCMAdapter>();
- _factory = new FaceletDocumentFactory(project);
- }
-
- public int getLength()
- {
- if (_ns.hasViewElements())
- {
- return _ns.getViewElements().size();
- }
- return 0;
- }
-
- public CMNode getNamedItem(final String name)
- {
- String localname = name;
-
- if (name != null && name.indexOf(':') > -1)
- {
- String[] splitName = name.split(":"); //$NON-NLS-1$
-
- if (splitName.length == 2)
- {
- localname = splitName[1];
- }
- }
- ElementCMAdapter element = _elements.get(localname);
-
- if (element == null)
- {
- final ITagElement tagElement = _ns.getViewElement(localname);
- if (tagElement != null)
- {
- TagInfo tagInfo = _factory.getOrCreateExtraTagInfo(_ns.getNSUri());
- element = new ElementCMAdapter(tagElement, tagInfo);
- _elements.put(localname, element);
- }
- }
- return element;
- }
-
- // TODO: optimize
- public CMNode item(int index)
- {
- if (_ns.hasViewElements() && index >= 0
- && index < _ns.getViewElements().size())
- {
- final Iterator<?> it = iterator();
- for (int i = 0; it.hasNext(); i++)
- {
- final ITagElement tagElement = (ITagElement) it.next();
- if (i == index)
- {
- ElementCMAdapter element = _elements.get(tagElement.getName());
-
- if (element == null)
- {
- element = new ElementCMAdapter(tagElement, _factory.getOrCreateExtraTagInfo(_ns.getNSUri()));
- _elements.put(tagElement.getName(), element);
- return element;
- }
- }
- }
- }
- return null;
- }
-
- public Iterator<?> iterator()
- {
- return new WrappingIterator(_ns.getViewElements());
- }
-
- private class WrappingIterator implements Iterator<CMNode>
- {
- @SuppressWarnings("unchecked")
- final Iterator _viewElementIterator;
- @SuppressWarnings("unchecked")
- public WrappingIterator(final Collection viewElements)
- {
- _viewElementIterator = viewElements.iterator();
- }
-
- public boolean hasNext()
- {
- return _viewElementIterator.hasNext();
- }
-
- public CMNode next()
- {
- ITagElement nextElement = (ITagElement) _viewElementIterator.next();
- CMNode node = getNamedItem(nextElement.getName());
- return node;
- }
-
- public void remove()
- {
- throw new UnsupportedOperationException(""); //$NON-NLS-1$
- }
-
- }
- public CMNamedNodeMap getElements()
- {
- return this;
- }
-
- public CMNamedNodeMap getEntities()
- {
- // no entities
- return null;
- }
-
- public CMNamespace getNamespace()
- {
- return new CMNamespaceImpl(_ns.getNSUri());
- }
-
- public String getNodeName()
- {
- return getNamespace().getURI();
- }
-
- public int getNodeType()
- {
- return CMNode.DOCUMENT;
- }
-
- public Object getProperty(String propertyName)
- {
- // none supported for now
- return null;
- }
-
- public boolean supports(String propertyName)
- {
- // support none for now
- return false;
- }
-
- private static class CMNamespaceImpl implements CMNamespace
- {
- private final String _uri;
-
- CMNamespaceImpl(final String uri)
- {
- _uri = uri;
- }
-
- public String getPrefix()
- {
- return null;
- }
-
- public String getURI()
- {
- return _uri;
- }
-
- public String getNodeName()
- {
- return getURI();
- }
-
- public int getNodeType()
- {
- return CMNode.NAME_SPACE;
- }
-
- public Object getProperty(String propertyName)
- {
- // TODO Auto-generated method stub
- return null;
- }
-
- public boolean supports(String propertyName)
- {
- // TODO Auto-generated method stub
- return false;
- }
- }
- public void dispose()
- {
- if (_isDisposed.compareAndSet(false, true))
- {
- _elements.clear();
- }
- }
-
- public void checkpoint()
- {
- // TODO: ??
-
- }
-
- public void destroy()
- {
- // TODO: ??
-
- }
-
- public boolean isDisposed()
- {
- return _isDisposed.get();
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/cm/TagInfo.java b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/cm/TagInfo.java
deleted file mode 100644
index dd801ee..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/cm/TagInfo.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package org.eclipse.jst.jsf.facelet.core.internal.cm;
-
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNamedNodeMap;
-
-/**
- * Generic adapter needed to provide CM required metadata for a CMNode from
- * different sources.
- *
- * @author cbateman
- *
- */
-public abstract class TagInfo
-{
- /**
- * @param tagName
- * @param key
- * @return the tag property in the CM model for tagName at key or null if
- * not found.
- */
- public abstract Object getTagProperty(final String tagName, final String key);
-
- /**
- * @param tagName
- * @return the node map of attributes for the tag called tagName
- */
- public abstract CMNamedNodeMap getAttributes(final String tagName);
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/cm/addtagmd/AddTagMDFactory.java b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/cm/addtagmd/AddTagMDFactory.java
deleted file mode 100644
index aac6e12..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/cm/addtagmd/AddTagMDFactory.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: AddTagMDFactory.java,v 1.1 2010/03/08 18:49:41 cbateman Exp $
- */
-package org.eclipse.jst.jsf.facelet.core.internal.cm.addtagmd;
-
-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.jst.jsf.facelet.core.internal.cm.addtagmd.AddTagMDPackage
- * @generated
- */
-public interface AddTagMDFactory extends EFactory
-{
- /**
- * The singleton instance of the factory.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- AddTagMDFactory eINSTANCE = org.eclipse.jst.jsf.facelet.core.internal.cm.addtagmd.impl.AddTagMDFactoryImpl.init();
-
- /**
- * Returns a new object of class '<em>Element Data</em>'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return a new object of class '<em>Element Data</em>'.
- * @generated
- */
- ElementData createElementData();
-
- /**
- * Returns a new object of class '<em>Attribute Data</em>'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return a new object of class '<em>Attribute Data</em>'.
- * @generated
- */
- AttributeData createAttributeData();
-
- /**
- * Returns the package supported by this factory.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the package supported by this factory.
- * @generated
- */
- AddTagMDPackage getAddTagMDPackage();
-
-} //AddTagMDFactory
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/cm/addtagmd/AddTagMDPackage.java b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/cm/addtagmd/AddTagMDPackage.java
deleted file mode 100644
index deaa284..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/cm/addtagmd/AddTagMDPackage.java
+++ /dev/null
@@ -1,339 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: AddTagMDPackage.java,v 1.1 2010/03/08 18:49:41 cbateman Exp $
- */
-package org.eclipse.jst.jsf.facelet.core.internal.cm.addtagmd;
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EEnum;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EReference;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Package</b> for the model.
- * It contains accessors for the meta objects to represent
- * <ul>
- * <li>each class,</li>
- * <li>each feature of each class,</li>
- * <li>each enum,</li>
- * <li>and each data type</li>
- * </ul>
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.jsf.facelet.core.internal.cm.addtagmd.AddTagMDFactory
- * @model kind="package"
- * @generated
- */
-public interface AddTagMDPackage extends EPackage
-{
- /**
- * The package name.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- String eNAME = "addtagmd"; //$NON-NLS-1$
-
- /**
- * The package namespace URI.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- String eNS_URI = "http://org.eclipse.jst.jsf.facelet.core/additionalTagMetadata.ecore"; //$NON-NLS-1$
-
- /**
- * The package namespace name.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- String eNS_PREFIX = "addTagMD"; //$NON-NLS-1$
-
- /**
- * The singleton instance of the package.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- AddTagMDPackage eINSTANCE = org.eclipse.jst.jsf.facelet.core.internal.cm.addtagmd.impl.AddTagMDPackageImpl.init();
-
- /**
- * The meta object id for the '{@link org.eclipse.jst.jsf.facelet.core.internal.cm.addtagmd.impl.ElementDataImpl <em>Element Data</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.jsf.facelet.core.internal.cm.addtagmd.impl.ElementDataImpl
- * @see org.eclipse.jst.jsf.facelet.core.internal.cm.addtagmd.impl.AddTagMDPackageImpl#getElementData()
- * @generated
- */
- int ELEMENT_DATA = 0;
-
- /**
- * The feature id for the '<em><b>Name</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int ELEMENT_DATA__NAME = 0;
-
- /**
- * The feature id for the '<em><b>Attributes</b></em>' containment reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int ELEMENT_DATA__ATTRIBUTES = 1;
-
- /**
- * The number of structural features of the '<em>Element Data</em>' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int ELEMENT_DATA_FEATURE_COUNT = 2;
-
- /**
- * The meta object id for the '{@link org.eclipse.jst.jsf.facelet.core.internal.cm.addtagmd.impl.AttributeDataImpl <em>Attribute Data</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.jsf.facelet.core.internal.cm.addtagmd.impl.AttributeDataImpl
- * @see org.eclipse.jst.jsf.facelet.core.internal.cm.addtagmd.impl.AddTagMDPackageImpl#getAttributeData()
- * @generated
- */
- int ATTRIBUTE_DATA = 1;
-
- /**
- * The feature id for the '<em><b>Name</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int ATTRIBUTE_DATA__NAME = 0;
-
- /**
- * The feature id for the '<em><b>Usage</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int ATTRIBUTE_DATA__USAGE = 1;
-
- /**
- * The feature id for the '<em><b>Description</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int ATTRIBUTE_DATA__DESCRIPTION = 2;
-
- /**
- * The number of structural features of the '<em>Attribute Data</em>' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int ATTRIBUTE_DATA_FEATURE_COUNT = 3;
-
- /**
- * The meta object id for the '{@link org.eclipse.jst.jsf.facelet.core.internal.cm.addtagmd.AttributeUsage <em>Attribute Usage</em>}' enum.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.jsf.facelet.core.internal.cm.addtagmd.AttributeUsage
- * @see org.eclipse.jst.jsf.facelet.core.internal.cm.addtagmd.impl.AddTagMDPackageImpl#getAttributeUsage()
- * @generated
- */
- int ATTRIBUTE_USAGE = 2;
-
-
- /**
- * Returns the meta object for class '{@link org.eclipse.jst.jsf.facelet.core.internal.cm.addtagmd.ElementData <em>Element Data</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for class '<em>Element Data</em>'.
- * @see org.eclipse.jst.jsf.facelet.core.internal.cm.addtagmd.ElementData
- * @generated
- */
- EClass getElementData();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jst.jsf.facelet.core.internal.cm.addtagmd.ElementData#getName <em>Name</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Name</em>'.
- * @see org.eclipse.jst.jsf.facelet.core.internal.cm.addtagmd.ElementData#getName()
- * @see #getElementData()
- * @generated
- */
- EAttribute getElementData_Name();
-
- /**
- * Returns the meta object for the containment reference list '{@link org.eclipse.jst.jsf.facelet.core.internal.cm.addtagmd.ElementData#getAttributes <em>Attributes</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the containment reference list '<em>Attributes</em>'.
- * @see org.eclipse.jst.jsf.facelet.core.internal.cm.addtagmd.ElementData#getAttributes()
- * @see #getElementData()
- * @generated
- */
- EReference getElementData_Attributes();
-
- /**
- * Returns the meta object for class '{@link org.eclipse.jst.jsf.facelet.core.internal.cm.addtagmd.AttributeData <em>Attribute Data</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for class '<em>Attribute Data</em>'.
- * @see org.eclipse.jst.jsf.facelet.core.internal.cm.addtagmd.AttributeData
- * @generated
- */
- EClass getAttributeData();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jst.jsf.facelet.core.internal.cm.addtagmd.AttributeData#getName <em>Name</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Name</em>'.
- * @see org.eclipse.jst.jsf.facelet.core.internal.cm.addtagmd.AttributeData#getName()
- * @see #getAttributeData()
- * @generated
- */
- EAttribute getAttributeData_Name();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jst.jsf.facelet.core.internal.cm.addtagmd.AttributeData#getUsage <em>Usage</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Usage</em>'.
- * @see org.eclipse.jst.jsf.facelet.core.internal.cm.addtagmd.AttributeData#getUsage()
- * @see #getAttributeData()
- * @generated
- */
- EAttribute getAttributeData_Usage();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jst.jsf.facelet.core.internal.cm.addtagmd.AttributeData#getDescription <em>Description</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Description</em>'.
- * @see org.eclipse.jst.jsf.facelet.core.internal.cm.addtagmd.AttributeData#getDescription()
- * @see #getAttributeData()
- * @generated
- */
- EAttribute getAttributeData_Description();
-
- /**
- * Returns the meta object for enum '{@link org.eclipse.jst.jsf.facelet.core.internal.cm.addtagmd.AttributeUsage <em>Attribute Usage</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for enum '<em>Attribute Usage</em>'.
- * @see org.eclipse.jst.jsf.facelet.core.internal.cm.addtagmd.AttributeUsage
- * @generated
- */
- EEnum getAttributeUsage();
-
- /**
- * 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
- */
- AddTagMDFactory getAddTagMDFactory();
-
- /**
- * <!-- 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
- */
- @SuppressWarnings("hiding")
- interface Literals
- {
- /**
- * The meta object literal for the '{@link org.eclipse.jst.jsf.facelet.core.internal.cm.addtagmd.impl.ElementDataImpl <em>Element Data</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.jsf.facelet.core.internal.cm.addtagmd.impl.ElementDataImpl
- * @see org.eclipse.jst.jsf.facelet.core.internal.cm.addtagmd.impl.AddTagMDPackageImpl#getElementData()
- * @generated
- */
- EClass ELEMENT_DATA = eINSTANCE.getElementData();
-
- /**
- * The meta object literal for the '<em><b>Name</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EAttribute ELEMENT_DATA__NAME = eINSTANCE.getElementData_Name();
-
- /**
- * The meta object literal for the '<em><b>Attributes</b></em>' containment reference list feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EReference ELEMENT_DATA__ATTRIBUTES = eINSTANCE.getElementData_Attributes();
-
- /**
- * The meta object literal for the '{@link org.eclipse.jst.jsf.facelet.core.internal.cm.addtagmd.impl.AttributeDataImpl <em>Attribute Data</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.jsf.facelet.core.internal.cm.addtagmd.impl.AttributeDataImpl
- * @see org.eclipse.jst.jsf.facelet.core.internal.cm.addtagmd.impl.AddTagMDPackageImpl#getAttributeData()
- * @generated
- */
- EClass ATTRIBUTE_DATA = eINSTANCE.getAttributeData();
-
- /**
- * The meta object literal for the '<em><b>Name</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EAttribute ATTRIBUTE_DATA__NAME = eINSTANCE.getAttributeData_Name();
-
- /**
- * The meta object literal for the '<em><b>Usage</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EAttribute ATTRIBUTE_DATA__USAGE = eINSTANCE.getAttributeData_Usage();
-
- /**
- * The meta object literal for the '<em><b>Description</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EAttribute ATTRIBUTE_DATA__DESCRIPTION = eINSTANCE.getAttributeData_Description();
-
- /**
- * The meta object literal for the '{@link org.eclipse.jst.jsf.facelet.core.internal.cm.addtagmd.AttributeUsage <em>Attribute Usage</em>}' enum.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.jsf.facelet.core.internal.cm.addtagmd.AttributeUsage
- * @see org.eclipse.jst.jsf.facelet.core.internal.cm.addtagmd.impl.AddTagMDPackageImpl#getAttributeUsage()
- * @generated
- */
- EEnum ATTRIBUTE_USAGE = eINSTANCE.getAttributeUsage();
-
- }
-
-} //AddTagMDPackage
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/cm/addtagmd/AttributeData.java b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/cm/addtagmd/AttributeData.java
deleted file mode 100644
index 1ffa635..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/cm/addtagmd/AttributeData.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: AttributeData.java,v 1.1 2010/03/08 18:49:41 cbateman Exp $
- */
-package org.eclipse.jst.jsf.facelet.core.internal.cm.addtagmd;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Attribute Data</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- * <li>{@link org.eclipse.jst.jsf.facelet.core.internal.cm.addtagmd.AttributeData#getName <em>Name</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.facelet.core.internal.cm.addtagmd.AttributeData#getUsage <em>Usage</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.facelet.core.internal.cm.addtagmd.AttributeData#getDescription <em>Description</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.jsf.facelet.core.internal.cm.addtagmd.AddTagMDPackage#getAttributeData()
- * @model
- * @generated
- */
-public interface AttributeData extends EObject
-{
- /**
- * Returns the value of the '<em><b>Name</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Name</em>' attribute isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @return the value of the '<em>Name</em>' attribute.
- * @see #setName(String)
- * @see org.eclipse.jst.jsf.facelet.core.internal.cm.addtagmd.AddTagMDPackage#getAttributeData_Name()
- * @model extendedMetaData="kind='element' name='name'"
- * @generated
- */
- String getName();
-
- /**
- * Sets the value of the '{@link org.eclipse.jst.jsf.facelet.core.internal.cm.addtagmd.AttributeData#getName <em>Name</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Name</em>' attribute.
- * @see #getName()
- * @generated
- */
- void setName(String value);
-
- /**
- * Returns the value of the '<em><b>Usage</b></em>' attribute.
- * The literals are from the enumeration {@link org.eclipse.jst.jsf.facelet.core.internal.cm.addtagmd.AttributeUsage}.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Usage</em>' attribute isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @return the value of the '<em>Usage</em>' attribute.
- * @see org.eclipse.jst.jsf.facelet.core.internal.cm.addtagmd.AttributeUsage
- * @see #setUsage(AttributeUsage)
- * @see org.eclipse.jst.jsf.facelet.core.internal.cm.addtagmd.AddTagMDPackage#getAttributeData_Usage()
- * @model extendedMetaData="kind='element' name='usage'"
- * @generated
- */
- AttributeUsage getUsage();
-
- /**
- * Sets the value of the '{@link org.eclipse.jst.jsf.facelet.core.internal.cm.addtagmd.AttributeData#getUsage <em>Usage</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Usage</em>' attribute.
- * @see org.eclipse.jst.jsf.facelet.core.internal.cm.addtagmd.AttributeUsage
- * @see #getUsage()
- * @generated
- */
- void setUsage(AttributeUsage value);
-
- /**
- * Returns the value of the '<em><b>Description</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Description</em>' attribute isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @return the value of the '<em>Description</em>' attribute.
- * @see #setDescription(String)
- * @see org.eclipse.jst.jsf.facelet.core.internal.cm.addtagmd.AddTagMDPackage#getAttributeData_Description()
- * @model extendedMetaData="kind='element' name='description'"
- * @generated
- */
- String getDescription();
-
- /**
- * Sets the value of the '{@link org.eclipse.jst.jsf.facelet.core.internal.cm.addtagmd.AttributeData#getDescription <em>Description</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Description</em>' attribute.
- * @see #getDescription()
- * @generated
- */
- void setDescription(String value);
-
-} // AttributeData
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/cm/addtagmd/AttributeUsage.java b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/cm/addtagmd/AttributeUsage.java
deleted file mode 100644
index f8bee81..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/cm/addtagmd/AttributeUsage.java
+++ /dev/null
@@ -1,287 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: AttributeUsage.java,v 1.1 2010/03/08 18:49:41 cbateman Exp $
- */
-package org.eclipse.jst.jsf.facelet.core.internal.cm.addtagmd;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.emf.common.util.Enumerator;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the literals of the enumeration '<em><b>Attribute Usage</b></em>',
- * and utility methods for working with them.
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.jsf.facelet.core.internal.cm.addtagmd.AddTagMDPackage#getAttributeUsage()
- * @model
- * @generated
- */
-public enum AttributeUsage implements Enumerator
-{
- /**
- * The '<em><b>OPTIONAL</b></em>' literal object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #OPTIONAL_VALUE
- * @generated
- * @ordered
- */
- OPTIONAL(0, "OPTIONAL", "OPTIONAL"), //$NON-NLS-1$ //$NON-NLS-2$
-
- /**
- * The '<em><b>REQUIRED</b></em>' literal object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #REQUIRED_VALUE
- * @generated
- * @ordered
- */
- REQUIRED(1, "REQUIRED", "REQUIRED"), //$NON-NLS-1$ //$NON-NLS-2$
-
- /**
- * The '<em><b>FIXED</b></em>' literal object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #FIXED_VALUE
- * @generated
- * @ordered
- */
- FIXED(2, "FIXED", "FIXED"), //$NON-NLS-1$ //$NON-NLS-2$
-
- /**
- * The '<em><b>PROHIBITED</b></em>' literal object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #PROHIBITED_VALUE
- * @generated
- * @ordered
- */
- PROHIBITED(3, "PROHIBITED", "PROHIBITED"); //$NON-NLS-1$ //$NON-NLS-2$
-
- /**
- * The '<em><b>OPTIONAL</b></em>' literal value.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of '<em><b>OPTIONAL</b></em>' literal object isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @see #OPTIONAL
- * @model
- * @generated
- * @ordered
- */
- public static final int OPTIONAL_VALUE = 0;
-
- /**
- * The '<em><b>REQUIRED</b></em>' literal value.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of '<em><b>REQUIRED</b></em>' literal object isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @see #REQUIRED
- * @model
- * @generated
- * @ordered
- */
- public static final int REQUIRED_VALUE = 1;
-
- /**
- * The '<em><b>FIXED</b></em>' literal value.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of '<em><b>FIXED</b></em>' literal object isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @see #FIXED
- * @model
- * @generated
- * @ordered
- */
- public static final int FIXED_VALUE = 2;
-
- /**
- * The '<em><b>PROHIBITED</b></em>' literal value.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of '<em><b>PROHIBITED</b></em>' literal object isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @see #PROHIBITED
- * @model
- * @generated
- * @ordered
- */
- public static final int PROHIBITED_VALUE = 3;
-
- /**
- * An array of all the '<em><b>Attribute Usage</b></em>' enumerators.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private static final AttributeUsage[] VALUES_ARRAY =
- new AttributeUsage[]
- {
- OPTIONAL,
- REQUIRED,
- FIXED,
- PROHIBITED,
- };
-
- /**
- * A public read-only list of all the '<em><b>Attribute Usage</b></em>' enumerators.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public static final List<AttributeUsage> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
-
- /**
- * Returns the '<em><b>Attribute Usage</b></em>' literal with the specified literal value.
- * <!-- begin-user-doc -->
- * @param literal
- * @return the attribute usage
- * <!-- end-user-doc -->
- * @generated
- */
- public static AttributeUsage get(String literal)
- {
- for (int i = 0; i < VALUES_ARRAY.length; ++i)
- {
- AttributeUsage result = VALUES_ARRAY[i];
- if (result.toString().equals(literal))
- {
- return result;
- }
- }
- return null;
- }
-
- /**
- * Returns the '<em><b>Attribute Usage</b></em>' literal with the specified name.
- * <!-- begin-user-doc -->
- * @param name
- * @return the attribute usage
- * <!-- end-user-doc -->
- * @generated
- */
- public static AttributeUsage getByName(String name)
- {
- for (int i = 0; i < VALUES_ARRAY.length; ++i)
- {
- AttributeUsage result = VALUES_ARRAY[i];
- if (result.getName().equals(name))
- {
- return result;
- }
- }
- return null;
- }
-
- /**
- * Returns the '<em><b>Attribute Usage</b></em>' literal with the specified integer value.
- * <!-- begin-user-doc -->
- * @param value
- * @return the attribute usage
- * <!-- end-user-doc -->
- * @generated
- */
- public static AttributeUsage get(int value)
- {
- switch (value)
- {
- case OPTIONAL_VALUE: return OPTIONAL;
- case REQUIRED_VALUE: return REQUIRED;
- case FIXED_VALUE: return FIXED;
- case PROHIBITED_VALUE: return PROHIBITED;
- }
- return null;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private final int value;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private final String name;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private final String literal;
-
- /**
- * Only this class can construct instances.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private AttributeUsage(int value, String name, String literal)
- {
- this.value = value;
- this.name = name;
- this.literal = literal;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public int getValue()
- {
- return value;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public String getName()
- {
- return name;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public String getLiteral()
- {
- return literal;
- }
-
- /**
- * Returns the literal value of the enumerator, which is its string representation.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public String toString()
- {
- return literal;
- }
-
-} //AttributeUsage
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/cm/addtagmd/ElementData.java b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/cm/addtagmd/ElementData.java
deleted file mode 100644
index 2e0d68f..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/cm/addtagmd/ElementData.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: ElementData.java,v 1.1 2010/03/08 18:49:41 cbateman Exp $
- */
-package org.eclipse.jst.jsf.facelet.core.internal.cm.addtagmd;
-
-import org.eclipse.emf.common.util.EList;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Element Data</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- * <li>{@link org.eclipse.jst.jsf.facelet.core.internal.cm.addtagmd.ElementData#getName <em>Name</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.facelet.core.internal.cm.addtagmd.ElementData#getAttributes <em>Attributes</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.jsf.facelet.core.internal.cm.addtagmd.AddTagMDPackage#getElementData()
- * @model
- * @generated
- */
-public interface ElementData extends EObject
-{
- /**
- * Returns the value of the '<em><b>Name</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Name</em>' attribute isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @return the value of the '<em>Name</em>' attribute.
- * @see #setName(String)
- * @see org.eclipse.jst.jsf.facelet.core.internal.cm.addtagmd.AddTagMDPackage#getElementData_Name()
- * @model extendedMetaData="kind='element' name='name'"
- * @generated
- */
- String getName();
-
- /**
- * Sets the value of the '{@link org.eclipse.jst.jsf.facelet.core.internal.cm.addtagmd.ElementData#getName <em>Name</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Name</em>' attribute.
- * @see #getName()
- * @generated
- */
- void setName(String value);
-
- /**
- * Returns the value of the '<em><b>Attributes</b></em>' containment reference list.
- * The list contents are of type {@link org.eclipse.jst.jsf.facelet.core.internal.cm.addtagmd.AttributeData}.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Attributes</em>' reference list isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @return the value of the '<em>Attributes</em>' containment reference list.
- * @see org.eclipse.jst.jsf.facelet.core.internal.cm.addtagmd.AddTagMDPackage#getElementData_Attributes()
- * @model containment="true"
- * extendedMetaData="kind='element' name='attribute'"
- * @generated
- */
- EList<AttributeData> getAttributes();
-
-} // ElementData
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/cm/addtagmd/impl/AddTagMDFactoryImpl.java b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/cm/addtagmd/impl/AddTagMDFactoryImpl.java
deleted file mode 100644
index 44fc555..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/cm/addtagmd/impl/AddTagMDFactoryImpl.java
+++ /dev/null
@@ -1,187 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: AddTagMDFactoryImpl.java,v 1.1 2010/03/08 18:49:41 cbateman Exp $
- */
-package org.eclipse.jst.jsf.facelet.core.internal.cm.addtagmd.impl;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EDataType;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-
-import org.eclipse.emf.ecore.impl.EFactoryImpl;
-
-import org.eclipse.emf.ecore.plugin.EcorePlugin;
-
-import org.eclipse.jst.jsf.facelet.core.internal.cm.addtagmd.*;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model <b>Factory</b>.
- * <!-- end-user-doc -->
- * @generated
- */
-public class AddTagMDFactoryImpl extends EFactoryImpl implements AddTagMDFactory
-{
- /**
- * Creates the default factory implementation.
- * <!-- begin-user-doc -->
- * @return the factory
- * <!-- end-user-doc -->
- * @generated
- */
- public static AddTagMDFactory init()
- {
- try
- {
- AddTagMDFactory theAddTagMDFactory = (AddTagMDFactory)EPackage.Registry.INSTANCE.getEFactory("http://org.eclipse.jst.jsf.facelet.core/additionalTagMetadata.ecore"); //$NON-NLS-1$
- if (theAddTagMDFactory != null)
- {
- return theAddTagMDFactory;
- }
- }
- catch (Exception exception)
- {
- EcorePlugin.INSTANCE.log(exception);
- }
- return new AddTagMDFactoryImpl();
- }
-
- /**
- * Creates an instance of the factory.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public AddTagMDFactoryImpl()
- {
- super();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public EObject create(EClass eClass)
- {
- switch (eClass.getClassifierID())
- {
- case AddTagMDPackage.ELEMENT_DATA: return createElementData();
- case AddTagMDPackage.ATTRIBUTE_DATA: return createAttributeData();
- default:
- throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$
- }
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public Object createFromString(EDataType eDataType, String initialValue)
- {
- switch (eDataType.getClassifierID())
- {
- case AddTagMDPackage.ATTRIBUTE_USAGE:
- return createAttributeUsageFromString(eDataType, initialValue);
- default:
- throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$
- }
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public String convertToString(EDataType eDataType, Object instanceValue)
- {
- switch (eDataType.getClassifierID())
- {
- case AddTagMDPackage.ATTRIBUTE_USAGE:
- return convertAttributeUsageToString(eDataType, instanceValue);
- default:
- throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$
- }
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public ElementData createElementData()
- {
- ElementDataImpl elementData = new ElementDataImpl();
- return elementData;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public AttributeData createAttributeData()
- {
- AttributeDataImpl attributeData = new AttributeDataImpl();
- return attributeData;
- }
-
- /**
- * <!-- begin-user-doc -->
- * @param eDataType
- * @param initialValue
- * @return the attribute usage
- * <!-- end-user-doc -->
- * @generated
- */
- public AttributeUsage createAttributeUsageFromString(EDataType eDataType, String initialValue)
- {
- AttributeUsage result = AttributeUsage.get(initialValue);
- if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- return result;
- }
-
- /**
- * <!-- begin-user-doc -->
- * @param eDataType
- * @param instanceValue
- * @return the usage string
- * <!-- end-user-doc -->
- * @generated
- */
- public String convertAttributeUsageToString(EDataType eDataType, Object instanceValue)
- {
- return instanceValue == null ? null : instanceValue.toString();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public AddTagMDPackage getAddTagMDPackage()
- {
- return (AddTagMDPackage)getEPackage();
- }
-
- /**
- * <!-- begin-user-doc -->
- * @return the package
- * <!-- end-user-doc -->
- * @deprecated
- * @generated
- */
- @Deprecated
- public static AddTagMDPackage getPackage()
- {
- return AddTagMDPackage.eINSTANCE;
- }
-
-} //AddTagMDFactoryImpl
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/cm/addtagmd/impl/AddTagMDPackageImpl.java b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/cm/addtagmd/impl/AddTagMDPackageImpl.java
deleted file mode 100644
index 743afa0..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/cm/addtagmd/impl/AddTagMDPackageImpl.java
+++ /dev/null
@@ -1,352 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: AddTagMDPackageImpl.java,v 1.1 2010/03/08 18:49:41 cbateman Exp $
- */
-package org.eclipse.jst.jsf.facelet.core.internal.cm.addtagmd.impl;
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EEnum;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EReference;
-
-import org.eclipse.emf.ecore.impl.EPackageImpl;
-
-import org.eclipse.jst.jsf.facelet.core.internal.cm.addtagmd.AddTagMDFactory;
-import org.eclipse.jst.jsf.facelet.core.internal.cm.addtagmd.AddTagMDPackage;
-import org.eclipse.jst.jsf.facelet.core.internal.cm.addtagmd.AttributeData;
-import org.eclipse.jst.jsf.facelet.core.internal.cm.addtagmd.AttributeUsage;
-import org.eclipse.jst.jsf.facelet.core.internal.cm.addtagmd.ElementData;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model <b>Package</b>.
- * <!-- end-user-doc -->
- * @generated
- */
-public class AddTagMDPackageImpl extends EPackageImpl implements AddTagMDPackage
-{
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private EClass elementDataEClass = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private EClass attributeDataEClass = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private EEnum attributeUsageEEnum = 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.jst.jsf.facelet.core.internal.cm.addtagmd.AddTagMDPackage#eNS_URI
- * @see #init()
- * @generated
- */
- private AddTagMDPackageImpl()
- {
- super(eNS_URI, AddTagMDFactory.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 -->
- * @return the package
- * <!-- end-user-doc -->
- * @see #eNS_URI
- * @see #createPackageContents()
- * @see #initializePackageContents()
- * @generated
- */
- public static AddTagMDPackage init()
- {
- if (isInited) return (AddTagMDPackage)EPackage.Registry.INSTANCE.getEPackage(AddTagMDPackage.eNS_URI);
-
- // Obtain or create and register package
- AddTagMDPackageImpl theAddTagMDPackage = (AddTagMDPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(eNS_URI) instanceof AddTagMDPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(eNS_URI) : new AddTagMDPackageImpl());
-
- isInited = true;
-
- // Create package meta-data objects
- theAddTagMDPackage.createPackageContents();
-
- // Initialize created meta-data
- theAddTagMDPackage.initializePackageContents();
-
- // Mark meta-data to indicate it can't be changed
- theAddTagMDPackage.freeze();
-
- return theAddTagMDPackage;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EClass getElementData()
- {
- return elementDataEClass;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getElementData_Name()
- {
- return (EAttribute)elementDataEClass.getEStructuralFeatures().get(0);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EReference getElementData_Attributes()
- {
- return (EReference)elementDataEClass.getEStructuralFeatures().get(1);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EClass getAttributeData()
- {
- return attributeDataEClass;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getAttributeData_Name()
- {
- return (EAttribute)attributeDataEClass.getEStructuralFeatures().get(0);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getAttributeData_Usage()
- {
- return (EAttribute)attributeDataEClass.getEStructuralFeatures().get(1);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getAttributeData_Description()
- {
- return (EAttribute)attributeDataEClass.getEStructuralFeatures().get(2);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EEnum getAttributeUsage()
- {
- return attributeUsageEEnum;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public AddTagMDFactory getAddTagMDFactory()
- {
- return (AddTagMDFactory)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
- elementDataEClass = createEClass(ELEMENT_DATA);
- createEAttribute(elementDataEClass, ELEMENT_DATA__NAME);
- createEReference(elementDataEClass, ELEMENT_DATA__ATTRIBUTES);
-
- attributeDataEClass = createEClass(ATTRIBUTE_DATA);
- createEAttribute(attributeDataEClass, ATTRIBUTE_DATA__NAME);
- createEAttribute(attributeDataEClass, ATTRIBUTE_DATA__USAGE);
- createEAttribute(attributeDataEClass, ATTRIBUTE_DATA__DESCRIPTION);
-
- // Create enums
- attributeUsageEEnum = createEEnum(ATTRIBUTE_USAGE);
- }
-
- /**
- * <!-- 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);
-
- // Create type parameters
-
- // Set bounds for type parameters
-
- // Add supertypes to classes
-
- // Initialize classes and features; add operations and parameters
- initEClass(elementDataEClass, ElementData.class, "ElementData", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEAttribute(getElementData_Name(), ecorePackage.getEString(), "name", null, 0, 1, ElementData.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getElementData_Attributes(), this.getAttributeData(), null, "attributes", null, 0, -1, ElementData.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
- initEClass(attributeDataEClass, AttributeData.class, "AttributeData", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEAttribute(getAttributeData_Name(), ecorePackage.getEString(), "name", null, 0, 1, AttributeData.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getAttributeData_Usage(), this.getAttributeUsage(), "usage", null, 0, 1, AttributeData.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getAttributeData_Description(), ecorePackage.getEString(), "description", null, 0, 1, AttributeData.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
- // Initialize enums and add enum literals
- initEEnum(attributeUsageEEnum, AttributeUsage.class, "AttributeUsage"); //$NON-NLS-1$
- addEEnumLiteral(attributeUsageEEnum, AttributeUsage.OPTIONAL);
- addEEnumLiteral(attributeUsageEEnum, AttributeUsage.REQUIRED);
- addEEnumLiteral(attributeUsageEEnum, AttributeUsage.FIXED);
- addEEnumLiteral(attributeUsageEEnum, AttributeUsage.PROHIBITED);
-
- // Create resource
- createResource(eNS_URI);
-
- // Create annotations
- // http:///org/eclipse/emf/ecore/util/ExtendedMetaData
- createExtendedMetaDataAnnotations();
- }
-
- /**
- * Initializes the annotations for <b>http:///org/eclipse/emf/ecore/util/ExtendedMetaData</b>.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected void createExtendedMetaDataAnnotations()
- {
- String source = "http:///org/eclipse/emf/ecore/util/ExtendedMetaData"; //$NON-NLS-1$
- addAnnotation
- (getElementData_Name(),
- source,
- new String[]
- {
- "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
- "name", "name" //$NON-NLS-1$ //$NON-NLS-2$
- });
- addAnnotation
- (getElementData_Attributes(),
- source,
- new String[]
- {
- "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
- "name", "attribute" //$NON-NLS-1$ //$NON-NLS-2$
- });
- addAnnotation
- (getAttributeData_Name(),
- source,
- new String[]
- {
- "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
- "name", "name" //$NON-NLS-1$ //$NON-NLS-2$
- });
- addAnnotation
- (getAttributeData_Usage(),
- source,
- new String[]
- {
- "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
- "name", "usage" //$NON-NLS-1$ //$NON-NLS-2$
- });
- addAnnotation
- (getAttributeData_Description(),
- source,
- new String[]
- {
- "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
- "name", "description" //$NON-NLS-1$ //$NON-NLS-2$
- });
- }
-
-} //AddTagMDPackageImpl
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/cm/addtagmd/impl/AttributeDataImpl.java b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/cm/addtagmd/impl/AttributeDataImpl.java
deleted file mode 100644
index 6e47d33..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/cm/addtagmd/impl/AttributeDataImpl.java
+++ /dev/null
@@ -1,294 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: AttributeDataImpl.java,v 1.1 2010/03/08 18:49:41 cbateman Exp $
- */
-package org.eclipse.jst.jsf.facelet.core.internal.cm.addtagmd.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.jst.jsf.facelet.core.internal.cm.addtagmd.AddTagMDPackage;
-import org.eclipse.jst.jsf.facelet.core.internal.cm.addtagmd.AttributeData;
-import org.eclipse.jst.jsf.facelet.core.internal.cm.addtagmd.AttributeUsage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Attribute Data</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- * <li>{@link org.eclipse.jst.jsf.facelet.core.internal.cm.addtagmd.impl.AttributeDataImpl#getName <em>Name</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.facelet.core.internal.cm.addtagmd.impl.AttributeDataImpl#getUsage <em>Usage</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.facelet.core.internal.cm.addtagmd.impl.AttributeDataImpl#getDescription <em>Description</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class AttributeDataImpl extends EObjectImpl implements AttributeData
-{
- /**
- * The default value of the '{@link #getName() <em>Name</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getName()
- * @generated
- * @ordered
- */
- protected static final String NAME_EDEFAULT = null;
-
- /**
- * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getName()
- * @generated
- * @ordered
- */
- protected String name = NAME_EDEFAULT;
-
- /**
- * The default value of the '{@link #getUsage() <em>Usage</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getUsage()
- * @generated
- * @ordered
- */
- protected static final AttributeUsage USAGE_EDEFAULT = AttributeUsage.OPTIONAL;
-
- /**
- * The cached value of the '{@link #getUsage() <em>Usage</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getUsage()
- * @generated
- * @ordered
- */
- protected AttributeUsage usage = USAGE_EDEFAULT;
-
- /**
- * The default value of the '{@link #getDescription() <em>Description</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getDescription()
- * @generated
- * @ordered
- */
- protected static final String DESCRIPTION_EDEFAULT = null;
-
- /**
- * The cached value of the '{@link #getDescription() <em>Description</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getDescription()
- * @generated
- * @ordered
- */
- protected String description = DESCRIPTION_EDEFAULT;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected AttributeDataImpl()
- {
- super();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- protected EClass eStaticClass()
- {
- return AddTagMDPackage.Literals.ATTRIBUTE_DATA;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public String getName()
- {
- return name;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setName(String newName)
- {
- String oldName = name;
- name = newName;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, AddTagMDPackage.ATTRIBUTE_DATA__NAME, oldName, name));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public AttributeUsage getUsage()
- {
- return usage;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setUsage(AttributeUsage newUsage)
- {
- AttributeUsage oldUsage = usage;
- usage = newUsage == null ? USAGE_EDEFAULT : newUsage;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, AddTagMDPackage.ATTRIBUTE_DATA__USAGE, oldUsage, usage));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public String getDescription()
- {
- return description;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setDescription(String newDescription)
- {
- String oldDescription = description;
- description = newDescription;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, AddTagMDPackage.ATTRIBUTE_DATA__DESCRIPTION, oldDescription, description));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public Object eGet(int featureID, boolean resolve, boolean coreType)
- {
- switch (featureID)
- {
- case AddTagMDPackage.ATTRIBUTE_DATA__NAME:
- return getName();
- case AddTagMDPackage.ATTRIBUTE_DATA__USAGE:
- return getUsage();
- case AddTagMDPackage.ATTRIBUTE_DATA__DESCRIPTION:
- return getDescription();
- }
- return super.eGet(featureID, resolve, coreType);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public void eSet(int featureID, Object newValue)
- {
- switch (featureID)
- {
- case AddTagMDPackage.ATTRIBUTE_DATA__NAME:
- setName((String)newValue);
- return;
- case AddTagMDPackage.ATTRIBUTE_DATA__USAGE:
- setUsage((AttributeUsage)newValue);
- return;
- case AddTagMDPackage.ATTRIBUTE_DATA__DESCRIPTION:
- setDescription((String)newValue);
- return;
- }
- super.eSet(featureID, newValue);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public void eUnset(int featureID)
- {
- switch (featureID)
- {
- case AddTagMDPackage.ATTRIBUTE_DATA__NAME:
- setName(NAME_EDEFAULT);
- return;
- case AddTagMDPackage.ATTRIBUTE_DATA__USAGE:
- setUsage(USAGE_EDEFAULT);
- return;
- case AddTagMDPackage.ATTRIBUTE_DATA__DESCRIPTION:
- setDescription(DESCRIPTION_EDEFAULT);
- return;
- }
- super.eUnset(featureID);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public boolean eIsSet(int featureID)
- {
- switch (featureID)
- {
- case AddTagMDPackage.ATTRIBUTE_DATA__NAME:
- return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
- case AddTagMDPackage.ATTRIBUTE_DATA__USAGE:
- return usage != USAGE_EDEFAULT;
- case AddTagMDPackage.ATTRIBUTE_DATA__DESCRIPTION:
- return DESCRIPTION_EDEFAULT == null ? description != null : !DESCRIPTION_EDEFAULT.equals(description);
- }
- return super.eIsSet(featureID);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public String toString()
- {
- if (eIsProxy()) return super.toString();
-
- StringBuffer result = new StringBuffer(super.toString());
- result.append(" (name: "); //$NON-NLS-1$
- result.append(name);
- result.append(", usage: "); //$NON-NLS-1$
- result.append(usage);
- result.append(", description: "); //$NON-NLS-1$
- result.append(description);
- result.append(')');
- return result.toString();
- }
-
-} //AttributeDataImpl
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/cm/addtagmd/impl/ElementDataImpl.java b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/cm/addtagmd/impl/ElementDataImpl.java
deleted file mode 100644
index 4860f62..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/cm/addtagmd/impl/ElementDataImpl.java
+++ /dev/null
@@ -1,239 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: ElementDataImpl.java,v 1.1 2010/03/08 18:49:41 cbateman Exp $
- */
-package org.eclipse.jst.jsf.facelet.core.internal.cm.addtagmd.impl;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.jst.jsf.facelet.core.internal.cm.addtagmd.AddTagMDPackage;
-import org.eclipse.jst.jsf.facelet.core.internal.cm.addtagmd.AttributeData;
-import org.eclipse.jst.jsf.facelet.core.internal.cm.addtagmd.ElementData;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Element Data</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- * <li>{@link org.eclipse.jst.jsf.facelet.core.internal.cm.addtagmd.impl.ElementDataImpl#getName <em>Name</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.facelet.core.internal.cm.addtagmd.impl.ElementDataImpl#getAttributes <em>Attributes</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class ElementDataImpl extends EObjectImpl implements ElementData
-{
- /**
- * The default value of the '{@link #getName() <em>Name</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getName()
- * @generated
- * @ordered
- */
- protected static final String NAME_EDEFAULT = null;
-
- /**
- * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getName()
- * @generated
- * @ordered
- */
- protected String name = NAME_EDEFAULT;
-
- /**
- * The cached value of the '{@link #getAttributes() <em>Attributes</em>}' containment reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getAttributes()
- * @generated
- * @ordered
- */
- protected EList<AttributeData> attributes;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected ElementDataImpl()
- {
- super();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- protected EClass eStaticClass()
- {
- return AddTagMDPackage.Literals.ELEMENT_DATA;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public String getName()
- {
- return name;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setName(String newName)
- {
- String oldName = name;
- name = newName;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, AddTagMDPackage.ELEMENT_DATA__NAME, oldName, name));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EList<AttributeData> getAttributes()
- {
- if (attributes == null)
- {
- attributes = new EObjectContainmentEList<AttributeData>(AttributeData.class, this, AddTagMDPackage.ELEMENT_DATA__ATTRIBUTES);
- }
- return attributes;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)
- {
- switch (featureID)
- {
- case AddTagMDPackage.ELEMENT_DATA__ATTRIBUTES:
- return ((InternalEList<?>)getAttributes()).basicRemove(otherEnd, msgs);
- }
- return super.eInverseRemove(otherEnd, featureID, msgs);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public Object eGet(int featureID, boolean resolve, boolean coreType)
- {
- switch (featureID)
- {
- case AddTagMDPackage.ELEMENT_DATA__NAME:
- return getName();
- case AddTagMDPackage.ELEMENT_DATA__ATTRIBUTES:
- return getAttributes();
- }
- return super.eGet(featureID, resolve, coreType);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @SuppressWarnings("unchecked")
- @Override
- public void eSet(int featureID, Object newValue)
- {
- switch (featureID)
- {
- case AddTagMDPackage.ELEMENT_DATA__NAME:
- setName((String)newValue);
- return;
- case AddTagMDPackage.ELEMENT_DATA__ATTRIBUTES:
- getAttributes().clear();
- getAttributes().addAll((Collection<? extends AttributeData>)newValue);
- return;
- }
- super.eSet(featureID, newValue);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public void eUnset(int featureID)
- {
- switch (featureID)
- {
- case AddTagMDPackage.ELEMENT_DATA__NAME:
- setName(NAME_EDEFAULT);
- return;
- case AddTagMDPackage.ELEMENT_DATA__ATTRIBUTES:
- getAttributes().clear();
- return;
- }
- super.eUnset(featureID);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public boolean eIsSet(int featureID)
- {
- switch (featureID)
- {
- case AddTagMDPackage.ELEMENT_DATA__NAME:
- return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
- case AddTagMDPackage.ELEMENT_DATA__ATTRIBUTES:
- return attributes != null && !attributes.isEmpty();
- }
- return super.eIsSet(featureID);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public String toString()
- {
- if (eIsProxy()) return super.toString();
-
- StringBuffer result = new StringBuffer(super.toString());
- result.append(" (name: "); //$NON-NLS-1$
- result.append(name);
- result.append(')');
- return result.toString();
- }
-
-} //ElementDataImpl
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/cm/addtagmd/provider/AddTagMDItemProviderAdapterFactory.java b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/cm/addtagmd/provider/AddTagMDItemProviderAdapterFactory.java
deleted file mode 100644
index 4d23f22..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/cm/addtagmd/provider/AddTagMDItemProviderAdapterFactory.java
+++ /dev/null
@@ -1,246 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: AddTagMDItemProviderAdapterFactory.java,v 1.1 2010/03/08 18:49:40 cbateman Exp $
- */
-package org.eclipse.jst.jsf.facelet.core.internal.cm.addtagmd.provider;
-
-import java.util.ArrayList;
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.Notifier;
-
-import org.eclipse.emf.edit.provider.ChangeNotifier;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
-import org.eclipse.emf.edit.provider.IChangeNotifier;
-import org.eclipse.emf.edit.provider.IDisposable;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.INotifyChangedListener;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-
-import org.eclipse.jst.jsf.facelet.core.internal.cm.addtagmd.util.AddTagMDAdapterFactory;
-
-/**
- * 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 AddTagMDItemProviderAdapterFactory extends AddTagMDAdapterFactory 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<Object> supportedTypes = new ArrayList<Object>();
-
- /**
- * This constructs an instance.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated NOT
- */
- public AddTagMDItemProviderAdapterFactory()
- {
- supportedTypes.add(IEditingDomainItemProvider.class);
- supportedTypes.add(IStructuredItemContentProvider.class);
- supportedTypes.add(ITreeItemContentProvider.class);
- supportedTypes.add(IItemLabelProvider.class);
- supportedTypes.add(IItemPropertySource.class);
- supportedTypes.add(IResourceProvider.class);
- }
-
- /**
- * This keeps track of the one adapter used for all {@link org.eclipse.jst.jsf.facelet.core.internal.cm.addtagmd.ElementData} instances.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected ElementDataItemProvider elementDataItemProvider;
-
- /**
- * This creates an adapter for a {@link org.eclipse.jst.jsf.facelet.core.internal.cm.addtagmd.ElementData}.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public Adapter createElementDataAdapter()
- {
- if (elementDataItemProvider == null)
- {
- elementDataItemProvider = new ElementDataItemProvider(this);
- }
-
- return elementDataItemProvider;
- }
-
- /**
- * This keeps track of the one adapter used for all {@link org.eclipse.jst.jsf.facelet.core.internal.cm.addtagmd.AttributeData} instances.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected AttributeDataItemProvider attributeDataItemProvider;
-
- /**
- * This creates an adapter for a {@link org.eclipse.jst.jsf.facelet.core.internal.cm.addtagmd.AttributeData}.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public Adapter createAttributeDataAdapter()
- {
- if (attributeDataItemProvider == null)
- {
- attributeDataItemProvider = new AttributeDataItemProvider(this);
- }
-
- return attributeDataItemProvider;
- }
-
- /**
- * 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
- */
- @Override
- 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
- */
- @Override
- public Adapter adapt(Notifier notifier, Object type)
- {
- return super.adapt(notifier, this);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- 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 (elementDataItemProvider != null) elementDataItemProvider.dispose();
- if (attributeDataItemProvider != null) attributeDataItemProvider.dispose();
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/cm/addtagmd/provider/AttributeDataItemProvider.java b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/cm/addtagmd/provider/AttributeDataItemProvider.java
deleted file mode 100644
index 1bc1152..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/cm/addtagmd/provider/AttributeDataItemProvider.java
+++ /dev/null
@@ -1,258 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: AttributeDataItemProvider.java,v 1.1 2010/03/08 18:49:40 cbateman Exp $
- */
-package org.eclipse.jst.jsf.facelet.core.internal.cm.addtagmd.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.common.util.ResourceLocator;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-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.jst.jsf.common.metadata.Trait;
-import org.eclipse.jst.jsf.common.metadata.internal.TraitValueHelper;
-import org.eclipse.jst.jsf.facelet.core.internal.FaceletCorePlugin;
-
-import org.eclipse.jst.jsf.facelet.core.internal.cm.addtagmd.AddTagMDPackage;
-import org.eclipse.jst.jsf.facelet.core.internal.cm.addtagmd.AttributeData;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.jst.jsf.facelet.core.internal.cm.addtagmd.AttributeData} object.
- * <!-- begin-user-doc -->
- * @extends IResourceProvider
- * <!-- end-user-doc -->
- * @generated
- */
-public class AttributeDataItemProvider
- extends ItemProviderAdapter
- implements
- IEditingDomainItemProvider,
- IStructuredItemContentProvider,
- ITreeItemContentProvider,
- IItemLabelProvider,
- IItemPropertySource,
- IResourceProvider
-{
- /**
- * This constructs an instance from a factory and a notifier.
- * <!-- begin-user-doc -->
- * @param adapterFactory
- * <!-- end-user-doc -->
- * @generated
- */
- public AttributeDataItemProvider(AdapterFactory adapterFactory)
- {
- super(adapterFactory);
- }
-
- /**
- * This returns the property descriptors for the adapted class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object)
- {
- if (itemPropertyDescriptors == null)
- {
- super.getPropertyDescriptors(object);
-
- addNamePropertyDescriptor(object);
- addUsagePropertyDescriptor(object);
- addDescriptionPropertyDescriptor(object);
- }
- return itemPropertyDescriptors;
- }
-
- /**
- * This adds a property descriptor for the Name feature.
- * <!-- begin-user-doc -->
- * @param object
- * <!-- end-user-doc -->
- * @generated
- */
- protected void addNamePropertyDescriptor(Object object)
- {
- itemPropertyDescriptors.add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_AttributeData_name_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_AttributeData_name_feature", "_UI_AttributeData_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- AddTagMDPackage.Literals.ATTRIBUTE_DATA__NAME,
- true,
- false,
- false,
- ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
- null,
- null));
- }
-
- /**
- * This adds a property descriptor for the Usage feature.
- * <!-- begin-user-doc -->
- * @param object
- * <!-- end-user-doc -->
- * @generated
- */
- protected void addUsagePropertyDescriptor(Object object)
- {
- itemPropertyDescriptors.add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_AttributeData_usage_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_AttributeData_usage_feature", "_UI_AttributeData_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- AddTagMDPackage.Literals.ATTRIBUTE_DATA__USAGE,
- true,
- false,
- false,
- ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
- null,
- null));
- }
-
- /**
- * This adds a property descriptor for the Description feature.
- * <!-- begin-user-doc -->
- * @param object
- * <!-- end-user-doc -->
- * @generated
- */
- protected void addDescriptionPropertyDescriptor(Object object)
- {
- itemPropertyDescriptors.add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_AttributeData_description_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_AttributeData_description_feature", "_UI_AttributeData_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- AddTagMDPackage.Literals.ATTRIBUTE_DATA__DESCRIPTION,
- true,
- false,
- false,
- ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
- null,
- null));
- }
-
- /**
- * This returns AttributeData.gif.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public Object getImage(Object object)
- {
- return overlayImage(object, getResourceLocator().getImage("full/obj16/AttributeData")); //$NON-NLS-1$
- }
-
- /**
- * This returns the label text for the adapted class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public String getText(Object object)
- {
- String label = ((AttributeData)object).getName();
- return label == null || label.length() == 0 ?
- getString("_UI_AttributeData_type") : //$NON-NLS-1$
- getString("_UI_AttributeData_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
- }
-
- /**
- * This handles model notifications by calling {@link #updateChildren} to update any cached
- * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public void notifyChanged(Notification notification)
- {
- updateChildren(notification);
-
- switch (notification.getFeatureID(AttributeData.class))
- {
- case AddTagMDPackage.ATTRIBUTE_DATA__NAME:
- case AddTagMDPackage.ATTRIBUTE_DATA__USAGE:
- case AddTagMDPackage.ATTRIBUTE_DATA__DESCRIPTION:
- 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
- */
- @Override
- protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object)
- {
- super.collectNewChildDescriptors(newChildDescriptors, object);
- }
-
- /**
- * Return the resource locator for this item provider's resources.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public ResourceLocator getResourceLocator()
- {
- return FaceletCorePlugin.INSTANCE;
- }
-
- public String getTranslatedString(EObject object, EStructuralFeature feature)
- {
- Object value = object.eGet(feature);
-
- if (value != null)
- {
- EObject testObject = object;
-
- while (! (testObject instanceof Trait)
- && testObject != null)
- {
- testObject = testObject.eContainer();
- }
-
- if (testObject instanceof Trait)
- {
- Trait trait = (Trait) testObject;
- value = TraitValueHelper.getNLSValue(trait, value.toString());
- }
- return value.toString();
- }
-
- return object.toString();
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/cm/addtagmd/provider/ElementDataItemProvider.java b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/cm/addtagmd/provider/ElementDataItemProvider.java
deleted file mode 100644
index 9aeae53..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/cm/addtagmd/provider/ElementDataItemProvider.java
+++ /dev/null
@@ -1,228 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: ElementDataItemProvider.java,v 1.1 2010/03/08 18:49:40 cbateman Exp $
- */
-package org.eclipse.jst.jsf.facelet.core.internal.cm.addtagmd.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-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.jst.jsf.common.metadata.Trait;
-import org.eclipse.jst.jsf.common.metadata.internal.TraitValueHelper;
-import org.eclipse.jst.jsf.facelet.core.internal.FaceletCorePlugin;
-import org.eclipse.jst.jsf.facelet.core.internal.cm.addtagmd.AddTagMDPackage;
-import org.eclipse.jst.jsf.facelet.core.internal.cm.addtagmd.ElementData;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.jst.jsf.facelet.core.internal.cm.addtagmd.ElementData} object.
- * <!-- begin-user-doc -->
- * @extends IResourceProvider
- * <!-- end-user-doc -->
- * @generated
- */
-public class ElementDataItemProvider
- extends ItemProviderAdapter
- implements
- IEditingDomainItemProvider,
- IStructuredItemContentProvider,
- ITreeItemContentProvider,
- IItemLabelProvider,
- IItemPropertySource,
- IResourceProvider
-{
- /**
- * This constructs an instance from a factory and a notifier.
- * <!-- begin-user-doc -->
- * @param adapterFactory
- * <!-- end-user-doc -->
- * @generated
- */
- public ElementDataItemProvider(AdapterFactory adapterFactory)
- {
- super(adapterFactory);
- }
-
- /**
- * This returns the property descriptors for the adapted class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object)
- {
- if (itemPropertyDescriptors == null)
- {
- super.getPropertyDescriptors(object);
-
- addNamePropertyDescriptor(object);
- addAttributesPropertyDescriptor(object);
- }
- return itemPropertyDescriptors;
- }
-
- /**
- * This adds a property descriptor for the Name feature.
- * <!-- begin-user-doc -->
- * @param object
- * <!-- end-user-doc -->
- * @generated
- */
- protected void addNamePropertyDescriptor(Object object)
- {
- itemPropertyDescriptors.add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_ElementData_name_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_ElementData_name_feature", "_UI_ElementData_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- AddTagMDPackage.Literals.ELEMENT_DATA__NAME,
- true,
- false,
- false,
- ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
- null,
- null));
- }
-
- /**
- * This adds a property descriptor for the Attributes feature.
- * <!-- begin-user-doc -->
- * @param object
- * <!-- end-user-doc -->
- * @generated
- */
- protected void addAttributesPropertyDescriptor(Object object)
- {
- itemPropertyDescriptors.add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_ElementData_attributes_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_ElementData_attributes_feature", "_UI_ElementData_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- AddTagMDPackage.Literals.ELEMENT_DATA__ATTRIBUTES,
- true,
- false,
- true,
- null,
- null,
- null));
- }
-
- /**
- * This returns ElementData.gif.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public Object getImage(Object object)
- {
- return overlayImage(object, getResourceLocator().getImage("full/obj16/ElementData")); //$NON-NLS-1$
- }
-
- /**
- * This returns the label text for the adapted class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public String getText(Object object)
- {
- String label = ((ElementData)object).getName();
- return label == null || label.length() == 0 ?
- getString("_UI_ElementData_type") : //$NON-NLS-1$
- getString("_UI_ElementData_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
- }
-
- /**
- * This handles model notifications by calling {@link #updateChildren} to update any cached
- * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public void notifyChanged(Notification notification)
- {
- updateChildren(notification);
-
- switch (notification.getFeatureID(ElementData.class))
- {
- case AddTagMDPackage.ELEMENT_DATA__NAME:
- 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
- */
- @Override
- protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object)
- {
- super.collectNewChildDescriptors(newChildDescriptors, object);
- }
-
- /**
- * Return the resource locator for this item provider's resources.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public ResourceLocator getResourceLocator()
- {
- return FaceletCorePlugin.INSTANCE;
- }
-
- public String getTranslatedString(EObject object, EStructuralFeature feature)
- {
- Object value = object.eGet(feature);
-
- if (value != null)
- {
- EObject testObject = object;
-
- while (! (testObject instanceof Trait)
- && testObject != null)
- {
- testObject = testObject.eContainer();
- }
-
- if (testObject instanceof Trait)
- {
- Trait trait = (Trait) testObject;
- value = TraitValueHelper.getNLSValue(trait, value.toString());
- }
- return value.toString();
- }
-
- return object.toString();
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/cm/addtagmd/provider/IResourceProvider.java b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/cm/addtagmd/provider/IResourceProvider.java
deleted file mode 100644
index d441f59..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/cm/addtagmd/provider/IResourceProvider.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Oracle 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:
- * Cameron Bateman - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facelet.core.internal.cm.addtagmd.provider;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-
-/**
- * A translated string provider.
- *
- * @author cbateman
- *
- */
-public interface IResourceProvider
-{
- /**
- * @param object
- * @param feature
- * @return the string value of object.eGet(feature)
- */
- String getTranslatedString(final EObject object,
- final EStructuralFeature feature);
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/cm/addtagmd/util/AddTagMDAdapterFactory.java b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/cm/addtagmd/util/AddTagMDAdapterFactory.java
deleted file mode 100644
index 0ec5f72..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/cm/addtagmd/util/AddTagMDAdapterFactory.java
+++ /dev/null
@@ -1,156 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: AddTagMDAdapterFactory.java,v 1.1 2010/03/08 18:49:42 cbateman Exp $
- */
-package org.eclipse.jst.jsf.facelet.core.internal.cm.addtagmd.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.jst.jsf.facelet.core.internal.cm.addtagmd.*;
-
-/**
- * <!-- 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.jst.jsf.facelet.core.internal.cm.addtagmd.AddTagMDPackage
- * @generated
- */
-public class AddTagMDAdapterFactory extends AdapterFactoryImpl
-{
- /**
- * The cached model package.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected static AddTagMDPackage modelPackage;
-
- /**
- * Creates an instance of the adapter factory.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public AddTagMDAdapterFactory()
- {
- if (modelPackage == null)
- {
- modelPackage = AddTagMDPackage.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
- */
- @Override
- 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 AddTagMDSwitch<Adapter> modelSwitch =
- new AddTagMDSwitch<Adapter>()
- {
- @Override
- public Adapter caseElementData(ElementData object)
- {
- return createElementDataAdapter();
- }
- @Override
- public Adapter caseAttributeData(AttributeData object)
- {
- return createAttributeDataAdapter();
- }
- @Override
- public Adapter 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
- */
- @Override
- public Adapter createAdapter(Notifier target)
- {
- return modelSwitch.doSwitch((EObject)target);
- }
-
-
- /**
- * Creates a new adapter for an object of class '{@link org.eclipse.jst.jsf.facelet.core.internal.cm.addtagmd.ElementData <em>Element Data</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.jst.jsf.facelet.core.internal.cm.addtagmd.ElementData
- * @generated
- */
- public Adapter createElementDataAdapter()
- {
- return null;
- }
-
- /**
- * Creates a new adapter for an object of class '{@link org.eclipse.jst.jsf.facelet.core.internal.cm.addtagmd.AttributeData <em>Attribute Data</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.jst.jsf.facelet.core.internal.cm.addtagmd.AttributeData
- * @generated
- */
- public Adapter createAttributeDataAdapter()
- {
- 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;
- }
-
-} //AddTagMDAdapterFactory
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/cm/addtagmd/util/AddTagMDSwitch.java b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/cm/addtagmd/util/AddTagMDSwitch.java
deleted file mode 100644
index e15cffd..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/cm/addtagmd/util/AddTagMDSwitch.java
+++ /dev/null
@@ -1,168 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: AddTagMDSwitch.java,v 1.1 2010/03/08 18:49:42 cbateman Exp $
- */
-package org.eclipse.jst.jsf.facelet.core.internal.cm.addtagmd.util;
-
-import java.util.List;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-
-import org.eclipse.jst.jsf.facelet.core.internal.cm.addtagmd.*;
-
-/**
- * <!-- 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.
- * @param <T>
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.jsf.facelet.core.internal.cm.addtagmd.AddTagMDPackage
- * @generated
- */
-public class AddTagMDSwitch<T>
-{
- /**
- * The cached model package
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected static AddTagMDPackage modelPackage;
-
- /**
- * Creates an instance of the switch.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public AddTagMDSwitch()
- {
- if (modelPackage == null)
- {
- modelPackage = AddTagMDPackage.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 -->
- * @param theEObject
- * <!-- end-user-doc -->
- * @return the first non-null result returned by a <code>caseXXX</code> call.
- * @generated
- */
- public T 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 -->
- * @param theEClass
- * @param theEObject
- * <!-- end-user-doc -->
- * @return the first non-null result returned by a <code>caseXXX</code> call.
- * @generated
- */
- protected T doSwitch(EClass theEClass, EObject theEObject)
- {
- if (theEClass.eContainer() == modelPackage)
- {
- return doSwitch(theEClass.getClassifierID(), theEObject);
- }
- List<EClass> eSuperTypes = theEClass.getESuperTypes();
- return
- eSuperTypes.isEmpty() ?
- defaultCase(theEObject) :
- doSwitch(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 -->
- * @param classifierID
- * @param theEObject
- * <!-- end-user-doc -->
- * @return the first non-null result returned by a <code>caseXXX</code> call.
- * @generated
- */
- protected T doSwitch(int classifierID, EObject theEObject)
- {
- switch (classifierID)
- {
- case AddTagMDPackage.ELEMENT_DATA:
- {
- ElementData elementData = (ElementData)theEObject;
- T result = caseElementData(elementData);
- if (result == null) result = defaultCase(theEObject);
- return result;
- }
- case AddTagMDPackage.ATTRIBUTE_DATA:
- {
- AttributeData attributeData = (AttributeData)theEObject;
- T result = caseAttributeData(attributeData);
- if (result == null) result = defaultCase(theEObject);
- return result;
- }
- default: return defaultCase(theEObject);
- }
- }
-
- /**
- * Returns the result of interpreting the object as an instance of '<em>Element Data</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>Element Data</em>'.
- * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
- * @generated
- */
- public T caseElementData(ElementData object)
- {
- return null;
- }
-
- /**
- * Returns the result of interpreting the object as an instance of '<em>Attribute Data</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>Attribute Data</em>'.
- * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
- * @generated
- */
- public T caseAttributeData(AttributeData 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 T defaultCase(EObject object)
- {
- return null;
- }
-
-} //AddTagMDSwitch
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/cm/attributevalues/TemplateWebPathType.java b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/cm/attributevalues/TemplateWebPathType.java
deleted file mode 100644
index 572d7d5..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/cm/attributevalues/TemplateWebPathType.java
+++ /dev/null
@@ -1,179 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Oracle 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:
- * Cameron Bateman - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facelet.core.internal.cm.attributevalues;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jst.jsf.context.resolver.structureddocument.IDOMContextResolver;
-import org.eclipse.jst.jsf.context.resolver.structureddocument.IStructuredDocumentContextResolverFactory;
-import org.eclipse.jst.jsf.context.structureddocument.IStructuredDocumentContext;
-import org.eclipse.jst.jsf.facelet.core.internal.FaceletCorePlugin;
-import org.eclipse.jst.jsf.metadataprocessors.features.IPossibleValues;
-import org.eclipse.jst.jsf.metadataprocessors.features.PossibleValue;
-import org.eclipse.jst.jsf.taglibprocessing.attributevalues.WebPathType;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.resources.IVirtualContainer;
-import org.eclipse.wst.common.componentcore.resources.IVirtualResource;
-import org.w3c.dom.Attr;
-import org.w3c.dom.Node;
-
-/**
- * Web-path attribute value type that adds possible values support
- *
- * @author cbateman
- *
- */
-public class TemplateWebPathType extends WebPathType implements IPossibleValues
-{
-
- public List getPossibleValues()
- {
- final IStructuredDocumentContext context = getStructuredDocumentContext();
- final IDOMContextResolver resolver = IStructuredDocumentContextResolverFactory.INSTANCE
- .getDOMContextResolver(context);
- if (resolver != null)
- {
- final Node node = resolver.getNode();
- if (node instanceof Attr)
- {
- return createPossibleValues((Attr) node);
- }
- }
- return Collections.EMPTY_LIST;
- }
-
- private List createPossibleValues(final Attr node)
- {
- String currentPathString = node.getNodeValue();
-
- final List possibleValues = new ArrayList();
-
- if (currentPathString == null || "".equals(currentPathString.trim())) //$NON-NLS-1$
- {
- currentPathString = "/"; //$NON-NLS-1$
- }
-
- final IPath currentPath = new Path(currentPathString);
-
- final IVirtualContainer webRoot = getWebRoot();
-
- final IVirtualResource deepestElement = findDeepestCommonElement(
- currentPath, webRoot);
-
- if (deepestElement == null)
- {
- // empty
- return possibleValues;
- }
-
- final IResource[] allResources = deepestElement
- .getUnderlyingResources();
- for (final IResource res : allResources)
- {
- if (res instanceof IContainer)
- {
- try
- {
- for (final IResource child : ((IContainer) res).members())
- {
- if (child.exists())
- {
- IPath childPath = child.getProjectRelativePath();
- int numLeadingSegments = webRoot
- .getProjectRelativePath()
- .matchingFirstSegments(childPath);
- childPath = childPath
- .removeFirstSegments(numLeadingSegments);
- String pathName = null;
- if (currentPath.isAbsolute())
- {
- pathName = childPath.makeAbsolute()
- .toString();
- }
- else
- {
- pathName = childPath.makeRelative().toString();
- }
-
- final PossibleValue pv = new PossibleValue(
- pathName, pathName);
- possibleValues.add(pv);
- }
- }
- }
- catch (final CoreException ce)
- {
- FaceletCorePlugin.log("While trying possible values", ce); //$NON-NLS-1$
- }
- }
- }
- return possibleValues;
- }
-
- private IVirtualResource findDeepestCommonElement(
- final IPath currentPath, final IVirtualContainer webRoot)
- {
- final String[] segments = currentPath.segments();
- IVirtualResource deepestElement = null;
- if (segments != null)
- {
- IPath longestSubPath = new Path(""); //$NON-NLS-1$
- for (final String segment : segments)
- {
- longestSubPath = longestSubPath.append(segment);
- deepestElement = webRoot.findMember(longestSubPath);
- if (deepestElement == null)
- {
- longestSubPath = longestSubPath.removeLastSegments(1);
- break;
- }
- }
-
- deepestElement = webRoot.findMember(longestSubPath);
- if (deepestElement == null)
- {
- deepestElement = webRoot;
- }
- else
- {
- int avoidInfiniteLoopCount = 0;
- while(avoidInfiniteLoopCount < 1000 && // we timeout in cause of circular chains.
- deepestElement != null &&
- ! (deepestElement.getUnderlyingResource() instanceof IContainer))
- {
- deepestElement = deepestElement.getParent();
- }
-
- if (avoidInfiniteLoopCount == 1000)
- {
- throw new IllegalStateException();
- }
- }
- }
- return deepestElement;
- }
-
- private IVirtualContainer getWebRoot()
-
- {
- final IVirtualContainer webRoot = ComponentCore.createComponent(
- getProject()).getRootFolder();
-
- return webRoot;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/cm/strategy/AbstractExternalMetadataStrategy.java b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/cm/strategy/AbstractExternalMetadataStrategy.java
deleted file mode 100644
index 3a46644..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/cm/strategy/AbstractExternalMetadataStrategy.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Oracle 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:
- * Cameron Bateman - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facelet.core.internal.cm.strategy;
-
-import org.eclipse.jst.jsf.common.dom.TagIdentifier;
-import org.eclipse.jst.jsf.facelet.core.internal.cm.ExternalTagInfo;
-import org.eclipse.jst.jsf.facelet.core.internal.cm.TagInfo;
-
-/**
- * Super class of all external meta-data strategy.
- *
- * @author cbateman
- *
- */
-/* package */abstract class AbstractExternalMetadataStrategy implements
-IExternalMetadataStrategy
-{
- private final String _displayName;
- private final String _id;
-
- protected AbstractExternalMetadataStrategy(final String id,
- final String displayName)
- {
- _id = id;
- _displayName = displayName;
- }
-
- public final TagInfo getNoResult()
- {
- // this value must be "==" comparable
- return ExternalTagInfo.NULL_INSTANCE;
- }
-
- public abstract TagInfo perform(TagIdentifier input) throws Exception;
-
- public final String getDisplayName()
- {
- return _displayName;
- }
-
- public String getId()
- {
- return _id;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/cm/strategy/FaceletExternalMetadataStrategy.java b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/cm/strategy/FaceletExternalMetadataStrategy.java
deleted file mode 100644
index 149c341..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/cm/strategy/FaceletExternalMetadataStrategy.java
+++ /dev/null
@@ -1,138 +0,0 @@
-package org.eclipse.jst.jsf.facelet.core.internal.cm.strategy;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.Map;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jst.jsf.common.dom.TagIdentifier;
-import org.eclipse.jst.jsf.common.runtime.internal.view.model.common.ITagAttribute;
-import org.eclipse.jst.jsf.common.runtime.internal.view.model.common.ITagElement;
-import org.eclipse.jst.jsf.common.runtime.internal.view.model.common.Namespace;
-import org.eclipse.jst.jsf.designtime.internal.view.model.ITagRegistry;
-import org.eclipse.jst.jsf.facelet.core.internal.cm.AttributeCMAdapter;
-import org.eclipse.jst.jsf.facelet.core.internal.cm.TagInfo;
-import org.eclipse.jst.jsf.facelet.core.internal.util.ViewUtil;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNamedNodeMap;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNode;
-
-/**
- * The
- * @author cbateman
- *
- */
-public class FaceletExternalMetadataStrategy extends
- AbstractExternalMetadataStrategy
-{
- /**
- * The unique identifier for the strategy.
- */
- public final static String STRATEGY_ID = "org.eclipse.jst.jsf.facelet.core.internal.cm.strategy.FaceletExternalMetadataStrategy"; //$NON-NLS-1$
- private final IProject _project;
-
- /**
- * @param project
- */
- public FaceletExternalMetadataStrategy(final IProject project)
- {
- super(STRATEGY_ID, Messages.FaceletExternalMetadataStrategy_0);
- _project = project;
- }
-
- @Override
- public TagInfo perform(TagIdentifier input) throws Exception
- {
- final ITagRegistry tagRegistry = ViewUtil.getTagRegistry(_project);
-
- if (tagRegistry != null)
- {
- Namespace tagLibrary = tagRegistry.getTagLibrary(input.getUri());
- if (tagLibrary != null)
- {
- return new FaceletInternalInfo(tagLibrary);
- }
- }
- return getNoResult();
- }
-
- private static class FaceletInternalInfo extends TagInfo
- {
- private final Namespace _namespace;
-
- public FaceletInternalInfo(final Namespace namespace)
- {
- _namespace = namespace;
- }
-
- @Override
- public Object getTagProperty(String tagName, String key)
- {
- if ("description".equals(key)) //$NON-NLS-1$
- {
- // TODO:
- }
- return null;
- }
-
- @Override
- public CMNamedNodeMap getAttributes(String tagName)
- {
- ITagElement viewElement = _namespace.getViewElement(tagName);
- if (viewElement != null)
- {
- return new MyNodeNameMap(viewElement);
- }
- return null;
- }
-
- private static class MyNodeNameMap implements CMNamedNodeMap
- {
- private final ITagElement _tagElement;
- private final ArrayList<CMNode> _attrs;
-
- public MyNodeNameMap(final ITagElement tagElement)
- {
- super();
- _tagElement = tagElement;
- _attrs = new ArrayList<CMNode>();
- for (final Map.Entry<String, ? extends ITagAttribute> entry : _tagElement.getAttributes().entrySet())
- {
- final ITagAttribute attr = entry.getValue();
- _attrs.add(new AttributeCMAdapter(attr));
- }
- }
-
- public int getLength()
- {
- return _attrs.size();
- }
-
- public CMNode getNamedItem(String name)
- {
- if (name == null)
- {
- return null;
- }
- for (final CMNode cmNode : _attrs)
- {
- if (name.equals(cmNode.getNodeName()))
- {
- return cmNode;
- }
- }
- return null;
- }
-
- public CMNode item(int index)
- {
- return _attrs.get(index);
- }
-
- public Iterator iterator()
- {
- return Collections.unmodifiableList(_attrs).iterator();
- }
- }
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/cm/strategy/IExternalMetadataStrategy.java b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/cm/strategy/IExternalMetadataStrategy.java
deleted file mode 100644
index 320e824..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/cm/strategy/IExternalMetadataStrategy.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Oracle 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:
- * Cameron Bateman - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facelet.core.internal.cm.strategy;
-
-import org.eclipse.jst.jsf.common.dom.TagIdentifier;
-import org.eclipse.jst.jsf.common.internal.strategy.IIdentifiableStrategy;
-import org.eclipse.jst.jsf.facelet.core.internal.cm.ExternalTagInfo;
-import org.eclipse.jst.jsf.facelet.core.internal.cm.TagInfo;
-
-/**
- * A strategy whose algorithm loads the tag CM data for a tag.
- *
- * @author cbateman
- *
- */
-public interface IExternalMetadataStrategy extends
- IIdentifiableStrategy<TagIdentifier, TagInfo, String>
-{
-
- /**
- * A null strategy that returns no result for all queries
- * @author cbateman
- *
- */
- static class NullExternalMetadataStrategy implements IExternalMetadataStrategy
- {
-
- public TagInfo getNoResult()
- {
- return ExternalTagInfo.NULL_INSTANCE;
- }
-
- public TagInfo perform(TagIdentifier input) throws Exception
- {
- return getNoResult();
- }
-
- public String getDisplayName()
- {
- return "NULL instance; you shouldn't see this label!"; //$NON-NLS-1$
- }
-
- public String getId()
- {
- return "NULL Strategy"; //$NON-NLS-1$
- }
-
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/cm/strategy/InternalNamedNodeMap.java b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/cm/strategy/InternalNamedNodeMap.java
deleted file mode 100644
index f92b8c7..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/cm/strategy/InternalNamedNodeMap.java
+++ /dev/null
@@ -1,96 +0,0 @@
-package org.eclipse.jst.jsf.facelet.core.internal.cm.strategy;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNamedNodeMap;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNode;
-
-/*package*/ class InternalNamedNodeMap implements CMNamedNodeMap
-{
- private final List<CMNode> _nodes = new ArrayList<CMNode>();
-
- /**
- * Add a node to the map. This is not on the CMNamedNodeMap and is used
- * to populate the map.
- *
- * @param node
- */
- public void add(final CMNode node)
- {
- _nodes.add(node);
- }
-
- public int getLength()
- {
- return _nodes.size();
- }
-
- public CMNode getNamedItem(final String name)
- {
- for (final CMNode foundNode : _nodes)
- {
- if (name.equals(foundNode.getNodeName()))
- {
- return foundNode;
- }
- }
- return null;
- }
-
- public CMNode item(final int index)
- {
- if (index < _nodes.size())
- {
- return _nodes.get(index);
- }
- return null;
- }
-
- public Iterator<?> iterator()
- {
- return Collections.unmodifiableList(_nodes).iterator();
- }
-
- /**
- * A null instance object for InternalNamedNodeMap
- *
- */
- public static class NullInternalNamedNodeMap extends InternalNamedNodeMap
- {
-
- @Override
- public void add(final CMNode node)
- {
- // do nothing
- }
-
- @Override
- public int getLength()
- {
- // always empty
- return 0;
- }
-
- @Override
- public CMNode getNamedItem(final String name)
- {
- return null;
- }
-
- @Override
- public CMNode item(final int index)
- {
- return null;
- }
-
- @Override
- public Iterator<?> iterator()
- {
- return Collections.EMPTY_LIST.iterator();
- }
-
- }
-}
\ No newline at end of file
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/cm/strategy/JSPExternalMetadataStrategy.java b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/cm/strategy/JSPExternalMetadataStrategy.java
deleted file mode 100644
index e704e03..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/cm/strategy/JSPExternalMetadataStrategy.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Oracle 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:
- * Cameron Bateman - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facelet.core.internal.cm.strategy;
-
-import org.eclipse.jst.jsf.common.dom.TagIdentifier;
-import org.eclipse.jst.jsf.facelet.core.internal.cm.ExternalTagInfo;
-import org.eclipse.jst.jsf.facelet.core.internal.cm.TagInfo;
-import org.eclipse.jst.jsp.core.internal.contentmodel.tld.provisional.TLDDocument;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNamedNodeMap;
-
-/**
- * A metadata strategy that uses JSP TLD metadata.
- *
- * @author cbateman
- *
- */
-public class JSPExternalMetadataStrategy extends
- AbstractExternalMetadataStrategy
-{
- private final TLDDocument _doc;
- /**
- * The unique identifier for the strategy.
- */
- public final static String STRATEGY_ID = "org.eclipse.jst.jsf.facelet.core.internal.cm.strategy.JSPExternalMetadataStrategy"; //$NON-NLS-1$
-
- /**
- * @param doc
- */
- public JSPExternalMetadataStrategy(final TLDDocument doc)
- {
- super(STRATEGY_ID, Messages.JSPExternalMetadataStrategy_DisplayName);
- _doc = doc;
- }
-
- @Override
- public TagInfo perform(final TagIdentifier input) throws Exception
- {
- if (_doc != null)
- {
- return new TLDMetadataExternalInfo(_doc);
- }
- return getNoResult();
- }
-
- private static class TLDMetadataExternalInfo extends ExternalTagInfo
- {
- private final TLDDocument _doc;
-
- public TLDMetadataExternalInfo(final TLDDocument doc)
- {
- _doc = doc;
- }
-
- @Override
- public CMNamedNodeMap getAttributes(final String tagName)
- {
- final CMElementDeclaration element = (CMElementDeclaration) _doc
- .getElements().getNamedItem(tagName);
-
- if (element != null)
- {
- return element.getAttributes();
- }
- return null;
- }
-
- @Override
- public Object getTagProperty(final String tagName, final String key)
- {
- final CMElementDeclaration element = (CMElementDeclaration) _doc
- .getElements().getNamedItem(tagName);
- if (element != null)
- {
- return element.getProperty(key);
- }
- return null;
- }
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/cm/strategy/MDExternalMetadataStrategy.java b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/cm/strategy/MDExternalMetadataStrategy.java
deleted file mode 100644
index b7b2b21..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/cm/strategy/MDExternalMetadataStrategy.java
+++ /dev/null
@@ -1,416 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Oracle 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:
- * Cameron Bateman - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facelet.core.internal.cm.strategy;
-
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.concurrent.atomic.AtomicBoolean;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.ISafeRunnable;
-import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
-import org.eclipse.jface.util.SafeRunnable;
-import org.eclipse.jst.jsf.common.dom.TagIdentifier;
-import org.eclipse.jst.jsf.common.internal.managedobject.IManagedObject;
-import org.eclipse.jst.jsf.common.internal.managedobject.ObjectManager.ManagedObjectException;
-import org.eclipse.jst.jsf.common.internal.resource.ResourceSingletonObjectManager;
-import org.eclipse.jst.jsf.facelet.core.internal.FaceletCorePlugin;
-import org.eclipse.jst.jsf.facelet.core.internal.cm.AttributeCMAdapter;
-import org.eclipse.jst.jsf.facelet.core.internal.cm.ExternalTagInfo;
-import org.eclipse.jst.jsf.facelet.core.internal.cm.TagInfo;
-import org.eclipse.jst.jsf.facelet.core.internal.cm.addtagmd.AddTagMDPackage;
-import org.eclipse.jst.jsf.facelet.core.internal.cm.addtagmd.AttributeData;
-import org.eclipse.jst.jsf.facelet.core.internal.cm.addtagmd.AttributeUsage;
-import org.eclipse.jst.jsf.facelet.core.internal.cm.addtagmd.ElementData;
-import org.eclipse.jst.jsf.facelet.core.internal.cm.addtagmd.provider.IResourceProvider;
-import org.eclipse.jst.jsf.facelet.core.internal.cm.strategy.InternalNamedNodeMap.NullInternalNamedNodeMap;
-import org.eclipse.jst.jsf.facelet.core.internal.util.TagMetadataLoader;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMAttributeDeclaration;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNamedNodeMap;
-
-/**
- * An external meta-data strategy that uses the JSF meta-data framework.
- *
- * @author cbateman
- *
- */
-public class MDExternalMetadataStrategy extends
- AbstractExternalMetadataStrategy implements IManagedObject
-{
- private static MySingletonManager MANAGER = new MySingletonManager();
-
- /**
- * @param project
- * @return the instance of the strategy for project or
- */
- public static IExternalMetadataStrategy create(final IProject project)
- {
- try
- {
- return MANAGER.getInstance(project);
- }
- catch (final ManagedObjectException e)
- {
- FaceletCorePlugin.log(
- "Getting managed instance of tag metadata strategy", e); //$NON-NLS-1$
- }
- return new NullExternalMetadataStrategy();
- }
-
- /**
- * The unique identifier for the strategy.
- */
- public final static String STRATEGY_ID = "org.eclipse.jst.jsf.facelet.core.internal.cm.strategy.MDExternalMetadataStrategy"; //$NON-NLS-1$
-
- // private static final String VAR = "var"; //$NON-NLS-1$
- // private static final String VALUE = "value"; //$NON-NLS-1$
- // private static final String SRC = "src"; //$NON-NLS-1$
- // private static final String NAME = "name"; //$NON-NLS-1$
- // private static final String HOTKEY = "hotkey"; //$NON-NLS-1$
- // private static final String TEMPLATE = "template"; //$NON-NLS-1$
- // private static final String BINDING = "binding"; //$NON-NLS-1$
- // private static final String ID = "id"; //$NON-NLS-1$
-
- private final IProject _project;
- private final TagMetadataLoader _tagMetadataLoader;
- private final Map<String, MDExternalTagInfo> _cached;
- private final AtomicBoolean _isDisposed = new AtomicBoolean(
- false);
-
- /**
- * Default constructor
- *
- * @param project
- */
- private MDExternalMetadataStrategy(final IProject project)
- {
- super(STRATEGY_ID, Messages.MDExternalMetadataStrategy_DisplayName);
- _project = project;
- _tagMetadataLoader = new TagMetadataLoader(_project);
- _cached = new HashMap<String, MDExternalTagInfo>();
- }
-
- public void checkpoint()
- {
- // do nothing
- }
-
- public void destroy()
- {
- // currently no persistent state, so just dispose
- }
-
- public void dispose()
- {
- if (_isDisposed.compareAndSet(false, true))
- {
- _cached.clear();
- }
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.jsf.facelet.core.internal.cm.strategy.
- * AbstractExternalMetadataStrategy
- * #perform(org.eclipse.jst.jsf.common.dom.TagIdentifier)
- */
- @Override
- public TagInfo perform(final TagIdentifier input) throws Exception
- {
- MDExternalTagInfo tagInfo = _cached.get(input.getUri());
-
- if (tagInfo == null)
- {
- tagInfo = new MDExternalTagInfo(input.getUri(), _tagMetadataLoader);
- _cached.put(input.getUri(), tagInfo);
- }
- return tagInfo;
- }
-
- private static class MDExternalTagInfo extends ExternalTagInfo
- {
- private final String _uri;
- private final TagMetadataLoader _tagMetadataLoader;
- private final Map<String, InternalNamedNodeMap> _attributes;
-
- public MDExternalTagInfo(final String uri,
- final TagMetadataLoader tagMetadataLoader)
- {
- _uri = uri;
- _tagMetadataLoader = tagMetadataLoader;
- _attributes = new HashMap<String, InternalNamedNodeMap>();
- }
-
- @Override
- public CMNamedNodeMap getAttributes(final String tagName)
- {
- final InternalNamedNodeMap nodeMap = _attributes.get(tagName);
- final InternalNamedNodeMap[] innerClassNodeMap = new InternalNamedNodeMap[1];
- innerClassNodeMap[0] = nodeMap;
-
- if (nodeMap == null)
- {
- SafeRunnable.run(new ISafeRunnable()
- {
- public void run()
- {
- final ElementData data = _tagMetadataLoader
- .getElementData(_uri, tagName);
-
- if (data != null)
- {
- innerClassNodeMap[0] = new InternalNamedNodeMap();
-
- for (final AttributeData attribute : data
- .getAttributes())
- {
- innerClassNodeMap[0]
- .add(createAttribute(attribute));
- }
- _attributes.put(tagName, innerClassNodeMap[0]);
- }
- // no meta-data found for this tag, so mark as null
- // instance so future calls don't bother a re-lookup.
- else
- {
- _attributes.put(tagName,
- MDExternalMetadataStrategy.NULL_INSTANCE);
- }
- }
-
- public void handleException(final Throwable exception)
- {
- FaceletCorePlugin.log(
- "While loading attribute meta-data", exception); //$NON-NLS-1$
- }
- });
- }
-
- // don't return the null map instance
- if (innerClassNodeMap[0] == MDExternalMetadataStrategy.NULL_INSTANCE)
- {
- return null;
- }
- return innerClassNodeMap[0];
- }
-
- @Override
- public Object getTagProperty(final String tagName, final String key)
- {
- final Object[] value = new Object[1];
- value[0] = null;
-
- SafeRunnable.run(new ISafeRunnable()
- {
- public void run()
- {
- if ("description".equals(key)) //$NON-NLS-1$
- {
- value[0] = _tagMetadataLoader.getDescription(_uri,
- tagName);
- }
- }
-
- public void handleException(final Throwable exception)
- {
- FaceletCorePlugin.log(
- "While loading tag property meta-data", exception); //$NON-NLS-1$
- }
- });
- return value[0];
- }
- }
-
- private final static NullInternalNamedNodeMap NULL_INSTANCE = new NullInternalNamedNodeMap();
-
-
-
- // temporary: transfer out to metadata
- final static Map<String, InternalNamedNodeMap> _faceletData;
-
- static
- {
- // final String ID_DESCRIPTION =
- // Messages.MDExternalMetadataStrategy_ID_DESCRIPTION;
- // final String BINDING_DESCRIPTION =
- // Messages.MDExternalMetadataStrategy_BINDING_DESCRIPTION;
- // final String TEMPLATE_DESCRIPTION =
- // Messages.MDExternalMetadataStrategy_TEMPLATE_DESCRIPTION;
- // final String HOTKEY_DESCRIPTION =
- // Messages.MDExternalMetadataStrategy_HOTKEY_DESCRIPTION;
- // final String DEFINE_NAME_DESCRIPTION =
- // Messages.MDExternalMetadataStrategy_DEFINE_NAME_DESCRIPTION;
- // final String SRC_DESCRIPTION =
- // Messages.MDExternalMetadataStrategy_SRC_DESCRIPTION;
- // final String INSERT_NAME_DESCRIPTION =
- // Messages.MDExternalMetadataStrategy_INSERT_NAME_DESCRIPTION;
- // final String PARAM_NAME_DESCRIPTION =
- // Messages.MDExternalMetadataStrategy_PARAM_NAME_DESCRIPTION;
- // final String PARAM_VALUE_DESCRIPTION =
- // Messages.MDExternalMetadataStrategy_PARAM_VALUE_DESCRIPTION;
- // final String REPEAT_VAR_DESCRIPTION =
- // Messages.MDExternalMetadataStrategy_REPEAT_VAR_DESCRIPTION;
- // final String REPEAT_VALUE_DESCRIPTION =
- // Messages.MDExternalMetadataStrategy_REPEAT_VALUE_DESCRIPTION;
-
- final Map<String, InternalNamedNodeMap> map = new HashMap<String, InternalNamedNodeMap>();
- // component
- // InternalNamedNodeMap nodeMap = new InternalNamedNodeMap();
- // nodeMap.add(createAttribute(ID, CMAttributeDeclaration.OPTIONAL,
- // ID_DESCRIPTION));
- // nodeMap.add(createAttribute(BINDING, CMAttributeDeclaration.OPTIONAL,
- // BINDING_DESCRIPTION));
- // map.put(IFaceletTagConstants.TAG_COMPONENT, nodeMap);
- //
- // // composition
- // nodeMap = new InternalNamedNodeMap();
- // nodeMap.add(createAttribute(TEMPLATE,
- // CMAttributeDeclaration.OPTIONAL,
- // TEMPLATE_DESCRIPTION));
- // map.put(IFaceletTagConstants.TAG_COMPOSITION, nodeMap);
-
- // debug
- // nodeMap = new InternalNamedNodeMap();
- // nodeMap.add(createAttribute(HOTKEY, CMAttributeDeclaration.OPTIONAL,
- // HOTKEY_DESCRIPTION));
- // map.put(IFaceletTagConstants.TAG_DEBUG, nodeMap);
-
- // decorate
- // nodeMap = new InternalNamedNodeMap();
- // nodeMap.add(createAttribute(TEMPLATE,
- // CMAttributeDeclaration.REQUIRED,
- // TEMPLATE_DESCRIPTION));
- // map.put(IFaceletTagConstants.TAG_DECORATE, nodeMap);
-
- // define
- // nodeMap = new InternalNamedNodeMap();
- // nodeMap.add(createAttribute(NAME, CMAttributeDeclaration.REQUIRED,
- // DEFINE_NAME_DESCRIPTION));
- // map.put(IFaceletTagConstants.TAG_DEFINE, nodeMap);
-
- // fragment
- // nodeMap = new InternalNamedNodeMap();
- // nodeMap.add(createAttribute(ID, CMAttributeDeclaration.OPTIONAL,
- // ID_DESCRIPTION));
- // nodeMap.add(createAttribute(BINDING, CMAttributeDeclaration.OPTIONAL,
- // BINDING_DESCRIPTION));
- // map.put(IFaceletTagConstants.TAG_FRAGMENT, nodeMap);
-
- // include
- // nodeMap = new InternalNamedNodeMap();
- // nodeMap.add(createAttribute(SRC, CMAttributeDeclaration.REQUIRED,
- // SRC_DESCRIPTION));
- // map.put(IFaceletTagConstants.TAG_INCLUDE, nodeMap);
-
- // insert
- // nodeMap = new InternalNamedNodeMap();
- // nodeMap.add(createAttribute(NAME, CMAttributeDeclaration.OPTIONAL,
- // INSERT_NAME_DESCRIPTION));
- // map.put(IFaceletTagConstants.TAG_INSERT, nodeMap);
-
- // param
- // nodeMap = new InternalNamedNodeMap();
- // nodeMap.add(createAttribute(NAME, CMAttributeDeclaration.REQUIRED,
- // PARAM_NAME_DESCRIPTION));
- // nodeMap.add(createAttribute(VALUE, CMAttributeDeclaration.REQUIRED,
- // PARAM_VALUE_DESCRIPTION));
- // map.put(IFaceletTagConstants.TAG_PARAM, nodeMap);
-
- // remove
- // nodeMap = new InternalNamedNodeMap();
- // // no attributes
- // map.put(IFaceletTagConstants.TAG_PARAM, nodeMap);
-
- // repeat
- // nodeMap = new InternalNamedNodeMap();
- // nodeMap.add(createAttribute(VALUE, CMAttributeDeclaration.REQUIRED,
- // REPEAT_VALUE_DESCRIPTION));
- // nodeMap.add(createAttribute(VAR, CMAttributeDeclaration.REQUIRED,
- // REPEAT_VAR_DESCRIPTION));
- // map.put(IFaceletTagConstants.TAG_REPEAT, nodeMap);
-
- _faceletData = Collections.unmodifiableMap(map);
- }
-
- private static CMAttributeDeclaration createAttribute(
- final AttributeData attributeData)
- {
- final AttributeCMAdapter attribute = new AttributeCMAdapter(
- attributeData.getName(), convertUsageEnum(attributeData
- .getUsage()));
-
- final ComposedAdapterFactory factory = new ComposedAdapterFactory(
- ComposedAdapterFactory.Descriptor.Registry.INSTANCE);
-
- final Object provider = factory.adapt(attributeData,
- IResourceProvider.class);
-
- // get the description from meta-data and feed through the provider
- // for possible translation
- String description = attributeData.getDescription();
-
- if (provider instanceof IResourceProvider)
- {
- final IResourceProvider resProvider = (IResourceProvider) provider;
- final String translated = resProvider.getTranslatedString(
- attributeData, AddTagMDPackage.eINSTANCE
- .getAttributeData_Description());
- description = translated != null ? translated : description;
- }
-
- attribute.setDescription(description);
- return attribute;
- }
-
- private static int convertUsageEnum(final AttributeUsage usage)
- {
- switch (usage)
- {
- case OPTIONAL:
- return CMAttributeDeclaration.OPTIONAL;
- case REQUIRED:
- return CMAttributeDeclaration.REQUIRED;
- case FIXED:
- return CMAttributeDeclaration.FIXED;
- case PROHIBITED:
- return CMAttributeDeclaration.PROHIBITED;
- default:
- return CMAttributeDeclaration.OPTIONAL;
- }
- }
-
- private static class MySingletonManager
- extends
- ResourceSingletonObjectManager<MDExternalMetadataStrategy, IProject>
- {
-
- protected MySingletonManager()
- {
- super(ResourcesPlugin.getWorkspace());
- }
-
- @Override
- protected MDExternalMetadataStrategy createNewInstance(
- final IProject resource)
- {
- return new MDExternalMetadataStrategy(resource);
- }
-
- }
-
- public boolean isDisposed()
- {
- return _isDisposed.get();
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/cm/strategy/Messages.java b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/cm/strategy/Messages.java
deleted file mode 100644
index 484f0cd..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/cm/strategy/Messages.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Oracle 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:
- * Cameron Bateman - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facelet.core.internal.cm.strategy;
-
-import org.eclipse.osgi.util.NLS;
-
-/**
- *
- * @author cbateman
- *
- */
-/*package*/ class Messages extends NLS
-{
- private static final String BUNDLE_NAME = "org.eclipse.jst.jsf.facelet.core.internal.cm.strategy.messages"; //$NON-NLS-1$
-
-
- public static String FaceletExternalMetadataStrategy_0;
-
-
- public static String JSPExternalMetadataStrategy_DisplayName;
-
-
- /**
- * Display name for MDExternalMetadataStrategy
- */
- public static String MDExternalMetadataStrategy_DisplayName;
-
- public static String MDExternalMetadataStrategy_BINDING_DESCRIPTION;
- public static String MDExternalMetadataStrategy_DEFINE_NAME_DESCRIPTION;
- public static String MDExternalMetadataStrategy_HOTKEY_DESCRIPTION;
- public static String MDExternalMetadataStrategy_ID_DESCRIPTION;
- public static String MDExternalMetadataStrategy_INSERT_NAME_DESCRIPTION;
- public static String MDExternalMetadataStrategy_PARAM_NAME_DESCRIPTION;
- public static String MDExternalMetadataStrategy_PARAM_VALUE_DESCRIPTION;
- public static String MDExternalMetadataStrategy_REPEAT_VALUE_DESCRIPTION;
- public static String MDExternalMetadataStrategy_REPEAT_VAR_DESCRIPTION;
- public static String MDExternalMetadataStrategy_SRC_DESCRIPTION;
- public static String MDExternalMetadataStrategy_TEMPLATE_DESCRIPTION;
-
-
- static
- {
- // initialize resource bundle
- NLS.initializeMessages(BUNDLE_NAME, Messages.class);
- }
-
- private Messages()
- {
- // no external instantiation
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/cm/strategy/TagInfoStrategyComposite.java b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/cm/strategy/TagInfoStrategyComposite.java
deleted file mode 100644
index b2f2a3d..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/cm/strategy/TagInfoStrategyComposite.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Oracle 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:
- * Cameron Bateman - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facelet.core.internal.cm.strategy;
-
-import java.util.Collection;
-import java.util.Iterator;
-
-import org.eclipse.jst.jsf.common.dom.TagIdentifier;
-import org.eclipse.jst.jsf.common.internal.policy.IdentifierOrderedIteratorPolicy;
-import org.eclipse.jst.jsf.common.internal.strategy.IteratorPolicyBasedStrategyComposite;
-import org.eclipse.jst.jsf.facelet.core.internal.cm.ExternalTagInfo;
-import org.eclipse.jst.jsf.facelet.core.internal.cm.TagInfo;
-
-/**
- * A composite of strategies for deriving external tag metadata.
- *
- * @author cbateman
- *
- */
-public class TagInfoStrategyComposite
- extends
- IteratorPolicyBasedStrategyComposite<TagIdentifier, TagInfo, TagInfo, String, IExternalMetadataStrategy>
-{
- private final Iterable<String> _policyOrder;
-
- /**
- * @param policyOrder
- */
- public TagInfoStrategyComposite(final Iterable<String> policyOrder)
- {
- super(new MyIteratorPolicy(policyOrder));
- _policyOrder = policyOrder;
- }
-
- @Override
- public TagInfo getNoResult()
- {
- return ExternalTagInfo.NULL_INSTANCE;
- }
-
- /**
- *
- */
- public void resetIterator()
- {
- setPolicy(new MyIteratorPolicy(_policyOrder));
- }
-
- private static class MyIteratorPolicy extends
- IdentifierOrderedIteratorPolicy<String>
- {
- private Iterator<String> _iterator;
-
- public MyIteratorPolicy(final Iterable<String> policyOrder)
- {
- super(policyOrder);
- setExcludeNonExplicitValues(true);
- }
-
- @Override
- public Iterator<String> getIterator(
- final Collection<String> forCollection)
- {
- if (_iterator == null)
- {
- _iterator = super.getIterator(forCollection);
- }
- return _iterator;
- }
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/cm/strategy/messages.properties b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/cm/strategy/messages.properties
deleted file mode 100644
index 8e41092..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/cm/strategy/messages.properties
+++ /dev/null
@@ -1,14 +0,0 @@
-FaceletExternalMetadataStrategy_0=Facelet metadata strategy
-JSPExternalMetadataStrategy_DisplayName=JSP TLD meta-data
-MDExternalMetadataStrategy_DisplayName=Tag meta-data from MD framework
-MDExternalMetadataStrategy_BINDING_DESCRIPTION=A method binding of the form of the form \#{bean.binding} where 'binding' has the signature <b>UIComponent binding()</b>, that returns the component instance to use. If not present, Facelets will automatically instantiate one.
-MDExternalMetadataStrategy_DEFINE_NAME_DESCRIPTION=The name of a template area. This name is referenced in instance documents using the insert tag
-MDExternalMetadataStrategy_HOTKEY_DESCRIPTION=The key in combination with CTRL-SHIFT to use to launch the debug viewer
-MDExternalMetadataStrategy_ID_DESCRIPTION=Assign a unique idea to generated component. If not present, Facelets will automatically generate one.
-MDExternalMetadataStrategy_INSERT_NAME_DESCRIPTION=The name of a template area to insert (defined in the template using the define tag). If not specified, the entire template will be inserted.
-MDExternalMetadataStrategy_PARAM_NAME_DESCRIPTION=The name of the new EL variable to declare
-MDExternalMetadataStrategy_PARAM_VALUE_DESCRIPTION=The literal or EL value to assign to the new variable
-MDExternalMetadataStrategy_REPEAT_VALUE_DESCRIPTION=The EL expression used to derive the list of items to repeat over
-MDExternalMetadataStrategy_REPEAT_VAR_DESCRIPTION=The name of the EL variable to use as the iterator
-MDExternalMetadataStrategy_SRC_DESCRIPTION=The path, absolute or relative to the original request, to another Facelet to include. May be EL. e.g. 'headerPage.xhtml'
-MDExternalMetadataStrategy_TEMPLATE_DESCRIPTION=A uri that points to the template to use. e.g. /WEB-INF/templates/mytemplate.xhtml
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/facet/ChangeActionType.java b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/facet/ChangeActionType.java
deleted file mode 100644
index 3348976..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/facet/ChangeActionType.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Oracle 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:
- * Cameron Bateman - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facelet.core.internal.facet;
-
-/**
- * Indicates the type of change that should be made with the data in a
- * FacetChangeModel.
- *
- * @author cbateman
- *
- */
-public enum ChangeActionType
-{
- /**
- * Change is to add indicated values
- */
- ADD,
-
- /**
- * Change is to remove indicated values
- */
- REMOVE
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/facet/FaceletChangeDelegate.java b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/facet/FaceletChangeDelegate.java
deleted file mode 100644
index 84a5bb2..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/facet/FaceletChangeDelegate.java
+++ /dev/null
@@ -1,160 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Oracle 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:
- * Cameron Bateman - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facelet.core.internal.facet;
-
-import java.util.Iterator;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.jst.jsf.facelet.core.internal.FaceletCoreTraceOptions;
-import org.eclipse.jst.jsf.facesconfig.emf.ApplicationType;
-import org.eclipse.jst.jsf.facesconfig.emf.FacesConfigType;
-import org.eclipse.jst.jsf.facesconfig.emf.ViewHandlerType;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.common.project.facet.core.IDelegate;
-import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
-
-/**
- * The super-class of all Facelet facet change delegates. The only expected
- * delegates at this time are install and uninstall. Each super-class must
- * decide the meaning of "change" and implement the abstract members
- * appropriately.
- *
- * @author cbateman
- *
- */
-public abstract class FaceletChangeDelegate implements IDelegate
-{
- /**
- * The default name of the Facelet runtime view handler
- */
- protected static final String RUNTIME_VIEWHANDLER_CLASS_NAME = "com.sun.facelets.FaceletViewHandler"; //$NON-NLS-1$
-
- public void execute(final IProject project, final IProjectFacetVersion fv,
- final Object config, final IProgressMonitor monitor)
- throws CoreException
- {
- PlatformUI.getWorkbench().getDisplay().syncExec(new Runnable()
- {
- public void run()
- {
- final FacetChangeModel model = (FacetChangeModel) config;
-
- // XXX: look at glassfish changes
- handleDesignTimeViewHandler(project);
-
- if (model.isChgViewHandler())
- {
- maybeChangeFaceletViewHandler(project, monitor);
- }
-
- final WebAppConfigurator configurator = WebAppConfigurator
- .getConfigurator(project);
-
- if (configurator != null)
- {
- maybeChangeDefaultSuffix(model, configurator);
- maybeChangeConfigureListener(model, configurator);
- maybeChangeWebLifecycleListener(model, configurator);
- }
- else if (FaceletCoreTraceOptions.TRACE_FACETCHANGEDELEGATE)
- {
- FaceletCoreTraceOptions
- .log("FaceletChangeDelegate: No web configurator"); //$NON-NLS-1$
- }
- }
- });
- }
-
- /**
- * Performs the change to the web lifecycle listener configuration of of the
- * web.xml model using configurator, if applicable.
- *
- * @param model
- * @param configurator
- */
- protected abstract void maybeChangeWebLifecycleListener(
- FacetChangeModel model, WebAppConfigurator configurator);
-
- /**
- * Performs the change to the configure listener configuration of the
- * web.xml model using configurator, if applicable.
- *
- * @param model
- * @param configurator
- */
- protected abstract void maybeChangeConfigureListener(
- FacetChangeModel model, WebAppConfigurator configurator);
-
- /**
- * Performs the change to the DEFAULT_SUFFIX configuration of the web.xml
- * model using configurator, if applicable.
- *
- * @param model
- * @param configurator
- */
- protected abstract void maybeChangeDefaultSuffix(FacetChangeModel model,
- WebAppConfigurator configurator);
-
- /**
- * Changes the runtime view handler settings on project if applicable.
- *
- * @param project
- * @param monitor
- *
- */
- protected abstract void maybeChangeFaceletViewHandler(IProject project,
- IProgressMonitor monitor);
-
- /**
- * Change the designtime view handler if applicable.
- *
- * @param project
- */
- protected abstract void handleDesignTimeViewHandler(final IProject project);
-
- /**
- * @return a user displayable name of the sub-classing change delegate.
- */
- protected abstract String getDisplayName();
-
- /**
- * @param root
- * @return true if the Facelet view handler is already present in the
- * WEB-INF/faces-config.xml file.
- */
- protected final boolean isViewHandlerPresent(final FacesConfigType root)
- {
- final EList<?> applications = root.getApplication();
- for (final Object name : applications)
- {
- final ApplicationType app = (ApplicationType) name;
- if (app != null)
- {
- for (final Iterator<?> viewIt = app.getViewHandler().iterator(); viewIt
- .hasNext();)
- {
- final ViewHandlerType viewHandler = (ViewHandlerType) viewIt
- .next();
- if (viewHandler != null
- && RUNTIME_VIEWHANDLER_CLASS_NAME
- .equals(viewHandler.getTextContent().trim()))
- {
- return true;
- }
- }
- }
- }
- return false;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/facet/FaceletFacet.java b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/facet/FaceletFacet.java
deleted file mode 100644
index ed425a4..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/facet/FaceletFacet.java
+++ /dev/null
@@ -1,96 +0,0 @@
-package org.eclipse.jst.jsf.facelet.core.internal.facet;
-
-import java.util.Iterator;
-import java.util.Set;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jst.jsf.core.internal.JSFCorePlugin;
-import org.eclipse.wst.common.project.facet.core.IFacetedProject;
-import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
-import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
-
-/**
- * Facelet facet constants and utilities
- * @author cbateman
- *
- */
-public final class FaceletFacet
-{
- /**
- * Facelet facet id
- */
- public final static String FACET_ID = "jsf.facelet"; //$NON-NLS-1$
- /**
- * The id of the Facelet HTML view handler
- */
- public final static String VIEW_HANDLER_ID = "org.eclipse.jst.jsf.facelet.core.html.viewhandler"; //$NON-NLS-1$
- static final String COM_SUN_FACES_APPLICATION_WEBAPP_LIFECYCLE_LISTENER = "com.sun.faces.application.WebappLifecycleListener"; //$NON-NLS-1$
- static final String COM_SUN_FACES_CONFIG_CONFIGURE_LISTENER = "com.sun.faces.config.ConfigureListener"; //$NON-NLS-1$
- static final String XHTML = ".xhtml"; //$NON-NLS-1$
- static final String JAVAX_FACES_DEFAULT_SUFFIX = "javax.faces.DEFAULT_SUFFIX"; //$NON-NLS-1$
-
- private FaceletFacet()
- {
- // no external instantiation
- }
-
- /**
- * @param project
- * @return true if projec has the facelet facet installed.
- */
- public static boolean hasFacet(final IProject project)
- {
- final IProjectFacetVersion facetVersion = getProjectFacet(project);
-
- if (facetVersion != null)
- {
- return true;
- }
- return false;
- }
-
- /**
- * Get the facet version for the project
- *
- * @param project
- * @return the project facet version or null if could not be found or if
- * project is not accessible
- */
- @SuppressWarnings("unchecked")
- public static IProjectFacetVersion getProjectFacet(final IProject project)
- {
- // check for null or inaccessible project
- if (project != null && project.isAccessible())
- {
- // check for Facelet facet on project
- try
- {
- final IFacetedProject facetedProject = ProjectFacetsManager
- .create(project);
- if (facetedProject != null)
- {
- final Set projectFacets = facetedProject.getProjectFacets();
- final Iterator itProjectFacets = projectFacets.iterator();
- while (itProjectFacets.hasNext())
- {
- final IProjectFacetVersion projectFacetVersion = (IProjectFacetVersion) itProjectFacets
- .next();
- if (FACET_ID.equals(projectFacetVersion
- .getProjectFacet().getId()))
- {
- return projectFacetVersion;
- }
- }
- }
- }
- catch (final CoreException ce)
- {
- // log error
- JSFCorePlugin.log(IStatus.ERROR, ce.getLocalizedMessage(), ce);
- }
- }
- return null;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/facet/FaceletFacetChangeDataModelProvider.java b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/facet/FaceletFacetChangeDataModelProvider.java
deleted file mode 100644
index f987c6a..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/facet/FaceletFacetChangeDataModelProvider.java
+++ /dev/null
@@ -1,108 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Oracle 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:
- * Cameron Bateman - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facelet.core.internal.facet;
-
-import java.beans.BeanInfo;
-import java.beans.IntrospectionException;
-import java.beans.Introspector;
-import java.beans.PropertyDescriptor;
-import java.util.Set;
-
-import org.eclipse.jst.jsf.facelet.core.internal.FaceletCorePlugin;
-import org.eclipse.wst.common.componentcore.datamodel.FacetInstallDataModelProvider;
-
-/**
- * The base data model provider for the facet install/uninstall
- *
- * @author cbateman
- *
- */
-public abstract class FaceletFacetChangeDataModelProvider extends
-FacetInstallDataModelProvider
-{
- /**
- * Change key identifier for web app lifecycle listener
- */
- protected static final String CHG_WEB_APP_LIFECYCLE_LISTENER = "chgWebAppLifecycleListener"; //$NON-NLS-1$
- /**
- * Change key identifier for configure listener
- */
- protected static final String CHG_CONFIGURE_LISTENER = "chgConfigureListener"; //$NON-NLS-1$
- /**
- * Change key identifier for the Facelet runtime view handler
- */
- protected static final String CHG_VIEW_HANDLER = "chgViewHandler"; //$NON-NLS-1$
- /**
- * Change key identifier for the default suffix
- */
- protected static final String CHG_DEFAULT_SUFFIX = "chgDefaultSuffix"; //$NON-NLS-1$
-
- private BeanInfo _beanInfo;
-
- /**
- *
- */
- public FaceletFacetChangeDataModelProvider()
- {
- try
- {
- _beanInfo = Introspector.getBeanInfo(FacetInstallModel.class);
- }
- catch (final IntrospectionException e)
- {
- // TODO: suppress for now
- FaceletCorePlugin.log("Problem getting bean info for FacetInstallModel", e); //$NON-NLS-1$
- }
- }
-
- @Override
- public Object create()
- {
- final FacetChangeModel model_ = createChangeModel();
-
- model_
- .setChgDefaultSuffix(((Boolean) getDefaultProperty(CHG_DEFAULT_SUFFIX)).booleanValue());
- model_.setChgViewHandler(((Boolean) getDefaultProperty(CHG_VIEW_HANDLER)).booleanValue());
- model_
- .setChgConfigureListener(((Boolean) getDefaultProperty(CHG_CONFIGURE_LISTENER)).booleanValue());
- model_
- .setChgWebAppLifecycleListener(((Boolean) getDefaultProperty(CHG_WEB_APP_LIFECYCLE_LISTENER)).booleanValue());
-
- return model_;
- }
-
- /**
- * @return the change model to be used by the delegate.
- */
- protected abstract FacetChangeModel createChangeModel();
-
- /**
- * Set the default property value
- */
- @Override
- public Object getDefaultProperty(final String propertyName)
- {
- return super.getDefaultProperty(propertyName);
- }
-
- @SuppressWarnings("unchecked")
- @Override
- public Set getPropertyNames()
- {
- final Set<String> propSet = super.getPropertyNames();
- final PropertyDescriptor[] props = _beanInfo.getPropertyDescriptors();
- for (final PropertyDescriptor prop : props)
- {
- propSet.add(prop.getName());
- }
- return propSet;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/facet/FaceletFacetDefaultVersionProvider.java b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/facet/FaceletFacetDefaultVersionProvider.java
deleted file mode 100644
index fd39d60..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/facet/FaceletFacetDefaultVersionProvider.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package org.eclipse.jst.jsf.facelet.core.internal.facet;
-
-import org.eclipse.wst.common.project.facet.core.IDefaultVersionProvider;
-import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
-import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
-
-/**
- * Provides the default Facelet project facet version. Currently always returns
- * "1.1" facet version.
- */
-public final class FaceletFacetDefaultVersionProvider implements
- IDefaultVersionProvider
-{
-
- /**
- * The global id for the Facelet facet
- */
- private static final String DEFAULT_FACET_ID = FaceletFacet.FACET_ID;
-
- private static final String DEFAULT_FACET_VERSION = "1.0"; //$NON-NLS-1$
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.project.facet.core.IDefaultVersionProvider#getDefaultVersion()
- */
-
- public IProjectFacetVersion getDefaultVersion()
- {
- return ProjectFacetsManager.getProjectFacet(DEFAULT_FACET_ID)
- .getVersion(DEFAULT_FACET_VERSION);
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/facet/FaceletFacetInstallDataModelProvider.java b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/facet/FaceletFacetInstallDataModelProvider.java
deleted file mode 100644
index 25ac2aa..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/facet/FaceletFacetInstallDataModelProvider.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package org.eclipse.jst.jsf.facelet.core.internal.facet;
-
-
-/**
- * The data model provider for the facet install.
- *
- * @author cbateman
- *
- */
-public class FaceletFacetInstallDataModelProvider extends FaceletFacetChangeDataModelProvider
-{
- @Override
- public Object getDefaultProperty(final String propertyName)
- {
- if (propertyName.equals(CHG_DEFAULT_SUFFIX))
- {
- return Boolean.TRUE;
- }
- else if (propertyName.equals(CHG_VIEW_HANDLER))
- {
- return Boolean.TRUE;
- }
- else if (propertyName.equals(CHG_CONFIGURE_LISTENER))
- {
- return Boolean.FALSE;
- }
- else if (propertyName.equals(CHG_WEB_APP_LIFECYCLE_LISTENER))
- {
- return Boolean.FALSE;
- }
- return super.getDefaultProperty(propertyName);
- }
-
- @Override
- protected FacetChangeModel createChangeModel()
- {
- return new FacetInstallModel();
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/facet/FaceletFacetUninstallModelProvider.java b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/facet/FaceletFacetUninstallModelProvider.java
deleted file mode 100644
index e17e071..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/facet/FaceletFacetUninstallModelProvider.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Oracle 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:
- * Cameron Bateman - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facelet.core.internal.facet;
-
-
-/**
- * The data model provider for facet uninstall.
- *
- * @author cbateman
- *
- */
-public class FaceletFacetUninstallModelProvider extends FaceletFacetChangeDataModelProvider
-{
- @Override
- public Object getDefaultProperty(final String propertyName)
- {
- if (propertyName.equals(CHG_DEFAULT_SUFFIX))
- {
- return Boolean.FALSE;
- }
- else if (propertyName.equals(CHG_VIEW_HANDLER))
- {
- return Boolean.FALSE;
- }
- else if (propertyName.equals(CHG_CONFIGURE_LISTENER))
- {
- return Boolean.FALSE;
- }
- else if (propertyName.equals(CHG_WEB_APP_LIFECYCLE_LISTENER))
- {
- return Boolean.FALSE;
- }
- return super.getDefaultProperty(propertyName);
- }
-
- @Override
- protected FacetChangeModel createChangeModel()
- {
- return new FaceletUninstallModel();
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/facet/FaceletInstallDelegate.java b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/facet/FaceletInstallDelegate.java
deleted file mode 100644
index 64eb0ee..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/facet/FaceletInstallDelegate.java
+++ /dev/null
@@ -1,234 +0,0 @@
-package org.eclipse.jst.jsf.facelet.core.internal.facet;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.jst.jsf.designtime.DesignTimeApplicationManager;
-import org.eclipse.jst.jsf.facelet.core.internal.FaceletCoreTraceOptions;
-import org.eclipse.jst.jsf.facesconfig.emf.ApplicationType;
-import org.eclipse.jst.jsf.facesconfig.emf.FacesConfigFactory;
-import org.eclipse.jst.jsf.facesconfig.emf.FacesConfigType;
-import org.eclipse.jst.jsf.facesconfig.emf.ViewHandlerType;
-import org.eclipse.jst.jsf.facesconfig.util.FacesConfigArtifactEdit;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
-
-/**
- * The facet installing delegate for Facelets.
- *
- * @author cbateman
- *
- */
-public class FaceletInstallDelegate extends FaceletChangeDelegate
-{
-
- @Override
- public void execute(final IProject project, final IProjectFacetVersion fv,
- final Object config, final IProgressMonitor monitor)
- throws CoreException
- {
- final FacetChangeModel model = (FacetChangeModel) config;
- if (FaceletCoreTraceOptions.TRACE_FACETINSTALLDELEGATE)
- {
- FaceletCoreTraceOptions.log("Installing facet on project: " //$NON-NLS-1$
- + project.getName());
-
- FaceletCoreTraceOptions.log(String.format(
- "FaceletInstallDelegate: Add default selection %b", //$NON-NLS-1$
- Boolean.valueOf(model.isChgDefaultSuffix())));
- FaceletCoreTraceOptions
- .log(String
- .format(
- "FaceletInstallDelegate: Add view handler %b", Boolean.valueOf(model //$NON-NLS-1$
- .isChgViewHandler())));
- FaceletCoreTraceOptions.log(String.format(
- "FaceletInstallDelegate: Add configure listener %b", //$NON-NLS-1$
- Boolean.valueOf(model.isChgConfigureListener())));
- FaceletCoreTraceOptions
- .log(String
- .format(
- "FaceletInstallDelegate: Add web app lifecycle listener %b", //$NON-NLS-1$
- Boolean.valueOf(model
- .isChgWebAppLifecycleListener())));
- }
-
- try
- {
- if (monitor != null)
- {
- monitor.beginTask("Installing facelet facet", 1); //$NON-NLS-1$
- }
-
- super.execute(project, fv, config, monitor);
- }
- finally
- {
- if (monitor != null)
- {
- monitor.done();
- }
- }
- }
-
- /**
- * Install the facelet view handler in the WEB-INF/faces-config file if not
- * already present.
- *
- * @param project
- * @param monitor
- */
- @Override
- protected void maybeChangeFaceletViewHandler(final IProject project,
- final IProgressMonitor monitor)
- {
- if (FaceletCoreTraceOptions.TRACE_FACETINSTALLDELEGATE)
- {
- FaceletCoreTraceOptions
- .log("FaceletInstallDelegate: Installing facelet view handler"); //$NON-NLS-1$
- }
-
- final FacesConfigArtifactEdit edit = FacesConfigArtifactEdit
- .getFacesConfigArtifactEditForWrite(project,
- "WEB-INF/faces-config.xml"); //$NON-NLS-1$
- if (edit != null)
- {
- try
- {
- final FacesConfigType root = edit.getFacesConfig();
- if (!isViewHandlerPresent(root))
- {
- if (FaceletCoreTraceOptions.TRACE_FACETINSTALLDELEGATE)
- {
- FaceletCoreTraceOptions
- .log("FaceletInstallDelegate: View Handler not already found in faces-config"); //$NON-NLS-1$
- }
-
- PlatformUI.getWorkbench().getDisplay().syncExec(
- new TempSafeUpdateFacesConfigOnUIThread(edit,
- monitor));
-
- if (FaceletCoreTraceOptions.TRACE_FACETINSTALLDELEGATE)
- {
- FaceletCoreTraceOptions
- .log("FaceletInstallDelegate: Saved changes for facelet view handler"); //$NON-NLS-1$
- }
- }
- else
- {
- if (FaceletCoreTraceOptions.TRACE_FACETINSTALLDELEGATE)
- {
- FaceletCoreTraceOptions
- .log("FaceletInstallDelegate: View Handler NOT already found in faces-config; not adding"); //$NON-NLS-1$
- }
- }
- }
- finally
- {
- edit.dispose();
- }
- }
- }
-
- private static class TempSafeUpdateFacesConfigOnUIThread implements
- Runnable
- {
- private final FacesConfigArtifactEdit _edit;
- private final IProgressMonitor _monitor;
-
- public TempSafeUpdateFacesConfigOnUIThread(
- final FacesConfigArtifactEdit edit,
- final IProgressMonitor monitor)
- {
- _edit = edit;
- _monitor = monitor;
- }
-
- @SuppressWarnings("unchecked")
- public void run()
- {
-
- final FacesConfigType root = _edit.getFacesConfig();
- final EList applications = root.getApplication();
- ApplicationType application = null;
- if (applications.size() > 0)
- {
- application = (ApplicationType) applications.get(0);
- }
- else
- {
- application = FacesConfigFactory.eINSTANCE
- .createApplicationType();
- applications.add(application);
- }
- final ViewHandlerType viewHandlerType = FacesConfigFactory.eINSTANCE
- .createViewHandlerType();
- viewHandlerType.setTextContent(RUNTIME_VIEWHANDLER_CLASS_NAME);
- application.getViewHandler().add(viewHandlerType);
- _edit.save(_monitor);
- }
- }
-
- @Override
- protected void handleDesignTimeViewHandler(final IProject project)
- {
- final DesignTimeApplicationManager manager = DesignTimeApplicationManager
- .getInstance(project);
-
- manager.setViewHandlerId(FaceletFacet.VIEW_HANDLER_ID);
- }
-
- @Override
- protected String getDisplayName()
- {
- return Messages.FaceletInstallDelegate_FACET_INSTALLER_DELEGATE_DISPLAY_NAME;
- }
-
- @Override
- protected void maybeChangeDefaultSuffix(final FacetChangeModel model,
- final WebAppConfigurator configurator)
- {
- if (model.isChgDefaultSuffix())
- {
- if (FaceletCoreTraceOptions.TRACE_FACETINSTALLDELEGATE)
- {
- FaceletCoreTraceOptions
- .log("FaceletInstallDelegate: Installing DEFAULT_SUFFIX"); //$NON-NLS-1$
- }
- configurator.addContextParam(FaceletFacet.JAVAX_FACES_DEFAULT_SUFFIX, FaceletFacet.XHTML,
- false);
- }
- }
-
- @Override
- protected void maybeChangeConfigureListener(final FacetChangeModel model,
- final WebAppConfigurator configurator)
- {
- if (model.isChgConfigureListener())
- {
- if (FaceletCoreTraceOptions.TRACE_FACETINSTALLDELEGATE)
- {
- FaceletCoreTraceOptions
- .log("FaceletInstallDelegate: Install Configure Listener"); //$NON-NLS-1$
- }
- configurator.addListener(FaceletFacet.COM_SUN_FACES_CONFIG_CONFIGURE_LISTENER,
- false);
- }
- }
-
- @Override
- protected void maybeChangeWebLifecycleListener(
- final FacetChangeModel model, final WebAppConfigurator configurator)
- {
- if (model.isChgWebAppLifecycleListener())
- {
- if (FaceletCoreTraceOptions.TRACE_FACETINSTALLDELEGATE)
- {
- FaceletCoreTraceOptions
- .log("FaceletInstallDelegate: Install WebappLifecycleListener"); //$NON-NLS-1$
- }
- configurator.addListener(
- FaceletFacet.COM_SUN_FACES_APPLICATION_WEBAPP_LIFECYCLE_LISTENER, false);
- }
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/facet/FaceletUninstallDelegate.java b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/facet/FaceletUninstallDelegate.java
deleted file mode 100644
index 3e0170e..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/facet/FaceletUninstallDelegate.java
+++ /dev/null
@@ -1,236 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Oracle 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:
- * Cameron Bateman - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facelet.core.internal.facet;
-
-import java.util.Iterator;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.jst.jsf.designtime.DesignTimeApplicationManager;
-import org.eclipse.jst.jsf.facelet.core.internal.FaceletCoreTraceOptions;
-import org.eclipse.jst.jsf.facesconfig.emf.ApplicationType;
-import org.eclipse.jst.jsf.facesconfig.emf.FacesConfigType;
-import org.eclipse.jst.jsf.facesconfig.emf.ViewHandlerType;
-import org.eclipse.jst.jsf.facesconfig.util.FacesConfigArtifactEdit;
-import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
-
-/**
- * The facet removal delegate for Facelets.
- *
- * @author cbateman
- *
- */
-public class FaceletUninstallDelegate extends FaceletChangeDelegate
-{
-
- @Override
- public void execute(final IProject project, final IProjectFacetVersion fv,
- final Object config, final IProgressMonitor monitor)
- throws CoreException
- {
- final FacetChangeModel model = (FacetChangeModel) config;
- if (FaceletCoreTraceOptions.TRACE_FACETUNINSTALLDELEGATE)
- {
- FaceletCoreTraceOptions.log("Uninstalling facet on project: " //$NON-NLS-1$
- + project.getName());
-
- FaceletCoreTraceOptions.log(String.format(
- "FaceletUninstallDelegate: Remove default selection %b", //$NON-NLS-1$
- Boolean.valueOf(model.isChgDefaultSuffix())));
- FaceletCoreTraceOptions
- .log(String
- .format(
- "FaceletUninstallDelegate: Remove view handler %b", Boolean.valueOf(model //$NON-NLS-1$
- .isChgViewHandler())));
- FaceletCoreTraceOptions.log(String.format(
- "FaceletUninstallDelegate: Remove configure listener %b", //$NON-NLS-1$
- Boolean.valueOf(model.isChgConfigureListener())));
- FaceletCoreTraceOptions
- .log(String
- .format(
- "FaceletUninstallDelegate: Remove web app lifecycle listener %b", //$NON-NLS-1$
- Boolean.valueOf(model
- .isChgWebAppLifecycleListener())));
- }
-
- try
- {
- if (monitor != null)
- {
- monitor.beginTask("Uninstalling facelet facet", 1); //$NON-NLS-1$
- }
-
- super.execute(project, fv, config, monitor);
- }
- finally
- {
- if (monitor != null)
- {
- monitor.done();
- }
- }
- }
-
- /**
- * Install the facelet view handler in the WEB-INF/faces-config file if not
- * already present.
- *
- * @param project
- * @param monitor
- */
- @SuppressWarnings("unchecked")
- @Override
- protected void maybeChangeFaceletViewHandler(final IProject project,
- final IProgressMonitor monitor)
- {
- if (FaceletCoreTraceOptions.TRACE_FACETUNINSTALLDELEGATE)
- {
- FaceletCoreTraceOptions
- .log("FaceletInstallDelegate: Uninstalling facelet view handler"); //$NON-NLS-1$
- }
-
- final FacesConfigArtifactEdit edit = FacesConfigArtifactEdit
- .getFacesConfigArtifactEditForWrite(project,
- "WEB-INF/faces-config.xml"); //$NON-NLS-1$
- if (edit != null)
- {
- try
- {
- final FacesConfigType root = edit.getFacesConfig();
- if (isViewHandlerPresent(root))
- {
- if (FaceletCoreTraceOptions.TRACE_FACETUNINSTALLDELEGATE)
- {
- FaceletCoreTraceOptions
- .log("FaceletInstallDelegate: View Handler not already found in faces-config"); //$NON-NLS-1$
- }
- final EList applications = root.getApplication();
-
- for (final Iterator<?> appIt = applications.iterator(); appIt
- .hasNext();)
- {
- final ApplicationType application = (ApplicationType) appIt
- .next();
- for (final Iterator viewHandlerIt = application
- .getViewHandler().iterator(); viewHandlerIt
- .hasNext();)
- {
- final ViewHandlerType viewHandlerType = (ViewHandlerType) viewHandlerIt
- .next();
- if (viewHandlerType != null
- && RUNTIME_VIEWHANDLER_CLASS_NAME
- .equals(viewHandlerType
- .getTextContent().trim()))
- {
- viewHandlerIt.remove();
-
- if (FaceletCoreTraceOptions.TRACE_FACETUNINSTALLDELEGATE)
- {
- FaceletCoreTraceOptions
- .log("FaceletUninstallDelegate: Removed runtime view handler"); //$NON-NLS-1$
- }
- }
- }
- }
-
- edit.save(monitor);
-
- if (FaceletCoreTraceOptions.TRACE_FACETUNINSTALLDELEGATE)
- {
- FaceletCoreTraceOptions
- .log("FaceletUninstallDelegate: Saved changes for facelet view handler"); //$NON-NLS-1$
- }
- }
- else
- {
- if (FaceletCoreTraceOptions.TRACE_FACETUNINSTALLDELEGATE)
- {
- FaceletCoreTraceOptions
- .log("FaceletInstallDelegate: View Handler NOT already found in faces-config; not adding"); //$NON-NLS-1$
- }
- }
- }
- finally
- {
- edit.dispose();
- }
- }
- }
-
- @Override
- protected void handleDesignTimeViewHandler(final IProject project)
- {
- final DesignTimeApplicationManager manager = DesignTimeApplicationManager
- .getInstance(project);
-
- // TODO: need this API
- //manager.clearViewHandlerId();
- manager.setViewHandlerId("org.eclipse.jst.jsf.designtime.view.jspviewhandler"); //$NON-NLS-1$
- }
-
- @Override
- protected String getDisplayName()
- {
- return Messages.FaceletUninstallDelegate_FACET_INSTALLER_DELEGATE_DISPLAY_NAME;
- }
-
- @Override
- protected void maybeChangeDefaultSuffix(final FacetChangeModel model,
- final WebAppConfigurator configurator)
- {
- if (model.isChgDefaultSuffix())
- {
- if (FaceletCoreTraceOptions.TRACE_FACETUNINSTALLDELEGATE)
- {
- FaceletCoreTraceOptions
- .log("FaceletUninstallDelegate: Removing DEFAULT_SUFFIX"); //$NON-NLS-1$
- }
- configurator
- .removeContextParam(
- FaceletFacet.JAVAX_FACES_DEFAULT_SUFFIX,
- FaceletFacet.XHTML);
- }
- }
-
- @Override
- protected void maybeChangeConfigureListener(final FacetChangeModel model,
- final WebAppConfigurator configurator)
- {
- if (model.isChgConfigureListener())
- {
- if (FaceletCoreTraceOptions.TRACE_FACETUNINSTALLDELEGATE)
- {
- FaceletCoreTraceOptions
- .log("FaceletUninstallDelegate: Remove Configure Listener"); //$NON-NLS-1$
- }
- configurator
- .removeListener(FaceletFacet.COM_SUN_FACES_CONFIG_CONFIGURE_LISTENER);
- }
- }
-
- @Override
- protected void maybeChangeWebLifecycleListener(
- final FacetChangeModel model, final WebAppConfigurator configurator)
- {
- if (model.isChgWebAppLifecycleListener())
- {
- if (FaceletCoreTraceOptions.TRACE_FACETUNINSTALLDELEGATE)
- {
- FaceletCoreTraceOptions
- .log("FaceletUninstallDelegate: Remove WebappLifecycleListener"); //$NON-NLS-1$
- }
- configurator
- .removeListener(FaceletFacet.COM_SUN_FACES_APPLICATION_WEBAPP_LIFECYCLE_LISTENER);
- }
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/facet/FaceletUninstallModel.java b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/facet/FaceletUninstallModel.java
deleted file mode 100644
index c8b6d19..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/facet/FaceletUninstallModel.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Oracle 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:
- * Cameron Bateman - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facelet.core.internal.facet;
-
-import java.beans.PropertyChangeListener;
-import java.beans.PropertyChangeSupport;
-
-/*package*/ class FaceletUninstallModel extends FacetChangeModel
-{
- // default bean listeners
- private final PropertyChangeSupport _changeSupport = new PropertyChangeSupport(
- this);
-
- public void addPropertyChangeListener(final String propertyName,
- final PropertyChangeListener listener)
- {
- _changeSupport.addPropertyChangeListener(propertyName, listener);
- }
-
- public void removePropertyChangeListener(final String propertyName,
- final PropertyChangeListener listener)
- {
- _changeSupport.removePropertyChangeListener(propertyName, listener);
- }
-
- @Override
- public ChangeActionType getChangeActionType()
- {
- return ChangeActionType.REMOVE;
- }
-}
\ No newline at end of file
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/facet/FacetChangeModel.java b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/facet/FacetChangeModel.java
deleted file mode 100644
index 1235e3f..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/facet/FacetChangeModel.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Oracle 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:
- * Cameron Bateman - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facelet.core.internal.facet;
-
-/**
- * Encapsulate configuration change data during facet install/uninstall
- * @author cbateman
- *
- */
-public abstract class FacetChangeModel
-{
- private boolean _chgDefaultSuffix;
- private boolean _chgViewHandler;
- private boolean _chgConfigureListener;
- private boolean _chgWebAppLifecycleListener;
-
- /**
- * @return the type of change action
- */
- public abstract ChangeActionType getChangeActionType();
-
- /**
- * @return true if should change the runtime view handler configuration
- */
- public boolean isChgViewHandler()
- {
- return _chgViewHandler;
- }
-
- /**
- * @param chgViewHandler
- */
- public void setChgViewHandler(final boolean chgViewHandler)
- {
- _chgViewHandler = chgViewHandler;
- }
-
- /**
- * @return true if should change DEFAULT_SUFFIX option
- */
- public boolean isChgDefaultSuffix()
- {
- return _chgDefaultSuffix;
- }
-
- /**
- * @param chgDefaultSuffix
- */
- public void setChgDefaultSuffix(final boolean chgDefaultSuffix)
- {
- _chgDefaultSuffix = chgDefaultSuffix;
- }
-
- /**
- * @return true if should change the configure listener option
- */
- public boolean isChgConfigureListener()
- {
- return _chgConfigureListener;
- }
-
- /**
- * @param chgConfigureListener
- */
- public void setChgConfigureListener(final boolean chgConfigureListener)
- {
- _chgConfigureListener = chgConfigureListener;
- }
-
- /**
- * @return true if should change the webapp lifecycle listener option
- */
- public boolean isChgWebAppLifecycleListener()
- {
- return _chgWebAppLifecycleListener;
- }
-
- /**
- * @param chgWebAppLifecycleListener
- */
- public void setChgWebAppLifecycleListener(
- final boolean chgWebAppLifecycleListener)
- {
- _chgWebAppLifecycleListener = chgWebAppLifecycleListener;
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/facet/FacetInstallModel.java b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/facet/FacetInstallModel.java
deleted file mode 100644
index aeac135..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/facet/FacetInstallModel.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package org.eclipse.jst.jsf.facelet.core.internal.facet;
-
-import java.beans.PropertyChangeListener;
-import java.beans.PropertyChangeSupport;
-
-/*package*/ class FacetInstallModel extends FacetChangeModel
-{
- // default bean listeners
- private final PropertyChangeSupport changeSupport = new PropertyChangeSupport(
- this);
-
- public void addPropertyChangeListener(final String propertyName,
- final PropertyChangeListener listener)
- {
- changeSupport.addPropertyChangeListener(propertyName, listener);
- }
-
- public void removePropertyChangeListener(final String propertyName,
- final PropertyChangeListener listener)
- {
- changeSupport.removePropertyChangeListener(propertyName, listener);
- }
-
- @Override
- public ChangeActionType getChangeActionType()
- {
- return ChangeActionType.ADD;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/facet/Messages.java b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/facet/Messages.java
deleted file mode 100644
index b7e076d..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/facet/Messages.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Oracle 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:
- * Cameron Bateman - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facelet.core.internal.facet;
-
-import org.eclipse.osgi.util.NLS;
-
-/**
- * NLS message file
- *
- * @author cbateman
- *
- */
-public class Messages extends NLS
-{
- private static final String BUNDLE_NAME = "org.eclipse.jst.jsf.facelet.core.internal.facet.messages"; //$NON-NLS-1$
- /**
- * see messages.properties
- */
- public static String FaceletInstallDelegate_FACET_INSTALLER_DELEGATE_DISPLAY_NAME;
- /**
- * see messages.properties
- */
- public static String FaceletUninstallDelegate_FACET_INSTALLER_DELEGATE_DISPLAY_NAME;
- static
- {
- // initialize resource bundle
- NLS.initializeMessages(BUNDLE_NAME, Messages.class);
- }
-
- private Messages()
- {
- // no external instantiation
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/facet/WebAppConfigurator.java b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/facet/WebAppConfigurator.java
deleted file mode 100644
index f5de1e9..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/facet/WebAppConfigurator.java
+++ /dev/null
@@ -1,394 +0,0 @@
-package org.eclipse.jst.jsf.facelet.core.internal.facet;
-
-import java.util.Iterator;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jst.j2ee.model.IModelProvider;
-import org.eclipse.jst.j2ee.model.ModelProviderManager;
-import org.eclipse.jst.jsf.facelet.core.internal.FaceletCorePlugin;
-
-/**
- * Insulates caller from the insane J2EE/JavaEE dual model.
- *
- * @author cbateman
- *
- */
-public abstract class WebAppConfigurator
-{
- /**
- * @param project
- * @return the configurator for project or null if none
- */
- public static WebAppConfigurator getConfigurator(final IProject project)
- {
- final IModelProvider provider = ModelProviderManager
- .getModelProvider(project);
- final Object webAppObj = provider.getModelObject();
- if (webAppObj == null)
- {
- FaceletCorePlugin.log("Error getting web app configurator", //$NON-NLS-1$
- new Throwable());
- return null;
- }
-
- if (webAppObj instanceof org.eclipse.jst.javaee.web.WebApp)
- {
- return new JavaEEWebAppConfigurator(project);
- }
- else if (webAppObj instanceof org.eclipse.jst.j2ee.webapplication.WebApp)
- {
- return new J2EEWebAppConfigurator(project);
- }
-
- return null;
- }
-
- private final IProject _project;
-
- WebAppConfigurator(final IProject project)
- {
- _project = project;
- }
-
- /**
- * @param paramName
- * @param paramValue
- * @param addEvenIfPresent
- */
- public abstract void addContextParam(final String paramName,
- final String paramValue, final boolean addEvenIfPresent);
-
- /**
- * @param paramName
- * @param paramValue
- */
- public abstract void removeContextParam(final String paramName,
- final String paramValue);
-
- /**
- * Adds the listenerClass to the webapp config. If addEventIfPresent is
- * false, then it will not add it if it finds it already. If true, it will
- * forcibly add.
- *
- * @param listenerClass
- * @param addEvenIfPresent
- */
- public abstract void addListener(final String listenerClass,
- final boolean addEvenIfPresent);
-
- /**
- * @param listenerClass
- */
- public abstract void removeListener(final String listenerClass);
-
- /**
- * @param runnable
- */
- protected void executeChange(final Runnable runnable)
- {
- final IPath webXMLPath = new Path("WEB-INF").append("web.xml"); //$NON-NLS-1$ //$NON-NLS-2$
- final IModelProvider provider = ModelProviderManager
- .getModelProvider(getProject());
- provider.modify(runnable, webXMLPath);
- }
-
- /**
- * @return the project
- */
- protected IProject getProject()
- {
- return _project;
- }
-
- @SuppressWarnings("unchecked")
- private static class JavaEEWebAppConfigurator extends WebAppConfigurator
- {
- public JavaEEWebAppConfigurator(final IProject project)
- {
- super(project);
- }
-
- @Override
- public void addContextParam(final String paramName,
- final String paramValue, final boolean addEvenIfPresent)
- {
- final Runnable runnable = new Runnable()
- {
- public void run()
- {
- final org.eclipse.jst.javaee.web.WebApp webApp = (org.eclipse.jst.javaee.web.WebApp) ModelProviderManager
- .getModelProvider(getProject()).getModelObject();
- if (addEvenIfPresent
- || !isContextParamPresent(webApp, paramName))
- {
- final org.eclipse.jst.javaee.core.ParamValue newParamValue = org.eclipse.jst.javaee.core.JavaeeFactory.eINSTANCE
- .createParamValue();
- newParamValue.setParamName(paramName);
- newParamValue.setParamValue(paramValue);
- webApp.getContextParams().add(newParamValue);
- }
- }
- };
- executeChange(runnable);
- }
-
- @Override
- public void removeContextParam(final String paramName,
- final String paramVal)
- {
- final Runnable runnable = new Runnable()
- {
- public void run()
- {
- final org.eclipse.jst.javaee.web.WebApp webApp = (org.eclipse.jst.javaee.web.WebApp) ModelProviderManager
- .getModelProvider(getProject()).getModelObject();
- for (final Iterator<?> it = webApp.getContextParams()
- .iterator(); it.hasNext();)
- {
- final org.eclipse.jst.javaee.core.ParamValue paramValue = (org.eclipse.jst.javaee.core.ParamValue) it
- .next();
- if (paramName.equals(paramValue.getParamName().trim())
- && paramVal.equals(paramValue.getParamValue()
- .trim()))
- {
- it.remove();
- }
- }
- }
- };
- executeChange(runnable);
- }
-
- private boolean isContextParamPresent(
- final org.eclipse.jst.javaee.web.WebApp webApp,
- final String paramName)
- {
- for (final Iterator<?> it = webApp.getContextParams().iterator(); it
- .hasNext();)
- {
- final org.eclipse.jst.javaee.core.ParamValue paramValue = (org.eclipse.jst.javaee.core.ParamValue) it
- .next();
- if (paramName.equals(paramValue.getParamName().trim()))
- {
- return true;
- }
- }
- return false;
- }
-
- @Override
- public void addListener(final String listenerClass,
- final boolean addEvenIfPresent)
- {
- final Runnable runnable = new Runnable()
- {
- public void run()
- {
- final org.eclipse.jst.javaee.web.WebApp webApp = (org.eclipse.jst.javaee.web.WebApp) ModelProviderManager
- .getModelProvider(getProject()).getModelObject();
-
- if (addEvenIfPresent
- || !isListenerPresent(webApp, listenerClass))
- {
- final org.eclipse.jst.javaee.core.Listener listener = org.eclipse.jst.javaee.core.JavaeeFactory.eINSTANCE
- .createListener();
- listener.setListenerClass(listenerClass);
- webApp.getListeners().add(listener);
- }
- }
- };
- executeChange(runnable);
- }
-
- @Override
- public void removeListener(final String listenerClass)
- {
- final Runnable runnable = new Runnable()
- {
- public void run()
- {
- final org.eclipse.jst.javaee.web.WebApp webApp = (org.eclipse.jst.javaee.web.WebApp) ModelProviderManager
- .getModelProvider(getProject()).getModelObject();
- for (final Iterator listenerIt = webApp.getListeners()
- .iterator(); listenerIt.hasNext();)
- {
- final org.eclipse.jst.javaee.core.Listener listener = (org.eclipse.jst.javaee.core.Listener) listenerIt
- .next();
- if (listenerClass.equals(listener.getListenerClass()
- .trim()))
- {
- listenerIt.remove();
- }
- }
- }
- };
- executeChange(runnable);
- }
-
- private boolean isListenerPresent(
- final org.eclipse.jst.javaee.web.WebApp webApp,
- final String listenerClass)
- {
- for (final Iterator listenerIt = webApp.getListeners().iterator(); listenerIt
- .hasNext();)
- {
- final org.eclipse.jst.javaee.core.Listener listener = (org.eclipse.jst.javaee.core.Listener) listenerIt
- .next();
- if (listenerClass.equals(listener.getListenerClass().trim()))
- {
- return true;
- }
- }
- return false;
- }
- }
-
- @SuppressWarnings("unchecked")
- private static class J2EEWebAppConfigurator extends WebAppConfigurator
- {
- public J2EEWebAppConfigurator(final IProject project)
- {
- super(project);
- }
-
- @Override
- public void addContextParam(final String paramName,
- final String paramValue, final boolean addEvenIfPresent)
- {
- final Runnable runnable = new Runnable()
- {
- public void run()
- {
- final org.eclipse.jst.j2ee.webapplication.WebApp webApp = (org.eclipse.jst.j2ee.webapplication.WebApp) ModelProviderManager
- .getModelProvider(getProject()).getModelObject();
-
- if (addEvenIfPresent
- || !isContextParamPresent(webApp, paramName))
- {
- final org.eclipse.jst.j2ee.common.ParamValue newParamValue = org.eclipse.jst.j2ee.common.CommonFactory.eINSTANCE
- .createParamValue();
- newParamValue.setName(paramName);
- newParamValue.setValue(paramValue);
- webApp.getContextParams().add(newParamValue);
- }
- }
- };
- executeChange(runnable);
- }
-
- @Override
- public void removeContextParam(final String paramName,
- final String paramVal)
- {
- final Runnable runnable = new Runnable()
- {
- public void run()
- {
- final org.eclipse.jst.j2ee.webapplication.WebApp webApp = (org.eclipse.jst.j2ee.webapplication.WebApp) ModelProviderManager
- .getModelProvider(getProject()).getModelObject();
- for (final Iterator it = webApp.getContextParams()
- .iterator(); it.hasNext();)
- {
- final org.eclipse.jst.j2ee.common.ParamValue paramValue = (org.eclipse.jst.j2ee.common.ParamValue) it
- .next();
- if (paramName.equals(paramValue.getName().trim())
- && paramVal
- .equals(paramValue.getValue().trim()))
- {
- it.remove();
- }
- }
- }
- };
- executeChange(runnable);
- }
-
- private boolean isContextParamPresent(
- final org.eclipse.jst.j2ee.webapplication.WebApp webApp,
- final String paramName)
- {
- for (final Iterator it = webApp.getContextParams().iterator(); it
- .hasNext();)
- {
- final org.eclipse.jst.j2ee.common.ParamValue paramValue = (org.eclipse.jst.j2ee.common.ParamValue) it
- .next();
- if (paramName.equals(paramValue.getName().trim()))
- {
- return true;
- }
- }
- return false;
- }
-
- @Override
- public void addListener(final String listenerClass,
- final boolean addEvenIfPresent)
- {
- final Runnable runnable = new Runnable()
- {
- public void run()
- {
- final org.eclipse.jst.j2ee.webapplication.WebApp webApp = (org.eclipse.jst.j2ee.webapplication.WebApp) ModelProviderManager
- .getModelProvider(getProject()).getModelObject();
-
- if (addEvenIfPresent
- || !isListenerPresent(webApp, listenerClass))
- {
- final org.eclipse.jst.j2ee.common.Listener listener = org.eclipse.jst.j2ee.common.CommonFactory.eINSTANCE
- .createListener();
- listener.setListenerClassName(listenerClass);
- webApp.getListeners().add(listener);
- }
- }
- };
- executeChange(runnable);
- }
-
- @Override
- public void removeListener(final String listenerClass)
- {
- final Runnable runnable = new Runnable()
- {
- public void run()
- {
- final org.eclipse.jst.j2ee.webapplication.WebApp webApp = (org.eclipse.jst.j2ee.webapplication.WebApp) ModelProviderManager
- .getModelProvider(getProject()).getModelObject();
-
- for (final Iterator listenerIt = webApp.getListeners()
- .iterator(); listenerIt.hasNext();)
- {
- final org.eclipse.jst.j2ee.common.Listener listener = (org.eclipse.jst.j2ee.common.Listener) listenerIt
- .next();
- if (listenerClass.equals(listener
- .getListenerClassName().trim()))
- {
- listenerIt.remove();
- }
- }
- }
- };
- executeChange(runnable);
- }
-
- private boolean isListenerPresent(
- final org.eclipse.jst.j2ee.webapplication.WebApp webApp,
- final String listenerClass)
- {
- for (final Iterator listenerIt = webApp.getListeners().iterator(); listenerIt
- .hasNext();)
- {
- final org.eclipse.jst.j2ee.common.Listener listener = (org.eclipse.jst.j2ee.common.Listener) listenerIt
- .next();
- if (listenerClass
- .equals(listener.getListenerClassName().trim()))
- {
- return true;
- }
- }
- return false;
- }
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/facet/messages.properties b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/facet/messages.properties
deleted file mode 100644
index aa79cd5..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/facet/messages.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-FaceletInstallDelegate_FACET_INSTALLER_DELEGATE_DISPLAY_NAME=Facelet Install Delegate
-FaceletUninstallDelegate_FACET_INSTALLER_DELEGATE_DISPLAY_NAME=Facelet Uninstall Delegate
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/metadata/FaceletNamespaceMetaDataLocator.java b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/metadata/FaceletNamespaceMetaDataLocator.java
deleted file mode 100644
index 9ded96b..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/metadata/FaceletNamespaceMetaDataLocator.java
+++ /dev/null
@@ -1,173 +0,0 @@
-package org.eclipse.jst.jsf.facelet.core.internal.metadata;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.ISafeRunnable;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.content.IContentType;
-import org.eclipse.jface.util.SafeRunnable;
-import org.eclipse.jst.jsf.common.metadata.internal.AbstractMetaDataLocator;
-import org.eclipse.jst.jsf.common.metadata.internal.IMetaDataChangeNotificationEvent;
-import org.eclipse.jst.jsf.common.metadata.internal.IMetaDataLocator;
-import org.eclipse.jst.jsf.common.metadata.internal.IMetaDataObserver;
-import org.eclipse.jst.jsf.common.metadata.internal.IMetaDataSourceModelProvider;
-import org.eclipse.jst.jsf.common.metadata.internal.IPathSensitiveMetaDataLocator;
-import org.eclipse.jst.jsf.common.metadata.internal.MetaDataChangeNotificationEvent;
-import org.eclipse.jst.jsf.common.runtime.internal.view.model.common.Namespace;
-import org.eclipse.jst.jsf.core.IJSFCoreConstants;
-import org.eclipse.jst.jsf.core.JSFVersion;
-import org.eclipse.jst.jsf.core.internal.CompositeTagRegistryFactory;
-import org.eclipse.jst.jsf.core.internal.CompositeTagRegistryFactory.TagRegistryIdentifier;
-import org.eclipse.jst.jsf.core.jsfappconfig.JSFAppConfigUtils;
-import org.eclipse.jst.jsf.core.metadata.internal.INamespaceModelProvider;
-import org.eclipse.jst.jsf.designtime.internal.view.model.ITagRegistry;
-import org.eclipse.jst.jsf.designtime.internal.view.model.ITagRegistry.ITagRegistryListener;
-import org.eclipse.jst.jsf.designtime.internal.view.model.ITagRegistry.TagRegistryChangeEvent;
-import org.eclipse.jst.jsf.facelet.core.internal.FaceletCorePlugin;
-import org.eclipse.wst.common.project.facet.core.FacetedProjectFramework;
-import org.eclipse.wst.common.project.facet.core.events.IFacetedProjectEvent;
-import org.eclipse.wst.common.project.facet.core.events.IFacetedProjectEvent.Type;
-import org.eclipse.wst.common.project.facet.core.events.IFacetedProjectListener;
-import org.eclipse.wst.common.project.facet.core.events.IProjectFacetActionEvent;
-
-
-/**
- * Locates Facelet {@link Namespace} metadata
- */
-public class FaceletNamespaceMetaDataLocator
- extends AbstractMetaDataLocator
- implements IPathSensitiveMetaDataLocator, ITagRegistryListener, IFacetedProjectListener {
-
- //in the future if there is an explicit xhtml content type id, we will need to use that here
- private static final IContentType XHTML_CONTENTTYPE =
- Platform.getContentTypeManager().getContentType("org.eclipse.wst.html.core.htmlsource"); //$NON-NLS-1$
-
- private IProject _project;
- private ITagRegistry _reg;
-
- public List<IMetaDataSourceModelProvider> locateMetaDataModelProviders(final String uri) {
- final List<IMetaDataSourceModelProvider> providers = new ArrayList<IMetaDataSourceModelProvider>();
- if (_reg != null) {
- final Namespace ns = _reg.getTagLibrary(uri);
-
- if (ns != null) {
- providers.add(new NamespaceSourceModel(ns));
- }
- }
- return providers;
- }
-
- public void startLocating() {
- if (_project != null && JSFAppConfigUtils.isValidJSFProject(_project)
- && JSFVersion.valueOfProject(_project).compareTo(JSFVersion.V2_0) >=0 ) {
-
- final TagRegistryIdentifier tagRegId = new TagRegistryIdentifier(_project, XHTML_CONTENTTYPE);
- _reg = CompositeTagRegistryFactory.getInstance().getRegistry(tagRegId);
- if (_reg != null) {
- _reg.addListener(this);
- }
- }
-
- //add faceted project listener that will check for JSF facet version
- //being added and the facelet registry not being initialized
- FacetedProjectFramework.addListener(this, Type.POST_INSTALL);
- }
-
- public void stopLocating() {
- if (_reg != null) {
- _reg.removeListener(this);
- _reg = null;
- }
- FacetedProjectFramework.removeListener(this);
- }
-
- public void setProjectContext(final IProject project) {
- _project = project;
- }
-
- public void registryChanged(final TagRegistryChangeEvent changeEvent) {
- for (final Namespace ns : changeEvent.getAffectedObjects()) {
- if (adaptTagRegistryEvent(changeEvent) != IMetaDataChangeNotificationEvent.ADDED) {
- final IMetaDataChangeNotificationEvent mdEvent = new MetaDataChangeNotificationEvent(this, ns.getNSUri(), adaptTagRegistryEvent(changeEvent));
- fireEvent(mdEvent);
- }
- }
- }
-
- private int adaptTagRegistryEvent(final TagRegistryChangeEvent event) {
- switch (event.getType()) {
- case ADDED_NAMESPACE:
- return IMetaDataChangeNotificationEvent.ADDED;
- case REMOVED_NAMESPACE:
- case REGISTRY_DISPOSED:
- return IMetaDataChangeNotificationEvent.REMOVED;
- default:
- return IMetaDataChangeNotificationEvent.CHANGED;
- }
- }
-
- private void fireEvent(final IMetaDataChangeNotificationEvent event) {
- SafeRunnable.run(new ISafeRunnable(){
-
- public void handleException(Throwable exception) {
- FaceletCorePlugin.log("Error while firing metadataChangeNotificationEvent" , exception) ; //$NON-NLS-1$
- }
-
- public void run() throws Exception {
- for (final IMetaDataObserver observer : getObservers()){
- observer.notifyMetadataChanged(event);
- }
- }
-
- });
- }
-
- public void handleEvent(final IFacetedProjectEvent event) {
- if (event.getProject().getProject() == _project) {
- final IProjectFacetActionEvent ev = (IProjectFacetActionEvent)event;
- if (ev.getProjectFacet().getId()
- .equals(IJSFCoreConstants.JSF_CORE_FACET_ID)) {
- //if jsf facet has been added, it may be a 2.0 faceted project now
- //call start locating again to add listener to facelet registry
- //if not already doing so.
- //only have to look at POST_INSTALL event since there is no version_changes option
- //currently with the JSF Facet
- if (ev.getType() == Type.POST_INSTALL && _reg == null) {
- startLocating();
- }
- }
- }
- }
- private class NamespaceSourceModel implements INamespaceModelProvider {
-
- private Namespace ns;
- private IMetaDataLocator locator;
-
- NamespaceSourceModel(final Namespace ns){
- this.ns = ns;
- }
-
- public Object getSourceModel() {
- return ns;
- }
-
- public IMetaDataLocator getLocator() {
- return locator;
- }
-
- public void setLocator(IMetaDataLocator locator) {
- this.locator = locator;
- }
-
- public Object getAdapter(Class klass) {
- return null;
- }
-
- public Namespace getNamespace() {
- return ns;
- }
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/metadata/FaceletNamespaceMetaDataTranslator.java b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/metadata/FaceletNamespaceMetaDataTranslator.java
deleted file mode 100644
index 4235213..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/metadata/FaceletNamespaceMetaDataTranslator.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package org.eclipse.jst.jsf.facelet.core.internal.metadata;
-
-import org.eclipse.jst.jsf.common.metadata.Entity;
-import org.eclipse.jst.jsf.common.metadata.Trait;
-import org.eclipse.jst.jsf.common.runtime.internal.view.model.common.Namespace;
-import org.eclipse.jst.jsf.core.metadata.internal.NamespaceMetaDataTranslator;
-
-/**
- * Translates Facelet {@link Namespace} to standard {@link Entity} and {@link Trait} metadata
- *
- */
-public class FaceletNamespaceMetaDataTranslator extends NamespaceMetaDataTranslator {
- private static final String COMPOSITE = "http://java.sun.com/jsf/composite"; //$NON-NLS-1$
-
- @Override
- protected String getNamespaceDisplayLabel() {
- if (getMergedModel().getId().indexOf(COMPOSITE) == 0
- && getMergedModel().getId().length() > COMPOSITE.length())
- return getMergedModel().getId().substring(COMPOSITE.length()+1);
- return super.getNamespaceDisplayLabel();
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/ELProxyContributor.java b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/ELProxyContributor.java
deleted file mode 100644
index c000bbc..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/ELProxyContributor.java
+++ /dev/null
@@ -1,53 +0,0 @@
-package org.eclipse.jst.jsf.facelet.core.internal.registry;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jem.internal.proxy.core.ConfigurationContributorAdapter;
-import org.eclipse.jem.internal.proxy.core.IConfigurationContributionController;
-import org.eclipse.jst.jsf.facelet.core.internal.FaceletCorePlugin;
-import org.osgi.framework.Bundle;
-
-/**
- * Contributes additional, sometimes fake, jars to the JEM classpath to allow
- * for smooth instantiation of introspected objects.
- *
- * @author cbateman
- *
- */
-public class ELProxyContributor extends ConfigurationContributorAdapter
-{
- private final IProject _project;
-
- /**
- * @param project
- */
- public ELProxyContributor(final IProject project)
- {
- _project = project;
- }
-
- @Override
- public void contributeClasspaths(
- final IConfigurationContributionController controller)
- throws CoreException
- {
- if (_project.isAccessible())
- {
- final IJavaProject javaProject = JavaCore.create(_project);
- final IType type = javaProject.findType("java.el.ELException"); //$NON-NLS-1$
-
- // if we can't find ELException on the classpath,then inject
- // our fake el jar to aid linkage while introspecting facelet libs
- if (type == null)
- {
- final Bundle faceletBundle = FaceletCorePlugin.getDefault().getBundle();
- controller.contributeClasspath(faceletBundle, "/jars/fake_el.jar", //$NON-NLS-1$
- IConfigurationContributionController.APPEND_USER_CLASSPATH,
- false);
- }
- }
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/FaceletMetaResolvingStrategy.java b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/FaceletMetaResolvingStrategy.java
deleted file mode 100644
index f202b1f..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/FaceletMetaResolvingStrategy.java
+++ /dev/null
@@ -1,205 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Oracle 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:
- * Cameron Bateman - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facelet.core.internal.registry;
-
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.jst.jsf.common.dom.TagIdentifier;
-import org.eclipse.jst.jsf.common.runtime.internal.model.component.ComponentTypeInfo;
-import org.eclipse.jst.jsf.common.runtime.internal.model.decorator.ConverterTypeInfo;
-import org.eclipse.jst.jsf.common.runtime.internal.model.decorator.ValidatorTypeInfo;
-import org.eclipse.jst.jsf.common.runtime.internal.model.types.TypeInfo;
-import org.eclipse.jst.jsf.common.runtime.internal.view.model.common.IHandlerTagElement.TagHandlerType;
-import org.eclipse.jst.jsf.common.runtime.internal.view.model.common.ITagElement;
-import org.eclipse.jst.jsf.core.internal.tld.TagIdentifierFactory;
-import org.eclipse.jst.jsf.designtime.internal.Messages;
-import org.eclipse.jst.jsf.designtime.internal.view.mapping.ViewMetadataLoader;
-import org.eclipse.jst.jsf.designtime.internal.view.mapping.ViewMetadataMapper;
-import org.eclipse.jst.jsf.designtime.internal.view.mapping.viewmapping.TagMapping;
-import org.eclipse.jst.jsf.designtime.internal.view.mapping.viewmapping.TagToViewObjectMapping;
-import org.eclipse.jst.jsf.designtime.internal.view.model.jsp.AbstractTagResolvingStrategy;
-import org.eclipse.jst.jsf.designtime.internal.view.model.jsp.DefaultTagTypeInfo;
-import org.eclipse.jst.jsf.facelet.core.internal.cm.FaceletDocumentFactory;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagAttribute;
-import org.eclipse.jst.jsf.facelet.core.internal.tagmodel.ComponentTag;
-import org.eclipse.jst.jsf.facelet.core.internal.tagmodel.ConverterTag;
-import org.eclipse.jst.jsf.facelet.core.internal.tagmodel.HandlerTag;
-import org.eclipse.jst.jsf.facelet.core.internal.tagmodel.NoArchetypeFaceletTag;
-import org.eclipse.jst.jsf.facelet.core.internal.tagmodel.ValidatorTag;
-import org.osgi.framework.Version;
-
-/**
- * Resolves facelet tags from JSF framework metadata.
- *
- * @author cbateman
- *
- */
-public class FaceletMetaResolvingStrategy
- extends
- AbstractTagResolvingStrategy<IFaceletTagResolvingStrategy.TLDWrapper, String>
- implements IFaceletTagResolvingStrategy
-{
-
- /**
- * strategy id
- */
- public final static String ID = "org.eclipse.jst.jsf.facelet.metadata.FaceletMetaResolvingStrategy"; //$NON-NLS-1$
- /**
- * displayable nameb
- */
- public final static String DISPLAY_NAME = Messages.DefaultJSPTagResolver_DisplayName;
-
- private final ViewMetadataLoader _loader;
- private final ViewMetadataMapper _mapper;
- private final FaceletDocumentFactory _factory;
-
- /**
- * @param project
- * @param factory
- */
- public FaceletMetaResolvingStrategy(final IProject project,
- final FaceletDocumentFactory factory)
- {
- _factory = factory;
- _loader = new ViewMetadataLoader(project);
- _mapper = new ViewMetadataMapper();
- }
-
- @Override
- public ITagElement resolve(
- final IFaceletTagResolvingStrategy.TLDWrapper elementDecl)
- {
- final String uri = elementDecl.getUri();
- final String tagName = elementDecl.getTagDefn().getTagName();
- final TagIdentifier tagId = TagIdentifierFactory.createJSPTagWrapper(
- uri, tagName);
- final TagMapping mapping = _loader.getTagToViewMapping(tagId);
-
- TypeInfo elementType = null;
- if (mapping != null)
- {
- elementType = findTypeInfo(mapping, "1.1", null); //$NON-NLS-1$
- }
- final List<FaceletTaglibTagAttribute> attributes =
- elementDecl.getTagDefn().getAttribute();
- if (elementType instanceof ComponentTypeInfo)
- {
- return new ComponentTag(uri, tagName,
- (ComponentTypeInfo) elementType, null, _factory,
- new MetadataAttributeAdvisor(tagId, _loader, attributes));
- }
- else if (elementType instanceof ConverterTypeInfo)
- {
- return new ConverterTag(uri, tagName,
- (ConverterTypeInfo) elementType, null, _factory,
- new MetadataAttributeAdvisor(tagId, _loader, attributes));
- }
- else if (elementType instanceof ValidatorTypeInfo)
- {
- return new ValidatorTag(uri, tagName,
- (ValidatorTypeInfo) elementType, null, _factory,
- new MetadataAttributeAdvisor(tagId, _loader, attributes));
- }
- else if (elementType instanceof TagHandlerType)
- {
- return new HandlerTag(uri, tagName,
- (TagHandlerType) elementType, null, _factory,
- new MetadataAttributeAdvisor(
- tagId, _loader, attributes));
- }
- else if (DefaultTagTypeInfo.isDefaultLib(tagId.getUri()))
- {
- return new NoArchetypeFaceletTag(uri, tagName, _factory, new MetadataAttributeAdvisor(tagId, _loader, attributes));
- }
-
- // not found
- return null;
- }
-
- private TypeInfo findTypeInfo(final TagMapping mapping,
- final String jsfVersion, final String libVersion)
- {
- final EList list = mapping.getVersionedTagToViewMappings();
-
- FIND_BY_VERSION: for (final Iterator<?> it = list.iterator(); it
- .hasNext();)
- {
- Object obj = it.next();
-
- if (obj instanceof TagToViewObjectMapping)
- {
- final TagToViewObjectMapping viewMapping = (TagToViewObjectMapping) obj;
-
- final String minJsfVersionString = viewMapping
- .getMinJSFVersion();
- if (minJsfVersionString != null)
- {
- try
- {
- final Version version = new Version(jsfVersion);
- final Version minVersion = Version
- .parseVersion(minJsfVersionString);
-
- if (version.compareTo(minVersion) < 0)
- {
- // my version is less than the minimum specified
- // by this meta-data
- continue FIND_BY_VERSION;
- }
- }
- catch (final IllegalArgumentException iae)
- {
- continue FIND_BY_VERSION;
- }
- }
- final String minLibVersionString = viewMapping
- .getMinLibraryVersion();
- if (libVersion != null && minLibVersionString != null)
- {
- try
- {
- final Version version = new Version(libVersion);
- final Version minLibVersion = Version
- .parseVersion(minLibVersionString);
-
- if (version.compareTo(minLibVersion) < 0)
- {
- // my lib version is less than the minimum specified
- // by the meta-data
- continue FIND_BY_VERSION;
- }
- }
- catch (IllegalArgumentException iae)
- {
- continue FIND_BY_VERSION;
- }
- }
- return _mapper.mapToFrameworkData(viewMapping.getTypeInfo());
- }
- }
- return null;
- }
-
- @Override
- public String getId()
- {
- return ID;
- }
-
- public String getDisplayName()
- {
- return DISPLAY_NAME;
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/FaceletRegistryManager.java b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/FaceletRegistryManager.java
deleted file mode 100644
index 357458b..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/FaceletRegistryManager.java
+++ /dev/null
@@ -1,130 +0,0 @@
-package org.eclipse.jst.jsf.facelet.core.internal.registry;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.jst.jsf.common.internal.resource.ResourceSingletonObjectManager;
-import org.eclipse.jst.jsf.core.JSFVersion;
-import org.eclipse.jst.jsf.designtime.internal.view.model.ITagRegistry;
-import org.eclipse.jst.jsf.designtime.internal.view.model.TagRegistryFactory;
-import org.eclipse.jst.jsf.facelet.core.internal.FaceletCoreTraceOptions;
-
-/**
- * A per-resource singleton manager for TLDTagRegistry's.
- *
- * @author cbateman
- *
- */
-public final class FaceletRegistryManager extends
- ResourceSingletonObjectManager<FaceletTagRegistry, IProject>
-{
- // STATIC
- private static FaceletRegistryManager INSTANCE;
-
- /**
- * @return the singleton instance
- */
- private static FaceletRegistryManager getGlobalManager(final IWorkspace workspace)
- {
- if (FaceletCoreTraceOptions.TRACE_REGISTRYMANAGER)
- {
- FaceletCoreTraceOptions
- .log("FaceletRegistryManager: Initializing FaceletRegistryManager singleton"); //$NON-NLS-1$
- }
-
- synchronized(FaceletRegistryManager.class)
- {
- if (INSTANCE == null)
- {
- INSTANCE = new FaceletRegistryManager(workspace);
- }
-
- return INSTANCE;
- }
- }
-
- private FaceletRegistryManager(final IWorkspace workspace)
- {
- super(workspace);
- }
-
- @Override
- protected FaceletTagRegistry createNewInstance(final IProject project)
- {
- if (FaceletCoreTraceOptions.TRACE_REGISTRYMANAGER)
- {
- FaceletCoreTraceOptions.log("FaceletRegistryManager: creating new instance for " //$NON-NLS-1$
- + project.toString());
- }
-
- return new FaceletTagRegistry(project);
- }
-
- @Override
- protected void runAfterGetInstance(final IProject resource)
- {
- if (FaceletCoreTraceOptions.TRACE_REGISTRYMANAGER)
- {
- FaceletCoreTraceOptions.log("FaceletRegistryManager: Acquired instance for " //$NON-NLS-1$
- + resource.toString());
- }
- }
-
- @Override
- protected void runBeforeGetInstance(final IProject resource)
- {
- if (FaceletCoreTraceOptions.TRACE_REGISTRYMANAGER)
- {
- FaceletCoreTraceOptions.log("FaceletRegistryManager: Getting registry for " //$NON-NLS-1$
- + resource.toString());
- }
- }
-
- /**
- * Adapter used to allow creation by extension point.
- *
- * @author cbateman
- *
- */
- public static class MyRegistryFactory extends TagRegistryFactory
- {
- @Override
- public ITagRegistry createTagRegistry(IProject project) throws TagRegistryFactoryException
- {
- try
- {
- return getGlobalManager(project.getWorkspace()).getInstance(project);
- }
- catch (ManagedObjectException e)
- {
- throw new TagRegistryFactoryException(e);
- }
- }
-
- @Override
- public boolean isInstance(IProject project)
- {
- return getGlobalManager(project.getWorkspace()).isInstance(project);
- }
-
- public String getDisplayName()
- {
- return Messages.FaceletRegistryManager_REGISTRY_FACTORY_DISPLAYNAME;
- }
-
- @Override
- public boolean projectIsValid(IProject project) {
- if (project == null)
- {
- return false;
- }
-
- final JSFVersion jsfVersion = JSFVersion.valueOfProject(project);
- if (jsfVersion != null && jsfVersion.compareTo(JSFVersion.V2_0) >= 0)
- {
- return true;
- }
-
- return false;
- }
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/FaceletTagRegistry.java b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/FaceletTagRegistry.java
deleted file mode 100644
index 16f782b..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/FaceletTagRegistry.java
+++ /dev/null
@@ -1,374 +0,0 @@
-package org.eclipse.jst.jsf.facelet.core.internal.registry;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.ConcurrentLinkedQueue;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.MultiStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jst.jsf.common.internal.managedobject.IManagedObject;
-import org.eclipse.jst.jsf.common.internal.managedobject.ObjectManager.ManagedObjectException;
-import org.eclipse.jst.jsf.common.internal.policy.IdentifierOrderedIteratorPolicy;
-import org.eclipse.jst.jsf.common.runtime.internal.view.model.common.Namespace;
-import org.eclipse.jst.jsf.core.internal.JSFCorePlugin;
-import org.eclipse.jst.jsf.core.internal.JSFCoreTraceOptions;
-import org.eclipse.jst.jsf.designtime.internal.view.model.AbstractTagRegistry;
-import org.eclipse.jst.jsf.designtime.internal.view.model.jsp.CompositeTagResolvingStrategy;
-import org.eclipse.jst.jsf.facelet.core.internal.FaceletCorePlugin;
-import org.eclipse.jst.jsf.facelet.core.internal.FaceletCoreTraceOptions;
-import org.eclipse.jst.jsf.facelet.core.internal.cm.FaceletDocumentFactory;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.IFaceletTagResolvingStrategy.TLDWrapper;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.FaceletTagIndex;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.IFaceletTagRecord;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.IProjectTaglibDescriptor;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.Listener;
-import org.eclipse.jst.jsf.facelet.core.internal.tagmodel.FaceletNamespace;
-
-/**
- * Registry of all facelet tag registries: at most one per project.
- *
- */
-public final class FaceletTagRegistry extends AbstractTagRegistry implements
- IManagedObject
-{
- // INSTANCE
- private final ConcurrentLinkedQueue<LibraryOperation> _changeOperations = new ConcurrentLinkedQueue<LibraryOperation>();
-
- private final IProject _project;
- private final Map<String, FaceletNamespace> _nsResolved;
- private final Set<FaceletNamespace> _unResolved;
- private final CompositeTagResolvingStrategy<TLDWrapper> _resolver;
- private final FaceletDocumentFactory _factory;
- private final LibraryOperationFactory _operationFactory = new LibraryOperationFactory(
- this);
- private boolean _isInitialized;
-
- private ChangeJob _changeJob;
- private MyTaglibListener _listener;
-
- FaceletTagRegistry(final IProject project)
- {
- _project = project;
- _nsResolved = new HashMap<String, FaceletNamespace>();
- _unResolved = new HashSet<FaceletNamespace>();
-
- final List<String> ids = new ArrayList<String>();
-
-//Commenting out this strategy because of current circular dependency with facelet md locating. See FaceletNamespaceMetaDataLocator.
-// ids.add(FaceletMetaResolvingStrategy.ID);
- ids.add(FaceletTagResolvingStrategy.ID);
- final IdentifierOrderedIteratorPolicy<String> policy = new IdentifierOrderedIteratorPolicy<String>(
- ids);
-
- // exclude things that are not explicitly listed in the policy. That
- // way preference-based disablement will cause those strategies to
- // be excluded.
- policy.setExcludeNonExplicitValues(true);
- _resolver = new CompositeTagResolvingStrategy<TLDWrapper>(policy);
-
- _factory = new FaceletDocumentFactory(project);
- // add the strategies
- _resolver.addStrategy(new FaceletTagResolvingStrategy(_project,
- _factory));
-
-//Commenting out this strategy because of current circular dependency with facelet md locating. See FaceletNamespaceMetaDataLocator.
-// _resolver.addStrategy(new FaceletMetaResolvingStrategy(_project, _factory));
-
- // _resolver.addStrategy(new DefaultJSPTagResolver(_project));
- // makes sure that a tag element will always be created for any
- // given tag definition even if other methods fail
- // _resolver.addStrategy(new UnresolvedJSPTagResolvingStrategy());
- _changeJob = new ChangeJob(project.getName());
- }
-
- /**
- * @return a copy of all tag libs, both with namespaces resolved and without
- * Changing the returned may has no effect on the registry, however
- * the containned objects are not copies.
- */
- @Override
- public synchronized Collection<FaceletNamespace> getAllTagLibraries()
- {
- final Set<FaceletNamespace> allTagLibraries = new HashSet<FaceletNamespace>();
- if (!_isInitialized)
- {
- try
- {
- initialize(false);
- _isInitialized = true;
- }
- catch (final JavaModelException e)
- {
- FaceletCorePlugin.log("Problem during initialization", e); //$NON-NLS-1$
- }
- catch (final CoreException e)
- {
- FaceletCorePlugin.log("Problem during initialization", e); //$NON-NLS-1$
- }
- }
- allTagLibraries.addAll(_nsResolved.values());
- allTagLibraries.addAll(_unResolved);
- return allTagLibraries;
- }
-
- private void initialize(boolean fireEvent) throws JavaModelException, CoreException
- {
- if (!_project.exists() || !_project.hasNature(JavaCore.NATURE_ID))
- {
- throw new CoreException(new Status(IStatus.ERROR,
- FaceletCorePlugin.PLUGIN_ID,
- "Project either does not exists or is not a java project: " //$NON-NLS-1$
- + _project));
- }
-
- final FaceletTagIndex index = FaceletTagIndex.getInstance(_project.getWorkspace());
-
- IProjectTaglibDescriptor tagDesc;
- try
- {
- tagDesc = index.getInstance(_project);
- }
- catch (ManagedObjectException e)
- {
- throw new CoreException(
- new Status(
- IStatus.ERROR,
- FaceletCorePlugin.PLUGIN_ID,
- "Error instantiating facelet tag index for project: " + _project.getName(), e)); //$NON-NLS-1$
- }
-
- if (tagDesc != null)
- {
- for (final IFaceletTagRecord taglib : tagDesc.getTagLibraries())
- {
- initialize(taglib, fireEvent);
- }
-
- _listener = new MyTaglibListener();
- tagDesc.addListener(_listener);
- }
- }
-
- FaceletNamespace initialize(final IFaceletTagRecord tagRecord,
- final boolean fireEvent)
- {
- if (JSFCoreTraceOptions.TRACE_JSPTAGREGISTRY_CHANGES)
- {
- FaceletCoreTraceOptions
- .log("TLDTagRegistry.initialize_TagRecord: Initializing new tld record: " + tagRecord.toString()); //$NON-NLS-1$
- }
- final FaceletNamespace ns = new FaceletNamespace(tagRecord, _resolver);
- _nsResolved.put(tagRecord.getURI(), ns);
-
- if (fireEvent)
- {
- fireEvent(new TagRegistryChangeEvent(this,
- TagRegistryChangeEvent.EventType.ADDED_NAMESPACE,
- Collections.singletonList(ns)));
- }
- return ns;
- }
-
- void remove(final IFaceletTagRecord tagRecord)
- {
- final FaceletNamespace ns = _nsResolved.remove(tagRecord.getURI());
-
- if (ns != null)
- {
- fireEvent(new TagRegistryChangeEvent(this,
- TagRegistryChangeEvent.EventType.REMOVED_NAMESPACE,
- Collections.singletonList(ns)));
- }
- }
-
- @Override
- public synchronized Namespace getTagLibrary(final String uri)
- {
- // TODO:
- getAllTagLibraries();
- return _nsResolved.get(uri);
- }
-
- @Override
- protected Job getRefreshJob(final boolean flushCaches)
- {
- return new Job("Refreshing Facelet tag registry for " + _project.getName()) //$NON-NLS-1$
- {
- @Override
- protected IStatus run(final IProgressMonitor monitor)
- {
-// if (FaceletCoreTraceOptions.TRACE_JSPTAGREGISTRY)
-// {
-// JSFCoreTraceOptions.log("FaceletTagRegistry.refresh: start"); //$NON-NLS-1$
-// }
-
- synchronized (FaceletTagRegistry.this)
- {
- if (JSFCoreTraceOptions.TRACE_JSPTAGREGISTRY)
- {
- JSFCoreTraceOptions
- .log("FaceletTagRegistry.refresh: start"); //$NON-NLS-1$
- }
-
- final List<Namespace> namespaces = new ArrayList(
- _nsResolved.values());
-
- if (flushCaches)
- {
- FaceletTagIndex.getInstance(_project.getWorkspace()).flush(_project);
- }
- // if we aren't flushing caches, then check point the
- // current namespace data, so it isn't lost when we clear
- // THE NAMESPACES
- else
- {
- checkpoint();
- }
-
- _nsResolved.clear();
-
- fireEvent(new TagRegistryChangeEvent(FaceletTagRegistry.this,
- TagRegistryChangeEvent.EventType.REMOVED_NAMESPACE,
- namespaces));
- try
- {
- initialize(true);
- }
- catch (JavaModelException e)
- {
- return new Status(IStatus.ERROR, FaceletCorePlugin.PLUGIN_ID, "Problem refreshing registry", e); //$NON-NLS-1$
- }
- catch (CoreException e)
- {
- return new Status(IStatus.ERROR, FaceletCorePlugin.PLUGIN_ID, "Problem refreshing registry", e); //$NON-NLS-1$
- }
-
-// if (JSFCoreTraceOptions.TRACE_JSPTAGREGISTRY)
-// {
-// JSFCoreTraceOptions
-// .log("TLDTagRegistry.refresh: finished");
-// }
- return Status.OK_STATUS;
- }
- }
- };
- }
-
- private class MyTaglibListener extends Listener
- {
- @Override
- public void changed(TaglibChangedEvent event)
- {
- switch (event.getChangeType())
- {
- case ADDED:
- addLibraryOperation(_operationFactory
- .createAddOperation(event.getNewValue()));
- break;
- case CHANGED:
- addLibraryOperation(_operationFactory
- .createChangeOperation(event.getNewValue()));
- break;
- case REMOVED:
- addLibraryOperation(_operationFactory
- .createRemoveOperation(event.getOldValue()));
- break;
- }
- }
- }
-
- private void addLibraryOperation(final LibraryOperation operation)
- {
- _changeOperations.add(operation);
- _changeJob.schedule();
- }
-
- private class ChangeJob extends Job
- {
- private int _rescheduleTime = -1;
-
- public ChangeJob(final String projectName)
- {
- super("Update job for project " + projectName); //$NON-NLS-1$
- }
-
- @Override
- protected IStatus run(final IProgressMonitor monitor)
- {
- synchronized (FaceletTagRegistry.this)
- {
- _rescheduleTime = -1;
-
- LibraryOperation operation = null;
- final MultiStatus multiStatus = new MultiStatus(
- JSFCorePlugin.PLUGIN_ID, 0, "Result of change job", //$NON-NLS-1$
- new Throwable());
- while ((operation = _changeOperations.poll()) != null)
- {
- _rescheduleTime = 10000; // ms
-
- operation.run();
- multiStatus.add(operation.getResult());
- }
-
- if (_rescheduleTime >= 0 && !monitor.isCanceled())
- {
- // if any operations were found on this run, reschedule
- // to run again in 10seconds based on the assumption that
- // events may be coming in bursts
- schedule(_rescheduleTime);
- }
-
- return multiStatus;
- }
- }
- }
-
- @Override
- protected void doDispose()
- {
- if (_listener != null)
- {
- FaceletTagIndex index = FaceletTagIndex.getInstance(_project.getWorkspace());
- try
- {
- IProjectTaglibDescriptor instance = index.getInstance(_project);
- instance.removeListener(_listener);
- }
- catch (ManagedObjectException e)
- {
- FaceletCorePlugin
- .log(
- "Disposing facelet tag registry for project: " + _project.getName(), e); //$NON-NLS-1$
- }
-
- _nsResolved.clear();
- }
- }
-
- @Override
- protected void cleanupPersistentState()
- {
- // TODO ??
-
- }
-
- public void checkpoint()
- {
- // TODO ??
-
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/FaceletTagResolvingStrategy.java b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/FaceletTagResolvingStrategy.java
deleted file mode 100644
index 7ba6238..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/FaceletTagResolvingStrategy.java
+++ /dev/null
@@ -1,167 +0,0 @@
-package org.eclipse.jst.jsf.facelet.core.internal.registry;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jem.internal.proxy.core.IConfigurationContributor;
-import org.eclipse.jst.jsf.common.dom.TagIdentifier;
-import org.eclipse.jst.jsf.common.runtime.internal.model.component.ComponentTypeInfo;
-import org.eclipse.jst.jsf.common.runtime.internal.model.decorator.ConverterTypeInfo;
-import org.eclipse.jst.jsf.common.runtime.internal.model.decorator.ValidatorTypeInfo;
-import org.eclipse.jst.jsf.common.runtime.internal.view.model.common.ITagElement;
-import org.eclipse.jst.jsf.core.internal.tld.TagIdentifierFactory;
-import org.eclipse.jst.jsf.designtime.internal.view.DTComponentIntrospector;
-import org.eclipse.jst.jsf.designtime.internal.view.mapping.ViewMetadataLoader;
-import org.eclipse.jst.jsf.designtime.internal.view.model.jsp.AbstractTagResolvingStrategy;
-import org.eclipse.jst.jsf.designtime.internal.view.model.jsp.IAttributeAdvisor;
-import org.eclipse.jst.jsf.facelet.core.internal.cm.FaceletDocumentFactory;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTag;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.ComponentTagDefn;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.ConverterTagDefn;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.HandlerTagDefn;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.SourceTagDefn;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.ValidatorTagDefn;
-import org.eclipse.jst.jsf.facelet.core.internal.tagmodel.ComponentTag;
-import org.eclipse.jst.jsf.facelet.core.internal.tagmodel.ConverterTag;
-import org.eclipse.jst.jsf.facelet.core.internal.tagmodel.FaceletTag;
-import org.eclipse.jst.jsf.facelet.core.internal.tagmodel.HandlerTag;
-import org.eclipse.jst.jsf.facelet.core.internal.tagmodel.NoArchetypeFaceletTag;
-import org.eclipse.jst.jsf.facelet.core.internal.tagmodel.SourceTag;
-import org.eclipse.jst.jsf.facelet.core.internal.tagmodel.ValidatorTag;
-
-/*package*/class FaceletTagResolvingStrategy
- extends
- AbstractTagResolvingStrategy<IFaceletTagResolvingStrategy.TLDWrapper, String>
- implements IFaceletTagResolvingStrategy
-{
- public final static String ID = "org.eclipse.jst.jsf.facelet.core.FaceletTagResolvingStrategy"; //$NON-NLS-1$
- private final IProject _project;
- private final FaceletDocumentFactory _factory;
- private final ViewMetadataLoader _viewLoader;
-
- public FaceletTagResolvingStrategy(final IProject project,
- final FaceletDocumentFactory factory)
- {
- _project = project;
- _factory = factory;
- _viewLoader = new ViewMetadataLoader(project);
- }
-
- @Override
- public final String getId()
- {
- return ID;
- }
-
- @Override
- public final ITagElement resolve(final TLDWrapper tldWrapper)
- {
- return createFaceletTag(tldWrapper.getUri(), tldWrapper.getTagDefn());
- }
-
- public final String getDisplayName()
- {
- return Messages.FaceletTagResolvingStrategy_FACELET_TAG_RESOLVER_DISPLAY_NAME;
- }
-
- private FaceletTag createFaceletTag(final String uri, final FaceletTaglibTag tagDefn)
- {
- final String tagName = tagDefn.getTagName();
- final TagIdentifier tagId = TagIdentifierFactory.createJSPTagWrapper(
- uri, tagName);
-
- final IAttributeAdvisor advisor = new MetadataAttributeAdvisor(tagId,
- _viewLoader, tagDefn.getAttribute());
-
- if (tagDefn instanceof ComponentTagDefn)
- {
- final ComponentTagDefn componentTagDefn = (ComponentTagDefn) tagDefn;
- final String componentType = componentTagDefn.getComponentType();
- final String componentClass = DTComponentIntrospector
- .findComponentClass(componentType, _project);
-
- ComponentTypeInfo typeInfo = null;
-
- if (componentClass != null)
- {
- typeInfo = DTComponentIntrospector.getComponent(componentType,
- componentClass, _project,
- new IConfigurationContributor[]
- { new ELProxyContributor(_project) });
- }
- return new ComponentTag(uri, tagName, typeInfo, safeGetString(componentTagDefn.getHandlerClass()), _factory, advisor);
- }
- // render type is optional, but must have component type
- else if (tagDefn instanceof ValidatorTagDefn)
- {
- final ValidatorTagDefn validatorTagDefn = (ValidatorTagDefn) tagDefn;
- final String validatorId = validatorTagDefn.getValidatorId();
-
- ValidatorTypeInfo typeInfo;
-
- if (validatorId != null)
- {
- final String validatorClass = DTComponentIntrospector
- .findValidatorClass(validatorId, _project);
- typeInfo = new ValidatorTypeInfo(validatorClass, validatorId);
- }
- else
- {
- typeInfo = ValidatorTypeInfo.UNKNOWN;
- }
-
- return new ValidatorTag(uri, tagName, typeInfo, safeGetString(validatorTagDefn.getHandlerClass()), _factory,
- advisor);
- }
- // render type is optional, but must have converter id
- else if (tagDefn instanceof ConverterTagDefn)
- {
- final ConverterTagDefn converterTagDefn = (ConverterTagDefn) tagDefn;
- final String converterId = converterTagDefn.getConverterId();
-
- ConverterTypeInfo typeInfo;
-
- if (converterId != null)
- {
- final String converterClass = DTComponentIntrospector
- .findConverterClass(converterId, _project);
- typeInfo = new ConverterTypeInfo(converterClass, converterId);
- }
- else
- {
- typeInfo = ConverterTypeInfo.UNKNOWN;
- }
-
- // for now, all converters are unknown
- return new ConverterTag(uri, tagName, typeInfo,
- safeGetString(converterTagDefn.getHandlerClass()), _factory, advisor);
- }
- else if (tagDefn instanceof HandlerTagDefn)
- {
- final String handlerClass = safeGetString(((HandlerTagDefn)tagDefn).getHandlerClass());
- return new HandlerTag(uri, tagName, null, handlerClass, _factory, advisor);
- }
- else if (tagDefn instanceof SourceTagDefn)
- {
- final String source = ((SourceTagDefn)tagDefn).getSource();
- return new SourceTag(uri, tagName, source, _factory, advisor);
- }
-
- return new NoArchetypeFaceletTag(uri, tagName, _factory, advisor);
- }
-
- private static String safeGetString(final String value)
- {
- if (value == null)
- {
- return null;
- }
-
- final String trimmed = value.trim();
-
- if ("".equals(trimmed)) //$NON-NLS-1$
- {
- return null;
- }
-
- return trimmed;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/IFaceletTagResolvingStrategy.java b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/IFaceletTagResolvingStrategy.java
deleted file mode 100644
index 2be5978..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/IFaceletTagResolvingStrategy.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Oracle 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:
- * Cameron Bateman - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facelet.core.internal.registry;
-
-import org.eclipse.jst.jsf.designtime.internal.view.model.jsp.ITagResolvingStrategy;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTag;
-
-/**
- * @author cbateman
- *
- */
-public interface IFaceletTagResolvingStrategy extends
- ITagResolvingStrategy<IFaceletTagResolvingStrategy.TLDWrapper, String>
-{
-
- /**
- * Wraps data for Facelet tag information to used by the resolving strategy
- *
- * @author cbateman
- *
- */
- public static class TLDWrapper
- {
- private final String _uri;
- private final FaceletTaglibTag _tagDefn;
-
- /**
- * @param tagDefn
- * @param uri
- */
- public TLDWrapper(FaceletTaglibTag tagDefn, String uri)
- {
- super();
- _tagDefn = tagDefn;
- _uri = uri;
- }
-
- /**
- * @return the uri for the tld namespace
- */
- public final String getUri()
- {
- return _uri;
- }
-
- /**
- * @return the tag definition information
- */
- public final FaceletTaglibTag getTagDefn()
- {
- return _tagDefn;
- }
-
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/LibraryOperation.java b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/LibraryOperation.java
deleted file mode 100644
index 249dfaf..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/LibraryOperation.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Oracle 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:
- * Cameron Bateman - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facelet.core.internal.registry;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.jsf.facelet.core.internal.FaceletCorePlugin;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.IFaceletTagRecord;
-
-abstract class LibraryOperation
-{
- protected final IFaceletTagRecord _changeRecord;
- private IStatus _result;
-
- protected LibraryOperation(final IFaceletTagRecord changeRecord)
- {
- if (changeRecord == null)
- {
- throw new NullPointerException();
- }
- _changeRecord = changeRecord;
- }
-
- public final void run()
- {
- try
- {
- _result = doRun();
- }
- catch (final Exception e)
- {
- _result = new Status(IStatus.ERROR, FaceletCorePlugin.PLUGIN_ID,
- "Problem during run", e); //$NON-NLS-1$
- }
- }
-
- public IStatus getResult()
- {
- return _result;
- }
-
- protected abstract IStatus doRun();
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/LibraryOperationFactory.java b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/LibraryOperationFactory.java
deleted file mode 100644
index c69cbfe..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/LibraryOperationFactory.java
+++ /dev/null
@@ -1,122 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Oracle 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:
- * Cameron Bateman - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facelet.core.internal.registry;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.IFaceletTagRecord;
-
-class LibraryOperationFactory
-{
- private final FaceletTagRegistry _tagRegistry;
-
- public LibraryOperationFactory(final FaceletTagRegistry tagRegistry)
- {
- _tagRegistry = tagRegistry;
- }
-
- LibraryOperation createAddOperation(final IFaceletTagRecord changeRecord)
- {
- return new AddTagLibrary(_tagRegistry, changeRecord);
- }
-
- LibraryOperation createRemoveOperation(final IFaceletTagRecord changeRecord)
- {
- return new RemoveTagLibrary(_tagRegistry, changeRecord);
- }
-
- LibraryOperation createChangeOperation(final IFaceletTagRecord changeRecord)
- {
- if (changeRecord == null)
- {
- throw new IllegalArgumentException();
- }
- return new ChangeTagLibrary(_tagRegistry, changeRecord);
- }
-
- private static class AddTagLibrary extends LibraryOperation
- {
- private final FaceletTagRegistry _tagRegistry;
-
- public AddTagLibrary(final FaceletTagRegistry tagRegistry,
- final IFaceletTagRecord newRecord)
- {
- super(newRecord);
- _tagRegistry = tagRegistry;
- }
-
- @Override
- protected IStatus doRun()
- {
- synchronized (_tagRegistry)
- {
- // fire change event if applicable
- _tagRegistry.initialize(_changeRecord, true);
- return Status.OK_STATUS;
- }
- }
- }
-
- private static class RemoveTagLibrary extends LibraryOperation
- {
- private final FaceletTagRegistry _tagRegistry;
-
- protected RemoveTagLibrary(final FaceletTagRegistry tagRegistry,
- final IFaceletTagRecord changeRecord)
- {
- super(changeRecord);
- _tagRegistry = tagRegistry;
- }
-
- @Override
- protected IStatus doRun()
- {
- _tagRegistry.remove(_changeRecord);
- return Status.OK_STATUS;
-
- }
-
- }
-
- private static class ChangeTagLibrary extends LibraryOperation
- {
- private final FaceletTagRegistry _tagRegistry;
-
- protected ChangeTagLibrary(final FaceletTagRegistry tagRegistry,
- final IFaceletTagRecord changeRecord)
- {
- super(changeRecord);
- _tagRegistry = tagRegistry;
- }
-
- @Override
- protected IStatus doRun()
- {
- IStatus result = null;
-
- synchronized (_tagRegistry)
- {
- result = new RemoveTagLibrary(_tagRegistry, _changeRecord).doRun();
-
- if (result.getSeverity() != IStatus.ERROR
- && result.getSeverity() != IStatus.CANCEL)
- {
- result = new AddTagLibrary(_tagRegistry, _changeRecord)
- .doRun();
- }
- }
-
- return result;
- }
-
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/Messages.java b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/Messages.java
deleted file mode 100644
index 1a4f0d6..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/Messages.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Oracle 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:
- * Cameron Bateman - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facelet.core.internal.registry;
-
-import org.eclipse.osgi.util.NLS;
-
-/**
- * Externalized string manager.
- *
- * @author cbateman
- *
- */
-public final class Messages extends NLS
-{
- private static final String BUNDLE_NAME = "org.eclipse.jst.jsf.facelet.core.internal.registry.messages"; //$NON-NLS-1$
- /**
- * see messages.properties
- */
- public static String FaceletRegistryManager_REGISTRY_FACTORY_DISPLAYNAME;
- /**
- * see messages.properties
- */
- public static String FaceletTagRegistry_TAG_REGISTRY_REFRESH_JOB_DESCRIPTION;
- /**
- * see messages.properties
- */
- public static String FaceletTagResolvingStrategy_FACELET_TAG_RESOLVER_DISPLAY_NAME;
- static
- {
- // initialize resource bundle
- NLS.initializeMessages(BUNDLE_NAME, Messages.class);
- }
-
- private Messages()
- {
- // no instantiation
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/MetadataAttributeAdvisor.java b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/MetadataAttributeAdvisor.java
deleted file mode 100644
index d0ba0bf..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/MetadataAttributeAdvisor.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Oracle 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:
- * Cameron Bateman - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facelet.core.internal.registry;
-
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.jst.jsf.common.dom.TagIdentifier;
-import org.eclipse.jst.jsf.common.runtime.internal.view.model.common.ComponentPropertyHandler;
-import org.eclipse.jst.jsf.common.runtime.internal.view.model.common.ITagAttribute;
-import org.eclipse.jst.jsf.common.runtime.internal.view.model.common.ITagAttributeHandler;
-import org.eclipse.jst.jsf.common.runtime.internal.view.model.common.TagAttributeHandler;
-import org.eclipse.jst.jsf.designtime.internal.view.mapping.ViewMetadataLoader;
-import org.eclipse.jst.jsf.designtime.internal.view.mapping.viewmapping.AttributeToPropertyMapping;
-import org.eclipse.jst.jsf.designtime.internal.view.model.jsp.IAttributeAdvisor;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagAttribute;
-import org.eclipse.jst.jsf.facelet.core.internal.tagmodel.FaceletAttribute;
-
-/**
- * An attribute advisor that composes multiple strategies for deriving information
- * about Facelet tags.
- *
- * @author cbateman
- *
- */
-/*package*/ class MetadataAttributeAdvisor implements IAttributeAdvisor
-{
- private final TagIdentifier _tagId;
- private final ViewMetadataLoader _loader;
- private List<FaceletTaglibTagAttribute> _attributes;
-
- /**
- * @param tagId
- * @param loader
- * @param attributes
- */
- public MetadataAttributeAdvisor(final TagIdentifier tagId,
- final ViewMetadataLoader loader, final List<FaceletTaglibTagAttribute> attributes)
- {
- _tagId = tagId;
- _loader = loader;
- _attributes = attributes;
- }
-
- public ITagAttributeHandler createAttributeHandler(final String name)
- throws UnknownAttributeException
- {
- final AttributeToPropertyMapping mapping = _loader.getAttributeMapping(
- _tagId, name);
- if (mapping != null)
- {
- final String customHandler = mapping.getCustomConversionFactoryId();
- final boolean isELAllowed = mapping.isElAllowed();
- final String propertyName = mapping.getPropertyName();
- if (propertyName != null)
- {
- return new ComponentPropertyHandler(customHandler, name,
- isELAllowed, propertyName);
- }
- return new TagAttributeHandler(customHandler, name, isELAllowed);
- }
- return new TagAttributeHandler(null, name, false);
- }
-
- public Map<String, ? extends ITagAttribute> getAttributes()
- {
- final Map<String, ITagAttribute> attributes = new HashMap<String, ITagAttribute>();
-
- for (final FaceletTaglibTagAttribute attribute : _attributes)
- {
- attributes.put(attribute.getName(), new FaceletAttribute(attribute));
- }
- return Collections.unmodifiableMap(attributes);
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/ServletBeanProxyContributor.java b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/ServletBeanProxyContributor.java
deleted file mode 100644
index 2394738..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/ServletBeanProxyContributor.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/**
- *
- */
-package org.eclipse.jst.jsf.facelet.core.internal.registry;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.jem.internal.proxy.core.ConfigurationContributorAdapter;
-import org.eclipse.jem.internal.proxy.core.IConfigurationContributionController;
-import org.eclipse.jst.jsf.core.JSFVersion;
-import org.osgi.framework.Bundle;
-
-/**
- * Contributes dummy jsp servlet api to smooth the JEM instantiation for introspection.
- *
- * @author cbateman
- *
- */
-public class ServletBeanProxyContributor extends ConfigurationContributorAdapter
-{
- private static final String JAVAX_SERVLET_JSP = "javax.servlet.jsp"; //$NON-NLS-1$
- private static final String JAVAX_SERVLET = "javax.servlet"; //$NON-NLS-1$
- private final JSFVersion _jsfVersion;
-
- /**
- * @param jsfVersion
- */
- public ServletBeanProxyContributor(final JSFVersion jsfVersion)
- {
- if (jsfVersion == null)
- {
- throw new IllegalArgumentException("jsfVersion must not be null"); //$NON-NLS-1$
- }
-
- _jsfVersion = jsfVersion;
- }
-
- @Override
- public void contributeClasspaths(
- final IConfigurationContributionController controller)
- throws CoreException
- {
- if (_jsfVersion != JSFVersion.V1_2)
- {
- final Bundle servletBundle = Platform.getBundle(JAVAX_SERVLET);
- controller.contributeClasspath(servletBundle, (IPath) null,
- IConfigurationContributionController.APPEND_USER_CLASSPATH,
- true);
-
- final Bundle jspBundle = Platform.getBundle(JAVAX_SERVLET_JSP);
- controller.contributeClasspath(jspBundle, (IPath) null,
- IConfigurationContributionController.APPEND_USER_CLASSPATH,
- true);
- }
-
- }
-}
\ No newline at end of file
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/messages.properties b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/messages.properties
deleted file mode 100644
index dd82d81..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/messages.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-FaceletRegistryManager_REGISTRY_FACTORY_DISPLAYNAME=Facelet Registry Factory
-FaceletTagRegistry_TAG_REGISTRY_REFRESH_JOB_DESCRIPTION=Refreshing Facelet tag registry for
-FaceletTagResolvingStrategy_FACELET_TAG_RESOLVER_DISPLAY_NAME=Facelet Introspecting Tag Resolver
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/AbstractFaceletTaglibLocator.java b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/AbstractFaceletTaglibLocator.java
deleted file mode 100644
index 3b63d2e..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/AbstractFaceletTaglibLocator.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Oracle 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:
- * Cameron Bateman - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facelet.core.internal.registry.taglib;
-
-import java.util.Map;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jst.jsf.common.internal.locator.AbstractLocator;
-import org.eclipse.jst.jsf.common.internal.locator.ILocatorChangeListener;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.Listener.TaglibChangedEvent;
-
-/**
- * Parent of all locators of facelet taglibs.
- *
- * @author cbateman
- *
- */
-public abstract class AbstractFaceletTaglibLocator
- extends
- AbstractLocator<Map<String, ? extends IFaceletTagRecord>, IProject, String>
- implements IFaceletTaglibLocator
-{
- /**
- * @param id
- * @param displayName
- */
- public AbstractFaceletTaglibLocator(final String id,
- final String displayName)
- {
- super(id, displayName);
- // new MapMergingCompositionStrategy
- // <IProject, Map<String, IFaceletTagRecord>, Map<String,
- // IFaceletTagRecord>,
- // ILocator<Map<String, IFaceletTagRecord>, IProject, String>>
- // (new HashMap<String, IFaceletTagRecord>(), Collections.EMPTY_MAP)
- }
-
- /**
- * @return a list of all tag libraries known to this locator
- */
- @Override
- protected abstract Map<String, ? extends IFaceletTagRecord> doLocate(
- IProject context);
-
- /**
- * Listener argument must be of type Listener.
- *
- * @see org.eclipse.jst.jsf.common.internal.locator.AbstractLocator#addListener(org.eclipse.jst.jsf.common.internal.locator.ILocatorChangeListener)
- */
- @Override
- public void addListener(final ILocatorChangeListener listener)
- {
- if (!(listener instanceof Listener))
- {
- throw new IllegalArgumentException();
- }
- super.addListener(listener);
- }
-
- /**
- * @param listener
- */
- public void addListener(final Listener listener)
- {
- super.addListener(listener);
- }
-
- /**
- * @param taglibChangedEvent
- */
- protected void fireChangeEvent(final TaglibChangedEvent taglibChangedEvent)
- {
- super.fireChangeEvent(taglibChangedEvent);
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/AbstractProjectTaglibDescriptorFactory.java b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/AbstractProjectTaglibDescriptorFactory.java
deleted file mode 100644
index 47866c0..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/AbstractProjectTaglibDescriptorFactory.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package org.eclipse.jst.jsf.facelet.core.internal.registry.taglib;
-
-import org.eclipse.core.resources.IProject;
-
-/**
- * The base class for all impls of IProjectTaglibDescriptorFactory.
- *
- * @author cbateman
- *
- */
-public abstract class AbstractProjectTaglibDescriptorFactory implements IProjectTaglibDescriptorFactory
-{
-
- public abstract IProjectTaglibDescriptor create(IProject project,
- TagRecordFactory factory);
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/CompositeComponentTaglibLocator.java b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/CompositeComponentTaglibLocator.java
deleted file mode 100644
index 8cf8ced..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/CompositeComponentTaglibLocator.java
+++ /dev/null
@@ -1,207 +0,0 @@
-package org.eclipse.jst.jsf.facelet.core.internal.registry.taglib;
-
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jst.jsf.common.internal.locator.ILocatorProvider;
-import org.eclipse.jst.jsf.designtime.internal.resources.IJSFResource;
-import org.eclipse.jst.jsf.designtime.internal.resources.IJSFResourceContainer;
-import org.eclipse.jst.jsf.designtime.internal.resources.IJSFResourceFragment;
-import org.eclipse.jst.jsf.designtime.internal.resources.IJSFResourceFragment.Type;
-import org.eclipse.jst.jsf.designtime.internal.resources.IJSFResourceLocator;
-import org.eclipse.jst.jsf.designtime.internal.resources.JSFResourceChangeListener;
-import org.eclipse.jst.jsf.designtime.internal.resources.JSFResourceContainer;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.JSFResourceBasedTagRecord.Builder;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.Listener.TaglibChangedEvent;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.Listener.TaglibChangedEvent.CHANGE_TYPE;
-
-/**
- * A taglib locator that locates composite components, which a located as a type
- * of JSF locatable resource.
- *
- * @author cbateman
- *
- */
-public class CompositeComponentTaglibLocator extends
- AbstractFaceletTaglibLocator
-{
- private final class ResourceLocatorChangeListener extends
- JSFResourceChangeListener
- {
- @Override
- public void changed(final JSFResourceChangedEvent event)
- {
- final Builder builder = new Builder();
- switch (event.getChangeType())
- {
- case ADDED:
- case CHANGED:
- {
- handleAddAndChange(event, builder);
- }
- break;
- case REMOVED:
- {
- handleRemove(event, builder);
- }
- break;
- }
- }
-
- private void handleRemove(final JSFResourceChangedEvent event,
- final Builder builder)
- {
- List<TaglibChangedEvent> events = Collections.EMPTY_LIST;
- switch (event.getOldValue().getType())
- {
- case RESOURCE:
- {
- events = handleRemoveResource(event, builder);
- }
- break;
- case CONTAINER:
- {
- events = handleRemoveContainer(event, builder);
- }
- break;
- }
-
- _records = builder.merge(events, _records);
- for (final TaglibChangedEvent fireEvent : events)
- {
- fireChangeEvent(fireEvent);
- }
- }
-
- private List<TaglibChangedEvent> handleRemoveContainer(
- final JSFResourceChangedEvent event, final Builder builder)
- {
- final IJSFResourceFragment oldValue = event.getOldValue();
- builder.addLibrary((IJSFResourceContainer) oldValue,
- CHANGE_TYPE.REMOVED);
- return builder.createRemove(CompositeComponentTaglibLocator.this,
- _records);
- }
-
- private List<TaglibChangedEvent> handleRemoveResource(
- final JSFResourceChangedEvent event, final Builder builder)
- {
- final IJSFResourceFragment oldValue = event.getOldValue();
- builder.addTag((IJSFResource) oldValue, CHANGE_TYPE.REMOVED);
- return builder.createRemove(CompositeComponentTaglibLocator.this,
- _records);
- }
-
- private void handleAddAndChange(final JSFResourceChangedEvent event,
- final Builder builder)
- {
- List<TaglibChangedEvent> events = Collections.EMPTY_LIST;
-
- switch (event.getNewValue().getType())
- {
- case CONTAINER:
- // if it's a fragment handle as a possible library add
- events = handleFolderAddChange(event, builder);
- break;
- case RESOURCE:
- // otherwise, handle as a file add.
- events = handleFileAddChange(event, builder);
- break;
- }
-
- _records = builder.merge(events, _records);
-
- for (final TaglibChangedEvent fireEvent : events)
- {
- fireChangeEvent(fireEvent);
- }
- }
-
- private List<TaglibChangedEvent> handleFolderAddChange(
- final JSFResourceChangedEvent event, final Builder builder)
- {
- final JSFResourceContainer newValue = (JSFResourceContainer) event
- .getNewValue();
- builder.addLibrary(newValue, CHANGE_TYPE.ADDED);
- return builder.createMerge(CompositeComponentTaglibLocator.this,
- _records);
- }
-
- private List<TaglibChangedEvent> handleFileAddChange(
- final JSFResourceChangedEvent event, final Builder builder)
- {
- final IJSFResource newValue = (IJSFResource) event.getNewValue();
- builder.addTag(newValue, CHANGE_TYPE.ADDED);
- return builder.createMerge(CompositeComponentTaglibLocator.this,
- _records);
- }
- }
-
- /**
- * the id of the locator strategy.
- */
- public static final String ID = CompositeComponentTaglibLocator.class
- .getCanonicalName();
- private static final String DISPLAY_NAME = "Composite Composite Tag Lib Locator"; //$NON-NLS-1$
- private final ILocatorProvider<IJSFResourceLocator> _locatorProvider;
- private Map<String, JSFResourceBasedTagRecord> _records;
- private final ResourceLocatorChangeListener _listener;
-
- /**
- * @param locatorProvider
- */
- public CompositeComponentTaglibLocator(
- final ILocatorProvider<IJSFResourceLocator> locatorProvider)
- {
- super(ID, DISPLAY_NAME);
- _locatorProvider = locatorProvider;
- _locatorProvider.initialize();
- _listener = new ResourceLocatorChangeListener();
- }
-
- @Override
- public void start(final IProject initialContext)
- {
- for (final IJSFResourceLocator locator : _locatorProvider.getLocators())
- {
- locator.start(initialContext);
- locator.addListener(_listener);
- }
-
- final Builder builder = new Builder();
- for (final IJSFResourceLocator locator : _locatorProvider.getLocators())
- {
- final List<IJSFResourceFragment> resources = locator
- .locate(initialContext);
- for (final IJSFResourceFragment resource : resources)
- {
- if (resource.getType() == Type.RESOURCE)
- {
- builder.addTag((IJSFResource) resource, CHANGE_TYPE.ADDED);
- }
- }
- }
- _records = builder.build();
-
- super.start(initialContext);
- }
-
- @Override
- public void stop()
- {
- for (final IJSFResourceLocator locator : _locatorProvider.getLocators())
- {
- locator.stop();
- }
- super.stop();
- }
-
- @Override
- protected Map<String, ? extends IFaceletTagRecord> doLocate(
- final IProject context)
- {
- return Collections.unmodifiableMap(_records);
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/ContextParamSpecifiedFaceletTaglibLocator.java b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/ContextParamSpecifiedFaceletTaglibLocator.java
deleted file mode 100644
index 863b16c..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/ContextParamSpecifiedFaceletTaglibLocator.java
+++ /dev/null
@@ -1,267 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2007 Oracle 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:
- * Ian Trimble - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facelet.core.internal.registry.taglib;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jst.j2ee.model.IModelProvider;
-import org.eclipse.jst.jsf.common.internal.componentcore.AbstractVirtualComponentQuery;
-import org.eclipse.jst.jsf.common.internal.managedobject.ObjectManager.ManagedObjectException;
-import org.eclipse.jst.jsf.common.internal.resource.WorkspaceMediator;
-import org.eclipse.jst.jsf.facelet.core.internal.FaceletCorePlugin;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.IFaceletTagRecord.WorkspaceTagRecordDescriptor;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.Listener.TaglibChangedEvent;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.Listener.TaglibChangedEvent.CHANGE_TYPE;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglib;
-
-/**
- * Attempts to locate Facelet taglib's specified as xml files in project
- * relative paths specified in the Facelet.LIBRARIES servlet parameters.
- *
- * @author Based on class in org.eclipse.jst.jsf.coreby Ian Trimble - Oracle
- *
- * TODO:merge back with common code in JSFAppConfig framework
- */
-public class ContextParamSpecifiedFaceletTaglibLocator extends
- AbstractFaceletTaglibLocator
-{
- private static final String ID = ContextParamSpecifiedFaceletTaglibLocator.class
- .getCanonicalName();
- private static final String DISPLAYNAME = Messages.ContextParamSpecifiedFaceletTaglibLocator_0;
- private final IProject _project;
- private final Map<String, IFaceletTagRecord> _records;
- private final TagRecordFactory _factory;
- private final TaglibResourceManager _fileManager;
-
- /**
- * @param project
- * @param factory
- * @param webAppProvider
- * @param vcQuery
- * @param wsMediator
- */
- public ContextParamSpecifiedFaceletTaglibLocator(final IProject project,
- final TagRecordFactory factory,
- final IModelProvider webAppProvider,
- final AbstractVirtualComponentQuery vcQuery,
- final WorkspaceMediator wsMediator)
- {
- super(ID, DISPLAYNAME);
- _project = project;
- _records = new HashMap<String, IFaceletTagRecord>();
- _factory = factory;
- WebappConfiguration webConfig = new WebappConfiguration(project, webAppProvider,
- vcQuery, wsMediator);
- _fileManager = new TaglibResourceManager(project,
- new LibraryChangeHandler(), wsMediator, webConfig);
- }
-
- /*
- * (non-Javadoc)
- *
- * @seeorg.eclipse.jst.jsf.core.jsfappconfig.AbstractJSFAppConfigLocater#
- * startLocating()
- */
- @Override
- public void start(final IProject project)
- {
- _fileManager.initResources();
- super.start(project);
- }
-
- /*
- * (non-Javadoc)
- *
- * @seeorg.eclipse.jst.jsf.core.jsfappconfig.AbstractJSFAppConfigLocater#
- * stopLocating()
- */
- @Override
- public void stop()
- {
- _fileManager.dispose();
- super.stop();
- }
-
- @Override
- protected Map<String, ? extends IFaceletTagRecord> doLocate(
- final IProject context)
- {
- final List<IFile> files = _fileManager.getResources();
-
- _records.clear();
-
- for (final IFile file : files)
- {
- if (file.exists())
- {
- TaglibFileTracker tracker = null;
- try
- {
- tracker = (TaglibFileTracker) _fileManager.getInstance(file);
- } catch (final ManagedObjectException e)
- {
- FaceletCorePlugin.log("Creating record", e); //$NON-NLS-1$
- }
-
- final IFaceletTagRecord record = createTagRecord(file);
- if (record != null)
- {
- _records.put(record.getURI(), record);
- if (tracker != null)
- {
- tracker.setUri(record.getURI());
- }
- }
- }
- }
-
- return _records;
- }
-
- private IFaceletTagRecord createTagRecord(final IFile file)
- {
- InputStream is = null;
- if (!file.isAccessible())
- {
- return null;
- }
- try
- {
- is = file.getContents();
- final TagModelLoader loader = new TagModelLoader(file.getFullPath()
- .toFile().getCanonicalPath());
- loader.loadFromInputStream(is);
- final FaceletTaglib taglib = loader.getTaglib();
- // if no valid namespace, don't create a record.
- if (taglib != null && taglib.getNamespaceUri() != null && taglib.getNamespaceUri().trim().length()>0)
- {
- return _factory.createRecords(taglib, new WorkspaceTagRecordDescriptor(file));
- }
- } catch (final Exception e)
- {
- FaceletCorePlugin
- .log(
- "Loading web root taglibs for project: " + _project.getName(), e); //$NON-NLS-1$
- } finally
- {
- if (is != null)
- {
- try
- {
- is.close();
- } catch (final IOException e)
- {
- FaceletCorePlugin.log("Closing taglib.xml", e); //$NON-NLS-1$
- }
- }
- }
- return null;
- }
-
- class LibraryChangeHandler implements ILibraryChangeHandler
- {
- public void added(final IFile file)
- {
- final IFaceletTagRecord tagRecord = createTagRecord(file);
- TaglibFileTracker tracker = null;
- try
- {
- tracker = (TaglibFileTracker) _fileManager.getInstance(file);
- } catch (final ManagedObjectException e)
- {
- FaceletCorePlugin.log("Adding new library", e); //$NON-NLS-1$
- }
-
- if (tagRecord != null)
- {
-
- _records.put(tagRecord.getURI(), tagRecord);
- if (tracker != null)
- {
- tracker.setUri(tagRecord.getURI());
- }
-
- fireChangeEvent(new TaglibChangedEvent(
- ContextParamSpecifiedFaceletTaglibLocator.this, null,
- tagRecord, CHANGE_TYPE.ADDED));
- }
- }
-
- public void removed(final String uri, final IFile file)
- {
- final IFaceletTagRecord tagRecord = _records.remove(uri);
- if (tagRecord != null)
- {
- fireChangeEvent(new TaglibChangedEvent(
- ContextParamSpecifiedFaceletTaglibLocator.this, tagRecord,
- null, CHANGE_TYPE.REMOVED));
- }
- }
-
- public void changed(final String uri, final IFile file)
- {
- final IFaceletTagRecord oldValue = _records.remove(uri);
- final IFaceletTagRecord newValue = createTagRecord(file);
-
- if (oldValue == null)
- {
- // no oldValue, is newValue so ADD
- if (newValue != null)
- {
- _records.put(uri, newValue);
- fireChangeEvent(new TaglibChangedEvent(
- ContextParamSpecifiedFaceletTaglibLocator.this, null,
- newValue, CHANGE_TYPE.ADDED));
- }
- }
- // if there is an old value
- else
- {
- // oldValue but no new value, so REMOVE
- if (newValue == null)
- {
- fireChangeEvent(new TaglibChangedEvent(
- ContextParamSpecifiedFaceletTaglibLocator.this, oldValue,
- null, CHANGE_TYPE.REMOVED));
-
- }
- // both old and new value, so a change of some kind
- else
- {
- _records.put(uri, newValue);
- // if the namespaces match, then it's a simple change
- if (oldValue.getURI() != null && oldValue.getURI().equals(newValue.getURI()))
- {
- fireChangeEvent(new TaglibChangedEvent(
- ContextParamSpecifiedFaceletTaglibLocator.this,
- oldValue, newValue, CHANGE_TYPE.CHANGED));
- }
- // otherwise, it's a remove of old value and an add of new value
- else
- {
- fireChangeEvent(new TaglibChangedEvent(
- ContextParamSpecifiedFaceletTaglibLocator.this, oldValue,
- null, CHANGE_TYPE.REMOVED));
- fireChangeEvent(new TaglibChangedEvent(
- ContextParamSpecifiedFaceletTaglibLocator.this, null,
- newValue, CHANGE_TYPE.ADDED));
- }
- }
- }
- }
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/DefaultStandardTaglibLocator.java b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/DefaultStandardTaglibLocator.java
deleted file mode 100644
index e62b51c..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/DefaultStandardTaglibLocator.java
+++ /dev/null
@@ -1,130 +0,0 @@
-package org.eclipse.jst.jsf.facelet.core.internal.registry.taglib;
-
-import java.io.File;
-import java.io.InputStream;
-import java.net.URL;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.FileLocator;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jst.jsf.facelet.core.internal.FaceletCorePlugin;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.IFaceletTagRecord.TagRecordDescriptor;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglib;
-
-/**
- * @author cbateman
- *
- */
-public class DefaultStandardTaglibLocator extends AbstractFaceletTaglibLocator
-{
- private static final Set<String> taglibLocations;
- static
- {
- final Set<String> set = new HashSet<String>();
- set.add("/std-taglibs/html_basic.taglib.xml"); //$NON-NLS-1$
- set.add("/std-taglibs/composite.taglib.xml"); //$NON-NLS-1$
- set.add("/std-taglibs/facelets_jsf_core.taglib.xml"); //$NON-NLS-1$
- set.add("/std-taglibs/jstl-core.taglib.xml"); //$NON-NLS-1$
- set.add("/std-taglibs/jstl-fn.taglib.xml"); //$NON-NLS-1$
- set.add("/std-taglibs/ui.taglib.xml"); //$NON-NLS-1$
- taglibLocations = Collections.unmodifiableSet(set);
- }
- private static final Set<MyTagRecordDescriptor> DEFAULT_TAGLIBS;
- static
- {
- Set<MyTagRecordDescriptor> taglibs = new HashSet<MyTagRecordDescriptor>();
- for (final String location : taglibLocations)
- {
- try
- {
- final URL url = FaceletCorePlugin.getDefault().getBundle()
- .getEntry(location);
- final URL fileURL = FileLocator.toFileURL(url);
- File file = new File(fileURL.getPath());
- final InputStream openStream = fileURL.openStream();
- final TagModelLoader loader = new TagModelLoader(
- file.getAbsolutePath());
- loader.loadFromInputStream(openStream);
- final FaceletTaglib taglib = loader.getTaglib();
- MyTagRecordDescriptor desc = new MyTagRecordDescriptor(new Path(fileURL.toString()), taglib);
- taglibs.add(desc);
- } catch (final Exception e)
- {
- FaceletCorePlugin.log(
- "Trying to load default taglib for: " + location, e); //$NON-NLS-1$
- }
- }
- DEFAULT_TAGLIBS = Collections.unmodifiableSet(taglibs);
- }
- private HashMap<String, IFaceletTagRecord> _defaultRecords;
-
- /**
- *
- */
- public DefaultStandardTaglibLocator()
- {
- super("", ""); //$NON-NLS-1$//$NON-NLS-2$
- _defaultRecords = new HashMap<String, IFaceletTagRecord>();
- }
-
- @Override
- public void start(IProject project)
- {
- final TagRecordFactory factory = new TagRecordFactory(project,
- false);
-
- for (final MyTagRecordDescriptor desc : DEFAULT_TAGLIBS)
- {
- final IFaceletTagRecord record = factory.createRecords(desc.getTaglib(),
- desc);
- if (record != null)
- {
- _defaultRecords.put(record.getURI(), record);
- }
- }
- super.start(project);
- }
-
- @Override
- protected Map<String, ? extends IFaceletTagRecord> doLocate(IProject context)
- {
- return Collections.unmodifiableMap(_defaultRecords);
- }
-
- private static class MyTagRecordDescriptor extends TagRecordDescriptor
- {
- private final IPath _path;
- private final FaceletTaglib _taglib;
-
- public MyTagRecordDescriptor(final IPath path, final FaceletTaglib taglib)
- {
- super(Source.JAR);
- _path = path;
- _taglib = taglib;
- }
-
- @Override
- public IResource getResource()
- {
- return null;
- }
-
- @Override
- public IPath getPath()
- {
- return _path;
- }
-
- public FaceletTaglib getTaglib()
- {
- return _taglib;
- }
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/ExtensionBasedTagDescriptorFactoryProviderStrategy.java b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/ExtensionBasedTagDescriptorFactoryProviderStrategy.java
deleted file mode 100644
index 1c61b9c..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/ExtensionBasedTagDescriptorFactoryProviderStrategy.java
+++ /dev/null
@@ -1,69 +0,0 @@
-package org.eclipse.jst.jsf.facelet.core.internal.registry.taglib;
-
-import java.util.List;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jst.jsf.common.internal.pde.AbstractSimpleClassExtensionRegistryReader;
-import org.eclipse.jst.jsf.common.internal.strategy.ISimpleStrategy;
-import org.eclipse.jst.jsf.core.jsfappconfig.internal.IJSFAppConfigManager;
-import org.eclipse.jst.jsf.facelet.core.internal.FaceletCorePlugin;
-
-/**
- * Extension-based strategy for returning {@link IJSFAppConfigManager}s
- *
- */
-public class ExtensionBasedTagDescriptorFactoryProviderStrategy implements
- ISimpleStrategy<IProject, IProjectTaglibDescriptorFactory>
-{
- private static IProjectTaglibDescriptorFactory EXT_PT_BASED_FACTORY;
- static
- {
- final ProjectTaglibDescriptorFactoryExtensionPointReader reader = new ProjectTaglibDescriptorFactoryExtensionPointReader();
- final List<IProjectTaglibDescriptorFactory> res = reader
- .getExtensions();
- if (res != null && res.size() > 0)
- {// return first
- EXT_PT_BASED_FACTORY = res.get(0);
- }
- }
-
- public IProjectTaglibDescriptorFactory perform(final IProject input)
- throws Exception
- {
- return EXT_PT_BASED_FACTORY != null ? EXT_PT_BASED_FACTORY
- : getNoResult();
- }
-
- private static class ProjectTaglibDescriptorFactoryExtensionPointReader
- extends
- AbstractSimpleClassExtensionRegistryReader<IProjectTaglibDescriptorFactory>
- {
- private static final String EXT_PT_ID = "projectTaglibDescriptorFactory"; //$NON-NLS-1$
- private static final String EXT_PT_ELEMENT = "factory"; //$NON-NLS-1$
- private static final String EXT_PT_ATTR = "class"; //$NON-NLS-1$
-
- protected ProjectTaglibDescriptorFactoryExtensionPointReader()
- {
- super(
- FaceletCorePlugin.PLUGIN_ID,
- EXT_PT_ID,
- EXT_PT_ELEMENT,
- EXT_PT_ATTR,
- new CompareOrgEclipseJstContributorsLastComparator<IProjectTaglibDescriptorFactory>());
- }
-
- @Override
- protected void handleLoadFailure(final CoreException ce)
- {
- org.eclipse.jst.jsf.core.internal.JSFCorePlugin
- .log(ce,
- "Error loading ProjectTaglibDescriptorFactory from extension"); //$NON-NLS-1$
- }
- }
-
- public IProjectTaglibDescriptorFactory getNoResult()
- {
- return null;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/FaceletTagIndex.java b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/FaceletTagIndex.java
deleted file mode 100644
index cdef395..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/FaceletTagIndex.java
+++ /dev/null
@@ -1,232 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Oracle 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:
- * Cameron Bateman - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facelet.core.internal.registry.taglib;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.concurrent.CopyOnWriteArrayList;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.jst.j2ee.model.ModelProviderManager;
-import org.eclipse.jst.jsf.common.internal.componentcore.AbstractVirtualComponentQuery.DefaultVirtualComponentQuery;
-import org.eclipse.jst.jsf.common.internal.finder.AbstractMatcher.AlwaysMatcher;
-import org.eclipse.jst.jsf.common.internal.locator.AbstractLocatorProvider;
-import org.eclipse.jst.jsf.common.internal.locator.AbstractLocatorProvider.DefaultLocatorProvider;
-import org.eclipse.jst.jsf.common.internal.locator.ILocatorChangeListener;
-import org.eclipse.jst.jsf.common.internal.resource.ContentTypeResolver;
-import org.eclipse.jst.jsf.common.internal.resource.DefaultJarLocator;
-import org.eclipse.jst.jsf.common.internal.resource.JavaCoreMediator;
-import org.eclipse.jst.jsf.common.internal.resource.ResourceSingletonObjectManager;
-import org.eclipse.jst.jsf.common.internal.resource.WorkspaceMediator;
-import org.eclipse.jst.jsf.common.internal.strategy.AbstractTestableExtensibleDefaultProviderSelectionStrategy;
-import org.eclipse.jst.jsf.common.internal.strategy.ISimpleStrategy;
-import org.eclipse.jst.jsf.designtime.internal.resources.IJSFResourceLocator;
-import org.eclipse.jst.jsf.designtime.internal.resources.JarBasedJSFResourceLocator;
-import org.eclipse.jst.jsf.designtime.internal.resources.WorkspaceJSFResourceLocator;
-
-/**
- * @author cbateman
- *
- */
-public class FaceletTagIndex extends
- ResourceSingletonObjectManager<IProjectTaglibDescriptor, IProject>
-{
- private ISimpleStrategy<IProject, IProjectTaglibDescriptorFactory> _tagDescriptorFactoryProvider;
-
- /**
- * @param ws
- */
- public FaceletTagIndex(final IWorkspace ws)
- {
- super(ws);
- _tagDescriptorFactoryProvider = new ProjectTaglibDescriptorFactoryProviderSelectionStrategy();
- }
-
- /**
- * @param ws
- * @param tagDescriptorFactoryProvider
- */
- public FaceletTagIndex(final IWorkspace ws, final ISimpleStrategy<IProject, IProjectTaglibDescriptorFactory> tagDescriptorFactoryProvider)
- {
- this(ws);
- _tagDescriptorFactoryProvider = tagDescriptorFactoryProvider;
- }
-
- private static FaceletTagIndex INSTANCE;
-
- /**
- * @param ws
- * @return the singleton instance
- */
- public static synchronized FaceletTagIndex getInstance(final IWorkspace ws)
- {
- if (INSTANCE == null)
- {
- INSTANCE = new FaceletTagIndex(ws);
- }
- return INSTANCE;
- }
-
- @Override
- protected IProjectTaglibDescriptor createNewInstance(final IProject project)
- {
- final TagRecordFactory factory = new TagRecordFactory(project, true);
- IProjectTaglibDescriptorFactory descFactory;
- try
- {
- descFactory = _tagDescriptorFactoryProvider
- .perform(project);
- return descFactory.create(project, factory);
- } catch (Exception e)
- {
- return null;
- }
- }
-
- /**
- * Force a project to refresh its tag index info
- *
- * @param project
- */
- public void flush(final IProject project)
- {
- final IProjectTaglibDescriptor flushedDescriptor = unmanageResource(project);
- flushedDescriptor.destroy();
- }
-
- /**
- * Used to decide what provider gets used to get the descriptor factory.
- * This allows us to inject a different descriptor factory than the default
- * through either a test setter (test-only) or production (ext point).
- *
- * @author cbateman
- *
- */
- private static class ProjectTaglibDescriptorFactoryProviderSelectionStrategy
- extends
- AbstractTestableExtensibleDefaultProviderSelectionStrategy<IProject, IProjectTaglibDescriptorFactory>
- {
- private static final IProjectTaglibDescriptorFactory NO_RESULT = null;
-
- public ProjectTaglibDescriptorFactoryProviderSelectionStrategy()
- {
- super();
- addDefaultStrategy(new DefaultProjectTaglibDescriptorFactoryProvider(
- new DefaultProjectTaglibDescriptorFactory()));
- addExtensionStrategy(new ExtensionBasedTagDescriptorFactoryProviderStrategy());
- }
-
- @Override
- public IProjectTaglibDescriptorFactory getNoResult()
- {
- return NO_RESULT;
- }
- }
-
- private static class DefaultProjectTaglibDescriptorFactoryProvider
- implements
- ISimpleStrategy<IProject, IProjectTaglibDescriptorFactory>
- {
- private final DefaultProjectTaglibDescriptorFactory _factory;
-
- public DefaultProjectTaglibDescriptorFactoryProvider(
- final DefaultProjectTaglibDescriptorFactory factory)
- {
- _factory = factory;
- }
-
- public IProjectTaglibDescriptorFactory perform(final IProject input)
- throws Exception
- {
- return _factory;
- }
-
- public IProjectTaglibDescriptorFactory getNoResult()
- {
- return null;
- }
- }
-
- /**
- * The default factory for creating per-project tag descriptors.
- *
- * @author cbateman
- *
- */
- public static class DefaultProjectTaglibDescriptorFactory extends
- AbstractProjectTaglibDescriptorFactory
- {
- @Override
- public IProjectTaglibDescriptor create(final IProject project,
- final TagRecordFactory factory)
- {
- final List<AbstractFaceletTaglibLocator> locators = new ArrayList<AbstractFaceletTaglibLocator>();
- locators.add(new JarFileFaceletTaglibLocator(factory));
- locators.add(new ContextParamSpecifiedFaceletTaglibLocator(project,
- factory, ModelProviderManager.getModelProvider(project),
- new DefaultVirtualComponentQuery(), new WorkspaceMediator()));
- final List<IJSFResourceLocator> resourceLocators = new ArrayList<IJSFResourceLocator>();
- resourceLocators
- .add(new JarBasedJSFResourceLocator(Collections.EMPTY_LIST,
- new CopyOnWriteArrayList<ILocatorChangeListener>(),
- new DefaultJarLocator(Collections
- .singletonList(new AlwaysMatcher()),
- new JavaCoreMediator()),
- new ContentTypeResolver()));
- final IWorkspace workspace = project.getWorkspace();
- resourceLocators.add(new WorkspaceJSFResourceLocator(
- Collections.EMPTY_LIST,
- new CopyOnWriteArrayList<ILocatorChangeListener>(),
- new DefaultVirtualComponentQuery(),
- new ContentTypeResolver(), workspace));
- final DefaultLocatorProvider<IJSFResourceLocator> resourceLocatorProvider = new DefaultLocatorProvider<IJSFResourceLocator>(
- resourceLocators);
- locators.add(new CompositeComponentTaglibLocator(
- resourceLocatorProvider));
- final LocatorProvider provider = new LocatorProvider(locators);
- return new ProjectTaglibDescriptor(project, factory, provider);
- }
- }
-
- /**
- * The locator provider used by the tag index.
- *
- * @author cbateman
- *
- */
- public static class LocatorProvider extends
- AbstractLocatorProvider<AbstractFaceletTaglibLocator>
- {
- private final List<AbstractFaceletTaglibLocator> _locators;
-
- /**
- * @param locators
- */
- public LocatorProvider(final List<AbstractFaceletTaglibLocator> locators)
- {
- _locators = locators;
- }
-
- @Override
- protected void doInitialize()
- {
- // nothing to do
- }
-
- @Override
- protected List<? extends AbstractFaceletTaglibLocator> doGetLocators()
- {
- return Collections.unmodifiableList(_locators);
- }
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/FaceletTagRecord.java b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/FaceletTagRecord.java
deleted file mode 100644
index 95db97f..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/FaceletTagRecord.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Oracle 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:
- * Cameron Bateman - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facelet.core.internal.registry.taglib;
-
-import java.util.Collection;
-import java.util.concurrent.CopyOnWriteArrayList;
-
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTag;
-
-/**
- * Super of all facelet tag records.
- *
- * @author cbateman
- *
- */
-public abstract class FaceletTagRecord implements IFaceletTagRecord
-{
- private final CopyOnWriteArrayList<ITagRecordChangeListener> _listeners;
- private final TagRecordDescriptor _descriptor;
-
- /**
- * @param descriptor
- *
- */
- public FaceletTagRecord(final TagRecordDescriptor descriptor)
- {
- _listeners = new CopyOnWriteArrayList<ITagRecordChangeListener>();
- _descriptor = descriptor;
- }
-
-
- public TagRecordDescriptor getDescriptor()
- {
- return _descriptor;
- }
-
-
- public void addListener(final ITagRecordChangeListener listener)
- {
- _listeners.addIfAbsent(listener);
- }
-
- public void removeListener(final ITagRecordChangeListener listener)
- {
- _listeners.remove(listener);
- }
-
- /**
- * @param event
- */
- protected void fireEvent(final TagRecordChangeEvent event)
- {
- for (final ITagRecordChangeListener listener : _listeners)
- {
- listener.changed(event);
- }
- }
-
- /**
- *
- */
- private static final long serialVersionUID = -4606745577562951499L;
-
- public abstract String getURI();
-
- public abstract FaceletTaglibTag getTag(final String name);
-
- public abstract Collection<? extends FaceletTaglibTag> getTags();
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/IFaceletTagRecord.java b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/IFaceletTagRecord.java
deleted file mode 100644
index 7de826b..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/IFaceletTagRecord.java
+++ /dev/null
@@ -1,267 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Oracle 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:
- * Cameron Bateman - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facelet.core.internal.registry.taglib;
-
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.EventObject;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTag;
-
-/**
- * @author cbateman
- *
- */
-public interface IFaceletTagRecord extends Serializable
-{
- /**
- * @return the uri of the tag library
- */
- String getURI();
-
- /**
- * This may be implemented differently than getTags().size(), since getting
- * all tags may be very expensive, while the overall number may be cheap.
- *
- * However, it should always be true that getTags().size() == getNumTags()
- *
- * @return the number of tags in this record.
- */
- int getNumTags();
-
- /**
- * @return the tag definitions
- */
- Collection<? extends FaceletTaglibTag> getTags();
-
- /**
- * @param name
- * @return the tag definition for name or null.
- */
- FaceletTaglibTag getTag(final String name);
-
- /**
- * @return the tag record descriptor for the record.
- */
- TagRecordDescriptor getDescriptor();
-
- /**
- * @param listener
- */
- void addListener(final ITagRecordChangeListener listener);
-
- /**
- * @param listener
- */
- void removeListener(final ITagRecordChangeListener listener);
-
- /**
- * Indicates that a tag record has changed
- */
- public static class TagRecordChangeEvent extends EventObject
- {
- /**
- *
- */
- private static final long serialVersionUID = 5655356157624922019L;
-
- /**
- * @param source
- */
- public TagRecordChangeEvent(final IFaceletTagRecord source)
- {
- super(source);
- }
- }
-
- /**
- * A listener for tag record change events.
- *
- */
- public interface ITagRecordChangeListener
- {
- /**
- * @param event
- */
- public void changed(final TagRecordChangeEvent event);
- }
-
- /**
- * Describes the source of a tag record in the filesystem and workspace.
- *
- */
- public abstract static class TagRecordDescriptor
- {
- private final Source _source;
-
- /**
- * @param source
- */
- public TagRecordDescriptor(final Source source)
- {
- super();
- _source = source;
- }
-
- /**
- * @return the source type of the descriptor
- */
- public Source getSource()
- {
- return _source;
- }
-
- /**
- * The source of the tag record
- *
- */
- public enum Source
- {
- /**
- * Tag record is defined in a file in the workspace. If this is the
- * source, then getResource() will never return null and will be of
- * type IFile.
- */
- WORKSPACE_FILE,
- /**
- * Tag record is defined in a folder in the workspace. If this is
- * the source, then getResource() will never return null and will be
- * of type IFolder.
- */
- WORKSPACE_FOLDER,
- /**
- * Tag record is defined in a jar file. If this is the source then
- * getResource() will return an IFile if the jar is in the workspace
- * and null otherwise.
- */
- JAR
- }
-
- /**
- * see Source for information on what this returns.
- *
- * @return the workspace resource where the tag record is defined. or
- * null if it is not in the workspace
- */
- public abstract IResource getResource();
-
- /**
- * @return the absolute path in the file system to the where the library
- * is defined. If Source is WORKSPACE_FOLDER then this will
- * point to a directory.
- *
- * Otherwise, it will point to a file.
- */
- public abstract IPath getPath();
- }
-
- /**
- * Describes a tag record defined in workspace.
- *
- */
- public static class WorkspaceTagRecordDescriptor extends
- TagRecordDescriptor
- {
- private final IResource _resource;
-
- /**
- * @param file
- */
- public WorkspaceTagRecordDescriptor(final IFile file)
- {
- super(Source.WORKSPACE_FILE);
- _resource = file;
- }
-
- /**
- * @param folder
- */
- public WorkspaceTagRecordDescriptor(final IFolder folder)
- {
- super(Source.WORKSPACE_FOLDER);
- _resource = folder;
- }
-
- @Override
- public IResource getResource()
- {
- return _resource;
- }
-
- @Override
- public IPath getPath()
- {
- return _resource.getLocation();
- }
- }
-
- /**
- * Describes a tag record defined in a jar. The additional entryName
- * provides the jar entry where the actual tag record source file is found.
- *
- */
- public static class JarTagRecordDescriptor extends TagRecordDescriptor
- {
- private final IResource _resourceJar;
- private final String _entryName;
- private final IPath _absPath;
-
- /**
- * @param resourceJar
- * @param entryName
- */
- public JarTagRecordDescriptor(final IResource resourceJar,
- final String entryName)
- {
- super(Source.JAR);
- _resourceJar = resourceJar;
- _entryName = entryName;
- _absPath = resourceJar.getLocation();
- }
-
- /**
- * @param absPath
- * @param entryName
- */
- public JarTagRecordDescriptor(final IPath absPath,
- final String entryName)
- {
- super(Source.JAR);
- _resourceJar = null;
- _absPath = absPath;
- _entryName = entryName;
- }
-
- @Override
- public IResource getResource()
- {
- return _resourceJar;
- }
-
- @Override
- public IPath getPath()
- {
- return _absPath;
- }
-
- /**
- * @return the entry name o
- */
- public final String getEntryName()
- {
- return _entryName;
- }
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/IFaceletTaglibLocator.java b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/IFaceletTaglibLocator.java
deleted file mode 100644
index 6d0f761..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/IFaceletTaglibLocator.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package org.eclipse.jst.jsf.facelet.core.internal.registry.taglib;
-
-import java.util.Map;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jst.jsf.common.internal.locator.ILocator;
-
-/**
- * A locator that returns a name-keyed map of facelet tag records for a particular
- * project.
- *
- * @author cbateman
- *
- */
-public interface IFaceletTaglibLocator extends ILocator<Map<String, ? extends IFaceletTagRecord>, IProject, String>
-{
- /**
- * @param listener
- */
- public abstract void addListener(final Listener listener);
-}
\ No newline at end of file
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/ILibraryChangeHandler.java b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/ILibraryChangeHandler.java
deleted file mode 100644
index 69d51f5..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/ILibraryChangeHandler.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package org.eclipse.jst.jsf.facelet.core.internal.registry.taglib;
-
-import org.eclipse.core.resources.IFile;
-
-/**
- * A callback interface used declare library changes to a client.
- *
- * @author cbateman
- *
- */
-public interface ILibraryChangeHandler
-{
-
- /**
- * Signal that the library defined in file with namespace uri has changed.
- *
- * @param uri
- * @param file
- */
- public abstract void changed(final String uri, final IFile file);
-
- /**
- * Signal that the library defined in file with namespace uri has been
- * removed as a library. This may or may not mean that file still exists.
- * @param uri
- * @param file
- */
- public abstract void removed(final String uri, final IFile file);
-
- /**
- * A new tag library defined in file has been added to the system.
- *
- * @param file
- */
- public abstract void added(final IFile file);
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/IProjectTaglibDescriptor.java b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/IProjectTaglibDescriptor.java
deleted file mode 100644
index effe16c..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/IProjectTaglibDescriptor.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Oracle 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:
- * Cameron Bateman - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facelet.core.internal.registry.taglib;
-
-import java.util.Collection;
-
-import org.eclipse.jst.jsf.common.internal.managedobject.IManagedObject;
-
-/**
- * A descriptor for all facelet taglibs in a project.
- *
- * @author cbateman
- *
- */
-public interface IProjectTaglibDescriptor extends IManagedObject
-{
- /**
- * @return get the tag library records
- */
- public Collection<? extends IFaceletTagRecord> getTagLibraries();
-
- /**
- * @param uri
- * @return get the tag library for uri
- */
- public IFaceletTagRecord getTagLibrary(final String uri);
-
- /**
- * @param listener
- */
- public void addListener(final Listener listener);
-
- /**
- * @param listener
- */
- public void removeListener(final Listener listener);
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/IProjectTaglibDescriptorFactory.java b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/IProjectTaglibDescriptorFactory.java
deleted file mode 100644
index 039d926..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/IProjectTaglibDescriptorFactory.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package org.eclipse.jst.jsf.facelet.core.internal.registry.taglib;
-
-import org.eclipse.core.resources.IProject;
-
-/**
- * Implemented by factories that create new IProjectTaglibDescriptor objects.
- *
- * @author cbateman
- *
- */
-public interface IProjectTaglibDescriptorFactory
-{
- /**
- * @param project
- * @param factory
- * @param jarProvider
- * @param webAppProvider
- * @param vcQuery
- * @return a new taglib descriptor.
- */
- IProjectTaglibDescriptor create(final IProject project, final TagRecordFactory factory);
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/JSFResourceBasedTagRecord.java b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/JSFResourceBasedTagRecord.java
deleted file mode 100644
index a15276e..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/JSFResourceBasedTagRecord.java
+++ /dev/null
@@ -1,421 +0,0 @@
-package org.eclipse.jst.jsf.facelet.core.internal.registry.taglib;
-
-import java.io.File;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jst.jsf.common.internal.util.JarUtilities;
-import org.eclipse.jst.jsf.designtime.internal.resources.IJSFResource;
-import org.eclipse.jst.jsf.designtime.internal.resources.IJSFResourceContainer;
-import org.eclipse.jst.jsf.designtime.internal.resources.IJSFResourceFragment;
-import org.eclipse.jst.jsf.designtime.internal.resources.IJarBasedJSFResource;
-import org.eclipse.jst.jsf.designtime.internal.resources.IWorkspaceJSFResourceFragment;
-import org.eclipse.jst.jsf.designtime.internal.resources.WorkspaceJSFResourceContainer;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.Listener.TaglibChangedEvent;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.Listener.TaglibChangedEvent.CHANGE_TYPE;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibFactory;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTag;
-
-/**
- * A facelet tag record is derived from a JSF locatable resource (ezcomp).
- *
- * @author cbateman
- *
- */
-public class JSFResourceBasedTagRecord extends FaceletTagRecord
-{
- private final List<FaceletTaglibTag> _tags;
- private final String _uri;
-
- /**
- * @param uri
- * @param tags
- * @param descriptor
- */
- public JSFResourceBasedTagRecord(final String uri,
- final List<FaceletTaglibTag> tags,
- final TagRecordDescriptor descriptor)
- {
- super(descriptor);
- _uri = uri;
- _tags = tags;
- }
-
- /**
- *
- */
- private static final long serialVersionUID = 5944923828112777373L;
-
- public int getNumTags()
- {
- return _tags.size();
- }
-
- @Override
- public String getURI()
- {
- return _uri;
- }
-
- @Override
- public FaceletTaglibTag getTag(final String name)
- {
- for (final FaceletTaglibTag tag : _tags)
- {
- if (tag.getTagName().equals(name))
- {
- return tag;
- }
- }
- return null;
- }
-
- @Override
- public Collection<? extends FaceletTaglibTag> getTags()
- {
- return Collections.unmodifiableCollection(_tags);
- }
-
- /**
- * Merge my tags with 'withThese'. Tags in my list will be replaced with
- * those in 'withThese' if their names match.
- *
- * @param withThese
- */
- /* package */JSFResourceBasedTagRecord mergeTags(
- final List<FaceletTaglibTag> withThese)
- {
- final List<FaceletTaglibTag> tags = new ArrayList<FaceletTaglibTag>(
- _tags);
- for (final FaceletTaglibTag mergeTag : withThese)
- {
- final FaceletTaglibTag tag = getTag(mergeTag.getTagName());
- if (tag != null)
- {
- tags.remove(tag);
- }
- tags.add(mergeTag);
- }
- return new JSFResourceBasedTagRecord(_uri, tags, getDescriptor());
- }
-
- /* package */JSFResourceBasedTagRecord removeTags(
- final List<FaceletTaglibTag> removeThese)
- {
- final List<FaceletTaglibTag> tags = new ArrayList<FaceletTaglibTag>(
- _tags);
- for (final FaceletTaglibTag mergeTag : removeThese)
- {
- final FaceletTaglibTag tag = getTag(mergeTag.getTagName());
- if (tag != null)
- {
- tags.remove(tag);
- }
- }
- return new JSFResourceBasedTagRecord(_uri, tags, getDescriptor());
- }
-
- /**
- * A builder for tag record.
- *
- * @author cbateman
- *
- */
- public static class Builder
- {
- private static final LibEntry WHOLE_LIBRARY = new LibEntry(null);
- private static final JSFResourceBasedTagRecord WHOLE_LIB_RECORD = new JSFResourceBasedTagRecord(null, Collections.EMPTY_LIST, null);
- private final Map<String, LibEntry> _tags = new HashMap<String, LibEntry>();
- private static final String FACELET_FILE_CONTENT_TYPE = "org.eclipse.wst.html.core.htmlsource"; //$NON-NLS-1$
-
- /**
- * @param jsfResource
- * @param changeType
- */
- public void addTag(final IJSFResource jsfResource,
- final CHANGE_TYPE changeType)
- {
- final String libraryName = jsfResource.getId().getLibraryName();
- if (libraryName == null)
- {
- return;
- }
- final String uri = String.format(
- "http://java.sun.com/jsf/composite/%s", libraryName); //$NON-NLS-1$
- LibEntry tags = _tags.get(uri);
- if (tags == null)
- {
- tags = new LibEntry(createDescriptor(jsfResource));
- _tags.put(uri, tags);
- }
- final String resourceName = jsfResource.getId().getResourceName();
- final IPath resourceNamePath = new Path(resourceName)
- .removeFileExtension();
- final FaceletTaglibTag tag = FaceletTaglibFactory.eINSTANCE
- .createFaceletTaglibTag();
- tag.setTagName(resourceNamePath.toString());
- switch (changeType)
- {
- case ADDED:
- case CHANGED:
- // only add to the list on a add/change if the resource
- // exists and is the right type
- if (jsfResource.isAccessible()
- && jsfResource
- .isContentType(FACELET_FILE_CONTENT_TYPE))
- {
- tags.addTag(tag);
- }
- break;
- case REMOVED:
- // add all comers to the remove list. There will only be
- // removal
- // on merge if ADDED/CHANGED path decided they should be
- // there.
- tags.addTag(tag);
- break;
- }
- }
-
- /**
- * @param jsfResource
- * @param changeType
- */
- public void addLibrary(final IJSFResourceContainer jsfResource,
- final CHANGE_TYPE changeType)
- {
- final String libraryName = jsfResource.getId().getLibraryName();
- if (libraryName == null || libraryName.trim().length() == 0)
- {
- return;
- }
- final String uri = String.format(
- "http://java.sun.com/jsf/composite/%s", libraryName); //$NON-NLS-1$
- if (changeType == CHANGE_TYPE.REMOVED)
- {
- _tags.put(uri, WHOLE_LIBRARY);
- } else
- {
- LibEntry tags = _tags.get(uri);
- if (tags == null)
- {
- tags = new LibEntry(createDescriptor(jsfResource));
- _tags.put(uri, tags);
- }
- }
- }
-
- /**
- * @return the built list of tag records.
- */
- public Map<String, JSFResourceBasedTagRecord> build()
- {
- final Map<String, JSFResourceBasedTagRecord> records = new HashMap<String, JSFResourceBasedTagRecord>();
- for (final Map.Entry<String, LibEntry> entry : _tags
- .entrySet())
- {
- if (entry.getValue() == WHOLE_LIBRARY)
- {
- records.put(entry.getKey(), WHOLE_LIB_RECORD);
- }
- else
- {
- final String uri = entry.getKey();
- final List<FaceletTaglibTag> tags = new ArrayList<FaceletTaglibTag>(entry.getValue().getTags());
- final TagRecordDescriptor descriptor = entry.getValue().getDescriptor();
- final JSFResourceBasedTagRecord newRecord = new JSFResourceBasedTagRecord(
- uri, tags, descriptor);
- records.put(entry.getKey(), newRecord);
- }
- }
- return records;
- }
-
- /**
- * @param locator
- * @param records
- * @return a list of taglib change events that reflect what will happen
- * when my tags are merged into the map 'records'.
- */
- public List<TaglibChangedEvent> createMerge(
- final AbstractFaceletTaglibLocator locator,
- final Map<String, JSFResourceBasedTagRecord> records)
- {
- final Map<String, JSFResourceBasedTagRecord> newRecords = build();
- final List<TaglibChangedEvent> mergeEvents = new ArrayList<TaglibChangedEvent>();
- for (final Map.Entry<String, JSFResourceBasedTagRecord> entry : newRecords
- .entrySet())
- {
- TaglibChangedEvent event = null;
- if (!records.containsKey(entry.getKey()))
- {
- event = new TaglibChangedEvent(locator, null,
- entry.getValue(), CHANGE_TYPE.ADDED);
- } else
- {
- final JSFResourceBasedTagRecord oldRecord = records
- .get(entry.getKey());
- final JSFResourceBasedTagRecord newRecord = oldRecord
- .mergeTags(entry.getValue()._tags);
- event = new TaglibChangedEvent(locator, oldRecord,
- newRecord, CHANGE_TYPE.CHANGED);
- }
- mergeEvents.add(event);
- }
- return mergeEvents;
- }
-
- /**
- * @param locator
- * @param records
- * @return a list of change events that will result from removing my
- * _tags from records.
- */
- public List<TaglibChangedEvent> createRemove(
- final AbstractFaceletTaglibLocator locator,
- final Map<String, JSFResourceBasedTagRecord> records)
- {
- final Map<String, JSFResourceBasedTagRecord> newRecords = build();
- final List<TaglibChangedEvent> mergeEvents = new ArrayList<TaglibChangedEvent>();
- for (final Map.Entry<String, JSFResourceBasedTagRecord> entry : newRecords
- .entrySet())
- {
- TaglibChangedEvent event = null;
- final JSFResourceBasedTagRecord oldRecord = records.get(entry
- .getKey());
- if (oldRecord != null)
- {
- final JSFResourceBasedTagRecord record = entry.getValue();
- if (record == WHOLE_LIB_RECORD)
- {
- event = new TaglibChangedEvent(locator, oldRecord,
- null, CHANGE_TYPE.REMOVED);
- } else
- {
- final JSFResourceBasedTagRecord newRecord = oldRecord
- .removeTags(entry.getValue()._tags);
- event = new TaglibChangedEvent(locator, oldRecord,
- newRecord, CHANGE_TYPE.CHANGED);
- }
- }
- if (event != null)
- {
- mergeEvents.add(event);
- }
- }
- return mergeEvents;
- }
-
- /**
- * @param events
- * @param withThese
- * @return a new merged map that contains withThese plus everything
- * here.
- */
- public Map<String, JSFResourceBasedTagRecord> merge(
- final List<TaglibChangedEvent> events,
- final Map<String, JSFResourceBasedTagRecord> withThese)
- {
- final Map<String, JSFResourceBasedTagRecord> newMap = new HashMap<String, JSFResourceBasedTagRecord>(
- withThese);
- for (final TaglibChangedEvent event : events)
- {
- switch (event.getChangeType())
- {
- case ADDED:
- case CHANGED:
- {
- final IFaceletTagRecord newRecord = event.getNewValue();
- // doubles as null check
- if (newRecord instanceof JSFResourceBasedTagRecord)
- {
- newMap.put(newRecord.getURI(),
- (JSFResourceBasedTagRecord) newRecord);
- }
- }
- break;
- case REMOVED:
- {
- final IFaceletTagRecord oldRecord = event.getOldValue();
- if (oldRecord != null)
- {
- newMap.remove(oldRecord.getURI());
- }
- }
- break;
- }
- }
- return newMap;
- }
-
- private TagRecordDescriptor createDescriptor(final IJSFResourceFragment resource)
- {
- if (resource instanceof IWorkspaceJSFResourceFragment)
- {
- if (resource instanceof WorkspaceJSFResourceContainer)
- {
- final IResource res = ((WorkspaceJSFResourceContainer)resource).getResource();
- return new WorkspaceTagRecordDescriptor((IFolder) res);
- }
- final IResource res = ((IWorkspaceJSFResourceFragment) resource)
- .getResource();
- return new WorkspaceTagRecordDescriptor((IFile) res);
- } else if (resource instanceof IJarBasedJSFResource)
- {
- final URL jarURL = ((IJarBasedJSFResource) resource)
- .getJarURL();
- final File file = JarUtilities.INSTANCE.getFile(jarURL);
- if (file != null)
- {
- final String absolutePath = file.getAbsolutePath();
- final String jarEntryName = ((IJarBasedJSFResource) resource)
- .getJarEntryName();
- return new JarTagRecordDescriptor(new Path(absolutePath),
- jarEntryName);
- }
- }
- return null;
- }
-
- private static class LibEntry
- {
- private final TagRecordDescriptor _descriptor;
- private final List<FaceletTaglibTag> _tags;
-
- /**
- * @param descriptor
- */
- public LibEntry(final TagRecordDescriptor descriptor)
- {
- super();
- _descriptor = descriptor;
- _tags = new ArrayList<FaceletTaglibTag>();
- }
-
- public TagRecordDescriptor getDescriptor()
- {
- return _descriptor;
- }
-
- public void addTag(final FaceletTaglibTag tag)
- {
- _tags.add(tag);
- }
-
- public List<FaceletTaglibTag> getTags()
- {
- return Collections.unmodifiableList(_tags);
- }
- }
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/JarFileFaceletTaglibLocator.java b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/JarFileFaceletTaglibLocator.java
deleted file mode 100644
index 01677e1..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/JarFileFaceletTaglibLocator.java
+++ /dev/null
@@ -1,308 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Oracle 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:
- * Cameron Bateman - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facelet.core.internal.registry.taglib;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.jar.JarEntry;
-import java.util.jar.JarFile;
-import java.util.regex.Pattern;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.jst.jsf.common.internal.finder.AbstractMatcher.AlwaysMatcher;
-import org.eclipse.jst.jsf.common.internal.finder.AbstractMatcher.IMatcher;
-import org.eclipse.jst.jsf.common.internal.finder.VisitorMatcher;
-import org.eclipse.jst.jsf.common.internal.finder.acceptor.JarEntryMatchingAcceptor;
-import org.eclipse.jst.jsf.common.internal.finder.matcher.TaglibJarEntryFinder;
-import org.eclipse.jst.jsf.common.internal.resource.ClasspathJarFile;
-import org.eclipse.jst.jsf.common.internal.resource.DefaultJarLocator;
-import org.eclipse.jst.jsf.common.internal.resource.IJarLocator;
-import org.eclipse.jst.jsf.common.internal.resource.IJarLocator.JarChangeEvent;
-import org.eclipse.jst.jsf.common.internal.resource.IJarLocator.JarChangeListener;
-import org.eclipse.jst.jsf.common.internal.resource.JavaCoreMediator;
-import org.eclipse.jst.jsf.core.internal.JSFCorePlugin;
-import org.eclipse.jst.jsf.facelet.core.internal.FaceletCorePlugin;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.IFaceletTagRecord.JarTagRecordDescriptor;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.Listener.TaglibChangedEvent;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.Listener.TaglibChangedEvent.CHANGE_TYPE;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglib;
-
-/**
- * A locator that finds Facelet taglibs in jars on the classpath
- *
- * @author cbateman
- *
- */
-public class JarFileFaceletTaglibLocator extends AbstractFaceletTaglibLocator
-{
- /**
- * Default taglib finder that looks in meta-inf
- */
- public static final TaglibJarEntryFinder _taglibMetaInfFinder = new TaglibJarEntryFinder(
- Pattern.compile("META-INF/.*\\.taglib\\.xml")); //$NON-NLS-1$
- /**
- * Default finder that looks in the glassfish package.
- */
- public static final TaglibJarEntryFinder _taglibGlassfishFinder = new TaglibJarEntryFinder(
- Pattern.compile("com/sun/faces/metadata/taglib/.*\\.taglib\\.xml")); //$NON-NLS-1$
- private static final List<IMatcher> MATCHERS;
- static
- {
- final List<IMatcher> matchers = new ArrayList<IMatcher>();
- matchers.add(_taglibGlassfishFinder);
- matchers.add(_taglibMetaInfFinder);
- MATCHERS = Collections.unmodifiableList(matchers);
- }
- private static final String DISPLAYNAME = Messages.JarFileFaceletTaglibLocator_0;
- private static final String ID = JarFileFaceletTaglibLocator.class
- .getCanonicalName();
- private final TagRecordFactory _factory;
- private final Map<String, IFaceletTagRecord> _records;
- private final IJarLocator _locator;
- private final List<IMatcher> _jarEntryMatchers;
-
- /**
- * @param factory
- */
- public JarFileFaceletTaglibLocator(final TagRecordFactory factory)
- {
- this(factory, new DefaultJarLocator(
- Collections.singletonList(new AlwaysMatcher()),
- new JavaCoreMediator()));
- }
-
- /**
- * @param factory
- * @param jarProvider
- */
- public JarFileFaceletTaglibLocator(final TagRecordFactory factory,
- final IJarLocator jarProvider)
- {
- this(factory, jarProvider, MATCHERS);
- }
-
- /**
- * @param factory
- * @param jarProvider
- * @param jarEntryMatchers
- */
- public JarFileFaceletTaglibLocator(final TagRecordFactory factory,
- final IJarLocator jarProvider, final List<IMatcher> jarEntryMatchers)
- {
- super(ID, DISPLAYNAME);
- _factory = factory;
- _records = new HashMap<String, IFaceletTagRecord>();
- _locator = jarProvider;
- _jarEntryMatchers = jarEntryMatchers;
- }
-
- @Override
- public void start(final IProject project)
- {
- _locator.start(project);
- final List<LibJarEntry> tagLibsFound = new ArrayList<LibJarEntry>();
- final Collection<? extends ClasspathJarFile> jars = _locator
- .getJars(project);
- for (final ClasspathJarFile cpJarFile : jars)
- {
- final JarFile jarFile = cpJarFile.getJarFile();
- if (jarFile != null)
- {
- tagLibsFound.addAll(processJar(cpJarFile, _jarEntryMatchers));
- }
- }
- for (final LibJarEntry jarEntry : tagLibsFound)
- {
- final IFaceletTagRecord record = _factory.createRecords(jarEntry
- .getTaglib(), new JarTagRecordDescriptor(
- jarEntry.getPath(), jarEntry.getEntryName()));
- if (record != null)
- {
- _records.put(record.getURI(), record);
- }
- }
- _locator.addListener(new JarChangeListener()
- {
- @Override
- public void changed(final JarChangeEvent event)
- {
- switch (event.getType())
- {
- case JAR_ADDED:
- {
- final ClasspathJarFile jar = event.getJar();
- final List<LibJarEntry> foundLibs = processJar(jar, _jarEntryMatchers);
- for (final LibJarEntry lib : foundLibs)
- {
- final IFaceletTagRecord newRecord = _factory.createRecords(
- lib.getTaglib(),
- new JarTagRecordDescriptor(lib
- .getPath(), lib
- .getEntryName()));
- _records.put(newRecord.getURI(), newRecord);
- fireChangeEvent(new TaglibChangedEvent(
- JarFileFaceletTaglibLocator.this, null,
- newRecord,
- CHANGE_TYPE.ADDED));
- }
- }
- break;
- case JAR_REMOVED:
- {
- final ClasspathJarFile jar = event.getJar();
- final List<IFaceletTagRecord> removeRecords =
- new ArrayList<IFaceletTagRecord>();
- for (final Map.Entry<String, IFaceletTagRecord> entry : _records
- .entrySet())
- {
- if (entry.getValue().getDescriptor()
- .getPath().equals(jar.getPath()))
- {
- removeRecords.add(entry.getValue());
- }
- }
-
- for (final IFaceletTagRecord removeMe : removeRecords)
- {
- _records.remove(removeMe);
- fireChangeEvent(new TaglibChangedEvent(
- JarFileFaceletTaglibLocator.this,
- removeMe, null,
- CHANGE_TYPE.REMOVED));
- }
- }
- break;
- }
- }
- });
- super.start(project);
- }
-
- @Override
- public void stop()
- {
- _locator.stop();
- super.stop();
- }
-
- @Override
- public Map<String, ? extends IFaceletTagRecord> doLocate(
- final IProject project)
- {
- return Collections.unmodifiableMap(_records);
- }
-
- /**
- * @param entry
- * @param defaultDtdStream
- * @throws Exception
- */
- private static List<LibJarEntry> processJar(final ClasspathJarFile cpJarFile,
- final List<IMatcher> jarEntryMatchers)
- {
- final List<LibJarEntry> tagLibsFound = new ArrayList<LibJarEntry>();
- final JarFile jarFile = cpJarFile.getJarFile();
- try
- {
- if (jarFile != null)
- {
- final JarEntryMatchingAcceptor acceptor = new JarEntryMatchingAcceptor();
- final VisitorMatcher<JarFile, JarEntry, String> matcher = new VisitorMatcher<JarFile, JarEntry, String>(
- "", "", acceptor, jarEntryMatchers); //$NON-NLS-1$//$NON-NLS-2$
- final Collection<? extends JarEntry> matchingEntries = matcher
- .find(jarFile);
- for (final JarEntry jarEntry : matchingEntries)
- {
- InputStream is = null;
- try
- {
- is = jarFile.getInputStream(jarEntry);
- final String name = jarEntry.getName();
- final TagModelLoader loader = new TagModelLoader(name);
- loader.loadFromInputStream(is);
- final FaceletTaglib tagLib = loader.getTaglib();
- if (tagLib != null)
- {
- tagLibsFound.add(new LibJarEntry(tagLib, cpJarFile
- .getPath(), name));
- }
- } catch (final Exception e)
- {
- FaceletCorePlugin.log(
- "Error initializing facelet registry entry", //$NON-NLS-1$
- e);
- } finally
- {
- if (is != null)
- {
- // is.close();
- }
- }
- }
- }
- } catch (final Exception e)
- {
- JSFCorePlugin.log(e,
- "While locating jar based facelet tag libraries"); //$NON-NLS-1$
- } finally
- {
- if (jarFile != null)
- {
- try
- {
- jarFile.close();
- } catch (final IOException ioe)
- {
- FaceletCorePlugin.log("Error closing jar file", ioe); //$NON-NLS-1$
- }
- }
- }
- return tagLibsFound;
- }
-
- private static class LibJarEntry
- {
- private final FaceletTaglib _taglib;
- private final String _entryName;
- private final IPath _iPath;
-
- public LibJarEntry(final FaceletTaglib taglib, final IPath iPath,
- final String entryName)
- {
- super();
- _taglib = taglib;
- _iPath = iPath;
- _entryName = entryName;
- }
-
- public FaceletTaglib getTaglib()
- {
- return _taglib;
- }
-
- public String getEntryName()
- {
- return _entryName;
- }
-
- public IPath getPath()
- {
- return _iPath;
- }
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/LibraryClassBasedTagRecord.java b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/LibraryClassBasedTagRecord.java
deleted file mode 100644
index 4997017..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/LibraryClassBasedTagRecord.java
+++ /dev/null
@@ -1,538 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Oracle 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:
- * Cameron Bateman - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facelet.core.internal.registry.taglib;
-
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Map;
-import java.util.concurrent.atomic.AtomicBoolean;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jem.internal.proxy.core.IBeanProxy;
-import org.eclipse.jem.internal.proxy.core.IBeanTypeProxy;
-import org.eclipse.jem.internal.proxy.core.IStringBeanProxy;
-import org.eclipse.jem.internal.proxy.core.ProxyFactoryRegistry;
-import org.eclipse.jst.jsf.core.internal.JSFCorePlugin;
-import org.eclipse.jst.jsf.core.internal.jem.BeanProxyUtil;
-import org.eclipse.jst.jsf.core.internal.jem.BeanProxyUtil.BeanProxyWrapper;
-import org.eclipse.jst.jsf.core.internal.jem.BeanProxyUtil.ProxyException;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTag;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.FaceletLibraryClassTagLib;
-
-/**
- * @author cbateman
- *
- */
-/* package */class LibraryClassBasedTagRecord extends FaceletTagRecord
-{
-// private static final String METHOD_NAME_GET_VALUE = "getValue"; //$NON-NLS-1$
-// private static final String METHOD_NAME_GET_KEY = "getKey"; //$NON-NLS-1$
-// private static final String METHOD_NAME_HAS_NEXT = "hasNext"; //$NON-NLS-1$
-// private static final String METHOD_NAME_NEXT = "next"; //$NON-NLS-1$
-// private static final String METHOD_NAME_ITERATOR = "iterator"; //$NON-NLS-1$
-// private static final String METHOD_NAME_ENTRY_SET = "entrySet"; //$NON-NLS-1$
-// private static final String PROPERTY_NAME_FACTORIES = "factories"; //$NON-NLS-1$
-// private static final String QUALIFIED_CLASS_NAME__COM_SUN_FACELETS_TAG_ABSTRACT_TAG_LIBRARY = "com.sun.facelets.tag.AbstractTagLibrary"; //$NON-NLS-1$
-// private static final String QUALIFIED_CLASS_NAME_JAVA_UTIL_MAP = "java.util.Map"; //$NON-NLS-1$
-//
-// private static final String COM_SUN_FACELETS_TAG_ABSTRACT_TAG_LIBRARY$_HANDLER_FACTORY = "com.sun.facelets.tag.AbstractTagLibrary$HandlerFactory"; //$NON-NLS-1$
-// private static final String COM_SUN_FACELETS_TAG_ABSTRACT_TAG_LIBRARY$_USER_CONVERTER_HANDLER_FACTORY = "com.sun.facelets.tag.AbstractTagLibrary$UserConverterHandlerFactory"; //$NON-NLS-1$
-// private static final String COM_SUN_FACELETS_TAG_ABSTRACT_TAG_LIBRARY$_CONVERTER_HANDLER_FACTORY = "com.sun.facelets.tag.AbstractTagLibrary$ConverterHandlerFactory"; //$NON-NLS-1$
-// private static final String COM_SUN_FACELETS_TAG_ABSTRACT_TAG_LIBRARY$_USER_VALIDATOR_HANDLER_FACTORY = "com.sun.facelets.tag.AbstractTagLibrary$UserValidatorHandlerFactory"; //$NON-NLS-1$
-// private static final String COM_SUN_FACELETS_TAG_ABSTRACT_TAG_LIBRARY$_VALIDATOR_HANDLER_FACTORY = "com.sun.facelets.tag.AbstractTagLibrary$ValidatorHandlerFactory"; //$NON-NLS-1$
-// private static final String COM_SUN_FACELETS_TAG_ABSTRACT_TAG_LIBRARY$_USER_COMPONENT_HANDLER_FACTORY = "com.sun.facelets.tag.AbstractTagLibrary$UserComponentHandlerFactory"; //$NON-NLS-1$
-// private static final String COM_SUN_FACELETS_TAG_ABSTRACT_TAG_LIBRARY$_COMPONENT_HANDLER_FACTORY = "com.sun.facelets.tag.AbstractTagLibrary$ComponentHandlerFactory"; //$NON-NLS-1$
-//
-// private static final String FIELD_NAME_CONVERTER_ID = "converterId"; //$NON-NLS-1$
-// private static final String FIELD_NAME_VALIDATOR_ID = "validatorId"; //$NON-NLS-1$
-// private static final String FIELD_NAME_RENDER_TYPE = "renderType"; //$NON-NLS-1$
-// private static final String FIELD_NAME_COMPONENT_TYPE = "componentType"; //$NON-NLS-1$
-
- /**
- *
- */
- private static final long serialVersionUID = 4174629773250721041L;
- private static final String STATIC_MEMBER_NAMESPACE = "Namespace"; //$NON-NLS-1$
- private static final String METHOD_NAME_GET_NAMESPACE = "getNamespace"; //$NON-NLS-1$
-
- private final IProject _project;
- private final FaceletLibraryClassTagLib _model;
- private final ProxyFactoryRegistry _registry;
- private final AtomicBoolean _isInitialized = new AtomicBoolean(
- false);
-
- private String _uri;
- private BeanProxyWrapper _classTypeWrapper;
- private Map<String, FaceletTaglibTag> _tags;
-
- /**
- * @param registry
- * @param model
- * @param project
- * @param descriptor
- */
- public LibraryClassBasedTagRecord(final ProxyFactoryRegistry registry,
- final FaceletLibraryClassTagLib model, final IProject project, TagRecordDescriptor descriptor)
- {
- super(descriptor);
- _registry = registry;
- _model = model;
- _project = project;
- }
-
- public void initURI() throws CoreException
- {
- if (_isInitialized.get())
- {
- throw new CoreException(
- new Status(
- IStatus.ERROR,
- JSFCorePlugin.PLUGIN_ID,
- "Cannot initURI once the library is initialized for: " + _model.getLibraryClass())); //$NON-NLS-1$
- }
-
- final IBeanTypeProxy libFactoryTypeProxy = _registry
- .getBeanTypeProxyFactory().getBeanTypeProxy(
- _model.getLibraryClass());
-
- if (libFactoryTypeProxy == null)
- {
- throw new CoreException(new Status(IStatus.ERROR,
- JSFCorePlugin.PLUGIN_ID,
- "Couldn't find type proxy for " + _model.getLibraryClass())); //$NON-NLS-1$
- }
-
- // TODO: wrap in try per the Glassfish patch
- _classTypeWrapper = new BeanProxyWrapper(_project, libFactoryTypeProxy);
-
- try
- {
- _classTypeWrapper.init();
- }
- catch (final ProxyException e)
- {
- throw new CoreException(new Status(IStatus.ERROR,
- JSFCorePlugin.PLUGIN_ID,
- "Couldn't load class: " + _model.getLibraryClass(), e)); //$NON-NLS-1$
- }
-
- final String namespace = resolveNS(_classTypeWrapper);
- System.out.println(namespace);
-
- if (namespace == null)
- {
- throw new CoreException(new Status(IStatus.ERROR,
- JSFCorePlugin.PLUGIN_ID,
- "Couldn't load uri: " + _model.getLibraryClass())); //$NON-NLS-1$
-
- }
- _uri = namespace;
- }
-
- @Override
- public synchronized FaceletTaglibTag getTag(final String name)
- {
-// initializeIfNecessary();
- return _tags.get(name);
- }
-
- @Override
- public synchronized Collection<? extends FaceletTaglibTag> getTags()
- {
-// initializeIfNecessary();
- return Collections.unmodifiableCollection(_tags.values());
- }
-
-// private void initializeIfNecessary()
-// {
-// if (_isInitialized.compareAndSet(false, true))
-// {
-// if (_tags == null)
-// {
-// _tags = resolveTags();
-// }
-// }
-// }
-
- /*
- * (non-Javadoc)
- *
- * @see
- * org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.FaceletTagRecord
- * #getURI()
- */
- @Override
- public String getURI()
- {
- return _uri;
- }
-
-// private Map<String, FaceletTaglibTag> resolveTags()
-// {
-// final Map<String, FaceletTaglibTag> tags = new HashMap<String, FaceletTaglibTag>();
-//
-// // if the tag factory is a child of AbstractTagFactory, then we
-// // can try to get our hands on its private parts ...
-// final IBeanTypeProxy mapTypeProxy = _registry.getBeanTypeProxyFactory()
-// .getBeanTypeProxy(QUALIFIED_CLASS_NAME_JAVA_UTIL_MAP);
-// final IBeanTypeProxy componentFactoryTypeProxy = _registry
-// .getBeanTypeProxyFactory()
-// .getBeanTypeProxy(
-// QUALIFIED_CLASS_NAME__COM_SUN_FACELETS_TAG_ABSTRACT_TAG_LIBRARY);
-//
-// if (mapTypeProxy != null && componentFactoryTypeProxy != null)
-// {
-// final IFieldProxy fieldProxy = componentFactoryTypeProxy
-// .getDeclaredFieldProxy(PROPERTY_NAME_FACTORIES);
-//
-// if (fieldProxy != null)
-// {
-// if (fieldProxy.getFieldType().isKindOf(mapTypeProxy))
-// {
-// IBeanProxy factories = null;
-//
-// try
-// {
-// // need to turn off security checking on the private
-// // field
-// fieldProxy.setAccessible(true);
-// factories = fieldProxy.get(_classTypeWrapper
-// .getInstance());
-// }
-// catch (final ThrowableProxy e)
-// {
-// FaceletCorePlugin.log(
-// "Error getting factories from bean instance", //$NON-NLS-1$
-// e);
-// }
-//
-// if (factories != null)
-// {
-// final IMethodProxy entrySetMethod = fieldProxy
-// .getFieldType().getMethodProxy(
-// METHOD_NAME_ENTRY_SET);
-// if (entrySetMethod != null)
-// {
-// try
-// {
-// entrySetMethod.setAccessible(true);
-// final IBeanProxy entrySetProxy = entrySetMethod
-// .invoke(factories);
-//
-// if (entrySetProxy != null)
-// {
-// final IMethodProxy iteratorMethod = entrySetProxy
-// .getTypeProxy().getMethodProxy(
-// METHOD_NAME_ITERATOR);
-// iteratorMethod.setAccessible(true);
-// final IBeanProxy iteratorProxy = iteratorMethod
-// .invoke(entrySetProxy);
-//
-// if (iteratorProxy != null)
-// {
-// final IMethodProxy nextMethod = iteratorProxy
-// .getTypeProxy().getMethodProxy(
-// METHOD_NAME_NEXT);
-// nextMethod.setAccessible(true);
-// final IMethodProxy hasNextMethod = iteratorProxy
-// .getTypeProxy().getMethodProxy(
-// METHOD_NAME_HAS_NEXT);
-// hasNextMethod.setAccessible(true);
-//
-// while (((IBooleanBeanProxy) hasNextMethod
-// .invoke(iteratorProxy))
-// .booleanValue())
-// {
-// final IBeanProxy entryProxy = nextMethod
-// .invoke(iteratorProxy);
-// final IMethodProxy getKeyProxy = entryProxy
-// .getTypeProxy()
-// .getMethodProxy(
-// METHOD_NAME_GET_KEY);
-// final IMethodProxy getValueProxy = entryProxy
-// .getTypeProxy()
-// .getMethodProxy(
-// METHOD_NAME_GET_VALUE);
-// if (getKeyProxy != null
-// && getValueProxy != null)
-// {
-// getKeyProxy.setAccessible(true);
-// final IBeanProxy key = getKeyProxy
-// .invoke(entryProxy);
-//
-// if (key instanceof IStringBeanProxy)
-// {
-// final String name = ((IStringBeanProxy) key)
-// .stringValue();
-// getValueProxy
-// .setAccessible(true);
-// final IBeanProxy value = getValueProxy
-// .invoke(entryProxy);
-//
-// if (value != null)
-// {
-// final FaceletTaglibTag tagDefn = createTagDefn(
-// name,
-// value);
-// if (tagDefn != null)
-// {
-// tags.put(name,
-// tagDefn);
-// }
-// }
-// }
-// }
-// }
-// }
-// }
-// }
-// catch (final ThrowableProxy e)
-// {
-// FaceletCorePlugin.log(
-// "Error invoking entrySet", e); //$NON-NLS-1$
-// }
-// }
-// }
-//
-// }
-// }
-// }
-// return tags;
-// }
-
-// private FaceletTaglibTag createTagDefn(final String name,
-// final IBeanProxy handlerValueProxy)
- {
-// final IBeanTypeProxy handlerTypeProxy = handlerValueProxy.getTypeProxy();
-// final FaceletTaglibFactory TAGDEFN_FACTORY = FaceletTaglibFactory.eINSTANCE;
-//
-// final IBeanTypeProxy componentHandlerFactory = _registry
-// .getBeanTypeProxyFactory()
-// .getBeanTypeProxy(
-// COM_SUN_FACELETS_TAG_ABSTRACT_TAG_LIBRARY$_COMPONENT_HANDLER_FACTORY);
-// final IBeanTypeProxy userComponentHandlerFactory = _registry
-// .getBeanTypeProxyFactory()
-// .getBeanTypeProxy(
-// COM_SUN_FACELETS_TAG_ABSTRACT_TAG_LIBRARY$_USER_COMPONENT_HANDLER_FACTORY);
-// final IBeanTypeProxy validatorHandlerFactory = _registry
-// .getBeanTypeProxyFactory()
-// .getBeanTypeProxy(
-// COM_SUN_FACELETS_TAG_ABSTRACT_TAG_LIBRARY$_VALIDATOR_HANDLER_FACTORY);
-// final IBeanTypeProxy userValidatorHandlerFactory = _registry
-// .getBeanTypeProxyFactory()
-// .getBeanTypeProxy(
-// COM_SUN_FACELETS_TAG_ABSTRACT_TAG_LIBRARY$_USER_VALIDATOR_HANDLER_FACTORY);
-// final IBeanTypeProxy converterHandlerFactory = _registry
-// .getBeanTypeProxyFactory()
-// .getBeanTypeProxy(
-// COM_SUN_FACELETS_TAG_ABSTRACT_TAG_LIBRARY$_CONVERTER_HANDLER_FACTORY);
-// final IBeanTypeProxy userConverterHandlerFactory = _registry
-// .getBeanTypeProxyFactory()
-// .getBeanTypeProxy(
-// COM_SUN_FACELETS_TAG_ABSTRACT_TAG_LIBRARY$_USER_CONVERTER_HANDLER_FACTORY);
-// final IBeanTypeProxy handlerFactory = _registry
-// .getBeanTypeProxyFactory()
-// .getBeanTypeProxy(
-// COM_SUN_FACELETS_TAG_ABSTRACT_TAG_LIBRARY$_HANDLER_FACTORY);
-// final IBeanTypeProxy userTagFactory = _registry
-// .getBeanTypeProxyFactory()
-// .getBeanTypeProxy(
-// COM_SUN_FACELETS_TAG_ABSTRACT_TAG_LIBRARY$_HANDLER_FACTORY);
-//
-// FaceletTaglibTag tagDefn = null;
-//
-// if (handlerTypeProxy.isKindOf(componentHandlerFactory)
-// || handlerTypeProxy.isKindOf(userComponentHandlerFactory))
-// {
-// final IFieldProxy componentTypeProxy = handlerTypeProxy
-// .getDeclaredFieldProxy(FIELD_NAME_COMPONENT_TYPE);
-// final IFieldProxy rendererTypeProxy = handlerTypeProxy
-// .getDeclaredFieldProxy(FIELD_NAME_RENDER_TYPE);
-// try
-// {
-// if (componentTypeProxy != null)
-// {
-// componentTypeProxy.setAccessible(true);
-// rendererTypeProxy.setAccessible(true);
-// final IBeanProxy componentType = componentTypeProxy
-// .get(handlerValueProxy);
-// // final IBeanProxy rendererType = rendererTypeProxy
-// // .get(handlerValueProxy);
-//
-// // render type is optional, but must have component type
-// if (componentType instanceof IStringBeanProxy)
-// {
-// final String componentTypeValue = getMeaningfulString(((IStringBeanProxy) componentType)
-// .stringValue());
-//
-// if (componentTypeValue != null)
-// {
-// final ComponentTagDefn compTagDefn = TAGDEFN_FACTORY
-// .createComponentTagDefn();
-// compTagDefn.setComponentType(componentTypeValue);
-// // if (rendererType instanceof IStringBeanProxy)
-// // {
-// // compTagDefn
-// // .setRendererType(getMeaningfulString(((
-// // IStringBeanProxy) rendererType)
-// // .stringValue()));
-// // }
-// tagDefn = compTagDefn;
-// }
-// }
-// }
-// }
-// catch (final ThrowableProxy e)
-// {
-// FaceletCorePlugin.log("Error get component info", e); //$NON-NLS-1$
-// }
-// }
-// else if (handlerTypeProxy.isKindOf(validatorHandlerFactory)
-// || handlerTypeProxy.isKindOf(userValidatorHandlerFactory))
-// {
-// final IFieldProxy validatorIdProxy = handlerTypeProxy
-// .getDeclaredFieldProxy(FIELD_NAME_VALIDATOR_ID);
-//
-// try
-// {
-// if (validatorIdProxy != null)
-// {
-// validatorIdProxy.setAccessible(true);
-// final IBeanProxy validatorId = validatorIdProxy
-// .get(handlerValueProxy);
-//
-// final ValidatorTagDefn valTagDefn = TAGDEFN_FACTORY
-// .createValidatorTagDefn();
-// tagDefn = valTagDefn;
-//
-// if (validatorId instanceof IStringBeanProxy)
-// {
-// final String validatorIdValue = getMeaningfulString(((IStringBeanProxy) validatorId)
-// .stringValue());
-//
-// if (validatorIdValue != null)
-// {
-// valTagDefn.setValidatorId(validatorIdValue);
-// }
-// }
-// }
-// }
-// catch (final ThrowableProxy e)
-// {
-// FaceletCorePlugin.log("Error getting validator info", e); //$NON-NLS-1$
-// }
-// }
-// else if (handlerTypeProxy.isKindOf(converterHandlerFactory)
-// || handlerTypeProxy.isKindOf(userConverterHandlerFactory))
-// {
-// final IFieldProxy converterIdProxy = handlerTypeProxy
-// .getDeclaredFieldProxy(FIELD_NAME_CONVERTER_ID);
-//
-// try
-// {
-// if (converterIdProxy != null)
-// {
-// converterIdProxy.setAccessible(true);
-// final IBeanProxy converterId = converterIdProxy
-// .get(handlerValueProxy);
-//
-// final ConverterTagDefn converterTagDefn = TAGDEFN_FACTORY
-// .createConverterTagDefn();
-// tagDefn = converterTagDefn;
-//
-// if (converterId instanceof IStringBeanProxy)
-// {
-// final String converterIdValue = getMeaningfulString(((IStringBeanProxy) converterId)
-// .stringValue());
-//
-// if (converterIdValue != null)
-// {
-// converterTagDefn.setConverterId(converterIdValue);
-// }
-// }
-// }
-// }
-// catch (final ThrowableProxy e)
-// {
-// FaceletCorePlugin.log("Error getting validator info", e); //$NON-NLS-1$
-// }
-// }
-// else if (handlerTypeProxy.isKindOf(handlerFactory)
-// || handlerTypeProxy.isKindOf(userTagFactory))
-// {
-// tagDefn = TAGDEFN_FACTORY.createHandlerTagDefn();
-// }
-//
-// if (tagDefn != null)
-// {
-// tagDefn.setName(name);
-// }
-// return tagDefn;
- }
-
-// private String getMeaningfulString(final String value)
-// {
-// if (value == null)
-// {
-// return null;
-// }
-//
-// String retValue = value.trim();
-//
-// if ("".equals(retValue)) //$NON-NLS-1$
-// {
-// retValue = null;
-// }
-// return retValue;
-// }
-
- private String resolveNS(final BeanProxyWrapper beanProxy)
- {
- IBeanProxy resultProxy = null;
- try
- {
- resultProxy = beanProxy.call(METHOD_NAME_GET_NAMESPACE);
-
- if (resultProxy instanceof IStringBeanProxy)
- {
- return ((IStringBeanProxy) resultProxy).stringValue();
- }
- }
- catch (final BeanProxyUtil.ProxyException e)
- {
- // fall through
- }
-
- return resolveNSAggressively(beanProxy);
- }
-
- private String resolveNSAggressively(final BeanProxyWrapper beanProxy)
- {
- try
- {
- return beanProxy.getStringFieldValue(STATIC_MEMBER_NAMESPACE);
- }
- catch (final ProxyException e)
- {
- // fall through
- }
- return null;
- }
-
- public synchronized int getNumTags()
- {
-// initializeIfNecessary();
- return _tags.size();
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/Listener.java b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/Listener.java
deleted file mode 100644
index 07de09a..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/Listener.java
+++ /dev/null
@@ -1,112 +0,0 @@
-package org.eclipse.jst.jsf.facelet.core.internal.registry.taglib;
-
-import org.eclipse.jst.jsf.common.internal.locator.ILocatorChangeListener;
-
-/**
- * A listener for locator detected tag library changes
- * @author cbateman
- *
- */
-public abstract class Listener implements ILocatorChangeListener
-{
- /**
- * Indicates that a tag library has changed
- * @author cbateman
- *
- */
- public static class TaglibChangedEvent extends LocatorChangeEvent
- {
- /**
- * TODO: what happens if one locator has a namespace collision with
- * another one?
- */
- public enum CHANGE_TYPE
- {
- /**
- * Indicates that the library is new
- */
- ADDED,
-
- /**
- * Indicates that the library was removed.
- */
- REMOVED,
-
- /**
- * Indicates that the library is not new, but it's content
- * has changed
- */
- CHANGED
- }
-
- private final TaglibChangedEvent.CHANGE_TYPE _changeType;
- private final IFaceletTagRecord _oldValue;
- private final IFaceletTagRecord _newValue;
-
- /**
- * @param source
- * @param oldValue
- * @param newValue
- * @param changeType
- */
- public TaglibChangedEvent(
- final AbstractFaceletTaglibLocator source,
- final IFaceletTagRecord oldValue,
- final IFaceletTagRecord newValue,
- TaglibChangedEvent.CHANGE_TYPE changeType)
- {
- super(source);
- _changeType = changeType;
- _oldValue = oldValue;
- _newValue = newValue;
- }
-
- /**
- *
- */
- private static final long serialVersionUID = -4060018031568577836L;
-
- @Override
- public AbstractFaceletTaglibLocator getSource()
- {
- return (AbstractFaceletTaglibLocator) super.getSource();
- }
-
- /**
- * @return the type of the change
- */
- public final TaglibChangedEvent.CHANGE_TYPE getChangeType()
- {
- return _changeType;
- }
-
- /**
- * @return the old value. This is null if the event is ADDED
- */
- public final IFaceletTagRecord getOldValue()
- {
- return _oldValue;
- }
-
- /**
- * @return the new value. This is null if the event is REMOVED
- */
- public final IFaceletTagRecord getNewValue()
- {
- return _newValue;
- }
- }
-
-
- public final void changed(final LocatorChangeEvent event)
- {
- changed((TaglibChangedEvent)event);
- }
-
-
- /**
- * @param event
- *
- */
- public abstract void changed(Listener.TaglibChangedEvent event);
-}
\ No newline at end of file
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/Messages.java b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/Messages.java
deleted file mode 100644
index 0ebb73d..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/Messages.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package org.eclipse.jst.jsf.facelet.core.internal.registry.taglib;
-
-import org.eclipse.osgi.util.NLS;
-
-/**
- * Package NLS manager.
- * @author cbateman
- *
- */
-public class Messages extends NLS
-{
- private static final String BUNDLE_NAME = "org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.messages"; //$NON-NLS-1$
- /**
- * see messages.properties.
- */
- public static String ContextParamSpecifiedFaceletTaglibLocator_0;
- /**
- * see messages.properties/
- */
- public static String JarFileFaceletTaglibLocator_0;
- static
- {
- // initialize resource bundle
- NLS.initializeMessages(BUNDLE_NAME, Messages.class);
- }
-
- private Messages()
- {
- // no external instantiation.
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/ProjectTaglibDescriptor.java b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/ProjectTaglibDescriptor.java
deleted file mode 100644
index cf9d74d..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/ProjectTaglibDescriptor.java
+++ /dev/null
@@ -1,200 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Oracle 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:
- * Cameron Bateman - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facelet.core.internal.registry.taglib;
-
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.concurrent.atomic.AtomicInteger;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.ISafeRunnable;
-import org.eclipse.core.runtime.SafeRunner;
-import org.eclipse.jst.jsf.common.internal.locator.ILocatorProvider;
-import org.eclipse.jst.jsf.core.internal.tld.IFaceletConstants;
-import org.eclipse.jst.jsf.facelet.core.internal.FaceletCorePlugin;
-
-/**
- * Taglib descriptor for a project.
- *
- * @author cbateman
- *
- */
-public class ProjectTaglibDescriptor implements IProjectTaglibDescriptor
-{
- private final AtomicInteger _isInitialized = new AtomicInteger(
- 0);
- private final IProject _project;
- private final ILocatorProvider<AbstractFaceletTaglibLocator> _locatorProvider;
- private final MyChangeListener _libChangeListener;
- private final Map<String, IFaceletTagRecord> _tagRecords;
- private final TagRecordFactory _factory;
- private final AtomicBoolean _isDisposed = new AtomicBoolean(false);
- private final DefaultStandardTaglibLocator _defaultTaglibLocator;
-
- /**
- * @param project
- * @param factory
- * @param locatorProvider
- */
- public ProjectTaglibDescriptor(final IProject project, final TagRecordFactory factory,
- final ILocatorProvider<AbstractFaceletTaglibLocator> locatorProvider)
- {
- _project = project;
- _tagRecords = new HashMap<String, IFaceletTagRecord>();
- _locatorProvider = locatorProvider;
- _locatorProvider.initialize();
- _factory = factory;
- _libChangeListener = new MyChangeListener();
- _defaultTaglibLocator = new DefaultStandardTaglibLocator();
- _defaultTaglibLocator.start(project);
- }
-
- private void initialize()
- {
- if (_isInitialized.addAndGet(1) == 1)
- {
- synchronized (this)
- {
- for (final AbstractFaceletTaglibLocator locator : _locatorProvider.getLocators())
- {
- SafeRunner.run(new ISafeRunnable()
- {
- public void handleException(final Throwable exception)
- {
- FaceletCorePlugin
- .log(
- "While locating facelet libraries on project: " + _project.getName(), new Exception(exception)); //$NON-NLS-1$
- }
- public void run() throws Exception
- {
- locator.addListener(_libChangeListener);
- locator.start(_project);
- _tagRecords.putAll(locator.locate(_project));
- }
- });
- }
- // ensure that we add the standard tag libraries if we don't find them
- // on the classpath. The spec doesn't require that taglib's are
- // included in a JSF impl for these
- ensureStandardLibraries(_project);
- }
- }
- }
-
- private void ensureStandardLibraries(final IProject project)
- {
- final Map<String, ? extends IFaceletTagRecord> defaultRecords = _defaultTaglibLocator.locate(project);
- for (final String uri : IFaceletConstants.ALL_FACELET_TAGLIBS)
- {
- if (!_tagRecords.containsKey(uri))
- {
- IFaceletTagRecord faceletTagRecord = defaultRecords.get(uri);
- if (faceletTagRecord != null)
- {
- _tagRecords.put(uri, faceletTagRecord);
- }
- else
- {
- FaceletCorePlugin.log("Could not find taglib for uri: "+uri, new Exception()); //$NON-NLS-1$
- }
- }
- }
- }
-
- public Collection<? extends IFaceletTagRecord> getTagLibraries()
- {
- initialize();
- return Collections.unmodifiableCollection(_tagRecords.values());
- }
-
- void maybeLog(final Exception e)
- {
- if (_isInitialized.get() <= 1)
- {
- FaceletCorePlugin.log("Failed initializing taglib descriptor", e); //$NON-NLS-1$
- }
- }
-
- public IFaceletTagRecord getTagLibrary(final String uri)
- {
- initialize();
- return _tagRecords.get(uri);
- }
-
- public void addListener(final Listener listener)
- {
- for (final AbstractFaceletTaglibLocator locator : _locatorProvider.getLocators())
- {
- locator.addListener(listener);
- }
- }
-
- public void removeListener(final Listener listener)
- {
- for (final AbstractFaceletTaglibLocator locator : _locatorProvider.getLocators())
- {
- locator.removeListener(listener);
- }
- }
-
- public void checkpoint()
- {
- // do nothing
- }
-
- public void destroy()
- {
- // call dispose; there is no persistent data to cleanup.
- dispose();
- }
-
- public void dispose()
- {
- if (_isDisposed.compareAndSet(false, true))
- {
- for (final AbstractFaceletTaglibLocator locator : _locatorProvider.getLocators())
- {
- locator.stop();
- }
- _factory.dispose();
- }
- }
-
- public boolean isDisposed()
- {
- return _isDisposed.get();
- }
-
- private class MyChangeListener extends Listener
- {
- @Override
- public void changed(final TaglibChangedEvent event)
- {
- switch (event.getChangeType())
- {
- case ADDED:
- _tagRecords.put(event.getNewValue().getURI(), event
- .getNewValue());
- break;
- case CHANGED:
- _tagRecords.put(event.getNewValue().getURI(), event
- .getNewValue());
- break;
- case REMOVED:
- _tagRecords.remove(event.getOldValue());
- break;
- }
- }
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/TagModelLoader.java b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/TagModelLoader.java
deleted file mode 100644
index 2ec287d..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/TagModelLoader.java
+++ /dev/null
@@ -1,239 +0,0 @@
-package org.eclipse.jst.jsf.facelet.core.internal.registry.taglib;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.net.URISyntaxException;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.core.runtime.URIUtil;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.ContentHandler;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.URIConverter;
-import org.eclipse.emf.ecore.resource.URIHandler;
-import org.eclipse.emf.ecore.resource.impl.ExtensibleURIConverterImpl;
-import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
-import org.eclipse.emf.ecore.resource.impl.URIHandlerImpl;
-import org.eclipse.emf.ecore.util.BasicExtendedMetaData;
-import org.eclipse.emf.ecore.util.ExtendedMetaData;
-import org.eclipse.emf.ecore.xmi.XMLResource;
-import org.eclipse.jst.jsf.facelet.core.internal.FaceletCorePlugin;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.DocumentRoot;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglib;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibPackage;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.util.FaceletTaglibResourceFactoryImpl;
-import org.eclipse.wst.xml.core.internal.XMLCorePlugin;
-import org.eclipse.wst.xml.core.internal.catalog.provisional.ICatalog;
-import org.eclipse.wst.xml.core.internal.catalog.provisional.ICatalogEntry;
-import org.eclipse.wst.xml.core.internal.catalog.provisional.INextCatalog;
-
-/**
- * Loads the facelet taglib file model using EMF.
- *
- * @author cbateman
- *
- */
-public class TagModelLoader
-{
- private final ResourceSetImpl _resSet;
- private final String _resourceUri;
- private DocumentRoot _docRoot;
- private FaceletTaglib _faceletTaglib;
- private final static List<URIHandler> DEFAULT_URI_HANDLERS;
- static
- {
- final List<URIHandler> handlers = new ArrayList<URIHandler>();
- final URIHandler handleFacelet = new DefaultFaceletURIHandler();
- handlers.add(handleFacelet);
- handlers.addAll(URIHandler.DEFAULT_HANDLERS);
- DEFAULT_URI_HANDLERS = handlers;
- }
-
- /**
- * @param resourceUri
- */
- public TagModelLoader(final String resourceUri)
- {
- this(resourceUri, new ExtensibleURIConverterImpl(DEFAULT_URI_HANDLERS,
- ContentHandler.Registry.INSTANCE.contentHandlers()));
- }
-
- /**
- * @param resourceUri
- * @param uriConverter
- */
- public TagModelLoader(final String resourceUri,
- final URIConverter uriConverter)
- {
- _resourceUri = resourceUri;
- _resSet = new ResourceSetImpl();
- _resSet.getPackageRegistry().put("http://java.sun.com/xml/ns/javaee", //$NON-NLS-1$
- FaceletTaglibPackage.eINSTANCE);
- _resSet.getPackageRegistry().put(
- "http://java.sun.com/xml/ns/javaee/web-facelettaglibrary.xsd", //$NON-NLS-1$
- FaceletTaglibPackage.eINSTANCE);
- _resSet.setURIConverter(uriConverter);
- final ExtendedMetaData extendedMetaData = new BasicExtendedMetaData(
- _resSet.getPackageRegistry());
- _resSet.getLoadOptions().put(XMLResource.OPTION_EXTENDED_META_DATA,
- extendedMetaData);
- _resSet.getResourceFactoryRegistry().getExtensionToFactoryMap()
- .put("xml", new FaceletTaglibResourceFactoryImpl()); //$NON-NLS-1$
- }
-
- /**
- * @param is
- * @throws Exception
- */
- public void loadFromInputStream(final InputStream is) throws Exception
- {
- final Resource res = _resSet.createResource(URI
- .createFileURI(_resourceUri));
- if (res != null)
- {
- res.load(is, Collections.EMPTY_MAP);
- final EObject eObject = res.getContents().get(0);
- _docRoot = (DocumentRoot) eObject;
- _faceletTaglib = _docRoot.getFaceletTaglib();
- } else
- {
- // This is often caused if the extension of the file pointed to
- // by _resourceUri wasn't initialized in extensionToFactoryMap.
- throw new IllegalArgumentException("Could not create Resource"); //$NON-NLS-1$
- }
- }
-
- /**
- * @param os
- * @throws Exception
- */
- public void save(final OutputStream os) throws Exception
- {
- final Resource res = _resSet.createResource(URI
- .createFileURI(_resourceUri));
- if (res != null)
- {
- res.getContents().add(_docRoot);
- res.save(os, Collections.EMPTY_MAP);
- } else
- {
- throw new IllegalArgumentException("Could not create Resource"); //$NON-NLS-1$
- }
- }
-
- /**
- * @param faceletTaglib
- */
- public final void setTaglib(final FaceletTaglib faceletTaglib)
- {
- _faceletTaglib = faceletTaglib;
- }
-
- /**
- * @param docRoot
- */
- public final void setDocRoot(final DocumentRoot docRoot)
- {
- _docRoot = docRoot;
- }
-
- /**
- * @return the taglib or null if none has been loaded.
- */
- public FaceletTaglib getTaglib()
- {
- return _faceletTaglib;
- }
-
- /**
- * @return the doc root or null if none has been loaded.
- */
- public DocumentRoot getDocRoot()
- {
- return _docRoot;
- }
-
- /**
- * Handles facelet taglib dtd resolver requests
- *
- */
- private static final class DefaultFaceletURIHandler extends URIHandlerImpl
- {
- @Override
- public boolean canHandle(final URI uri)
- {
- return "http://java.sun.com/dtd/facelet-taglib_1_0.dtd".equals(uri.toString()); //$NON-NLS-1$
- }
-
- @Override
- public InputStream createInputStream(final URI uri, final Map<?, ?> options)
- throws IOException
- {
- try
- {
- return findFaceletDtdInCatalog();
- } catch (final URISyntaxException e)
- {
- FaceletCorePlugin.log(
- "While trying to load facelet dtd from catalog", e); //$NON-NLS-1$
- // fall through
- }
- return null;
- }
-
- private InputStream findFaceletDtdInCatalog() throws URISyntaxException, IOException
- {
- final ICatalog xmlCatalog = XMLCorePlugin.getDefault()
- .getDefaultXMLCatalog();
- if (xmlCatalog != null)
- {
- ICatalog systemCatalog = null;
- final INextCatalog[] nextCatalogs = xmlCatalog.getNextCatalogs();
- for (final INextCatalog catalog : nextCatalogs)
- {
- final ICatalog referencedCatalog = catalog
- .getReferencedCatalog();
- if (referencedCatalog != null)
- {
- if (XMLCorePlugin.SYSTEM_CATALOG_ID
- .equals(referencedCatalog.getId()))
- {
- systemCatalog = referencedCatalog;
- }
- }
- }
- if (systemCatalog != null)
- {
- ICatalogEntry foundEntry = null;
- for (final ICatalogEntry entry : systemCatalog.getCatalogEntries())
- {
- if ("-//Sun Microsystems, Inc.//DTD Facelet Taglib 1.0//EN" //$NON-NLS-1$
- .equals(entry.getKey()))
- {
- foundEntry = entry;
- break;
- }
- }
- if (foundEntry != null)
- {
- final java.net.URI uri = new java.net.URI(foundEntry.getURI());
- URL url = URIUtil.toURL(uri);
- return url.openStream();
-// final String uriString = foundEntry.getURI();
-// if (URIUtil.isFileURI(uriString))
-// {
-// return new File(URIUtil.toFile(uriString));
-// }
- }
- }
- }
- return null;
- }
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/TagModelParser.java b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/TagModelParser.java
deleted file mode 100644
index bb7c164..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/TagModelParser.java
+++ /dev/null
@@ -1,461 +0,0 @@
-package org.eclipse.jst.jsf.facelet.core.internal.registry.taglib;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-
-import org.eclipse.jst.jsf.facelet.core.internal.FaceletCorePlugin;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.ComponentTagDefn;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.ConverterTagDefn;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.FaceletLibraryClassTagLib;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.FaceletTaglibDefn;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.FaceletTaglibFactory;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.FaceletXMLDefnTaglib;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.HandlerTagDefn;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.SourceTagDefn;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.TagDefn;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.ValidatorTagDefn;
-import org.w3c.dom.Document;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
-import org.xml.sax.helpers.DefaultHandler;
-
-/**
- * A Facelet tag library document parser (dtd 1.0).
- *
- * @author cbateman
- *
- */
-public class TagModelParser
-{
- private static final String FACELET_TAGLIB_DTD_PATH = "/dtd/facelet-taglib_1_0.dtd"; //$NON-NLS-1$
-
-
- private static final String ELEMENT_NAME_VALIDATOR_ID = "validator-id"; //$NON-NLS-1$
- private static final String ELEMENT_NAME_CONVERTER_ID = "converter-id"; //$NON-NLS-1$
- private static final String ELEMENT_NAME_RENDERER_TYPE = "renderer-type"; //$NON-NLS-1$
- private static final String ELEMENT_NAME_COMPONENT_TYPE = "component-type"; //$NON-NLS-1$
- private static final String ELEMENT_NAME_VALIDATOR = "validator"; //$NON-NLS-1$
- private static final String ELEMENT_NAME_CONVERTER = "converter"; //$NON-NLS-1$
- private static final String ELEMENT_NAME_COMPONENT = "component"; //$NON-NLS-1$
- private static final String ELEMENT_NAME_HANDLER_CLASS = "handler-class"; //$NON-NLS-1$
- private static final String ELEMENT_NAME_SOURCE = "source"; //$NON-NLS-1$
- private static final String ELEMENT_NAME_TAG_NAME = "tag-name"; //$NON-NLS-1$
- private static final String ELEMENT_NAME_TAG = "tag"; //$NON-NLS-1$
- private static final String ELEMENT_NAME_NAMESPACE = "namespace"; //$NON-NLS-1$
- private static final String ELEMENT_NAME_LIBRARY_CLASS = "library-class"; //$NON-NLS-1$
- private static final String ELEMENT_NAME_FACELET_TAGLIB = "facelet-taglib"; //$NON-NLS-1$
- private static final String URI_FACELET_TAGLIB_1_0_DTD = "facelet-taglib_1_0.dtd"; //$NON-NLS-1$
- private static final String PUBLIC_DTD_FACELET_TAGLIB_1_0_DTD = "-//Sun Microsystems, Inc.//DTD Facelet Taglib 1.0//EN"; //$NON-NLS-1$
-
- /**
- * @param is
- * @param dtdSourcePath
- * @return the taglib definition or null
- * @throws IOException
- * @throws ParserConfigurationException
- * @throws SAXException
- */
- public static FaceletTaglibDefn loadFromInputStream(final InputStream is, final String dtdSourcePath) throws IOException, ParserConfigurationException, SAXException
- {
- final byte[] buffer = getBufferForEntry(is);
- final InputStream dtdSource = getDefaultDTDSource(dtdSourcePath != null ? dtdSourcePath : FACELET_TAGLIB_DTD_PATH);
- final FaceletTaglibDefn taglib = loadFromBuffer(buffer, dtdSource);
- return taglib;
-
- }
- /**
- * @param buffer
- * @param defaultDtdStream
- * @return the tag library definition (loaded EMF model) for the buffer
- * @throws IOException
- * @throws ParserConfigurationException
- * @throws SAXException
- */
- public static FaceletTaglibDefn loadFromBuffer(final byte[] buffer,
- final InputStream defaultDtdStream) throws IOException,
- ParserConfigurationException, SAXException
- {
- final InputSource inputSource = new InputSource(
- new ByteArrayInputStream(buffer));
-
- final Document doc = TagModelParser.getDefaultTaglibDocument(
- inputSource, new InputSource(defaultDtdStream));
- final FaceletTaglibDefn tagLib = TagModelParser.processDocument(doc);
- return tagLib;
- }
-
- /**
- * @param path
- * @return the input stream for the default bundle Facelet dtd.
- * @throws IOException
- */
- protected static InputStream getDefaultDTDSource(final String path) throws IOException
- {
- final URL url = FaceletCorePlugin.getDefault().getBundle().getEntry(path);
-
- if (url != null)
- {
- return url.openStream();
- }
- return null;
- }
-
- /**
- * @param is must be open. Caller is responsible for closing.
- * @return load the stream into a byte buffer.
- */
- protected static byte[] getBufferForEntry(final InputStream is)
- {
- final ByteArrayOutputStream stream = new ByteArrayOutputStream();
- final byte[] buffer = new byte[2048];
-
- int bytesRead = 0;
-
- try
- {
- while (((bytesRead = is.read(buffer))) != -1)
- {
- stream.write(buffer, 0, bytesRead);
- }
- }
- catch (final IOException e)
- {
- FaceletCorePlugin.log("Error loading buffer", e); //$NON-NLS-1$
- return null;
- }
-
- return stream.toByteArray();
- }
-
- /**
- * @param taglibFile
- * @param defaultDTDSource
- * @return the default taglib dom Document
- * @throws IOException
- * @throws ParserConfigurationException
- * @throws SAXException
- */
- public static Document getDefaultTaglibDocument(
- final InputSource taglibFile, final InputSource defaultDTDSource)
- throws IOException, ParserConfigurationException, SAXException
- {
- final DocumentBuilderFactory factory = DocumentBuilderFactory
- .newInstance();
- factory.setValidating(false);
- factory.setIgnoringComments(true);
-
- final DocumentBuilder builder = factory.newDocumentBuilder();
-
- final DefaultHandler handler = new DefaultHandler()
- {
- @Override
- public InputSource resolveEntity(final String publicId,
- final String systemId) throws IOException, SAXException
- {
- if (PUBLIC_DTD_FACELET_TAGLIB_1_0_DTD.equals(publicId)
- || (systemId != null && systemId
- .endsWith(URI_FACELET_TAGLIB_1_0_DTD)))
-
- {
- return defaultDTDSource;
- }
- return super.resolveEntity(publicId, systemId);
- }
- };
-
- builder.setEntityResolver(handler);
- return builder.parse(taglibFile);
- }
-
- /**
- * @param doc
- * @return the facelet tag library or null
- */
- public static FaceletTaglibDefn processDocument(final Document doc)
- {
- Node curNode = null;
-
- for (int i = 0; i < doc.getChildNodes().getLength(); i++)
- {
- curNode = doc.getChildNodes().item(i);
-
- if (curNode.getNodeType() == Node.ELEMENT_NODE
- && ELEMENT_NAME_FACELET_TAGLIB
- .equals(curNode.getNodeName()))
- {
- break;
- }
- }
-
- if (curNode == null)
- {
- throw new IllegalArgumentException(
- "Couldn't find facelet-taglib node"); //$NON-NLS-1$
- }
-
- for (int i = 0; i < curNode.getChildNodes().getLength(); i++)
- {
- final Node node = curNode.getChildNodes().item(i);
-
- if (node.getNodeType() == Node.ELEMENT_NODE)
- {
- if (ELEMENT_NAME_LIBRARY_CLASS.equals(node.getNodeName()))
- {
- final FaceletLibraryClassTagLib faceletLibraryClassTagLib = FaceletTaglibFactory.eINSTANCE
- .createFaceletLibraryClassTagLib();
- faceletLibraryClassTagLib.setLibraryClass(node
- .getTextContent().trim());
- return faceletLibraryClassTagLib;
- }
- return processFaceletTaglibWithTags(curNode);
- }
- }
-
- return null;
- }
-
- private static FaceletXMLDefnTaglib processFaceletTaglibWithTags(
- final Node node)
- {
- String namespace = null;
- final List<Node> tagNodes = new ArrayList<Node>();
-
- for (int i = 0; i < node.getChildNodes().getLength(); i++)
- {
- final Node childNode = node.getChildNodes().item(i);
-
- if (childNode.getNodeType() == Node.ELEMENT_NODE)
- {
- if (ELEMENT_NAME_NAMESPACE.equals(childNode.getNodeName()))
- {
- namespace = childNode.getTextContent();
- }
- else if (ELEMENT_NAME_TAG.equals(childNode.getNodeName()))
- {
- tagNodes.add(childNode);
- }
- }
- }
-
- if (namespace != null)
- {
- final FaceletXMLDefnTaglib xmlDefnTaglib = FaceletTaglibFactory.eINSTANCE
- .createFaceletXMLDefnTaglib();
- xmlDefnTaglib.setNamespace(namespace);
-
- for (final Node tagNode : tagNodes)
- {
- final TagDefn tag = createTagFromNode(namespace, tagNode);
-
- if (tag != null)
- {
- xmlDefnTaglib.getTags().add(tag);
- }
- }
-
- return xmlDefnTaglib;
- }
- return null;
- }
-
- private static TagDefn createTagFromNode(final String namespace,
- final Node tagNode)
- {
- final Map<String, Node> children = indexChildren(tagNode);
-
- Node node = children.get(ELEMENT_NAME_TAG_NAME);
-
- if (node != null)
- {
- final String name = safeGetTextContext(node);
-
- if (name == null)
- {
- return null;
- }
-
- node = children.get(ELEMENT_NAME_HANDLER_CLASS);
-
- if (node != null)
- {
- final HandlerTagDefn handlerTag = FaceletTaglibFactory.eINSTANCE
- .createHandlerTagDefn();
- handlerTag.setHandlerClass(safeGetTextContext(node));
- handlerTag.setName(name);
- return handlerTag;
- }
-
- node = children.get(ELEMENT_NAME_SOURCE);
-
- if (node != null)
- {
- final SourceTagDefn sourceTag = FaceletTaglibFactory.eINSTANCE
- .createSourceTagDefn();
- sourceTag.setSource(safeGetTextContext(node));
- sourceTag.setName(name);
- return sourceTag;
- }
-
- node = children.get(ELEMENT_NAME_COMPONENT);
-
- if (node != null)
- {
- return createTagWithComponentType(namespace, name, node);
- }
-
- node = children.get(ELEMENT_NAME_CONVERTER);
-
- if (node != null)
- {
- return createTagWithConverter(namespace, name, node);
- }
-
- node = children.get(ELEMENT_NAME_VALIDATOR);
-
- if (node != null)
- {
- return createValidatorTag(namespace, name, node);
- }
- }
-
- return null;
- }
-
- private static ComponentTagDefn createTagWithComponentType(
- final String uri, final String tagName, final Node paramNode)
- {
- final Map<String, Node> componentChildren = indexChildren(paramNode);
- Node node = componentChildren.get(ELEMENT_NAME_COMPONENT_TYPE);
-
- if (node != null)
- {
- final String componentType = safeGetTextContext(node);
- String rendererType = null;
- String handlerClass = null;
-
- node = componentChildren.get(ELEMENT_NAME_RENDERER_TYPE);
- if (node != null)
- {
- rendererType = safeGetTextContext(node);
- }
-
- node = componentChildren.get(ELEMENT_NAME_HANDLER_CLASS);
- if (node != null)
- {
- handlerClass = safeGetTextContext(node);
- }
-
- final ComponentTagDefn componentTag = FaceletTaglibFactory.eINSTANCE
- .createComponentTagDefn();
- componentTag.setName(tagName);
- componentTag.setComponentType(componentType);
- componentTag.setHandlerClass(handlerClass);
- componentTag.setRendererType(rendererType);
- return componentTag;
- }
- return null;
- }
-
- private static ConverterTagDefn createTagWithConverter(final String uri,
- final String tagName, final Node paramNode)
- {
- final Map<String, Node> converterChildren = indexChildren(paramNode);
- Node node = converterChildren.get(ELEMENT_NAME_CONVERTER_ID);
-
- if (node != null)
- {
- final String converterId = safeGetTextContext(node);
- String handlerClass = null;
-
- node = converterChildren.get(ELEMENT_NAME_HANDLER_CLASS);
- if (node != null)
- {
- handlerClass = safeGetTextContext(node);
- }
-
- final ConverterTagDefn converterTag = FaceletTaglibFactory.eINSTANCE
- .createConverterTagDefn();
- converterTag.setName(tagName);
- converterTag.setConverterId(converterId);
- converterTag.setHandlerClass(handlerClass);
- return converterTag;
- }
- return null;
- }
-
- private static ValidatorTagDefn createValidatorTag(final String uri,
- final String tagName, final Node paramNode)
- {
- final Map<String, Node> converterChildren = indexChildren(paramNode);
- Node node = converterChildren.get(ELEMENT_NAME_VALIDATOR_ID);
-
- if (node != null)
- {
- final String validatorId = safeGetTextContext(node);
- String handlerClass = null;
-
- node = converterChildren.get(ELEMENT_NAME_HANDLER_CLASS);
- if (node != null)
- {
- handlerClass = safeGetTextContext(node);
- }
-
- final ValidatorTagDefn validatorTag = FaceletTaglibFactory.eINSTANCE
- .createValidatorTagDefn();
- validatorTag.setName(tagName);
- validatorTag.setHandlerClass(handlerClass);
- validatorTag.setValidatorId(validatorId);
- return validatorTag;
- }
- return null;
- }
-
- private static Map<String, Node> indexChildren(final Node node)
- {
- final Map<String, Node> children = new HashMap<String, Node>();
- final NodeList nodeList = node.getChildNodes();
-
- for (int i = 0; i < nodeList.getLength(); i++)
- {
- final Node childNode = nodeList.item(i);
-
- if (childNode.getNodeType() == Node.ELEMENT_NODE)
- {
- children.put(childNode.getNodeName(), childNode);
- }
- }
-
- return children;
- }
-
- private static String safeGetTextContext(final Node node)
- {
- String textContent = node.getTextContent();
- if (textContent == null)
- {
- return null;
- }
-
- textContent = textContent.trim();
-
- if ("".equals(textContent)) //$NON-NLS-1$
- {
- return null;
- }
-
- return textContent;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/TagRecordFactory.java b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/TagRecordFactory.java
deleted file mode 100644
index ef06cec..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/TagRecordFactory.java
+++ /dev/null
@@ -1,154 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Oracle 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:
- * Cameron Bateman - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facelet.core.internal.registry.taglib;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.ISafeRunnable;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.SafeRunner;
-import org.eclipse.jem.internal.proxy.core.ICallbackRegistry;
-import org.eclipse.jem.internal.proxy.core.IConfigurationContributor;
-import org.eclipse.jem.internal.proxy.core.ProxyFactoryRegistry;
-import org.eclipse.jem.internal.proxy.ide.IDERegistration;
-import org.eclipse.jst.jsf.core.JSFVersion;
-import org.eclipse.jst.jsf.facelet.core.internal.FaceletCorePlugin;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.ELProxyContributor;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.ServletBeanProxyContributor;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.IFaceletTagRecord.TagRecordDescriptor;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglib;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.FaceletLibraryClassTagLib;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.FaceletXMLDefnTaglib;
-
-/**
- * Creates new tag records for a project.
- *
- */
-public class TagRecordFactory
-{
- private final ProxyFactoryRegistry _registry;
- private final IProject _project;
-
- /**
- * @param project
- * @param useJEMProxy TODO
- */
- public TagRecordFactory(final IProject project, boolean useJEMProxy)
- {
- _project = project;
- ProxyFactoryRegistry registry = NULL_REGISTRY;
- if (useJEMProxy)
- {
- try
- {
- registry = createProxyRegistry(_project);
- } catch (final Exception e)
- {
- FaceletCorePlugin.log("While creatinng proxy", e); //$NON-NLS-1$
- }
-
- }
- _registry = registry;
- }
-
- /**
- * @param taglibDefn
- * @param descriptor
- * @return the new tag record
- */
- public IFaceletTagRecord createRecords(final FaceletTaglib taglibDefn, final TagRecordDescriptor descriptor)
- {
- IFaceletTagRecord retValue = null;
-
- if (taglibDefn instanceof FaceletLibraryClassTagLib)
- {
- if (_registry != NULL_REGISTRY)
- {
- final LibraryClassBasedTagRecord record = new LibraryClassBasedTagRecord(
- _registry, (FaceletLibraryClassTagLib) taglibDefn,
- _project, descriptor);
- try
- {
- record.initURI();
- retValue = record;
- } catch (CoreException e)
- {
- FaceletCorePlugin
- .log("While creating record: " + record, e); //$NON-NLS-1$
- }
- }
- } else if (taglibDefn instanceof FaceletXMLDefnTaglib)
- {
- throw new UnsupportedOperationException();
- // final XMLBasedTagRecord record = new XMLBasedTagRecord(
- // (FaceletXMLDefnTaglib) taglibDefn);
- // retValue = record;
- } else
- {
- final XMLBasedTagRecord record = new XMLBasedTagRecord(taglibDefn, descriptor);
- retValue = record;
- }
- return retValue;
- }
-
- /**
- * Dispose the registry.
- */
- public void dispose()
- {
- if (_registry != null && _registry != NULL_REGISTRY)
- {
- SafeRunner.run(new ISafeRunnable()
- {
-
- public void run() throws Exception
- {
- _registry.terminateRegistry(false);
- }
-
- public void handleException(Throwable e)
- {
- FaceletCorePlugin.log("While creatinng proxy", e); //$NON-NLS-1$
- }
- });
- }
- }
-
- private static ProxyFactoryRegistry createProxyRegistry(
- final IProject project) throws CoreException
- {
- final IConfigurationContributor[] contributor = new IConfigurationContributor[]
- { new ServletBeanProxyContributor(JSFVersion.V1_1),
- new ELProxyContributor(project) };
-
- return IDERegistration.startAnImplementation(contributor, false,
- project, project.getName(), FaceletCorePlugin.PLUGIN_ID,
- new NullProgressMonitor());
- }
-
- private final static NullProxyFactoryRegistry NULL_REGISTRY = new NullProxyFactoryRegistry();
-
- private static class NullProxyFactoryRegistry extends ProxyFactoryRegistry
- {
-
- @Override
- public ICallbackRegistry getCallbackRegistry()
- {
- throw new UnsupportedOperationException("This is null proxy"); //$NON-NLS-1$
- }
-
- @Override
- protected void registryTerminated(final boolean wait)
- {
- throw new UnsupportedOperationException("This is null proxy"); //$NON-NLS-1$
- }
- }
-}
\ No newline at end of file
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/TaglibFileTracker.java b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/TaglibFileTracker.java
deleted file mode 100644
index cc435e2..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/TaglibFileTracker.java
+++ /dev/null
@@ -1,60 +0,0 @@
-package org.eclipse.jst.jsf.facelet.core.internal.registry.taglib;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.jst.jsf.common.internal.resource.ResourceLifecycleEvent.ReasonType;
-import org.eclipse.jst.jsf.common.internal.resource.ResourceTracker;
-
-class TaglibFileTracker extends ResourceTracker<IFile>
-{
- private String _uri;
- private TaglibResourceManager _manager;
- private final ILibraryChangeHandler _handler;
-
- public TaglibFileTracker(final IFile file, final TaglibResourceManager manager,
- final ILibraryChangeHandler handler)
- {
- super(file);
- _manager = manager;
- _manager.addListener(this);
- _handler = handler;
- }
-
- public String getUri()
- {
- return _uri;
- }
-
- public final void setUri(final String uri)
- {
- _uri = uri;
- }
-
- @Override
- public void dispose()
- {
- _manager.removeListener(this);
- _manager = null;
- }
-
- @Override
- protected void fireResourceInAccessible(final IResource resource, final ReasonType reasonType)
- {
- // removed resources kick a remove event
- _handler.removed(_uri, getResource());
- }
-
- @Override
- protected void fireResourceChanged(final IResource resource, final ReasonType reasonType)
- {
- // changed resources kick a change event
- _handler.changed(_uri, getResource());
- }
-
- @Override
- protected void fireResourceAdded(final IResource affectedResource, final ReasonType reasonType)
- {
- // added resources kick an add event.
- _handler.added(getResource());
- }
-}
\ No newline at end of file
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/TaglibResourceManager.java b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/TaglibResourceManager.java
deleted file mode 100644
index ce7cce0..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/TaglibResourceManager.java
+++ /dev/null
@@ -1,99 +0,0 @@
-package org.eclipse.jst.jsf.facelet.core.internal.registry.taglib;
-
-import java.util.List;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.jst.jsf.common.internal.resource.ResourceManager;
-import org.eclipse.jst.jsf.common.internal.resource.ResourceTracker;
-import org.eclipse.jst.jsf.common.internal.resource.WorkspaceMediator;
-import org.eclipse.jst.jsf.facelet.core.internal.FaceletCorePlugin;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.WebappConfiguration.WebappListener;
-
-class TaglibResourceManager extends ResourceManager<IFile>
-{
- private ILibraryChangeHandler _handler;
- private final WebappConfiguration _webAppConfiguration;
-
- public TaglibResourceManager(final IProject project,
- final ILibraryChangeHandler handler,
- final WorkspaceMediator wsMediator,
- final WebappConfiguration webAppConfiguration)
- {
- super(project.getWorkspace());
- _handler = handler;
- _webAppConfiguration = webAppConfiguration;
- }
-
- @Override
- public List<IFile> getResources()
- {
- return _webAppConfiguration.getFiles();
- }
-
- @Override
- public void initResources()
- {
- _webAppConfiguration.start();
- _webAppConfiguration.addListener(new WebappListener()
- {
- @Override
- public void webappChanged(final WebappChangeEvent event)
- {
- for (final IFile file : event.getRemoved())
- {
- TaglibFileTracker tracker;
- // only fire removals on files that we are already managing: you can't remove
- // a file that is not there.
- if (isInstance(file))
- {
- tracker = (TaglibFileTracker) unmanageResource(file);
- _handler.removed(tracker.getUri(), file);
- }
- }
-
- for (final IFile file : event.getAdded())
- {
- _handler.added(file);
- }
- }
- });
- List<IFile> files = _webAppConfiguration.getFiles();
- for (final IFile file : files)
- {
- // add files to ensure we get add events for ones that don't exist.
- try
- {
- getInstance(file);
- } catch (ManagedObjectException e)
- {
- FaceletCorePlugin.log("While starting the taglib resource manager", e); //$NON-NLS-1$
- }
- }
- }
-
- @Override
- protected ResourceTracker createNewInstance(final IResource resource)
- {
- if (resource.getType() == IResource.FILE)
- {
- return new TaglibFileTracker((IFile) resource, this, _handler);
- }
- throw new IllegalArgumentException();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see
- * org.eclipse.jst.jsf.common.internal.resource.ResourceSingletonObjectManager
- * #dispose()
- */
- @Override
- public void dispose()
- {
- _webAppConfiguration.dispose();
- super.dispose();
- }
-}
\ No newline at end of file
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/WebappConfiguration.java b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/WebappConfiguration.java
deleted file mode 100644
index e0117c8..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/WebappConfiguration.java
+++ /dev/null
@@ -1,400 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Oracle 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:
- * Cameron Bateman - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facelet.core.internal.registry.taglib;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-import java.util.StringTokenizer;
-import java.util.concurrent.CopyOnWriteArrayList;
-
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IWorkspaceRunnable;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jst.j2ee.model.IModelProvider;
-import org.eclipse.jst.javaee.web.IWebCommon;
-import org.eclipse.jst.jsf.common.internal.componentcore.AbstractVirtualComponentQuery;
-import org.eclipse.jst.jsf.common.internal.resource.EventResult;
-import org.eclipse.jst.jsf.common.internal.resource.IResourceLifecycleListener;
-import org.eclipse.jst.jsf.common.internal.resource.LifecycleListener;
-import org.eclipse.jst.jsf.common.internal.resource.ResourceLifecycleEvent;
-import org.eclipse.jst.jsf.common.internal.resource.ResourceLifecycleEvent.EventType;
-import org.eclipse.jst.jsf.common.internal.resource.WorkspaceMediator;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.WebappConfiguration.WebappListener.WebappChangeEvent;
-import org.eclipse.wst.common.componentcore.resources.IVirtualFile;
-import org.eclipse.wst.common.componentcore.resources.IVirtualFolder;
-
-/**
- * Manages the web.xml elements of interest to Facelet tag libraries
- *
- * @author cbateman
- *
- */
-public class WebappConfiguration
-{
- /**
- * The param key for Facelet 1.x libraries declared in web.xml
- */
- public static final String FACELET_10_LIBRARIES_CONTEXT_PARAM_NAME = "facelets.LIBRARIES"; //$NON-NLS-1$
- /**
- * The param key for Facelet 2.0 libraries declared in web.xml
- */
- public static final String JSF20_FACELET_LIBRARIES_CONTEXT_PARAM_NAME = "javax.faces.FACELETS_LIBRARIES"; //$NON-NLS-1$
- private final IProject _project;
- /**
- * Cached instance of ContextParamAdapter.
- */
- private final ContextParamAdapter _contextParamAdapter;
- private List<IFile> _cachedFiles;
- private final IModelProvider _modelProvider;
- private final AbstractVirtualComponentQuery _vcQuery;
- private final LifecycleListener _lifecycleListener;
- private final WorkspaceMediator _wsMediator;
-
- /**
- * @param project
- * @param modelProvider
- * @param vcQuery
- * @param wsMediator
- */
- public WebappConfiguration(final IProject project,
- final IModelProvider modelProvider,
- final AbstractVirtualComponentQuery vcQuery,
- final WorkspaceMediator wsMediator)
- {
- _project = project;
- _vcQuery = vcQuery;
- _lifecycleListener = new LifecycleListener(getWebXmlFile(project),
- project.getWorkspace());
- _contextParamAdapter = new ContextParamAdapter();
- _modelProvider = modelProvider;
- _wsMediator = wsMediator;
- }
-
- /**
- * @param listener
- */
- public void addListener(final WebappListener listener)
- {
- _contextParamAdapter.addListener(listener);
- }
-
- /**
- * @param listener
- */
- public void removeListener(final WebappListener listener)
- {
- _contextParamAdapter.removeListener(listener);
- }
-
- /**
- * @return the list of IFile's
- */
- public List<IFile> getFiles()
- {
- final IVirtualFolder folder = _vcQuery.getWebContentFolder(_project);
-
- if (folder == null)
- {
- return Collections.emptyList();
- }
-
- final List<String> filenames = getConfigFilesFromContextParam(_project,
- _modelProvider);
- final List<IFile> files = new ArrayList<IFile>();
-
- for (final String filename : filenames)
- {
- final IVirtualFile vfile = folder.getFile(new Path(filename));
- if (vfile != null)
- {
- files.add(vfile.getUnderlyingFile());
- }
- }
- _cachedFiles = files;
- return Collections.unmodifiableList(_cachedFiles);
- }
-
- private IFile getWebXmlFile(final IProject project)
- {
- final IVirtualFolder webContentFolder = _vcQuery
- .getWebContentFolder(project);
- final IContainer folder = webContentFolder.getUnderlyingFolder();
- return folder.getFile(new Path("WEB-INF/web.xml")); //$NON-NLS-1$
- }
-
- /**
- *
- */
- public void start()
- {
- _lifecycleListener.addListener(_contextParamAdapter);
- }
-
- /**
- *
- */
- public void stop()
- {
- _lifecycleListener.removeListener(_contextParamAdapter);
- }
-
- /**
- *
- */
- public void dispose()
- {
- _lifecycleListener.dispose();
- }
-
- /**
- * Gets list of application configuration file names as listed in the JSF
- * CONFIG_FILES context parameter ("javax.faces.CONFIG_FILES"). Will return
- * an empty list if WebArtifactEdit is null, if WebApp is null, if context
- * parameter does not exist, or if trimmed context parameter's value is an
- * empty String.
- *
- * @param project
- * IProject instance for which to get the context parameter's
- * value.
- * @param provider
- * @return List of application configuration file names as listed in the JSF
- * CONFIG_FILES context parameter ("javax.faces.CONFIG_FILES"); list
- * may be empty.
- */
- public static List<String> getConfigFilesFromContextParam(
- final IProject project, final IModelProvider provider)
- {
- List<String> filesList = Collections.EMPTY_LIST;
- // if (JSFAppConfigUtils.isValidJSFProject(project))
- {
- final Object webAppObj = provider.getModelObject();
- if (webAppObj != null)
- {
- if (webAppObj instanceof org.eclipse.jst.javaee.web.WebApp)
- {
- filesList = getConfigFilesForJEEApp((org.eclipse.jst.javaee.web.WebApp) webAppObj);
- }
- }
-
- }
- return filesList;
- }
-
- private static List<String> getConfigFilesForJEEApp(
- final org.eclipse.jst.javaee.web.WebApp webApp)
- {
- String filesString = null;
- final List contextParams = webApp.getContextParams();
- final Iterator itContextParams = contextParams.iterator();
- final List<String> fileStrings = new ArrayList<String>();
- while (itContextParams.hasNext())
- {
- final org.eclipse.jst.javaee.core.ParamValue paramValue = (org.eclipse.jst.javaee.core.ParamValue) itContextParams
- .next();
- if (paramValue.getParamName().equals(
- FACELET_10_LIBRARIES_CONTEXT_PARAM_NAME)
- || paramValue.getParamName().equals(
- JSF20_FACELET_LIBRARIES_CONTEXT_PARAM_NAME))
- {
- filesString = paramValue.getParamValue();
- fileStrings.addAll(parseFilesString(filesString));
- }
- }
- return fileStrings;
- }
-
- private static List<String> parseFilesString(final String filesString)
- {
- final List<String> filesList = new ArrayList<String>();
- if (filesString != null && filesString.trim().length() > 0)
- {
- final StringTokenizer stFilesString = new StringTokenizer(
- filesString, ";"); //$NON-NLS-1$
- while (stFilesString.hasMoreTokens())
- {
- final String configFile = stFilesString.nextToken().trim();
- filesList.add(configFile);
- }
- }
- return filesList;
- }
-
- /**
- * Adapter implementation used to monitor addition/removal of context-param
- * nodes and change in name of existing nodes in order to respond to changes
- * to the JSF CONFIG_FILES context-param.
- *
- * @author Ian Trimble - Oracle
- */
- private class ContextParamAdapter implements IResourceLifecycleListener
- {
- private final CopyOnWriteArrayList<WebappListener> _listeners = new CopyOnWriteArrayList<WebappListener>();
-
- public void addListener(final WebappListener listener)
- {
- _listeners.addIfAbsent(listener);
- }
-
- public void removeListener(final WebappListener listener)
- {
- _listeners.remove(listener);
- }
-
- private void fireEvent(final WebappChangeEvent event)
- {
- for (final WebappListener listener : _listeners)
- {
- listener.webappChanged(event);
- }
- }
-
- private void checkAndFireFileChanges()
- {
- final List<IFile> oldFiles = _cachedFiles == null ? Collections.EMPTY_LIST
- : _cachedFiles;
- final List<IFile> newFiles = getFiles();
-
- final List<IFile> filesAdded = new ArrayList<IFile>();
- final List<IFile> filesRemoved = new ArrayList<IFile>();
-
- for (final IFile oldFile : oldFiles)
- {
- if (!newFiles.contains(oldFile))
- {
- filesRemoved.add(oldFile);
- }
- }
-
- for (final IFile newFile : newFiles)
- {
- if (!oldFiles.contains(newFile))
- {
- filesAdded.add(newFile);
- }
- }
-
- if (filesAdded.size() > 0 || filesRemoved.size() > 0)
- {
- fireEvent(new WebappChangeEvent(filesRemoved, filesAdded));
- }
- }
-
- /**
- * Called when a ContextParam instance is removed.
- *
- * @param contextParam
- * ContextParam instance.
- */
- protected void processParamValue(
- final org.eclipse.jst.javaee.core.ParamValue contextParam)
- {
- checkAndFireFileChanges();
- }
-
-// /**
-// * Tests if the passed ContextParam instance is the JSF CONFIG_FILES
-// * context parameter.
-// *
-// * @param contextParam
-// * ContextParam instance.
-// * @return true if the passed ContextParam instance is the JSF
-// * CONFIG_FILES context parameter, else false
-// */
-// protected boolean isConfigFilesContextParam(
-// final org.eclipse.jst.javaee.core.ParamValue contextParam)
-// {
-// boolean isConfigFiles = false;
-// if (contextParam != null)
-// {
-// final String name = contextParam.getParamName();
-// if (FACELET_10_LIBRARIES_CONTEXT_PARAM_NAME.equals(name)
-// || JSF20_FACELET_LIBRARIES_CONTEXT_PARAM_NAME
-// .equals(name))
-// {
-// isConfigFiles = true;
-// }
-// }
-// return isConfigFiles;
-// }
-
- public EventResult acceptEvent(final ResourceLifecycleEvent event)
- {
- // the event is only interesting if it is the web.xml
- if (event.getAffectedResource() instanceof IFile
- && "web.xml".equals(event.getAffectedResource().getProjectRelativePath().lastSegment())) //$NON-NLS-1$
- {
- if (event.getEventType() == EventType.RESOURCE_CHANGED)
- {
- handleChange();
- }
- }
- return EventResult.getDefaultEventResult();
- }
-
- private void handleChange()
- {
- final IWorkspaceRunnable runnable = new IWorkspaceRunnable()
- {
- public void run(final IProgressMonitor monitor) throws CoreException
- {
- final Object modelObject = _modelProvider.getModelObject();
- if (modelObject instanceof org.eclipse.jst.javaee.web.WebApp)
- {
- for (final org.eclipse.jst.javaee.core.ParamValue paramValue : ((IWebCommon) modelObject)
- .getContextParams())
- {
- processParamValue(paramValue);
- }
- }
- // TODO: possibly handle facelets 1.0 in pre-2.5 webapps in
- // the
- // future
- // if it's worth the complexity.
- // SEE previous revs in CVS.
- }
- };
- _wsMediator.runInWorkspaceJob(runnable, "Update web xml"); //$NON-NLS-1$
- }
- }
-
- abstract static class WebappListener
- {
- public static class WebappChangeEvent
- {
- private final List<IFile> _removed;
- private final List<IFile> _added;
-
- WebappChangeEvent(final List<IFile> removed, final List<IFile> added)
- {
- _removed = Collections.unmodifiableList(removed);
- _added = Collections.unmodifiableList(added);
- }
-
- public final List<IFile> getRemoved()
- {
- return _removed;
- }
-
- public final List<IFile> getAdded()
- {
- return _added;
- }
- }
-
- public abstract void webappChanged(final WebappChangeEvent event);
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/XMLBasedTagRecord.java b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/XMLBasedTagRecord.java
deleted file mode 100644
index 9fda907..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/XMLBasedTagRecord.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Oracle 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:
- * Cameron Bateman - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facelet.core.internal.registry.taglib;
-
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglib;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTag;
-
-/**
- * A tag record based on an xml tag defined Facelet taglib.xml
- * @author cbateman
- *
- */
-public class XMLBasedTagRecord extends FaceletTagRecord
-{
- /**
- *
- */
- private static final long serialVersionUID = 1411551451386954263L;
- private final FaceletTaglib _taglibDefn;
- private Map<String, FaceletTaglibTag> _tagIndexByName;
-
- /**
- * @param taglibDefn
- * @param descriptor
- */
- public XMLBasedTagRecord(final FaceletTaglib taglibDefn, final TagRecordDescriptor descriptor)
- {
- super(descriptor);
- _taglibDefn = taglibDefn;
- }
-
- @Override
- public String getURI()
- {
- return _taglibDefn.getNamespaceUri();
- }
-
-
- @Override
- public FaceletTaglibTag getTag(final String name)
- {
- return getAndIndexElementDeclaration(name);
- }
-
- private synchronized FaceletTaglibTag getAndIndexElementDeclaration(final String name)
- {
- FaceletTaglibTag tagDefn = null;
-
- if (_tagIndexByName == null)
- {
- _tagIndexByName = new HashMap<String, FaceletTaglibTag>();
- }
- else
- {
- tagDefn = _tagIndexByName.get(name);
- }
-
- if (tagDefn == null && _tagIndexByName.size() < _taglibDefn.getTag().size())
- {
- tagDefn = findTag(name);
- if (tagDefn != null)
- {
- _tagIndexByName.put(name, tagDefn);
- }
- }
-
- return tagDefn;
- }
-
- private FaceletTaglibTag findTag(final String name)
- {
- for (final FaceletTaglibTag tag : _taglibDefn.getTag())
- {
- if (name.equals(tag.getTagName()))
- {
- return tag;
- }
- }
- return null;
- }
-
- @Override
- public List<FaceletTaglibTag> getTags()
- {
- return Collections.unmodifiableList(_taglibDefn.getTag());
- }
-
- public int getNumTags()
- {
- return _taglibDefn.getTag().size();
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/XMLBasedTagRecord_Facelet10.java b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/XMLBasedTagRecord_Facelet10.java
deleted file mode 100644
index 1a73273..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/XMLBasedTagRecord_Facelet10.java
+++ /dev/null
@@ -1,101 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Oracle 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:
- * Cameron Bateman - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facelet.core.internal.registry.taglib;
-
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglib;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTag;
-
-/**
- * A tag record based on an xml tag defined Facelet taglib.xml
- * @author cbateman
- *
- */
-public class XMLBasedTagRecord_Facelet10 extends FaceletTagRecord
-{
- /**
- *
- */
- private static final long serialVersionUID = 1411551451386954263L;
- private final FaceletTaglib _taglibDefn;
- private Map<String, FaceletTaglibTag> _tagIndexByName;
-
- /**
- * @param taglibDefn
- * @param descriptor
- */
- public XMLBasedTagRecord_Facelet10(final FaceletTaglib taglibDefn, final TagRecordDescriptor descriptor)
- {
- super(descriptor);
- _taglibDefn = taglibDefn;
- }
-
- @Override
- public String getURI()
- {
- return _taglibDefn.getNamespaceUri();
- }
-
-
- @Override
- public FaceletTaglibTag getTag(final String name)
- {
- return getAndIndexElementDeclaration(name);
- }
-
- private synchronized FaceletTaglibTag getAndIndexElementDeclaration(final String name)
- {
- FaceletTaglibTag tagDefn = null;
-
- if (_tagIndexByName == null)
- {
- _tagIndexByName = new HashMap<String, FaceletTaglibTag>();
- }
- else
- {
- tagDefn = _tagIndexByName.get(name);
- }
-
- if (tagDefn == null && _tagIndexByName.size() < _taglibDefn.getTag().size())
- {
- tagDefn = findTag(name);
- }
-
- return tagDefn;
- }
-
- private FaceletTaglibTag findTag(final String name)
- {
- for (final FaceletTaglibTag tag : _taglibDefn.getTag())
- {
- if (name.equals(tag.getTagName()))
- {
- return tag;
- }
- }
- return null;
- }
-
- @Override
- public List<FaceletTaglibTag> getTags()
- {
- return Collections.unmodifiableList(_taglibDefn.getTag());
- }
-
- public int getNumTags()
- {
- return _taglibDefn.getTag().size();
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib/Description.java b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib/Description.java
deleted file mode 100644
index 42810ac..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib/Description.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: Description.java,v 1.1 2010/03/18 06:24:36 cbateman Exp $
- */
-package org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Description</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- *
- *
- * The description type is used by a description element to
- * provide text describing the parent element. The elements
- * that use this type should include any information that the
- * Deployment Component's Deployment File file producer wants
- * to provide to the consumer of the Deployment Component's
- * Deployment File (i.e., to the Deployer). Typically, the
- * tools used by such a Deployment File consumer will display
- * the description when processing the parent element that
- * contains the description.
- *
- * The lang attribute defines the language that the
- * description is provided in. The default value is "en" (English).
- *
- *
- * <!-- end-model-doc -->
- *
- *
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibPackage#getDescription()
- * @model extendedMetaData="name='descriptionType' kind='simple'"
- * @generated
- */
-public interface Description extends IdentifiableLangStringValue
-{
- // Description
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib/DisplayName.java b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib/DisplayName.java
deleted file mode 100644
index c44b496..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib/DisplayName.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: DisplayName.java,v 1.1 2010/03/18 06:24:36 cbateman Exp $
- */
-package org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Display Name</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- *
- * <![CDATA[
- *
- * The display-name type contains a short name that is intended
- * to be displayed by tools. It is used by display-name
- * elements. The display name need not be unique.
- *
- * Example:
- *
- * ...
- * <display-name xml:lang="en">
- * Employee Self Service
- * </display-name>
- *
- * The value of the xml:lang attribute is "en" (English) by default.
- *
- * ]]>
- *
- * <!-- end-model-doc -->
- *
- *
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibPackage#getDisplayName()
- * @model extendedMetaData="name='display-nameType' kind='simple'"
- * @generated
- */
-public interface DisplayName extends IdentifiableLangStringValue
-{
- // DisplayName
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib/DocumentRoot.java b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib/DocumentRoot.java
deleted file mode 100644
index 3cb9176..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib/DocumentRoot.java
+++ /dev/null
@@ -1,114 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: DocumentRoot.java,v 1.1 2010/03/18 06:24:37 cbateman Exp $
- */
-package org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib;
-
-import org.eclipse.emf.common.util.EMap;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.util.FeatureMap;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Document Root</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- * <li>{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.DocumentRoot#getMixed <em>Mixed</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.DocumentRoot#getXMLNSPrefixMap <em>XMLNS Prefix Map</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.DocumentRoot#getXSISchemaLocation <em>XSI Schema Location</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.DocumentRoot#getFaceletTaglib <em>Facelet Taglib</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibPackage#getDocumentRoot()
- * @model extendedMetaData="name='' kind='mixed'"
- * @generated
- */
-public interface DocumentRoot extends EObject
-{
- /**
- * Returns the value of the '<em><b>Mixed</b></em>' attribute list.
- * The list contents are of type {@link org.eclipse.emf.ecore.util.FeatureMap.Entry}.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Mixed</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>Mixed</em>' attribute list.
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibPackage#getDocumentRoot_Mixed()
- * @model unique="false" dataType="org.eclipse.emf.ecore.EFeatureMapEntry" many="true"
- * extendedMetaData="kind='elementWildcard' name=':mixed'"
- * @generated
- */
- FeatureMap getMixed();
-
- /**
- * Returns the value of the '<em><b>XMLNS Prefix Map</b></em>' map.
- * The key is of type {@link java.lang.String},
- * and the value is of type {@link java.lang.String},
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>XMLNS Prefix Map</em>' map isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @return the value of the '<em>XMLNS Prefix Map</em>' map.
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibPackage#getDocumentRoot_XMLNSPrefixMap()
- * @model mapType="org.eclipse.emf.ecore.EStringToStringMapEntry<org.eclipse.emf.ecore.EString, org.eclipse.emf.ecore.EString>" transient="true"
- * extendedMetaData="kind='attribute' name='xmlns:prefix'"
- * @generated
- */
- EMap<String, String> getXMLNSPrefixMap();
-
- /**
- * Returns the value of the '<em><b>XSI Schema Location</b></em>' map.
- * The key is of type {@link java.lang.String},
- * and the value is of type {@link java.lang.String},
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>XSI Schema Location</em>' map isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @return the value of the '<em>XSI Schema Location</em>' map.
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibPackage#getDocumentRoot_XSISchemaLocation()
- * @model mapType="org.eclipse.emf.ecore.EStringToStringMapEntry<org.eclipse.emf.ecore.EString, org.eclipse.emf.ecore.EString>" transient="true"
- * extendedMetaData="kind='attribute' name='xsi:schemaLocation'"
- * @generated
- */
- EMap<String, String> getXSISchemaLocation();
-
- /**
- * Returns the value of the '<em><b>Facelet Taglib</b></em>' containment reference.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Facelet Taglib</em>' containment reference isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @return the value of the '<em>Facelet Taglib</em>' containment reference.
- * @see #setFaceletTaglib(FaceletTaglib)
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibPackage#getDocumentRoot_FaceletTaglib()
- * @model containment="true" upper="-2" transient="true" volatile="true" derived="true"
- * extendedMetaData="kind='element' name='facelet-taglib' namespace='##targetNamespace'"
- * @generated
- */
- FaceletTaglib getFaceletTaglib();
-
- /**
- * Sets the value of the '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.DocumentRoot#getFaceletTaglib <em>Facelet Taglib</em>}' containment reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Facelet Taglib</em>' containment reference.
- * @see #getFaceletTaglib()
- * @generated
- */
- void setFaceletTaglib(FaceletTaglib value);
-
-} // DocumentRoot
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib/FaceletTaglib.java b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib/FaceletTaglib.java
deleted file mode 100644
index 1e872d8..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib/FaceletTaglib.java
+++ /dev/null
@@ -1,304 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: FaceletTaglib.java,v 1.1 2010/03/18 06:24:29 cbateman Exp $
- */
-package org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.util.FeatureMap;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Facelet Taglib</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- *
- * The top level XML element in a facelet tag library XML file.
- *
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- * <li>{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglib#getLibraryClass <em>Library Class</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglib#getNamespace <em>Namespace</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglib#getCompositeLibraryName <em>Composite Library Name</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglib#getGroup <em>Group</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglib#getTag <em>Tag</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglib#getFunction <em>Function</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglib#getTaglibExtension <em>Taglib Extension</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglib#getId <em>Id</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglib#getVersion <em>Version</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglib#getNamespaceUri <em>Namespace Uri</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibPackage#getFaceletTaglib()
- * @model extendedMetaData="name='facelet-taglibType' kind='elementOnly'"
- * @generated
- */
-public interface FaceletTaglib extends UserVisibleTaglibObject
-{
- /**
- * Returns the value of the '<em><b>Library Class</b></em>' containment reference.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Library Class</em>' containment reference isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @return the value of the '<em>Library Class</em>' containment reference.
- * @see #setLibraryClass(FullyQualifiedClass)
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibPackage#getFaceletTaglib_LibraryClass()
- * @model containment="true"
- * extendedMetaData="kind='element' name='library-class' namespace='##targetNamespace'"
- * @generated
- */
- FullyQualifiedClass getLibraryClass();
-
- /**
- * Sets the value of the '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglib#getLibraryClass <em>Library Class</em>}' containment reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Library Class</em>' containment reference.
- * @see #getLibraryClass()
- * @generated
- */
- void setLibraryClass(FullyQualifiedClass value);
-
- /**
- * Returns the value of the '<em><b>Namespace</b></em>' containment reference.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Namespace</em>' containment reference isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @return the value of the '<em>Namespace</em>' containment reference.
- * @see #setNamespace(IdentifiableStringValue)
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibPackage#getFaceletTaglib_Namespace()
- * @model containment="true"
- * extendedMetaData="kind='element' name='namespace' namespace='##targetNamespace'"
- * @generated
- */
- IdentifiableStringValue getNamespace();
-
- /**
- * Sets the value of the '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglib#getNamespace <em>Namespace</em>}' containment reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Namespace</em>' containment reference.
- * @see #getNamespace()
- * @generated
- */
- void setNamespace(IdentifiableStringValue value);
-
- /**
- * Returns the value of the '<em><b>Composite Library Name</b></em>' containment reference.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Composite Library Name</em>' containment reference isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @return the value of the '<em>Composite Library Name</em>' containment reference.
- * @see #setCompositeLibraryName(FullyQualifiedClass)
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibPackage#getFaceletTaglib_CompositeLibraryName()
- * @model containment="true"
- * extendedMetaData="kind='element' name='composite-library-name' namespace='##targetNamespace'"
- * @generated
- */
- FullyQualifiedClass getCompositeLibraryName();
-
- /**
- * Sets the value of the '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglib#getCompositeLibraryName <em>Composite Library Name</em>}' containment reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Composite Library Name</em>' containment reference.
- * @see #getCompositeLibraryName()
- * @generated
- */
- void setCompositeLibraryName(FullyQualifiedClass value);
-
- /**
- * Returns the value of the '<em><b>Group</b></em>' attribute list.
- * The list contents are of type {@link org.eclipse.emf.ecore.util.FeatureMap.Entry}.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Group</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>Group</em>' attribute list.
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibPackage#getFaceletTaglib_Group()
- * @model unique="false" dataType="org.eclipse.emf.ecore.EFeatureMapEntry" many="true"
- * extendedMetaData="kind='group' name='group:6'"
- * @generated
- */
- FeatureMap getGroup();
-
- /**
- * Returns the value of the '<em><b>Tag</b></em>' containment reference list.
- * The list contents are of type {@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTag}.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Tag</em>' containment reference list isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @return the value of the '<em>Tag</em>' containment reference list.
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibPackage#getFaceletTaglib_Tag()
- * @model containment="true" transient="true" volatile="true" derived="true"
- * extendedMetaData="kind='element' name='tag' namespace='##targetNamespace' group='#group:6'"
- * @generated
- */
- EList<FaceletTaglibTag> getTag();
-
- /**
- * Returns the value of the '<em><b>Function</b></em>' containment reference list.
- * The list contents are of type {@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibFunction}.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Function</em>' containment reference list isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @return the value of the '<em>Function</em>' containment reference list.
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibPackage#getFaceletTaglib_Function()
- * @model containment="true" transient="true" volatile="true" derived="true"
- * extendedMetaData="kind='element' name='function' namespace='##targetNamespace' group='#group:6'"
- * @generated
- */
- EList<FaceletTaglibFunction> getFunction();
-
- /**
- * Returns the value of the '<em><b>Taglib Extension</b></em>' containment reference list.
- * The list contents are of type {@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibExtension}.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Taglib Extension</em>' containment reference list isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @return the value of the '<em>Taglib Extension</em>' containment reference list.
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibPackage#getFaceletTaglib_TaglibExtension()
- * @model containment="true"
- * extendedMetaData="kind='element' name='taglib-extension' namespace='##targetNamespace'"
- * @generated
- */
- EList<FaceletTaglibExtension> getTaglibExtension();
-
- /**
- * Returns the value of the '<em><b>Id</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Id</em>' attribute isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @return the value of the '<em>Id</em>' attribute.
- * @see #setId(String)
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibPackage#getFaceletTaglib_Id()
- * @model id="true" dataType="org.eclipse.emf.ecore.xml.type.ID"
- * extendedMetaData="kind='attribute' name='id'"
- * @generated
- */
- String getId();
-
- /**
- * Sets the value of the '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglib#getId <em>Id</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Id</em>' attribute.
- * @see #getId()
- * @generated
- */
- void setId(String value);
-
- /**
- * Returns the value of the '<em><b>Version</b></em>' attribute.
- * The literals are from the enumeration {@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibVersion}.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Version</em>' attribute isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @return the value of the '<em>Version</em>' attribute.
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibVersion
- * @see #isSetVersion()
- * @see #unsetVersion()
- * @see #setVersion(FaceletTaglibVersion)
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibPackage#getFaceletTaglib_Version()
- * @model unsettable="true" required="true"
- * extendedMetaData="kind='attribute' name='version'"
- * @generated
- */
- FaceletTaglibVersion getVersion();
-
- /**
- * Sets the value of the '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglib#getVersion <em>Version</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Version</em>' attribute.
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibVersion
- * @see #isSetVersion()
- * @see #unsetVersion()
- * @see #getVersion()
- * @generated
- */
- void setVersion(FaceletTaglibVersion value);
-
- /**
- * Unsets the value of the '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglib#getVersion <em>Version</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #isSetVersion()
- * @see #getVersion()
- * @see #setVersion(FaceletTaglibVersion)
- * @generated
- */
- void unsetVersion();
-
- /**
- * Returns whether the value of the '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglib#getVersion <em>Version</em>}' attribute is set.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return whether the value of the '<em>Version</em>' attribute is set.
- * @see #unsetVersion()
- * @see #getVersion()
- * @see #setVersion(FaceletTaglibVersion)
- * @generated
- */
- boolean isSetVersion();
-
- /**
- * Returns the value of the '<em><b>Namespace Uri</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Namespace Uri</em>' attribute isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @return the value of the '<em>Namespace Uri</em>' attribute.
- * @see #setNamespaceUri(String)
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibPackage#getFaceletTaglib_NamespaceUri()
- * @model dataType="org.eclipse.emf.ecore.xml.type.Token" transient="true" volatile="true"
- * @generated
- */
- String getNamespaceUri();
-
- /**
- * Sets the value of the '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglib#getNamespaceUri <em>Namespace Uri</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Namespace Uri</em>' attribute.
- * @see #getNamespaceUri()
- * @generated
- */
- void setNamespaceUri(String value);
-
-} // FaceletTaglib
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib/FaceletTaglibCanonicalName.java b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib/FaceletTaglibCanonicalName.java
deleted file mode 100644
index 21fabab..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib/FaceletTaglibCanonicalName.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: FaceletTaglibCanonicalName.java,v 1.1 2010/03/18 06:24:29 cbateman Exp $
- */
-package org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Facelet Taglib Canonical Name</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- *
- *
- * Defines the canonical name of a tag or attribute being
- * defined.
- *
- * The name must conform to the lexical rules for an NCName
- *
- *
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- * <li>{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibCanonicalName#getValue <em>Value</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibCanonicalName#getId <em>Id</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibPackage#getFaceletTaglibCanonicalName()
- * @model extendedMetaData="name='facelet-taglib-canonical-nameType' kind='simple'"
- * @generated
- */
-public interface FaceletTaglibCanonicalName extends EObject
-{
- /**
- * Returns the value of the '<em><b>Value</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Value</em>' attribute isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @return the value of the '<em>Value</em>' attribute.
- * @see #setValue(String)
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibPackage#getFaceletTaglibCanonicalName_Value()
- * @model dataType="org.eclipse.emf.ecore.xml.type.NCName"
- * extendedMetaData="name=':0' kind='simple'"
- * @generated
- */
- String getValue();
-
- /**
- * Sets the value of the '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibCanonicalName#getValue <em>Value</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Value</em>' attribute.
- * @see #getValue()
- * @generated
- */
- void setValue(String value);
-
- /**
- * Returns the value of the '<em><b>Id</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Id</em>' attribute isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @return the value of the '<em>Id</em>' attribute.
- * @see #setId(String)
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibPackage#getFaceletTaglibCanonicalName_Id()
- * @model id="true" dataType="org.eclipse.emf.ecore.xml.type.ID"
- * extendedMetaData="kind='attribute' name='id'"
- * @generated
- */
- String getId();
-
- /**
- * Sets the value of the '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibCanonicalName#getId <em>Id</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Id</em>' attribute.
- * @see #getId()
- * @generated
- */
- void setId(String value);
-
-} // FaceletTaglibCanonicalName
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib/FaceletTaglibExtension.java b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib/FaceletTaglibExtension.java
deleted file mode 100644
index 75ab467..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib/FaceletTaglibExtension.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: FaceletTaglibExtension.java,v 1.1 2010/03/18 06:24:29 cbateman Exp $
- */
-package org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.util.FeatureMap;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Facelet Taglib Extension</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- *
- * Extension element for facelet-taglib. It may contain
- * implementation specific content.
- *
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- * <li>{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibExtension#getAny <em>Any</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibExtension#getId <em>Id</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibPackage#getFaceletTaglibExtension()
- * @model extendedMetaData="name='facelet-taglib-extensionType' kind='elementOnly'"
- * @generated
- */
-public interface FaceletTaglibExtension extends EObject
-{
- /**
- * Returns the value of the '<em><b>Any</b></em>' attribute list.
- * The list contents are of type {@link org.eclipse.emf.ecore.util.FeatureMap.Entry}.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Any</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>Any</em>' attribute list.
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibPackage#getFaceletTaglibExtension_Any()
- * @model unique="false" dataType="org.eclipse.emf.ecore.EFeatureMapEntry" many="true"
- * extendedMetaData="kind='elementWildcard' wildcards='##any' name=':0' processing='lax'"
- * @generated
- */
- FeatureMap getAny();
-
- /**
- * Returns the value of the '<em><b>Id</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Id</em>' attribute isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @return the value of the '<em>Id</em>' attribute.
- * @see #setId(String)
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibPackage#getFaceletTaglibExtension_Id()
- * @model id="true" dataType="org.eclipse.emf.ecore.xml.type.ID"
- * extendedMetaData="kind='attribute' name='id'"
- * @generated
- */
- String getId();
-
- /**
- * Sets the value of the '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibExtension#getId <em>Id</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Id</em>' attribute.
- * @see #getId()
- * @generated
- */
- void setId(String value);
-
-} // FaceletTaglibExtension
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib/FaceletTaglibFactory.java b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib/FaceletTaglibFactory.java
deleted file mode 100644
index 97c72da..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib/FaceletTaglibFactory.java
+++ /dev/null
@@ -1,254 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: FaceletTaglibFactory.java,v 1.2 2010/03/18 06:24:28 cbateman Exp $
- */
-package org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib;
-
-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.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibPackage
- * @generated
- */
-public interface FaceletTaglibFactory extends EFactory
-{
- /**
- * The singleton instance of the factory.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- FaceletTaglibFactory eINSTANCE = org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl.FaceletTaglibFactoryImpl.init();
-
- /**
- * Returns a new object of class '<em>Description</em>'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return a new object of class '<em>Description</em>'.
- * @generated
- */
- Description createDescription();
-
- /**
- * Returns a new object of class '<em>Display Name</em>'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return a new object of class '<em>Display Name</em>'.
- * @generated
- */
- DisplayName createDisplayName();
-
- /**
- * Returns a new object of class '<em>Document Root</em>'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return a new object of class '<em>Document Root</em>'.
- * @generated
- */
- DocumentRoot createDocumentRoot();
-
- /**
- * Returns a new object of class '<em>Canonical Name</em>'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return a new object of class '<em>Canonical Name</em>'.
- * @generated
- */
- FaceletTaglibCanonicalName createFaceletTaglibCanonicalName();
-
- /**
- * Returns a new object of class '<em>Extension</em>'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return a new object of class '<em>Extension</em>'.
- * @generated
- */
- FaceletTaglibExtension createFaceletTaglibExtension();
-
- /**
- * Returns a new object of class '<em>Function</em>'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return a new object of class '<em>Function</em>'.
- * @generated
- */
- FaceletTaglibFunction createFaceletTaglibFunction();
-
- /**
- * Returns a new object of class '<em>Tag Attribute</em>'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return a new object of class '<em>Tag Attribute</em>'.
- * @generated
- */
- FaceletTaglibTagAttribute createFaceletTaglibTagAttribute();
-
- /**
- * Returns a new object of class '<em>Tag Behavior Extension</em>'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return a new object of class '<em>Tag Behavior Extension</em>'.
- * @generated
- */
- FaceletTaglibTagBehaviorExtension createFaceletTaglibTagBehaviorExtension();
-
- /**
- * Returns a new object of class '<em>Tag Behavior</em>'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return a new object of class '<em>Tag Behavior</em>'.
- * @generated
- */
- FaceletTaglibTagBehavior createFaceletTaglibTagBehavior();
-
- /**
- * Returns a new object of class '<em>Tag Component Extension</em>'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return a new object of class '<em>Tag Component Extension</em>'.
- * @generated
- */
- FaceletTaglibTagComponentExtension createFaceletTaglibTagComponentExtension();
-
- /**
- * Returns a new object of class '<em>Tag Component</em>'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return a new object of class '<em>Tag Component</em>'.
- * @generated
- */
- FaceletTaglibTagComponent createFaceletTaglibTagComponent();
-
- /**
- * Returns a new object of class '<em>Tag Converter Extension</em>'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return a new object of class '<em>Tag Converter Extension</em>'.
- * @generated
- */
- FaceletTaglibTagConverterExtension createFaceletTaglibTagConverterExtension();
-
- /**
- * Returns a new object of class '<em>Tag Converter</em>'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return a new object of class '<em>Tag Converter</em>'.
- * @generated
- */
- FaceletTaglibTagConverter createFaceletTaglibTagConverter();
-
- /**
- * Returns a new object of class '<em>Tag Extension</em>'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return a new object of class '<em>Tag Extension</em>'.
- * @generated
- */
- FaceletTaglibTagExtension createFaceletTaglibTagExtension();
-
- /**
- * Returns a new object of class '<em>Tag</em>'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return a new object of class '<em>Tag</em>'.
- * @generated
- */
- FaceletTaglibTag createFaceletTaglibTag();
-
- /**
- * Returns a new object of class '<em>Tag Validator Extension</em>'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return a new object of class '<em>Tag Validator Extension</em>'.
- * @generated
- */
- FaceletTaglibTagValidatorExtension createFaceletTaglibTagValidatorExtension();
-
- /**
- * Returns a new object of class '<em>Tag Validator</em>'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return a new object of class '<em>Tag Validator</em>'.
- * @generated
- */
- FaceletTaglibTagValidator createFaceletTaglibTagValidator();
-
- /**
- * Returns a new object of class '<em>Facelet Taglib</em>'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return a new object of class '<em>Facelet Taglib</em>'.
- * @generated
- */
- FaceletTaglib createFaceletTaglib();
-
- /**
- * Returns a new object of class '<em>Fully Qualified Class</em>'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return a new object of class '<em>Fully Qualified Class</em>'.
- * @generated
- */
- FullyQualifiedClass createFullyQualifiedClass();
-
- /**
- * Returns a new object of class '<em>Generic Boolean</em>'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return a new object of class '<em>Generic Boolean</em>'.
- * @generated
- */
- GenericBoolean createGenericBoolean();
-
- /**
- * Returns a new object of class '<em>Icon</em>'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return a new object of class '<em>Icon</em>'.
- * @generated
- */
- Icon createIcon();
-
- /**
- * Returns a new object of class '<em>Java Identifier</em>'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return a new object of class '<em>Java Identifier</em>'.
- * @generated
- */
- JavaIdentifier createJavaIdentifier();
-
- /**
- * Returns a new object of class '<em>Path</em>'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return a new object of class '<em>Path</em>'.
- * @generated
- */
- Path createPath();
-
- /**
- * Returns a new object of class '<em>Identifiable String Value</em>'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return a new object of class '<em>Identifiable String Value</em>'.
- * @generated
- */
- IdentifiableStringValue createIdentifiableStringValue();
-
- /**
- * Returns the package supported by this factory.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the package supported by this factory.
- * @generated
- */
- FaceletTaglibPackage getFaceletTaglibPackage();
-
-} //FaceletTaglibFactory
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib/FaceletTaglibFunction.java b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib/FaceletTaglibFunction.java
deleted file mode 100644
index 51abee1..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib/FaceletTaglibFunction.java
+++ /dev/null
@@ -1,120 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: FaceletTaglibFunction.java,v 1.1 2010/03/18 06:24:29 cbateman Exp $
- */
-package org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Facelet Taglib Function</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- *
- * If the tag library XML file contains individual function
- * declarations rather than pointing to a library-class or a
- * declaring a composite-library name, the individual functions are
- * enclosed in function elements.
- *
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- * <li>{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibFunction#getFunctionName <em>Function Name</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibFunction#getFunctionClass <em>Function Class</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibFunction#getFunctionSignature <em>Function Signature</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibPackage#getFaceletTaglibFunction()
- * @model extendedMetaData="name='facelet-taglib-functionType' kind='elementOnly'"
- * @generated
- */
-public interface FaceletTaglibFunction extends UserVisibleTaglibObject
-{
- /**
- * Returns the value of the '<em><b>Function Name</b></em>' containment reference.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Function Name</em>' containment reference isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @return the value of the '<em>Function Name</em>' containment reference.
- * @see #setFunctionName(IdentifiableStringValue)
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibPackage#getFaceletTaglibFunction_FunctionName()
- * @model containment="true" required="true"
- * extendedMetaData="kind='element' name='function-name' namespace='##targetNamespace'"
- * @generated
- */
- IdentifiableStringValue getFunctionName();
-
- /**
- * Sets the value of the '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibFunction#getFunctionName <em>Function Name</em>}' containment reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Function Name</em>' containment reference.
- * @see #getFunctionName()
- * @generated
- */
- void setFunctionName(IdentifiableStringValue value);
-
- /**
- * Returns the value of the '<em><b>Function Class</b></em>' containment reference.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Function Class</em>' containment reference isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @return the value of the '<em>Function Class</em>' containment reference.
- * @see #setFunctionClass(FullyQualifiedClass)
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibPackage#getFaceletTaglibFunction_FunctionClass()
- * @model containment="true" required="true"
- * extendedMetaData="kind='element' name='function-class' namespace='##targetNamespace'"
- * @generated
- */
- FullyQualifiedClass getFunctionClass();
-
- /**
- * Sets the value of the '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibFunction#getFunctionClass <em>Function Class</em>}' containment reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Function Class</em>' containment reference.
- * @see #getFunctionClass()
- * @generated
- */
- void setFunctionClass(FullyQualifiedClass value);
-
- /**
- * Returns the value of the '<em><b>Function Signature</b></em>' containment reference.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Function Signature</em>' containment reference isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @return the value of the '<em>Function Signature</em>' containment reference.
- * @see #setFunctionSignature(IdentifiableStringValue)
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibPackage#getFaceletTaglibFunction_FunctionSignature()
- * @model containment="true" required="true"
- * extendedMetaData="kind='element' name='function-signature' namespace='##targetNamespace'"
- * @generated
- */
- IdentifiableStringValue getFunctionSignature();
-
- /**
- * Sets the value of the '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibFunction#getFunctionSignature <em>Function Signature</em>}' containment reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Function Signature</em>' containment reference.
- * @see #getFunctionSignature()
- * @generated
- */
- void setFunctionSignature(IdentifiableStringValue value);
-
-} // FaceletTaglibFunction
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib/FaceletTaglibPackage.java b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib/FaceletTaglibPackage.java
deleted file mode 100644
index 2525d4b..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib/FaceletTaglibPackage.java
+++ /dev/null
@@ -1,4018 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: FaceletTaglibPackage.java,v 1.2 2010/03/18 06:24:36 cbateman Exp $
- */
-package org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib;
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EDataType;
-import org.eclipse.emf.ecore.EEnum;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EReference;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Package</b> for the model.
- * It contains accessors for the meta objects to represent
- * <ul>
- * <li>each class,</li>
- * <li>each feature of each class,</li>
- * <li>each enum,</li>
- * <li>and each data type</li>
- * </ul>
- * <!-- end-user-doc -->
- * <!-- begin-model-doc -->
- *
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- *
- * Copyright 2003-2009 Sun Microsystems, Inc. All rights reserved.
- *
- * The contents of this file are subject to the terms of either the
- * GNU General Public License Version 2 only ("GPL") or the Common
- * Development and Distribution License("CDDL") (collectively, the
- * "License"). You may not use this file except in compliance with
- * the License. You can obtain a copy of the License at
- * https://glassfish.dev.java.net/public/CDDL+GPL.html or
- * glassfish/bootstrap/legal/LICENSE.txt. See the License for the
- * specific language governing permissions and limitations under the
- * License.
- *
- * When distributing the software, include this License Header
- * Notice in each file and include the License file at
- * glassfish/bootstrap/legal/LICENSE.txt. Sun designates this
- * particular file as subject to the "Classpath" exception as
- * provided by Sun in the GPL Version 2 section of the License file
- * that accompanied this code. If applicable, add the following
- * below the License Header, with the fields enclosed by brackets []
- * replaced by your own identifying information:
- * "Portions Copyrighted [year] [name of copyright owner]"
- *
- * Contributor(s):
- *
- * If you wish your version of this file to be governed by only the
- * CDDL or only the GPL Version 2, indicate your decision by adding
- * "[Contributor] elects to include this software in this
- * distribution under the [CDDL or GPL Version 2] license." If you
- * don't indicate a single choice of license, a recipient has the
- * option to distribute your version of this file under either the
- * CDDL, the GPL Version 2 or to extend the choice of license to its
- * licensees as provided above. However, if you add GPL Version 2
- * code and therefore, elected the GPL Version 2 license, then the
- * option applies only if the new code is made subject to such
- * option by the copyright holder.
- *
- *
- *
- *
- * <![CDATA[
- *
- * The XML Schema for the Tag Libraries in the JavaServer Faces
- * Standard Facelets View Declaration Language (Facelets VDL)
- * (Version 2.0).
- *
- * JSF 2.0 Facelet Tag Libraries that wish to conform to this
- * schema must declare it in the following manner.
- *
- * <facelet-taglib xmlns="http://java.sun.com/xml/ns/javaee"
- * xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- * xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facelettaglibary_2_0.xsd"
- * version="2.0">
- *
- * ...
- *
- * </facelet-taglib>
- *
- * The instance documents may indicate the published
- * version of the schema using xsi:schemaLocation attribute
- * for javaee namespace with the following location:
- *
- * http://java.sun.com/xml/ns/javaee/web-facelettaglibary_2_0.xsd
- *
- * ]]>
- *
- *
- *
- *
- *
- *
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- *
- * Copyright 2003-2009 Sun Microsystems, Inc. All rights reserved.
- *
- * The contents of this file are subject to the terms of either the
- * GNU General Public License Version 2 only ("GPL") or the Common
- * Development and Distribution License("CDDL") (collectively, the
- * "License"). You may not use this file except in compliance with
- * the License. You can obtain a copy of the License at
- * https://glassfish.dev.java.net/public/CDDL+GPL.html or
- * glassfish/bootstrap/legal/LICENSE.txt. See the License for the
- * specific language governing permissions and limitations under the
- * License.
- *
- * When distributing the software, include this License Header
- * Notice in each file and include the License file at
- * glassfish/bootstrap/legal/LICENSE.txt. Sun designates this
- * particular file as subject to the "Classpath" exception as
- * provided by Sun in the GPL Version 2 section of the License file
- * that accompanied this code. If applicable, add the following
- * below the License Header, with the fields enclosed by brackets []
- * replaced by your own identifying information:
- * "Portions Copyrighted [year] [name of copyright owner]"
- *
- * Contributor(s):
- *
- * If you wish your version of this file to be governed by only the
- * CDDL or only the GPL Version 2, indicate your decision by adding
- * "[Contributor] elects to include this software in this
- * distribution under the [CDDL or GPL Version 2] license." If you
- * don't indicate a single choice of license, a recipient has the
- * option to distribute your version of this file under either the
- * CDDL, the GPL Version 2 or to extend the choice of license to its
- * licensees as provided above. However, if you add GPL Version 2
- * code and therefore, elected the GPL Version 2 license, then the
- * option applies only if the new code is made subject to such
- * option by the copyright holder.
- *
- *
- *
- *
- * The following definitions that appear in the common
- * shareable schema(s) of J2EE deployment descriptors should be
- * interpreted with respect to the context they are included:
- *
- * Deployment Component may indicate one of the following:
- * j2ee application;
- * application client;
- * web application;
- * enterprise bean;
- * resource adapter;
- *
- * Deployment File may indicate one of the following:
- * ear file;
- * war file;
- * jar file;
- * rar file;
- *
- *
- *
- * <div xmlns="http://www.w3.org/1999/xhtml">
- * <h1>About the XML namespace</h1>
- *
- * <div class="bodytext">
- * <p>
- * This schema document describes the XML namespace, in a form
- * suitable for import by other schema documents.
- * </p>
- * <p>
- * See <a href="http://www.w3.org/XML/1998/namespace.html">
- * http://www.w3.org/XML/1998/namespace.html</a> and
- * <a href="http://www.w3.org/TR/REC-xml">
- * http://www.w3.org/TR/REC-xml</a> for information
- * about this namespace.
- * </p>
- * <p>
- * Note that local names in this namespace are intended to be
- * defined only by the World Wide Web Consortium or its subgroups.
- * The names currently defined in this namespace are listed below.
- * They should not be used with conflicting semantics by any Working
- * Group, specification, or document instance.
- * </p>
- * <p>
- * See further below in this document for more information about <a href="#usage">how to refer to this schema document from your own
- * XSD schema documents</a> and about <a href="#nsversioning">the
- * namespace-versioning policy governing this schema document</a>.
- * </p>
- * </div>
- * </div>
- *
- *
- * <div xmlns="http://www.w3.org/1999/xhtml">
- *
- * <h3>Father (in any context at all)</h3>
- *
- * <div class="bodytext">
- * <p>
- * denotes Jon Bosak, the chair of
- * the original XML Working Group. This name is reserved by
- * the following decision of the W3C XML Plenary and
- * XML Coordination groups:
- * </p>
- * <blockquote>
- * <p>
- * In appreciation for his vision, leadership and
- * dedication the W3C XML Plenary on this 10th day of
- * February, 2000, reserves for Jon Bosak in perpetuity
- * the XML name "xml:Father".
- * </p>
- * </blockquote>
- * </div>
- * </div>
- *
- *
- * <div id="usage" xml:id="usage" xmlns="http://www.w3.org/1999/xhtml">
- * <h2>
- * <a name="usage">About this schema document</a>
- * </h2>
- *
- * <div class="bodytext">
- * <p>
- * This schema defines attributes and an attribute group suitable
- * for use by schemas wishing to allow <code>xml:base</code>,
- * <code>xml:lang</code>, <code>xml:space</code> or
- * <code>xml:id</code> attributes on elements they define.
- * </p>
- * <p>
- * To enable this, such a schema must import this schema for
- * the XML namespace, e.g. as follows:
- * </p>
- * <pre>
- * <schema . . .>
- * . . .
- * <import namespace="http://www.w3.org/XML/1998/namespace"
- * schemaLocation="http://www.w3.org/2001/xml.xsd"/>
- * </pre>
- * <p>
- * or
- * </p>
- * <pre>
- * <import namespace="http://www.w3.org/XML/1998/namespace"
- * schemaLocation="http://www.w3.org/2009/01/xml.xsd"/>
- * </pre>
- * <p>
- * Subsequently, qualified reference to any of the attributes or the
- * group defined below will have the desired effect, e.g.
- * </p>
- * <pre>
- * <type . . .>
- * . . .
- * <attributeGroup ref="xml:specialAttrs"/>
- * </pre>
- * <p>
- * will define a type which will schema-validate an instance element
- * with any of those attributes.
- * </p>
- * </div>
- * </div>
- *
- *
- * <div id="nsversioning" xml:id="nsversioning" xmlns="http://www.w3.org/1999/xhtml">
- * <h2>
- * <a name="nsversioning">Versioning policy for this schema document</a>
- * </h2>
- * <div class="bodytext">
- * <p>
- * In keeping with the XML Schema WG's standard versioning
- * policy, this schema document will persist at
- * <a href="http://www.w3.org/2009/01/xml.xsd">
- * http://www.w3.org/2009/01/xml.xsd</a>.
- * </p>
- * <p>
- * At the date of issue it can also be found at
- * <a href="http://www.w3.org/2001/xml.xsd">
- * http://www.w3.org/2001/xml.xsd</a>.
- * </p>
- * <p>
- * The schema document at that URI may however change in the future,
- * in order to remain compatible with the latest version of XML
- * Schema itself, or with the XML namespace itself. In other words,
- * if the XML Schema or XML namespaces change, the version of this
- * document at <a href="http://www.w3.org/2001/xml.xsd">
- * http://www.w3.org/2001/xml.xsd
- * </a>
- * will change accordingly; the version at
- * <a href="http://www.w3.org/2009/01/xml.xsd">
- * http://www.w3.org/2009/01/xml.xsd
- * </a>
- * will not change.
- * </p>
- * <p>
- * Previous dated (and unchanging) versions of this schema
- * document are at:
- * </p>
- * <ul>
- * <li>
- * <a href="http://www.w3.org/2009/01/xml.xsd">
- * http://www.w3.org/2009/01/xml.xsd</a>
- * </li>
- * <li>
- * <a href="http://www.w3.org/2007/08/xml.xsd">
- * http://www.w3.org/2007/08/xml.xsd</a>
- * </li>
- * <li>
- * <a href="http://www.w3.org/2004/10/xml.xsd">
- * http://www.w3.org/2004/10/xml.xsd</a>
- * </li>
- * <li>
- * <a href="http://www.w3.org/2001/03/xml.xsd">
- * http://www.w3.org/2001/03/xml.xsd</a>
- * </li>
- * </ul>
- * </div>
- * </div>
- *
- * <!-- end-model-doc -->
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibFactory
- * @model kind="package"
- * @generated
- */
-public interface FaceletTaglibPackage extends EPackage
-{
- /**
- * The package name.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- String eNAME = "faceletTaglib"; //$NON-NLS-1$
-
- /**
- * The package namespace URI.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- String eNS_URI = "http://java.sun.com/xml/ns/javaee/web-facelettaglibrary_2_0"; //$NON-NLS-1$
-
- /**
- * The package namespace name.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- String eNS_PREFIX = "faceletTaglib"; //$NON-NLS-1$
-
- /**
- * The singleton instance of the package.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- FaceletTaglibPackage eINSTANCE = org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl.FaceletTaglibPackageImpl.init();
-
- /**
- * The meta object id for the '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl.IdentifiableStringValueImpl <em>Identifiable String Value</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl.IdentifiableStringValueImpl
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl.FaceletTaglibPackageImpl#getIdentifiableStringValue()
- * @generated
- */
- int IDENTIFIABLE_STRING_VALUE = 23;
-
- /**
- * The feature id for the '<em><b>Value</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int IDENTIFIABLE_STRING_VALUE__VALUE = 0;
-
- /**
- * The feature id for the '<em><b>Id</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int IDENTIFIABLE_STRING_VALUE__ID = 1;
-
- /**
- * The number of structural features of the '<em>Identifiable String Value</em>' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int IDENTIFIABLE_STRING_VALUE_FEATURE_COUNT = 2;
-
- /**
- * The meta object id for the '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl.IdentifiableLangStringValueImpl <em>Identifiable Lang String Value</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl.IdentifiableLangStringValueImpl
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl.FaceletTaglibPackageImpl#getIdentifiableLangStringValue()
- * @generated
- */
- int IDENTIFIABLE_LANG_STRING_VALUE = 24;
-
- /**
- * The feature id for the '<em><b>Value</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int IDENTIFIABLE_LANG_STRING_VALUE__VALUE = IDENTIFIABLE_STRING_VALUE__VALUE;
-
- /**
- * The feature id for the '<em><b>Id</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int IDENTIFIABLE_LANG_STRING_VALUE__ID = IDENTIFIABLE_STRING_VALUE__ID;
-
- /**
- * The feature id for the '<em><b>Lang</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int IDENTIFIABLE_LANG_STRING_VALUE__LANG = IDENTIFIABLE_STRING_VALUE_FEATURE_COUNT + 0;
-
- /**
- * The number of structural features of the '<em>Identifiable Lang String Value</em>' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int IDENTIFIABLE_LANG_STRING_VALUE_FEATURE_COUNT = IDENTIFIABLE_STRING_VALUE_FEATURE_COUNT + 1;
-
- /**
- * The meta object id for the '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl.DescriptionImpl <em>Description</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl.DescriptionImpl
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl.FaceletTaglibPackageImpl#getDescription()
- * @generated
- */
- int DESCRIPTION = 0;
-
- /**
- * The feature id for the '<em><b>Value</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int DESCRIPTION__VALUE = IDENTIFIABLE_LANG_STRING_VALUE__VALUE;
-
- /**
- * The feature id for the '<em><b>Id</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int DESCRIPTION__ID = IDENTIFIABLE_LANG_STRING_VALUE__ID;
-
- /**
- * The feature id for the '<em><b>Lang</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int DESCRIPTION__LANG = IDENTIFIABLE_LANG_STRING_VALUE__LANG;
-
- /**
- * The number of structural features of the '<em>Description</em>' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int DESCRIPTION_FEATURE_COUNT = IDENTIFIABLE_LANG_STRING_VALUE_FEATURE_COUNT + 0;
-
- /**
- * The meta object id for the '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl.DisplayNameImpl <em>Display Name</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl.DisplayNameImpl
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl.FaceletTaglibPackageImpl#getDisplayName()
- * @generated
- */
- int DISPLAY_NAME = 1;
-
- /**
- * The feature id for the '<em><b>Value</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int DISPLAY_NAME__VALUE = IDENTIFIABLE_LANG_STRING_VALUE__VALUE;
-
- /**
- * The feature id for the '<em><b>Id</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int DISPLAY_NAME__ID = IDENTIFIABLE_LANG_STRING_VALUE__ID;
-
- /**
- * The feature id for the '<em><b>Lang</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int DISPLAY_NAME__LANG = IDENTIFIABLE_LANG_STRING_VALUE__LANG;
-
- /**
- * The number of structural features of the '<em>Display Name</em>' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int DISPLAY_NAME_FEATURE_COUNT = IDENTIFIABLE_LANG_STRING_VALUE_FEATURE_COUNT + 0;
-
- /**
- * The meta object id for the '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl.DocumentRootImpl <em>Document Root</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl.DocumentRootImpl
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl.FaceletTaglibPackageImpl#getDocumentRoot()
- * @generated
- */
- int DOCUMENT_ROOT = 2;
-
- /**
- * The feature id for the '<em><b>Mixed</b></em>' attribute list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int DOCUMENT_ROOT__MIXED = 0;
-
- /**
- * The feature id for the '<em><b>XMLNS Prefix Map</b></em>' map.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int DOCUMENT_ROOT__XMLNS_PREFIX_MAP = 1;
-
- /**
- * The feature id for the '<em><b>XSI Schema Location</b></em>' map.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int DOCUMENT_ROOT__XSI_SCHEMA_LOCATION = 2;
-
- /**
- * The feature id for the '<em><b>Facelet Taglib</b></em>' containment reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int DOCUMENT_ROOT__FACELET_TAGLIB = 3;
-
- /**
- * The number of structural features of the '<em>Document Root</em>' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int DOCUMENT_ROOT_FEATURE_COUNT = 4;
-
- /**
- * The meta object id for the '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl.FaceletTaglibCanonicalNameImpl <em>Canonical Name</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl.FaceletTaglibCanonicalNameImpl
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl.FaceletTaglibPackageImpl#getFaceletTaglibCanonicalName()
- * @generated
- */
- int FACELET_TAGLIB_CANONICAL_NAME = 3;
-
- /**
- * The feature id for the '<em><b>Value</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int FACELET_TAGLIB_CANONICAL_NAME__VALUE = 0;
-
- /**
- * The feature id for the '<em><b>Id</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int FACELET_TAGLIB_CANONICAL_NAME__ID = 1;
-
- /**
- * The number of structural features of the '<em>Canonical Name</em>' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int FACELET_TAGLIB_CANONICAL_NAME_FEATURE_COUNT = 2;
-
- /**
- * The meta object id for the '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl.FaceletTaglibExtensionImpl <em>Extension</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl.FaceletTaglibExtensionImpl
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl.FaceletTaglibPackageImpl#getFaceletTaglibExtension()
- * @generated
- */
- int FACELET_TAGLIB_EXTENSION = 4;
-
- /**
- * The feature id for the '<em><b>Any</b></em>' attribute list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int FACELET_TAGLIB_EXTENSION__ANY = 0;
-
- /**
- * The feature id for the '<em><b>Id</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int FACELET_TAGLIB_EXTENSION__ID = 1;
-
- /**
- * The number of structural features of the '<em>Extension</em>' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int FACELET_TAGLIB_EXTENSION_FEATURE_COUNT = 2;
-
- /**
- * The meta object id for the '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl.UserVisibleTaglibObjectImpl <em>User Visible Taglib Object</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl.UserVisibleTaglibObjectImpl
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl.FaceletTaglibPackageImpl#getUserVisibleTaglibObject()
- * @generated
- */
- int USER_VISIBLE_TAGLIB_OBJECT = 25;
-
- /**
- * The feature id for the '<em><b>Description</b></em>' containment reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int USER_VISIBLE_TAGLIB_OBJECT__DESCRIPTION = 0;
-
- /**
- * The feature id for the '<em><b>Display Name</b></em>' containment reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int USER_VISIBLE_TAGLIB_OBJECT__DISPLAY_NAME = 1;
-
- /**
- * The feature id for the '<em><b>Icon</b></em>' containment reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int USER_VISIBLE_TAGLIB_OBJECT__ICON = 2;
-
- /**
- * The number of structural features of the '<em>User Visible Taglib Object</em>' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int USER_VISIBLE_TAGLIB_OBJECT_FEATURE_COUNT = 3;
-
- /**
- * The meta object id for the '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl.FaceletTaglibFunctionImpl <em>Function</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl.FaceletTaglibFunctionImpl
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl.FaceletTaglibPackageImpl#getFaceletTaglibFunction()
- * @generated
- */
- int FACELET_TAGLIB_FUNCTION = 5;
-
- /**
- * The feature id for the '<em><b>Description</b></em>' containment reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int FACELET_TAGLIB_FUNCTION__DESCRIPTION = USER_VISIBLE_TAGLIB_OBJECT__DESCRIPTION;
-
- /**
- * The feature id for the '<em><b>Display Name</b></em>' containment reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int FACELET_TAGLIB_FUNCTION__DISPLAY_NAME = USER_VISIBLE_TAGLIB_OBJECT__DISPLAY_NAME;
-
- /**
- * The feature id for the '<em><b>Icon</b></em>' containment reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int FACELET_TAGLIB_FUNCTION__ICON = USER_VISIBLE_TAGLIB_OBJECT__ICON;
-
- /**
- * The feature id for the '<em><b>Function Name</b></em>' containment reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int FACELET_TAGLIB_FUNCTION__FUNCTION_NAME = USER_VISIBLE_TAGLIB_OBJECT_FEATURE_COUNT + 0;
-
- /**
- * The feature id for the '<em><b>Function Class</b></em>' containment reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int FACELET_TAGLIB_FUNCTION__FUNCTION_CLASS = USER_VISIBLE_TAGLIB_OBJECT_FEATURE_COUNT + 1;
-
- /**
- * The feature id for the '<em><b>Function Signature</b></em>' containment reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int FACELET_TAGLIB_FUNCTION__FUNCTION_SIGNATURE = USER_VISIBLE_TAGLIB_OBJECT_FEATURE_COUNT + 2;
-
- /**
- * The number of structural features of the '<em>Function</em>' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int FACELET_TAGLIB_FUNCTION_FEATURE_COUNT = USER_VISIBLE_TAGLIB_OBJECT_FEATURE_COUNT + 3;
-
- /**
- * The meta object id for the '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl.FaceletTaglibTagAttributeImpl <em>Tag Attribute</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl.FaceletTaglibTagAttributeImpl
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl.FaceletTaglibPackageImpl#getFaceletTaglibTagAttribute()
- * @generated
- */
- int FACELET_TAGLIB_TAG_ATTRIBUTE = 6;
-
- /**
- * The feature id for the '<em><b>Description</b></em>' containment reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int FACELET_TAGLIB_TAG_ATTRIBUTE__DESCRIPTION = USER_VISIBLE_TAGLIB_OBJECT__DESCRIPTION;
-
- /**
- * The feature id for the '<em><b>Display Name</b></em>' containment reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int FACELET_TAGLIB_TAG_ATTRIBUTE__DISPLAY_NAME = USER_VISIBLE_TAGLIB_OBJECT__DISPLAY_NAME;
-
- /**
- * The feature id for the '<em><b>Icon</b></em>' containment reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int FACELET_TAGLIB_TAG_ATTRIBUTE__ICON = USER_VISIBLE_TAGLIB_OBJECT__ICON;
-
- /**
- * The feature id for the '<em><b>Name Element</b></em>' containment reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int FACELET_TAGLIB_TAG_ATTRIBUTE__NAME_ELEMENT = USER_VISIBLE_TAGLIB_OBJECT_FEATURE_COUNT + 0;
-
- /**
- * The feature id for the '<em><b>Required Element</b></em>' containment reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int FACELET_TAGLIB_TAG_ATTRIBUTE__REQUIRED_ELEMENT = USER_VISIBLE_TAGLIB_OBJECT_FEATURE_COUNT + 1;
-
- /**
- * The feature id for the '<em><b>Type Element</b></em>' containment reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int FACELET_TAGLIB_TAG_ATTRIBUTE__TYPE_ELEMENT = USER_VISIBLE_TAGLIB_OBJECT_FEATURE_COUNT + 2;
-
- /**
- * The feature id for the '<em><b>Method Signature Element</b></em>' containment reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int FACELET_TAGLIB_TAG_ATTRIBUTE__METHOD_SIGNATURE_ELEMENT = USER_VISIBLE_TAGLIB_OBJECT_FEATURE_COUNT + 3;
-
- /**
- * The feature id for the '<em><b>Id</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int FACELET_TAGLIB_TAG_ATTRIBUTE__ID = USER_VISIBLE_TAGLIB_OBJECT_FEATURE_COUNT + 4;
-
- /**
- * The feature id for the '<em><b>Name</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int FACELET_TAGLIB_TAG_ATTRIBUTE__NAME = USER_VISIBLE_TAGLIB_OBJECT_FEATURE_COUNT + 5;
-
- /**
- * The feature id for the '<em><b>Required</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int FACELET_TAGLIB_TAG_ATTRIBUTE__REQUIRED = USER_VISIBLE_TAGLIB_OBJECT_FEATURE_COUNT + 6;
-
- /**
- * The feature id for the '<em><b>Type</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int FACELET_TAGLIB_TAG_ATTRIBUTE__TYPE = USER_VISIBLE_TAGLIB_OBJECT_FEATURE_COUNT + 7;
-
- /**
- * The feature id for the '<em><b>Method Signature</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int FACELET_TAGLIB_TAG_ATTRIBUTE__METHOD_SIGNATURE = USER_VISIBLE_TAGLIB_OBJECT_FEATURE_COUNT + 8;
-
- /**
- * The number of structural features of the '<em>Tag Attribute</em>' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int FACELET_TAGLIB_TAG_ATTRIBUTE_FEATURE_COUNT = USER_VISIBLE_TAGLIB_OBJECT_FEATURE_COUNT + 9;
-
- /**
- * The meta object id for the '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl.FaceletTaglibTagBehaviorExtensionImpl <em>Tag Behavior Extension</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl.FaceletTaglibTagBehaviorExtensionImpl
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl.FaceletTaglibPackageImpl#getFaceletTaglibTagBehaviorExtension()
- * @generated
- */
- int FACELET_TAGLIB_TAG_BEHAVIOR_EXTENSION = 7;
-
- /**
- * The feature id for the '<em><b>Any</b></em>' attribute list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int FACELET_TAGLIB_TAG_BEHAVIOR_EXTENSION__ANY = 0;
-
- /**
- * The feature id for the '<em><b>Id</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int FACELET_TAGLIB_TAG_BEHAVIOR_EXTENSION__ID = 1;
-
- /**
- * The number of structural features of the '<em>Tag Behavior Extension</em>' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int FACELET_TAGLIB_TAG_BEHAVIOR_EXTENSION_FEATURE_COUNT = 2;
-
- /**
- * The meta object id for the '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl.FaceletTaglibTagBehaviorImpl <em>Tag Behavior</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl.FaceletTaglibTagBehaviorImpl
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl.FaceletTaglibPackageImpl#getFaceletTaglibTagBehavior()
- * @generated
- */
- int FACELET_TAGLIB_TAG_BEHAVIOR = 8;
-
- /**
- * The feature id for the '<em><b>Description</b></em>' containment reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int FACELET_TAGLIB_TAG_BEHAVIOR__DESCRIPTION = USER_VISIBLE_TAGLIB_OBJECT__DESCRIPTION;
-
- /**
- * The feature id for the '<em><b>Display Name</b></em>' containment reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int FACELET_TAGLIB_TAG_BEHAVIOR__DISPLAY_NAME = USER_VISIBLE_TAGLIB_OBJECT__DISPLAY_NAME;
-
- /**
- * The feature id for the '<em><b>Icon</b></em>' containment reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int FACELET_TAGLIB_TAG_BEHAVIOR__ICON = USER_VISIBLE_TAGLIB_OBJECT__ICON;
-
- /**
- * The feature id for the '<em><b>Behavior Id</b></em>' containment reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int FACELET_TAGLIB_TAG_BEHAVIOR__BEHAVIOR_ID = USER_VISIBLE_TAGLIB_OBJECT_FEATURE_COUNT + 0;
-
- /**
- * The feature id for the '<em><b>Handler Class</b></em>' containment reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int FACELET_TAGLIB_TAG_BEHAVIOR__HANDLER_CLASS = USER_VISIBLE_TAGLIB_OBJECT_FEATURE_COUNT + 1;
-
- /**
- * The feature id for the '<em><b>Behavior Extension</b></em>' containment reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int FACELET_TAGLIB_TAG_BEHAVIOR__BEHAVIOR_EXTENSION = USER_VISIBLE_TAGLIB_OBJECT_FEATURE_COUNT + 2;
-
- /**
- * The number of structural features of the '<em>Tag Behavior</em>' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int FACELET_TAGLIB_TAG_BEHAVIOR_FEATURE_COUNT = USER_VISIBLE_TAGLIB_OBJECT_FEATURE_COUNT + 3;
-
- /**
- * The meta object id for the '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl.FaceletTaglibTagComponentExtensionImpl <em>Tag Component Extension</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl.FaceletTaglibTagComponentExtensionImpl
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl.FaceletTaglibPackageImpl#getFaceletTaglibTagComponentExtension()
- * @generated
- */
- int FACELET_TAGLIB_TAG_COMPONENT_EXTENSION = 9;
-
- /**
- * The feature id for the '<em><b>Any</b></em>' attribute list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int FACELET_TAGLIB_TAG_COMPONENT_EXTENSION__ANY = 0;
-
- /**
- * The feature id for the '<em><b>Id</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int FACELET_TAGLIB_TAG_COMPONENT_EXTENSION__ID = 1;
-
- /**
- * The number of structural features of the '<em>Tag Component Extension</em>' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int FACELET_TAGLIB_TAG_COMPONENT_EXTENSION_FEATURE_COUNT = 2;
-
- /**
- * The meta object id for the '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl.FaceletTaglibTagComponentImpl <em>Tag Component</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl.FaceletTaglibTagComponentImpl
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl.FaceletTaglibPackageImpl#getFaceletTaglibTagComponent()
- * @generated
- */
- int FACELET_TAGLIB_TAG_COMPONENT = 10;
-
- /**
- * The feature id for the '<em><b>Description</b></em>' containment reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int FACELET_TAGLIB_TAG_COMPONENT__DESCRIPTION = USER_VISIBLE_TAGLIB_OBJECT__DESCRIPTION;
-
- /**
- * The feature id for the '<em><b>Display Name</b></em>' containment reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int FACELET_TAGLIB_TAG_COMPONENT__DISPLAY_NAME = USER_VISIBLE_TAGLIB_OBJECT__DISPLAY_NAME;
-
- /**
- * The feature id for the '<em><b>Icon</b></em>' containment reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int FACELET_TAGLIB_TAG_COMPONENT__ICON = USER_VISIBLE_TAGLIB_OBJECT__ICON;
-
- /**
- * The feature id for the '<em><b>Component Type</b></em>' containment reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int FACELET_TAGLIB_TAG_COMPONENT__COMPONENT_TYPE = USER_VISIBLE_TAGLIB_OBJECT_FEATURE_COUNT + 0;
-
- /**
- * The feature id for the '<em><b>Renderer Type</b></em>' containment reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int FACELET_TAGLIB_TAG_COMPONENT__RENDERER_TYPE = USER_VISIBLE_TAGLIB_OBJECT_FEATURE_COUNT + 1;
-
- /**
- * The feature id for the '<em><b>Handler Class</b></em>' containment reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int FACELET_TAGLIB_TAG_COMPONENT__HANDLER_CLASS = USER_VISIBLE_TAGLIB_OBJECT_FEATURE_COUNT + 2;
-
- /**
- * The feature id for the '<em><b>Component Extension</b></em>' containment reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int FACELET_TAGLIB_TAG_COMPONENT__COMPONENT_EXTENSION = USER_VISIBLE_TAGLIB_OBJECT_FEATURE_COUNT + 3;
-
- /**
- * The number of structural features of the '<em>Tag Component</em>' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int FACELET_TAGLIB_TAG_COMPONENT_FEATURE_COUNT = USER_VISIBLE_TAGLIB_OBJECT_FEATURE_COUNT + 4;
-
- /**
- * The meta object id for the '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl.FaceletTaglibTagConverterExtensionImpl <em>Tag Converter Extension</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl.FaceletTaglibTagConverterExtensionImpl
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl.FaceletTaglibPackageImpl#getFaceletTaglibTagConverterExtension()
- * @generated
- */
- int FACELET_TAGLIB_TAG_CONVERTER_EXTENSION = 11;
-
- /**
- * The feature id for the '<em><b>Any</b></em>' attribute list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int FACELET_TAGLIB_TAG_CONVERTER_EXTENSION__ANY = 0;
-
- /**
- * The feature id for the '<em><b>Id</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int FACELET_TAGLIB_TAG_CONVERTER_EXTENSION__ID = 1;
-
- /**
- * The number of structural features of the '<em>Tag Converter Extension</em>' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int FACELET_TAGLIB_TAG_CONVERTER_EXTENSION_FEATURE_COUNT = 2;
-
- /**
- * The meta object id for the '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl.FaceletTaglibTagConverterImpl <em>Tag Converter</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl.FaceletTaglibTagConverterImpl
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl.FaceletTaglibPackageImpl#getFaceletTaglibTagConverter()
- * @generated
- */
- int FACELET_TAGLIB_TAG_CONVERTER = 12;
-
- /**
- * The feature id for the '<em><b>Description</b></em>' containment reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int FACELET_TAGLIB_TAG_CONVERTER__DESCRIPTION = USER_VISIBLE_TAGLIB_OBJECT__DESCRIPTION;
-
- /**
- * The feature id for the '<em><b>Display Name</b></em>' containment reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int FACELET_TAGLIB_TAG_CONVERTER__DISPLAY_NAME = USER_VISIBLE_TAGLIB_OBJECT__DISPLAY_NAME;
-
- /**
- * The feature id for the '<em><b>Icon</b></em>' containment reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int FACELET_TAGLIB_TAG_CONVERTER__ICON = USER_VISIBLE_TAGLIB_OBJECT__ICON;
-
- /**
- * The feature id for the '<em><b>Converter Id</b></em>' containment reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int FACELET_TAGLIB_TAG_CONVERTER__CONVERTER_ID = USER_VISIBLE_TAGLIB_OBJECT_FEATURE_COUNT + 0;
-
- /**
- * The feature id for the '<em><b>Handler Class</b></em>' containment reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int FACELET_TAGLIB_TAG_CONVERTER__HANDLER_CLASS = USER_VISIBLE_TAGLIB_OBJECT_FEATURE_COUNT + 1;
-
- /**
- * The feature id for the '<em><b>Converter Extension</b></em>' containment reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int FACELET_TAGLIB_TAG_CONVERTER__CONVERTER_EXTENSION = USER_VISIBLE_TAGLIB_OBJECT_FEATURE_COUNT + 2;
-
- /**
- * The number of structural features of the '<em>Tag Converter</em>' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int FACELET_TAGLIB_TAG_CONVERTER_FEATURE_COUNT = USER_VISIBLE_TAGLIB_OBJECT_FEATURE_COUNT + 3;
-
- /**
- * The meta object id for the '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl.FaceletTaglibTagExtensionImpl <em>Tag Extension</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl.FaceletTaglibTagExtensionImpl
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl.FaceletTaglibPackageImpl#getFaceletTaglibTagExtension()
- * @generated
- */
- int FACELET_TAGLIB_TAG_EXTENSION = 13;
-
- /**
- * The feature id for the '<em><b>Any</b></em>' attribute list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int FACELET_TAGLIB_TAG_EXTENSION__ANY = 0;
-
- /**
- * The feature id for the '<em><b>Id</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int FACELET_TAGLIB_TAG_EXTENSION__ID = 1;
-
- /**
- * The number of structural features of the '<em>Tag Extension</em>' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int FACELET_TAGLIB_TAG_EXTENSION_FEATURE_COUNT = 2;
-
- /**
- * The meta object id for the '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl.FaceletTaglibTagImpl <em>Tag</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl.FaceletTaglibTagImpl
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl.FaceletTaglibPackageImpl#getFaceletTaglibTag()
- * @generated
- */
- int FACELET_TAGLIB_TAG = 14;
-
- /**
- * The feature id for the '<em><b>Description</b></em>' containment reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int FACELET_TAGLIB_TAG__DESCRIPTION = USER_VISIBLE_TAGLIB_OBJECT__DESCRIPTION;
-
- /**
- * The feature id for the '<em><b>Display Name</b></em>' containment reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int FACELET_TAGLIB_TAG__DISPLAY_NAME = USER_VISIBLE_TAGLIB_OBJECT__DISPLAY_NAME;
-
- /**
- * The feature id for the '<em><b>Icon</b></em>' containment reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int FACELET_TAGLIB_TAG__ICON = USER_VISIBLE_TAGLIB_OBJECT__ICON;
-
- /**
- * The feature id for the '<em><b>Tag Name Element</b></em>' containment reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int FACELET_TAGLIB_TAG__TAG_NAME_ELEMENT = USER_VISIBLE_TAGLIB_OBJECT_FEATURE_COUNT + 0;
-
- /**
- * The feature id for the '<em><b>Handler Class Element</b></em>' containment reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int FACELET_TAGLIB_TAG__HANDLER_CLASS_ELEMENT = USER_VISIBLE_TAGLIB_OBJECT_FEATURE_COUNT + 1;
-
- /**
- * The feature id for the '<em><b>Behavior</b></em>' containment reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int FACELET_TAGLIB_TAG__BEHAVIOR = USER_VISIBLE_TAGLIB_OBJECT_FEATURE_COUNT + 2;
-
- /**
- * The feature id for the '<em><b>Component</b></em>' containment reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int FACELET_TAGLIB_TAG__COMPONENT = USER_VISIBLE_TAGLIB_OBJECT_FEATURE_COUNT + 3;
-
- /**
- * The feature id for the '<em><b>Converter</b></em>' containment reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int FACELET_TAGLIB_TAG__CONVERTER = USER_VISIBLE_TAGLIB_OBJECT_FEATURE_COUNT + 4;
-
- /**
- * The feature id for the '<em><b>Validator</b></em>' containment reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int FACELET_TAGLIB_TAG__VALIDATOR = USER_VISIBLE_TAGLIB_OBJECT_FEATURE_COUNT + 5;
-
- /**
- * The feature id for the '<em><b>Source</b></em>' containment reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int FACELET_TAGLIB_TAG__SOURCE = USER_VISIBLE_TAGLIB_OBJECT_FEATURE_COUNT + 6;
-
- /**
- * The feature id for the '<em><b>Attribute</b></em>' containment reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int FACELET_TAGLIB_TAG__ATTRIBUTE = USER_VISIBLE_TAGLIB_OBJECT_FEATURE_COUNT + 7;
-
- /**
- * The feature id for the '<em><b>Tag Extension</b></em>' containment reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int FACELET_TAGLIB_TAG__TAG_EXTENSION = USER_VISIBLE_TAGLIB_OBJECT_FEATURE_COUNT + 8;
-
- /**
- * The feature id for the '<em><b>Tag Name</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int FACELET_TAGLIB_TAG__TAG_NAME = USER_VISIBLE_TAGLIB_OBJECT_FEATURE_COUNT + 9;
-
- /**
- * The feature id for the '<em><b>Handler Class</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int FACELET_TAGLIB_TAG__HANDLER_CLASS = USER_VISIBLE_TAGLIB_OBJECT_FEATURE_COUNT + 10;
-
- /**
- * The number of structural features of the '<em>Tag</em>' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int FACELET_TAGLIB_TAG_FEATURE_COUNT = USER_VISIBLE_TAGLIB_OBJECT_FEATURE_COUNT + 11;
-
- /**
- * The meta object id for the '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl.FaceletTaglibTagValidatorExtensionImpl <em>Tag Validator Extension</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl.FaceletTaglibTagValidatorExtensionImpl
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl.FaceletTaglibPackageImpl#getFaceletTaglibTagValidatorExtension()
- * @generated
- */
- int FACELET_TAGLIB_TAG_VALIDATOR_EXTENSION = 15;
-
- /**
- * The feature id for the '<em><b>Any</b></em>' attribute list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int FACELET_TAGLIB_TAG_VALIDATOR_EXTENSION__ANY = 0;
-
- /**
- * The feature id for the '<em><b>Id</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int FACELET_TAGLIB_TAG_VALIDATOR_EXTENSION__ID = 1;
-
- /**
- * The number of structural features of the '<em>Tag Validator Extension</em>' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int FACELET_TAGLIB_TAG_VALIDATOR_EXTENSION_FEATURE_COUNT = 2;
-
- /**
- * The meta object id for the '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl.FaceletTaglibTagValidatorImpl <em>Tag Validator</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl.FaceletTaglibTagValidatorImpl
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl.FaceletTaglibPackageImpl#getFaceletTaglibTagValidator()
- * @generated
- */
- int FACELET_TAGLIB_TAG_VALIDATOR = 16;
-
- /**
- * The feature id for the '<em><b>Description</b></em>' containment reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int FACELET_TAGLIB_TAG_VALIDATOR__DESCRIPTION = USER_VISIBLE_TAGLIB_OBJECT__DESCRIPTION;
-
- /**
- * The feature id for the '<em><b>Display Name</b></em>' containment reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int FACELET_TAGLIB_TAG_VALIDATOR__DISPLAY_NAME = USER_VISIBLE_TAGLIB_OBJECT__DISPLAY_NAME;
-
- /**
- * The feature id for the '<em><b>Icon</b></em>' containment reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int FACELET_TAGLIB_TAG_VALIDATOR__ICON = USER_VISIBLE_TAGLIB_OBJECT__ICON;
-
- /**
- * The feature id for the '<em><b>Validator Id</b></em>' containment reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int FACELET_TAGLIB_TAG_VALIDATOR__VALIDATOR_ID = USER_VISIBLE_TAGLIB_OBJECT_FEATURE_COUNT + 0;
-
- /**
- * The feature id for the '<em><b>Handler Class</b></em>' containment reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int FACELET_TAGLIB_TAG_VALIDATOR__HANDLER_CLASS = USER_VISIBLE_TAGLIB_OBJECT_FEATURE_COUNT + 1;
-
- /**
- * The feature id for the '<em><b>Validator Extension</b></em>' containment reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int FACELET_TAGLIB_TAG_VALIDATOR__VALIDATOR_EXTENSION = USER_VISIBLE_TAGLIB_OBJECT_FEATURE_COUNT + 2;
-
- /**
- * The number of structural features of the '<em>Tag Validator</em>' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int FACELET_TAGLIB_TAG_VALIDATOR_FEATURE_COUNT = USER_VISIBLE_TAGLIB_OBJECT_FEATURE_COUNT + 3;
-
- /**
- * The meta object id for the '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl.FaceletTaglibImpl <em>Facelet Taglib</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl.FaceletTaglibImpl
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl.FaceletTaglibPackageImpl#getFaceletTaglib()
- * @generated
- */
- int FACELET_TAGLIB = 17;
-
- /**
- * The feature id for the '<em><b>Description</b></em>' containment reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int FACELET_TAGLIB__DESCRIPTION = USER_VISIBLE_TAGLIB_OBJECT__DESCRIPTION;
-
- /**
- * The feature id for the '<em><b>Display Name</b></em>' containment reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int FACELET_TAGLIB__DISPLAY_NAME = USER_VISIBLE_TAGLIB_OBJECT__DISPLAY_NAME;
-
- /**
- * The feature id for the '<em><b>Icon</b></em>' containment reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int FACELET_TAGLIB__ICON = USER_VISIBLE_TAGLIB_OBJECT__ICON;
-
- /**
- * The feature id for the '<em><b>Library Class</b></em>' containment reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int FACELET_TAGLIB__LIBRARY_CLASS = USER_VISIBLE_TAGLIB_OBJECT_FEATURE_COUNT + 0;
-
- /**
- * The feature id for the '<em><b>Namespace</b></em>' containment reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int FACELET_TAGLIB__NAMESPACE = USER_VISIBLE_TAGLIB_OBJECT_FEATURE_COUNT + 1;
-
- /**
- * The feature id for the '<em><b>Composite Library Name</b></em>' containment reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int FACELET_TAGLIB__COMPOSITE_LIBRARY_NAME = USER_VISIBLE_TAGLIB_OBJECT_FEATURE_COUNT + 2;
-
- /**
- * The feature id for the '<em><b>Group</b></em>' attribute list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int FACELET_TAGLIB__GROUP = USER_VISIBLE_TAGLIB_OBJECT_FEATURE_COUNT + 3;
-
- /**
- * The feature id for the '<em><b>Tag</b></em>' containment reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int FACELET_TAGLIB__TAG = USER_VISIBLE_TAGLIB_OBJECT_FEATURE_COUNT + 4;
-
- /**
- * The feature id for the '<em><b>Function</b></em>' containment reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int FACELET_TAGLIB__FUNCTION = USER_VISIBLE_TAGLIB_OBJECT_FEATURE_COUNT + 5;
-
- /**
- * The feature id for the '<em><b>Taglib Extension</b></em>' containment reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int FACELET_TAGLIB__TAGLIB_EXTENSION = USER_VISIBLE_TAGLIB_OBJECT_FEATURE_COUNT + 6;
-
- /**
- * The feature id for the '<em><b>Id</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int FACELET_TAGLIB__ID = USER_VISIBLE_TAGLIB_OBJECT_FEATURE_COUNT + 7;
-
- /**
- * The feature id for the '<em><b>Version</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int FACELET_TAGLIB__VERSION = USER_VISIBLE_TAGLIB_OBJECT_FEATURE_COUNT + 8;
-
- /**
- * The feature id for the '<em><b>Namespace Uri</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int FACELET_TAGLIB__NAMESPACE_URI = USER_VISIBLE_TAGLIB_OBJECT_FEATURE_COUNT + 9;
-
- /**
- * The number of structural features of the '<em>Facelet Taglib</em>' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int FACELET_TAGLIB_FEATURE_COUNT = USER_VISIBLE_TAGLIB_OBJECT_FEATURE_COUNT + 10;
-
- /**
- * The meta object id for the '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl.FullyQualifiedClassImpl <em>Fully Qualified Class</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl.FullyQualifiedClassImpl
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl.FaceletTaglibPackageImpl#getFullyQualifiedClass()
- * @generated
- */
- int FULLY_QUALIFIED_CLASS = 18;
-
- /**
- * The feature id for the '<em><b>Value</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int FULLY_QUALIFIED_CLASS__VALUE = IDENTIFIABLE_STRING_VALUE__VALUE;
-
- /**
- * The feature id for the '<em><b>Id</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int FULLY_QUALIFIED_CLASS__ID = IDENTIFIABLE_STRING_VALUE__ID;
-
- /**
- * The number of structural features of the '<em>Fully Qualified Class</em>' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int FULLY_QUALIFIED_CLASS_FEATURE_COUNT = IDENTIFIABLE_STRING_VALUE_FEATURE_COUNT + 0;
-
- /**
- * The meta object id for the '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl.GenericBooleanImpl <em>Generic Boolean</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl.GenericBooleanImpl
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl.FaceletTaglibPackageImpl#getGenericBoolean()
- * @generated
- */
- int GENERIC_BOOLEAN = 19;
-
- /**
- * The feature id for the '<em><b>Value</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int GENERIC_BOOLEAN__VALUE = IDENTIFIABLE_STRING_VALUE__VALUE;
-
- /**
- * The feature id for the '<em><b>Id</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int GENERIC_BOOLEAN__ID = IDENTIFIABLE_STRING_VALUE__ID;
-
- /**
- * The number of structural features of the '<em>Generic Boolean</em>' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int GENERIC_BOOLEAN_FEATURE_COUNT = IDENTIFIABLE_STRING_VALUE_FEATURE_COUNT + 0;
-
- /**
- * The meta object id for the '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl.IconImpl <em>Icon</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl.IconImpl
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl.FaceletTaglibPackageImpl#getIcon()
- * @generated
- */
- int ICON = 20;
-
- /**
- * The feature id for the '<em><b>Small Icon</b></em>' containment reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int ICON__SMALL_ICON = 0;
-
- /**
- * The feature id for the '<em><b>Large Icon</b></em>' containment reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int ICON__LARGE_ICON = 1;
-
- /**
- * The feature id for the '<em><b>Id</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int ICON__ID = 2;
-
- /**
- * The feature id for the '<em><b>Lang</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int ICON__LANG = 3;
-
- /**
- * The number of structural features of the '<em>Icon</em>' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int ICON_FEATURE_COUNT = 4;
-
- /**
- * The meta object id for the '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl.JavaIdentifierImpl <em>Java Identifier</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl.JavaIdentifierImpl
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl.FaceletTaglibPackageImpl#getJavaIdentifier()
- * @generated
- */
- int JAVA_IDENTIFIER = 21;
-
- /**
- * The feature id for the '<em><b>Value</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int JAVA_IDENTIFIER__VALUE = IDENTIFIABLE_STRING_VALUE__VALUE;
-
- /**
- * The feature id for the '<em><b>Id</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int JAVA_IDENTIFIER__ID = IDENTIFIABLE_STRING_VALUE__ID;
-
- /**
- * The number of structural features of the '<em>Java Identifier</em>' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int JAVA_IDENTIFIER_FEATURE_COUNT = IDENTIFIABLE_STRING_VALUE_FEATURE_COUNT + 0;
-
- /**
- * The meta object id for the '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl.PathImpl <em>Path</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl.PathImpl
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl.FaceletTaglibPackageImpl#getPath()
- * @generated
- */
- int PATH = 22;
-
- /**
- * The feature id for the '<em><b>Value</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int PATH__VALUE = IDENTIFIABLE_STRING_VALUE__VALUE;
-
- /**
- * The feature id for the '<em><b>Id</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int PATH__ID = IDENTIFIABLE_STRING_VALUE__ID;
-
- /**
- * The number of structural features of the '<em>Path</em>' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int PATH_FEATURE_COUNT = IDENTIFIABLE_STRING_VALUE_FEATURE_COUNT + 0;
-
- /**
- * The meta object id for the '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibVersion <em>Version</em>}' enum.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibVersion
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl.FaceletTaglibPackageImpl#getFaceletTaglibVersion()
- * @generated
- */
- int FACELET_TAGLIB_VERSION = 26;
-
- /**
- * The meta object id for the '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.GenericBooleanBase <em>Generic Boolean Base</em>}' enum.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.GenericBooleanBase
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl.FaceletTaglibPackageImpl#getGenericBooleanBase()
- * @generated
- */
- int GENERIC_BOOLEAN_BASE = 27;
-
- /**
- * The meta object id for the '<em>Version Type Object</em>' data type.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibVersion
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl.FaceletTaglibPackageImpl#getFaceletTaglibVersionTypeObject()
- * @generated
- */
- int FACELET_TAGLIB_VERSION_TYPE_OBJECT = 28;
-
- /**
- * The meta object id for the '<em>Fully Qualified Class Base</em>' data type.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see java.lang.String
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl.FaceletTaglibPackageImpl#getFullyQualifiedClassBase()
- * @generated
- */
- int FULLY_QUALIFIED_CLASS_BASE = 29;
-
- /**
- * The meta object id for the '<em>Java Identifier Base</em>' data type.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see java.lang.String
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl.FaceletTaglibPackageImpl#getJavaIdentifierBase()
- * @generated
- */
- int JAVA_IDENTIFIER_BASE = 30;
-
- /**
- * The meta object id for the '<em>Path Type Base</em>' data type.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see java.lang.String
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl.FaceletTaglibPackageImpl#getPathTypeBase()
- * @generated
- */
- int PATH_TYPE_BASE = 31;
-
-
- /**
- * Returns the meta object for class '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.Description <em>Description</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for class '<em>Description</em>'.
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.Description
- * @generated
- */
- EClass getDescription();
-
- /**
- * Returns the meta object for class '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.DisplayName <em>Display Name</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for class '<em>Display Name</em>'.
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.DisplayName
- * @generated
- */
- EClass getDisplayName();
-
- /**
- * Returns the meta object for class '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.DocumentRoot <em>Document Root</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for class '<em>Document Root</em>'.
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.DocumentRoot
- * @generated
- */
- EClass getDocumentRoot();
-
- /**
- * Returns the meta object for the attribute list '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.DocumentRoot#getMixed <em>Mixed</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute list '<em>Mixed</em>'.
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.DocumentRoot#getMixed()
- * @see #getDocumentRoot()
- * @generated
- */
- EAttribute getDocumentRoot_Mixed();
-
- /**
- * Returns the meta object for the map '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.DocumentRoot#getXMLNSPrefixMap <em>XMLNS Prefix Map</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the map '<em>XMLNS Prefix Map</em>'.
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.DocumentRoot#getXMLNSPrefixMap()
- * @see #getDocumentRoot()
- * @generated
- */
- EReference getDocumentRoot_XMLNSPrefixMap();
-
- /**
- * Returns the meta object for the map '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.DocumentRoot#getXSISchemaLocation <em>XSI Schema Location</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the map '<em>XSI Schema Location</em>'.
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.DocumentRoot#getXSISchemaLocation()
- * @see #getDocumentRoot()
- * @generated
- */
- EReference getDocumentRoot_XSISchemaLocation();
-
- /**
- * Returns the meta object for the containment reference '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.DocumentRoot#getFaceletTaglib <em>Facelet Taglib</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the containment reference '<em>Facelet Taglib</em>'.
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.DocumentRoot#getFaceletTaglib()
- * @see #getDocumentRoot()
- * @generated
- */
- EReference getDocumentRoot_FaceletTaglib();
-
- /**
- * Returns the meta object for class '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibCanonicalName <em>Canonical Name</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for class '<em>Canonical Name</em>'.
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibCanonicalName
- * @generated
- */
- EClass getFaceletTaglibCanonicalName();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibCanonicalName#getValue <em>Value</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Value</em>'.
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibCanonicalName#getValue()
- * @see #getFaceletTaglibCanonicalName()
- * @generated
- */
- EAttribute getFaceletTaglibCanonicalName_Value();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibCanonicalName#getId <em>Id</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Id</em>'.
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibCanonicalName#getId()
- * @see #getFaceletTaglibCanonicalName()
- * @generated
- */
- EAttribute getFaceletTaglibCanonicalName_Id();
-
- /**
- * Returns the meta object for class '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibExtension <em>Extension</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for class '<em>Extension</em>'.
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibExtension
- * @generated
- */
- EClass getFaceletTaglibExtension();
-
- /**
- * Returns the meta object for the attribute list '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibExtension#getAny <em>Any</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute list '<em>Any</em>'.
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibExtension#getAny()
- * @see #getFaceletTaglibExtension()
- * @generated
- */
- EAttribute getFaceletTaglibExtension_Any();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibExtension#getId <em>Id</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Id</em>'.
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibExtension#getId()
- * @see #getFaceletTaglibExtension()
- * @generated
- */
- EAttribute getFaceletTaglibExtension_Id();
-
- /**
- * Returns the meta object for class '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibFunction <em>Function</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for class '<em>Function</em>'.
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibFunction
- * @generated
- */
- EClass getFaceletTaglibFunction();
-
- /**
- * Returns the meta object for the containment reference '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibFunction#getFunctionName <em>Function Name</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the containment reference '<em>Function Name</em>'.
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibFunction#getFunctionName()
- * @see #getFaceletTaglibFunction()
- * @generated
- */
- EReference getFaceletTaglibFunction_FunctionName();
-
- /**
- * Returns the meta object for the containment reference '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibFunction#getFunctionClass <em>Function Class</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the containment reference '<em>Function Class</em>'.
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibFunction#getFunctionClass()
- * @see #getFaceletTaglibFunction()
- * @generated
- */
- EReference getFaceletTaglibFunction_FunctionClass();
-
- /**
- * Returns the meta object for the containment reference '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibFunction#getFunctionSignature <em>Function Signature</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the containment reference '<em>Function Signature</em>'.
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibFunction#getFunctionSignature()
- * @see #getFaceletTaglibFunction()
- * @generated
- */
- EReference getFaceletTaglibFunction_FunctionSignature();
-
- /**
- * Returns the meta object for class '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagAttribute <em>Tag Attribute</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for class '<em>Tag Attribute</em>'.
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagAttribute
- * @generated
- */
- EClass getFaceletTaglibTagAttribute();
-
- /**
- * Returns the meta object for the containment reference '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagAttribute#getNameElement <em>Name Element</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the containment reference '<em>Name Element</em>'.
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagAttribute#getNameElement()
- * @see #getFaceletTaglibTagAttribute()
- * @generated
- */
- EReference getFaceletTaglibTagAttribute_NameElement();
-
- /**
- * Returns the meta object for the containment reference '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagAttribute#getRequiredElement <em>Required Element</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the containment reference '<em>Required Element</em>'.
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagAttribute#getRequiredElement()
- * @see #getFaceletTaglibTagAttribute()
- * @generated
- */
- EReference getFaceletTaglibTagAttribute_RequiredElement();
-
- /**
- * Returns the meta object for the containment reference '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagAttribute#getTypeElement <em>Type Element</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the containment reference '<em>Type Element</em>'.
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagAttribute#getTypeElement()
- * @see #getFaceletTaglibTagAttribute()
- * @generated
- */
- EReference getFaceletTaglibTagAttribute_TypeElement();
-
- /**
- * Returns the meta object for the containment reference '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagAttribute#getMethodSignatureElement <em>Method Signature Element</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the containment reference '<em>Method Signature Element</em>'.
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagAttribute#getMethodSignatureElement()
- * @see #getFaceletTaglibTagAttribute()
- * @generated
- */
- EReference getFaceletTaglibTagAttribute_MethodSignatureElement();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagAttribute#getId <em>Id</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Id</em>'.
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagAttribute#getId()
- * @see #getFaceletTaglibTagAttribute()
- * @generated
- */
- EAttribute getFaceletTaglibTagAttribute_Id();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagAttribute#getName <em>Name</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Name</em>'.
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagAttribute#getName()
- * @see #getFaceletTaglibTagAttribute()
- * @generated
- */
- EAttribute getFaceletTaglibTagAttribute_Name();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagAttribute#isRequired <em>Required</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Required</em>'.
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagAttribute#isRequired()
- * @see #getFaceletTaglibTagAttribute()
- * @generated
- */
- EAttribute getFaceletTaglibTagAttribute_Required();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagAttribute#getType <em>Type</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Type</em>'.
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagAttribute#getType()
- * @see #getFaceletTaglibTagAttribute()
- * @generated
- */
- EAttribute getFaceletTaglibTagAttribute_Type();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagAttribute#getMethodSignature <em>Method Signature</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Method Signature</em>'.
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagAttribute#getMethodSignature()
- * @see #getFaceletTaglibTagAttribute()
- * @generated
- */
- EAttribute getFaceletTaglibTagAttribute_MethodSignature();
-
- /**
- * Returns the meta object for class '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagBehaviorExtension <em>Tag Behavior Extension</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for class '<em>Tag Behavior Extension</em>'.
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagBehaviorExtension
- * @generated
- */
- EClass getFaceletTaglibTagBehaviorExtension();
-
- /**
- * Returns the meta object for the attribute list '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagBehaviorExtension#getAny <em>Any</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute list '<em>Any</em>'.
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagBehaviorExtension#getAny()
- * @see #getFaceletTaglibTagBehaviorExtension()
- * @generated
- */
- EAttribute getFaceletTaglibTagBehaviorExtension_Any();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagBehaviorExtension#getId <em>Id</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Id</em>'.
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagBehaviorExtension#getId()
- * @see #getFaceletTaglibTagBehaviorExtension()
- * @generated
- */
- EAttribute getFaceletTaglibTagBehaviorExtension_Id();
-
- /**
- * Returns the meta object for class '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagBehavior <em>Tag Behavior</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for class '<em>Tag Behavior</em>'.
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagBehavior
- * @generated
- */
- EClass getFaceletTaglibTagBehavior();
-
- /**
- * Returns the meta object for the containment reference '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagBehavior#getBehaviorId <em>Behavior Id</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the containment reference '<em>Behavior Id</em>'.
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagBehavior#getBehaviorId()
- * @see #getFaceletTaglibTagBehavior()
- * @generated
- */
- EReference getFaceletTaglibTagBehavior_BehaviorId();
-
- /**
- * Returns the meta object for the containment reference '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagBehavior#getHandlerClass <em>Handler Class</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the containment reference '<em>Handler Class</em>'.
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagBehavior#getHandlerClass()
- * @see #getFaceletTaglibTagBehavior()
- * @generated
- */
- EReference getFaceletTaglibTagBehavior_HandlerClass();
-
- /**
- * Returns the meta object for the containment reference list '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagBehavior#getBehaviorExtension <em>Behavior Extension</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the containment reference list '<em>Behavior Extension</em>'.
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagBehavior#getBehaviorExtension()
- * @see #getFaceletTaglibTagBehavior()
- * @generated
- */
- EReference getFaceletTaglibTagBehavior_BehaviorExtension();
-
- /**
- * Returns the meta object for class '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagComponentExtension <em>Tag Component Extension</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for class '<em>Tag Component Extension</em>'.
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagComponentExtension
- * @generated
- */
- EClass getFaceletTaglibTagComponentExtension();
-
- /**
- * Returns the meta object for the attribute list '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagComponentExtension#getAny <em>Any</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute list '<em>Any</em>'.
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagComponentExtension#getAny()
- * @see #getFaceletTaglibTagComponentExtension()
- * @generated
- */
- EAttribute getFaceletTaglibTagComponentExtension_Any();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagComponentExtension#getId <em>Id</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Id</em>'.
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagComponentExtension#getId()
- * @see #getFaceletTaglibTagComponentExtension()
- * @generated
- */
- EAttribute getFaceletTaglibTagComponentExtension_Id();
-
- /**
- * Returns the meta object for class '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagComponent <em>Tag Component</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for class '<em>Tag Component</em>'.
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagComponent
- * @generated
- */
- EClass getFaceletTaglibTagComponent();
-
- /**
- * Returns the meta object for the containment reference '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagComponent#getComponentType <em>Component Type</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the containment reference '<em>Component Type</em>'.
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagComponent#getComponentType()
- * @see #getFaceletTaglibTagComponent()
- * @generated
- */
- EReference getFaceletTaglibTagComponent_ComponentType();
-
- /**
- * Returns the meta object for the containment reference '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagComponent#getRendererType <em>Renderer Type</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the containment reference '<em>Renderer Type</em>'.
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagComponent#getRendererType()
- * @see #getFaceletTaglibTagComponent()
- * @generated
- */
- EReference getFaceletTaglibTagComponent_RendererType();
-
- /**
- * Returns the meta object for the containment reference '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagComponent#getHandlerClass <em>Handler Class</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the containment reference '<em>Handler Class</em>'.
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagComponent#getHandlerClass()
- * @see #getFaceletTaglibTagComponent()
- * @generated
- */
- EReference getFaceletTaglibTagComponent_HandlerClass();
-
- /**
- * Returns the meta object for the containment reference list '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagComponent#getComponentExtension <em>Component Extension</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the containment reference list '<em>Component Extension</em>'.
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagComponent#getComponentExtension()
- * @see #getFaceletTaglibTagComponent()
- * @generated
- */
- EReference getFaceletTaglibTagComponent_ComponentExtension();
-
- /**
- * Returns the meta object for class '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagConverterExtension <em>Tag Converter Extension</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for class '<em>Tag Converter Extension</em>'.
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagConverterExtension
- * @generated
- */
- EClass getFaceletTaglibTagConverterExtension();
-
- /**
- * Returns the meta object for the attribute list '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagConverterExtension#getAny <em>Any</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute list '<em>Any</em>'.
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagConverterExtension#getAny()
- * @see #getFaceletTaglibTagConverterExtension()
- * @generated
- */
- EAttribute getFaceletTaglibTagConverterExtension_Any();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagConverterExtension#getId <em>Id</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Id</em>'.
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagConverterExtension#getId()
- * @see #getFaceletTaglibTagConverterExtension()
- * @generated
- */
- EAttribute getFaceletTaglibTagConverterExtension_Id();
-
- /**
- * Returns the meta object for class '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagConverter <em>Tag Converter</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for class '<em>Tag Converter</em>'.
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagConverter
- * @generated
- */
- EClass getFaceletTaglibTagConverter();
-
- /**
- * Returns the meta object for the containment reference '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagConverter#getConverterId <em>Converter Id</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the containment reference '<em>Converter Id</em>'.
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagConverter#getConverterId()
- * @see #getFaceletTaglibTagConverter()
- * @generated
- */
- EReference getFaceletTaglibTagConverter_ConverterId();
-
- /**
- * Returns the meta object for the containment reference '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagConverter#getHandlerClass <em>Handler Class</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the containment reference '<em>Handler Class</em>'.
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagConverter#getHandlerClass()
- * @see #getFaceletTaglibTagConverter()
- * @generated
- */
- EReference getFaceletTaglibTagConverter_HandlerClass();
-
- /**
- * Returns the meta object for the containment reference list '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagConverter#getConverterExtension <em>Converter Extension</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the containment reference list '<em>Converter Extension</em>'.
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagConverter#getConverterExtension()
- * @see #getFaceletTaglibTagConverter()
- * @generated
- */
- EReference getFaceletTaglibTagConverter_ConverterExtension();
-
- /**
- * Returns the meta object for class '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagExtension <em>Tag Extension</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for class '<em>Tag Extension</em>'.
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagExtension
- * @generated
- */
- EClass getFaceletTaglibTagExtension();
-
- /**
- * Returns the meta object for the attribute list '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagExtension#getAny <em>Any</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute list '<em>Any</em>'.
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagExtension#getAny()
- * @see #getFaceletTaglibTagExtension()
- * @generated
- */
- EAttribute getFaceletTaglibTagExtension_Any();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagExtension#getId <em>Id</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Id</em>'.
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagExtension#getId()
- * @see #getFaceletTaglibTagExtension()
- * @generated
- */
- EAttribute getFaceletTaglibTagExtension_Id();
-
- /**
- * Returns the meta object for class '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTag <em>Tag</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for class '<em>Tag</em>'.
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTag
- * @generated
- */
- EClass getFaceletTaglibTag();
-
- /**
- * Returns the meta object for the containment reference '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTag#getTagNameElement <em>Tag Name Element</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the containment reference '<em>Tag Name Element</em>'.
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTag#getTagNameElement()
- * @see #getFaceletTaglibTag()
- * @generated
- */
- EReference getFaceletTaglibTag_TagNameElement();
-
- /**
- * Returns the meta object for the containment reference '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTag#getHandlerClassElement <em>Handler Class Element</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the containment reference '<em>Handler Class Element</em>'.
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTag#getHandlerClassElement()
- * @see #getFaceletTaglibTag()
- * @generated
- */
- EReference getFaceletTaglibTag_HandlerClassElement();
-
- /**
- * Returns the meta object for the containment reference '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTag#getBehavior <em>Behavior</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the containment reference '<em>Behavior</em>'.
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTag#getBehavior()
- * @see #getFaceletTaglibTag()
- * @generated
- */
- EReference getFaceletTaglibTag_Behavior();
-
- /**
- * Returns the meta object for the containment reference '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTag#getComponent <em>Component</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the containment reference '<em>Component</em>'.
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTag#getComponent()
- * @see #getFaceletTaglibTag()
- * @generated
- */
- EReference getFaceletTaglibTag_Component();
-
- /**
- * Returns the meta object for the containment reference '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTag#getConverter <em>Converter</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the containment reference '<em>Converter</em>'.
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTag#getConverter()
- * @see #getFaceletTaglibTag()
- * @generated
- */
- EReference getFaceletTaglibTag_Converter();
-
- /**
- * Returns the meta object for the containment reference '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTag#getValidator <em>Validator</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the containment reference '<em>Validator</em>'.
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTag#getValidator()
- * @see #getFaceletTaglibTag()
- * @generated
- */
- EReference getFaceletTaglibTag_Validator();
-
- /**
- * Returns the meta object for the containment reference '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTag#getSource <em>Source</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the containment reference '<em>Source</em>'.
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTag#getSource()
- * @see #getFaceletTaglibTag()
- * @generated
- */
- EReference getFaceletTaglibTag_Source();
-
- /**
- * Returns the meta object for the containment reference list '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTag#getAttribute <em>Attribute</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the containment reference list '<em>Attribute</em>'.
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTag#getAttribute()
- * @see #getFaceletTaglibTag()
- * @generated
- */
- EReference getFaceletTaglibTag_Attribute();
-
- /**
- * Returns the meta object for the containment reference list '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTag#getTagExtension <em>Tag Extension</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the containment reference list '<em>Tag Extension</em>'.
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTag#getTagExtension()
- * @see #getFaceletTaglibTag()
- * @generated
- */
- EReference getFaceletTaglibTag_TagExtension();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTag#getTagName <em>Tag Name</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Tag Name</em>'.
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTag#getTagName()
- * @see #getFaceletTaglibTag()
- * @generated
- */
- EAttribute getFaceletTaglibTag_TagName();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTag#getHandlerClass <em>Handler Class</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Handler Class</em>'.
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTag#getHandlerClass()
- * @see #getFaceletTaglibTag()
- * @generated
- */
- EAttribute getFaceletTaglibTag_HandlerClass();
-
- /**
- * Returns the meta object for class '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagValidatorExtension <em>Tag Validator Extension</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for class '<em>Tag Validator Extension</em>'.
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagValidatorExtension
- * @generated
- */
- EClass getFaceletTaglibTagValidatorExtension();
-
- /**
- * Returns the meta object for the attribute list '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagValidatorExtension#getAny <em>Any</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute list '<em>Any</em>'.
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagValidatorExtension#getAny()
- * @see #getFaceletTaglibTagValidatorExtension()
- * @generated
- */
- EAttribute getFaceletTaglibTagValidatorExtension_Any();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagValidatorExtension#getId <em>Id</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Id</em>'.
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagValidatorExtension#getId()
- * @see #getFaceletTaglibTagValidatorExtension()
- * @generated
- */
- EAttribute getFaceletTaglibTagValidatorExtension_Id();
-
- /**
- * Returns the meta object for class '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagValidator <em>Tag Validator</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for class '<em>Tag Validator</em>'.
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagValidator
- * @generated
- */
- EClass getFaceletTaglibTagValidator();
-
- /**
- * Returns the meta object for the containment reference '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagValidator#getValidatorId <em>Validator Id</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the containment reference '<em>Validator Id</em>'.
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagValidator#getValidatorId()
- * @see #getFaceletTaglibTagValidator()
- * @generated
- */
- EReference getFaceletTaglibTagValidator_ValidatorId();
-
- /**
- * Returns the meta object for the containment reference '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagValidator#getHandlerClass <em>Handler Class</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the containment reference '<em>Handler Class</em>'.
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagValidator#getHandlerClass()
- * @see #getFaceletTaglibTagValidator()
- * @generated
- */
- EReference getFaceletTaglibTagValidator_HandlerClass();
-
- /**
- * Returns the meta object for the containment reference list '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagValidator#getValidatorExtension <em>Validator Extension</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the containment reference list '<em>Validator Extension</em>'.
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagValidator#getValidatorExtension()
- * @see #getFaceletTaglibTagValidator()
- * @generated
- */
- EReference getFaceletTaglibTagValidator_ValidatorExtension();
-
- /**
- * Returns the meta object for class '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglib <em>Facelet Taglib</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for class '<em>Facelet Taglib</em>'.
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglib
- * @generated
- */
- EClass getFaceletTaglib();
-
- /**
- * Returns the meta object for the containment reference '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglib#getLibraryClass <em>Library Class</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the containment reference '<em>Library Class</em>'.
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglib#getLibraryClass()
- * @see #getFaceletTaglib()
- * @generated
- */
- EReference getFaceletTaglib_LibraryClass();
-
- /**
- * Returns the meta object for the containment reference '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglib#getNamespace <em>Namespace</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the containment reference '<em>Namespace</em>'.
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglib#getNamespace()
- * @see #getFaceletTaglib()
- * @generated
- */
- EReference getFaceletTaglib_Namespace();
-
- /**
- * Returns the meta object for the containment reference '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglib#getCompositeLibraryName <em>Composite Library Name</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the containment reference '<em>Composite Library Name</em>'.
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglib#getCompositeLibraryName()
- * @see #getFaceletTaglib()
- * @generated
- */
- EReference getFaceletTaglib_CompositeLibraryName();
-
- /**
- * Returns the meta object for the attribute list '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglib#getGroup <em>Group</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute list '<em>Group</em>'.
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglib#getGroup()
- * @see #getFaceletTaglib()
- * @generated
- */
- EAttribute getFaceletTaglib_Group();
-
- /**
- * Returns the meta object for the containment reference list '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglib#getTag <em>Tag</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the containment reference list '<em>Tag</em>'.
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglib#getTag()
- * @see #getFaceletTaglib()
- * @generated
- */
- EReference getFaceletTaglib_Tag();
-
- /**
- * Returns the meta object for the containment reference list '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglib#getFunction <em>Function</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the containment reference list '<em>Function</em>'.
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglib#getFunction()
- * @see #getFaceletTaglib()
- * @generated
- */
- EReference getFaceletTaglib_Function();
-
- /**
- * Returns the meta object for the containment reference list '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglib#getTaglibExtension <em>Taglib Extension</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the containment reference list '<em>Taglib Extension</em>'.
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglib#getTaglibExtension()
- * @see #getFaceletTaglib()
- * @generated
- */
- EReference getFaceletTaglib_TaglibExtension();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglib#getId <em>Id</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Id</em>'.
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglib#getId()
- * @see #getFaceletTaglib()
- * @generated
- */
- EAttribute getFaceletTaglib_Id();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglib#getVersion <em>Version</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Version</em>'.
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglib#getVersion()
- * @see #getFaceletTaglib()
- * @generated
- */
- EAttribute getFaceletTaglib_Version();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglib#getNamespaceUri <em>Namespace Uri</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Namespace Uri</em>'.
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglib#getNamespaceUri()
- * @see #getFaceletTaglib()
- * @generated
- */
- EAttribute getFaceletTaglib_NamespaceUri();
-
- /**
- * Returns the meta object for class '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FullyQualifiedClass <em>Fully Qualified Class</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for class '<em>Fully Qualified Class</em>'.
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FullyQualifiedClass
- * @generated
- */
- EClass getFullyQualifiedClass();
-
- /**
- * Returns the meta object for class '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.GenericBoolean <em>Generic Boolean</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for class '<em>Generic Boolean</em>'.
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.GenericBoolean
- * @generated
- */
- EClass getGenericBoolean();
-
- /**
- * Returns the meta object for class '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.Icon <em>Icon</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for class '<em>Icon</em>'.
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.Icon
- * @generated
- */
- EClass getIcon();
-
- /**
- * Returns the meta object for the containment reference '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.Icon#getSmallIcon <em>Small Icon</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the containment reference '<em>Small Icon</em>'.
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.Icon#getSmallIcon()
- * @see #getIcon()
- * @generated
- */
- EReference getIcon_SmallIcon();
-
- /**
- * Returns the meta object for the containment reference '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.Icon#getLargeIcon <em>Large Icon</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the containment reference '<em>Large Icon</em>'.
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.Icon#getLargeIcon()
- * @see #getIcon()
- * @generated
- */
- EReference getIcon_LargeIcon();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.Icon#getId <em>Id</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Id</em>'.
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.Icon#getId()
- * @see #getIcon()
- * @generated
- */
- EAttribute getIcon_Id();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.Icon#getLang <em>Lang</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Lang</em>'.
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.Icon#getLang()
- * @see #getIcon()
- * @generated
- */
- EAttribute getIcon_Lang();
-
- /**
- * Returns the meta object for class '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.JavaIdentifier <em>Java Identifier</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for class '<em>Java Identifier</em>'.
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.JavaIdentifier
- * @generated
- */
- EClass getJavaIdentifier();
-
- /**
- * Returns the meta object for class '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.Path <em>Path</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for class '<em>Path</em>'.
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.Path
- * @generated
- */
- EClass getPath();
-
- /**
- * Returns the meta object for class '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.IdentifiableStringValue <em>Identifiable String Value</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for class '<em>Identifiable String Value</em>'.
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.IdentifiableStringValue
- * @generated
- */
- EClass getIdentifiableStringValue();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.IdentifiableStringValue#getValue <em>Value</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Value</em>'.
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.IdentifiableStringValue#getValue()
- * @see #getIdentifiableStringValue()
- * @generated
- */
- EAttribute getIdentifiableStringValue_Value();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.IdentifiableStringValue#getId <em>Id</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Id</em>'.
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.IdentifiableStringValue#getId()
- * @see #getIdentifiableStringValue()
- * @generated
- */
- EAttribute getIdentifiableStringValue_Id();
-
- /**
- * Returns the meta object for class '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.IdentifiableLangStringValue <em>Identifiable Lang String Value</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for class '<em>Identifiable Lang String Value</em>'.
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.IdentifiableLangStringValue
- * @generated
- */
- EClass getIdentifiableLangStringValue();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.IdentifiableLangStringValue#getLang <em>Lang</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Lang</em>'.
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.IdentifiableLangStringValue#getLang()
- * @see #getIdentifiableLangStringValue()
- * @generated
- */
- EAttribute getIdentifiableLangStringValue_Lang();
-
- /**
- * Returns the meta object for class '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.UserVisibleTaglibObject <em>User Visible Taglib Object</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for class '<em>User Visible Taglib Object</em>'.
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.UserVisibleTaglibObject
- * @generated
- */
- EClass getUserVisibleTaglibObject();
-
- /**
- * Returns the meta object for the containment reference list '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.UserVisibleTaglibObject#getDescription <em>Description</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the containment reference list '<em>Description</em>'.
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.UserVisibleTaglibObject#getDescription()
- * @see #getUserVisibleTaglibObject()
- * @generated
- */
- EReference getUserVisibleTaglibObject_Description();
-
- /**
- * Returns the meta object for the containment reference list '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.UserVisibleTaglibObject#getDisplayName <em>Display Name</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the containment reference list '<em>Display Name</em>'.
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.UserVisibleTaglibObject#getDisplayName()
- * @see #getUserVisibleTaglibObject()
- * @generated
- */
- EReference getUserVisibleTaglibObject_DisplayName();
-
- /**
- * Returns the meta object for the containment reference list '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.UserVisibleTaglibObject#getIcon <em>Icon</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the containment reference list '<em>Icon</em>'.
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.UserVisibleTaglibObject#getIcon()
- * @see #getUserVisibleTaglibObject()
- * @generated
- */
- EReference getUserVisibleTaglibObject_Icon();
-
- /**
- * Returns the meta object for enum '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibVersion <em>Version</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for enum '<em>Version</em>'.
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibVersion
- * @generated
- */
- EEnum getFaceletTaglibVersion();
-
- /**
- * Returns the meta object for enum '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.GenericBooleanBase <em>Generic Boolean Base</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for enum '<em>Generic Boolean Base</em>'.
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.GenericBooleanBase
- * @generated
- */
- EEnum getGenericBooleanBase();
-
- /**
- * Returns the meta object for data type '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibVersion <em>Version Type Object</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for data type '<em>Version Type Object</em>'.
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibVersion
- * @model instanceClass="org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibVersion"
- * extendedMetaData="name='facelet-taglib-versionType:Object' baseType='facelet-taglib-versionType'"
- * @generated
- */
- EDataType getFaceletTaglibVersionTypeObject();
-
- /**
- * Returns the meta object for data type '{@link java.lang.String <em>Fully Qualified Class Base</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for data type '<em>Fully Qualified Class Base</em>'.
- * @see java.lang.String
- * @model instanceClass="java.lang.String"
- * extendedMetaData="name='fully-qualified-classType_._base' baseType='http://www.eclipse.org/emf/2003/XMLType#token'"
- * @generated
- */
- EDataType getFullyQualifiedClassBase();
-
- /**
- * Returns the meta object for data type '{@link java.lang.String <em>Java Identifier Base</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for data type '<em>Java Identifier Base</em>'.
- * @see java.lang.String
- * @model instanceClass="java.lang.String"
- * extendedMetaData="name='java-identifierType_._base' baseType='http://www.eclipse.org/emf/2003/XMLType#token' pattern='($|_|\\p{L})(\\p{L}|\\p{Nd}|_|$)*'"
- * @generated
- */
- EDataType getJavaIdentifierBase();
-
- /**
- * Returns the meta object for data type '{@link java.lang.String <em>Path Type Base</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for data type '<em>Path Type Base</em>'.
- * @see java.lang.String
- * @model instanceClass="java.lang.String"
- * extendedMetaData="name='pathType_._base' baseType='http://www.eclipse.org/emf/2003/XMLType#token'"
- * @generated
- */
- EDataType getPathTypeBase();
-
- /**
- * 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
- */
- FaceletTaglibFactory getFaceletTaglibFactory();
-
- /**
- * <!-- 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
- */
- @SuppressWarnings("hiding")
- interface Literals
- {
- /**
- * The meta object literal for the '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl.DescriptionImpl <em>Description</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl.DescriptionImpl
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl.FaceletTaglibPackageImpl#getDescription()
- * @generated
- */
- EClass DESCRIPTION = eINSTANCE.getDescription();
-
- /**
- * The meta object literal for the '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl.DisplayNameImpl <em>Display Name</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl.DisplayNameImpl
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl.FaceletTaglibPackageImpl#getDisplayName()
- * @generated
- */
- EClass DISPLAY_NAME = eINSTANCE.getDisplayName();
-
- /**
- * The meta object literal for the '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl.DocumentRootImpl <em>Document Root</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl.DocumentRootImpl
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl.FaceletTaglibPackageImpl#getDocumentRoot()
- * @generated
- */
- EClass DOCUMENT_ROOT = eINSTANCE.getDocumentRoot();
-
- /**
- * The meta object literal for the '<em><b>Mixed</b></em>' attribute list feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EAttribute DOCUMENT_ROOT__MIXED = eINSTANCE.getDocumentRoot_Mixed();
-
- /**
- * The meta object literal for the '<em><b>XMLNS Prefix Map</b></em>' map feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EReference DOCUMENT_ROOT__XMLNS_PREFIX_MAP = eINSTANCE.getDocumentRoot_XMLNSPrefixMap();
-
- /**
- * The meta object literal for the '<em><b>XSI Schema Location</b></em>' map feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EReference DOCUMENT_ROOT__XSI_SCHEMA_LOCATION = eINSTANCE.getDocumentRoot_XSISchemaLocation();
-
- /**
- * The meta object literal for the '<em><b>Facelet Taglib</b></em>' containment reference feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EReference DOCUMENT_ROOT__FACELET_TAGLIB = eINSTANCE.getDocumentRoot_FaceletTaglib();
-
- /**
- * The meta object literal for the '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl.FaceletTaglibCanonicalNameImpl <em>Canonical Name</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl.FaceletTaglibCanonicalNameImpl
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl.FaceletTaglibPackageImpl#getFaceletTaglibCanonicalName()
- * @generated
- */
- EClass FACELET_TAGLIB_CANONICAL_NAME = eINSTANCE.getFaceletTaglibCanonicalName();
-
- /**
- * The meta object literal for the '<em><b>Value</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EAttribute FACELET_TAGLIB_CANONICAL_NAME__VALUE = eINSTANCE.getFaceletTaglibCanonicalName_Value();
-
- /**
- * The meta object literal for the '<em><b>Id</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EAttribute FACELET_TAGLIB_CANONICAL_NAME__ID = eINSTANCE.getFaceletTaglibCanonicalName_Id();
-
- /**
- * The meta object literal for the '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl.FaceletTaglibExtensionImpl <em>Extension</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl.FaceletTaglibExtensionImpl
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl.FaceletTaglibPackageImpl#getFaceletTaglibExtension()
- * @generated
- */
- EClass FACELET_TAGLIB_EXTENSION = eINSTANCE.getFaceletTaglibExtension();
-
- /**
- * The meta object literal for the '<em><b>Any</b></em>' attribute list feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EAttribute FACELET_TAGLIB_EXTENSION__ANY = eINSTANCE.getFaceletTaglibExtension_Any();
-
- /**
- * The meta object literal for the '<em><b>Id</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EAttribute FACELET_TAGLIB_EXTENSION__ID = eINSTANCE.getFaceletTaglibExtension_Id();
-
- /**
- * The meta object literal for the '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl.FaceletTaglibFunctionImpl <em>Function</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl.FaceletTaglibFunctionImpl
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl.FaceletTaglibPackageImpl#getFaceletTaglibFunction()
- * @generated
- */
- EClass FACELET_TAGLIB_FUNCTION = eINSTANCE.getFaceletTaglibFunction();
-
- /**
- * The meta object literal for the '<em><b>Function Name</b></em>' containment reference feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EReference FACELET_TAGLIB_FUNCTION__FUNCTION_NAME = eINSTANCE.getFaceletTaglibFunction_FunctionName();
-
- /**
- * The meta object literal for the '<em><b>Function Class</b></em>' containment reference feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EReference FACELET_TAGLIB_FUNCTION__FUNCTION_CLASS = eINSTANCE.getFaceletTaglibFunction_FunctionClass();
-
- /**
- * The meta object literal for the '<em><b>Function Signature</b></em>' containment reference feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EReference FACELET_TAGLIB_FUNCTION__FUNCTION_SIGNATURE = eINSTANCE.getFaceletTaglibFunction_FunctionSignature();
-
- /**
- * The meta object literal for the '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl.FaceletTaglibTagAttributeImpl <em>Tag Attribute</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl.FaceletTaglibTagAttributeImpl
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl.FaceletTaglibPackageImpl#getFaceletTaglibTagAttribute()
- * @generated
- */
- EClass FACELET_TAGLIB_TAG_ATTRIBUTE = eINSTANCE.getFaceletTaglibTagAttribute();
-
- /**
- * The meta object literal for the '<em><b>Name Element</b></em>' containment reference feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EReference FACELET_TAGLIB_TAG_ATTRIBUTE__NAME_ELEMENT = eINSTANCE.getFaceletTaglibTagAttribute_NameElement();
-
- /**
- * The meta object literal for the '<em><b>Required Element</b></em>' containment reference feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EReference FACELET_TAGLIB_TAG_ATTRIBUTE__REQUIRED_ELEMENT = eINSTANCE.getFaceletTaglibTagAttribute_RequiredElement();
-
- /**
- * The meta object literal for the '<em><b>Type Element</b></em>' containment reference feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EReference FACELET_TAGLIB_TAG_ATTRIBUTE__TYPE_ELEMENT = eINSTANCE.getFaceletTaglibTagAttribute_TypeElement();
-
- /**
- * The meta object literal for the '<em><b>Method Signature Element</b></em>' containment reference feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EReference FACELET_TAGLIB_TAG_ATTRIBUTE__METHOD_SIGNATURE_ELEMENT = eINSTANCE.getFaceletTaglibTagAttribute_MethodSignatureElement();
-
- /**
- * The meta object literal for the '<em><b>Id</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EAttribute FACELET_TAGLIB_TAG_ATTRIBUTE__ID = eINSTANCE.getFaceletTaglibTagAttribute_Id();
-
- /**
- * The meta object literal for the '<em><b>Name</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EAttribute FACELET_TAGLIB_TAG_ATTRIBUTE__NAME = eINSTANCE.getFaceletTaglibTagAttribute_Name();
-
- /**
- * The meta object literal for the '<em><b>Required</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EAttribute FACELET_TAGLIB_TAG_ATTRIBUTE__REQUIRED = eINSTANCE.getFaceletTaglibTagAttribute_Required();
-
- /**
- * The meta object literal for the '<em><b>Type</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EAttribute FACELET_TAGLIB_TAG_ATTRIBUTE__TYPE = eINSTANCE.getFaceletTaglibTagAttribute_Type();
-
- /**
- * The meta object literal for the '<em><b>Method Signature</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EAttribute FACELET_TAGLIB_TAG_ATTRIBUTE__METHOD_SIGNATURE = eINSTANCE.getFaceletTaglibTagAttribute_MethodSignature();
-
- /**
- * The meta object literal for the '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl.FaceletTaglibTagBehaviorExtensionImpl <em>Tag Behavior Extension</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl.FaceletTaglibTagBehaviorExtensionImpl
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl.FaceletTaglibPackageImpl#getFaceletTaglibTagBehaviorExtension()
- * @generated
- */
- EClass FACELET_TAGLIB_TAG_BEHAVIOR_EXTENSION = eINSTANCE.getFaceletTaglibTagBehaviorExtension();
-
- /**
- * The meta object literal for the '<em><b>Any</b></em>' attribute list feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EAttribute FACELET_TAGLIB_TAG_BEHAVIOR_EXTENSION__ANY = eINSTANCE.getFaceletTaglibTagBehaviorExtension_Any();
-
- /**
- * The meta object literal for the '<em><b>Id</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EAttribute FACELET_TAGLIB_TAG_BEHAVIOR_EXTENSION__ID = eINSTANCE.getFaceletTaglibTagBehaviorExtension_Id();
-
- /**
- * The meta object literal for the '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl.FaceletTaglibTagBehaviorImpl <em>Tag Behavior</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl.FaceletTaglibTagBehaviorImpl
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl.FaceletTaglibPackageImpl#getFaceletTaglibTagBehavior()
- * @generated
- */
- EClass FACELET_TAGLIB_TAG_BEHAVIOR = eINSTANCE.getFaceletTaglibTagBehavior();
-
- /**
- * The meta object literal for the '<em><b>Behavior Id</b></em>' containment reference feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EReference FACELET_TAGLIB_TAG_BEHAVIOR__BEHAVIOR_ID = eINSTANCE.getFaceletTaglibTagBehavior_BehaviorId();
-
- /**
- * The meta object literal for the '<em><b>Handler Class</b></em>' containment reference feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EReference FACELET_TAGLIB_TAG_BEHAVIOR__HANDLER_CLASS = eINSTANCE.getFaceletTaglibTagBehavior_HandlerClass();
-
- /**
- * The meta object literal for the '<em><b>Behavior Extension</b></em>' containment reference list feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EReference FACELET_TAGLIB_TAG_BEHAVIOR__BEHAVIOR_EXTENSION = eINSTANCE.getFaceletTaglibTagBehavior_BehaviorExtension();
-
- /**
- * The meta object literal for the '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl.FaceletTaglibTagComponentExtensionImpl <em>Tag Component Extension</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl.FaceletTaglibTagComponentExtensionImpl
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl.FaceletTaglibPackageImpl#getFaceletTaglibTagComponentExtension()
- * @generated
- */
- EClass FACELET_TAGLIB_TAG_COMPONENT_EXTENSION = eINSTANCE.getFaceletTaglibTagComponentExtension();
-
- /**
- * The meta object literal for the '<em><b>Any</b></em>' attribute list feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EAttribute FACELET_TAGLIB_TAG_COMPONENT_EXTENSION__ANY = eINSTANCE.getFaceletTaglibTagComponentExtension_Any();
-
- /**
- * The meta object literal for the '<em><b>Id</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EAttribute FACELET_TAGLIB_TAG_COMPONENT_EXTENSION__ID = eINSTANCE.getFaceletTaglibTagComponentExtension_Id();
-
- /**
- * The meta object literal for the '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl.FaceletTaglibTagComponentImpl <em>Tag Component</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl.FaceletTaglibTagComponentImpl
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl.FaceletTaglibPackageImpl#getFaceletTaglibTagComponent()
- * @generated
- */
- EClass FACELET_TAGLIB_TAG_COMPONENT = eINSTANCE.getFaceletTaglibTagComponent();
-
- /**
- * The meta object literal for the '<em><b>Component Type</b></em>' containment reference feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EReference FACELET_TAGLIB_TAG_COMPONENT__COMPONENT_TYPE = eINSTANCE.getFaceletTaglibTagComponent_ComponentType();
-
- /**
- * The meta object literal for the '<em><b>Renderer Type</b></em>' containment reference feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EReference FACELET_TAGLIB_TAG_COMPONENT__RENDERER_TYPE = eINSTANCE.getFaceletTaglibTagComponent_RendererType();
-
- /**
- * The meta object literal for the '<em><b>Handler Class</b></em>' containment reference feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EReference FACELET_TAGLIB_TAG_COMPONENT__HANDLER_CLASS = eINSTANCE.getFaceletTaglibTagComponent_HandlerClass();
-
- /**
- * The meta object literal for the '<em><b>Component Extension</b></em>' containment reference list feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EReference FACELET_TAGLIB_TAG_COMPONENT__COMPONENT_EXTENSION = eINSTANCE.getFaceletTaglibTagComponent_ComponentExtension();
-
- /**
- * The meta object literal for the '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl.FaceletTaglibTagConverterExtensionImpl <em>Tag Converter Extension</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl.FaceletTaglibTagConverterExtensionImpl
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl.FaceletTaglibPackageImpl#getFaceletTaglibTagConverterExtension()
- * @generated
- */
- EClass FACELET_TAGLIB_TAG_CONVERTER_EXTENSION = eINSTANCE.getFaceletTaglibTagConverterExtension();
-
- /**
- * The meta object literal for the '<em><b>Any</b></em>' attribute list feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EAttribute FACELET_TAGLIB_TAG_CONVERTER_EXTENSION__ANY = eINSTANCE.getFaceletTaglibTagConverterExtension_Any();
-
- /**
- * The meta object literal for the '<em><b>Id</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EAttribute FACELET_TAGLIB_TAG_CONVERTER_EXTENSION__ID = eINSTANCE.getFaceletTaglibTagConverterExtension_Id();
-
- /**
- * The meta object literal for the '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl.FaceletTaglibTagConverterImpl <em>Tag Converter</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl.FaceletTaglibTagConverterImpl
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl.FaceletTaglibPackageImpl#getFaceletTaglibTagConverter()
- * @generated
- */
- EClass FACELET_TAGLIB_TAG_CONVERTER = eINSTANCE.getFaceletTaglibTagConverter();
-
- /**
- * The meta object literal for the '<em><b>Converter Id</b></em>' containment reference feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EReference FACELET_TAGLIB_TAG_CONVERTER__CONVERTER_ID = eINSTANCE.getFaceletTaglibTagConverter_ConverterId();
-
- /**
- * The meta object literal for the '<em><b>Handler Class</b></em>' containment reference feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EReference FACELET_TAGLIB_TAG_CONVERTER__HANDLER_CLASS = eINSTANCE.getFaceletTaglibTagConverter_HandlerClass();
-
- /**
- * The meta object literal for the '<em><b>Converter Extension</b></em>' containment reference list feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EReference FACELET_TAGLIB_TAG_CONVERTER__CONVERTER_EXTENSION = eINSTANCE.getFaceletTaglibTagConverter_ConverterExtension();
-
- /**
- * The meta object literal for the '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl.FaceletTaglibTagExtensionImpl <em>Tag Extension</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl.FaceletTaglibTagExtensionImpl
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl.FaceletTaglibPackageImpl#getFaceletTaglibTagExtension()
- * @generated
- */
- EClass FACELET_TAGLIB_TAG_EXTENSION = eINSTANCE.getFaceletTaglibTagExtension();
-
- /**
- * The meta object literal for the '<em><b>Any</b></em>' attribute list feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EAttribute FACELET_TAGLIB_TAG_EXTENSION__ANY = eINSTANCE.getFaceletTaglibTagExtension_Any();
-
- /**
- * The meta object literal for the '<em><b>Id</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EAttribute FACELET_TAGLIB_TAG_EXTENSION__ID = eINSTANCE.getFaceletTaglibTagExtension_Id();
-
- /**
- * The meta object literal for the '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl.FaceletTaglibTagImpl <em>Tag</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl.FaceletTaglibTagImpl
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl.FaceletTaglibPackageImpl#getFaceletTaglibTag()
- * @generated
- */
- EClass FACELET_TAGLIB_TAG = eINSTANCE.getFaceletTaglibTag();
-
- /**
- * The meta object literal for the '<em><b>Tag Name Element</b></em>' containment reference feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EReference FACELET_TAGLIB_TAG__TAG_NAME_ELEMENT = eINSTANCE.getFaceletTaglibTag_TagNameElement();
-
- /**
- * The meta object literal for the '<em><b>Handler Class Element</b></em>' containment reference feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EReference FACELET_TAGLIB_TAG__HANDLER_CLASS_ELEMENT = eINSTANCE.getFaceletTaglibTag_HandlerClassElement();
-
- /**
- * The meta object literal for the '<em><b>Behavior</b></em>' containment reference feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EReference FACELET_TAGLIB_TAG__BEHAVIOR = eINSTANCE.getFaceletTaglibTag_Behavior();
-
- /**
- * The meta object literal for the '<em><b>Component</b></em>' containment reference feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EReference FACELET_TAGLIB_TAG__COMPONENT = eINSTANCE.getFaceletTaglibTag_Component();
-
- /**
- * The meta object literal for the '<em><b>Converter</b></em>' containment reference feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EReference FACELET_TAGLIB_TAG__CONVERTER = eINSTANCE.getFaceletTaglibTag_Converter();
-
- /**
- * The meta object literal for the '<em><b>Validator</b></em>' containment reference feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EReference FACELET_TAGLIB_TAG__VALIDATOR = eINSTANCE.getFaceletTaglibTag_Validator();
-
- /**
- * The meta object literal for the '<em><b>Source</b></em>' containment reference feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EReference FACELET_TAGLIB_TAG__SOURCE = eINSTANCE.getFaceletTaglibTag_Source();
-
- /**
- * The meta object literal for the '<em><b>Attribute</b></em>' containment reference list feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EReference FACELET_TAGLIB_TAG__ATTRIBUTE = eINSTANCE.getFaceletTaglibTag_Attribute();
-
- /**
- * The meta object literal for the '<em><b>Tag Extension</b></em>' containment reference list feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EReference FACELET_TAGLIB_TAG__TAG_EXTENSION = eINSTANCE.getFaceletTaglibTag_TagExtension();
-
- /**
- * The meta object literal for the '<em><b>Tag Name</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EAttribute FACELET_TAGLIB_TAG__TAG_NAME = eINSTANCE.getFaceletTaglibTag_TagName();
-
- /**
- * The meta object literal for the '<em><b>Handler Class</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EAttribute FACELET_TAGLIB_TAG__HANDLER_CLASS = eINSTANCE.getFaceletTaglibTag_HandlerClass();
-
- /**
- * The meta object literal for the '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl.FaceletTaglibTagValidatorExtensionImpl <em>Tag Validator Extension</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl.FaceletTaglibTagValidatorExtensionImpl
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl.FaceletTaglibPackageImpl#getFaceletTaglibTagValidatorExtension()
- * @generated
- */
- EClass FACELET_TAGLIB_TAG_VALIDATOR_EXTENSION = eINSTANCE.getFaceletTaglibTagValidatorExtension();
-
- /**
- * The meta object literal for the '<em><b>Any</b></em>' attribute list feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EAttribute FACELET_TAGLIB_TAG_VALIDATOR_EXTENSION__ANY = eINSTANCE.getFaceletTaglibTagValidatorExtension_Any();
-
- /**
- * The meta object literal for the '<em><b>Id</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EAttribute FACELET_TAGLIB_TAG_VALIDATOR_EXTENSION__ID = eINSTANCE.getFaceletTaglibTagValidatorExtension_Id();
-
- /**
- * The meta object literal for the '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl.FaceletTaglibTagValidatorImpl <em>Tag Validator</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl.FaceletTaglibTagValidatorImpl
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl.FaceletTaglibPackageImpl#getFaceletTaglibTagValidator()
- * @generated
- */
- EClass FACELET_TAGLIB_TAG_VALIDATOR = eINSTANCE.getFaceletTaglibTagValidator();
-
- /**
- * The meta object literal for the '<em><b>Validator Id</b></em>' containment reference feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EReference FACELET_TAGLIB_TAG_VALIDATOR__VALIDATOR_ID = eINSTANCE.getFaceletTaglibTagValidator_ValidatorId();
-
- /**
- * The meta object literal for the '<em><b>Handler Class</b></em>' containment reference feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EReference FACELET_TAGLIB_TAG_VALIDATOR__HANDLER_CLASS = eINSTANCE.getFaceletTaglibTagValidator_HandlerClass();
-
- /**
- * The meta object literal for the '<em><b>Validator Extension</b></em>' containment reference list feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EReference FACELET_TAGLIB_TAG_VALIDATOR__VALIDATOR_EXTENSION = eINSTANCE.getFaceletTaglibTagValidator_ValidatorExtension();
-
- /**
- * The meta object literal for the '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl.FaceletTaglibImpl <em>Facelet Taglib</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl.FaceletTaglibImpl
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl.FaceletTaglibPackageImpl#getFaceletTaglib()
- * @generated
- */
- EClass FACELET_TAGLIB = eINSTANCE.getFaceletTaglib();
-
- /**
- * The meta object literal for the '<em><b>Library Class</b></em>' containment reference feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EReference FACELET_TAGLIB__LIBRARY_CLASS = eINSTANCE.getFaceletTaglib_LibraryClass();
-
- /**
- * The meta object literal for the '<em><b>Namespace</b></em>' containment reference feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EReference FACELET_TAGLIB__NAMESPACE = eINSTANCE.getFaceletTaglib_Namespace();
-
- /**
- * The meta object literal for the '<em><b>Composite Library Name</b></em>' containment reference feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EReference FACELET_TAGLIB__COMPOSITE_LIBRARY_NAME = eINSTANCE.getFaceletTaglib_CompositeLibraryName();
-
- /**
- * The meta object literal for the '<em><b>Group</b></em>' attribute list feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EAttribute FACELET_TAGLIB__GROUP = eINSTANCE.getFaceletTaglib_Group();
-
- /**
- * The meta object literal for the '<em><b>Tag</b></em>' containment reference list feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EReference FACELET_TAGLIB__TAG = eINSTANCE.getFaceletTaglib_Tag();
-
- /**
- * The meta object literal for the '<em><b>Function</b></em>' containment reference list feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EReference FACELET_TAGLIB__FUNCTION = eINSTANCE.getFaceletTaglib_Function();
-
- /**
- * The meta object literal for the '<em><b>Taglib Extension</b></em>' containment reference list feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EReference FACELET_TAGLIB__TAGLIB_EXTENSION = eINSTANCE.getFaceletTaglib_TaglibExtension();
-
- /**
- * The meta object literal for the '<em><b>Id</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EAttribute FACELET_TAGLIB__ID = eINSTANCE.getFaceletTaglib_Id();
-
- /**
- * The meta object literal for the '<em><b>Version</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EAttribute FACELET_TAGLIB__VERSION = eINSTANCE.getFaceletTaglib_Version();
-
- /**
- * The meta object literal for the '<em><b>Namespace Uri</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EAttribute FACELET_TAGLIB__NAMESPACE_URI = eINSTANCE.getFaceletTaglib_NamespaceUri();
-
- /**
- * The meta object literal for the '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl.FullyQualifiedClassImpl <em>Fully Qualified Class</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl.FullyQualifiedClassImpl
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl.FaceletTaglibPackageImpl#getFullyQualifiedClass()
- * @generated
- */
- EClass FULLY_QUALIFIED_CLASS = eINSTANCE.getFullyQualifiedClass();
-
- /**
- * The meta object literal for the '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl.GenericBooleanImpl <em>Generic Boolean</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl.GenericBooleanImpl
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl.FaceletTaglibPackageImpl#getGenericBoolean()
- * @generated
- */
- EClass GENERIC_BOOLEAN = eINSTANCE.getGenericBoolean();
-
- /**
- * The meta object literal for the '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl.IconImpl <em>Icon</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl.IconImpl
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl.FaceletTaglibPackageImpl#getIcon()
- * @generated
- */
- EClass ICON = eINSTANCE.getIcon();
-
- /**
- * The meta object literal for the '<em><b>Small Icon</b></em>' containment reference feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EReference ICON__SMALL_ICON = eINSTANCE.getIcon_SmallIcon();
-
- /**
- * The meta object literal for the '<em><b>Large Icon</b></em>' containment reference feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EReference ICON__LARGE_ICON = eINSTANCE.getIcon_LargeIcon();
-
- /**
- * The meta object literal for the '<em><b>Id</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EAttribute ICON__ID = eINSTANCE.getIcon_Id();
-
- /**
- * The meta object literal for the '<em><b>Lang</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EAttribute ICON__LANG = eINSTANCE.getIcon_Lang();
-
- /**
- * The meta object literal for the '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl.JavaIdentifierImpl <em>Java Identifier</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl.JavaIdentifierImpl
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl.FaceletTaglibPackageImpl#getJavaIdentifier()
- * @generated
- */
- EClass JAVA_IDENTIFIER = eINSTANCE.getJavaIdentifier();
-
- /**
- * The meta object literal for the '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl.PathImpl <em>Path</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl.PathImpl
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl.FaceletTaglibPackageImpl#getPath()
- * @generated
- */
- EClass PATH = eINSTANCE.getPath();
-
- /**
- * The meta object literal for the '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl.IdentifiableStringValueImpl <em>Identifiable String Value</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl.IdentifiableStringValueImpl
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl.FaceletTaglibPackageImpl#getIdentifiableStringValue()
- * @generated
- */
- EClass IDENTIFIABLE_STRING_VALUE = eINSTANCE.getIdentifiableStringValue();
-
- /**
- * The meta object literal for the '<em><b>Value</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EAttribute IDENTIFIABLE_STRING_VALUE__VALUE = eINSTANCE.getIdentifiableStringValue_Value();
-
- /**
- * The meta object literal for the '<em><b>Id</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EAttribute IDENTIFIABLE_STRING_VALUE__ID = eINSTANCE.getIdentifiableStringValue_Id();
-
- /**
- * The meta object literal for the '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl.IdentifiableLangStringValueImpl <em>Identifiable Lang String Value</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl.IdentifiableLangStringValueImpl
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl.FaceletTaglibPackageImpl#getIdentifiableLangStringValue()
- * @generated
- */
- EClass IDENTIFIABLE_LANG_STRING_VALUE = eINSTANCE.getIdentifiableLangStringValue();
-
- /**
- * The meta object literal for the '<em><b>Lang</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EAttribute IDENTIFIABLE_LANG_STRING_VALUE__LANG = eINSTANCE.getIdentifiableLangStringValue_Lang();
-
- /**
- * The meta object literal for the '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl.UserVisibleTaglibObjectImpl <em>User Visible Taglib Object</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl.UserVisibleTaglibObjectImpl
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl.FaceletTaglibPackageImpl#getUserVisibleTaglibObject()
- * @generated
- */
- EClass USER_VISIBLE_TAGLIB_OBJECT = eINSTANCE.getUserVisibleTaglibObject();
-
- /**
- * The meta object literal for the '<em><b>Description</b></em>' containment reference list feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EReference USER_VISIBLE_TAGLIB_OBJECT__DESCRIPTION = eINSTANCE.getUserVisibleTaglibObject_Description();
-
- /**
- * The meta object literal for the '<em><b>Display Name</b></em>' containment reference list feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EReference USER_VISIBLE_TAGLIB_OBJECT__DISPLAY_NAME = eINSTANCE.getUserVisibleTaglibObject_DisplayName();
-
- /**
- * The meta object literal for the '<em><b>Icon</b></em>' containment reference list feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EReference USER_VISIBLE_TAGLIB_OBJECT__ICON = eINSTANCE.getUserVisibleTaglibObject_Icon();
-
- /**
- * The meta object literal for the '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibVersion <em>Version</em>}' enum.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibVersion
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl.FaceletTaglibPackageImpl#getFaceletTaglibVersion()
- * @generated
- */
- EEnum FACELET_TAGLIB_VERSION = eINSTANCE.getFaceletTaglibVersion();
-
- /**
- * The meta object literal for the '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.GenericBooleanBase <em>Generic Boolean Base</em>}' enum.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.GenericBooleanBase
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl.FaceletTaglibPackageImpl#getGenericBooleanBase()
- * @generated
- */
- EEnum GENERIC_BOOLEAN_BASE = eINSTANCE.getGenericBooleanBase();
-
- /**
- * The meta object literal for the '<em>Version Type Object</em>' data type.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibVersion
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl.FaceletTaglibPackageImpl#getFaceletTaglibVersionTypeObject()
- * @generated
- */
- EDataType FACELET_TAGLIB_VERSION_TYPE_OBJECT = eINSTANCE.getFaceletTaglibVersionTypeObject();
-
- /**
- * The meta object literal for the '<em>Fully Qualified Class Base</em>' data type.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see java.lang.String
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl.FaceletTaglibPackageImpl#getFullyQualifiedClassBase()
- * @generated
- */
- EDataType FULLY_QUALIFIED_CLASS_BASE = eINSTANCE.getFullyQualifiedClassBase();
-
- /**
- * The meta object literal for the '<em>Java Identifier Base</em>' data type.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see java.lang.String
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl.FaceletTaglibPackageImpl#getJavaIdentifierBase()
- * @generated
- */
- EDataType JAVA_IDENTIFIER_BASE = eINSTANCE.getJavaIdentifierBase();
-
- /**
- * The meta object literal for the '<em>Path Type Base</em>' data type.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see java.lang.String
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl.FaceletTaglibPackageImpl#getPathTypeBase()
- * @generated
- */
- EDataType PATH_TYPE_BASE = eINSTANCE.getPathTypeBase();
-
- }
-
-} //FaceletTaglibPackage
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib/FaceletTaglibTag.java b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib/FaceletTaglibTag.java
deleted file mode 100644
index d1124c6..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib/FaceletTaglibTag.java
+++ /dev/null
@@ -1,323 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: FaceletTaglibTag.java,v 1.1 2010/03/18 06:24:28 cbateman Exp $
- */
-package org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib;
-
-import org.eclipse.emf.common.util.EList;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Facelet Taglib Tag</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- *
- * If the tag library XML file contains individual tag
- * declarations rather than pointing to a library-class or a
- * declaring a composite-library name, the individual tags are
- * enclosed in tag elements.
- *
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- * <li>{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTag#getTagNameElement <em>Tag Name Element</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTag#getHandlerClassElement <em>Handler Class Element</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTag#getBehavior <em>Behavior</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTag#getComponent <em>Component</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTag#getConverter <em>Converter</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTag#getValidator <em>Validator</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTag#getSource <em>Source</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTag#getAttribute <em>Attribute</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTag#getTagExtension <em>Tag Extension</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTag#getTagName <em>Tag Name</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTag#getHandlerClass <em>Handler Class</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibPackage#getFaceletTaglibTag()
- * @model extendedMetaData="name='facelet-taglib-tagType' kind='elementOnly'"
- * @generated
- */
-public interface FaceletTaglibTag extends UserVisibleTaglibObject
-{
- /**
- * Returns the value of the '<em><b>Tag Name Element</b></em>' containment reference.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Tag Name Element</em>' containment reference isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @return the value of the '<em>Tag Name Element</em>' containment reference.
- * @see #setTagNameElement(FaceletTaglibCanonicalName)
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibPackage#getFaceletTaglibTag_TagNameElement()
- * @model containment="true" required="true"
- * extendedMetaData="kind='element' name='tag-name' namespace='##targetNamespace'"
- * @generated
- */
- FaceletTaglibCanonicalName getTagNameElement();
-
- /**
- * Sets the value of the '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTag#getTagNameElement <em>Tag Name Element</em>}' containment reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Tag Name Element</em>' containment reference.
- * @see #getTagNameElement()
- * @generated
- */
- void setTagNameElement(FaceletTaglibCanonicalName value);
-
- /**
- * Returns the value of the '<em><b>Handler Class Element</b></em>' containment reference.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Handler Class Element</em>' containment reference isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @return the value of the '<em>Handler Class Element</em>' containment reference.
- * @see #setHandlerClassElement(FullyQualifiedClass)
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibPackage#getFaceletTaglibTag_HandlerClassElement()
- * @model containment="true"
- * extendedMetaData="kind='element' name='handler-class' namespace='##targetNamespace'"
- * @generated
- */
- FullyQualifiedClass getHandlerClassElement();
-
- /**
- * Sets the value of the '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTag#getHandlerClassElement <em>Handler Class Element</em>}' containment reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Handler Class Element</em>' containment reference.
- * @see #getHandlerClassElement()
- * @generated
- */
- void setHandlerClassElement(FullyQualifiedClass value);
-
- /**
- * Returns the value of the '<em><b>Tag Name</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Tag Name</em>' containment reference isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @return the value of the '<em>Tag Name</em>' attribute.
- * @see #setTagName(String)
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibPackage#getFaceletTaglibTag_TagName()
- * @model transient="true" volatile="true"
- * @generated
- */
- String getTagName();
-
- /**
- * Sets the value of the '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTag#getTagName <em>Tag Name</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Tag Name</em>' attribute.
- * @see #getTagName()
- * @generated
- */
- void setTagName(String value);
-
- /**
- * Returns the value of the '<em><b>Handler Class</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Handle Class</em>' attribute isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @return the value of the '<em>Handler Class</em>' attribute.
- * @see #setHandlerClass(String)
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibPackage#getFaceletTaglibTag_HandlerClass()
- * @model transient="true" volatile="true"
- * @generated
- */
- String getHandlerClass();
-
- /**
- * Sets the value of the '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTag#getHandlerClass <em>Handler Class</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Handler Class</em>' attribute.
- * @see #getHandlerClass()
- * @generated
- */
- void setHandlerClass(String value);
-
- /**
- * Returns the value of the '<em><b>Behavior</b></em>' containment reference.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Behavior</em>' containment reference isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @return the value of the '<em>Behavior</em>' containment reference.
- * @see #setBehavior(FaceletTaglibTagBehavior)
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibPackage#getFaceletTaglibTag_Behavior()
- * @model containment="true"
- * extendedMetaData="kind='element' name='behavior' namespace='##targetNamespace'"
- * @generated
- */
- FaceletTaglibTagBehavior getBehavior();
-
- /**
- * Sets the value of the '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTag#getBehavior <em>Behavior</em>}' containment reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Behavior</em>' containment reference.
- * @see #getBehavior()
- * @generated
- */
- void setBehavior(FaceletTaglibTagBehavior value);
-
- /**
- * Returns the value of the '<em><b>Component</b></em>' containment reference.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Component</em>' containment reference isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @return the value of the '<em>Component</em>' containment reference.
- * @see #setComponent(FaceletTaglibTagComponent)
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibPackage#getFaceletTaglibTag_Component()
- * @model containment="true"
- * extendedMetaData="kind='element' name='component' namespace='##targetNamespace'"
- * @generated
- */
- FaceletTaglibTagComponent getComponent();
-
- /**
- * Sets the value of the '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTag#getComponent <em>Component</em>}' containment reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Component</em>' containment reference.
- * @see #getComponent()
- * @generated
- */
- void setComponent(FaceletTaglibTagComponent value);
-
- /**
- * Returns the value of the '<em><b>Converter</b></em>' containment reference.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Converter</em>' containment reference isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @return the value of the '<em>Converter</em>' containment reference.
- * @see #setConverter(FaceletTaglibTagConverter)
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibPackage#getFaceletTaglibTag_Converter()
- * @model containment="true"
- * extendedMetaData="kind='element' name='converter' namespace='##targetNamespace'"
- * @generated
- */
- FaceletTaglibTagConverter getConverter();
-
- /**
- * Sets the value of the '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTag#getConverter <em>Converter</em>}' containment reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Converter</em>' containment reference.
- * @see #getConverter()
- * @generated
- */
- void setConverter(FaceletTaglibTagConverter value);
-
- /**
- * Returns the value of the '<em><b>Validator</b></em>' containment reference.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Validator</em>' containment reference isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @return the value of the '<em>Validator</em>' containment reference.
- * @see #setValidator(FaceletTaglibTagValidator)
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibPackage#getFaceletTaglibTag_Validator()
- * @model containment="true"
- * extendedMetaData="kind='element' name='validator' namespace='##targetNamespace'"
- * @generated
- */
- FaceletTaglibTagValidator getValidator();
-
- /**
- * Sets the value of the '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTag#getValidator <em>Validator</em>}' containment reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Validator</em>' containment reference.
- * @see #getValidator()
- * @generated
- */
- void setValidator(FaceletTaglibTagValidator value);
-
- /**
- * Returns the value of the '<em><b>Source</b></em>' containment reference.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Source</em>' containment reference isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @return the value of the '<em>Source</em>' containment reference.
- * @see #setSource(IdentifiableStringValue)
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibPackage#getFaceletTaglibTag_Source()
- * @model containment="true"
- * extendedMetaData="kind='element' name='source' namespace='##targetNamespace'"
- * @generated
- */
- IdentifiableStringValue getSource();
-
- /**
- * Sets the value of the '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTag#getSource <em>Source</em>}' containment reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Source</em>' containment reference.
- * @see #getSource()
- * @generated
- */
- void setSource(IdentifiableStringValue value);
-
- /**
- * Returns the value of the '<em><b>Attribute</b></em>' containment reference list.
- * The list contents are of type {@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagAttribute}.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Attribute</em>' containment reference list isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @return the value of the '<em>Attribute</em>' containment reference list.
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibPackage#getFaceletTaglibTag_Attribute()
- * @model containment="true"
- * extendedMetaData="kind='element' name='attribute' namespace='##targetNamespace'"
- * @generated
- */
- EList<FaceletTaglibTagAttribute> getAttribute();
-
- /**
- * Returns the value of the '<em><b>Tag Extension</b></em>' containment reference list.
- * The list contents are of type {@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagExtension}.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Tag Extension</em>' containment reference list isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @return the value of the '<em>Tag Extension</em>' containment reference list.
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibPackage#getFaceletTaglibTag_TagExtension()
- * @model containment="true"
- * extendedMetaData="kind='element' name='tag-extension' namespace='##targetNamespace'"
- * @generated
- */
- EList<FaceletTaglibTagExtension> getTagExtension();
-
-} // FaceletTaglibTag
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib/FaceletTaglibTagAttribute.java b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib/FaceletTaglibTagAttribute.java
deleted file mode 100644
index 52d2ea2..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib/FaceletTaglibTagAttribute.java
+++ /dev/null
@@ -1,303 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: FaceletTaglibTagAttribute.java,v 1.1 2010/03/18 06:24:37 cbateman Exp $
- */
-package org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Facelet Taglib Tag Attribute</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- *
- *
- * The attribute element defines an attribute for the nesting
- * tag. The attribute element may have several subelements
- * defining:
- *
- * description a description of the attribute
- *
- * name the name of the attribute
- *
- * required whether the attribute is required or
- * optional
- *
- * type the type of the attribute
- *
- *
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- * <li>{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagAttribute#getNameElement <em>Name Element</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagAttribute#getRequiredElement <em>Required Element</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagAttribute#getTypeElement <em>Type Element</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagAttribute#getMethodSignatureElement <em>Method Signature Element</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagAttribute#getId <em>Id</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagAttribute#getName <em>Name</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagAttribute#isRequired <em>Required</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagAttribute#getType <em>Type</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagAttribute#getMethodSignature <em>Method Signature</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibPackage#getFaceletTaglibTagAttribute()
- * @model extendedMetaData="name='facelet-taglib-tag-attributeType' kind='elementOnly'"
- * @generated
- */
-public interface FaceletTaglibTagAttribute extends UserVisibleTaglibObject
-{
- /**
- * Returns the value of the '<em><b>Name Element</b></em>' containment reference.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Name Element</em>' containment reference isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @return the value of the '<em>Name Element</em>' containment reference.
- * @see #setNameElement(FaceletTaglibCanonicalName)
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibPackage#getFaceletTaglibTagAttribute_NameElement()
- * @model containment="true" required="true"
- * extendedMetaData="kind='element' name='name' namespace='##targetNamespace'"
- * @generated
- */
- FaceletTaglibCanonicalName getNameElement();
-
- /**
- * Sets the value of the '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagAttribute#getNameElement <em>Name Element</em>}' containment reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Name Element</em>' containment reference.
- * @see #getNameElement()
- * @generated
- */
- void setNameElement(FaceletTaglibCanonicalName value);
-
- /**
- * Returns the value of the '<em><b>Required Element</b></em>' containment reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * <!-- begin-model-doc -->
- *
- *
- * Defines if the nesting attribute is required or
- * optional.
- *
- * If not present then the default is "false", i.e
- * the attribute is optional.
- *
- *
- * <!-- end-model-doc -->
- * @return the value of the '<em>Required Element</em>' containment reference.
- * @see #setRequiredElement(GenericBoolean)
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibPackage#getFaceletTaglibTagAttribute_RequiredElement()
- * @model containment="true"
- * extendedMetaData="kind='element' name='required' namespace='##targetNamespace'"
- * @generated
- */
- GenericBoolean getRequiredElement();
-
- /**
- * Sets the value of the '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagAttribute#getRequiredElement <em>Required Element</em>}' containment reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Required Element</em>' containment reference.
- * @see #getRequiredElement()
- * @generated
- */
- void setRequiredElement(GenericBoolean value);
-
- /**
- * Returns the value of the '<em><b>Type Element</b></em>' containment reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * <!-- begin-model-doc -->
- *
- *
- * Defines the Java type of the attributes
- * value. If this element is omitted, the
- * expected type is assumed to be
- * "java.lang.Object".
- *
- *
- * <!-- end-model-doc -->
- * @return the value of the '<em>Type Element</em>' containment reference.
- * @see #setTypeElement(FullyQualifiedClass)
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibPackage#getFaceletTaglibTagAttribute_TypeElement()
- * @model containment="true"
- * extendedMetaData="kind='element' name='type' namespace='##targetNamespace'"
- * @generated
- */
- FullyQualifiedClass getTypeElement();
-
- /**
- * Sets the value of the '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagAttribute#getTypeElement <em>Type Element</em>}' containment reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Type Element</em>' containment reference.
- * @see #getTypeElement()
- * @generated
- */
- void setTypeElement(FullyQualifiedClass value);
-
- /**
- * Returns the value of the '<em><b>Method Signature Element</b></em>' containment reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * <!-- begin-model-doc -->
- *
- *
- * Defines the method signature for a MethodExpression-
- * enabled attribute.
- *
- *
- * <!-- end-model-doc -->
- * @return the value of the '<em>Method Signature Element</em>' containment reference.
- * @see #setMethodSignatureElement(IdentifiableStringValue)
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibPackage#getFaceletTaglibTagAttribute_MethodSignatureElement()
- * @model containment="true"
- * extendedMetaData="kind='element' name='method-signature' namespace='##targetNamespace'"
- * @generated
- */
- IdentifiableStringValue getMethodSignatureElement();
-
- /**
- * Sets the value of the '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagAttribute#getMethodSignatureElement <em>Method Signature Element</em>}' containment reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Method Signature Element</em>' containment reference.
- * @see #getMethodSignatureElement()
- * @generated
- */
- void setMethodSignatureElement(IdentifiableStringValue value);
-
- /**
- * Returns the value of the '<em><b>Name</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Name</em>' containment reference isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @return the value of the '<em>Name</em>' attribute.
- * @see #setName(String)
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibPackage#getFaceletTaglibTagAttribute_Name()
- * @model transient="true" volatile="true"
- * @generated
- */
- String getName();
-
- /**
- * Sets the value of the '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagAttribute#getName <em>Name</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Name</em>' attribute.
- * @see #getName()
- * @generated
- */
- void setName(String value);
-
- /**
- * Returns the value of the '<em><b>Required</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Required</em>' attribute isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @return the value of the '<em>Required</em>' attribute.
- * @see #setRequired(boolean)
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibPackage#getFaceletTaglibTagAttribute_Required()
- * @model transient="true" volatile="true"
- * @generated
- */
- boolean isRequired();
-
- /**
- * Sets the value of the '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagAttribute#isRequired <em>Required</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Required</em>' attribute.
- * @see #isRequired()
- * @generated
- */
- void setRequired(boolean value);
-
- /**
- * Returns the value of the '<em><b>Type</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the value of the '<em>Type</em>' attribute.
- * @see #setType(String)
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibPackage#getFaceletTaglibTagAttribute_Type()
- * @model transient="true" volatile="true"
- * @generated
- */
- String getType();
-
- /**
- * Sets the value of the '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagAttribute#getType <em>Type</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Type</em>' attribute.
- * @see #getType()
- * @generated
- */
- void setType(String value);
-
- /**
- * Returns the value of the '<em><b>Method Signature</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the value of the '<em>Method Signature</em>' attribute.
- * @see #setMethodSignature(String)
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibPackage#getFaceletTaglibTagAttribute_MethodSignature()
- * @model transient="true" volatile="true"
- * @generated
- */
- String getMethodSignature();
-
- /**
- * Sets the value of the '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagAttribute#getMethodSignature <em>Method Signature</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Method Signature</em>' attribute.
- * @see #getMethodSignature()
- * @generated
- */
- void setMethodSignature(String value);
-
- /**
- * Returns the value of the '<em><b>Id</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Id</em>' attribute isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @return the value of the '<em>Id</em>' attribute.
- * @see #setId(String)
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibPackage#getFaceletTaglibTagAttribute_Id()
- * @model id="true" dataType="org.eclipse.emf.ecore.xml.type.ID"
- * extendedMetaData="kind='attribute' name='id'"
- * @generated
- */
- String getId();
-
- /**
- * Sets the value of the '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagAttribute#getId <em>Id</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Id</em>' attribute.
- * @see #getId()
- * @generated
- */
- void setId(String value);
-
-} // FaceletTaglibTagAttribute
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib/FaceletTaglibTagBehavior.java b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib/FaceletTaglibTagBehavior.java
deleted file mode 100644
index 7d0fd20..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib/FaceletTaglibTagBehavior.java
+++ /dev/null
@@ -1,109 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: FaceletTaglibTagBehavior.java,v 1.1 2010/03/18 06:24:37 cbateman Exp $
- */
-package org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib;
-
-import org.eclipse.emf.common.util.EList;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Facelet Taglib Tag Behavior</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- *
- * Within a tag element, the behavior element encapsulates
- * information specific to a JSF Behavior.
- *
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- * <li>{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagBehavior#getBehaviorId <em>Behavior Id</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagBehavior#getHandlerClass <em>Handler Class</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagBehavior#getBehaviorExtension <em>Behavior Extension</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibPackage#getFaceletTaglibTagBehavior()
- * @model extendedMetaData="name='facelet-taglib-tag-behaviorType' kind='elementOnly'"
- * @generated
- */
-public interface FaceletTaglibTagBehavior extends UserVisibleTaglibObject
-{
- /**
- * Returns the value of the '<em><b>Behavior Id</b></em>' containment reference.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Behavior Id</em>' containment reference isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @return the value of the '<em>Behavior Id</em>' containment reference.
- * @see #setBehaviorId(IdentifiableStringValue)
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibPackage#getFaceletTaglibTagBehavior_BehaviorId()
- * @model containment="true" required="true"
- * extendedMetaData="kind='element' name='behavior-id' namespace='##targetNamespace'"
- * @generated
- */
- IdentifiableStringValue getBehaviorId();
-
- /**
- * Sets the value of the '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagBehavior#getBehaviorId <em>Behavior Id</em>}' containment reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Behavior Id</em>' containment reference.
- * @see #getBehaviorId()
- * @generated
- */
- void setBehaviorId(IdentifiableStringValue value);
-
- /**
- * Returns the value of the '<em><b>Handler Class</b></em>' containment reference.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Handler Class</em>' containment reference isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @return the value of the '<em>Handler Class</em>' containment reference.
- * @see #setHandlerClass(FullyQualifiedClass)
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibPackage#getFaceletTaglibTagBehavior_HandlerClass()
- * @model containment="true"
- * extendedMetaData="kind='element' name='handler-class' namespace='##targetNamespace'"
- * @generated
- */
- FullyQualifiedClass getHandlerClass();
-
- /**
- * Sets the value of the '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagBehavior#getHandlerClass <em>Handler Class</em>}' containment reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Handler Class</em>' containment reference.
- * @see #getHandlerClass()
- * @generated
- */
- void setHandlerClass(FullyQualifiedClass value);
-
- /**
- * Returns the value of the '<em><b>Behavior Extension</b></em>' containment reference list.
- * The list contents are of type {@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagBehaviorExtension}.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Behavior Extension</em>' containment reference list isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @return the value of the '<em>Behavior Extension</em>' containment reference list.
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibPackage#getFaceletTaglibTagBehavior_BehaviorExtension()
- * @model containment="true"
- * extendedMetaData="kind='element' name='behavior-extension' namespace='##targetNamespace'"
- * @generated
- */
- EList<FaceletTaglibTagBehaviorExtension> getBehaviorExtension();
-
-} // FaceletTaglibTagBehavior
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib/FaceletTaglibTagBehaviorExtension.java b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib/FaceletTaglibTagBehaviorExtension.java
deleted file mode 100644
index b489e89..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib/FaceletTaglibTagBehaviorExtension.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: FaceletTaglibTagBehaviorExtension.java,v 1.1 2010/03/18 06:24:29 cbateman Exp $
- */
-package org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.util.FeatureMap;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Facelet Taglib Tag Behavior Extension</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- *
- * Extension element for behavior. It may contain
- * implementation specific content.
- *
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- * <li>{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagBehaviorExtension#getAny <em>Any</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagBehaviorExtension#getId <em>Id</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibPackage#getFaceletTaglibTagBehaviorExtension()
- * @model extendedMetaData="name='facelet-taglib-tag-behavior-extensionType' kind='elementOnly'"
- * @generated
- */
-public interface FaceletTaglibTagBehaviorExtension extends EObject
-{
- /**
- * Returns the value of the '<em><b>Any</b></em>' attribute list.
- * The list contents are of type {@link org.eclipse.emf.ecore.util.FeatureMap.Entry}.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Any</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>Any</em>' attribute list.
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibPackage#getFaceletTaglibTagBehaviorExtension_Any()
- * @model unique="false" dataType="org.eclipse.emf.ecore.EFeatureMapEntry" many="true"
- * extendedMetaData="kind='elementWildcard' wildcards='##any' name=':0' processing='lax'"
- * @generated
- */
- FeatureMap getAny();
-
- /**
- * Returns the value of the '<em><b>Id</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Id</em>' attribute isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @return the value of the '<em>Id</em>' attribute.
- * @see #setId(String)
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibPackage#getFaceletTaglibTagBehaviorExtension_Id()
- * @model id="true" dataType="org.eclipse.emf.ecore.xml.type.ID"
- * extendedMetaData="kind='attribute' name='id'"
- * @generated
- */
- String getId();
-
- /**
- * Sets the value of the '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagBehaviorExtension#getId <em>Id</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Id</em>' attribute.
- * @see #getId()
- * @generated
- */
- void setId(String value);
-
-} // FaceletTaglibTagBehaviorExtension
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib/FaceletTaglibTagComponent.java b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib/FaceletTaglibTagComponent.java
deleted file mode 100644
index 585fe2d..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib/FaceletTaglibTagComponent.java
+++ /dev/null
@@ -1,137 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: FaceletTaglibTagComponent.java,v 1.1 2010/03/18 06:24:29 cbateman Exp $
- */
-package org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib;
-
-import org.eclipse.emf.common.util.EList;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Facelet Taglib Tag Component</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- *
- * Within a tag element, the component element encapsulates
- * information specific to a JSF UIComponent.
- *
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- * <li>{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagComponent#getComponentType <em>Component Type</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagComponent#getRendererType <em>Renderer Type</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagComponent#getHandlerClass <em>Handler Class</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagComponent#getComponentExtension <em>Component Extension</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibPackage#getFaceletTaglibTagComponent()
- * @model extendedMetaData="name='facelet-taglib-tag-componentType' kind='elementOnly'"
- * @generated
- */
-public interface FaceletTaglibTagComponent extends UserVisibleTaglibObject
-{
- /**
- * Returns the value of the '<em><b>Component Type</b></em>' containment reference.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Component Type</em>' containment reference isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @return the value of the '<em>Component Type</em>' containment reference.
- * @see #setComponentType(IdentifiableStringValue)
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibPackage#getFaceletTaglibTagComponent_ComponentType()
- * @model containment="true" required="true"
- * extendedMetaData="kind='element' name='component-type' namespace='##targetNamespace'"
- * @generated
- */
- IdentifiableStringValue getComponentType();
-
- /**
- * Sets the value of the '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagComponent#getComponentType <em>Component Type</em>}' containment reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Component Type</em>' containment reference.
- * @see #getComponentType()
- * @generated
- */
- void setComponentType(IdentifiableStringValue value);
-
- /**
- * Returns the value of the '<em><b>Renderer Type</b></em>' containment reference.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Renderer Type</em>' containment reference isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @return the value of the '<em>Renderer Type</em>' containment reference.
- * @see #setRendererType(IdentifiableStringValue)
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibPackage#getFaceletTaglibTagComponent_RendererType()
- * @model containment="true"
- * extendedMetaData="kind='element' name='renderer-type' namespace='##targetNamespace'"
- * @generated
- */
- IdentifiableStringValue getRendererType();
-
- /**
- * Sets the value of the '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagComponent#getRendererType <em>Renderer Type</em>}' containment reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Renderer Type</em>' containment reference.
- * @see #getRendererType()
- * @generated
- */
- void setRendererType(IdentifiableStringValue value);
-
- /**
- * Returns the value of the '<em><b>Handler Class</b></em>' containment reference.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Handler Class</em>' containment reference isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @return the value of the '<em>Handler Class</em>' containment reference.
- * @see #setHandlerClass(FullyQualifiedClass)
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibPackage#getFaceletTaglibTagComponent_HandlerClass()
- * @model containment="true"
- * extendedMetaData="kind='element' name='handler-class' namespace='##targetNamespace'"
- * @generated
- */
- FullyQualifiedClass getHandlerClass();
-
- /**
- * Sets the value of the '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagComponent#getHandlerClass <em>Handler Class</em>}' containment reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Handler Class</em>' containment reference.
- * @see #getHandlerClass()
- * @generated
- */
- void setHandlerClass(FullyQualifiedClass value);
-
- /**
- * Returns the value of the '<em><b>Component Extension</b></em>' containment reference list.
- * The list contents are of type {@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagComponentExtension}.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Component Extension</em>' containment reference list isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @return the value of the '<em>Component Extension</em>' containment reference list.
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibPackage#getFaceletTaglibTagComponent_ComponentExtension()
- * @model containment="true"
- * extendedMetaData="kind='element' name='component-extension' namespace='##targetNamespace'"
- * @generated
- */
- EList<FaceletTaglibTagComponentExtension> getComponentExtension();
-
-} // FaceletTaglibTagComponent
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib/FaceletTaglibTagComponentExtension.java b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib/FaceletTaglibTagComponentExtension.java
deleted file mode 100644
index 83c19b9..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib/FaceletTaglibTagComponentExtension.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: FaceletTaglibTagComponentExtension.java,v 1.1 2010/03/18 06:24:29 cbateman Exp $
- */
-package org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.util.FeatureMap;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Facelet Taglib Tag Component Extension</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- *
- * Extension element for component It may contain
- * implementation specific content.
- *
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- * <li>{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagComponentExtension#getAny <em>Any</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagComponentExtension#getId <em>Id</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibPackage#getFaceletTaglibTagComponentExtension()
- * @model extendedMetaData="name='facelet-taglib-tag-component-extensionType' kind='elementOnly'"
- * @generated
- */
-public interface FaceletTaglibTagComponentExtension extends EObject
-{
- /**
- * Returns the value of the '<em><b>Any</b></em>' attribute list.
- * The list contents are of type {@link org.eclipse.emf.ecore.util.FeatureMap.Entry}.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Any</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>Any</em>' attribute list.
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibPackage#getFaceletTaglibTagComponentExtension_Any()
- * @model unique="false" dataType="org.eclipse.emf.ecore.EFeatureMapEntry" many="true"
- * extendedMetaData="kind='elementWildcard' wildcards='##any' name=':0' processing='lax'"
- * @generated
- */
- FeatureMap getAny();
-
- /**
- * Returns the value of the '<em><b>Id</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Id</em>' attribute isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @return the value of the '<em>Id</em>' attribute.
- * @see #setId(String)
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibPackage#getFaceletTaglibTagComponentExtension_Id()
- * @model id="true" dataType="org.eclipse.emf.ecore.xml.type.ID"
- * extendedMetaData="kind='attribute' name='id'"
- * @generated
- */
- String getId();
-
- /**
- * Sets the value of the '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagComponentExtension#getId <em>Id</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Id</em>' attribute.
- * @see #getId()
- * @generated
- */
- void setId(String value);
-
-} // FaceletTaglibTagComponentExtension
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib/FaceletTaglibTagConverter.java b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib/FaceletTaglibTagConverter.java
deleted file mode 100644
index 35a2b49..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib/FaceletTaglibTagConverter.java
+++ /dev/null
@@ -1,109 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: FaceletTaglibTagConverter.java,v 1.1 2010/03/18 06:24:29 cbateman Exp $
- */
-package org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib;
-
-import org.eclipse.emf.common.util.EList;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Facelet Taglib Tag Converter</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- *
- * Within a tag element, the converter element encapsulates
- * information specific to a JSF Converter.
- *
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- * <li>{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagConverter#getConverterId <em>Converter Id</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagConverter#getHandlerClass <em>Handler Class</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagConverter#getConverterExtension <em>Converter Extension</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibPackage#getFaceletTaglibTagConverter()
- * @model extendedMetaData="name='facelet-taglib-tag-converterType' kind='elementOnly'"
- * @generated
- */
-public interface FaceletTaglibTagConverter extends UserVisibleTaglibObject
-{
- /**
- * Returns the value of the '<em><b>Converter Id</b></em>' containment reference.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Converter Id</em>' containment reference isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @return the value of the '<em>Converter Id</em>' containment reference.
- * @see #setConverterId(IdentifiableStringValue)
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibPackage#getFaceletTaglibTagConverter_ConverterId()
- * @model containment="true" required="true"
- * extendedMetaData="kind='element' name='converter-id' namespace='##targetNamespace'"
- * @generated
- */
- IdentifiableStringValue getConverterId();
-
- /**
- * Sets the value of the '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagConverter#getConverterId <em>Converter Id</em>}' containment reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Converter Id</em>' containment reference.
- * @see #getConverterId()
- * @generated
- */
- void setConverterId(IdentifiableStringValue value);
-
- /**
- * Returns the value of the '<em><b>Handler Class</b></em>' containment reference.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Handler Class</em>' containment reference isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @return the value of the '<em>Handler Class</em>' containment reference.
- * @see #setHandlerClass(FullyQualifiedClass)
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibPackage#getFaceletTaglibTagConverter_HandlerClass()
- * @model containment="true"
- * extendedMetaData="kind='element' name='handler-class' namespace='##targetNamespace'"
- * @generated
- */
- FullyQualifiedClass getHandlerClass();
-
- /**
- * Sets the value of the '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagConverter#getHandlerClass <em>Handler Class</em>}' containment reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Handler Class</em>' containment reference.
- * @see #getHandlerClass()
- * @generated
- */
- void setHandlerClass(FullyQualifiedClass value);
-
- /**
- * Returns the value of the '<em><b>Converter Extension</b></em>' containment reference list.
- * The list contents are of type {@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagConverterExtension}.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Converter Extension</em>' containment reference list isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @return the value of the '<em>Converter Extension</em>' containment reference list.
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibPackage#getFaceletTaglibTagConverter_ConverterExtension()
- * @model containment="true"
- * extendedMetaData="kind='element' name='converter-extension' namespace='##targetNamespace'"
- * @generated
- */
- EList<FaceletTaglibTagConverterExtension> getConverterExtension();
-
-} // FaceletTaglibTagConverter
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib/FaceletTaglibTagConverterExtension.java b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib/FaceletTaglibTagConverterExtension.java
deleted file mode 100644
index e6d88c1..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib/FaceletTaglibTagConverterExtension.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: FaceletTaglibTagConverterExtension.java,v 1.1 2010/03/18 06:24:29 cbateman Exp $
- */
-package org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.util.FeatureMap;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Facelet Taglib Tag Converter Extension</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- *
- * Extension element for converter It may contain
- * implementation specific content.
- *
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- * <li>{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagConverterExtension#getAny <em>Any</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagConverterExtension#getId <em>Id</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibPackage#getFaceletTaglibTagConverterExtension()
- * @model extendedMetaData="name='facelet-taglib-tag-converter-extensionType' kind='elementOnly'"
- * @generated
- */
-public interface FaceletTaglibTagConverterExtension extends EObject
-{
- /**
- * Returns the value of the '<em><b>Any</b></em>' attribute list.
- * The list contents are of type {@link org.eclipse.emf.ecore.util.FeatureMap.Entry}.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Any</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>Any</em>' attribute list.
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibPackage#getFaceletTaglibTagConverterExtension_Any()
- * @model unique="false" dataType="org.eclipse.emf.ecore.EFeatureMapEntry" many="true"
- * extendedMetaData="kind='elementWildcard' wildcards='##any' name=':0' processing='lax'"
- * @generated
- */
- FeatureMap getAny();
-
- /**
- * Returns the value of the '<em><b>Id</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Id</em>' attribute isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @return the value of the '<em>Id</em>' attribute.
- * @see #setId(String)
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibPackage#getFaceletTaglibTagConverterExtension_Id()
- * @model id="true" dataType="org.eclipse.emf.ecore.xml.type.ID"
- * extendedMetaData="kind='attribute' name='id'"
- * @generated
- */
- String getId();
-
- /**
- * Sets the value of the '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagConverterExtension#getId <em>Id</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Id</em>' attribute.
- * @see #getId()
- * @generated
- */
- void setId(String value);
-
-} // FaceletTaglibTagConverterExtension
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib/FaceletTaglibTagExtension.java b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib/FaceletTaglibTagExtension.java
deleted file mode 100644
index 013b045..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib/FaceletTaglibTagExtension.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: FaceletTaglibTagExtension.java,v 1.1 2010/03/18 06:24:37 cbateman Exp $
- */
-package org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.util.FeatureMap;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Facelet Taglib Tag Extension</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- *
- * Extension element for tag It may contain
- * implementation specific content.
- *
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- * <li>{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagExtension#getAny <em>Any</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagExtension#getId <em>Id</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibPackage#getFaceletTaglibTagExtension()
- * @model extendedMetaData="name='facelet-taglib-tag-extensionType' kind='elementOnly'"
- * @generated
- */
-public interface FaceletTaglibTagExtension extends EObject
-{
- /**
- * Returns the value of the '<em><b>Any</b></em>' attribute list.
- * The list contents are of type {@link org.eclipse.emf.ecore.util.FeatureMap.Entry}.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Any</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>Any</em>' attribute list.
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibPackage#getFaceletTaglibTagExtension_Any()
- * @model unique="false" dataType="org.eclipse.emf.ecore.EFeatureMapEntry" many="true"
- * extendedMetaData="kind='elementWildcard' wildcards='##any' name=':0' processing='lax'"
- * @generated
- */
- FeatureMap getAny();
-
- /**
- * Returns the value of the '<em><b>Id</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Id</em>' attribute isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @return the value of the '<em>Id</em>' attribute.
- * @see #setId(String)
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibPackage#getFaceletTaglibTagExtension_Id()
- * @model id="true" dataType="org.eclipse.emf.ecore.xml.type.ID"
- * extendedMetaData="kind='attribute' name='id'"
- * @generated
- */
- String getId();
-
- /**
- * Sets the value of the '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagExtension#getId <em>Id</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Id</em>' attribute.
- * @see #getId()
- * @generated
- */
- void setId(String value);
-
-} // FaceletTaglibTagExtension
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib/FaceletTaglibTagValidator.java b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib/FaceletTaglibTagValidator.java
deleted file mode 100644
index 772fe8c..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib/FaceletTaglibTagValidator.java
+++ /dev/null
@@ -1,109 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: FaceletTaglibTagValidator.java,v 1.1 2010/03/18 06:24:29 cbateman Exp $
- */
-package org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib;
-
-import org.eclipse.emf.common.util.EList;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Facelet Taglib Tag Validator</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- *
- * Within a tag element, the validator element encapsulates
- * information specific to a JSF Validator.
- *
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- * <li>{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagValidator#getValidatorId <em>Validator Id</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagValidator#getHandlerClass <em>Handler Class</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagValidator#getValidatorExtension <em>Validator Extension</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibPackage#getFaceletTaglibTagValidator()
- * @model extendedMetaData="name='facelet-taglib-tag-validatorType' kind='elementOnly'"
- * @generated
- */
-public interface FaceletTaglibTagValidator extends UserVisibleTaglibObject
-{
- /**
- * Returns the value of the '<em><b>Validator Id</b></em>' containment reference.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Validator Id</em>' containment reference isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @return the value of the '<em>Validator Id</em>' containment reference.
- * @see #setValidatorId(IdentifiableStringValue)
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibPackage#getFaceletTaglibTagValidator_ValidatorId()
- * @model containment="true" required="true"
- * extendedMetaData="kind='element' name='validator-id' namespace='##targetNamespace'"
- * @generated
- */
- IdentifiableStringValue getValidatorId();
-
- /**
- * Sets the value of the '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagValidator#getValidatorId <em>Validator Id</em>}' containment reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Validator Id</em>' containment reference.
- * @see #getValidatorId()
- * @generated
- */
- void setValidatorId(IdentifiableStringValue value);
-
- /**
- * Returns the value of the '<em><b>Handler Class</b></em>' containment reference.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Handler Class</em>' containment reference isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @return the value of the '<em>Handler Class</em>' containment reference.
- * @see #setHandlerClass(FullyQualifiedClass)
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibPackage#getFaceletTaglibTagValidator_HandlerClass()
- * @model containment="true"
- * extendedMetaData="kind='element' name='handler-class' namespace='##targetNamespace'"
- * @generated
- */
- FullyQualifiedClass getHandlerClass();
-
- /**
- * Sets the value of the '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagValidator#getHandlerClass <em>Handler Class</em>}' containment reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Handler Class</em>' containment reference.
- * @see #getHandlerClass()
- * @generated
- */
- void setHandlerClass(FullyQualifiedClass value);
-
- /**
- * Returns the value of the '<em><b>Validator Extension</b></em>' containment reference list.
- * The list contents are of type {@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagValidatorExtension}.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Validator Extension</em>' containment reference list isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @return the value of the '<em>Validator Extension</em>' containment reference list.
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibPackage#getFaceletTaglibTagValidator_ValidatorExtension()
- * @model containment="true"
- * extendedMetaData="kind='element' name='validator-extension' namespace='##targetNamespace'"
- * @generated
- */
- EList<FaceletTaglibTagValidatorExtension> getValidatorExtension();
-
-} // FaceletTaglibTagValidator
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib/FaceletTaglibTagValidatorExtension.java b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib/FaceletTaglibTagValidatorExtension.java
deleted file mode 100644
index 08fd06a..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib/FaceletTaglibTagValidatorExtension.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: FaceletTaglibTagValidatorExtension.java,v 1.1 2010/03/18 06:24:29 cbateman Exp $
- */
-package org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.util.FeatureMap;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Facelet Taglib Tag Validator Extension</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- *
- * Extension element for validator It may contain
- * implementation specific content.
- *
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- * <li>{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagValidatorExtension#getAny <em>Any</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagValidatorExtension#getId <em>Id</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibPackage#getFaceletTaglibTagValidatorExtension()
- * @model extendedMetaData="name='facelet-taglib-tag-validator-extensionType' kind='elementOnly'"
- * @generated
- */
-public interface FaceletTaglibTagValidatorExtension extends EObject
-{
- /**
- * Returns the value of the '<em><b>Any</b></em>' attribute list.
- * The list contents are of type {@link org.eclipse.emf.ecore.util.FeatureMap.Entry}.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Any</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>Any</em>' attribute list.
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibPackage#getFaceletTaglibTagValidatorExtension_Any()
- * @model unique="false" dataType="org.eclipse.emf.ecore.EFeatureMapEntry" many="true"
- * extendedMetaData="kind='elementWildcard' wildcards='##any' name=':0' processing='lax'"
- * @generated
- */
- FeatureMap getAny();
-
- /**
- * Returns the value of the '<em><b>Id</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Id</em>' attribute isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @return the value of the '<em>Id</em>' attribute.
- * @see #setId(String)
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibPackage#getFaceletTaglibTagValidatorExtension_Id()
- * @model id="true" dataType="org.eclipse.emf.ecore.xml.type.ID"
- * extendedMetaData="kind='attribute' name='id'"
- * @generated
- */
- String getId();
-
- /**
- * Sets the value of the '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagValidatorExtension#getId <em>Id</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Id</em>' attribute.
- * @see #getId()
- * @generated
- */
- void setId(String value);
-
-} // FaceletTaglibTagValidatorExtension
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib/FaceletTaglibVersion.java b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib/FaceletTaglibVersion.java
deleted file mode 100644
index 48ab61d..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib/FaceletTaglibVersion.java
+++ /dev/null
@@ -1,212 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: FaceletTaglibVersion.java,v 1.1 2010/03/18 06:24:28 cbateman Exp $
- */
-package org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.emf.common.util.Enumerator;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the literals of the enumeration '<em><b>Facelet Taglib Version</b></em>',
- * and utility methods for working with them.
- * <!-- end-user-doc -->
- * <!-- begin-model-doc -->
- *
- * This type contains the recognized versions of
- * facelet-taglib supported.
- *
- * <!-- end-model-doc -->
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibPackage#getFaceletTaglibVersion()
- * @model extendedMetaData="name='facelet-taglib-versionType'"
- * @generated
- */
-public enum FaceletTaglibVersion implements Enumerator
-{
- /**
- * The '<em><b>20</b></em>' literal object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #_20_VALUE
- * @generated
- * @ordered
- */
- _20(0, "_20", "2.0"); //$NON-NLS-1$//$NON-NLS-2$
-
- /**
- * The '<em><b>20</b></em>' literal value.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of '<em><b>20</b></em>' literal object isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @see #_20
- * @model literal="2.0"
- * @generated
- * @ordered
- */
- public static final int _20_VALUE = 0;
-
- /**
- * An array of all the '<em><b>Version</b></em>' enumerators.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private static final FaceletTaglibVersion[] VALUES_ARRAY =
- new FaceletTaglibVersion[]
- {
- _20,
- };
-
- /**
- * A public read-only list of all the '<em><b>Version</b></em>' enumerators.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public static final List<FaceletTaglibVersion> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
-
- /**
- * Returns the '<em><b>Version</b></em>' literal with the specified literal value.
- * <!-- begin-user-doc -->
- * @param literal
- * @return the version
- * <!-- end-user-doc -->
- * @generated
- */
- public static FaceletTaglibVersion get(String literal)
- {
- for (int i = 0; i < VALUES_ARRAY.length; ++i)
- {
- FaceletTaglibVersion result = VALUES_ARRAY[i];
- if (result.toString().equals(literal))
- {
- return result;
- }
- }
- return null;
- }
-
- /**
- * Returns the '<em><b>Version</b></em>' literal with the specified name.
- * <!-- begin-user-doc -->
- * @param name
- * @return the version
- * <!-- end-user-doc -->
- * @generated
- */
- public static FaceletTaglibVersion getByName(String name)
- {
- for (int i = 0; i < VALUES_ARRAY.length; ++i)
- {
- FaceletTaglibVersion result = VALUES_ARRAY[i];
- if (result.getName().equals(name))
- {
- return result;
- }
- }
- return null;
- }
-
- /**
- * Returns the '<em><b>Version</b></em>' literal with the specified integer value.
- * <!-- begin-user-doc -->
- * @param value
- * @return the version
- * <!-- end-user-doc -->
- * @generated
- */
- public static FaceletTaglibVersion get(int value)
- {
- switch (value)
- {
- case _20_VALUE: return _20;
- }
- return null;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private final int value;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private final String name;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private final String literal;
-
- /**
- * Only this class can construct instances.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private FaceletTaglibVersion(int value, String name, String literal)
- {
- this.value = value;
- this.name = name;
- this.literal = literal;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public int getValue()
- {
- return value;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public String getName()
- {
- return name;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public String getLiteral()
- {
- return literal;
- }
-
- /**
- * Returns the literal value of the enumerator, which is its string representation.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public String toString()
- {
- return literal;
- }
-
-} //FaceletTaglibVersion
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib/FullyQualifiedClass.java b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib/FullyQualifiedClass.java
deleted file mode 100644
index 4315186..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib/FullyQualifiedClass.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: FullyQualifiedClass.java,v 1.1 2010/03/18 06:24:29 cbateman Exp $
- */
-package org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Fully Qualified Class</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- *
- *
- * The elements that use this type designate the name of a
- * Java class or interface. The name is in the form of a
- * "binary name", as defined in the JLS. This is the form
- * of name used in Class.forName(). Tools that need the
- * canonical name (the name used in source code) will need
- * to convert this binary name to the canonical name.
- *
- *
- * <!-- end-model-doc -->
- *
- *
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibPackage#getFullyQualifiedClass()
- * @model extendedMetaData="name='fully-qualified-classType' kind='simple'"
- * @generated
- */
-public interface FullyQualifiedClass extends IdentifiableStringValue
-{
- // FullyQualifiedClass
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib/GenericBoolean.java b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib/GenericBoolean.java
deleted file mode 100644
index 23b8f2e..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib/GenericBoolean.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: GenericBoolean.java,v 1.1 2010/03/18 06:24:29 cbateman Exp $
- */
-package org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Generic Boolean</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- *
- *
- * This type defines four different values which can designate
- * boolean values. This includes values yes and no which are
- * not designated by xsd:boolean
- *
- *
- * <!-- end-model-doc -->
- *
- *
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibPackage#getGenericBoolean()
- * @model extendedMetaData="name='generic-booleanType' kind='simple'"
- * @generated
- */
-public interface GenericBoolean extends IdentifiableStringValue
-{
- // GenericBoolean
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib/GenericBooleanBase.java b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib/GenericBooleanBase.java
deleted file mode 100644
index b17f306..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib/GenericBooleanBase.java
+++ /dev/null
@@ -1,287 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: GenericBooleanBase.java,v 1.1 2010/03/18 06:24:28 cbateman Exp $
- */
-package org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.emf.common.util.Enumerator;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the literals of the enumeration '<em><b>Generic Boolean Base</b></em>',
- * and utility methods for working with them.
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibPackage#getGenericBooleanBase()
- * @model extendedMetaData="name='generic-booleanType_._base'"
- * @generated
- */
-public enum GenericBooleanBase implements Enumerator
-{
- /**
- * The '<em><b>True</b></em>' literal object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #TRUE_VALUE
- * @generated
- * @ordered
- */
- TRUE(0, "true", "true"), //$NON-NLS-1$//$NON-NLS-2$
-
- /**
- * The '<em><b>False</b></em>' literal object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #FALSE_VALUE
- * @generated
- * @ordered
- */
- FALSE(1, "false", "false"), //$NON-NLS-1$ //$NON-NLS-2$
-
- /**
- * The '<em><b>Yes</b></em>' literal object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #YES_VALUE
- * @generated
- * @ordered
- */
- YES(2, "yes", "yes"), //$NON-NLS-1$//$NON-NLS-2$
-
- /**
- * The '<em><b>No</b></em>' literal object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #NO_VALUE
- * @generated
- * @ordered
- */
- NO(3, "no", "no"); //$NON-NLS-1$ //$NON-NLS-2$
-
- /**
- * The '<em><b>True</b></em>' literal value.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of '<em><b>True</b></em>' literal object isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @see #TRUE
- * @model name="true"
- * @generated
- * @ordered
- */
- public static final int TRUE_VALUE = 0;
-
- /**
- * The '<em><b>False</b></em>' literal value.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of '<em><b>False</b></em>' literal object isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @see #FALSE
- * @model name="false"
- * @generated
- * @ordered
- */
- public static final int FALSE_VALUE = 1;
-
- /**
- * The '<em><b>Yes</b></em>' literal value.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of '<em><b>Yes</b></em>' literal object isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @see #YES
- * @model name="yes"
- * @generated
- * @ordered
- */
- public static final int YES_VALUE = 2;
-
- /**
- * The '<em><b>No</b></em>' literal value.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of '<em><b>No</b></em>' literal object isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @see #NO
- * @model name="no"
- * @generated
- * @ordered
- */
- public static final int NO_VALUE = 3;
-
- /**
- * An array of all the '<em><b>Generic Boolean Base</b></em>' enumerators.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private static final GenericBooleanBase[] VALUES_ARRAY =
- new GenericBooleanBase[]
- {
- TRUE,
- FALSE,
- YES,
- NO,
- };
-
- /**
- * A public read-only list of all the '<em><b>Generic Boolean Base</b></em>' enumerators.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public static final List<GenericBooleanBase> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
-
- /**
- * Returns the '<em><b>Generic Boolean Base</b></em>' literal with the specified literal value.
- * <!-- begin-user-doc -->
- * @param literal
- * @return value
- * <!-- end-user-doc -->
- * @generated
- */
- public static GenericBooleanBase get(String literal)
- {
- for (int i = 0; i < VALUES_ARRAY.length; ++i)
- {
- GenericBooleanBase result = VALUES_ARRAY[i];
- if (result.toString().equals(literal))
- {
- return result;
- }
- }
- return null;
- }
-
- /**
- * Returns the '<em><b>Generic Boolean Base</b></em>' literal with the specified name.
- * <!-- begin-user-doc -->
- * @param name
- * @return the boolean base.
- * <!-- end-user-doc -->
- * @generated
- */
- public static GenericBooleanBase getByName(String name)
- {
- for (int i = 0; i < VALUES_ARRAY.length; ++i)
- {
- GenericBooleanBase result = VALUES_ARRAY[i];
- if (result.getName().equals(name))
- {
- return result;
- }
- }
- return null;
- }
-
- /**
- * Returns the '<em><b>Generic Boolean Base</b></em>' literal with the specified integer value.
- * <!-- begin-user-doc -->
- * @param value
- * @return the boolean base.
- * <!-- end-user-doc -->
- * @generated
- */
- public static GenericBooleanBase get(int value)
- {
- switch (value)
- {
- case TRUE_VALUE: return TRUE;
- case FALSE_VALUE: return FALSE;
- case YES_VALUE: return YES;
- case NO_VALUE: return NO;
- }
- return null;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private final int value;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private final String name;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private final String literal;
-
- /**
- * Only this class can construct instances.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private GenericBooleanBase(int value, String name, String literal)
- {
- this.value = value;
- this.name = name;
- this.literal = literal;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public int getValue()
- {
- return value;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public String getName()
- {
- return name;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public String getLiteral()
- {
- return literal;
- }
-
- /**
- * Returns the literal value of the enumerator, which is its string representation.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public String toString()
- {
- return literal;
- }
-
-} //GenericBooleanBase
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib/Icon.java b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib/Icon.java
deleted file mode 100644
index 2525a7b..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib/Icon.java
+++ /dev/null
@@ -1,215 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: Icon.java,v 1.1 2010/03/18 06:24:29 cbateman Exp $
- */
-package org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Icon</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- *
- *
- * The icon type contains small-icon and large-icon elements
- * that specify the file names for small and large GIF, JPEG,
- * or PNG icon images used to represent the parent element in a
- * GUI tool.
- *
- * The xml:lang attribute defines the language that the
- * icon file names are provided in. Its value is "en" (English)
- * by default.
- *
- *
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- * <li>{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.Icon#getSmallIcon <em>Small Icon</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.Icon#getLargeIcon <em>Large Icon</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.Icon#getId <em>Id</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.Icon#getLang <em>Lang</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibPackage#getIcon()
- * @model extendedMetaData="name='iconType' kind='elementOnly'"
- * @generated
- */
-public interface Icon extends EObject
-{
- /**
- * Returns the value of the '<em><b>Small Icon</b></em>' containment reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * <!-- begin-model-doc -->
- *
- * <![CDATA[
- *
- * The small-icon element contains the name of a file
- * containing a small (16 x 16) icon image. The file
- * name is a relative path within the Deployment
- * Component's Deployment File.
- *
- * The image may be in the GIF, JPEG, or PNG format.
- * The icon can be used by tools.
- *
- * Example:
- *
- * <small-icon>employee-service-icon16x16.jpg</small-icon>
- *
- * ]]>
- *
- * <!-- end-model-doc -->
- * @return the value of the '<em>Small Icon</em>' containment reference.
- * @see #setSmallIcon(Path)
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibPackage#getIcon_SmallIcon()
- * @model containment="true"
- * extendedMetaData="kind='element' name='small-icon' namespace='##targetNamespace'"
- * @generated
- */
- Path getSmallIcon();
-
- /**
- * Sets the value of the '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.Icon#getSmallIcon <em>Small Icon</em>}' containment reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Small Icon</em>' containment reference.
- * @see #getSmallIcon()
- * @generated
- */
- void setSmallIcon(Path value);
-
- /**
- * Returns the value of the '<em><b>Large Icon</b></em>' containment reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * <!-- begin-model-doc -->
- *
- * <![CDATA[
- *
- * The large-icon element contains the name of a file
- * containing a large
- * (32 x 32) icon image. The file name is a relative
- * path within the Deployment Component's Deployment
- * File.
- *
- * The image may be in the GIF, JPEG, or PNG format.
- * The icon can be used by tools.
- *
- * Example:
- *
- * <large-icon>employee-service-icon32x32.jpg</large-icon>
- *
- * ]]>
- *
- * <!-- end-model-doc -->
- * @return the value of the '<em>Large Icon</em>' containment reference.
- * @see #setLargeIcon(Path)
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibPackage#getIcon_LargeIcon()
- * @model containment="true"
- * extendedMetaData="kind='element' name='large-icon' namespace='##targetNamespace'"
- * @generated
- */
- Path getLargeIcon();
-
- /**
- * Sets the value of the '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.Icon#getLargeIcon <em>Large Icon</em>}' containment reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Large Icon</em>' containment reference.
- * @see #getLargeIcon()
- * @generated
- */
- void setLargeIcon(Path value);
-
- /**
- * Returns the value of the '<em><b>Id</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Id</em>' attribute isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @return the value of the '<em>Id</em>' attribute.
- * @see #setId(String)
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibPackage#getIcon_Id()
- * @model id="true" dataType="org.eclipse.emf.ecore.xml.type.ID"
- * extendedMetaData="kind='attribute' name='id'"
- * @generated
- */
- String getId();
-
- /**
- * Sets the value of the '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.Icon#getId <em>Id</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Id</em>' attribute.
- * @see #getId()
- * @generated
- */
- void setId(String value);
-
- /**
- * Returns the value of the '<em><b>Lang</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * <!-- begin-model-doc -->
- *
- * <div xmlns="http://www.w3.org/1999/xhtml">
- *
- * <h3>lang (as an attribute name)</h3>
- * <p>
- * denotes an attribute whose value
- * is a language code for the natural language of the content of
- * any element; its value is inherited. This name is reserved
- * by virtue of its definition in the XML specification.</p>
- *
- * </div>
- * <div xmlns="http://www.w3.org/1999/xhtml">
- * <h4>Notes</h4>
- * <p>
- * Attempting to install the relevant ISO 2- and 3-letter
- * codes as the enumerated possible values is probably never
- * going to be a realistic possibility.
- * </p>
- * <p>
- * See BCP 47 at <a href="http://www.rfc-editor.org/rfc/bcp/bcp47.txt">
- * http://www.rfc-editor.org/rfc/bcp/bcp47.txt</a>
- * and the IANA language subtag registry at
- * <a href="http://www.iana.org/assignments/language-subtag-registry">
- * http://www.iana.org/assignments/language-subtag-registry</a>
- * for further information.
- * </p>
- * <p>
- * The union allows for the 'un-declaration' of xml:lang with
- * the empty string.
- * </p>
- * </div>
- *
- * <!-- end-model-doc -->
- * @return the value of the '<em>Lang</em>' attribute.
- * @see #setLang(String)
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibPackage#getIcon_Lang()
- * @model extendedMetaData="kind='attribute' name='lang' namespace='http://www.w3.org/XML/1998/namespace'"
- * @generated
- */
- String getLang();
-
- /**
- * Sets the value of the '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.Icon#getLang <em>Lang</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Lang</em>' attribute.
- * @see #getLang()
- * @generated
- */
- void setLang(String value);
-
-} // Icon
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib/IdentifiableLangStringValue.java b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib/IdentifiableLangStringValue.java
deleted file mode 100644
index 262a670..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib/IdentifiableLangStringValue.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: IdentifiableLangStringValue.java,v 1.1 2010/03/18 06:24:37 cbateman Exp $
- */
-package org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Identifiable Lang String Value</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- * <li>{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.IdentifiableLangStringValue#getLang <em>Lang</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibPackage#getIdentifiableLangStringValue()
- * @model abstract="true"
- * @generated
- */
-public interface IdentifiableLangStringValue extends IdentifiableStringValue
-{
- /**
- * Returns the value of the '<em><b>Lang</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * <!-- begin-model-doc -->
- *
- * <div xmlns="http://www.w3.org/1999/xhtml">
- *
- * <h3>lang (as an attribute name)</h3>
- * <p>
- * denotes an attribute whose value
- * is a language code for the natural language of the content of
- * any element; its value is inherited. This name is reserved
- * by virtue of its definition in the XML specification.</p>
- *
- * </div>
- * <div xmlns="http://www.w3.org/1999/xhtml">
- * <h4>Notes</h4>
- * <p>
- * Attempting to install the relevant ISO 2- and 3-letter
- * codes as the enumerated possible values is probably never
- * going to be a realistic possibility.
- * </p>
- * <p>
- * See BCP 47 at <a href="http://www.rfc-editor.org/rfc/bcp/bcp47.txt">
- * http://www.rfc-editor.org/rfc/bcp/bcp47.txt</a>
- * and the IANA language subtag registry at
- * <a href="http://www.iana.org/assignments/language-subtag-registry">
- * http://www.iana.org/assignments/language-subtag-registry</a>
- * for further information.
- * </p>
- * <p>
- * The union allows for the 'un-declaration' of xml:lang with
- * the empty string.
- * </p>
- * </div>
- *
- * <!-- end-model-doc -->
- * @return the value of the '<em>Lang</em>' attribute.
- * @see #setLang(String)
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibPackage#getIdentifiableLangStringValue_Lang()
- * @model extendedMetaData="kind='attribute' name='lang' namespace='http://www.w3.org/XML/1998/namespace'"
- * @generated
- */
- String getLang();
-
- /**
- * Sets the value of the '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.IdentifiableLangStringValue#getLang <em>Lang</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Lang</em>' attribute.
- * @see #getLang()
- * @generated
- */
- void setLang(String value);
-
-} // IdentifiableLangStringValue
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib/IdentifiableStringValue.java b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib/IdentifiableStringValue.java
deleted file mode 100644
index 6e0693c..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib/IdentifiableStringValue.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: IdentifiableStringValue.java,v 1.1 2010/03/18 06:24:36 cbateman Exp $
- */
-package org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Identifiable String Value</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- *
- *
- * This is a special string datatype that is defined by Java EE as
- * a base type for defining collapsed strings. When schemas
- * require trailing/leading space elimination as well as
- * collapsing the existing whitespace, this base type may be
- * used.
- *
- *
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- * <li>{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.IdentifiableStringValue#getValue <em>Value</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.IdentifiableStringValue#getId <em>Id</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibPackage#getIdentifiableStringValue()
- * @model extendedMetaData="name='string' kind='simple'"
- * @generated
- */
-public interface IdentifiableStringValue extends EObject
-{
- /**
- * Returns the value of the '<em><b>Value</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Value</em>' attribute isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @return the value of the '<em>Value</em>' attribute.
- * @see #setValue(String)
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibPackage#getIdentifiableStringValue_Value()
- * @model dataType="org.eclipse.emf.ecore.xml.type.Token"
- * extendedMetaData="name=':0' kind='simple'"
- * @generated
- */
- String getValue();
-
- /**
- * Sets the value of the '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.IdentifiableStringValue#getValue <em>Value</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Value</em>' attribute.
- * @see #getValue()
- * @generated
- */
- void setValue(String value);
-
- /**
- * Returns the value of the '<em><b>Id</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Id</em>' attribute isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @return the value of the '<em>Id</em>' attribute.
- * @see #setId(String)
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibPackage#getIdentifiableStringValue_Id()
- * @model id="true" dataType="org.eclipse.emf.ecore.xml.type.ID"
- * extendedMetaData="kind='attribute' name='id'"
- * @generated
- */
- String getId();
-
- /**
- * Sets the value of the '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.IdentifiableStringValue#getId <em>Id</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Id</em>' attribute.
- * @see #getId()
- * @generated
- */
- void setId(String value);
-
-} // IdentifiableStringValue
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib/JavaIdentifier.java b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib/JavaIdentifier.java
deleted file mode 100644
index f6623c1..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib/JavaIdentifier.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: JavaIdentifier.java,v 1.1 2010/03/18 06:24:37 cbateman Exp $
- */
-package org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Java Identifier</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- *
- *
- * The java-identifierType defines a Java identifier.
- * The users of this type should further verify that
- * the content does not contain Java reserved keywords.
- *
- *
- * <!-- end-model-doc -->
- *
- *
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibPackage#getJavaIdentifier()
- * @model extendedMetaData="name='java-identifierType' kind='simple'"
- * @generated
- */
-public interface JavaIdentifier extends IdentifiableStringValue
-{
- // JavaIdentifier
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib/Path.java b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib/Path.java
deleted file mode 100644
index 35a2fb7..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib/Path.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: Path.java,v 1.1 2010/03/18 06:24:37 cbateman Exp $
- */
-package org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Path</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- *
- *
- * The elements that use this type designate either a relative
- * path or an absolute path starting with a "/".
- *
- * In elements that specify a pathname to a file within the
- * same Deployment File, relative filenames (i.e., those not
- * starting with "/") are considered relative to the root of
- * the Deployment File's namespace. Absolute filenames (i.e.,
- * those starting with "/") also specify names in the root of
- * the Deployment File's namespace. In general, relative names
- * are preferred. The exception is .war files where absolute
- * names are preferred for consistency with the Servlet API.
- *
- *
- * <!-- end-model-doc -->
- *
- *
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibPackage#getPath()
- * @model extendedMetaData="name='pathType' kind='simple'"
- * @generated
- */
-public interface Path extends IdentifiableStringValue
-{
- // Path
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib/UserVisibleTaglibObject.java b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib/UserVisibleTaglibObject.java
deleted file mode 100644
index d4684f8..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib/UserVisibleTaglibObject.java
+++ /dev/null
@@ -1,150 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: UserVisibleTaglibObject.java,v 1.1 2010/03/18 06:24:37 cbateman Exp $
- */
-package org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>User Visible Taglib Object</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- * <li>{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.UserVisibleTaglibObject#getDescription <em>Description</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.UserVisibleTaglibObject#getDisplayName <em>Display Name</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.UserVisibleTaglibObject#getIcon <em>Icon</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibPackage#getUserVisibleTaglibObject()
- * @model abstract="true"
- * @generated
- */
-public interface UserVisibleTaglibObject extends EObject
-{
- /**
- * Returns the value of the '<em><b>Description</b></em>' containment reference list.
- * The list contents are of type {@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.Description}.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Description</em>' containment reference list isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @return the value of the '<em>Description</em>' containment reference list.
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibPackage#getUserVisibleTaglibObject_Description()
- * @model containment="true"
- * extendedMetaData="kind='element' name='description' namespace='##targetNamespace'"
- * @generated
- */
- EList<Description> getDescription();
-
- /**
- * Returns the value of the '<em><b>Display Name</b></em>' containment reference list.
- * The list contents are of type {@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.DisplayName}.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Display Name</em>' containment reference list isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @return the value of the '<em>Display Name</em>' containment reference list.
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibPackage#getUserVisibleTaglibObject_DisplayName()
- * @model containment="true"
- * extendedMetaData="kind='element' name='display-name' namespace='##targetNamespace'"
- * @generated
- */
- EList<DisplayName> getDisplayName();
-
- /**
- * Returns the value of the '<em><b>Icon</b></em>' containment reference list.
- * The list contents are of type {@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.Icon}.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Icon</em>' containment reference list isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @return the value of the '<em>Icon</em>' containment reference list.
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibPackage#getUserVisibleTaglibObject_Icon()
- * @model containment="true"
- * extendedMetaData="kind='element' name='icon' namespace='##targetNamespace'"
- * @generated
- */
- EList<Icon> getIcon();
-
- /**
- * <!-- begin-user-doc -->
- * @param language
- * @return
- * <!-- end-user-doc -->
- * <!-- begin-model-doc -->
- * Iterates through all descriptions and returns a concatenated string of
- * all descriptions for the specified language.
- * Passing the empty string indicates descriptions with no locale.
- * Passing null is invalid and will cause an NPE to be thrown.
- * @param separationString
- * A string that will be used to separate each individual description after it
- * has been trimmed but before it is concatenated to the result.
- * <!-- end-model-doc -->
- * @model
- * @generated
- */
- String getDescription(String language, String separationString);
-
- /**
- * <!-- begin-user-doc -->
- * @return
- * <!-- end-user-doc -->
- * <!-- begin-model-doc -->
- * Equivalent to getDescription("").
- * @param separationString
- * A string that will be used to separate each individual display-name after it
- * has been trimmed but before it is concatenated to the result.
- * <!-- end-model-doc -->
- * @model
- * @generated
- */
- String getDefaultDescription(String separationString);
-
- /**
- * <!-- begin-user-doc -->
- * @param language
- * @return
- * <!-- end-user-doc -->
- * <!-- begin-model-doc -->
- * Iterates through all display names and returns a concatenated string of
- * all display names for the specified language. Passing null indicates the use of the current locale.
- * Passing the empty string indicates descriptions with no locale.
- * @param separationString
- * A string that will be used to separate each individual display-name after it
- * has been trimmed but before it is concatenated to the result.
- * <!-- end-model-doc -->
- * @model
- * @generated
- */
- String getDisplayName(String language, String separationString);
-
- /**
- * <!-- begin-user-doc -->
- * @return
- * <!-- end-user-doc -->
- * <!-- begin-model-doc -->
- * Equivalent to getDisplayName("").
- * @param separationString
- * A string that will be used to separate each individual display-name after it
- * has been trimmed but before it is concatenated to the result.
- * <!-- end-model-doc -->
- * @model
- * @generated
- */
- String getDefaultDisplayName(String separationString);
-
-} // UserVisibleTaglibObject
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib/impl/DescriptionImpl.java b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib/impl/DescriptionImpl.java
deleted file mode 100644
index 1b9cf17..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib/impl/DescriptionImpl.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: DescriptionImpl.java,v 1.1 2010/03/18 06:24:38 cbateman Exp $
- */
-package org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.Description;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Description</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * </p>
- *
- * @generated
- */
-public class DescriptionImpl extends IdentifiableLangStringValueImpl implements Description
-{
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected DescriptionImpl()
- {
- super();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- protected EClass eStaticClass()
- {
- return FaceletTaglibPackage.Literals.DESCRIPTION;
- }
-
-} //DescriptionImpl
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib/impl/DisplayNameImpl.java b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib/impl/DisplayNameImpl.java
deleted file mode 100644
index 9b59e3b..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib/impl/DisplayNameImpl.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: DisplayNameImpl.java,v 1.1 2010/03/18 06:24:38 cbateman Exp $
- */
-package org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.DisplayName;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Display Name</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * </p>
- *
- * @generated
- */
-public class DisplayNameImpl extends IdentifiableLangStringValueImpl implements DisplayName
-{
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected DisplayNameImpl()
- {
- super();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- protected EClass eStaticClass()
- {
- return FaceletTaglibPackage.Literals.DISPLAY_NAME;
- }
-
-} //DisplayNameImpl
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib/impl/DocumentRootImpl.java b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib/impl/DocumentRootImpl.java
deleted file mode 100644
index 3786cba..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib/impl/DocumentRootImpl.java
+++ /dev/null
@@ -1,307 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: DocumentRootImpl.java,v 1.1 2010/03/18 06:24:38 cbateman Exp $
- */
-package org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl;
-
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EMap;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.EcorePackage;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.emf.ecore.impl.EStringToStringMapEntryImpl;
-import org.eclipse.emf.ecore.util.BasicFeatureMap;
-import org.eclipse.emf.ecore.util.EcoreEMap;
-import org.eclipse.emf.ecore.util.FeatureMap;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.DocumentRoot;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglib;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Document Root</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- * <li>{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl.DocumentRootImpl#getMixed <em>Mixed</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl.DocumentRootImpl#getXMLNSPrefixMap <em>XMLNS Prefix Map</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl.DocumentRootImpl#getXSISchemaLocation <em>XSI Schema Location</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl.DocumentRootImpl#getFaceletTaglib <em>Facelet Taglib</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class DocumentRootImpl extends EObjectImpl implements DocumentRoot
-{
- /**
- * The cached value of the '{@link #getMixed() <em>Mixed</em>}' attribute list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getMixed()
- * @generated
- * @ordered
- */
- protected FeatureMap mixed;
-
- /**
- * The cached value of the '{@link #getXMLNSPrefixMap() <em>XMLNS Prefix Map</em>}' map.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getXMLNSPrefixMap()
- * @generated
- * @ordered
- */
- protected EMap<String, String> xMLNSPrefixMap;
-
- /**
- * The cached value of the '{@link #getXSISchemaLocation() <em>XSI Schema Location</em>}' map.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getXSISchemaLocation()
- * @generated
- * @ordered
- */
- protected EMap<String, String> xSISchemaLocation;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected DocumentRootImpl()
- {
- super();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- protected EClass eStaticClass()
- {
- return FaceletTaglibPackage.Literals.DOCUMENT_ROOT;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public FeatureMap getMixed()
- {
- if (mixed == null)
- {
- mixed = new BasicFeatureMap(this, FaceletTaglibPackage.DOCUMENT_ROOT__MIXED);
- }
- return mixed;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EMap<String, String> getXMLNSPrefixMap()
- {
- if (xMLNSPrefixMap == null)
- {
- xMLNSPrefixMap = new EcoreEMap<String,String>(EcorePackage.Literals.ESTRING_TO_STRING_MAP_ENTRY, EStringToStringMapEntryImpl.class, this, FaceletTaglibPackage.DOCUMENT_ROOT__XMLNS_PREFIX_MAP);
- }
- return xMLNSPrefixMap;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EMap<String, String> getXSISchemaLocation()
- {
- if (xSISchemaLocation == null)
- {
- xSISchemaLocation = new EcoreEMap<String,String>(EcorePackage.Literals.ESTRING_TO_STRING_MAP_ENTRY, EStringToStringMapEntryImpl.class, this, FaceletTaglibPackage.DOCUMENT_ROOT__XSI_SCHEMA_LOCATION);
- }
- return xSISchemaLocation;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public FaceletTaglib getFaceletTaglib()
- {
- return (FaceletTaglib)getMixed().get(FaceletTaglibPackage.Literals.DOCUMENT_ROOT__FACELET_TAGLIB, true);
- }
-
- /**
- * <!-- begin-user-doc -->
- * @param newFaceletTaglib
- * @param msgs
- * @return the notification chain
- * <!-- end-user-doc -->
- * @generated
- */
- public NotificationChain basicSetFaceletTaglib(FaceletTaglib newFaceletTaglib, NotificationChain msgs)
- {
- return ((FeatureMap.Internal)getMixed()).basicAdd(FaceletTaglibPackage.Literals.DOCUMENT_ROOT__FACELET_TAGLIB, newFaceletTaglib, msgs);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setFaceletTaglib(FaceletTaglib newFaceletTaglib)
- {
- ((FeatureMap.Internal)getMixed()).set(FaceletTaglibPackage.Literals.DOCUMENT_ROOT__FACELET_TAGLIB, newFaceletTaglib);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)
- {
- switch (featureID)
- {
- case FaceletTaglibPackage.DOCUMENT_ROOT__MIXED:
- return ((InternalEList<?>)getMixed()).basicRemove(otherEnd, msgs);
- case FaceletTaglibPackage.DOCUMENT_ROOT__XMLNS_PREFIX_MAP:
- return ((InternalEList<?>)getXMLNSPrefixMap()).basicRemove(otherEnd, msgs);
- case FaceletTaglibPackage.DOCUMENT_ROOT__XSI_SCHEMA_LOCATION:
- return ((InternalEList<?>)getXSISchemaLocation()).basicRemove(otherEnd, msgs);
- case FaceletTaglibPackage.DOCUMENT_ROOT__FACELET_TAGLIB:
- return basicSetFaceletTaglib(null, msgs);
- }
- return super.eInverseRemove(otherEnd, featureID, msgs);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public Object eGet(int featureID, boolean resolve, boolean coreType)
- {
- switch (featureID)
- {
- case FaceletTaglibPackage.DOCUMENT_ROOT__MIXED:
- if (coreType) return getMixed();
- return ((FeatureMap.Internal)getMixed()).getWrapper();
- case FaceletTaglibPackage.DOCUMENT_ROOT__XMLNS_PREFIX_MAP:
- if (coreType) return getXMLNSPrefixMap();
- return getXMLNSPrefixMap().map();
- case FaceletTaglibPackage.DOCUMENT_ROOT__XSI_SCHEMA_LOCATION:
- if (coreType) return getXSISchemaLocation();
- return getXSISchemaLocation().map();
- case FaceletTaglibPackage.DOCUMENT_ROOT__FACELET_TAGLIB:
- return getFaceletTaglib();
- }
- return super.eGet(featureID, resolve, coreType);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public void eSet(int featureID, Object newValue)
- {
- switch (featureID)
- {
- case FaceletTaglibPackage.DOCUMENT_ROOT__MIXED:
- ((FeatureMap.Internal)getMixed()).set(newValue);
- return;
- case FaceletTaglibPackage.DOCUMENT_ROOT__XMLNS_PREFIX_MAP:
- ((EStructuralFeature.Setting)getXMLNSPrefixMap()).set(newValue);
- return;
- case FaceletTaglibPackage.DOCUMENT_ROOT__XSI_SCHEMA_LOCATION:
- ((EStructuralFeature.Setting)getXSISchemaLocation()).set(newValue);
- return;
- case FaceletTaglibPackage.DOCUMENT_ROOT__FACELET_TAGLIB:
- setFaceletTaglib((FaceletTaglib)newValue);
- return;
- }
- super.eSet(featureID, newValue);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public void eUnset(int featureID)
- {
- switch (featureID)
- {
- case FaceletTaglibPackage.DOCUMENT_ROOT__MIXED:
- getMixed().clear();
- return;
- case FaceletTaglibPackage.DOCUMENT_ROOT__XMLNS_PREFIX_MAP:
- getXMLNSPrefixMap().clear();
- return;
- case FaceletTaglibPackage.DOCUMENT_ROOT__XSI_SCHEMA_LOCATION:
- getXSISchemaLocation().clear();
- return;
- case FaceletTaglibPackage.DOCUMENT_ROOT__FACELET_TAGLIB:
- setFaceletTaglib((FaceletTaglib)null);
- return;
- }
- super.eUnset(featureID);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public boolean eIsSet(int featureID)
- {
- switch (featureID)
- {
- case FaceletTaglibPackage.DOCUMENT_ROOT__MIXED:
- return mixed != null && !mixed.isEmpty();
- case FaceletTaglibPackage.DOCUMENT_ROOT__XMLNS_PREFIX_MAP:
- return xMLNSPrefixMap != null && !xMLNSPrefixMap.isEmpty();
- case FaceletTaglibPackage.DOCUMENT_ROOT__XSI_SCHEMA_LOCATION:
- return xSISchemaLocation != null && !xSISchemaLocation.isEmpty();
- case FaceletTaglibPackage.DOCUMENT_ROOT__FACELET_TAGLIB:
- return getFaceletTaglib() != null;
- }
- return super.eIsSet(featureID);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public String toString()
- {
- if (eIsProxy()) return super.toString();
-
- StringBuffer result = new StringBuffer(super.toString());
- result.append(" (mixed: "); //$NON-NLS-1$
- result.append(mixed);
- result.append(')');
- return result.toString();
- }
-
-} //DocumentRootImpl
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib/impl/FaceletTaglibCanonicalNameImpl.java b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib/impl/FaceletTaglibCanonicalNameImpl.java
deleted file mode 100644
index 01a3571..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib/impl/FaceletTaglibCanonicalNameImpl.java
+++ /dev/null
@@ -1,234 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: FaceletTaglibCanonicalNameImpl.java,v 1.1 2010/03/18 06:24:39 cbateman Exp $
- */
-package org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.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.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibCanonicalName;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Facelet Taglib Canonical Name</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- * <li>{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl.FaceletTaglibCanonicalNameImpl#getValue <em>Value</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl.FaceletTaglibCanonicalNameImpl#getId <em>Id</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class FaceletTaglibCanonicalNameImpl extends EObjectImpl implements FaceletTaglibCanonicalName
-{
- /**
- * The default value of the '{@link #getValue() <em>Value</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getValue()
- * @generated
- * @ordered
- */
- protected static final String VALUE_EDEFAULT = null;
-
- /**
- * The cached value of the '{@link #getValue() <em>Value</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getValue()
- * @generated
- * @ordered
- */
- protected String value = VALUE_EDEFAULT;
-
- /**
- * The default value of the '{@link #getId() <em>Id</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getId()
- * @generated
- * @ordered
- */
- protected static final String ID_EDEFAULT = null;
-
- /**
- * The cached value of the '{@link #getId() <em>Id</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getId()
- * @generated
- * @ordered
- */
- protected String id = ID_EDEFAULT;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected FaceletTaglibCanonicalNameImpl()
- {
- super();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- protected EClass eStaticClass()
- {
- return FaceletTaglibPackage.Literals.FACELET_TAGLIB_CANONICAL_NAME;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public String getValue()
- {
- return value;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setValue(String newValue)
- {
- String oldValue = value;
- value = newValue;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, FaceletTaglibPackage.FACELET_TAGLIB_CANONICAL_NAME__VALUE, oldValue, value));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public String getId()
- {
- return id;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setId(String newId)
- {
- String oldId = id;
- id = newId;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, FaceletTaglibPackage.FACELET_TAGLIB_CANONICAL_NAME__ID, oldId, id));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public Object eGet(int featureID, boolean resolve, boolean coreType)
- {
- switch (featureID)
- {
- case FaceletTaglibPackage.FACELET_TAGLIB_CANONICAL_NAME__VALUE:
- return getValue();
- case FaceletTaglibPackage.FACELET_TAGLIB_CANONICAL_NAME__ID:
- return getId();
- }
- return super.eGet(featureID, resolve, coreType);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public void eSet(int featureID, Object newValue)
- {
- switch (featureID)
- {
- case FaceletTaglibPackage.FACELET_TAGLIB_CANONICAL_NAME__VALUE:
- setValue((String)newValue);
- return;
- case FaceletTaglibPackage.FACELET_TAGLIB_CANONICAL_NAME__ID:
- setId((String)newValue);
- return;
- }
- super.eSet(featureID, newValue);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public void eUnset(int featureID)
- {
- switch (featureID)
- {
- case FaceletTaglibPackage.FACELET_TAGLIB_CANONICAL_NAME__VALUE:
- setValue(VALUE_EDEFAULT);
- return;
- case FaceletTaglibPackage.FACELET_TAGLIB_CANONICAL_NAME__ID:
- setId(ID_EDEFAULT);
- return;
- }
- super.eUnset(featureID);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public boolean eIsSet(int featureID)
- {
- switch (featureID)
- {
- case FaceletTaglibPackage.FACELET_TAGLIB_CANONICAL_NAME__VALUE:
- return VALUE_EDEFAULT == null ? value != null : !VALUE_EDEFAULT.equals(value);
- case FaceletTaglibPackage.FACELET_TAGLIB_CANONICAL_NAME__ID:
- return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
- }
- return super.eIsSet(featureID);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public String toString()
- {
- if (eIsProxy()) return super.toString();
-
- StringBuffer result = new StringBuffer(super.toString());
- result.append(" (value: "); //$NON-NLS-1$
- result.append(value);
- result.append(", id: "); //$NON-NLS-1$
- result.append(id);
- result.append(')');
- return result.toString();
- }
-
-} //FaceletTaglibCanonicalNameImpl
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib/impl/FaceletTaglibExtensionImpl.java b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib/impl/FaceletTaglibExtensionImpl.java
deleted file mode 100644
index a347bc2..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib/impl/FaceletTaglibExtensionImpl.java
+++ /dev/null
@@ -1,237 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: FaceletTaglibExtensionImpl.java,v 1.1 2010/03/18 06:24:39 cbateman Exp $
- */
-package org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.emf.ecore.util.BasicFeatureMap;
-import org.eclipse.emf.ecore.util.FeatureMap;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibExtension;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Facelet Taglib Extension</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- * <li>{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl.FaceletTaglibExtensionImpl#getAny <em>Any</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl.FaceletTaglibExtensionImpl#getId <em>Id</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class FaceletTaglibExtensionImpl extends EObjectImpl implements FaceletTaglibExtension
-{
- /**
- * The cached value of the '{@link #getAny() <em>Any</em>}' attribute list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getAny()
- * @generated
- * @ordered
- */
- protected FeatureMap any;
-
- /**
- * The default value of the '{@link #getId() <em>Id</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getId()
- * @generated
- * @ordered
- */
- protected static final String ID_EDEFAULT = null;
-
- /**
- * The cached value of the '{@link #getId() <em>Id</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getId()
- * @generated
- * @ordered
- */
- protected String id = ID_EDEFAULT;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected FaceletTaglibExtensionImpl()
- {
- super();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- protected EClass eStaticClass()
- {
- return FaceletTaglibPackage.Literals.FACELET_TAGLIB_EXTENSION;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public FeatureMap getAny()
- {
- if (any == null)
- {
- any = new BasicFeatureMap(this, FaceletTaglibPackage.FACELET_TAGLIB_EXTENSION__ANY);
- }
- return any;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public String getId()
- {
- return id;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setId(String newId)
- {
- String oldId = id;
- id = newId;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, FaceletTaglibPackage.FACELET_TAGLIB_EXTENSION__ID, oldId, id));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)
- {
- switch (featureID)
- {
- case FaceletTaglibPackage.FACELET_TAGLIB_EXTENSION__ANY:
- return ((InternalEList<?>)getAny()).basicRemove(otherEnd, msgs);
- }
- return super.eInverseRemove(otherEnd, featureID, msgs);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public Object eGet(int featureID, boolean resolve, boolean coreType)
- {
- switch (featureID)
- {
- case FaceletTaglibPackage.FACELET_TAGLIB_EXTENSION__ANY:
- if (coreType) return getAny();
- return ((FeatureMap.Internal)getAny()).getWrapper();
- case FaceletTaglibPackage.FACELET_TAGLIB_EXTENSION__ID:
- return getId();
- }
- return super.eGet(featureID, resolve, coreType);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public void eSet(int featureID, Object newValue)
- {
- switch (featureID)
- {
- case FaceletTaglibPackage.FACELET_TAGLIB_EXTENSION__ANY:
- ((FeatureMap.Internal)getAny()).set(newValue);
- return;
- case FaceletTaglibPackage.FACELET_TAGLIB_EXTENSION__ID:
- setId((String)newValue);
- return;
- }
- super.eSet(featureID, newValue);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public void eUnset(int featureID)
- {
- switch (featureID)
- {
- case FaceletTaglibPackage.FACELET_TAGLIB_EXTENSION__ANY:
- getAny().clear();
- return;
- case FaceletTaglibPackage.FACELET_TAGLIB_EXTENSION__ID:
- setId(ID_EDEFAULT);
- return;
- }
- super.eUnset(featureID);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public boolean eIsSet(int featureID)
- {
- switch (featureID)
- {
- case FaceletTaglibPackage.FACELET_TAGLIB_EXTENSION__ANY:
- return any != null && !any.isEmpty();
- case FaceletTaglibPackage.FACELET_TAGLIB_EXTENSION__ID:
- return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
- }
- return super.eIsSet(featureID);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public String toString()
- {
- if (eIsProxy()) return super.toString();
-
- StringBuffer result = new StringBuffer(super.toString());
- result.append(" (any: "); //$NON-NLS-1$
- result.append(any);
- result.append(", id: "); //$NON-NLS-1$
- result.append(id);
- result.append(')');
- return result.toString();
- }
-
-} //FaceletTaglibExtensionImpl
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib/impl/FaceletTaglibFactoryImpl.java b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib/impl/FaceletTaglibFactoryImpl.java
deleted file mode 100644
index 3dd27c7..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib/impl/FaceletTaglibFactoryImpl.java
+++ /dev/null
@@ -1,629 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: FaceletTaglibFactoryImpl.java,v 1.2 2010/03/18 06:24:39 cbateman Exp $
- */
-package org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EDataType;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.impl.EFactoryImpl;
-import org.eclipse.emf.ecore.plugin.EcorePlugin;
-import org.eclipse.emf.ecore.xml.type.XMLTypeFactory;
-import org.eclipse.emf.ecore.xml.type.XMLTypePackage;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.Description;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.DisplayName;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.DocumentRoot;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglib;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibCanonicalName;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibExtension;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibFactory;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibFunction;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibPackage;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTag;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagAttribute;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagBehavior;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagBehaviorExtension;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagComponent;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagComponentExtension;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagConverter;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagConverterExtension;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagExtension;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagValidator;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagValidatorExtension;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibVersion;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FullyQualifiedClass;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.GenericBoolean;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.GenericBooleanBase;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.Icon;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.IdentifiableStringValue;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.JavaIdentifier;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.Path;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model <b>Factory</b>.
- * <!-- end-user-doc -->
- * @generated
- */
-public class FaceletTaglibFactoryImpl extends EFactoryImpl implements FaceletTaglibFactory
-{
- /**
- * Creates the default factory implementation.
- * <!-- begin-user-doc -->
- * @return
- * <!-- end-user-doc -->
- * @generated
- */
- public static FaceletTaglibFactory init()
- {
- try
- {
- FaceletTaglibFactory theFaceletTaglibFactory = (FaceletTaglibFactory)EPackage.Registry.INSTANCE.getEFactory("http://java.sun.com/xml/ns/javaee/web-facelettaglibrary_2_0"); //$NON-NLS-1$
- if (theFaceletTaglibFactory != null)
- {
- return theFaceletTaglibFactory;
- }
- }
- catch (Exception exception)
- {
- EcorePlugin.INSTANCE.log(exception);
- }
- return new FaceletTaglibFactoryImpl();
- }
-
- /**
- * Creates an instance of the factory.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public FaceletTaglibFactoryImpl()
- {
- super();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public EObject create(EClass eClass)
- {
- switch (eClass.getClassifierID())
- {
- case FaceletTaglibPackage.DESCRIPTION: return createDescription();
- case FaceletTaglibPackage.DISPLAY_NAME: return createDisplayName();
- case FaceletTaglibPackage.DOCUMENT_ROOT: return createDocumentRoot();
- case FaceletTaglibPackage.FACELET_TAGLIB_CANONICAL_NAME: return createFaceletTaglibCanonicalName();
- case FaceletTaglibPackage.FACELET_TAGLIB_EXTENSION: return createFaceletTaglibExtension();
- case FaceletTaglibPackage.FACELET_TAGLIB_FUNCTION: return createFaceletTaglibFunction();
- case FaceletTaglibPackage.FACELET_TAGLIB_TAG_ATTRIBUTE: return createFaceletTaglibTagAttribute();
- case FaceletTaglibPackage.FACELET_TAGLIB_TAG_BEHAVIOR_EXTENSION: return createFaceletTaglibTagBehaviorExtension();
- case FaceletTaglibPackage.FACELET_TAGLIB_TAG_BEHAVIOR: return createFaceletTaglibTagBehavior();
- case FaceletTaglibPackage.FACELET_TAGLIB_TAG_COMPONENT_EXTENSION: return createFaceletTaglibTagComponentExtension();
- case FaceletTaglibPackage.FACELET_TAGLIB_TAG_COMPONENT: return createFaceletTaglibTagComponent();
- case FaceletTaglibPackage.FACELET_TAGLIB_TAG_CONVERTER_EXTENSION: return createFaceletTaglibTagConverterExtension();
- case FaceletTaglibPackage.FACELET_TAGLIB_TAG_CONVERTER: return createFaceletTaglibTagConverter();
- case FaceletTaglibPackage.FACELET_TAGLIB_TAG_EXTENSION: return createFaceletTaglibTagExtension();
- case FaceletTaglibPackage.FACELET_TAGLIB_TAG: return createFaceletTaglibTag();
- case FaceletTaglibPackage.FACELET_TAGLIB_TAG_VALIDATOR_EXTENSION: return createFaceletTaglibTagValidatorExtension();
- case FaceletTaglibPackage.FACELET_TAGLIB_TAG_VALIDATOR: return createFaceletTaglibTagValidator();
- case FaceletTaglibPackage.FACELET_TAGLIB: return createFaceletTaglib();
- case FaceletTaglibPackage.FULLY_QUALIFIED_CLASS: return createFullyQualifiedClass();
- case FaceletTaglibPackage.GENERIC_BOOLEAN: return createGenericBoolean();
- case FaceletTaglibPackage.ICON: return createIcon();
- case FaceletTaglibPackage.JAVA_IDENTIFIER: return createJavaIdentifier();
- case FaceletTaglibPackage.PATH: return createPath();
- case FaceletTaglibPackage.IDENTIFIABLE_STRING_VALUE: return createIdentifiableStringValue();
- default:
- throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$
- }
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public Object createFromString(EDataType eDataType, String initialValue)
- {
- switch (eDataType.getClassifierID())
- {
- case FaceletTaglibPackage.FACELET_TAGLIB_VERSION:
- return createFaceletTaglibVersionFromString(eDataType, initialValue);
- case FaceletTaglibPackage.GENERIC_BOOLEAN_BASE:
- return createGenericBooleanBaseFromString(eDataType, initialValue);
- case FaceletTaglibPackage.FACELET_TAGLIB_VERSION_TYPE_OBJECT:
- return createFaceletTaglibVersionTypeObjectFromString(eDataType, initialValue);
- case FaceletTaglibPackage.FULLY_QUALIFIED_CLASS_BASE:
- return createFullyQualifiedClassBaseFromString(eDataType, initialValue);
- case FaceletTaglibPackage.JAVA_IDENTIFIER_BASE:
- return createJavaIdentifierBaseFromString(eDataType, initialValue);
- case FaceletTaglibPackage.PATH_TYPE_BASE:
- return createPathTypeBaseFromString(eDataType, initialValue);
- default:
- throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$
- }
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public String convertToString(EDataType eDataType, Object instanceValue)
- {
- switch (eDataType.getClassifierID())
- {
- case FaceletTaglibPackage.FACELET_TAGLIB_VERSION:
- return convertFaceletTaglibVersionToString(eDataType, instanceValue);
- case FaceletTaglibPackage.GENERIC_BOOLEAN_BASE:
- return convertGenericBooleanBaseToString(eDataType, instanceValue);
- case FaceletTaglibPackage.FACELET_TAGLIB_VERSION_TYPE_OBJECT:
- return convertFaceletTaglibVersionTypeObjectToString(eDataType, instanceValue);
- case FaceletTaglibPackage.FULLY_QUALIFIED_CLASS_BASE:
- return convertFullyQualifiedClassBaseToString(eDataType, instanceValue);
- case FaceletTaglibPackage.JAVA_IDENTIFIER_BASE:
- return convertJavaIdentifierBaseToString(eDataType, instanceValue);
- case FaceletTaglibPackage.PATH_TYPE_BASE:
- return convertPathTypeBaseToString(eDataType, instanceValue);
- default:
- throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$
- }
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public Description createDescription()
- {
- DescriptionImpl description = new DescriptionImpl();
- return description;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public DisplayName createDisplayName()
- {
- DisplayNameImpl displayName = new DisplayNameImpl();
- return displayName;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public DocumentRoot createDocumentRoot()
- {
- DocumentRootImpl documentRoot = new DocumentRootImpl();
- return documentRoot;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public FaceletTaglibCanonicalName createFaceletTaglibCanonicalName()
- {
- FaceletTaglibCanonicalNameImpl faceletTaglibCanonicalName = new FaceletTaglibCanonicalNameImpl();
- return faceletTaglibCanonicalName;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public FaceletTaglibExtension createFaceletTaglibExtension()
- {
- FaceletTaglibExtensionImpl faceletTaglibExtension = new FaceletTaglibExtensionImpl();
- return faceletTaglibExtension;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public FaceletTaglibFunction createFaceletTaglibFunction()
- {
- FaceletTaglibFunctionImpl faceletTaglibFunction = new FaceletTaglibFunctionImpl();
- return faceletTaglibFunction;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public FaceletTaglibTagAttribute createFaceletTaglibTagAttribute()
- {
- FaceletTaglibTagAttributeImpl faceletTaglibTagAttribute = new FaceletTaglibTagAttributeImpl();
- return faceletTaglibTagAttribute;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public FaceletTaglibTagBehaviorExtension createFaceletTaglibTagBehaviorExtension()
- {
- FaceletTaglibTagBehaviorExtensionImpl faceletTaglibTagBehaviorExtension = new FaceletTaglibTagBehaviorExtensionImpl();
- return faceletTaglibTagBehaviorExtension;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public FaceletTaglibTagBehavior createFaceletTaglibTagBehavior()
- {
- FaceletTaglibTagBehaviorImpl faceletTaglibTagBehavior = new FaceletTaglibTagBehaviorImpl();
- return faceletTaglibTagBehavior;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public FaceletTaglibTagComponentExtension createFaceletTaglibTagComponentExtension()
- {
- FaceletTaglibTagComponentExtensionImpl faceletTaglibTagComponentExtension = new FaceletTaglibTagComponentExtensionImpl();
- return faceletTaglibTagComponentExtension;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public FaceletTaglibTagComponent createFaceletTaglibTagComponent()
- {
- FaceletTaglibTagComponentImpl faceletTaglibTagComponent = new FaceletTaglibTagComponentImpl();
- return faceletTaglibTagComponent;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public FaceletTaglibTagConverterExtension createFaceletTaglibTagConverterExtension()
- {
- FaceletTaglibTagConverterExtensionImpl faceletTaglibTagConverterExtension = new FaceletTaglibTagConverterExtensionImpl();
- return faceletTaglibTagConverterExtension;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public FaceletTaglibTagConverter createFaceletTaglibTagConverter()
- {
- FaceletTaglibTagConverterImpl faceletTaglibTagConverter = new FaceletTaglibTagConverterImpl();
- return faceletTaglibTagConverter;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public FaceletTaglibTagExtension createFaceletTaglibTagExtension()
- {
- FaceletTaglibTagExtensionImpl faceletTaglibTagExtension = new FaceletTaglibTagExtensionImpl();
- return faceletTaglibTagExtension;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public FaceletTaglibTag createFaceletTaglibTag()
- {
- FaceletTaglibTagImpl faceletTaglibTag = new FaceletTaglibTagImpl();
- return faceletTaglibTag;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public FaceletTaglibTagValidatorExtension createFaceletTaglibTagValidatorExtension()
- {
- FaceletTaglibTagValidatorExtensionImpl faceletTaglibTagValidatorExtension = new FaceletTaglibTagValidatorExtensionImpl();
- return faceletTaglibTagValidatorExtension;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public FaceletTaglibTagValidator createFaceletTaglibTagValidator()
- {
- FaceletTaglibTagValidatorImpl faceletTaglibTagValidator = new FaceletTaglibTagValidatorImpl();
- return faceletTaglibTagValidator;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public FaceletTaglib createFaceletTaglib()
- {
- FaceletTaglibImpl faceletTaglib = new FaceletTaglibImpl();
- return faceletTaglib;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public FullyQualifiedClass createFullyQualifiedClass()
- {
- FullyQualifiedClassImpl fullyQualifiedClass = new FullyQualifiedClassImpl();
- return fullyQualifiedClass;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public GenericBoolean createGenericBoolean()
- {
- GenericBooleanImpl genericBoolean = new GenericBooleanImpl();
- return genericBoolean;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public Icon createIcon()
- {
- IconImpl icon = new IconImpl();
- return icon;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public JavaIdentifier createJavaIdentifier()
- {
- JavaIdentifierImpl javaIdentifier = new JavaIdentifierImpl();
- return javaIdentifier;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public Path createPath()
- {
- PathImpl path = new PathImpl();
- return path;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public IdentifiableStringValue createIdentifiableStringValue()
- {
- IdentifiableStringValueImpl identifiableStringValue = new IdentifiableStringValueImpl();
- return identifiableStringValue;
- }
-
- /**
- * <!-- begin-user-doc -->
- * @param eDataType
- * @param initialValue
- * @return the version
- * <!-- end-user-doc -->
- * @generated
- */
- public FaceletTaglibVersion createFaceletTaglibVersionFromString(EDataType eDataType, String initialValue)
- {
- FaceletTaglibVersion result = FaceletTaglibVersion.get(initialValue);
- if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- return result;
- }
-
- /**
- * <!-- begin-user-doc -->
- * @param eDataType
- * @param instanceValue
- * @return
- * <!-- end-user-doc -->
- * @generated
- */
- public String convertFaceletTaglibVersionToString(EDataType eDataType, Object instanceValue)
- {
- return instanceValue == null ? null : instanceValue.toString();
- }
-
- /**
- * <!-- begin-user-doc -->
- * @param eDataType
- * @param initialValue
- * @return
- * <!-- end-user-doc -->
- * @generated
- */
- public GenericBooleanBase createGenericBooleanBaseFromString(EDataType eDataType, String initialValue)
- {
- GenericBooleanBase result = GenericBooleanBase.get(initialValue);
- if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- return result;
- }
-
- /**
- * <!-- begin-user-doc -->
- * @param eDataType
- * @param instanceValue
- * @return
- * <!-- end-user-doc -->
- * @generated
- */
- public String convertGenericBooleanBaseToString(EDataType eDataType, Object instanceValue)
- {
- return instanceValue == null ? null : instanceValue.toString();
- }
-
- /**
- * <!-- begin-user-doc -->
- * @param eDataType
- * @param initialValue
- * @return
- * <!-- end-user-doc -->
- * @generated
- */
- public FaceletTaglibVersion createFaceletTaglibVersionTypeObjectFromString(EDataType eDataType, String initialValue)
- {
- return createFaceletTaglibVersionFromString(FaceletTaglibPackage.Literals.FACELET_TAGLIB_VERSION, initialValue);
- }
-
- /**
- * <!-- begin-user-doc -->
- * @param eDataType
- * @param instanceValue
- * @return
- * <!-- end-user-doc -->
- * @generated
- */
- public String convertFaceletTaglibVersionTypeObjectToString(EDataType eDataType, Object instanceValue)
- {
- return convertFaceletTaglibVersionToString(FaceletTaglibPackage.Literals.FACELET_TAGLIB_VERSION, instanceValue);
- }
-
- /**
- * <!-- begin-user-doc -->
- * @param eDataType
- * @param initialValue
- * @return
- * <!-- end-user-doc -->
- * @generated
- */
- public String createFullyQualifiedClassBaseFromString(EDataType eDataType, String initialValue)
- {
- return (String)XMLTypeFactory.eINSTANCE.createFromString(XMLTypePackage.Literals.TOKEN, initialValue);
- }
-
- /**
- * <!-- begin-user-doc -->
- * @param eDataType
- * @param instanceValue
- * @return
- * <!-- end-user-doc -->
- * @generated
- */
- public String convertFullyQualifiedClassBaseToString(EDataType eDataType, Object instanceValue)
- {
- return XMLTypeFactory.eINSTANCE.convertToString(XMLTypePackage.Literals.TOKEN, instanceValue);
- }
-
- /**
- * <!-- begin-user-doc -->
- * @param eDataType
- * @param initialValue
- * @return
- * <!-- end-user-doc -->
- * @generated
- */
- public String createJavaIdentifierBaseFromString(EDataType eDataType, String initialValue)
- {
- return (String)XMLTypeFactory.eINSTANCE.createFromString(XMLTypePackage.Literals.TOKEN, initialValue);
- }
-
- /**
- * <!-- begin-user-doc -->
- * @param eDataType
- * @param instanceValue
- * @return
- * <!-- end-user-doc -->
- * @generated
- */
- public String convertJavaIdentifierBaseToString(EDataType eDataType, Object instanceValue)
- {
- return XMLTypeFactory.eINSTANCE.convertToString(XMLTypePackage.Literals.TOKEN, instanceValue);
- }
-
- /**
- * <!-- begin-user-doc -->
- * @param eDataType
- * @param initialValue
- * @return
- * <!-- end-user-doc -->
- * @generated
- */
- public String createPathTypeBaseFromString(EDataType eDataType, String initialValue)
- {
- return (String)XMLTypeFactory.eINSTANCE.createFromString(XMLTypePackage.Literals.TOKEN, initialValue);
- }
-
- /**
- * <!-- begin-user-doc -->
- * @param eDataType
- * @param instanceValue
- * @return
- * <!-- end-user-doc -->
- * @generated
- */
- public String convertPathTypeBaseToString(EDataType eDataType, Object instanceValue)
- {
- return XMLTypeFactory.eINSTANCE.convertToString(XMLTypePackage.Literals.TOKEN, instanceValue);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public FaceletTaglibPackage getFaceletTaglibPackage()
- {
- return (FaceletTaglibPackage)getEPackage();
- }
-
- /**
- * <!-- begin-user-doc -->
- * @return
- * <!-- end-user-doc -->
- * @deprecated
- * @generated
- */
- @Deprecated
- public static FaceletTaglibPackage getPackage()
- {
- return FaceletTaglibPackage.eINSTANCE;
- }
-
-} //FaceletTaglibFactoryImpl
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib/impl/FaceletTaglibFunctionImpl.java b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib/impl/FaceletTaglibFunctionImpl.java
deleted file mode 100644
index b12c43f..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib/impl/FaceletTaglibFunctionImpl.java
+++ /dev/null
@@ -1,347 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: FaceletTaglibFunctionImpl.java,v 1.1 2010/03/18 06:24:38 cbateman Exp $
- */
-package org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibFunction;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibPackage;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FullyQualifiedClass;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.IdentifiableStringValue;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Facelet Taglib Function</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- * <li>{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl.FaceletTaglibFunctionImpl#getFunctionName <em>Function Name</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl.FaceletTaglibFunctionImpl#getFunctionClass <em>Function Class</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl.FaceletTaglibFunctionImpl#getFunctionSignature <em>Function Signature</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class FaceletTaglibFunctionImpl extends UserVisibleTaglibObjectImpl implements FaceletTaglibFunction
-{
- /**
- * The cached value of the '{@link #getFunctionName() <em>Function Name</em>}' containment reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getFunctionName()
- * @generated
- * @ordered
- */
- protected IdentifiableStringValue functionName;
-
- /**
- * The cached value of the '{@link #getFunctionClass() <em>Function Class</em>}' containment reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getFunctionClass()
- * @generated
- * @ordered
- */
- protected FullyQualifiedClass functionClass;
-
- /**
- * The cached value of the '{@link #getFunctionSignature() <em>Function Signature</em>}' containment reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getFunctionSignature()
- * @generated
- * @ordered
- */
- protected IdentifiableStringValue functionSignature;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected FaceletTaglibFunctionImpl()
- {
- super();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- protected EClass eStaticClass()
- {
- return FaceletTaglibPackage.Literals.FACELET_TAGLIB_FUNCTION;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public IdentifiableStringValue getFunctionName()
- {
- return functionName;
- }
-
- /**
- * <!-- begin-user-doc -->
- * @param newFunctionName
- * @param msgs
- * @return the notification chain
- * <!-- end-user-doc -->
- * @generated
- */
- public NotificationChain basicSetFunctionName(IdentifiableStringValue newFunctionName, NotificationChain msgs)
- {
- IdentifiableStringValue oldFunctionName = functionName;
- functionName = newFunctionName;
- if (eNotificationRequired())
- {
- ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, FaceletTaglibPackage.FACELET_TAGLIB_FUNCTION__FUNCTION_NAME, oldFunctionName, newFunctionName);
- if (msgs == null) msgs = notification; else msgs.add(notification);
- }
- return msgs;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setFunctionName(IdentifiableStringValue newFunctionName)
- {
- if (newFunctionName != functionName)
- {
- NotificationChain msgs = null;
- if (functionName != null)
- msgs = ((InternalEObject)functionName).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - FaceletTaglibPackage.FACELET_TAGLIB_FUNCTION__FUNCTION_NAME, null, msgs);
- if (newFunctionName != null)
- msgs = ((InternalEObject)newFunctionName).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - FaceletTaglibPackage.FACELET_TAGLIB_FUNCTION__FUNCTION_NAME, null, msgs);
- msgs = basicSetFunctionName(newFunctionName, msgs);
- if (msgs != null) msgs.dispatch();
- }
- else if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, FaceletTaglibPackage.FACELET_TAGLIB_FUNCTION__FUNCTION_NAME, newFunctionName, newFunctionName));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public FullyQualifiedClass getFunctionClass()
- {
- return functionClass;
- }
-
- /**
- * <!-- begin-user-doc -->
- * @param newFunctionClass
- * @param msgs
- * @return the notification chain.
- * <!-- end-user-doc -->
- * @generated
- */
- public NotificationChain basicSetFunctionClass(FullyQualifiedClass newFunctionClass, NotificationChain msgs)
- {
- FullyQualifiedClass oldFunctionClass = functionClass;
- functionClass = newFunctionClass;
- if (eNotificationRequired())
- {
- ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, FaceletTaglibPackage.FACELET_TAGLIB_FUNCTION__FUNCTION_CLASS, oldFunctionClass, newFunctionClass);
- if (msgs == null) msgs = notification; else msgs.add(notification);
- }
- return msgs;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setFunctionClass(FullyQualifiedClass newFunctionClass)
- {
- if (newFunctionClass != functionClass)
- {
- NotificationChain msgs = null;
- if (functionClass != null)
- msgs = ((InternalEObject)functionClass).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - FaceletTaglibPackage.FACELET_TAGLIB_FUNCTION__FUNCTION_CLASS, null, msgs);
- if (newFunctionClass != null)
- msgs = ((InternalEObject)newFunctionClass).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - FaceletTaglibPackage.FACELET_TAGLIB_FUNCTION__FUNCTION_CLASS, null, msgs);
- msgs = basicSetFunctionClass(newFunctionClass, msgs);
- if (msgs != null) msgs.dispatch();
- }
- else if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, FaceletTaglibPackage.FACELET_TAGLIB_FUNCTION__FUNCTION_CLASS, newFunctionClass, newFunctionClass));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public IdentifiableStringValue getFunctionSignature()
- {
- return functionSignature;
- }
-
- /**
- * <!-- begin-user-doc -->
- * @param newFunctionSignature
- * @param msgs
- * @return the notification chain.
- * <!-- end-user-doc -->
- * @generated
- */
- public NotificationChain basicSetFunctionSignature(IdentifiableStringValue newFunctionSignature, NotificationChain msgs)
- {
- IdentifiableStringValue oldFunctionSignature = functionSignature;
- functionSignature = newFunctionSignature;
- if (eNotificationRequired())
- {
- ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, FaceletTaglibPackage.FACELET_TAGLIB_FUNCTION__FUNCTION_SIGNATURE, oldFunctionSignature, newFunctionSignature);
- if (msgs == null) msgs = notification; else msgs.add(notification);
- }
- return msgs;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setFunctionSignature(IdentifiableStringValue newFunctionSignature)
- {
- if (newFunctionSignature != functionSignature)
- {
- NotificationChain msgs = null;
- if (functionSignature != null)
- msgs = ((InternalEObject)functionSignature).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - FaceletTaglibPackage.FACELET_TAGLIB_FUNCTION__FUNCTION_SIGNATURE, null, msgs);
- if (newFunctionSignature != null)
- msgs = ((InternalEObject)newFunctionSignature).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - FaceletTaglibPackage.FACELET_TAGLIB_FUNCTION__FUNCTION_SIGNATURE, null, msgs);
- msgs = basicSetFunctionSignature(newFunctionSignature, msgs);
- if (msgs != null) msgs.dispatch();
- }
- else if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, FaceletTaglibPackage.FACELET_TAGLIB_FUNCTION__FUNCTION_SIGNATURE, newFunctionSignature, newFunctionSignature));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)
- {
- switch (featureID)
- {
- case FaceletTaglibPackage.FACELET_TAGLIB_FUNCTION__FUNCTION_NAME:
- return basicSetFunctionName(null, msgs);
- case FaceletTaglibPackage.FACELET_TAGLIB_FUNCTION__FUNCTION_CLASS:
- return basicSetFunctionClass(null, msgs);
- case FaceletTaglibPackage.FACELET_TAGLIB_FUNCTION__FUNCTION_SIGNATURE:
- return basicSetFunctionSignature(null, msgs);
- }
- return super.eInverseRemove(otherEnd, featureID, msgs);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public Object eGet(int featureID, boolean resolve, boolean coreType)
- {
- switch (featureID)
- {
- case FaceletTaglibPackage.FACELET_TAGLIB_FUNCTION__FUNCTION_NAME:
- return getFunctionName();
- case FaceletTaglibPackage.FACELET_TAGLIB_FUNCTION__FUNCTION_CLASS:
- return getFunctionClass();
- case FaceletTaglibPackage.FACELET_TAGLIB_FUNCTION__FUNCTION_SIGNATURE:
- return getFunctionSignature();
- }
- return super.eGet(featureID, resolve, coreType);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @SuppressWarnings("unchecked")
- @Override
- public void eSet(int featureID, Object newValue)
- {
- switch (featureID)
- {
- case FaceletTaglibPackage.FACELET_TAGLIB_FUNCTION__FUNCTION_NAME:
- setFunctionName((IdentifiableStringValue)newValue);
- return;
- case FaceletTaglibPackage.FACELET_TAGLIB_FUNCTION__FUNCTION_CLASS:
- setFunctionClass((FullyQualifiedClass)newValue);
- return;
- case FaceletTaglibPackage.FACELET_TAGLIB_FUNCTION__FUNCTION_SIGNATURE:
- setFunctionSignature((IdentifiableStringValue)newValue);
- return;
- }
- super.eSet(featureID, newValue);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public void eUnset(int featureID)
- {
- switch (featureID)
- {
- case FaceletTaglibPackage.FACELET_TAGLIB_FUNCTION__FUNCTION_NAME:
- setFunctionName((IdentifiableStringValue)null);
- return;
- case FaceletTaglibPackage.FACELET_TAGLIB_FUNCTION__FUNCTION_CLASS:
- setFunctionClass((FullyQualifiedClass)null);
- return;
- case FaceletTaglibPackage.FACELET_TAGLIB_FUNCTION__FUNCTION_SIGNATURE:
- setFunctionSignature((IdentifiableStringValue)null);
- return;
- }
- super.eUnset(featureID);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public boolean eIsSet(int featureID)
- {
- switch (featureID)
- {
- case FaceletTaglibPackage.FACELET_TAGLIB_FUNCTION__FUNCTION_NAME:
- return functionName != null;
- case FaceletTaglibPackage.FACELET_TAGLIB_FUNCTION__FUNCTION_CLASS:
- return functionClass != null;
- case FaceletTaglibPackage.FACELET_TAGLIB_FUNCTION__FUNCTION_SIGNATURE:
- return functionSignature != null;
- }
- return super.eIsSet(featureID);
- }
-
-} //FaceletTaglibFunctionImpl
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib/impl/FaceletTaglibImpl.java b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib/impl/FaceletTaglibImpl.java
deleted file mode 100644
index 5fc20bc..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib/impl/FaceletTaglibImpl.java
+++ /dev/null
@@ -1,694 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: FaceletTaglibImpl.java,v 1.1 2010/03/18 06:24:38 cbateman Exp $
- */
-package org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.BasicFeatureMap;
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.FeatureMap;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglib;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibExtension;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibFunction;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibPackage;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTag;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibVersion;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FullyQualifiedClass;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.IdentifiableStringValue;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Facelet Taglib</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- * <li>{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl.FaceletTaglibImpl#getLibraryClass <em>Library Class</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl.FaceletTaglibImpl#getNamespace <em>Namespace</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl.FaceletTaglibImpl#getCompositeLibraryName <em>Composite Library Name</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl.FaceletTaglibImpl#getGroup <em>Group</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl.FaceletTaglibImpl#getTag <em>Tag</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl.FaceletTaglibImpl#getFunction <em>Function</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl.FaceletTaglibImpl#getTaglibExtension <em>Taglib Extension</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl.FaceletTaglibImpl#getId <em>Id</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl.FaceletTaglibImpl#getVersion <em>Version</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl.FaceletTaglibImpl#getNamespaceUri <em>Namespace Uri</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class FaceletTaglibImpl extends UserVisibleTaglibObjectImpl implements FaceletTaglib
-{
- /**
- * The cached value of the '{@link #getLibraryClass() <em>Library Class</em>}' containment reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getLibraryClass()
- * @generated
- * @ordered
- */
- protected FullyQualifiedClass libraryClass;
-
- /**
- * The cached value of the '{@link #getNamespace() <em>Namespace</em>}' containment reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getNamespace()
- * @generated
- * @ordered
- */
- protected IdentifiableStringValue namespace;
-
- /**
- * The cached value of the '{@link #getCompositeLibraryName() <em>Composite Library Name</em>}' containment reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getCompositeLibraryName()
- * @generated
- * @ordered
- */
- protected FullyQualifiedClass compositeLibraryName;
-
- /**
- * The cached value of the '{@link #getGroup() <em>Group</em>}' attribute list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getGroup()
- * @generated
- * @ordered
- */
- protected FeatureMap group;
-
- /**
- * The cached value of the '{@link #getTaglibExtension() <em>Taglib Extension</em>}' containment reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getTaglibExtension()
- * @generated
- * @ordered
- */
- protected EList<FaceletTaglibExtension> taglibExtension;
-
- /**
- * The default value of the '{@link #getId() <em>Id</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getId()
- * @generated
- * @ordered
- */
- protected static final String ID_EDEFAULT = null;
-
- /**
- * The cached value of the '{@link #getId() <em>Id</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getId()
- * @generated
- * @ordered
- */
- protected String id = ID_EDEFAULT;
-
- /**
- * The default value of the '{@link #getVersion() <em>Version</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getVersion()
- * @generated
- * @ordered
- */
- protected static final FaceletTaglibVersion VERSION_EDEFAULT = FaceletTaglibVersion._20;
-
- /**
- * The cached value of the '{@link #getVersion() <em>Version</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getVersion()
- * @generated
- * @ordered
- */
- protected FaceletTaglibVersion version = VERSION_EDEFAULT;
-
- /**
- * This is true if the Version attribute has been set.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- protected boolean versionESet;
-
- /**
- * The default value of the '{@link #getNamespaceUri() <em>Namespace Uri</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getNamespaceUri()
- * @generated
- * @ordered
- */
- protected static final String NAMESPACE_URI_EDEFAULT = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected FaceletTaglibImpl()
- {
- super();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- protected EClass eStaticClass()
- {
- return FaceletTaglibPackage.Literals.FACELET_TAGLIB;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public FullyQualifiedClass getLibraryClass()
- {
- return libraryClass;
- }
-
- /**
- * <!-- begin-user-doc -->
- * @param newLibraryClass
- * @param msgs
- * @return the notification chain
- * <!-- end-user-doc -->
- * @generated
- */
- public NotificationChain basicSetLibraryClass(FullyQualifiedClass newLibraryClass, NotificationChain msgs)
- {
- FullyQualifiedClass oldLibraryClass = libraryClass;
- libraryClass = newLibraryClass;
- if (eNotificationRequired())
- {
- ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, FaceletTaglibPackage.FACELET_TAGLIB__LIBRARY_CLASS, oldLibraryClass, newLibraryClass);
- if (msgs == null) msgs = notification; else msgs.add(notification);
- }
- return msgs;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setLibraryClass(FullyQualifiedClass newLibraryClass)
- {
- if (newLibraryClass != libraryClass)
- {
- NotificationChain msgs = null;
- if (libraryClass != null)
- msgs = ((InternalEObject)libraryClass).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - FaceletTaglibPackage.FACELET_TAGLIB__LIBRARY_CLASS, null, msgs);
- if (newLibraryClass != null)
- msgs = ((InternalEObject)newLibraryClass).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - FaceletTaglibPackage.FACELET_TAGLIB__LIBRARY_CLASS, null, msgs);
- msgs = basicSetLibraryClass(newLibraryClass, msgs);
- if (msgs != null) msgs.dispatch();
- }
- else if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, FaceletTaglibPackage.FACELET_TAGLIB__LIBRARY_CLASS, newLibraryClass, newLibraryClass));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public IdentifiableStringValue getNamespace()
- {
- return namespace;
- }
-
- /**
- * <!-- begin-user-doc -->
- * @param newNamespace
- * @param msgs
- * @return the notification chain
- * <!-- end-user-doc -->
- * @generated
- */
- public NotificationChain basicSetNamespace(IdentifiableStringValue newNamespace, NotificationChain msgs)
- {
- IdentifiableStringValue oldNamespace = namespace;
- namespace = newNamespace;
- if (eNotificationRequired())
- {
- ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, FaceletTaglibPackage.FACELET_TAGLIB__NAMESPACE, oldNamespace, newNamespace);
- if (msgs == null) msgs = notification; else msgs.add(notification);
- }
- return msgs;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setNamespace(IdentifiableStringValue newNamespace)
- {
- if (newNamespace != namespace)
- {
- NotificationChain msgs = null;
- if (namespace != null)
- msgs = ((InternalEObject)namespace).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - FaceletTaglibPackage.FACELET_TAGLIB__NAMESPACE, null, msgs);
- if (newNamespace != null)
- msgs = ((InternalEObject)newNamespace).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - FaceletTaglibPackage.FACELET_TAGLIB__NAMESPACE, null, msgs);
- msgs = basicSetNamespace(newNamespace, msgs);
- if (msgs != null) msgs.dispatch();
- }
- else if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, FaceletTaglibPackage.FACELET_TAGLIB__NAMESPACE, newNamespace, newNamespace));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public FullyQualifiedClass getCompositeLibraryName()
- {
- return compositeLibraryName;
- }
-
- /**
- * <!-- begin-user-doc -->
- * @param newCompositeLibraryName
- * @param msgs
- * @return the notification chain
- * <!-- end-user-doc -->
- * @generated
- */
- public NotificationChain basicSetCompositeLibraryName(FullyQualifiedClass newCompositeLibraryName, NotificationChain msgs)
- {
- FullyQualifiedClass oldCompositeLibraryName = compositeLibraryName;
- compositeLibraryName = newCompositeLibraryName;
- if (eNotificationRequired())
- {
- ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, FaceletTaglibPackage.FACELET_TAGLIB__COMPOSITE_LIBRARY_NAME, oldCompositeLibraryName, newCompositeLibraryName);
- if (msgs == null) msgs = notification; else msgs.add(notification);
- }
- return msgs;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setCompositeLibraryName(FullyQualifiedClass newCompositeLibraryName)
- {
- if (newCompositeLibraryName != compositeLibraryName)
- {
- NotificationChain msgs = null;
- if (compositeLibraryName != null)
- msgs = ((InternalEObject)compositeLibraryName).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - FaceletTaglibPackage.FACELET_TAGLIB__COMPOSITE_LIBRARY_NAME, null, msgs);
- if (newCompositeLibraryName != null)
- msgs = ((InternalEObject)newCompositeLibraryName).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - FaceletTaglibPackage.FACELET_TAGLIB__COMPOSITE_LIBRARY_NAME, null, msgs);
- msgs = basicSetCompositeLibraryName(newCompositeLibraryName, msgs);
- if (msgs != null) msgs.dispatch();
- }
- else if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, FaceletTaglibPackage.FACELET_TAGLIB__COMPOSITE_LIBRARY_NAME, newCompositeLibraryName, newCompositeLibraryName));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public FeatureMap getGroup()
- {
- if (group == null)
- {
- group = new BasicFeatureMap(this, FaceletTaglibPackage.FACELET_TAGLIB__GROUP);
- }
- return group;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EList<FaceletTaglibTag> getTag()
- {
- return getGroup().list(FaceletTaglibPackage.Literals.FACELET_TAGLIB__TAG);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EList<FaceletTaglibFunction> getFunction()
- {
- return getGroup().list(FaceletTaglibPackage.Literals.FACELET_TAGLIB__FUNCTION);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EList<FaceletTaglibExtension> getTaglibExtension()
- {
- if (taglibExtension == null)
- {
- taglibExtension = new EObjectContainmentEList<FaceletTaglibExtension>(FaceletTaglibExtension.class, this, FaceletTaglibPackage.FACELET_TAGLIB__TAGLIB_EXTENSION);
- }
- return taglibExtension;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public String getId()
- {
- return id;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setId(String newId)
- {
- String oldId = id;
- id = newId;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, FaceletTaglibPackage.FACELET_TAGLIB__ID, oldId, id));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public FaceletTaglibVersion getVersion()
- {
- return version;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setVersion(FaceletTaglibVersion newVersion)
- {
- FaceletTaglibVersion oldVersion = version;
- version = newVersion == null ? VERSION_EDEFAULT : newVersion;
- boolean oldVersionESet = versionESet;
- versionESet = true;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, FaceletTaglibPackage.FACELET_TAGLIB__VERSION, oldVersion, version, !oldVersionESet));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void unsetVersion()
- {
- FaceletTaglibVersion oldVersion = version;
- boolean oldVersionESet = versionESet;
- version = VERSION_EDEFAULT;
- versionESet = false;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.UNSET, FaceletTaglibPackage.FACELET_TAGLIB__VERSION, oldVersion, VERSION_EDEFAULT, oldVersionESet));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean isSetVersion()
- {
- return versionESet;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated NOT
- */
- public String getNamespaceUri()
- {
- return (String) Util.getSimplifiedNestedField(this, FaceletTaglibPackage.Literals.FACELET_TAGLIB__NAMESPACE, FaceletTaglibPackage.Literals.IDENTIFIABLE_STRING_VALUE__VALUE);
- }
-
- /**
- * <!-- begin-user-doc -->
- * Sets the namespace value on the this taglib. If the wrapping IdentifiableStringValue
- * does not exist, then it is created.
- *
- * NOTE: event listeners will receive an event for the value set on the
- * the IdentifiableStringValue if it was non-null but will receive an
- * event for set on the whole getNamespace() featuer if it was null.
- * <!-- end-user-doc -->
- * @generated NOT
- */
- public void setNamespaceUri(String newNamespaceUri)
- {
- Util.setSimplifiedNestedField(this, FaceletTaglibPackage.Literals.FACELET_TAGLIB__NAMESPACE, FaceletTaglibPackage.Literals.IDENTIFIABLE_STRING_VALUE__VALUE, newNamespaceUri);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)
- {
- switch (featureID)
- {
- case FaceletTaglibPackage.FACELET_TAGLIB__LIBRARY_CLASS:
- return basicSetLibraryClass(null, msgs);
- case FaceletTaglibPackage.FACELET_TAGLIB__NAMESPACE:
- return basicSetNamespace(null, msgs);
- case FaceletTaglibPackage.FACELET_TAGLIB__COMPOSITE_LIBRARY_NAME:
- return basicSetCompositeLibraryName(null, msgs);
- case FaceletTaglibPackage.FACELET_TAGLIB__GROUP:
- return ((InternalEList<?>)getGroup()).basicRemove(otherEnd, msgs);
- case FaceletTaglibPackage.FACELET_TAGLIB__TAG:
- return ((InternalEList<?>)getTag()).basicRemove(otherEnd, msgs);
- case FaceletTaglibPackage.FACELET_TAGLIB__FUNCTION:
- return ((InternalEList<?>)getFunction()).basicRemove(otherEnd, msgs);
- case FaceletTaglibPackage.FACELET_TAGLIB__TAGLIB_EXTENSION:
- return ((InternalEList<?>)getTaglibExtension()).basicRemove(otherEnd, msgs);
- }
- return super.eInverseRemove(otherEnd, featureID, msgs);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public Object eGet(int featureID, boolean resolve, boolean coreType)
- {
- switch (featureID)
- {
- case FaceletTaglibPackage.FACELET_TAGLIB__LIBRARY_CLASS:
- return getLibraryClass();
- case FaceletTaglibPackage.FACELET_TAGLIB__NAMESPACE:
- return getNamespace();
- case FaceletTaglibPackage.FACELET_TAGLIB__COMPOSITE_LIBRARY_NAME:
- return getCompositeLibraryName();
- case FaceletTaglibPackage.FACELET_TAGLIB__GROUP:
- if (coreType) return getGroup();
- return ((FeatureMap.Internal)getGroup()).getWrapper();
- case FaceletTaglibPackage.FACELET_TAGLIB__TAG:
- return getTag();
- case FaceletTaglibPackage.FACELET_TAGLIB__FUNCTION:
- return getFunction();
- case FaceletTaglibPackage.FACELET_TAGLIB__TAGLIB_EXTENSION:
- return getTaglibExtension();
- case FaceletTaglibPackage.FACELET_TAGLIB__ID:
- return getId();
- case FaceletTaglibPackage.FACELET_TAGLIB__VERSION:
- return getVersion();
- case FaceletTaglibPackage.FACELET_TAGLIB__NAMESPACE_URI:
- return getNamespaceUri();
- }
- return super.eGet(featureID, resolve, coreType);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @SuppressWarnings("unchecked")
- @Override
- public void eSet(int featureID, Object newValue)
- {
- switch (featureID)
- {
- case FaceletTaglibPackage.FACELET_TAGLIB__LIBRARY_CLASS:
- setLibraryClass((FullyQualifiedClass)newValue);
- return;
- case FaceletTaglibPackage.FACELET_TAGLIB__NAMESPACE:
- setNamespace((IdentifiableStringValue)newValue);
- return;
- case FaceletTaglibPackage.FACELET_TAGLIB__COMPOSITE_LIBRARY_NAME:
- setCompositeLibraryName((FullyQualifiedClass)newValue);
- return;
- case FaceletTaglibPackage.FACELET_TAGLIB__GROUP:
- ((FeatureMap.Internal)getGroup()).set(newValue);
- return;
- case FaceletTaglibPackage.FACELET_TAGLIB__TAG:
- getTag().clear();
- getTag().addAll((Collection<? extends FaceletTaglibTag>)newValue);
- return;
- case FaceletTaglibPackage.FACELET_TAGLIB__FUNCTION:
- getFunction().clear();
- getFunction().addAll((Collection<? extends FaceletTaglibFunction>)newValue);
- return;
- case FaceletTaglibPackage.FACELET_TAGLIB__TAGLIB_EXTENSION:
- getTaglibExtension().clear();
- getTaglibExtension().addAll((Collection<? extends FaceletTaglibExtension>)newValue);
- return;
- case FaceletTaglibPackage.FACELET_TAGLIB__ID:
- setId((String)newValue);
- return;
- case FaceletTaglibPackage.FACELET_TAGLIB__VERSION:
- setVersion((FaceletTaglibVersion)newValue);
- return;
- case FaceletTaglibPackage.FACELET_TAGLIB__NAMESPACE_URI:
- setNamespaceUri((String)newValue);
- return;
- }
- super.eSet(featureID, newValue);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public void eUnset(int featureID)
- {
- switch (featureID)
- {
- case FaceletTaglibPackage.FACELET_TAGLIB__LIBRARY_CLASS:
- setLibraryClass((FullyQualifiedClass)null);
- return;
- case FaceletTaglibPackage.FACELET_TAGLIB__NAMESPACE:
- setNamespace((IdentifiableStringValue)null);
- return;
- case FaceletTaglibPackage.FACELET_TAGLIB__COMPOSITE_LIBRARY_NAME:
- setCompositeLibraryName((FullyQualifiedClass)null);
- return;
- case FaceletTaglibPackage.FACELET_TAGLIB__GROUP:
- getGroup().clear();
- return;
- case FaceletTaglibPackage.FACELET_TAGLIB__TAG:
- getTag().clear();
- return;
- case FaceletTaglibPackage.FACELET_TAGLIB__FUNCTION:
- getFunction().clear();
- return;
- case FaceletTaglibPackage.FACELET_TAGLIB__TAGLIB_EXTENSION:
- getTaglibExtension().clear();
- return;
- case FaceletTaglibPackage.FACELET_TAGLIB__ID:
- setId(ID_EDEFAULT);
- return;
- case FaceletTaglibPackage.FACELET_TAGLIB__VERSION:
- unsetVersion();
- return;
- case FaceletTaglibPackage.FACELET_TAGLIB__NAMESPACE_URI:
- setNamespaceUri(NAMESPACE_URI_EDEFAULT);
- return;
- }
- super.eUnset(featureID);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public boolean eIsSet(int featureID)
- {
- switch (featureID)
- {
- case FaceletTaglibPackage.FACELET_TAGLIB__LIBRARY_CLASS:
- return libraryClass != null;
- case FaceletTaglibPackage.FACELET_TAGLIB__NAMESPACE:
- return namespace != null;
- case FaceletTaglibPackage.FACELET_TAGLIB__COMPOSITE_LIBRARY_NAME:
- return compositeLibraryName != null;
- case FaceletTaglibPackage.FACELET_TAGLIB__GROUP:
- return group != null && !group.isEmpty();
- case FaceletTaglibPackage.FACELET_TAGLIB__TAG:
- return !getTag().isEmpty();
- case FaceletTaglibPackage.FACELET_TAGLIB__FUNCTION:
- return !getFunction().isEmpty();
- case FaceletTaglibPackage.FACELET_TAGLIB__TAGLIB_EXTENSION:
- return taglibExtension != null && !taglibExtension.isEmpty();
- case FaceletTaglibPackage.FACELET_TAGLIB__ID:
- return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
- case FaceletTaglibPackage.FACELET_TAGLIB__VERSION:
- return isSetVersion();
- case FaceletTaglibPackage.FACELET_TAGLIB__NAMESPACE_URI:
- return NAMESPACE_URI_EDEFAULT == null ? getNamespaceUri() != null : !NAMESPACE_URI_EDEFAULT.equals(getNamespaceUri());
- }
- return super.eIsSet(featureID);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public String toString()
- {
- if (eIsProxy()) return super.toString();
-
- StringBuffer result = new StringBuffer(super.toString());
- result.append(" (group: "); //$NON-NLS-1$
- result.append(group);
- result.append(", id: "); //$NON-NLS-1$
- result.append(id);
- result.append(", version: "); //$NON-NLS-1$
- if (versionESet) result.append(version); else result.append("<unset>"); //$NON-NLS-1$
- result.append(')');
- return result.toString();
- }
-
-} //FaceletTaglibImpl
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib/impl/FaceletTaglibPackageImpl.java b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib/impl/FaceletTaglibPackageImpl.java
deleted file mode 100644
index 1395630..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib/impl/FaceletTaglibPackageImpl.java
+++ /dev/null
@@ -1,2653 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: FaceletTaglibPackageImpl.java,v 1.2 2010/03/18 06:24:39 cbateman Exp $
- */
-package org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl;
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EDataType;
-import org.eclipse.emf.ecore.EEnum;
-import org.eclipse.emf.ecore.EOperation;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.ecore.EValidator;
-import org.eclipse.emf.ecore.impl.EPackageImpl;
-import org.eclipse.emf.ecore.xml.type.XMLTypePackage;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.Description;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.DisplayName;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.DocumentRoot;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglib;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibCanonicalName;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibExtension;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibFactory;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibFunction;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibPackage;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTag;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagAttribute;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagBehavior;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagBehaviorExtension;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagComponent;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagComponentExtension;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagConverter;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagConverterExtension;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagExtension;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagValidator;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagValidatorExtension;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibVersion;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FullyQualifiedClass;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.GenericBoolean;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.GenericBooleanBase;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.Icon;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.IdentifiableLangStringValue;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.IdentifiableStringValue;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.JavaIdentifier;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.Path;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.UserVisibleTaglibObject;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.util.FaceletTaglibValidator;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model <b>Package</b>.
- * <!-- end-user-doc -->
- * @generated
- */
-public class FaceletTaglibPackageImpl extends EPackageImpl implements FaceletTaglibPackage
-{
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private EClass descriptionEClass = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private EClass displayNameEClass = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private EClass documentRootEClass = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private EClass faceletTaglibCanonicalNameEClass = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private EClass faceletTaglibExtensionEClass = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private EClass faceletTaglibFunctionEClass = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private EClass faceletTaglibTagAttributeEClass = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private EClass faceletTaglibTagBehaviorExtensionEClass = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private EClass faceletTaglibTagBehaviorEClass = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private EClass faceletTaglibTagComponentExtensionEClass = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private EClass faceletTaglibTagComponentEClass = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private EClass faceletTaglibTagConverterExtensionEClass = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private EClass faceletTaglibTagConverterEClass = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private EClass faceletTaglibTagExtensionEClass = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private EClass faceletTaglibTagEClass = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private EClass faceletTaglibTagValidatorExtensionEClass = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private EClass faceletTaglibTagValidatorEClass = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private EClass faceletTaglibEClass = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private EClass fullyQualifiedClassEClass = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private EClass genericBooleanEClass = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private EClass iconEClass = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private EClass javaIdentifierEClass = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private EClass pathEClass = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private EClass identifiableStringValueEClass = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private EClass identifiableLangStringValueEClass = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private EClass userVisibleTaglibObjectEClass = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private EEnum faceletTaglibVersionEEnum = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private EEnum genericBooleanBaseEEnum = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private EDataType faceletTaglibVersionTypeObjectEDataType = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private EDataType fullyQualifiedClassBaseEDataType = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private EDataType javaIdentifierBaseEDataType = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private EDataType pathTypeBaseEDataType = 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.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibPackage#eNS_URI
- * @see #init()
- * @generated
- */
- private FaceletTaglibPackageImpl()
- {
- super(eNS_URI, FaceletTaglibFactory.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.
- *
- * <p>This method is used to initialize {@link FaceletTaglibPackage#eINSTANCE} when that field is accessed.
- * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.
- * <!-- begin-user-doc -->
- * @return
- * <!-- end-user-doc -->
- * @see #eNS_URI
- * @see #createPackageContents()
- * @see #initializePackageContents()
- * @generated
- */
- public static FaceletTaglibPackage init()
- {
- if (isInited) return (FaceletTaglibPackage)EPackage.Registry.INSTANCE.getEPackage(FaceletTaglibPackage.eNS_URI);
-
- // Obtain or create and register package
- FaceletTaglibPackageImpl theFaceletTaglibPackage = (FaceletTaglibPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof FaceletTaglibPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new FaceletTaglibPackageImpl());
-
- isInited = true;
-
- // Initialize simple dependencies
- XMLTypePackage.eINSTANCE.eClass();
-
- // Create package meta-data objects
- theFaceletTaglibPackage.createPackageContents();
-
- // Initialize created meta-data
- theFaceletTaglibPackage.initializePackageContents();
-
- // Register package validator
- EValidator.Registry.INSTANCE.put
- (theFaceletTaglibPackage,
- new EValidator.Descriptor()
- {
- public EValidator getEValidator()
- {
- return FaceletTaglibValidator.INSTANCE;
- }
- });
-
- // Mark meta-data to indicate it can't be changed
- theFaceletTaglibPackage.freeze();
-
-
- // Update the registry and return the package
- EPackage.Registry.INSTANCE.put(FaceletTaglibPackage.eNS_URI, theFaceletTaglibPackage);
- return theFaceletTaglibPackage;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EClass getDescription()
- {
- return descriptionEClass;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EClass getDisplayName()
- {
- return displayNameEClass;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EClass getDocumentRoot()
- {
- return documentRootEClass;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getDocumentRoot_Mixed()
- {
- return (EAttribute)documentRootEClass.getEStructuralFeatures().get(0);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EReference getDocumentRoot_XMLNSPrefixMap()
- {
- return (EReference)documentRootEClass.getEStructuralFeatures().get(1);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EReference getDocumentRoot_XSISchemaLocation()
- {
- return (EReference)documentRootEClass.getEStructuralFeatures().get(2);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EReference getDocumentRoot_FaceletTaglib()
- {
- return (EReference)documentRootEClass.getEStructuralFeatures().get(3);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EClass getFaceletTaglibCanonicalName()
- {
- return faceletTaglibCanonicalNameEClass;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getFaceletTaglibCanonicalName_Value()
- {
- return (EAttribute)faceletTaglibCanonicalNameEClass.getEStructuralFeatures().get(0);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getFaceletTaglibCanonicalName_Id()
- {
- return (EAttribute)faceletTaglibCanonicalNameEClass.getEStructuralFeatures().get(1);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EClass getFaceletTaglibExtension()
- {
- return faceletTaglibExtensionEClass;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getFaceletTaglibExtension_Any()
- {
- return (EAttribute)faceletTaglibExtensionEClass.getEStructuralFeatures().get(0);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getFaceletTaglibExtension_Id()
- {
- return (EAttribute)faceletTaglibExtensionEClass.getEStructuralFeatures().get(1);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EClass getFaceletTaglibFunction()
- {
- return faceletTaglibFunctionEClass;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EReference getFaceletTaglibFunction_FunctionName()
- {
- return (EReference)faceletTaglibFunctionEClass.getEStructuralFeatures().get(0);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EReference getFaceletTaglibFunction_FunctionClass()
- {
- return (EReference)faceletTaglibFunctionEClass.getEStructuralFeatures().get(1);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EReference getFaceletTaglibFunction_FunctionSignature()
- {
- return (EReference)faceletTaglibFunctionEClass.getEStructuralFeatures().get(2);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EClass getFaceletTaglibTagAttribute()
- {
- return faceletTaglibTagAttributeEClass;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EReference getFaceletTaglibTagAttribute_NameElement()
- {
- return (EReference)faceletTaglibTagAttributeEClass.getEStructuralFeatures().get(0);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EReference getFaceletTaglibTagAttribute_RequiredElement()
- {
- return (EReference)faceletTaglibTagAttributeEClass.getEStructuralFeatures().get(1);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EReference getFaceletTaglibTagAttribute_TypeElement()
- {
- return (EReference)faceletTaglibTagAttributeEClass.getEStructuralFeatures().get(2);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EReference getFaceletTaglibTagAttribute_MethodSignatureElement()
- {
- return (EReference)faceletTaglibTagAttributeEClass.getEStructuralFeatures().get(3);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getFaceletTaglibTagAttribute_Id()
- {
- return (EAttribute)faceletTaglibTagAttributeEClass.getEStructuralFeatures().get(4);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getFaceletTaglibTagAttribute_Name()
- {
- return (EAttribute)faceletTaglibTagAttributeEClass.getEStructuralFeatures().get(5);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getFaceletTaglibTagAttribute_Required()
- {
- return (EAttribute)faceletTaglibTagAttributeEClass.getEStructuralFeatures().get(6);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getFaceletTaglibTagAttribute_Type()
- {
- return (EAttribute)faceletTaglibTagAttributeEClass.getEStructuralFeatures().get(7);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getFaceletTaglibTagAttribute_MethodSignature()
- {
- return (EAttribute)faceletTaglibTagAttributeEClass.getEStructuralFeatures().get(8);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EClass getFaceletTaglibTagBehaviorExtension()
- {
- return faceletTaglibTagBehaviorExtensionEClass;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getFaceletTaglibTagBehaviorExtension_Any()
- {
- return (EAttribute)faceletTaglibTagBehaviorExtensionEClass.getEStructuralFeatures().get(0);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getFaceletTaglibTagBehaviorExtension_Id()
- {
- return (EAttribute)faceletTaglibTagBehaviorExtensionEClass.getEStructuralFeatures().get(1);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EClass getFaceletTaglibTagBehavior()
- {
- return faceletTaglibTagBehaviorEClass;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EReference getFaceletTaglibTagBehavior_BehaviorId()
- {
- return (EReference)faceletTaglibTagBehaviorEClass.getEStructuralFeatures().get(0);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EReference getFaceletTaglibTagBehavior_HandlerClass()
- {
- return (EReference)faceletTaglibTagBehaviorEClass.getEStructuralFeatures().get(1);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EReference getFaceletTaglibTagBehavior_BehaviorExtension()
- {
- return (EReference)faceletTaglibTagBehaviorEClass.getEStructuralFeatures().get(2);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EClass getFaceletTaglibTagComponentExtension()
- {
- return faceletTaglibTagComponentExtensionEClass;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getFaceletTaglibTagComponentExtension_Any()
- {
- return (EAttribute)faceletTaglibTagComponentExtensionEClass.getEStructuralFeatures().get(0);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getFaceletTaglibTagComponentExtension_Id()
- {
- return (EAttribute)faceletTaglibTagComponentExtensionEClass.getEStructuralFeatures().get(1);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EClass getFaceletTaglibTagComponent()
- {
- return faceletTaglibTagComponentEClass;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EReference getFaceletTaglibTagComponent_ComponentType()
- {
- return (EReference)faceletTaglibTagComponentEClass.getEStructuralFeatures().get(0);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EReference getFaceletTaglibTagComponent_RendererType()
- {
- return (EReference)faceletTaglibTagComponentEClass.getEStructuralFeatures().get(1);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EReference getFaceletTaglibTagComponent_HandlerClass()
- {
- return (EReference)faceletTaglibTagComponentEClass.getEStructuralFeatures().get(2);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EReference getFaceletTaglibTagComponent_ComponentExtension()
- {
- return (EReference)faceletTaglibTagComponentEClass.getEStructuralFeatures().get(3);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EClass getFaceletTaglibTagConverterExtension()
- {
- return faceletTaglibTagConverterExtensionEClass;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getFaceletTaglibTagConverterExtension_Any()
- {
- return (EAttribute)faceletTaglibTagConverterExtensionEClass.getEStructuralFeatures().get(0);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getFaceletTaglibTagConverterExtension_Id()
- {
- return (EAttribute)faceletTaglibTagConverterExtensionEClass.getEStructuralFeatures().get(1);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EClass getFaceletTaglibTagConverter()
- {
- return faceletTaglibTagConverterEClass;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EReference getFaceletTaglibTagConverter_ConverterId()
- {
- return (EReference)faceletTaglibTagConverterEClass.getEStructuralFeatures().get(0);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EReference getFaceletTaglibTagConverter_HandlerClass()
- {
- return (EReference)faceletTaglibTagConverterEClass.getEStructuralFeatures().get(1);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EReference getFaceletTaglibTagConverter_ConverterExtension()
- {
- return (EReference)faceletTaglibTagConverterEClass.getEStructuralFeatures().get(2);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EClass getFaceletTaglibTagExtension()
- {
- return faceletTaglibTagExtensionEClass;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getFaceletTaglibTagExtension_Any()
- {
- return (EAttribute)faceletTaglibTagExtensionEClass.getEStructuralFeatures().get(0);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getFaceletTaglibTagExtension_Id()
- {
- return (EAttribute)faceletTaglibTagExtensionEClass.getEStructuralFeatures().get(1);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EClass getFaceletTaglibTag()
- {
- return faceletTaglibTagEClass;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EReference getFaceletTaglibTag_TagNameElement()
- {
- return (EReference)faceletTaglibTagEClass.getEStructuralFeatures().get(0);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EReference getFaceletTaglibTag_HandlerClassElement()
- {
- return (EReference)faceletTaglibTagEClass.getEStructuralFeatures().get(1);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EReference getFaceletTaglibTag_Behavior()
- {
- return (EReference)faceletTaglibTagEClass.getEStructuralFeatures().get(2);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EReference getFaceletTaglibTag_Component()
- {
- return (EReference)faceletTaglibTagEClass.getEStructuralFeatures().get(3);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EReference getFaceletTaglibTag_Converter()
- {
- return (EReference)faceletTaglibTagEClass.getEStructuralFeatures().get(4);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EReference getFaceletTaglibTag_Validator()
- {
- return (EReference)faceletTaglibTagEClass.getEStructuralFeatures().get(5);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EReference getFaceletTaglibTag_Source()
- {
- return (EReference)faceletTaglibTagEClass.getEStructuralFeatures().get(6);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EReference getFaceletTaglibTag_Attribute()
- {
- return (EReference)faceletTaglibTagEClass.getEStructuralFeatures().get(7);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EReference getFaceletTaglibTag_TagExtension()
- {
- return (EReference)faceletTaglibTagEClass.getEStructuralFeatures().get(8);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getFaceletTaglibTag_TagName()
- {
- return (EAttribute)faceletTaglibTagEClass.getEStructuralFeatures().get(9);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getFaceletTaglibTag_HandlerClass()
- {
- return (EAttribute)faceletTaglibTagEClass.getEStructuralFeatures().get(10);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EClass getFaceletTaglibTagValidatorExtension()
- {
- return faceletTaglibTagValidatorExtensionEClass;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getFaceletTaglibTagValidatorExtension_Any()
- {
- return (EAttribute)faceletTaglibTagValidatorExtensionEClass.getEStructuralFeatures().get(0);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getFaceletTaglibTagValidatorExtension_Id()
- {
- return (EAttribute)faceletTaglibTagValidatorExtensionEClass.getEStructuralFeatures().get(1);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EClass getFaceletTaglibTagValidator()
- {
- return faceletTaglibTagValidatorEClass;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EReference getFaceletTaglibTagValidator_ValidatorId()
- {
- return (EReference)faceletTaglibTagValidatorEClass.getEStructuralFeatures().get(0);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EReference getFaceletTaglibTagValidator_HandlerClass()
- {
- return (EReference)faceletTaglibTagValidatorEClass.getEStructuralFeatures().get(1);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EReference getFaceletTaglibTagValidator_ValidatorExtension()
- {
- return (EReference)faceletTaglibTagValidatorEClass.getEStructuralFeatures().get(2);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EClass getFaceletTaglib()
- {
- return faceletTaglibEClass;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EReference getFaceletTaglib_LibraryClass()
- {
- return (EReference)faceletTaglibEClass.getEStructuralFeatures().get(0);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EReference getFaceletTaglib_Namespace()
- {
- return (EReference)faceletTaglibEClass.getEStructuralFeatures().get(1);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EReference getFaceletTaglib_CompositeLibraryName()
- {
- return (EReference)faceletTaglibEClass.getEStructuralFeatures().get(2);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getFaceletTaglib_Group()
- {
- return (EAttribute)faceletTaglibEClass.getEStructuralFeatures().get(3);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EReference getFaceletTaglib_Tag()
- {
- return (EReference)faceletTaglibEClass.getEStructuralFeatures().get(4);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EReference getFaceletTaglib_Function()
- {
- return (EReference)faceletTaglibEClass.getEStructuralFeatures().get(5);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EReference getFaceletTaglib_TaglibExtension()
- {
- return (EReference)faceletTaglibEClass.getEStructuralFeatures().get(6);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getFaceletTaglib_Id()
- {
- return (EAttribute)faceletTaglibEClass.getEStructuralFeatures().get(7);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getFaceletTaglib_Version()
- {
- return (EAttribute)faceletTaglibEClass.getEStructuralFeatures().get(8);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getFaceletTaglib_NamespaceUri()
- {
- return (EAttribute)faceletTaglibEClass.getEStructuralFeatures().get(9);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EClass getFullyQualifiedClass()
- {
- return fullyQualifiedClassEClass;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EClass getGenericBoolean()
- {
- return genericBooleanEClass;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EClass getIcon()
- {
- return iconEClass;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EReference getIcon_SmallIcon()
- {
- return (EReference)iconEClass.getEStructuralFeatures().get(0);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EReference getIcon_LargeIcon()
- {
- return (EReference)iconEClass.getEStructuralFeatures().get(1);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getIcon_Id()
- {
- return (EAttribute)iconEClass.getEStructuralFeatures().get(2);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getIcon_Lang()
- {
- return (EAttribute)iconEClass.getEStructuralFeatures().get(3);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EClass getJavaIdentifier()
- {
- return javaIdentifierEClass;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EClass getPath()
- {
- return pathEClass;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EClass getIdentifiableStringValue()
- {
- return identifiableStringValueEClass;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getIdentifiableStringValue_Value()
- {
- return (EAttribute)identifiableStringValueEClass.getEStructuralFeatures().get(0);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getIdentifiableStringValue_Id()
- {
- return (EAttribute)identifiableStringValueEClass.getEStructuralFeatures().get(1);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EClass getIdentifiableLangStringValue()
- {
- return identifiableLangStringValueEClass;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getIdentifiableLangStringValue_Lang()
- {
- return (EAttribute)identifiableLangStringValueEClass.getEStructuralFeatures().get(0);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EClass getUserVisibleTaglibObject()
- {
- return userVisibleTaglibObjectEClass;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EReference getUserVisibleTaglibObject_Description()
- {
- return (EReference)userVisibleTaglibObjectEClass.getEStructuralFeatures().get(0);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EReference getUserVisibleTaglibObject_DisplayName()
- {
- return (EReference)userVisibleTaglibObjectEClass.getEStructuralFeatures().get(1);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EReference getUserVisibleTaglibObject_Icon()
- {
- return (EReference)userVisibleTaglibObjectEClass.getEStructuralFeatures().get(2);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EEnum getFaceletTaglibVersion()
- {
- return faceletTaglibVersionEEnum;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EEnum getGenericBooleanBase()
- {
- return genericBooleanBaseEEnum;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EDataType getFaceletTaglibVersionTypeObject()
- {
- return faceletTaglibVersionTypeObjectEDataType;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EDataType getFullyQualifiedClassBase()
- {
- return fullyQualifiedClassBaseEDataType;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EDataType getJavaIdentifierBase()
- {
- return javaIdentifierBaseEDataType;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EDataType getPathTypeBase()
- {
- return pathTypeBaseEDataType;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public FaceletTaglibFactory getFaceletTaglibFactory()
- {
- return (FaceletTaglibFactory)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
- descriptionEClass = createEClass(DESCRIPTION);
-
- displayNameEClass = createEClass(DISPLAY_NAME);
-
- documentRootEClass = createEClass(DOCUMENT_ROOT);
- createEAttribute(documentRootEClass, DOCUMENT_ROOT__MIXED);
- createEReference(documentRootEClass, DOCUMENT_ROOT__XMLNS_PREFIX_MAP);
- createEReference(documentRootEClass, DOCUMENT_ROOT__XSI_SCHEMA_LOCATION);
- createEReference(documentRootEClass, DOCUMENT_ROOT__FACELET_TAGLIB);
-
- faceletTaglibCanonicalNameEClass = createEClass(FACELET_TAGLIB_CANONICAL_NAME);
- createEAttribute(faceletTaglibCanonicalNameEClass, FACELET_TAGLIB_CANONICAL_NAME__VALUE);
- createEAttribute(faceletTaglibCanonicalNameEClass, FACELET_TAGLIB_CANONICAL_NAME__ID);
-
- faceletTaglibExtensionEClass = createEClass(FACELET_TAGLIB_EXTENSION);
- createEAttribute(faceletTaglibExtensionEClass, FACELET_TAGLIB_EXTENSION__ANY);
- createEAttribute(faceletTaglibExtensionEClass, FACELET_TAGLIB_EXTENSION__ID);
-
- faceletTaglibFunctionEClass = createEClass(FACELET_TAGLIB_FUNCTION);
- createEReference(faceletTaglibFunctionEClass, FACELET_TAGLIB_FUNCTION__FUNCTION_NAME);
- createEReference(faceletTaglibFunctionEClass, FACELET_TAGLIB_FUNCTION__FUNCTION_CLASS);
- createEReference(faceletTaglibFunctionEClass, FACELET_TAGLIB_FUNCTION__FUNCTION_SIGNATURE);
-
- faceletTaglibTagAttributeEClass = createEClass(FACELET_TAGLIB_TAG_ATTRIBUTE);
- createEReference(faceletTaglibTagAttributeEClass, FACELET_TAGLIB_TAG_ATTRIBUTE__NAME_ELEMENT);
- createEReference(faceletTaglibTagAttributeEClass, FACELET_TAGLIB_TAG_ATTRIBUTE__REQUIRED_ELEMENT);
- createEReference(faceletTaglibTagAttributeEClass, FACELET_TAGLIB_TAG_ATTRIBUTE__TYPE_ELEMENT);
- createEReference(faceletTaglibTagAttributeEClass, FACELET_TAGLIB_TAG_ATTRIBUTE__METHOD_SIGNATURE_ELEMENT);
- createEAttribute(faceletTaglibTagAttributeEClass, FACELET_TAGLIB_TAG_ATTRIBUTE__ID);
- createEAttribute(faceletTaglibTagAttributeEClass, FACELET_TAGLIB_TAG_ATTRIBUTE__NAME);
- createEAttribute(faceletTaglibTagAttributeEClass, FACELET_TAGLIB_TAG_ATTRIBUTE__REQUIRED);
- createEAttribute(faceletTaglibTagAttributeEClass, FACELET_TAGLIB_TAG_ATTRIBUTE__TYPE);
- createEAttribute(faceletTaglibTagAttributeEClass, FACELET_TAGLIB_TAG_ATTRIBUTE__METHOD_SIGNATURE);
-
- faceletTaglibTagBehaviorExtensionEClass = createEClass(FACELET_TAGLIB_TAG_BEHAVIOR_EXTENSION);
- createEAttribute(faceletTaglibTagBehaviorExtensionEClass, FACELET_TAGLIB_TAG_BEHAVIOR_EXTENSION__ANY);
- createEAttribute(faceletTaglibTagBehaviorExtensionEClass, FACELET_TAGLIB_TAG_BEHAVIOR_EXTENSION__ID);
-
- faceletTaglibTagBehaviorEClass = createEClass(FACELET_TAGLIB_TAG_BEHAVIOR);
- createEReference(faceletTaglibTagBehaviorEClass, FACELET_TAGLIB_TAG_BEHAVIOR__BEHAVIOR_ID);
- createEReference(faceletTaglibTagBehaviorEClass, FACELET_TAGLIB_TAG_BEHAVIOR__HANDLER_CLASS);
- createEReference(faceletTaglibTagBehaviorEClass, FACELET_TAGLIB_TAG_BEHAVIOR__BEHAVIOR_EXTENSION);
-
- faceletTaglibTagComponentExtensionEClass = createEClass(FACELET_TAGLIB_TAG_COMPONENT_EXTENSION);
- createEAttribute(faceletTaglibTagComponentExtensionEClass, FACELET_TAGLIB_TAG_COMPONENT_EXTENSION__ANY);
- createEAttribute(faceletTaglibTagComponentExtensionEClass, FACELET_TAGLIB_TAG_COMPONENT_EXTENSION__ID);
-
- faceletTaglibTagComponentEClass = createEClass(FACELET_TAGLIB_TAG_COMPONENT);
- createEReference(faceletTaglibTagComponentEClass, FACELET_TAGLIB_TAG_COMPONENT__COMPONENT_TYPE);
- createEReference(faceletTaglibTagComponentEClass, FACELET_TAGLIB_TAG_COMPONENT__RENDERER_TYPE);
- createEReference(faceletTaglibTagComponentEClass, FACELET_TAGLIB_TAG_COMPONENT__HANDLER_CLASS);
- createEReference(faceletTaglibTagComponentEClass, FACELET_TAGLIB_TAG_COMPONENT__COMPONENT_EXTENSION);
-
- faceletTaglibTagConverterExtensionEClass = createEClass(FACELET_TAGLIB_TAG_CONVERTER_EXTENSION);
- createEAttribute(faceletTaglibTagConverterExtensionEClass, FACELET_TAGLIB_TAG_CONVERTER_EXTENSION__ANY);
- createEAttribute(faceletTaglibTagConverterExtensionEClass, FACELET_TAGLIB_TAG_CONVERTER_EXTENSION__ID);
-
- faceletTaglibTagConverterEClass = createEClass(FACELET_TAGLIB_TAG_CONVERTER);
- createEReference(faceletTaglibTagConverterEClass, FACELET_TAGLIB_TAG_CONVERTER__CONVERTER_ID);
- createEReference(faceletTaglibTagConverterEClass, FACELET_TAGLIB_TAG_CONVERTER__HANDLER_CLASS);
- createEReference(faceletTaglibTagConverterEClass, FACELET_TAGLIB_TAG_CONVERTER__CONVERTER_EXTENSION);
-
- faceletTaglibTagExtensionEClass = createEClass(FACELET_TAGLIB_TAG_EXTENSION);
- createEAttribute(faceletTaglibTagExtensionEClass, FACELET_TAGLIB_TAG_EXTENSION__ANY);
- createEAttribute(faceletTaglibTagExtensionEClass, FACELET_TAGLIB_TAG_EXTENSION__ID);
-
- faceletTaglibTagEClass = createEClass(FACELET_TAGLIB_TAG);
- createEReference(faceletTaglibTagEClass, FACELET_TAGLIB_TAG__TAG_NAME_ELEMENT);
- createEReference(faceletTaglibTagEClass, FACELET_TAGLIB_TAG__HANDLER_CLASS_ELEMENT);
- createEReference(faceletTaglibTagEClass, FACELET_TAGLIB_TAG__BEHAVIOR);
- createEReference(faceletTaglibTagEClass, FACELET_TAGLIB_TAG__COMPONENT);
- createEReference(faceletTaglibTagEClass, FACELET_TAGLIB_TAG__CONVERTER);
- createEReference(faceletTaglibTagEClass, FACELET_TAGLIB_TAG__VALIDATOR);
- createEReference(faceletTaglibTagEClass, FACELET_TAGLIB_TAG__SOURCE);
- createEReference(faceletTaglibTagEClass, FACELET_TAGLIB_TAG__ATTRIBUTE);
- createEReference(faceletTaglibTagEClass, FACELET_TAGLIB_TAG__TAG_EXTENSION);
- createEAttribute(faceletTaglibTagEClass, FACELET_TAGLIB_TAG__TAG_NAME);
- createEAttribute(faceletTaglibTagEClass, FACELET_TAGLIB_TAG__HANDLER_CLASS);
-
- faceletTaglibTagValidatorExtensionEClass = createEClass(FACELET_TAGLIB_TAG_VALIDATOR_EXTENSION);
- createEAttribute(faceletTaglibTagValidatorExtensionEClass, FACELET_TAGLIB_TAG_VALIDATOR_EXTENSION__ANY);
- createEAttribute(faceletTaglibTagValidatorExtensionEClass, FACELET_TAGLIB_TAG_VALIDATOR_EXTENSION__ID);
-
- faceletTaglibTagValidatorEClass = createEClass(FACELET_TAGLIB_TAG_VALIDATOR);
- createEReference(faceletTaglibTagValidatorEClass, FACELET_TAGLIB_TAG_VALIDATOR__VALIDATOR_ID);
- createEReference(faceletTaglibTagValidatorEClass, FACELET_TAGLIB_TAG_VALIDATOR__HANDLER_CLASS);
- createEReference(faceletTaglibTagValidatorEClass, FACELET_TAGLIB_TAG_VALIDATOR__VALIDATOR_EXTENSION);
-
- faceletTaglibEClass = createEClass(FACELET_TAGLIB);
- createEReference(faceletTaglibEClass, FACELET_TAGLIB__LIBRARY_CLASS);
- createEReference(faceletTaglibEClass, FACELET_TAGLIB__NAMESPACE);
- createEReference(faceletTaglibEClass, FACELET_TAGLIB__COMPOSITE_LIBRARY_NAME);
- createEAttribute(faceletTaglibEClass, FACELET_TAGLIB__GROUP);
- createEReference(faceletTaglibEClass, FACELET_TAGLIB__TAG);
- createEReference(faceletTaglibEClass, FACELET_TAGLIB__FUNCTION);
- createEReference(faceletTaglibEClass, FACELET_TAGLIB__TAGLIB_EXTENSION);
- createEAttribute(faceletTaglibEClass, FACELET_TAGLIB__ID);
- createEAttribute(faceletTaglibEClass, FACELET_TAGLIB__VERSION);
- createEAttribute(faceletTaglibEClass, FACELET_TAGLIB__NAMESPACE_URI);
-
- fullyQualifiedClassEClass = createEClass(FULLY_QUALIFIED_CLASS);
-
- genericBooleanEClass = createEClass(GENERIC_BOOLEAN);
-
- iconEClass = createEClass(ICON);
- createEReference(iconEClass, ICON__SMALL_ICON);
- createEReference(iconEClass, ICON__LARGE_ICON);
- createEAttribute(iconEClass, ICON__ID);
- createEAttribute(iconEClass, ICON__LANG);
-
- javaIdentifierEClass = createEClass(JAVA_IDENTIFIER);
-
- pathEClass = createEClass(PATH);
-
- identifiableStringValueEClass = createEClass(IDENTIFIABLE_STRING_VALUE);
- createEAttribute(identifiableStringValueEClass, IDENTIFIABLE_STRING_VALUE__VALUE);
- createEAttribute(identifiableStringValueEClass, IDENTIFIABLE_STRING_VALUE__ID);
-
- identifiableLangStringValueEClass = createEClass(IDENTIFIABLE_LANG_STRING_VALUE);
- createEAttribute(identifiableLangStringValueEClass, IDENTIFIABLE_LANG_STRING_VALUE__LANG);
-
- userVisibleTaglibObjectEClass = createEClass(USER_VISIBLE_TAGLIB_OBJECT);
- createEReference(userVisibleTaglibObjectEClass, USER_VISIBLE_TAGLIB_OBJECT__DESCRIPTION);
- createEReference(userVisibleTaglibObjectEClass, USER_VISIBLE_TAGLIB_OBJECT__DISPLAY_NAME);
- createEReference(userVisibleTaglibObjectEClass, USER_VISIBLE_TAGLIB_OBJECT__ICON);
-
- // Create enums
- faceletTaglibVersionEEnum = createEEnum(FACELET_TAGLIB_VERSION);
- genericBooleanBaseEEnum = createEEnum(GENERIC_BOOLEAN_BASE);
-
- // Create data types
- faceletTaglibVersionTypeObjectEDataType = createEDataType(FACELET_TAGLIB_VERSION_TYPE_OBJECT);
- fullyQualifiedClassBaseEDataType = createEDataType(FULLY_QUALIFIED_CLASS_BASE);
- javaIdentifierBaseEDataType = createEDataType(JAVA_IDENTIFIER_BASE);
- pathTypeBaseEDataType = createEDataType(PATH_TYPE_BASE);
- }
-
- /**
- * <!-- 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
- XMLTypePackage theXMLTypePackage = (XMLTypePackage)EPackage.Registry.INSTANCE.getEPackage(XMLTypePackage.eNS_URI);
-
- // Create type parameters
-
- // Set bounds for type parameters
-
- // Add supertypes to classes
- descriptionEClass.getESuperTypes().add(this.getIdentifiableLangStringValue());
- displayNameEClass.getESuperTypes().add(this.getIdentifiableLangStringValue());
- faceletTaglibFunctionEClass.getESuperTypes().add(this.getUserVisibleTaglibObject());
- faceletTaglibTagAttributeEClass.getESuperTypes().add(this.getUserVisibleTaglibObject());
- faceletTaglibTagBehaviorEClass.getESuperTypes().add(this.getUserVisibleTaglibObject());
- faceletTaglibTagComponentEClass.getESuperTypes().add(this.getUserVisibleTaglibObject());
- faceletTaglibTagConverterEClass.getESuperTypes().add(this.getUserVisibleTaglibObject());
- faceletTaglibTagEClass.getESuperTypes().add(this.getUserVisibleTaglibObject());
- faceletTaglibTagValidatorEClass.getESuperTypes().add(this.getUserVisibleTaglibObject());
- faceletTaglibEClass.getESuperTypes().add(this.getUserVisibleTaglibObject());
- fullyQualifiedClassEClass.getESuperTypes().add(this.getIdentifiableStringValue());
- genericBooleanEClass.getESuperTypes().add(this.getIdentifiableStringValue());
- javaIdentifierEClass.getESuperTypes().add(this.getIdentifiableStringValue());
- pathEClass.getESuperTypes().add(this.getIdentifiableStringValue());
- identifiableLangStringValueEClass.getESuperTypes().add(this.getIdentifiableStringValue());
-
- // Initialize classes and features; add operations and parameters
- initEClass(descriptionEClass, Description.class, "Description", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-
- initEClass(displayNameEClass, DisplayName.class, "DisplayName", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-
- initEClass(documentRootEClass, DocumentRoot.class, "DocumentRoot", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEAttribute(getDocumentRoot_Mixed(), ecorePackage.getEFeatureMapEntry(), "mixed", null, 0, -1, null, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getDocumentRoot_XMLNSPrefixMap(), ecorePackage.getEStringToStringMapEntry(), null, "xMLNSPrefixMap", null, 0, -1, null, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getDocumentRoot_XSISchemaLocation(), ecorePackage.getEStringToStringMapEntry(), null, "xSISchemaLocation", null, 0, -1, null, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getDocumentRoot_FaceletTaglib(), this.getFaceletTaglib(), null, "faceletTaglib", null, 0, -2, null, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
- initEClass(faceletTaglibCanonicalNameEClass, FaceletTaglibCanonicalName.class, "FaceletTaglibCanonicalName", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEAttribute(getFaceletTaglibCanonicalName_Value(), theXMLTypePackage.getNCName(), "value", null, 0, 1, FaceletTaglibCanonicalName.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getFaceletTaglibCanonicalName_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, FaceletTaglibCanonicalName.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
- initEClass(faceletTaglibExtensionEClass, FaceletTaglibExtension.class, "FaceletTaglibExtension", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEAttribute(getFaceletTaglibExtension_Any(), ecorePackage.getEFeatureMapEntry(), "any", null, 0, -1, FaceletTaglibExtension.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getFaceletTaglibExtension_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, FaceletTaglibExtension.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
- initEClass(faceletTaglibFunctionEClass, FaceletTaglibFunction.class, "FaceletTaglibFunction", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEReference(getFaceletTaglibFunction_FunctionName(), this.getIdentifiableStringValue(), null, "functionName", null, 1, 1, FaceletTaglibFunction.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getFaceletTaglibFunction_FunctionClass(), this.getFullyQualifiedClass(), null, "functionClass", null, 1, 1, FaceletTaglibFunction.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getFaceletTaglibFunction_FunctionSignature(), this.getIdentifiableStringValue(), null, "functionSignature", null, 1, 1, FaceletTaglibFunction.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
- initEClass(faceletTaglibTagAttributeEClass, FaceletTaglibTagAttribute.class, "FaceletTaglibTagAttribute", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEReference(getFaceletTaglibTagAttribute_NameElement(), this.getFaceletTaglibCanonicalName(), null, "nameElement", null, 1, 1, FaceletTaglibTagAttribute.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getFaceletTaglibTagAttribute_RequiredElement(), this.getGenericBoolean(), null, "requiredElement", null, 0, 1, FaceletTaglibTagAttribute.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getFaceletTaglibTagAttribute_TypeElement(), this.getFullyQualifiedClass(), null, "typeElement", null, 0, 1, FaceletTaglibTagAttribute.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getFaceletTaglibTagAttribute_MethodSignatureElement(), this.getIdentifiableStringValue(), null, "methodSignatureElement", null, 0, 1, FaceletTaglibTagAttribute.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getFaceletTaglibTagAttribute_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, FaceletTaglibTagAttribute.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getFaceletTaglibTagAttribute_Name(), ecorePackage.getEString(), "name", null, 0, 1, FaceletTaglibTagAttribute.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getFaceletTaglibTagAttribute_Required(), ecorePackage.getEBoolean(), "required", null, 0, 1, FaceletTaglibTagAttribute.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getFaceletTaglibTagAttribute_Type(), ecorePackage.getEString(), "type", null, 0, 1, FaceletTaglibTagAttribute.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getFaceletTaglibTagAttribute_MethodSignature(), ecorePackage.getEString(), "methodSignature", null, 0, 1, FaceletTaglibTagAttribute.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
- initEClass(faceletTaglibTagBehaviorExtensionEClass, FaceletTaglibTagBehaviorExtension.class, "FaceletTaglibTagBehaviorExtension", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEAttribute(getFaceletTaglibTagBehaviorExtension_Any(), ecorePackage.getEFeatureMapEntry(), "any", null, 0, -1, FaceletTaglibTagBehaviorExtension.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getFaceletTaglibTagBehaviorExtension_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, FaceletTaglibTagBehaviorExtension.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
- initEClass(faceletTaglibTagBehaviorEClass, FaceletTaglibTagBehavior.class, "FaceletTaglibTagBehavior", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEReference(getFaceletTaglibTagBehavior_BehaviorId(), this.getIdentifiableStringValue(), null, "behaviorId", null, 1, 1, FaceletTaglibTagBehavior.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getFaceletTaglibTagBehavior_HandlerClass(), this.getFullyQualifiedClass(), null, "handlerClass", null, 0, 1, FaceletTaglibTagBehavior.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getFaceletTaglibTagBehavior_BehaviorExtension(), this.getFaceletTaglibTagBehaviorExtension(), null, "behaviorExtension", null, 0, -1, FaceletTaglibTagBehavior.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
- initEClass(faceletTaglibTagComponentExtensionEClass, FaceletTaglibTagComponentExtension.class, "FaceletTaglibTagComponentExtension", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEAttribute(getFaceletTaglibTagComponentExtension_Any(), ecorePackage.getEFeatureMapEntry(), "any", null, 0, -1, FaceletTaglibTagComponentExtension.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getFaceletTaglibTagComponentExtension_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, FaceletTaglibTagComponentExtension.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
- initEClass(faceletTaglibTagComponentEClass, FaceletTaglibTagComponent.class, "FaceletTaglibTagComponent", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEReference(getFaceletTaglibTagComponent_ComponentType(), this.getIdentifiableStringValue(), null, "componentType", null, 1, 1, FaceletTaglibTagComponent.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getFaceletTaglibTagComponent_RendererType(), this.getIdentifiableStringValue(), null, "rendererType", null, 0, 1, FaceletTaglibTagComponent.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getFaceletTaglibTagComponent_HandlerClass(), this.getFullyQualifiedClass(), null, "handlerClass", null, 0, 1, FaceletTaglibTagComponent.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getFaceletTaglibTagComponent_ComponentExtension(), this.getFaceletTaglibTagComponentExtension(), null, "componentExtension", null, 0, -1, FaceletTaglibTagComponent.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
- initEClass(faceletTaglibTagConverterExtensionEClass, FaceletTaglibTagConverterExtension.class, "FaceletTaglibTagConverterExtension", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEAttribute(getFaceletTaglibTagConverterExtension_Any(), ecorePackage.getEFeatureMapEntry(), "any", null, 0, -1, FaceletTaglibTagConverterExtension.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getFaceletTaglibTagConverterExtension_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, FaceletTaglibTagConverterExtension.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
- initEClass(faceletTaglibTagConverterEClass, FaceletTaglibTagConverter.class, "FaceletTaglibTagConverter", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEReference(getFaceletTaglibTagConverter_ConverterId(), this.getIdentifiableStringValue(), null, "converterId", null, 1, 1, FaceletTaglibTagConverter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getFaceletTaglibTagConverter_HandlerClass(), this.getFullyQualifiedClass(), null, "handlerClass", null, 0, 1, FaceletTaglibTagConverter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getFaceletTaglibTagConverter_ConverterExtension(), this.getFaceletTaglibTagConverterExtension(), null, "converterExtension", null, 0, -1, FaceletTaglibTagConverter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
- initEClass(faceletTaglibTagExtensionEClass, FaceletTaglibTagExtension.class, "FaceletTaglibTagExtension", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEAttribute(getFaceletTaglibTagExtension_Any(), ecorePackage.getEFeatureMapEntry(), "any", null, 0, -1, FaceletTaglibTagExtension.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getFaceletTaglibTagExtension_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, FaceletTaglibTagExtension.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
- initEClass(faceletTaglibTagEClass, FaceletTaglibTag.class, "FaceletTaglibTag", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEReference(getFaceletTaglibTag_TagNameElement(), this.getFaceletTaglibCanonicalName(), null, "tagNameElement", null, 1, 1, FaceletTaglibTag.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getFaceletTaglibTag_HandlerClassElement(), this.getFullyQualifiedClass(), null, "handlerClassElement", null, 0, 1, FaceletTaglibTag.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getFaceletTaglibTag_Behavior(), this.getFaceletTaglibTagBehavior(), null, "behavior", null, 0, 1, FaceletTaglibTag.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getFaceletTaglibTag_Component(), this.getFaceletTaglibTagComponent(), null, "component", null, 0, 1, FaceletTaglibTag.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getFaceletTaglibTag_Converter(), this.getFaceletTaglibTagConverter(), null, "converter", null, 0, 1, FaceletTaglibTag.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getFaceletTaglibTag_Validator(), this.getFaceletTaglibTagValidator(), null, "validator", null, 0, 1, FaceletTaglibTag.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getFaceletTaglibTag_Source(), this.getIdentifiableStringValue(), null, "source", null, 0, 1, FaceletTaglibTag.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getFaceletTaglibTag_Attribute(), this.getFaceletTaglibTagAttribute(), null, "attribute", null, 0, -1, FaceletTaglibTag.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getFaceletTaglibTag_TagExtension(), this.getFaceletTaglibTagExtension(), null, "tagExtension", null, 0, -1, FaceletTaglibTag.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getFaceletTaglibTag_TagName(), ecorePackage.getEString(), "tagName", null, 0, 1, FaceletTaglibTag.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getFaceletTaglibTag_HandlerClass(), ecorePackage.getEString(), "handlerClass", null, 0, 1, FaceletTaglibTag.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
- initEClass(faceletTaglibTagValidatorExtensionEClass, FaceletTaglibTagValidatorExtension.class, "FaceletTaglibTagValidatorExtension", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEAttribute(getFaceletTaglibTagValidatorExtension_Any(), ecorePackage.getEFeatureMapEntry(), "any", null, 0, -1, FaceletTaglibTagValidatorExtension.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getFaceletTaglibTagValidatorExtension_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, FaceletTaglibTagValidatorExtension.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
- initEClass(faceletTaglibTagValidatorEClass, FaceletTaglibTagValidator.class, "FaceletTaglibTagValidator", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEReference(getFaceletTaglibTagValidator_ValidatorId(), this.getIdentifiableStringValue(), null, "validatorId", null, 1, 1, FaceletTaglibTagValidator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getFaceletTaglibTagValidator_HandlerClass(), this.getFullyQualifiedClass(), null, "handlerClass", null, 0, 1, FaceletTaglibTagValidator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getFaceletTaglibTagValidator_ValidatorExtension(), this.getFaceletTaglibTagValidatorExtension(), null, "validatorExtension", null, 0, -1, FaceletTaglibTagValidator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
- initEClass(faceletTaglibEClass, FaceletTaglib.class, "FaceletTaglib", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEReference(getFaceletTaglib_LibraryClass(), this.getFullyQualifiedClass(), null, "libraryClass", null, 0, 1, FaceletTaglib.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getFaceletTaglib_Namespace(), this.getIdentifiableStringValue(), null, "namespace", null, 0, 1, FaceletTaglib.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getFaceletTaglib_CompositeLibraryName(), this.getFullyQualifiedClass(), null, "compositeLibraryName", null, 0, 1, FaceletTaglib.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getFaceletTaglib_Group(), ecorePackage.getEFeatureMapEntry(), "group", null, 0, -1, FaceletTaglib.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getFaceletTaglib_Tag(), this.getFaceletTaglibTag(), null, "tag", null, 0, -1, FaceletTaglib.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getFaceletTaglib_Function(), this.getFaceletTaglibFunction(), null, "function", null, 0, -1, FaceletTaglib.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getFaceletTaglib_TaglibExtension(), this.getFaceletTaglibExtension(), null, "taglibExtension", null, 0, -1, FaceletTaglib.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getFaceletTaglib_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, FaceletTaglib.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getFaceletTaglib_Version(), this.getFaceletTaglibVersion(), "version", null, 1, 1, FaceletTaglib.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getFaceletTaglib_NamespaceUri(), theXMLTypePackage.getToken(), "namespaceUri", null, 0, 1, FaceletTaglib.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
- initEClass(fullyQualifiedClassEClass, FullyQualifiedClass.class, "FullyQualifiedClass", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-
- initEClass(genericBooleanEClass, GenericBoolean.class, "GenericBoolean", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-
- initEClass(iconEClass, Icon.class, "Icon", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEReference(getIcon_SmallIcon(), this.getPath(), null, "smallIcon", null, 0, 1, Icon.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getIcon_LargeIcon(), this.getPath(), null, "largeIcon", null, 0, 1, Icon.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getIcon_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, Icon.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getIcon_Lang(), ecorePackage.getEString(), "lang", null, 0, 1, Icon.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
- initEClass(javaIdentifierEClass, JavaIdentifier.class, "JavaIdentifier", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-
- initEClass(pathEClass, Path.class, "Path", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-
- initEClass(identifiableStringValueEClass, IdentifiableStringValue.class, "IdentifiableStringValue", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEAttribute(getIdentifiableStringValue_Value(), theXMLTypePackage.getToken(), "value", null, 0, 1, IdentifiableStringValue.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getIdentifiableStringValue_Id(), theXMLTypePackage.getID(), "id", null, 0, 1, IdentifiableStringValue.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
- initEClass(identifiableLangStringValueEClass, IdentifiableLangStringValue.class, "IdentifiableLangStringValue", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEAttribute(getIdentifiableLangStringValue_Lang(), ecorePackage.getEString(), "lang", null, 0, 1, IdentifiableLangStringValue.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
- initEClass(userVisibleTaglibObjectEClass, UserVisibleTaglibObject.class, "UserVisibleTaglibObject", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEReference(getUserVisibleTaglibObject_Description(), this.getDescription(), null, "description", null, 0, -1, UserVisibleTaglibObject.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getUserVisibleTaglibObject_DisplayName(), this.getDisplayName(), null, "displayName", null, 0, -1, UserVisibleTaglibObject.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getUserVisibleTaglibObject_Icon(), this.getIcon(), null, "icon", null, 0, -1, UserVisibleTaglibObject.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
- EOperation op = addEOperation(userVisibleTaglibObjectEClass, ecorePackage.getEString(), "getDescription", 0, 1, IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$
- addEParameter(op, ecorePackage.getEString(), "language", 0, 1, IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$
- addEParameter(op, ecorePackage.getEString(), "separationString", 0, 1, IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$
-
- op = addEOperation(userVisibleTaglibObjectEClass, ecorePackage.getEString(), "getDefaultDescription", 0, 1, IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$
- addEParameter(op, ecorePackage.getEString(), "separationString", 0, 1, IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$
-
- op = addEOperation(userVisibleTaglibObjectEClass, ecorePackage.getEString(), "getDisplayName", 0, 1, IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$
- addEParameter(op, ecorePackage.getEString(), "language", 0, 1, IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$
- addEParameter(op, ecorePackage.getEString(), "separationString", 0, 1, IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$
-
- op = addEOperation(userVisibleTaglibObjectEClass, ecorePackage.getEString(), "getDefaultDisplayName", 0, 1, IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$
- addEParameter(op, ecorePackage.getEString(), "separationString", 0, 1, IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$
-
- // Initialize enums and add enum literals
- initEEnum(faceletTaglibVersionEEnum, FaceletTaglibVersion.class, "FaceletTaglibVersion"); //$NON-NLS-1$
- addEEnumLiteral(faceletTaglibVersionEEnum, FaceletTaglibVersion._20);
-
- initEEnum(genericBooleanBaseEEnum, GenericBooleanBase.class, "GenericBooleanBase"); //$NON-NLS-1$
- addEEnumLiteral(genericBooleanBaseEEnum, GenericBooleanBase.TRUE);
- addEEnumLiteral(genericBooleanBaseEEnum, GenericBooleanBase.FALSE);
- addEEnumLiteral(genericBooleanBaseEEnum, GenericBooleanBase.YES);
- addEEnumLiteral(genericBooleanBaseEEnum, GenericBooleanBase.NO);
-
- // Initialize data types
- initEDataType(faceletTaglibVersionTypeObjectEDataType, FaceletTaglibVersion.class, "FaceletTaglibVersionTypeObject", IS_SERIALIZABLE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEDataType(fullyQualifiedClassBaseEDataType, String.class, "FullyQualifiedClassBase", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEDataType(javaIdentifierBaseEDataType, String.class, "JavaIdentifierBase", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEDataType(pathTypeBaseEDataType, String.class, "PathTypeBase", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-
- // Create resource
- createResource(eNS_URI);
-
- // Create annotations
- // http:///org/eclipse/emf/ecore/util/ExtendedMetaData
- createExtendedMetaDataAnnotations();
- }
-
- /**
- * Initializes the annotations for <b>http:///org/eclipse/emf/ecore/util/ExtendedMetaData</b>.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected void createExtendedMetaDataAnnotations()
- {
- String source = "http:///org/eclipse/emf/ecore/util/ExtendedMetaData"; //$NON-NLS-1$
- addAnnotation
- (descriptionEClass,
- source,
- new String[]
- {
- "name", "descriptionType", //$NON-NLS-1$ //$NON-NLS-2$
- "kind", "simple" //$NON-NLS-1$ //$NON-NLS-2$
- });
- addAnnotation
- (displayNameEClass,
- source,
- new String[]
- {
- "name", "display-nameType", //$NON-NLS-1$ //$NON-NLS-2$
- "kind", "simple" //$NON-NLS-1$ //$NON-NLS-2$
- });
- addAnnotation
- (documentRootEClass,
- source,
- new String[]
- {
- "name", "", //$NON-NLS-1$ //$NON-NLS-2$
- "kind", "mixed" //$NON-NLS-1$ //$NON-NLS-2$
- });
- addAnnotation
- (getDocumentRoot_Mixed(),
- source,
- new String[]
- {
- "kind", "elementWildcard", //$NON-NLS-1$ //$NON-NLS-2$
- "name", ":mixed" //$NON-NLS-1$ //$NON-NLS-2$
- });
- addAnnotation
- (getDocumentRoot_XMLNSPrefixMap(),
- source,
- new String[]
- {
- "kind", "attribute", //$NON-NLS-1$ //$NON-NLS-2$
- "name", "xmlns:prefix" //$NON-NLS-1$ //$NON-NLS-2$
- });
- addAnnotation
- (getDocumentRoot_XSISchemaLocation(),
- source,
- new String[]
- {
- "kind", "attribute", //$NON-NLS-1$ //$NON-NLS-2$
- "name", "xsi:schemaLocation" //$NON-NLS-1$ //$NON-NLS-2$
- });
- addAnnotation
- (getDocumentRoot_FaceletTaglib(),
- source,
- new String[]
- {
- "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
- "name", "facelet-taglib", //$NON-NLS-1$ //$NON-NLS-2$
- "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
- });
- addAnnotation
- (faceletTaglibCanonicalNameEClass,
- source,
- new String[]
- {
- "name", "facelet-taglib-canonical-nameType", //$NON-NLS-1$ //$NON-NLS-2$
- "kind", "simple" //$NON-NLS-1$ //$NON-NLS-2$
- });
- addAnnotation
- (getFaceletTaglibCanonicalName_Value(),
- source,
- new String[]
- {
- "name", ":0", //$NON-NLS-1$ //$NON-NLS-2$
- "kind", "simple" //$NON-NLS-1$ //$NON-NLS-2$
- });
- addAnnotation
- (getFaceletTaglibCanonicalName_Id(),
- source,
- new String[]
- {
- "kind", "attribute", //$NON-NLS-1$ //$NON-NLS-2$
- "name", "id" //$NON-NLS-1$ //$NON-NLS-2$
- });
- addAnnotation
- (faceletTaglibExtensionEClass,
- source,
- new String[]
- {
- "name", "facelet-taglib-extensionType", //$NON-NLS-1$ //$NON-NLS-2$
- "kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$
- });
- addAnnotation
- (getFaceletTaglibExtension_Any(),
- source,
- new String[]
- {
- "kind", "elementWildcard", //$NON-NLS-1$ //$NON-NLS-2$
- "wildcards", "##any", //$NON-NLS-1$ //$NON-NLS-2$
- "name", ":0", //$NON-NLS-1$ //$NON-NLS-2$
- "processing", "lax" //$NON-NLS-1$ //$NON-NLS-2$
- });
- addAnnotation
- (getFaceletTaglibExtension_Id(),
- source,
- new String[]
- {
- "kind", "attribute", //$NON-NLS-1$ //$NON-NLS-2$
- "name", "id" //$NON-NLS-1$ //$NON-NLS-2$
- });
- addAnnotation
- (faceletTaglibFunctionEClass,
- source,
- new String[]
- {
- "name", "facelet-taglib-functionType", //$NON-NLS-1$ //$NON-NLS-2$
- "kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$
- });
- addAnnotation
- (getFaceletTaglibFunction_FunctionName(),
- source,
- new String[]
- {
- "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
- "name", "function-name", //$NON-NLS-1$ //$NON-NLS-2$
- "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
- });
- addAnnotation
- (getFaceletTaglibFunction_FunctionClass(),
- source,
- new String[]
- {
- "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
- "name", "function-class", //$NON-NLS-1$ //$NON-NLS-2$
- "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
- });
- addAnnotation
- (getFaceletTaglibFunction_FunctionSignature(),
- source,
- new String[]
- {
- "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
- "name", "function-signature", //$NON-NLS-1$ //$NON-NLS-2$
- "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
- });
- addAnnotation
- (faceletTaglibTagAttributeEClass,
- source,
- new String[]
- {
- "name", "facelet-taglib-tag-attributeType", //$NON-NLS-1$ //$NON-NLS-2$
- "kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$
- });
- addAnnotation
- (getFaceletTaglibTagAttribute_NameElement(),
- source,
- new String[]
- {
- "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
- "name", "name", //$NON-NLS-1$ //$NON-NLS-2$
- "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
- });
- addAnnotation
- (getFaceletTaglibTagAttribute_RequiredElement(),
- source,
- new String[]
- {
- "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
- "name", "required", //$NON-NLS-1$ //$NON-NLS-2$
- "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
- });
- addAnnotation
- (getFaceletTaglibTagAttribute_TypeElement(),
- source,
- new String[]
- {
- "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
- "name", "type", //$NON-NLS-1$ //$NON-NLS-2$
- "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
- });
- addAnnotation
- (getFaceletTaglibTagAttribute_MethodSignatureElement(),
- source,
- new String[]
- {
- "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
- "name", "method-signature", //$NON-NLS-1$ //$NON-NLS-2$
- "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
- });
- addAnnotation
- (getFaceletTaglibTagAttribute_Id(),
- source,
- new String[]
- {
- "kind", "attribute", //$NON-NLS-1$ //$NON-NLS-2$
- "name", "id" //$NON-NLS-1$ //$NON-NLS-2$
- });
- addAnnotation
- (faceletTaglibTagBehaviorExtensionEClass,
- source,
- new String[]
- {
- "name", "facelet-taglib-tag-behavior-extensionType", //$NON-NLS-1$ //$NON-NLS-2$
- "kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$
- });
- addAnnotation
- (getFaceletTaglibTagBehaviorExtension_Any(),
- source,
- new String[]
- {
- "kind", "elementWildcard", //$NON-NLS-1$ //$NON-NLS-2$
- "wildcards", "##any", //$NON-NLS-1$ //$NON-NLS-2$
- "name", ":0", //$NON-NLS-1$ //$NON-NLS-2$
- "processing", "lax" //$NON-NLS-1$ //$NON-NLS-2$
- });
- addAnnotation
- (getFaceletTaglibTagBehaviorExtension_Id(),
- source,
- new String[]
- {
- "kind", "attribute", //$NON-NLS-1$ //$NON-NLS-2$
- "name", "id" //$NON-NLS-1$ //$NON-NLS-2$
- });
- addAnnotation
- (faceletTaglibTagBehaviorEClass,
- source,
- new String[]
- {
- "name", "facelet-taglib-tag-behaviorType", //$NON-NLS-1$ //$NON-NLS-2$
- "kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$
- });
- addAnnotation
- (getFaceletTaglibTagBehavior_BehaviorId(),
- source,
- new String[]
- {
- "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
- "name", "behavior-id", //$NON-NLS-1$ //$NON-NLS-2$
- "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
- });
- addAnnotation
- (getFaceletTaglibTagBehavior_HandlerClass(),
- source,
- new String[]
- {
- "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
- "name", "handler-class", //$NON-NLS-1$ //$NON-NLS-2$
- "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
- });
- addAnnotation
- (getFaceletTaglibTagBehavior_BehaviorExtension(),
- source,
- new String[]
- {
- "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
- "name", "behavior-extension", //$NON-NLS-1$ //$NON-NLS-2$
- "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
- });
- addAnnotation
- (faceletTaglibTagComponentExtensionEClass,
- source,
- new String[]
- {
- "name", "facelet-taglib-tag-component-extensionType", //$NON-NLS-1$ //$NON-NLS-2$
- "kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$
- });
- addAnnotation
- (getFaceletTaglibTagComponentExtension_Any(),
- source,
- new String[]
- {
- "kind", "elementWildcard", //$NON-NLS-1$ //$NON-NLS-2$
- "wildcards", "##any", //$NON-NLS-1$ //$NON-NLS-2$
- "name", ":0", //$NON-NLS-1$ //$NON-NLS-2$
- "processing", "lax" //$NON-NLS-1$ //$NON-NLS-2$
- });
- addAnnotation
- (getFaceletTaglibTagComponentExtension_Id(),
- source,
- new String[]
- {
- "kind", "attribute", //$NON-NLS-1$ //$NON-NLS-2$
- "name", "id" //$NON-NLS-1$ //$NON-NLS-2$
- });
- addAnnotation
- (faceletTaglibTagComponentEClass,
- source,
- new String[]
- {
- "name", "facelet-taglib-tag-componentType", //$NON-NLS-1$ //$NON-NLS-2$
- "kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$
- });
- addAnnotation
- (getFaceletTaglibTagComponent_ComponentType(),
- source,
- new String[]
- {
- "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
- "name", "component-type", //$NON-NLS-1$ //$NON-NLS-2$
- "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
- });
- addAnnotation
- (getFaceletTaglibTagComponent_RendererType(),
- source,
- new String[]
- {
- "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
- "name", "renderer-type", //$NON-NLS-1$ //$NON-NLS-2$
- "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
- });
- addAnnotation
- (getFaceletTaglibTagComponent_HandlerClass(),
- source,
- new String[]
- {
- "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
- "name", "handler-class", //$NON-NLS-1$ //$NON-NLS-2$
- "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
- });
- addAnnotation
- (getFaceletTaglibTagComponent_ComponentExtension(),
- source,
- new String[]
- {
- "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
- "name", "component-extension", //$NON-NLS-1$ //$NON-NLS-2$
- "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
- });
- addAnnotation
- (faceletTaglibTagConverterExtensionEClass,
- source,
- new String[]
- {
- "name", "facelet-taglib-tag-converter-extensionType", //$NON-NLS-1$ //$NON-NLS-2$
- "kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$
- });
- addAnnotation
- (getFaceletTaglibTagConverterExtension_Any(),
- source,
- new String[]
- {
- "kind", "elementWildcard", //$NON-NLS-1$ //$NON-NLS-2$
- "wildcards", "##any", //$NON-NLS-1$ //$NON-NLS-2$
- "name", ":0", //$NON-NLS-1$ //$NON-NLS-2$
- "processing", "lax" //$NON-NLS-1$ //$NON-NLS-2$
- });
- addAnnotation
- (getFaceletTaglibTagConverterExtension_Id(),
- source,
- new String[]
- {
- "kind", "attribute", //$NON-NLS-1$ //$NON-NLS-2$
- "name", "id" //$NON-NLS-1$ //$NON-NLS-2$
- });
- addAnnotation
- (faceletTaglibTagConverterEClass,
- source,
- new String[]
- {
- "name", "facelet-taglib-tag-converterType", //$NON-NLS-1$ //$NON-NLS-2$
- "kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$
- });
- addAnnotation
- (getFaceletTaglibTagConverter_ConverterId(),
- source,
- new String[]
- {
- "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
- "name", "converter-id", //$NON-NLS-1$ //$NON-NLS-2$
- "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
- });
- addAnnotation
- (getFaceletTaglibTagConverter_HandlerClass(),
- source,
- new String[]
- {
- "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
- "name", "handler-class", //$NON-NLS-1$ //$NON-NLS-2$
- "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
- });
- addAnnotation
- (getFaceletTaglibTagConverter_ConverterExtension(),
- source,
- new String[]
- {
- "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
- "name", "converter-extension", //$NON-NLS-1$ //$NON-NLS-2$
- "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
- });
- addAnnotation
- (faceletTaglibTagExtensionEClass,
- source,
- new String[]
- {
- "name", "facelet-taglib-tag-extensionType", //$NON-NLS-1$ //$NON-NLS-2$
- "kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$
- });
- addAnnotation
- (getFaceletTaglibTagExtension_Any(),
- source,
- new String[]
- {
- "kind", "elementWildcard", //$NON-NLS-1$ //$NON-NLS-2$
- "wildcards", "##any", //$NON-NLS-1$ //$NON-NLS-2$
- "name", ":0", //$NON-NLS-1$ //$NON-NLS-2$
- "processing", "lax" //$NON-NLS-1$ //$NON-NLS-2$
- });
- addAnnotation
- (getFaceletTaglibTagExtension_Id(),
- source,
- new String[]
- {
- "kind", "attribute", //$NON-NLS-1$ //$NON-NLS-2$
- "name", "id" //$NON-NLS-1$ //$NON-NLS-2$
- });
- addAnnotation
- (faceletTaglibTagEClass,
- source,
- new String[]
- {
- "name", "facelet-taglib-tagType", //$NON-NLS-1$ //$NON-NLS-2$
- "kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$
- });
- addAnnotation
- (getFaceletTaglibTag_TagNameElement(),
- source,
- new String[]
- {
- "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
- "name", "tag-name", //$NON-NLS-1$ //$NON-NLS-2$
- "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
- });
- addAnnotation
- (getFaceletTaglibTag_HandlerClassElement(),
- source,
- new String[]
- {
- "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
- "name", "handler-class", //$NON-NLS-1$ //$NON-NLS-2$
- "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
- });
- addAnnotation
- (getFaceletTaglibTag_Behavior(),
- source,
- new String[]
- {
- "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
- "name", "behavior", //$NON-NLS-1$ //$NON-NLS-2$
- "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
- });
- addAnnotation
- (getFaceletTaglibTag_Component(),
- source,
- new String[]
- {
- "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
- "name", "component", //$NON-NLS-1$ //$NON-NLS-2$
- "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
- });
- addAnnotation
- (getFaceletTaglibTag_Converter(),
- source,
- new String[]
- {
- "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
- "name", "converter", //$NON-NLS-1$ //$NON-NLS-2$
- "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
- });
- addAnnotation
- (getFaceletTaglibTag_Validator(),
- source,
- new String[]
- {
- "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
- "name", "validator", //$NON-NLS-1$ //$NON-NLS-2$
- "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
- });
- addAnnotation
- (getFaceletTaglibTag_Source(),
- source,
- new String[]
- {
- "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
- "name", "source", //$NON-NLS-1$ //$NON-NLS-2$
- "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
- });
- addAnnotation
- (getFaceletTaglibTag_Attribute(),
- source,
- new String[]
- {
- "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
- "name", "attribute", //$NON-NLS-1$ //$NON-NLS-2$
- "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
- });
- addAnnotation
- (getFaceletTaglibTag_TagExtension(),
- source,
- new String[]
- {
- "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
- "name", "tag-extension", //$NON-NLS-1$ //$NON-NLS-2$
- "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
- });
- addAnnotation
- (faceletTaglibTagValidatorExtensionEClass,
- source,
- new String[]
- {
- "name", "facelet-taglib-tag-validator-extensionType", //$NON-NLS-1$ //$NON-NLS-2$
- "kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$
- });
- addAnnotation
- (getFaceletTaglibTagValidatorExtension_Any(),
- source,
- new String[]
- {
- "kind", "elementWildcard", //$NON-NLS-1$ //$NON-NLS-2$
- "wildcards", "##any", //$NON-NLS-1$ //$NON-NLS-2$
- "name", ":0", //$NON-NLS-1$ //$NON-NLS-2$
- "processing", "lax" //$NON-NLS-1$ //$NON-NLS-2$
- });
- addAnnotation
- (getFaceletTaglibTagValidatorExtension_Id(),
- source,
- new String[]
- {
- "kind", "attribute", //$NON-NLS-1$ //$NON-NLS-2$
- "name", "id" //$NON-NLS-1$ //$NON-NLS-2$
- });
- addAnnotation
- (faceletTaglibTagValidatorEClass,
- source,
- new String[]
- {
- "name", "facelet-taglib-tag-validatorType", //$NON-NLS-1$ //$NON-NLS-2$
- "kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$
- });
- addAnnotation
- (faceletTaglibTagValidatorEClass,
- 1,
- "http:///org/eclipse/emf/ecore/util/ExtendedMetaData", //$NON-NLS-1$
- new String[]
- {
- "name", "facelet-taglib-tag-validatorType", //$NON-NLS-1$ //$NON-NLS-2$
- "kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$
- });
- addAnnotation
- (getFaceletTaglibTagValidator_ValidatorId(),
- source,
- new String[]
- {
- "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
- "name", "validator-id", //$NON-NLS-1$ //$NON-NLS-2$
- "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
- });
- addAnnotation
- (getFaceletTaglibTagValidator_HandlerClass(),
- source,
- new String[]
- {
- "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
- "name", "handler-class", //$NON-NLS-1$ //$NON-NLS-2$
- "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
- });
- addAnnotation
- (getFaceletTaglibTagValidator_ValidatorExtension(),
- source,
- new String[]
- {
- "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
- "name", "validator-extension", //$NON-NLS-1$ //$NON-NLS-2$
- "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
- });
- addAnnotation
- (faceletTaglibEClass,
- source,
- new String[]
- {
- "name", "facelet-taglibType", //$NON-NLS-1$ //$NON-NLS-2$
- "kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$
- });
- addAnnotation
- (getFaceletTaglib_LibraryClass(),
- source,
- new String[]
- {
- "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
- "name", "library-class", //$NON-NLS-1$ //$NON-NLS-2$
- "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
- });
- addAnnotation
- (getFaceletTaglib_Namespace(),
- source,
- new String[]
- {
- "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
- "name", "namespace", //$NON-NLS-1$ //$NON-NLS-2$
- "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
- });
- addAnnotation
- (getFaceletTaglib_CompositeLibraryName(),
- source,
- new String[]
- {
- "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
- "name", "composite-library-name", //$NON-NLS-1$ //$NON-NLS-2$
- "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
- });
- addAnnotation
- (getFaceletTaglib_Group(),
- source,
- new String[]
- {
- "kind", "group", //$NON-NLS-1$ //$NON-NLS-2$
- "name", "group:6" //$NON-NLS-1$ //$NON-NLS-2$
- });
- addAnnotation
- (getFaceletTaglib_Tag(),
- source,
- new String[]
- {
- "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
- "name", "tag", //$NON-NLS-1$ //$NON-NLS-2$
- "namespace", "##targetNamespace", //$NON-NLS-1$ //$NON-NLS-2$
- "group", "#group:6" //$NON-NLS-1$ //$NON-NLS-2$
- });
- addAnnotation
- (getFaceletTaglib_Function(),
- source,
- new String[]
- {
- "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
- "name", "function", //$NON-NLS-1$ //$NON-NLS-2$
- "namespace", "##targetNamespace", //$NON-NLS-1$ //$NON-NLS-2$
- "group", "#group:6" //$NON-NLS-1$ //$NON-NLS-2$
- });
- addAnnotation
- (getFaceletTaglib_TaglibExtension(),
- source,
- new String[]
- {
- "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
- "name", "taglib-extension", //$NON-NLS-1$ //$NON-NLS-2$
- "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
- });
- addAnnotation
- (getFaceletTaglib_Id(),
- source,
- new String[]
- {
- "kind", "attribute", //$NON-NLS-1$ //$NON-NLS-2$
- "name", "id" //$NON-NLS-1$ //$NON-NLS-2$
- });
- addAnnotation
- (getFaceletTaglib_Version(),
- source,
- new String[]
- {
- "kind", "attribute", //$NON-NLS-1$ //$NON-NLS-2$
- "name", "version" //$NON-NLS-1$ //$NON-NLS-2$
- });
- addAnnotation
- (faceletTaglibVersionEEnum,
- source,
- new String[]
- {
- "name", "facelet-taglib-versionType" //$NON-NLS-1$ //$NON-NLS-2$
- });
- addAnnotation
- (faceletTaglibVersionTypeObjectEDataType,
- source,
- new String[]
- {
- "name", "facelet-taglib-versionType:Object", //$NON-NLS-1$ //$NON-NLS-2$
- "baseType", "facelet-taglib-versionType" //$NON-NLS-1$ //$NON-NLS-2$
- });
- addAnnotation
- (fullyQualifiedClassEClass,
- source,
- new String[]
- {
- "name", "fully-qualified-classType", //$NON-NLS-1$ //$NON-NLS-2$
- "kind", "simple" //$NON-NLS-1$ //$NON-NLS-2$
- });
- addAnnotation
- (fullyQualifiedClassBaseEDataType,
- source,
- new String[]
- {
- "name", "fully-qualified-classType_._base", //$NON-NLS-1$ //$NON-NLS-2$
- "baseType", "http://www.eclipse.org/emf/2003/XMLType#token" //$NON-NLS-1$ //$NON-NLS-2$
- });
- addAnnotation
- (genericBooleanEClass,
- source,
- new String[]
- {
- "name", "generic-booleanType", //$NON-NLS-1$ //$NON-NLS-2$
- "kind", "simple" //$NON-NLS-1$ //$NON-NLS-2$
- });
- addAnnotation
- (genericBooleanBaseEEnum,
- source,
- new String[]
- {
- "name", "generic-booleanType_._base" //$NON-NLS-1$ //$NON-NLS-2$
- });
- addAnnotation
- (iconEClass,
- source,
- new String[]
- {
- "name", "iconType", //$NON-NLS-1$ //$NON-NLS-2$
- "kind", "elementOnly" //$NON-NLS-1$ //$NON-NLS-2$
- });
- addAnnotation
- (getIcon_SmallIcon(),
- source,
- new String[]
- {
- "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
- "name", "small-icon", //$NON-NLS-1$ //$NON-NLS-2$
- "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
- });
- addAnnotation
- (getIcon_LargeIcon(),
- source,
- new String[]
- {
- "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
- "name", "large-icon", //$NON-NLS-1$ //$NON-NLS-2$
- "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
- });
- addAnnotation
- (getIcon_Id(),
- source,
- new String[]
- {
- "kind", "attribute", //$NON-NLS-1$ //$NON-NLS-2$
- "name", "id" //$NON-NLS-1$ //$NON-NLS-2$
- });
- addAnnotation
- (getIcon_Lang(),
- source,
- new String[]
- {
- "kind", "attribute", //$NON-NLS-1$ //$NON-NLS-2$
- "name", "lang", //$NON-NLS-1$ //$NON-NLS-2$
- "namespace", "http://www.w3.org/XML/1998/namespace" //$NON-NLS-1$ //$NON-NLS-2$
- });
- addAnnotation
- (javaIdentifierEClass,
- source,
- new String[]
- {
- "name", "java-identifierType", //$NON-NLS-1$ //$NON-NLS-2$
- "kind", "simple" //$NON-NLS-1$ //$NON-NLS-2$
- });
- addAnnotation
- (javaIdentifierBaseEDataType,
- source,
- new String[]
- {
- "name", "java-identifierType_._base", //$NON-NLS-1$ //$NON-NLS-2$
- "baseType", "http://www.eclipse.org/emf/2003/XMLType#token", //$NON-NLS-1$ //$NON-NLS-2$
- "pattern", "($|_|\\p{L})(\\p{L}|\\p{Nd}|_|$)*" //$NON-NLS-1$ //$NON-NLS-2$
- });
- addAnnotation
- (pathEClass,
- source,
- new String[]
- {
- "name", "pathType", //$NON-NLS-1$ //$NON-NLS-2$
- "kind", "simple" //$NON-NLS-1$ //$NON-NLS-2$
- });
- addAnnotation
- (pathTypeBaseEDataType,
- source,
- new String[]
- {
- "name", "pathType_._base", //$NON-NLS-1$ //$NON-NLS-2$
- "baseType", "http://www.eclipse.org/emf/2003/XMLType#token" //$NON-NLS-1$ //$NON-NLS-2$
- });
- addAnnotation
- (identifiableStringValueEClass,
- source,
- new String[]
- {
- "name", "string", //$NON-NLS-1$ //$NON-NLS-2$
- "kind", "simple" //$NON-NLS-1$ //$NON-NLS-2$
- });
- addAnnotation
- (getIdentifiableStringValue_Value(),
- source,
- new String[]
- {
- "name", ":0", //$NON-NLS-1$ //$NON-NLS-2$
- "kind", "simple" //$NON-NLS-1$ //$NON-NLS-2$
- });
- addAnnotation
- (getIdentifiableStringValue_Id(),
- source,
- new String[]
- {
- "kind", "attribute", //$NON-NLS-1$ //$NON-NLS-2$
- "name", "id" //$NON-NLS-1$ //$NON-NLS-2$
- });
- addAnnotation
- (getIdentifiableLangStringValue_Lang(),
- source,
- new String[]
- {
- "kind", "attribute", //$NON-NLS-1$ //$NON-NLS-2$
- "name", "lang", //$NON-NLS-1$ //$NON-NLS-2$
- "namespace", "http://www.w3.org/XML/1998/namespace" //$NON-NLS-1$ //$NON-NLS-2$
- });
- addAnnotation
- (getUserVisibleTaglibObject_Description(),
- source,
- new String[]
- {
- "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
- "name", "description", //$NON-NLS-1$ //$NON-NLS-2$
- "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
- });
- addAnnotation
- (getUserVisibleTaglibObject_DisplayName(),
- source,
- new String[]
- {
- "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
- "name", "display-name", //$NON-NLS-1$ //$NON-NLS-2$
- "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
- });
- addAnnotation
- (getUserVisibleTaglibObject_Icon(),
- source,
- new String[]
- {
- "kind", "element", //$NON-NLS-1$ //$NON-NLS-2$
- "name", "icon", //$NON-NLS-1$ //$NON-NLS-2$
- "namespace", "##targetNamespace" //$NON-NLS-1$ //$NON-NLS-2$
- });
- }
-
-} //FaceletTaglibPackageImpl
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib/impl/FaceletTaglibTagAttributeImpl.java b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib/impl/FaceletTaglibTagAttributeImpl.java
deleted file mode 100644
index dfe5916..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib/impl/FaceletTaglibTagAttributeImpl.java
+++ /dev/null
@@ -1,671 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: FaceletTaglibTagAttributeImpl.java,v 1.1 2010/03/18 06:24:38 cbateman Exp $
- */
-package org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibCanonicalName;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibPackage;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagAttribute;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FullyQualifiedClass;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.GenericBoolean;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.GenericBooleanBase;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.IdentifiableStringValue;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Facelet Taglib Tag Attribute</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- * <li>{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl.FaceletTaglibTagAttributeImpl#getNameElement <em>Name Element</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl.FaceletTaglibTagAttributeImpl#getRequiredElement <em>Required Element</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl.FaceletTaglibTagAttributeImpl#getTypeElement <em>Type Element</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl.FaceletTaglibTagAttributeImpl#getMethodSignatureElement <em>Method Signature Element</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl.FaceletTaglibTagAttributeImpl#getId <em>Id</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl.FaceletTaglibTagAttributeImpl#getName <em>Name</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl.FaceletTaglibTagAttributeImpl#isRequired <em>Required</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl.FaceletTaglibTagAttributeImpl#getType <em>Type</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl.FaceletTaglibTagAttributeImpl#getMethodSignature <em>Method Signature</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class FaceletTaglibTagAttributeImpl extends UserVisibleTaglibObjectImpl implements FaceletTaglibTagAttribute
-{
- /**
- * The cached value of the '{@link #getNameElement() <em>Name Element</em>}' containment reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getNameElement()
- * @generated
- * @ordered
- */
- protected FaceletTaglibCanonicalName nameElement;
-
- /**
- * The cached value of the '{@link #getRequiredElement() <em>Required Element</em>}' containment reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getRequiredElement()
- * @generated
- * @ordered
- */
- protected GenericBoolean requiredElement;
-
- /**
- * The cached value of the '{@link #getTypeElement() <em>Type Element</em>}' containment reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getTypeElement()
- * @generated
- * @ordered
- */
- protected FullyQualifiedClass typeElement;
-
- /**
- * The cached value of the '{@link #getMethodSignatureElement() <em>Method Signature Element</em>}' containment reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getMethodSignatureElement()
- * @generated
- * @ordered
- */
- protected IdentifiableStringValue methodSignatureElement;
-
- /**
- * The default value of the '{@link #getId() <em>Id</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getId()
- * @generated
- * @ordered
- */
- protected static final String ID_EDEFAULT = null;
-
- /**
- * The cached value of the '{@link #getId() <em>Id</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getId()
- * @generated
- * @ordered
- */
- protected String id = ID_EDEFAULT;
-
- /**
- * The default value of the '{@link #getName() <em>Name</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getName()
- * @generated
- * @ordered
- */
- protected static final String NAME_EDEFAULT = null;
-
- /**
- * The default value of the '{@link #isRequired() <em>Required</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #isRequired()
- * @generated
- * @ordered
- */
- protected static final boolean REQUIRED_EDEFAULT = false;
-
- /**
- * The default value of the '{@link #getType() <em>Type</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getType()
- * @generated
- * @ordered
- */
- protected static final String TYPE_EDEFAULT = null;
-
- /**
- * The default value of the '{@link #getMethodSignature() <em>Method Signature</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getMethodSignature()
- * @generated
- * @ordered
- */
- protected static final String METHOD_SIGNATURE_EDEFAULT = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected FaceletTaglibTagAttributeImpl()
- {
- super();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- protected EClass eStaticClass()
- {
- return FaceletTaglibPackage.Literals.FACELET_TAGLIB_TAG_ATTRIBUTE;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public FaceletTaglibCanonicalName getNameElement()
- {
- return nameElement;
- }
-
- /**
- * <!-- begin-user-doc -->
- * @param newNameElement
- * @param msgs
- * @return the notification chain
- * <!-- end-user-doc -->
- * @generated
- */
- public NotificationChain basicSetNameElement(FaceletTaglibCanonicalName newNameElement, NotificationChain msgs)
- {
- FaceletTaglibCanonicalName oldNameElement = nameElement;
- nameElement = newNameElement;
- if (eNotificationRequired())
- {
- ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, FaceletTaglibPackage.FACELET_TAGLIB_TAG_ATTRIBUTE__NAME_ELEMENT, oldNameElement, newNameElement);
- if (msgs == null) msgs = notification; else msgs.add(notification);
- }
- return msgs;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setNameElement(FaceletTaglibCanonicalName newNameElement)
- {
- if (newNameElement != nameElement)
- {
- NotificationChain msgs = null;
- if (nameElement != null)
- msgs = ((InternalEObject)nameElement).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - FaceletTaglibPackage.FACELET_TAGLIB_TAG_ATTRIBUTE__NAME_ELEMENT, null, msgs);
- if (newNameElement != null)
- msgs = ((InternalEObject)newNameElement).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - FaceletTaglibPackage.FACELET_TAGLIB_TAG_ATTRIBUTE__NAME_ELEMENT, null, msgs);
- msgs = basicSetNameElement(newNameElement, msgs);
- if (msgs != null) msgs.dispatch();
- }
- else if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, FaceletTaglibPackage.FACELET_TAGLIB_TAG_ATTRIBUTE__NAME_ELEMENT, newNameElement, newNameElement));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public GenericBoolean getRequiredElement()
- {
- return requiredElement;
- }
-
- /**
- * <!-- begin-user-doc -->
- * @param newRequiredElement
- * @param msgs
- * @return
- * <!-- end-user-doc -->
- * @generated
- */
- public NotificationChain basicSetRequiredElement(GenericBoolean newRequiredElement, NotificationChain msgs)
- {
- GenericBoolean oldRequiredElement = requiredElement;
- requiredElement = newRequiredElement;
- if (eNotificationRequired())
- {
- ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, FaceletTaglibPackage.FACELET_TAGLIB_TAG_ATTRIBUTE__REQUIRED_ELEMENT, oldRequiredElement, newRequiredElement);
- if (msgs == null) msgs = notification; else msgs.add(notification);
- }
- return msgs;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setRequiredElement(GenericBoolean newRequiredElement)
- {
- if (newRequiredElement != requiredElement)
- {
- NotificationChain msgs = null;
- if (requiredElement != null)
- msgs = ((InternalEObject)requiredElement).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - FaceletTaglibPackage.FACELET_TAGLIB_TAG_ATTRIBUTE__REQUIRED_ELEMENT, null, msgs);
- if (newRequiredElement != null)
- msgs = ((InternalEObject)newRequiredElement).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - FaceletTaglibPackage.FACELET_TAGLIB_TAG_ATTRIBUTE__REQUIRED_ELEMENT, null, msgs);
- msgs = basicSetRequiredElement(newRequiredElement, msgs);
- if (msgs != null) msgs.dispatch();
- }
- else if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, FaceletTaglibPackage.FACELET_TAGLIB_TAG_ATTRIBUTE__REQUIRED_ELEMENT, newRequiredElement, newRequiredElement));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public FullyQualifiedClass getTypeElement()
- {
- return typeElement;
- }
-
- /**
- * <!-- begin-user-doc -->
- * @param newTypeElement
- * @param msgs
- * @return
- * <!-- end-user-doc -->
- * @generated
- */
- public NotificationChain basicSetTypeElement(FullyQualifiedClass newTypeElement, NotificationChain msgs)
- {
- FullyQualifiedClass oldTypeElement = typeElement;
- typeElement = newTypeElement;
- if (eNotificationRequired())
- {
- ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, FaceletTaglibPackage.FACELET_TAGLIB_TAG_ATTRIBUTE__TYPE_ELEMENT, oldTypeElement, newTypeElement);
- if (msgs == null) msgs = notification; else msgs.add(notification);
- }
- return msgs;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setTypeElement(FullyQualifiedClass newTypeElement)
- {
- if (newTypeElement != typeElement)
- {
- NotificationChain msgs = null;
- if (typeElement != null)
- msgs = ((InternalEObject)typeElement).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - FaceletTaglibPackage.FACELET_TAGLIB_TAG_ATTRIBUTE__TYPE_ELEMENT, null, msgs);
- if (newTypeElement != null)
- msgs = ((InternalEObject)newTypeElement).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - FaceletTaglibPackage.FACELET_TAGLIB_TAG_ATTRIBUTE__TYPE_ELEMENT, null, msgs);
- msgs = basicSetTypeElement(newTypeElement, msgs);
- if (msgs != null) msgs.dispatch();
- }
- else if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, FaceletTaglibPackage.FACELET_TAGLIB_TAG_ATTRIBUTE__TYPE_ELEMENT, newTypeElement, newTypeElement));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public IdentifiableStringValue getMethodSignatureElement()
- {
- return methodSignatureElement;
- }
-
- /**
- * <!-- begin-user-doc -->
- * @param newMethodSignatureElement
- * @param msgs
- * @return
- * <!-- end-user-doc -->
- * @generated
- */
- public NotificationChain basicSetMethodSignatureElement(IdentifiableStringValue newMethodSignatureElement, NotificationChain msgs)
- {
- IdentifiableStringValue oldMethodSignatureElement = methodSignatureElement;
- methodSignatureElement = newMethodSignatureElement;
- if (eNotificationRequired())
- {
- ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, FaceletTaglibPackage.FACELET_TAGLIB_TAG_ATTRIBUTE__METHOD_SIGNATURE_ELEMENT, oldMethodSignatureElement, newMethodSignatureElement);
- if (msgs == null) msgs = notification; else msgs.add(notification);
- }
- return msgs;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setMethodSignatureElement(IdentifiableStringValue newMethodSignatureElement)
- {
- if (newMethodSignatureElement != methodSignatureElement)
- {
- NotificationChain msgs = null;
- if (methodSignatureElement != null)
- msgs = ((InternalEObject)methodSignatureElement).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - FaceletTaglibPackage.FACELET_TAGLIB_TAG_ATTRIBUTE__METHOD_SIGNATURE_ELEMENT, null, msgs);
- if (newMethodSignatureElement != null)
- msgs = ((InternalEObject)newMethodSignatureElement).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - FaceletTaglibPackage.FACELET_TAGLIB_TAG_ATTRIBUTE__METHOD_SIGNATURE_ELEMENT, null, msgs);
- msgs = basicSetMethodSignatureElement(newMethodSignatureElement, msgs);
- if (msgs != null) msgs.dispatch();
- }
- else if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, FaceletTaglibPackage.FACELET_TAGLIB_TAG_ATTRIBUTE__METHOD_SIGNATURE_ELEMENT, newMethodSignatureElement, newMethodSignatureElement));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated NOT
- */
- public String getName()
- {
- return (String) Util.getSimplifiedNestedField(this, FaceletTaglibPackage.Literals.FACELET_TAGLIB_TAG_ATTRIBUTE__NAME_ELEMENT, FaceletTaglibPackage.Literals.FACELET_TAGLIB_CANONICAL_NAME__VALUE);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated NOT
- */
- public void setName(String newName)
- {
- Util.setSimplifiedNestedField(
- this,
- FaceletTaglibPackage.Literals.FACELET_TAGLIB_TAG_ATTRIBUTE__NAME_ELEMENT,
- FaceletTaglibPackage.Literals.FACELET_TAGLIB_CANONICAL_NAME__VALUE,
- newName);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated NOT
- */
- public boolean isRequired()
- {
- String requiredStr = (String) Util.getSimplifiedNestedField(this, FaceletTaglibPackage.Literals.FACELET_TAGLIB_TAG_ATTRIBUTE__REQUIRED_ELEMENT, FaceletTaglibPackage.Literals.IDENTIFIABLE_STRING_VALUE__VALUE);
- GenericBooleanBase enumValue = GenericBooleanBase.get(requiredStr);
- if (enumValue == GenericBooleanBase.TRUE || enumValue == GenericBooleanBase.YES)
- {
- return true;
- }
- return false;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated NOT
- */
- public void setRequired(boolean newRequired)
- {
- String newValue = newRequired ? GenericBooleanBase.TRUE.toString() : GenericBooleanBase.FALSE.toString();
- Util.setSimplifiedNestedField(this, FaceletTaglibPackage.Literals.FACELET_TAGLIB_TAG_ATTRIBUTE__REQUIRED_ELEMENT, FaceletTaglibPackage.Literals.IDENTIFIABLE_STRING_VALUE__VALUE, newValue);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated NOT
- */
- public String getType()
- {
- return (String) Util.getSimplifiedNestedField(this, FaceletTaglibPackage.Literals.FACELET_TAGLIB_TAG_ATTRIBUTE__TYPE_ELEMENT, FaceletTaglibPackage.Literals.IDENTIFIABLE_STRING_VALUE__VALUE);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated NOT
- */
- public void setType(String newType)
- {
- Util.setSimplifiedNestedField(this, FaceletTaglibPackage.Literals.FACELET_TAGLIB_TAG_ATTRIBUTE__TYPE_ELEMENT, FaceletTaglibPackage.Literals.IDENTIFIABLE_STRING_VALUE__VALUE, newType);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated NOT
- */
- public String getMethodSignature()
- {
- return (String) Util.getSimplifiedNestedField(this, FaceletTaglibPackage.Literals.FACELET_TAGLIB_TAG_ATTRIBUTE__METHOD_SIGNATURE_ELEMENT, FaceletTaglibPackage.Literals.IDENTIFIABLE_STRING_VALUE__VALUE);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated NOT
- */
- public void setMethodSignature(String newMethodSignature)
- {
- Util.setSimplifiedNestedField(this, FaceletTaglibPackage.Literals.FACELET_TAGLIB_TAG_ATTRIBUTE__METHOD_SIGNATURE_ELEMENT, FaceletTaglibPackage.Literals.IDENTIFIABLE_STRING_VALUE__VALUE, newMethodSignature);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public String getId()
- {
- return id;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setId(String newId)
- {
- String oldId = id;
- id = newId;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, FaceletTaglibPackage.FACELET_TAGLIB_TAG_ATTRIBUTE__ID, oldId, id));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)
- {
- switch (featureID)
- {
- case FaceletTaglibPackage.FACELET_TAGLIB_TAG_ATTRIBUTE__NAME_ELEMENT:
- return basicSetNameElement(null, msgs);
- case FaceletTaglibPackage.FACELET_TAGLIB_TAG_ATTRIBUTE__REQUIRED_ELEMENT:
- return basicSetRequiredElement(null, msgs);
- case FaceletTaglibPackage.FACELET_TAGLIB_TAG_ATTRIBUTE__TYPE_ELEMENT:
- return basicSetTypeElement(null, msgs);
- case FaceletTaglibPackage.FACELET_TAGLIB_TAG_ATTRIBUTE__METHOD_SIGNATURE_ELEMENT:
- return basicSetMethodSignatureElement(null, msgs);
- }
- return super.eInverseRemove(otherEnd, featureID, msgs);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @SuppressWarnings("boxing")
- @Override
- public Object eGet(int featureID, boolean resolve, boolean coreType)
- {
- switch (featureID)
- {
- case FaceletTaglibPackage.FACELET_TAGLIB_TAG_ATTRIBUTE__NAME_ELEMENT:
- return getNameElement();
- case FaceletTaglibPackage.FACELET_TAGLIB_TAG_ATTRIBUTE__REQUIRED_ELEMENT:
- return getRequiredElement();
- case FaceletTaglibPackage.FACELET_TAGLIB_TAG_ATTRIBUTE__TYPE_ELEMENT:
- return getTypeElement();
- case FaceletTaglibPackage.FACELET_TAGLIB_TAG_ATTRIBUTE__METHOD_SIGNATURE_ELEMENT:
- return getMethodSignatureElement();
- case FaceletTaglibPackage.FACELET_TAGLIB_TAG_ATTRIBUTE__ID:
- return getId();
- case FaceletTaglibPackage.FACELET_TAGLIB_TAG_ATTRIBUTE__NAME:
- return getName();
- case FaceletTaglibPackage.FACELET_TAGLIB_TAG_ATTRIBUTE__REQUIRED:
- return isRequired();
- case FaceletTaglibPackage.FACELET_TAGLIB_TAG_ATTRIBUTE__TYPE:
- return getType();
- case FaceletTaglibPackage.FACELET_TAGLIB_TAG_ATTRIBUTE__METHOD_SIGNATURE:
- return getMethodSignature();
- }
- return super.eGet(featureID, resolve, coreType);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @SuppressWarnings({ "unchecked", "boxing" })
- @Override
- public void eSet(int featureID, Object newValue)
- {
- switch (featureID)
- {
- case FaceletTaglibPackage.FACELET_TAGLIB_TAG_ATTRIBUTE__NAME_ELEMENT:
- setNameElement((FaceletTaglibCanonicalName)newValue);
- return;
- case FaceletTaglibPackage.FACELET_TAGLIB_TAG_ATTRIBUTE__REQUIRED_ELEMENT:
- setRequiredElement((GenericBoolean)newValue);
- return;
- case FaceletTaglibPackage.FACELET_TAGLIB_TAG_ATTRIBUTE__TYPE_ELEMENT:
- setTypeElement((FullyQualifiedClass)newValue);
- return;
- case FaceletTaglibPackage.FACELET_TAGLIB_TAG_ATTRIBUTE__METHOD_SIGNATURE_ELEMENT:
- setMethodSignatureElement((IdentifiableStringValue)newValue);
- return;
- case FaceletTaglibPackage.FACELET_TAGLIB_TAG_ATTRIBUTE__ID:
- setId((String)newValue);
- return;
- case FaceletTaglibPackage.FACELET_TAGLIB_TAG_ATTRIBUTE__NAME:
- setName((String)newValue);
- return;
- case FaceletTaglibPackage.FACELET_TAGLIB_TAG_ATTRIBUTE__REQUIRED:
- setRequired((Boolean)newValue);
- return;
- case FaceletTaglibPackage.FACELET_TAGLIB_TAG_ATTRIBUTE__TYPE:
- setType((String)newValue);
- return;
- case FaceletTaglibPackage.FACELET_TAGLIB_TAG_ATTRIBUTE__METHOD_SIGNATURE:
- setMethodSignature((String)newValue);
- return;
- }
- super.eSet(featureID, newValue);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public void eUnset(int featureID)
- {
- switch (featureID)
- {
- case FaceletTaglibPackage.FACELET_TAGLIB_TAG_ATTRIBUTE__NAME_ELEMENT:
- setNameElement((FaceletTaglibCanonicalName)null);
- return;
- case FaceletTaglibPackage.FACELET_TAGLIB_TAG_ATTRIBUTE__REQUIRED_ELEMENT:
- setRequiredElement((GenericBoolean)null);
- return;
- case FaceletTaglibPackage.FACELET_TAGLIB_TAG_ATTRIBUTE__TYPE_ELEMENT:
- setTypeElement((FullyQualifiedClass)null);
- return;
- case FaceletTaglibPackage.FACELET_TAGLIB_TAG_ATTRIBUTE__METHOD_SIGNATURE_ELEMENT:
- setMethodSignatureElement((IdentifiableStringValue)null);
- return;
- case FaceletTaglibPackage.FACELET_TAGLIB_TAG_ATTRIBUTE__ID:
- setId(ID_EDEFAULT);
- return;
- case FaceletTaglibPackage.FACELET_TAGLIB_TAG_ATTRIBUTE__NAME:
- setName(NAME_EDEFAULT);
- return;
- case FaceletTaglibPackage.FACELET_TAGLIB_TAG_ATTRIBUTE__REQUIRED:
- setRequired(REQUIRED_EDEFAULT);
- return;
- case FaceletTaglibPackage.FACELET_TAGLIB_TAG_ATTRIBUTE__TYPE:
- setType(TYPE_EDEFAULT);
- return;
- case FaceletTaglibPackage.FACELET_TAGLIB_TAG_ATTRIBUTE__METHOD_SIGNATURE:
- setMethodSignature(METHOD_SIGNATURE_EDEFAULT);
- return;
- }
- super.eUnset(featureID);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public boolean eIsSet(int featureID)
- {
- switch (featureID)
- {
- case FaceletTaglibPackage.FACELET_TAGLIB_TAG_ATTRIBUTE__NAME_ELEMENT:
- return nameElement != null;
- case FaceletTaglibPackage.FACELET_TAGLIB_TAG_ATTRIBUTE__REQUIRED_ELEMENT:
- return requiredElement != null;
- case FaceletTaglibPackage.FACELET_TAGLIB_TAG_ATTRIBUTE__TYPE_ELEMENT:
- return typeElement != null;
- case FaceletTaglibPackage.FACELET_TAGLIB_TAG_ATTRIBUTE__METHOD_SIGNATURE_ELEMENT:
- return methodSignatureElement != null;
- case FaceletTaglibPackage.FACELET_TAGLIB_TAG_ATTRIBUTE__ID:
- return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
- case FaceletTaglibPackage.FACELET_TAGLIB_TAG_ATTRIBUTE__NAME:
- return NAME_EDEFAULT == null ? getName() != null : !NAME_EDEFAULT.equals(getName());
- case FaceletTaglibPackage.FACELET_TAGLIB_TAG_ATTRIBUTE__REQUIRED:
- return isRequired() != REQUIRED_EDEFAULT;
- case FaceletTaglibPackage.FACELET_TAGLIB_TAG_ATTRIBUTE__TYPE:
- return TYPE_EDEFAULT == null ? getType() != null : !TYPE_EDEFAULT.equals(getType());
- case FaceletTaglibPackage.FACELET_TAGLIB_TAG_ATTRIBUTE__METHOD_SIGNATURE:
- return METHOD_SIGNATURE_EDEFAULT == null ? getMethodSignature() != null : !METHOD_SIGNATURE_EDEFAULT.equals(getMethodSignature());
- }
- return super.eIsSet(featureID);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public String toString()
- {
- if (eIsProxy()) return super.toString();
-
- StringBuffer result = new StringBuffer(super.toString());
- result.append(" (id: "); //$NON-NLS-1$
- result.append(id);
- result.append(')');
- return result.toString();
- }
-
-} //FaceletTaglibTagAttributeImpl
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib/impl/FaceletTaglibTagBehaviorExtensionImpl.java b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib/impl/FaceletTaglibTagBehaviorExtensionImpl.java
deleted file mode 100644
index b933999..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib/impl/FaceletTaglibTagBehaviorExtensionImpl.java
+++ /dev/null
@@ -1,237 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: FaceletTaglibTagBehaviorExtensionImpl.java,v 1.1 2010/03/18 06:24:37 cbateman Exp $
- */
-package org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.emf.ecore.util.BasicFeatureMap;
-import org.eclipse.emf.ecore.util.FeatureMap;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibPackage;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagBehaviorExtension;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Facelet Taglib Tag Behavior Extension</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- * <li>{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl.FaceletTaglibTagBehaviorExtensionImpl#getAny <em>Any</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl.FaceletTaglibTagBehaviorExtensionImpl#getId <em>Id</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class FaceletTaglibTagBehaviorExtensionImpl extends EObjectImpl implements FaceletTaglibTagBehaviorExtension
-{
- /**
- * The cached value of the '{@link #getAny() <em>Any</em>}' attribute list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getAny()
- * @generated
- * @ordered
- */
- protected FeatureMap any;
-
- /**
- * The default value of the '{@link #getId() <em>Id</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getId()
- * @generated
- * @ordered
- */
- protected static final String ID_EDEFAULT = null;
-
- /**
- * The cached value of the '{@link #getId() <em>Id</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getId()
- * @generated
- * @ordered
- */
- protected String id = ID_EDEFAULT;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected FaceletTaglibTagBehaviorExtensionImpl()
- {
- super();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- protected EClass eStaticClass()
- {
- return FaceletTaglibPackage.Literals.FACELET_TAGLIB_TAG_BEHAVIOR_EXTENSION;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public FeatureMap getAny()
- {
- if (any == null)
- {
- any = new BasicFeatureMap(this, FaceletTaglibPackage.FACELET_TAGLIB_TAG_BEHAVIOR_EXTENSION__ANY);
- }
- return any;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public String getId()
- {
- return id;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setId(String newId)
- {
- String oldId = id;
- id = newId;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, FaceletTaglibPackage.FACELET_TAGLIB_TAG_BEHAVIOR_EXTENSION__ID, oldId, id));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)
- {
- switch (featureID)
- {
- case FaceletTaglibPackage.FACELET_TAGLIB_TAG_BEHAVIOR_EXTENSION__ANY:
- return ((InternalEList<?>)getAny()).basicRemove(otherEnd, msgs);
- }
- return super.eInverseRemove(otherEnd, featureID, msgs);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public Object eGet(int featureID, boolean resolve, boolean coreType)
- {
- switch (featureID)
- {
- case FaceletTaglibPackage.FACELET_TAGLIB_TAG_BEHAVIOR_EXTENSION__ANY:
- if (coreType) return getAny();
- return ((FeatureMap.Internal)getAny()).getWrapper();
- case FaceletTaglibPackage.FACELET_TAGLIB_TAG_BEHAVIOR_EXTENSION__ID:
- return getId();
- }
- return super.eGet(featureID, resolve, coreType);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public void eSet(int featureID, Object newValue)
- {
- switch (featureID)
- {
- case FaceletTaglibPackage.FACELET_TAGLIB_TAG_BEHAVIOR_EXTENSION__ANY:
- ((FeatureMap.Internal)getAny()).set(newValue);
- return;
- case FaceletTaglibPackage.FACELET_TAGLIB_TAG_BEHAVIOR_EXTENSION__ID:
- setId((String)newValue);
- return;
- }
- super.eSet(featureID, newValue);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public void eUnset(int featureID)
- {
- switch (featureID)
- {
- case FaceletTaglibPackage.FACELET_TAGLIB_TAG_BEHAVIOR_EXTENSION__ANY:
- getAny().clear();
- return;
- case FaceletTaglibPackage.FACELET_TAGLIB_TAG_BEHAVIOR_EXTENSION__ID:
- setId(ID_EDEFAULT);
- return;
- }
- super.eUnset(featureID);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public boolean eIsSet(int featureID)
- {
- switch (featureID)
- {
- case FaceletTaglibPackage.FACELET_TAGLIB_TAG_BEHAVIOR_EXTENSION__ANY:
- return any != null && !any.isEmpty();
- case FaceletTaglibPackage.FACELET_TAGLIB_TAG_BEHAVIOR_EXTENSION__ID:
- return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
- }
- return super.eIsSet(featureID);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public String toString()
- {
- if (eIsProxy()) return super.toString();
-
- StringBuffer result = new StringBuffer(super.toString());
- result.append(" (any: "); //$NON-NLS-1$
- result.append(any);
- result.append(", id: "); //$NON-NLS-1$
- result.append(id);
- result.append(')');
- return result.toString();
- }
-
-} //FaceletTaglibTagBehaviorExtensionImpl
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib/impl/FaceletTaglibTagBehaviorImpl.java b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib/impl/FaceletTaglibTagBehaviorImpl.java
deleted file mode 100644
index dc23e00..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib/impl/FaceletTaglibTagBehaviorImpl.java
+++ /dev/null
@@ -1,317 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: FaceletTaglibTagBehaviorImpl.java,v 1.1 2010/03/18 06:24:38 cbateman Exp $
- */
-package org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibPackage;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagBehavior;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagBehaviorExtension;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FullyQualifiedClass;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.IdentifiableStringValue;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Facelet Taglib Tag Behavior</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- * <li>{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl.FaceletTaglibTagBehaviorImpl#getBehaviorId <em>Behavior Id</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl.FaceletTaglibTagBehaviorImpl#getHandlerClass <em>Handler Class</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl.FaceletTaglibTagBehaviorImpl#getBehaviorExtension <em>Behavior Extension</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class FaceletTaglibTagBehaviorImpl extends UserVisibleTaglibObjectImpl implements FaceletTaglibTagBehavior
-{
- /**
- * The cached value of the '{@link #getBehaviorId() <em>Behavior Id</em>}' containment reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getBehaviorId()
- * @generated
- * @ordered
- */
- protected IdentifiableStringValue behaviorId;
-
- /**
- * The cached value of the '{@link #getHandlerClass() <em>Handler Class</em>}' containment reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getHandlerClass()
- * @generated
- * @ordered
- */
- protected FullyQualifiedClass handlerClass;
-
- /**
- * The cached value of the '{@link #getBehaviorExtension() <em>Behavior Extension</em>}' containment reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getBehaviorExtension()
- * @generated
- * @ordered
- */
- protected EList<FaceletTaglibTagBehaviorExtension> behaviorExtension;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected FaceletTaglibTagBehaviorImpl()
- {
- super();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- protected EClass eStaticClass()
- {
- return FaceletTaglibPackage.Literals.FACELET_TAGLIB_TAG_BEHAVIOR;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public IdentifiableStringValue getBehaviorId()
- {
- return behaviorId;
- }
-
- /**
- * <!-- begin-user-doc -->
- * @param newBehaviorId
- * @param msgs
- * @return the notification chain
- * <!-- end-user-doc -->
- * @generated
- */
- public NotificationChain basicSetBehaviorId(IdentifiableStringValue newBehaviorId, NotificationChain msgs)
- {
- IdentifiableStringValue oldBehaviorId = behaviorId;
- behaviorId = newBehaviorId;
- if (eNotificationRequired())
- {
- ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, FaceletTaglibPackage.FACELET_TAGLIB_TAG_BEHAVIOR__BEHAVIOR_ID, oldBehaviorId, newBehaviorId);
- if (msgs == null) msgs = notification; else msgs.add(notification);
- }
- return msgs;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setBehaviorId(IdentifiableStringValue newBehaviorId)
- {
- if (newBehaviorId != behaviorId)
- {
- NotificationChain msgs = null;
- if (behaviorId != null)
- msgs = ((InternalEObject)behaviorId).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - FaceletTaglibPackage.FACELET_TAGLIB_TAG_BEHAVIOR__BEHAVIOR_ID, null, msgs);
- if (newBehaviorId != null)
- msgs = ((InternalEObject)newBehaviorId).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - FaceletTaglibPackage.FACELET_TAGLIB_TAG_BEHAVIOR__BEHAVIOR_ID, null, msgs);
- msgs = basicSetBehaviorId(newBehaviorId, msgs);
- if (msgs != null) msgs.dispatch();
- }
- else if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, FaceletTaglibPackage.FACELET_TAGLIB_TAG_BEHAVIOR__BEHAVIOR_ID, newBehaviorId, newBehaviorId));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public FullyQualifiedClass getHandlerClass()
- {
- return handlerClass;
- }
-
- /**
- * <!-- begin-user-doc -->
- * @param newHandlerClass
- * @param msgs
- * @return the notification chain
- * <!-- end-user-doc -->
- * @generated
- */
- public NotificationChain basicSetHandlerClass(FullyQualifiedClass newHandlerClass, NotificationChain msgs)
- {
- FullyQualifiedClass oldHandlerClass = handlerClass;
- handlerClass = newHandlerClass;
- if (eNotificationRequired())
- {
- ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, FaceletTaglibPackage.FACELET_TAGLIB_TAG_BEHAVIOR__HANDLER_CLASS, oldHandlerClass, newHandlerClass);
- if (msgs == null) msgs = notification; else msgs.add(notification);
- }
- return msgs;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setHandlerClass(FullyQualifiedClass newHandlerClass)
- {
- if (newHandlerClass != handlerClass)
- {
- NotificationChain msgs = null;
- if (handlerClass != null)
- msgs = ((InternalEObject)handlerClass).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - FaceletTaglibPackage.FACELET_TAGLIB_TAG_BEHAVIOR__HANDLER_CLASS, null, msgs);
- if (newHandlerClass != null)
- msgs = ((InternalEObject)newHandlerClass).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - FaceletTaglibPackage.FACELET_TAGLIB_TAG_BEHAVIOR__HANDLER_CLASS, null, msgs);
- msgs = basicSetHandlerClass(newHandlerClass, msgs);
- if (msgs != null) msgs.dispatch();
- }
- else if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, FaceletTaglibPackage.FACELET_TAGLIB_TAG_BEHAVIOR__HANDLER_CLASS, newHandlerClass, newHandlerClass));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EList<FaceletTaglibTagBehaviorExtension> getBehaviorExtension()
- {
- if (behaviorExtension == null)
- {
- behaviorExtension = new EObjectContainmentEList<FaceletTaglibTagBehaviorExtension>(FaceletTaglibTagBehaviorExtension.class, this, FaceletTaglibPackage.FACELET_TAGLIB_TAG_BEHAVIOR__BEHAVIOR_EXTENSION);
- }
- return behaviorExtension;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)
- {
- switch (featureID)
- {
- case FaceletTaglibPackage.FACELET_TAGLIB_TAG_BEHAVIOR__BEHAVIOR_ID:
- return basicSetBehaviorId(null, msgs);
- case FaceletTaglibPackage.FACELET_TAGLIB_TAG_BEHAVIOR__HANDLER_CLASS:
- return basicSetHandlerClass(null, msgs);
- case FaceletTaglibPackage.FACELET_TAGLIB_TAG_BEHAVIOR__BEHAVIOR_EXTENSION:
- return ((InternalEList<?>)getBehaviorExtension()).basicRemove(otherEnd, msgs);
- }
- return super.eInverseRemove(otherEnd, featureID, msgs);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public Object eGet(int featureID, boolean resolve, boolean coreType)
- {
- switch (featureID)
- {
- case FaceletTaglibPackage.FACELET_TAGLIB_TAG_BEHAVIOR__BEHAVIOR_ID:
- return getBehaviorId();
- case FaceletTaglibPackage.FACELET_TAGLIB_TAG_BEHAVIOR__HANDLER_CLASS:
- return getHandlerClass();
- case FaceletTaglibPackage.FACELET_TAGLIB_TAG_BEHAVIOR__BEHAVIOR_EXTENSION:
- return getBehaviorExtension();
- }
- return super.eGet(featureID, resolve, coreType);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @SuppressWarnings("unchecked")
- @Override
- public void eSet(int featureID, Object newValue)
- {
- switch (featureID)
- {
- case FaceletTaglibPackage.FACELET_TAGLIB_TAG_BEHAVIOR__BEHAVIOR_ID:
- setBehaviorId((IdentifiableStringValue)newValue);
- return;
- case FaceletTaglibPackage.FACELET_TAGLIB_TAG_BEHAVIOR__HANDLER_CLASS:
- setHandlerClass((FullyQualifiedClass)newValue);
- return;
- case FaceletTaglibPackage.FACELET_TAGLIB_TAG_BEHAVIOR__BEHAVIOR_EXTENSION:
- getBehaviorExtension().clear();
- getBehaviorExtension().addAll((Collection<? extends FaceletTaglibTagBehaviorExtension>)newValue);
- return;
- }
- super.eSet(featureID, newValue);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public void eUnset(int featureID)
- {
- switch (featureID)
- {
- case FaceletTaglibPackage.FACELET_TAGLIB_TAG_BEHAVIOR__BEHAVIOR_ID:
- setBehaviorId((IdentifiableStringValue)null);
- return;
- case FaceletTaglibPackage.FACELET_TAGLIB_TAG_BEHAVIOR__HANDLER_CLASS:
- setHandlerClass((FullyQualifiedClass)null);
- return;
- case FaceletTaglibPackage.FACELET_TAGLIB_TAG_BEHAVIOR__BEHAVIOR_EXTENSION:
- getBehaviorExtension().clear();
- return;
- }
- super.eUnset(featureID);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public boolean eIsSet(int featureID)
- {
- switch (featureID)
- {
- case FaceletTaglibPackage.FACELET_TAGLIB_TAG_BEHAVIOR__BEHAVIOR_ID:
- return behaviorId != null;
- case FaceletTaglibPackage.FACELET_TAGLIB_TAG_BEHAVIOR__HANDLER_CLASS:
- return handlerClass != null;
- case FaceletTaglibPackage.FACELET_TAGLIB_TAG_BEHAVIOR__BEHAVIOR_EXTENSION:
- return behaviorExtension != null && !behaviorExtension.isEmpty();
- }
- return super.eIsSet(featureID);
- }
-
-} //FaceletTaglibTagBehaviorImpl
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib/impl/FaceletTaglibTagComponentExtensionImpl.java b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib/impl/FaceletTaglibTagComponentExtensionImpl.java
deleted file mode 100644
index 5366ec2..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib/impl/FaceletTaglibTagComponentExtensionImpl.java
+++ /dev/null
@@ -1,237 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: FaceletTaglibTagComponentExtensionImpl.java,v 1.1 2010/03/18 06:24:39 cbateman Exp $
- */
-package org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.emf.ecore.util.BasicFeatureMap;
-import org.eclipse.emf.ecore.util.FeatureMap;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibPackage;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagComponentExtension;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Facelet Taglib Tag Component Extension</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- * <li>{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl.FaceletTaglibTagComponentExtensionImpl#getAny <em>Any</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl.FaceletTaglibTagComponentExtensionImpl#getId <em>Id</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class FaceletTaglibTagComponentExtensionImpl extends EObjectImpl implements FaceletTaglibTagComponentExtension
-{
- /**
- * The cached value of the '{@link #getAny() <em>Any</em>}' attribute list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getAny()
- * @generated
- * @ordered
- */
- protected FeatureMap any;
-
- /**
- * The default value of the '{@link #getId() <em>Id</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getId()
- * @generated
- * @ordered
- */
- protected static final String ID_EDEFAULT = null;
-
- /**
- * The cached value of the '{@link #getId() <em>Id</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getId()
- * @generated
- * @ordered
- */
- protected String id = ID_EDEFAULT;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected FaceletTaglibTagComponentExtensionImpl()
- {
- super();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- protected EClass eStaticClass()
- {
- return FaceletTaglibPackage.Literals.FACELET_TAGLIB_TAG_COMPONENT_EXTENSION;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public FeatureMap getAny()
- {
- if (any == null)
- {
- any = new BasicFeatureMap(this, FaceletTaglibPackage.FACELET_TAGLIB_TAG_COMPONENT_EXTENSION__ANY);
- }
- return any;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public String getId()
- {
- return id;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setId(String newId)
- {
- String oldId = id;
- id = newId;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, FaceletTaglibPackage.FACELET_TAGLIB_TAG_COMPONENT_EXTENSION__ID, oldId, id));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)
- {
- switch (featureID)
- {
- case FaceletTaglibPackage.FACELET_TAGLIB_TAG_COMPONENT_EXTENSION__ANY:
- return ((InternalEList<?>)getAny()).basicRemove(otherEnd, msgs);
- }
- return super.eInverseRemove(otherEnd, featureID, msgs);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public Object eGet(int featureID, boolean resolve, boolean coreType)
- {
- switch (featureID)
- {
- case FaceletTaglibPackage.FACELET_TAGLIB_TAG_COMPONENT_EXTENSION__ANY:
- if (coreType) return getAny();
- return ((FeatureMap.Internal)getAny()).getWrapper();
- case FaceletTaglibPackage.FACELET_TAGLIB_TAG_COMPONENT_EXTENSION__ID:
- return getId();
- }
- return super.eGet(featureID, resolve, coreType);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public void eSet(int featureID, Object newValue)
- {
- switch (featureID)
- {
- case FaceletTaglibPackage.FACELET_TAGLIB_TAG_COMPONENT_EXTENSION__ANY:
- ((FeatureMap.Internal)getAny()).set(newValue);
- return;
- case FaceletTaglibPackage.FACELET_TAGLIB_TAG_COMPONENT_EXTENSION__ID:
- setId((String)newValue);
- return;
- }
- super.eSet(featureID, newValue);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public void eUnset(int featureID)
- {
- switch (featureID)
- {
- case FaceletTaglibPackage.FACELET_TAGLIB_TAG_COMPONENT_EXTENSION__ANY:
- getAny().clear();
- return;
- case FaceletTaglibPackage.FACELET_TAGLIB_TAG_COMPONENT_EXTENSION__ID:
- setId(ID_EDEFAULT);
- return;
- }
- super.eUnset(featureID);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public boolean eIsSet(int featureID)
- {
- switch (featureID)
- {
- case FaceletTaglibPackage.FACELET_TAGLIB_TAG_COMPONENT_EXTENSION__ANY:
- return any != null && !any.isEmpty();
- case FaceletTaglibPackage.FACELET_TAGLIB_TAG_COMPONENT_EXTENSION__ID:
- return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
- }
- return super.eIsSet(featureID);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public String toString()
- {
- if (eIsProxy()) return super.toString();
-
- StringBuffer result = new StringBuffer(super.toString());
- result.append(" (any: "); //$NON-NLS-1$
- result.append(any);
- result.append(", id: "); //$NON-NLS-1$
- result.append(id);
- result.append(')');
- return result.toString();
- }
-
-} //FaceletTaglibTagComponentExtensionImpl
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib/impl/FaceletTaglibTagComponentImpl.java b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib/impl/FaceletTaglibTagComponentImpl.java
deleted file mode 100644
index e1f86ff..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib/impl/FaceletTaglibTagComponentImpl.java
+++ /dev/null
@@ -1,391 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: FaceletTaglibTagComponentImpl.java,v 1.1 2010/03/18 06:24:39 cbateman Exp $
- */
-package org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibPackage;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagComponent;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagComponentExtension;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FullyQualifiedClass;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.IdentifiableStringValue;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Facelet Taglib Tag Component</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- * <li>{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl.FaceletTaglibTagComponentImpl#getComponentType <em>Component Type</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl.FaceletTaglibTagComponentImpl#getRendererType <em>Renderer Type</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl.FaceletTaglibTagComponentImpl#getHandlerClass <em>Handler Class</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl.FaceletTaglibTagComponentImpl#getComponentExtension <em>Component Extension</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class FaceletTaglibTagComponentImpl extends UserVisibleTaglibObjectImpl implements FaceletTaglibTagComponent
-{
- /**
- * The cached value of the '{@link #getComponentType() <em>Component Type</em>}' containment reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getComponentType()
- * @generated
- * @ordered
- */
- protected IdentifiableStringValue componentType;
-
- /**
- * The cached value of the '{@link #getRendererType() <em>Renderer Type</em>}' containment reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getRendererType()
- * @generated
- * @ordered
- */
- protected IdentifiableStringValue rendererType;
-
- /**
- * The cached value of the '{@link #getHandlerClass() <em>Handler Class</em>}' containment reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getHandlerClass()
- * @generated
- * @ordered
- */
- protected FullyQualifiedClass handlerClass;
-
- /**
- * The cached value of the '{@link #getComponentExtension() <em>Component Extension</em>}' containment reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getComponentExtension()
- * @generated
- * @ordered
- */
- protected EList<FaceletTaglibTagComponentExtension> componentExtension;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected FaceletTaglibTagComponentImpl()
- {
- super();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- protected EClass eStaticClass()
- {
- return FaceletTaglibPackage.Literals.FACELET_TAGLIB_TAG_COMPONENT;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public IdentifiableStringValue getComponentType()
- {
- return componentType;
- }
-
- /**
- * <!-- begin-user-doc -->
- * @param newComponentType
- * @param msgs
- * @return the notification chain
- * <!-- end-user-doc -->
- * @generated
- */
- public NotificationChain basicSetComponentType(IdentifiableStringValue newComponentType, NotificationChain msgs)
- {
- IdentifiableStringValue oldComponentType = componentType;
- componentType = newComponentType;
- if (eNotificationRequired())
- {
- ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, FaceletTaglibPackage.FACELET_TAGLIB_TAG_COMPONENT__COMPONENT_TYPE, oldComponentType, newComponentType);
- if (msgs == null) msgs = notification; else msgs.add(notification);
- }
- return msgs;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setComponentType(IdentifiableStringValue newComponentType)
- {
- if (newComponentType != componentType)
- {
- NotificationChain msgs = null;
- if (componentType != null)
- msgs = ((InternalEObject)componentType).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - FaceletTaglibPackage.FACELET_TAGLIB_TAG_COMPONENT__COMPONENT_TYPE, null, msgs);
- if (newComponentType != null)
- msgs = ((InternalEObject)newComponentType).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - FaceletTaglibPackage.FACELET_TAGLIB_TAG_COMPONENT__COMPONENT_TYPE, null, msgs);
- msgs = basicSetComponentType(newComponentType, msgs);
- if (msgs != null) msgs.dispatch();
- }
- else if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, FaceletTaglibPackage.FACELET_TAGLIB_TAG_COMPONENT__COMPONENT_TYPE, newComponentType, newComponentType));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public IdentifiableStringValue getRendererType()
- {
- return rendererType;
- }
-
- /**
- * <!-- begin-user-doc -->
- * @param newRendererType
- * @param msgs
- * @return the notification chain
- * <!-- end-user-doc -->
- * @generated
- */
- public NotificationChain basicSetRendererType(IdentifiableStringValue newRendererType, NotificationChain msgs)
- {
- IdentifiableStringValue oldRendererType = rendererType;
- rendererType = newRendererType;
- if (eNotificationRequired())
- {
- ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, FaceletTaglibPackage.FACELET_TAGLIB_TAG_COMPONENT__RENDERER_TYPE, oldRendererType, newRendererType);
- if (msgs == null) msgs = notification; else msgs.add(notification);
- }
- return msgs;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setRendererType(IdentifiableStringValue newRendererType)
- {
- if (newRendererType != rendererType)
- {
- NotificationChain msgs = null;
- if (rendererType != null)
- msgs = ((InternalEObject)rendererType).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - FaceletTaglibPackage.FACELET_TAGLIB_TAG_COMPONENT__RENDERER_TYPE, null, msgs);
- if (newRendererType != null)
- msgs = ((InternalEObject)newRendererType).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - FaceletTaglibPackage.FACELET_TAGLIB_TAG_COMPONENT__RENDERER_TYPE, null, msgs);
- msgs = basicSetRendererType(newRendererType, msgs);
- if (msgs != null) msgs.dispatch();
- }
- else if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, FaceletTaglibPackage.FACELET_TAGLIB_TAG_COMPONENT__RENDERER_TYPE, newRendererType, newRendererType));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public FullyQualifiedClass getHandlerClass()
- {
- return handlerClass;
- }
-
- /**
- * <!-- begin-user-doc -->
- * @param newHandlerClass
- * @param msgs
- * @return the notification chain
- * <!-- end-user-doc -->
- * @generated
- */
- public NotificationChain basicSetHandlerClass(FullyQualifiedClass newHandlerClass, NotificationChain msgs)
- {
- FullyQualifiedClass oldHandlerClass = handlerClass;
- handlerClass = newHandlerClass;
- if (eNotificationRequired())
- {
- ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, FaceletTaglibPackage.FACELET_TAGLIB_TAG_COMPONENT__HANDLER_CLASS, oldHandlerClass, newHandlerClass);
- if (msgs == null) msgs = notification; else msgs.add(notification);
- }
- return msgs;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setHandlerClass(FullyQualifiedClass newHandlerClass)
- {
- if (newHandlerClass != handlerClass)
- {
- NotificationChain msgs = null;
- if (handlerClass != null)
- msgs = ((InternalEObject)handlerClass).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - FaceletTaglibPackage.FACELET_TAGLIB_TAG_COMPONENT__HANDLER_CLASS, null, msgs);
- if (newHandlerClass != null)
- msgs = ((InternalEObject)newHandlerClass).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - FaceletTaglibPackage.FACELET_TAGLIB_TAG_COMPONENT__HANDLER_CLASS, null, msgs);
- msgs = basicSetHandlerClass(newHandlerClass, msgs);
- if (msgs != null) msgs.dispatch();
- }
- else if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, FaceletTaglibPackage.FACELET_TAGLIB_TAG_COMPONENT__HANDLER_CLASS, newHandlerClass, newHandlerClass));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EList<FaceletTaglibTagComponentExtension> getComponentExtension()
- {
- if (componentExtension == null)
- {
- componentExtension = new EObjectContainmentEList<FaceletTaglibTagComponentExtension>(FaceletTaglibTagComponentExtension.class, this, FaceletTaglibPackage.FACELET_TAGLIB_TAG_COMPONENT__COMPONENT_EXTENSION);
- }
- return componentExtension;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)
- {
- switch (featureID)
- {
- case FaceletTaglibPackage.FACELET_TAGLIB_TAG_COMPONENT__COMPONENT_TYPE:
- return basicSetComponentType(null, msgs);
- case FaceletTaglibPackage.FACELET_TAGLIB_TAG_COMPONENT__RENDERER_TYPE:
- return basicSetRendererType(null, msgs);
- case FaceletTaglibPackage.FACELET_TAGLIB_TAG_COMPONENT__HANDLER_CLASS:
- return basicSetHandlerClass(null, msgs);
- case FaceletTaglibPackage.FACELET_TAGLIB_TAG_COMPONENT__COMPONENT_EXTENSION:
- return ((InternalEList<?>)getComponentExtension()).basicRemove(otherEnd, msgs);
- }
- return super.eInverseRemove(otherEnd, featureID, msgs);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public Object eGet(int featureID, boolean resolve, boolean coreType)
- {
- switch (featureID)
- {
- case FaceletTaglibPackage.FACELET_TAGLIB_TAG_COMPONENT__COMPONENT_TYPE:
- return getComponentType();
- case FaceletTaglibPackage.FACELET_TAGLIB_TAG_COMPONENT__RENDERER_TYPE:
- return getRendererType();
- case FaceletTaglibPackage.FACELET_TAGLIB_TAG_COMPONENT__HANDLER_CLASS:
- return getHandlerClass();
- case FaceletTaglibPackage.FACELET_TAGLIB_TAG_COMPONENT__COMPONENT_EXTENSION:
- return getComponentExtension();
- }
- return super.eGet(featureID, resolve, coreType);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @SuppressWarnings("unchecked")
- @Override
- public void eSet(int featureID, Object newValue)
- {
- switch (featureID)
- {
- case FaceletTaglibPackage.FACELET_TAGLIB_TAG_COMPONENT__COMPONENT_TYPE:
- setComponentType((IdentifiableStringValue)newValue);
- return;
- case FaceletTaglibPackage.FACELET_TAGLIB_TAG_COMPONENT__RENDERER_TYPE:
- setRendererType((IdentifiableStringValue)newValue);
- return;
- case FaceletTaglibPackage.FACELET_TAGLIB_TAG_COMPONENT__HANDLER_CLASS:
- setHandlerClass((FullyQualifiedClass)newValue);
- return;
- case FaceletTaglibPackage.FACELET_TAGLIB_TAG_COMPONENT__COMPONENT_EXTENSION:
- getComponentExtension().clear();
- getComponentExtension().addAll((Collection<? extends FaceletTaglibTagComponentExtension>)newValue);
- return;
- }
- super.eSet(featureID, newValue);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public void eUnset(int featureID)
- {
- switch (featureID)
- {
- case FaceletTaglibPackage.FACELET_TAGLIB_TAG_COMPONENT__COMPONENT_TYPE:
- setComponentType((IdentifiableStringValue)null);
- return;
- case FaceletTaglibPackage.FACELET_TAGLIB_TAG_COMPONENT__RENDERER_TYPE:
- setRendererType((IdentifiableStringValue)null);
- return;
- case FaceletTaglibPackage.FACELET_TAGLIB_TAG_COMPONENT__HANDLER_CLASS:
- setHandlerClass((FullyQualifiedClass)null);
- return;
- case FaceletTaglibPackage.FACELET_TAGLIB_TAG_COMPONENT__COMPONENT_EXTENSION:
- getComponentExtension().clear();
- return;
- }
- super.eUnset(featureID);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public boolean eIsSet(int featureID)
- {
- switch (featureID)
- {
- case FaceletTaglibPackage.FACELET_TAGLIB_TAG_COMPONENT__COMPONENT_TYPE:
- return componentType != null;
- case FaceletTaglibPackage.FACELET_TAGLIB_TAG_COMPONENT__RENDERER_TYPE:
- return rendererType != null;
- case FaceletTaglibPackage.FACELET_TAGLIB_TAG_COMPONENT__HANDLER_CLASS:
- return handlerClass != null;
- case FaceletTaglibPackage.FACELET_TAGLIB_TAG_COMPONENT__COMPONENT_EXTENSION:
- return componentExtension != null && !componentExtension.isEmpty();
- }
- return super.eIsSet(featureID);
- }
-
-} //FaceletTaglibTagComponentImpl
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib/impl/FaceletTaglibTagConverterExtensionImpl.java b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib/impl/FaceletTaglibTagConverterExtensionImpl.java
deleted file mode 100644
index 454af8f..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib/impl/FaceletTaglibTagConverterExtensionImpl.java
+++ /dev/null
@@ -1,237 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: FaceletTaglibTagConverterExtensionImpl.java,v 1.1 2010/03/18 06:24:38 cbateman Exp $
- */
-package org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.emf.ecore.util.BasicFeatureMap;
-import org.eclipse.emf.ecore.util.FeatureMap;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibPackage;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagConverterExtension;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Facelet Taglib Tag Converter Extension</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- * <li>{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl.FaceletTaglibTagConverterExtensionImpl#getAny <em>Any</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl.FaceletTaglibTagConverterExtensionImpl#getId <em>Id</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class FaceletTaglibTagConverterExtensionImpl extends EObjectImpl implements FaceletTaglibTagConverterExtension
-{
- /**
- * The cached value of the '{@link #getAny() <em>Any</em>}' attribute list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getAny()
- * @generated
- * @ordered
- */
- protected FeatureMap any;
-
- /**
- * The default value of the '{@link #getId() <em>Id</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getId()
- * @generated
- * @ordered
- */
- protected static final String ID_EDEFAULT = null;
-
- /**
- * The cached value of the '{@link #getId() <em>Id</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getId()
- * @generated
- * @ordered
- */
- protected String id = ID_EDEFAULT;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected FaceletTaglibTagConverterExtensionImpl()
- {
- super();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- protected EClass eStaticClass()
- {
- return FaceletTaglibPackage.Literals.FACELET_TAGLIB_TAG_CONVERTER_EXTENSION;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public FeatureMap getAny()
- {
- if (any == null)
- {
- any = new BasicFeatureMap(this, FaceletTaglibPackage.FACELET_TAGLIB_TAG_CONVERTER_EXTENSION__ANY);
- }
- return any;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public String getId()
- {
- return id;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setId(String newId)
- {
- String oldId = id;
- id = newId;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, FaceletTaglibPackage.FACELET_TAGLIB_TAG_CONVERTER_EXTENSION__ID, oldId, id));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)
- {
- switch (featureID)
- {
- case FaceletTaglibPackage.FACELET_TAGLIB_TAG_CONVERTER_EXTENSION__ANY:
- return ((InternalEList<?>)getAny()).basicRemove(otherEnd, msgs);
- }
- return super.eInverseRemove(otherEnd, featureID, msgs);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public Object eGet(int featureID, boolean resolve, boolean coreType)
- {
- switch (featureID)
- {
- case FaceletTaglibPackage.FACELET_TAGLIB_TAG_CONVERTER_EXTENSION__ANY:
- if (coreType) return getAny();
- return ((FeatureMap.Internal)getAny()).getWrapper();
- case FaceletTaglibPackage.FACELET_TAGLIB_TAG_CONVERTER_EXTENSION__ID:
- return getId();
- }
- return super.eGet(featureID, resolve, coreType);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public void eSet(int featureID, Object newValue)
- {
- switch (featureID)
- {
- case FaceletTaglibPackage.FACELET_TAGLIB_TAG_CONVERTER_EXTENSION__ANY:
- ((FeatureMap.Internal)getAny()).set(newValue);
- return;
- case FaceletTaglibPackage.FACELET_TAGLIB_TAG_CONVERTER_EXTENSION__ID:
- setId((String)newValue);
- return;
- }
- super.eSet(featureID, newValue);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public void eUnset(int featureID)
- {
- switch (featureID)
- {
- case FaceletTaglibPackage.FACELET_TAGLIB_TAG_CONVERTER_EXTENSION__ANY:
- getAny().clear();
- return;
- case FaceletTaglibPackage.FACELET_TAGLIB_TAG_CONVERTER_EXTENSION__ID:
- setId(ID_EDEFAULT);
- return;
- }
- super.eUnset(featureID);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public boolean eIsSet(int featureID)
- {
- switch (featureID)
- {
- case FaceletTaglibPackage.FACELET_TAGLIB_TAG_CONVERTER_EXTENSION__ANY:
- return any != null && !any.isEmpty();
- case FaceletTaglibPackage.FACELET_TAGLIB_TAG_CONVERTER_EXTENSION__ID:
- return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
- }
- return super.eIsSet(featureID);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public String toString()
- {
- if (eIsProxy()) return super.toString();
-
- StringBuffer result = new StringBuffer(super.toString());
- result.append(" (any: "); //$NON-NLS-1$
- result.append(any);
- result.append(", id: "); //$NON-NLS-1$
- result.append(id);
- result.append(')');
- return result.toString();
- }
-
-} //FaceletTaglibTagConverterExtensionImpl
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib/impl/FaceletTaglibTagConverterImpl.java b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib/impl/FaceletTaglibTagConverterImpl.java
deleted file mode 100644
index dc62580..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib/impl/FaceletTaglibTagConverterImpl.java
+++ /dev/null
@@ -1,317 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: FaceletTaglibTagConverterImpl.java,v 1.1 2010/03/18 06:24:38 cbateman Exp $
- */
-package org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibPackage;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagConverter;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagConverterExtension;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FullyQualifiedClass;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.IdentifiableStringValue;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Facelet Taglib Tag Converter</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- * <li>{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl.FaceletTaglibTagConverterImpl#getConverterId <em>Converter Id</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl.FaceletTaglibTagConverterImpl#getHandlerClass <em>Handler Class</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl.FaceletTaglibTagConverterImpl#getConverterExtension <em>Converter Extension</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class FaceletTaglibTagConverterImpl extends UserVisibleTaglibObjectImpl implements FaceletTaglibTagConverter
-{
- /**
- * The cached value of the '{@link #getConverterId() <em>Converter Id</em>}' containment reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getConverterId()
- * @generated
- * @ordered
- */
- protected IdentifiableStringValue converterId;
-
- /**
- * The cached value of the '{@link #getHandlerClass() <em>Handler Class</em>}' containment reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getHandlerClass()
- * @generated
- * @ordered
- */
- protected FullyQualifiedClass handlerClass;
-
- /**
- * The cached value of the '{@link #getConverterExtension() <em>Converter Extension</em>}' containment reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getConverterExtension()
- * @generated
- * @ordered
- */
- protected EList<FaceletTaglibTagConverterExtension> converterExtension;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected FaceletTaglibTagConverterImpl()
- {
- super();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- protected EClass eStaticClass()
- {
- return FaceletTaglibPackage.Literals.FACELET_TAGLIB_TAG_CONVERTER;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public IdentifiableStringValue getConverterId()
- {
- return converterId;
- }
-
- /**
- * <!-- begin-user-doc -->
- * @param newConverterId
- * @param msgs
- * @return the notification chain
- * <!-- end-user-doc -->
- * @generated
- */
- public NotificationChain basicSetConverterId(IdentifiableStringValue newConverterId, NotificationChain msgs)
- {
- IdentifiableStringValue oldConverterId = converterId;
- converterId = newConverterId;
- if (eNotificationRequired())
- {
- ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, FaceletTaglibPackage.FACELET_TAGLIB_TAG_CONVERTER__CONVERTER_ID, oldConverterId, newConverterId);
- if (msgs == null) msgs = notification; else msgs.add(notification);
- }
- return msgs;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setConverterId(IdentifiableStringValue newConverterId)
- {
- if (newConverterId != converterId)
- {
- NotificationChain msgs = null;
- if (converterId != null)
- msgs = ((InternalEObject)converterId).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - FaceletTaglibPackage.FACELET_TAGLIB_TAG_CONVERTER__CONVERTER_ID, null, msgs);
- if (newConverterId != null)
- msgs = ((InternalEObject)newConverterId).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - FaceletTaglibPackage.FACELET_TAGLIB_TAG_CONVERTER__CONVERTER_ID, null, msgs);
- msgs = basicSetConverterId(newConverterId, msgs);
- if (msgs != null) msgs.dispatch();
- }
- else if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, FaceletTaglibPackage.FACELET_TAGLIB_TAG_CONVERTER__CONVERTER_ID, newConverterId, newConverterId));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public FullyQualifiedClass getHandlerClass()
- {
- return handlerClass;
- }
-
- /**
- * <!-- begin-user-doc -->
- * @param newHandlerClass
- * @param msgs
- * @return the notification chain
- * <!-- end-user-doc -->
- * @generated
- */
- public NotificationChain basicSetHandlerClass(FullyQualifiedClass newHandlerClass, NotificationChain msgs)
- {
- FullyQualifiedClass oldHandlerClass = handlerClass;
- handlerClass = newHandlerClass;
- if (eNotificationRequired())
- {
- ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, FaceletTaglibPackage.FACELET_TAGLIB_TAG_CONVERTER__HANDLER_CLASS, oldHandlerClass, newHandlerClass);
- if (msgs == null) msgs = notification; else msgs.add(notification);
- }
- return msgs;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setHandlerClass(FullyQualifiedClass newHandlerClass)
- {
- if (newHandlerClass != handlerClass)
- {
- NotificationChain msgs = null;
- if (handlerClass != null)
- msgs = ((InternalEObject)handlerClass).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - FaceletTaglibPackage.FACELET_TAGLIB_TAG_CONVERTER__HANDLER_CLASS, null, msgs);
- if (newHandlerClass != null)
- msgs = ((InternalEObject)newHandlerClass).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - FaceletTaglibPackage.FACELET_TAGLIB_TAG_CONVERTER__HANDLER_CLASS, null, msgs);
- msgs = basicSetHandlerClass(newHandlerClass, msgs);
- if (msgs != null) msgs.dispatch();
- }
- else if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, FaceletTaglibPackage.FACELET_TAGLIB_TAG_CONVERTER__HANDLER_CLASS, newHandlerClass, newHandlerClass));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EList<FaceletTaglibTagConverterExtension> getConverterExtension()
- {
- if (converterExtension == null)
- {
- converterExtension = new EObjectContainmentEList<FaceletTaglibTagConverterExtension>(FaceletTaglibTagConverterExtension.class, this, FaceletTaglibPackage.FACELET_TAGLIB_TAG_CONVERTER__CONVERTER_EXTENSION);
- }
- return converterExtension;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)
- {
- switch (featureID)
- {
- case FaceletTaglibPackage.FACELET_TAGLIB_TAG_CONVERTER__CONVERTER_ID:
- return basicSetConverterId(null, msgs);
- case FaceletTaglibPackage.FACELET_TAGLIB_TAG_CONVERTER__HANDLER_CLASS:
- return basicSetHandlerClass(null, msgs);
- case FaceletTaglibPackage.FACELET_TAGLIB_TAG_CONVERTER__CONVERTER_EXTENSION:
- return ((InternalEList<?>)getConverterExtension()).basicRemove(otherEnd, msgs);
- }
- return super.eInverseRemove(otherEnd, featureID, msgs);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public Object eGet(int featureID, boolean resolve, boolean coreType)
- {
- switch (featureID)
- {
- case FaceletTaglibPackage.FACELET_TAGLIB_TAG_CONVERTER__CONVERTER_ID:
- return getConverterId();
- case FaceletTaglibPackage.FACELET_TAGLIB_TAG_CONVERTER__HANDLER_CLASS:
- return getHandlerClass();
- case FaceletTaglibPackage.FACELET_TAGLIB_TAG_CONVERTER__CONVERTER_EXTENSION:
- return getConverterExtension();
- }
- return super.eGet(featureID, resolve, coreType);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @SuppressWarnings("unchecked")
- @Override
- public void eSet(int featureID, Object newValue)
- {
- switch (featureID)
- {
- case FaceletTaglibPackage.FACELET_TAGLIB_TAG_CONVERTER__CONVERTER_ID:
- setConverterId((IdentifiableStringValue)newValue);
- return;
- case FaceletTaglibPackage.FACELET_TAGLIB_TAG_CONVERTER__HANDLER_CLASS:
- setHandlerClass((FullyQualifiedClass)newValue);
- return;
- case FaceletTaglibPackage.FACELET_TAGLIB_TAG_CONVERTER__CONVERTER_EXTENSION:
- getConverterExtension().clear();
- getConverterExtension().addAll((Collection<? extends FaceletTaglibTagConverterExtension>)newValue);
- return;
- }
- super.eSet(featureID, newValue);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public void eUnset(int featureID)
- {
- switch (featureID)
- {
- case FaceletTaglibPackage.FACELET_TAGLIB_TAG_CONVERTER__CONVERTER_ID:
- setConverterId((IdentifiableStringValue)null);
- return;
- case FaceletTaglibPackage.FACELET_TAGLIB_TAG_CONVERTER__HANDLER_CLASS:
- setHandlerClass((FullyQualifiedClass)null);
- return;
- case FaceletTaglibPackage.FACELET_TAGLIB_TAG_CONVERTER__CONVERTER_EXTENSION:
- getConverterExtension().clear();
- return;
- }
- super.eUnset(featureID);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public boolean eIsSet(int featureID)
- {
- switch (featureID)
- {
- case FaceletTaglibPackage.FACELET_TAGLIB_TAG_CONVERTER__CONVERTER_ID:
- return converterId != null;
- case FaceletTaglibPackage.FACELET_TAGLIB_TAG_CONVERTER__HANDLER_CLASS:
- return handlerClass != null;
- case FaceletTaglibPackage.FACELET_TAGLIB_TAG_CONVERTER__CONVERTER_EXTENSION:
- return converterExtension != null && !converterExtension.isEmpty();
- }
- return super.eIsSet(featureID);
- }
-
-} //FaceletTaglibTagConverterImpl
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib/impl/FaceletTaglibTagExtensionImpl.java b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib/impl/FaceletTaglibTagExtensionImpl.java
deleted file mode 100644
index 1034a81..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib/impl/FaceletTaglibTagExtensionImpl.java
+++ /dev/null
@@ -1,237 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: FaceletTaglibTagExtensionImpl.java,v 1.1 2010/03/18 06:24:38 cbateman Exp $
- */
-package org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.emf.ecore.util.BasicFeatureMap;
-import org.eclipse.emf.ecore.util.FeatureMap;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibPackage;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagExtension;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Facelet Taglib Tag Extension</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- * <li>{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl.FaceletTaglibTagExtensionImpl#getAny <em>Any</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl.FaceletTaglibTagExtensionImpl#getId <em>Id</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class FaceletTaglibTagExtensionImpl extends EObjectImpl implements FaceletTaglibTagExtension
-{
- /**
- * The cached value of the '{@link #getAny() <em>Any</em>}' attribute list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getAny()
- * @generated
- * @ordered
- */
- protected FeatureMap any;
-
- /**
- * The default value of the '{@link #getId() <em>Id</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getId()
- * @generated
- * @ordered
- */
- protected static final String ID_EDEFAULT = null;
-
- /**
- * The cached value of the '{@link #getId() <em>Id</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getId()
- * @generated
- * @ordered
- */
- protected String id = ID_EDEFAULT;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected FaceletTaglibTagExtensionImpl()
- {
- super();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- protected EClass eStaticClass()
- {
- return FaceletTaglibPackage.Literals.FACELET_TAGLIB_TAG_EXTENSION;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public FeatureMap getAny()
- {
- if (any == null)
- {
- any = new BasicFeatureMap(this, FaceletTaglibPackage.FACELET_TAGLIB_TAG_EXTENSION__ANY);
- }
- return any;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public String getId()
- {
- return id;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setId(String newId)
- {
- String oldId = id;
- id = newId;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, FaceletTaglibPackage.FACELET_TAGLIB_TAG_EXTENSION__ID, oldId, id));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)
- {
- switch (featureID)
- {
- case FaceletTaglibPackage.FACELET_TAGLIB_TAG_EXTENSION__ANY:
- return ((InternalEList<?>)getAny()).basicRemove(otherEnd, msgs);
- }
- return super.eInverseRemove(otherEnd, featureID, msgs);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public Object eGet(int featureID, boolean resolve, boolean coreType)
- {
- switch (featureID)
- {
- case FaceletTaglibPackage.FACELET_TAGLIB_TAG_EXTENSION__ANY:
- if (coreType) return getAny();
- return ((FeatureMap.Internal)getAny()).getWrapper();
- case FaceletTaglibPackage.FACELET_TAGLIB_TAG_EXTENSION__ID:
- return getId();
- }
- return super.eGet(featureID, resolve, coreType);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public void eSet(int featureID, Object newValue)
- {
- switch (featureID)
- {
- case FaceletTaglibPackage.FACELET_TAGLIB_TAG_EXTENSION__ANY:
- ((FeatureMap.Internal)getAny()).set(newValue);
- return;
- case FaceletTaglibPackage.FACELET_TAGLIB_TAG_EXTENSION__ID:
- setId((String)newValue);
- return;
- }
- super.eSet(featureID, newValue);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public void eUnset(int featureID)
- {
- switch (featureID)
- {
- case FaceletTaglibPackage.FACELET_TAGLIB_TAG_EXTENSION__ANY:
- getAny().clear();
- return;
- case FaceletTaglibPackage.FACELET_TAGLIB_TAG_EXTENSION__ID:
- setId(ID_EDEFAULT);
- return;
- }
- super.eUnset(featureID);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public boolean eIsSet(int featureID)
- {
- switch (featureID)
- {
- case FaceletTaglibPackage.FACELET_TAGLIB_TAG_EXTENSION__ANY:
- return any != null && !any.isEmpty();
- case FaceletTaglibPackage.FACELET_TAGLIB_TAG_EXTENSION__ID:
- return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
- }
- return super.eIsSet(featureID);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public String toString()
- {
- if (eIsProxy()) return super.toString();
-
- StringBuffer result = new StringBuffer(super.toString());
- result.append(" (any: "); //$NON-NLS-1$
- result.append(any);
- result.append(", id: "); //$NON-NLS-1$
- result.append(id);
- result.append(')');
- return result.toString();
- }
-
-} //FaceletTaglibTagExtensionImpl
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib/impl/FaceletTaglibTagImpl.java b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib/impl/FaceletTaglibTagImpl.java
deleted file mode 100644
index 65915c3..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib/impl/FaceletTaglibTagImpl.java
+++ /dev/null
@@ -1,800 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: FaceletTaglibTagImpl.java,v 1.1 2010/03/18 06:24:38 cbateman Exp $
- */
-package org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibCanonicalName;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibPackage;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTag;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagAttribute;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagBehavior;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagComponent;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagConverter;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagExtension;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagValidator;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FullyQualifiedClass;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.IdentifiableStringValue;
-
-/**
- * <!-- begin-user-doc --> An implementation of the model object '
- * <em><b>Facelet Taglib Tag</b></em>'. <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- * <li>{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl.FaceletTaglibTagImpl#getTagNameElement <em>Tag Name Element</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl.FaceletTaglibTagImpl#getHandlerClassElement <em>Handler Class Element</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl.FaceletTaglibTagImpl#getBehavior <em>Behavior</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl.FaceletTaglibTagImpl#getComponent <em>Component</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl.FaceletTaglibTagImpl#getConverter <em>Converter</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl.FaceletTaglibTagImpl#getValidator <em>Validator</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl.FaceletTaglibTagImpl#getSource <em>Source</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl.FaceletTaglibTagImpl#getAttribute <em>Attribute</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl.FaceletTaglibTagImpl#getTagExtension <em>Tag Extension</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl.FaceletTaglibTagImpl#getTagName <em>Tag Name</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl.FaceletTaglibTagImpl#getHandlerClass <em>Handler Class</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class FaceletTaglibTagImpl extends UserVisibleTaglibObjectImpl implements
- FaceletTaglibTag
-{
- /**
- * The cached value of the '{@link #getTagNameElement() <em>Tag Name Element</em>}' containment reference.
- * <!-- begin-user-doc
- * --> <!-- end-user-doc -->
- * @see #getTagNameElement()
- * @generated
- * @ordered
- */
- protected FaceletTaglibCanonicalName tagNameElement;
-
- /**
- * The cached value of the '{@link #getHandlerClassElement() <em>Handler Class Element</em>}' containment reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getHandlerClassElement()
- * @generated
- * @ordered
- */
- protected FullyQualifiedClass handlerClassElement;
-
- /**
- * The cached value of the '{@link #getBehavior() <em>Behavior</em>}' containment reference.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- * @see #getBehavior()
- * @generated
- * @ordered
- */
- protected FaceletTaglibTagBehavior behavior;
-
- /**
- * The cached value of the '{@link #getComponent() <em>Component</em>}' containment reference.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- * @see #getComponent()
- * @generated
- * @ordered
- */
- protected FaceletTaglibTagComponent component;
-
- /**
- * The cached value of the '{@link #getConverter() <em>Converter</em>}' containment reference.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- * @see #getConverter()
- * @generated
- * @ordered
- */
- protected FaceletTaglibTagConverter converter;
-
- /**
- * The cached value of the '{@link #getValidator() <em>Validator</em>}' containment reference.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- * @see #getValidator()
- * @generated
- * @ordered
- */
- protected FaceletTaglibTagValidator validator;
-
- /**
- * The cached value of the '{@link #getSource() <em>Source</em>}' containment reference.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- * @see #getSource()
- * @generated
- * @ordered
- */
- protected IdentifiableStringValue source;
-
- /**
- * The cached value of the '{@link #getAttribute() <em>Attribute</em>}' containment reference list.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- * @see #getAttribute()
- * @generated
- * @ordered
- */
- protected EList<FaceletTaglibTagAttribute> attribute;
-
- /**
- * The cached value of the '{@link #getTagExtension() <em>Tag Extension</em>}' containment reference list.
- * <!-- begin-user-doc
- * --> <!-- end-user-doc -->
- * @see #getTagExtension()
- * @generated
- * @ordered
- */
- protected EList<FaceletTaglibTagExtension> tagExtension;
-
- /**
- * The default value of the '{@link #getTagName() <em>Tag Name</em>}' attribute.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- * @see #getTagName()
- * @generated
- * @ordered
- */
- protected static final String TAG_NAME_EDEFAULT = null;
-
- /**
- * The default value of the '{@link #getHandlerClass() <em>Handler Class</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getHandlerClass()
- * @generated
- * @ordered
- */
- protected static final String HANDLER_CLASS_EDEFAULT = null;
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- * @generated
- */
- protected FaceletTaglibTagImpl()
- {
- super();
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- * @generated
- */
- @Override
- protected EClass eStaticClass()
- {
- return FaceletTaglibPackage.Literals.FACELET_TAGLIB_TAG;
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- * @generated
- */
- public FaceletTaglibCanonicalName getTagNameElement()
- {
- return tagNameElement;
- }
-
- /**
- * <!-- begin-user-doc -->
- *
- * @param newTagNameElement
- * @param msgs
- * @return the notification chain <!-- end-user-doc -->
- * @generated
- */
- public NotificationChain basicSetTagNameElement(
- FaceletTaglibCanonicalName newTagNameElement, NotificationChain msgs)
- {
- FaceletTaglibCanonicalName oldTagNameElement = tagNameElement;
- tagNameElement = newTagNameElement;
- if (eNotificationRequired())
- {
- ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, FaceletTaglibPackage.FACELET_TAGLIB_TAG__TAG_NAME_ELEMENT, oldTagNameElement, newTagNameElement);
- if (msgs == null) msgs = notification; else msgs.add(notification);
- }
- return msgs;
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- * @generated
- */
- public void setTagNameElement(FaceletTaglibCanonicalName newTagNameElement)
- {
- if (newTagNameElement != tagNameElement)
- {
- NotificationChain msgs = null;
- if (tagNameElement != null)
- msgs = ((InternalEObject)tagNameElement).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - FaceletTaglibPackage.FACELET_TAGLIB_TAG__TAG_NAME_ELEMENT, null, msgs);
- if (newTagNameElement != null)
- msgs = ((InternalEObject)newTagNameElement).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - FaceletTaglibPackage.FACELET_TAGLIB_TAG__TAG_NAME_ELEMENT, null, msgs);
- msgs = basicSetTagNameElement(newTagNameElement, msgs);
- if (msgs != null) msgs.dispatch();
- }
- else if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, FaceletTaglibPackage.FACELET_TAGLIB_TAG__TAG_NAME_ELEMENT, newTagNameElement, newTagNameElement));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public FullyQualifiedClass getHandlerClassElement()
- {
- return handlerClassElement;
- }
-
- /**
- * <!-- begin-user-doc -->
- * @param newHandlerClassElement
- * @param msgs
- * @return
- * <!-- end-user-doc -->
- * @generated
- */
- public NotificationChain basicSetHandlerClassElement(FullyQualifiedClass newHandlerClassElement, NotificationChain msgs)
- {
- FullyQualifiedClass oldHandlerClassElement = handlerClassElement;
- handlerClassElement = newHandlerClassElement;
- if (eNotificationRequired())
- {
- ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, FaceletTaglibPackage.FACELET_TAGLIB_TAG__HANDLER_CLASS_ELEMENT, oldHandlerClassElement, newHandlerClassElement);
- if (msgs == null) msgs = notification; else msgs.add(notification);
- }
- return msgs;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setHandlerClassElement(FullyQualifiedClass newHandlerClassElement)
- {
- if (newHandlerClassElement != handlerClassElement)
- {
- NotificationChain msgs = null;
- if (handlerClassElement != null)
- msgs = ((InternalEObject)handlerClassElement).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - FaceletTaglibPackage.FACELET_TAGLIB_TAG__HANDLER_CLASS_ELEMENT, null, msgs);
- if (newHandlerClassElement != null)
- msgs = ((InternalEObject)newHandlerClassElement).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - FaceletTaglibPackage.FACELET_TAGLIB_TAG__HANDLER_CLASS_ELEMENT, null, msgs);
- msgs = basicSetHandlerClassElement(newHandlerClassElement, msgs);
- if (msgs != null) msgs.dispatch();
- }
- else if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, FaceletTaglibPackage.FACELET_TAGLIB_TAG__HANDLER_CLASS_ELEMENT, newHandlerClassElement, newHandlerClassElement));
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated NOT
- */
- public String getTagName()
- {
- return (String) Util.getSimplifiedNestedField(this, FaceletTaglibPackage.Literals.FACELET_TAGLIB_TAG__TAG_NAME_ELEMENT, FaceletTaglibPackage.Literals.FACELET_TAGLIB_CANONICAL_NAME__VALUE);
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated NOT
- */
- public void setTagName(String newTagName)
- {
- Util.setSimplifiedNestedField(this, FaceletTaglibPackage.Literals.FACELET_TAGLIB_TAG__TAG_NAME_ELEMENT, FaceletTaglibPackage.Literals.FACELET_TAGLIB_CANONICAL_NAME__VALUE, newTagName);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated NOT
- */
- public String getHandlerClass()
- {
- return (String) Util
- .getSimplifiedNestedField(
- this,
- FaceletTaglibPackage.Literals.FACELET_TAGLIB_TAG__HANDLER_CLASS_ELEMENT,
- FaceletTaglibPackage.Literals.IDENTIFIABLE_STRING_VALUE__VALUE);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated NOT
- */
- public void setHandlerClass(String newHandleClass)
- {
- Util.setSimplifiedNestedField(
- this,
- FaceletTaglibPackage.Literals.FACELET_TAGLIB_TAG__HANDLER_CLASS_ELEMENT,
- FaceletTaglibPackage.Literals.IDENTIFIABLE_STRING_VALUE__VALUE,
- newHandleClass);
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- * @generated
- */
- public FaceletTaglibTagBehavior getBehavior()
- {
- return behavior;
- }
-
- /**
- * <!-- begin-user-doc -->
- *
- * @param newBehavior
- * @param msgs
- * @return the notification chain <!-- end-user-doc -->
- * @generated
- */
- public NotificationChain basicSetBehavior(
- FaceletTaglibTagBehavior newBehavior, NotificationChain msgs)
- {
- FaceletTaglibTagBehavior oldBehavior = behavior;
- behavior = newBehavior;
- if (eNotificationRequired())
- {
- ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, FaceletTaglibPackage.FACELET_TAGLIB_TAG__BEHAVIOR, oldBehavior, newBehavior);
- if (msgs == null) msgs = notification; else msgs.add(notification);
- }
- return msgs;
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- * @generated
- */
- public void setBehavior(FaceletTaglibTagBehavior newBehavior)
- {
- if (newBehavior != behavior)
- {
- NotificationChain msgs = null;
- if (behavior != null)
- msgs = ((InternalEObject)behavior).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - FaceletTaglibPackage.FACELET_TAGLIB_TAG__BEHAVIOR, null, msgs);
- if (newBehavior != null)
- msgs = ((InternalEObject)newBehavior).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - FaceletTaglibPackage.FACELET_TAGLIB_TAG__BEHAVIOR, null, msgs);
- msgs = basicSetBehavior(newBehavior, msgs);
- if (msgs != null) msgs.dispatch();
- }
- else if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, FaceletTaglibPackage.FACELET_TAGLIB_TAG__BEHAVIOR, newBehavior, newBehavior));
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- * @generated
- */
- public FaceletTaglibTagComponent getComponent()
- {
- return component;
- }
-
- /**
- * <!-- begin-user-doc -->
- *
- * @param newComponent
- * @param msgs
- * @return the notification chain <!-- end-user-doc -->
- * @generated
- */
- public NotificationChain basicSetComponent(
- FaceletTaglibTagComponent newComponent, NotificationChain msgs)
- {
- FaceletTaglibTagComponent oldComponent = component;
- component = newComponent;
- if (eNotificationRequired())
- {
- ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, FaceletTaglibPackage.FACELET_TAGLIB_TAG__COMPONENT, oldComponent, newComponent);
- if (msgs == null) msgs = notification; else msgs.add(notification);
- }
- return msgs;
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- * @generated
- */
- public void setComponent(FaceletTaglibTagComponent newComponent)
- {
- if (newComponent != component)
- {
- NotificationChain msgs = null;
- if (component != null)
- msgs = ((InternalEObject)component).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - FaceletTaglibPackage.FACELET_TAGLIB_TAG__COMPONENT, null, msgs);
- if (newComponent != null)
- msgs = ((InternalEObject)newComponent).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - FaceletTaglibPackage.FACELET_TAGLIB_TAG__COMPONENT, null, msgs);
- msgs = basicSetComponent(newComponent, msgs);
- if (msgs != null) msgs.dispatch();
- }
- else if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, FaceletTaglibPackage.FACELET_TAGLIB_TAG__COMPONENT, newComponent, newComponent));
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- * @generated
- */
- public FaceletTaglibTagConverter getConverter()
- {
- return converter;
- }
-
- /**
- * <!-- begin-user-doc -->
- *
- * @param newConverter
- * @param msgs
- * @return the notification chain <!-- end-user-doc -->
- * @generated
- */
- public NotificationChain basicSetConverter(
- FaceletTaglibTagConverter newConverter, NotificationChain msgs)
- {
- FaceletTaglibTagConverter oldConverter = converter;
- converter = newConverter;
- if (eNotificationRequired())
- {
- ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, FaceletTaglibPackage.FACELET_TAGLIB_TAG__CONVERTER, oldConverter, newConverter);
- if (msgs == null) msgs = notification; else msgs.add(notification);
- }
- return msgs;
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- * @generated
- */
- public void setConverter(FaceletTaglibTagConverter newConverter)
- {
- if (newConverter != converter)
- {
- NotificationChain msgs = null;
- if (converter != null)
- msgs = ((InternalEObject)converter).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - FaceletTaglibPackage.FACELET_TAGLIB_TAG__CONVERTER, null, msgs);
- if (newConverter != null)
- msgs = ((InternalEObject)newConverter).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - FaceletTaglibPackage.FACELET_TAGLIB_TAG__CONVERTER, null, msgs);
- msgs = basicSetConverter(newConverter, msgs);
- if (msgs != null) msgs.dispatch();
- }
- else if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, FaceletTaglibPackage.FACELET_TAGLIB_TAG__CONVERTER, newConverter, newConverter));
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- * @generated
- */
- public FaceletTaglibTagValidator getValidator()
- {
- return validator;
- }
-
- /**
- * <!-- begin-user-doc -->
- *
- * @param newValidator
- * @param msgs
- * @return the notification chain <!-- end-user-doc -->
- * @generated
- */
- public NotificationChain basicSetValidator(
- FaceletTaglibTagValidator newValidator, NotificationChain msgs)
- {
- FaceletTaglibTagValidator oldValidator = validator;
- validator = newValidator;
- if (eNotificationRequired())
- {
- ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, FaceletTaglibPackage.FACELET_TAGLIB_TAG__VALIDATOR, oldValidator, newValidator);
- if (msgs == null) msgs = notification; else msgs.add(notification);
- }
- return msgs;
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- * @generated
- */
- public void setValidator(FaceletTaglibTagValidator newValidator)
- {
- if (newValidator != validator)
- {
- NotificationChain msgs = null;
- if (validator != null)
- msgs = ((InternalEObject)validator).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - FaceletTaglibPackage.FACELET_TAGLIB_TAG__VALIDATOR, null, msgs);
- if (newValidator != null)
- msgs = ((InternalEObject)newValidator).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - FaceletTaglibPackage.FACELET_TAGLIB_TAG__VALIDATOR, null, msgs);
- msgs = basicSetValidator(newValidator, msgs);
- if (msgs != null) msgs.dispatch();
- }
- else if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, FaceletTaglibPackage.FACELET_TAGLIB_TAG__VALIDATOR, newValidator, newValidator));
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- * @generated
- */
- public IdentifiableStringValue getSource()
- {
- return source;
- }
-
- /**
- * <!-- begin-user-doc -->
- *
- * @param newSource
- * @param msgs
- * @return the notification chain <!-- end-user-doc -->
- * @generated
- */
- public NotificationChain basicSetSource(IdentifiableStringValue newSource,
- NotificationChain msgs)
- {
- IdentifiableStringValue oldSource = source;
- source = newSource;
- if (eNotificationRequired())
- {
- ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, FaceletTaglibPackage.FACELET_TAGLIB_TAG__SOURCE, oldSource, newSource);
- if (msgs == null) msgs = notification; else msgs.add(notification);
- }
- return msgs;
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- * @generated
- */
- public void setSource(IdentifiableStringValue newSource)
- {
- if (newSource != source)
- {
- NotificationChain msgs = null;
- if (source != null)
- msgs = ((InternalEObject)source).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - FaceletTaglibPackage.FACELET_TAGLIB_TAG__SOURCE, null, msgs);
- if (newSource != null)
- msgs = ((InternalEObject)newSource).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - FaceletTaglibPackage.FACELET_TAGLIB_TAG__SOURCE, null, msgs);
- msgs = basicSetSource(newSource, msgs);
- if (msgs != null) msgs.dispatch();
- }
- else if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, FaceletTaglibPackage.FACELET_TAGLIB_TAG__SOURCE, newSource, newSource));
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- * @generated
- */
- public EList<FaceletTaglibTagAttribute> getAttribute()
- {
- if (attribute == null)
- {
- attribute = new EObjectContainmentEList<FaceletTaglibTagAttribute>(FaceletTaglibTagAttribute.class, this, FaceletTaglibPackage.FACELET_TAGLIB_TAG__ATTRIBUTE);
- }
- return attribute;
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- * @generated
- */
- public EList<FaceletTaglibTagExtension> getTagExtension()
- {
- if (tagExtension == null)
- {
- tagExtension = new EObjectContainmentEList<FaceletTaglibTagExtension>(FaceletTaglibTagExtension.class, this, FaceletTaglibPackage.FACELET_TAGLIB_TAG__TAG_EXTENSION);
- }
- return tagExtension;
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- * @generated
- */
- @Override
- public NotificationChain eInverseRemove(InternalEObject otherEnd,
- int featureID, NotificationChain msgs)
- {
- switch (featureID)
- {
- case FaceletTaglibPackage.FACELET_TAGLIB_TAG__TAG_NAME_ELEMENT:
- return basicSetTagNameElement(null, msgs);
- case FaceletTaglibPackage.FACELET_TAGLIB_TAG__HANDLER_CLASS_ELEMENT:
- return basicSetHandlerClassElement(null, msgs);
- case FaceletTaglibPackage.FACELET_TAGLIB_TAG__BEHAVIOR:
- return basicSetBehavior(null, msgs);
- case FaceletTaglibPackage.FACELET_TAGLIB_TAG__COMPONENT:
- return basicSetComponent(null, msgs);
- case FaceletTaglibPackage.FACELET_TAGLIB_TAG__CONVERTER:
- return basicSetConverter(null, msgs);
- case FaceletTaglibPackage.FACELET_TAGLIB_TAG__VALIDATOR:
- return basicSetValidator(null, msgs);
- case FaceletTaglibPackage.FACELET_TAGLIB_TAG__SOURCE:
- return basicSetSource(null, msgs);
- case FaceletTaglibPackage.FACELET_TAGLIB_TAG__ATTRIBUTE:
- return ((InternalEList<?>)getAttribute()).basicRemove(otherEnd, msgs);
- case FaceletTaglibPackage.FACELET_TAGLIB_TAG__TAG_EXTENSION:
- return ((InternalEList<?>)getTagExtension()).basicRemove(otherEnd, msgs);
- }
- return super.eInverseRemove(otherEnd, featureID, msgs);
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- * @generated
- */
- @Override
- public Object eGet(int featureID, boolean resolve, boolean coreType)
- {
- switch (featureID)
- {
- case FaceletTaglibPackage.FACELET_TAGLIB_TAG__TAG_NAME_ELEMENT:
- return getTagNameElement();
- case FaceletTaglibPackage.FACELET_TAGLIB_TAG__HANDLER_CLASS_ELEMENT:
- return getHandlerClassElement();
- case FaceletTaglibPackage.FACELET_TAGLIB_TAG__BEHAVIOR:
- return getBehavior();
- case FaceletTaglibPackage.FACELET_TAGLIB_TAG__COMPONENT:
- return getComponent();
- case FaceletTaglibPackage.FACELET_TAGLIB_TAG__CONVERTER:
- return getConverter();
- case FaceletTaglibPackage.FACELET_TAGLIB_TAG__VALIDATOR:
- return getValidator();
- case FaceletTaglibPackage.FACELET_TAGLIB_TAG__SOURCE:
- return getSource();
- case FaceletTaglibPackage.FACELET_TAGLIB_TAG__ATTRIBUTE:
- return getAttribute();
- case FaceletTaglibPackage.FACELET_TAGLIB_TAG__TAG_EXTENSION:
- return getTagExtension();
- case FaceletTaglibPackage.FACELET_TAGLIB_TAG__TAG_NAME:
- return getTagName();
- case FaceletTaglibPackage.FACELET_TAGLIB_TAG__HANDLER_CLASS:
- return getHandlerClass();
- }
- return super.eGet(featureID, resolve, coreType);
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- * @generated
- */
- @SuppressWarnings("unchecked")
- @Override
- public void eSet(int featureID, Object newValue)
- {
- switch (featureID)
- {
- case FaceletTaglibPackage.FACELET_TAGLIB_TAG__TAG_NAME_ELEMENT:
- setTagNameElement((FaceletTaglibCanonicalName)newValue);
- return;
- case FaceletTaglibPackage.FACELET_TAGLIB_TAG__HANDLER_CLASS_ELEMENT:
- setHandlerClassElement((FullyQualifiedClass)newValue);
- return;
- case FaceletTaglibPackage.FACELET_TAGLIB_TAG__BEHAVIOR:
- setBehavior((FaceletTaglibTagBehavior)newValue);
- return;
- case FaceletTaglibPackage.FACELET_TAGLIB_TAG__COMPONENT:
- setComponent((FaceletTaglibTagComponent)newValue);
- return;
- case FaceletTaglibPackage.FACELET_TAGLIB_TAG__CONVERTER:
- setConverter((FaceletTaglibTagConverter)newValue);
- return;
- case FaceletTaglibPackage.FACELET_TAGLIB_TAG__VALIDATOR:
- setValidator((FaceletTaglibTagValidator)newValue);
- return;
- case FaceletTaglibPackage.FACELET_TAGLIB_TAG__SOURCE:
- setSource((IdentifiableStringValue)newValue);
- return;
- case FaceletTaglibPackage.FACELET_TAGLIB_TAG__ATTRIBUTE:
- getAttribute().clear();
- getAttribute().addAll((Collection<? extends FaceletTaglibTagAttribute>)newValue);
- return;
- case FaceletTaglibPackage.FACELET_TAGLIB_TAG__TAG_EXTENSION:
- getTagExtension().clear();
- getTagExtension().addAll((Collection<? extends FaceletTaglibTagExtension>)newValue);
- return;
- case FaceletTaglibPackage.FACELET_TAGLIB_TAG__TAG_NAME:
- setTagName((String)newValue);
- return;
- case FaceletTaglibPackage.FACELET_TAGLIB_TAG__HANDLER_CLASS:
- setHandlerClass((String)newValue);
- return;
- }
- super.eSet(featureID, newValue);
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- * @generated
- */
- @Override
- public void eUnset(int featureID)
- {
- switch (featureID)
- {
- case FaceletTaglibPackage.FACELET_TAGLIB_TAG__TAG_NAME_ELEMENT:
- setTagNameElement((FaceletTaglibCanonicalName)null);
- return;
- case FaceletTaglibPackage.FACELET_TAGLIB_TAG__HANDLER_CLASS_ELEMENT:
- setHandlerClassElement((FullyQualifiedClass)null);
- return;
- case FaceletTaglibPackage.FACELET_TAGLIB_TAG__BEHAVIOR:
- setBehavior((FaceletTaglibTagBehavior)null);
- return;
- case FaceletTaglibPackage.FACELET_TAGLIB_TAG__COMPONENT:
- setComponent((FaceletTaglibTagComponent)null);
- return;
- case FaceletTaglibPackage.FACELET_TAGLIB_TAG__CONVERTER:
- setConverter((FaceletTaglibTagConverter)null);
- return;
- case FaceletTaglibPackage.FACELET_TAGLIB_TAG__VALIDATOR:
- setValidator((FaceletTaglibTagValidator)null);
- return;
- case FaceletTaglibPackage.FACELET_TAGLIB_TAG__SOURCE:
- setSource((IdentifiableStringValue)null);
- return;
- case FaceletTaglibPackage.FACELET_TAGLIB_TAG__ATTRIBUTE:
- getAttribute().clear();
- return;
- case FaceletTaglibPackage.FACELET_TAGLIB_TAG__TAG_EXTENSION:
- getTagExtension().clear();
- return;
- case FaceletTaglibPackage.FACELET_TAGLIB_TAG__TAG_NAME:
- setTagName(TAG_NAME_EDEFAULT);
- return;
- case FaceletTaglibPackage.FACELET_TAGLIB_TAG__HANDLER_CLASS:
- setHandlerClass(HANDLER_CLASS_EDEFAULT);
- return;
- }
- super.eUnset(featureID);
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- * @generated
- */
- @Override
- public boolean eIsSet(int featureID)
- {
- switch (featureID)
- {
- case FaceletTaglibPackage.FACELET_TAGLIB_TAG__TAG_NAME_ELEMENT:
- return tagNameElement != null;
- case FaceletTaglibPackage.FACELET_TAGLIB_TAG__HANDLER_CLASS_ELEMENT:
- return handlerClassElement != null;
- case FaceletTaglibPackage.FACELET_TAGLIB_TAG__BEHAVIOR:
- return behavior != null;
- case FaceletTaglibPackage.FACELET_TAGLIB_TAG__COMPONENT:
- return component != null;
- case FaceletTaglibPackage.FACELET_TAGLIB_TAG__CONVERTER:
- return converter != null;
- case FaceletTaglibPackage.FACELET_TAGLIB_TAG__VALIDATOR:
- return validator != null;
- case FaceletTaglibPackage.FACELET_TAGLIB_TAG__SOURCE:
- return source != null;
- case FaceletTaglibPackage.FACELET_TAGLIB_TAG__ATTRIBUTE:
- return attribute != null && !attribute.isEmpty();
- case FaceletTaglibPackage.FACELET_TAGLIB_TAG__TAG_EXTENSION:
- return tagExtension != null && !tagExtension.isEmpty();
- case FaceletTaglibPackage.FACELET_TAGLIB_TAG__TAG_NAME:
- return TAG_NAME_EDEFAULT == null ? getTagName() != null : !TAG_NAME_EDEFAULT.equals(getTagName());
- case FaceletTaglibPackage.FACELET_TAGLIB_TAG__HANDLER_CLASS:
- return HANDLER_CLASS_EDEFAULT == null ? getHandlerClass() != null : !HANDLER_CLASS_EDEFAULT.equals(getHandlerClass());
- }
- return super.eIsSet(featureID);
- }
-
-} // FaceletTaglibTagImpl
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib/impl/FaceletTaglibTagValidatorExtensionImpl.java b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib/impl/FaceletTaglibTagValidatorExtensionImpl.java
deleted file mode 100644
index 48145ba..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib/impl/FaceletTaglibTagValidatorExtensionImpl.java
+++ /dev/null
@@ -1,237 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: FaceletTaglibTagValidatorExtensionImpl.java,v 1.1 2010/03/18 06:24:38 cbateman Exp $
- */
-package org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.emf.ecore.util.BasicFeatureMap;
-import org.eclipse.emf.ecore.util.FeatureMap;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibPackage;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagValidatorExtension;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Facelet Taglib Tag Validator Extension</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- * <li>{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl.FaceletTaglibTagValidatorExtensionImpl#getAny <em>Any</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl.FaceletTaglibTagValidatorExtensionImpl#getId <em>Id</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class FaceletTaglibTagValidatorExtensionImpl extends EObjectImpl implements FaceletTaglibTagValidatorExtension
-{
- /**
- * The cached value of the '{@link #getAny() <em>Any</em>}' attribute list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getAny()
- * @generated
- * @ordered
- */
- protected FeatureMap any;
-
- /**
- * The default value of the '{@link #getId() <em>Id</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getId()
- * @generated
- * @ordered
- */
- protected static final String ID_EDEFAULT = null;
-
- /**
- * The cached value of the '{@link #getId() <em>Id</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getId()
- * @generated
- * @ordered
- */
- protected String id = ID_EDEFAULT;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected FaceletTaglibTagValidatorExtensionImpl()
- {
- super();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- protected EClass eStaticClass()
- {
- return FaceletTaglibPackage.Literals.FACELET_TAGLIB_TAG_VALIDATOR_EXTENSION;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public FeatureMap getAny()
- {
- if (any == null)
- {
- any = new BasicFeatureMap(this, FaceletTaglibPackage.FACELET_TAGLIB_TAG_VALIDATOR_EXTENSION__ANY);
- }
- return any;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public String getId()
- {
- return id;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setId(String newId)
- {
- String oldId = id;
- id = newId;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, FaceletTaglibPackage.FACELET_TAGLIB_TAG_VALIDATOR_EXTENSION__ID, oldId, id));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)
- {
- switch (featureID)
- {
- case FaceletTaglibPackage.FACELET_TAGLIB_TAG_VALIDATOR_EXTENSION__ANY:
- return ((InternalEList<?>)getAny()).basicRemove(otherEnd, msgs);
- }
- return super.eInverseRemove(otherEnd, featureID, msgs);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public Object eGet(int featureID, boolean resolve, boolean coreType)
- {
- switch (featureID)
- {
- case FaceletTaglibPackage.FACELET_TAGLIB_TAG_VALIDATOR_EXTENSION__ANY:
- if (coreType) return getAny();
- return ((FeatureMap.Internal)getAny()).getWrapper();
- case FaceletTaglibPackage.FACELET_TAGLIB_TAG_VALIDATOR_EXTENSION__ID:
- return getId();
- }
- return super.eGet(featureID, resolve, coreType);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public void eSet(int featureID, Object newValue)
- {
- switch (featureID)
- {
- case FaceletTaglibPackage.FACELET_TAGLIB_TAG_VALIDATOR_EXTENSION__ANY:
- ((FeatureMap.Internal)getAny()).set(newValue);
- return;
- case FaceletTaglibPackage.FACELET_TAGLIB_TAG_VALIDATOR_EXTENSION__ID:
- setId((String)newValue);
- return;
- }
- super.eSet(featureID, newValue);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public void eUnset(int featureID)
- {
- switch (featureID)
- {
- case FaceletTaglibPackage.FACELET_TAGLIB_TAG_VALIDATOR_EXTENSION__ANY:
- getAny().clear();
- return;
- case FaceletTaglibPackage.FACELET_TAGLIB_TAG_VALIDATOR_EXTENSION__ID:
- setId(ID_EDEFAULT);
- return;
- }
- super.eUnset(featureID);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public boolean eIsSet(int featureID)
- {
- switch (featureID)
- {
- case FaceletTaglibPackage.FACELET_TAGLIB_TAG_VALIDATOR_EXTENSION__ANY:
- return any != null && !any.isEmpty();
- case FaceletTaglibPackage.FACELET_TAGLIB_TAG_VALIDATOR_EXTENSION__ID:
- return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
- }
- return super.eIsSet(featureID);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public String toString()
- {
- if (eIsProxy()) return super.toString();
-
- StringBuffer result = new StringBuffer(super.toString());
- result.append(" (any: "); //$NON-NLS-1$
- result.append(any);
- result.append(", id: "); //$NON-NLS-1$
- result.append(id);
- result.append(')');
- return result.toString();
- }
-
-} //FaceletTaglibTagValidatorExtensionImpl
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib/impl/FaceletTaglibTagValidatorImpl.java b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib/impl/FaceletTaglibTagValidatorImpl.java
deleted file mode 100644
index 675da9b..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib/impl/FaceletTaglibTagValidatorImpl.java
+++ /dev/null
@@ -1,317 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: FaceletTaglibTagValidatorImpl.java,v 1.1 2010/03/18 06:24:38 cbateman Exp $
- */
-package org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibPackage;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagValidator;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagValidatorExtension;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FullyQualifiedClass;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.IdentifiableStringValue;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Facelet Taglib Tag Validator</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- * <li>{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl.FaceletTaglibTagValidatorImpl#getValidatorId <em>Validator Id</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl.FaceletTaglibTagValidatorImpl#getHandlerClass <em>Handler Class</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl.FaceletTaglibTagValidatorImpl#getValidatorExtension <em>Validator Extension</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class FaceletTaglibTagValidatorImpl extends UserVisibleTaglibObjectImpl implements FaceletTaglibTagValidator
-{
- /**
- * The cached value of the '{@link #getValidatorId() <em>Validator Id</em>}' containment reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getValidatorId()
- * @generated
- * @ordered
- */
- protected IdentifiableStringValue validatorId;
-
- /**
- * The cached value of the '{@link #getHandlerClass() <em>Handler Class</em>}' containment reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getHandlerClass()
- * @generated
- * @ordered
- */
- protected FullyQualifiedClass handlerClass;
-
- /**
- * The cached value of the '{@link #getValidatorExtension() <em>Validator Extension</em>}' containment reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getValidatorExtension()
- * @generated
- * @ordered
- */
- protected EList<FaceletTaglibTagValidatorExtension> validatorExtension;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected FaceletTaglibTagValidatorImpl()
- {
- super();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- protected EClass eStaticClass()
- {
- return FaceletTaglibPackage.Literals.FACELET_TAGLIB_TAG_VALIDATOR;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public IdentifiableStringValue getValidatorId()
- {
- return validatorId;
- }
-
- /**
- * <!-- begin-user-doc -->
- * @param newValidatorId
- * @param msgs
- * @return the notification chain
- * <!-- end-user-doc -->
- * @generated
- */
- public NotificationChain basicSetValidatorId(IdentifiableStringValue newValidatorId, NotificationChain msgs)
- {
- IdentifiableStringValue oldValidatorId = validatorId;
- validatorId = newValidatorId;
- if (eNotificationRequired())
- {
- ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, FaceletTaglibPackage.FACELET_TAGLIB_TAG_VALIDATOR__VALIDATOR_ID, oldValidatorId, newValidatorId);
- if (msgs == null) msgs = notification; else msgs.add(notification);
- }
- return msgs;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setValidatorId(IdentifiableStringValue newValidatorId)
- {
- if (newValidatorId != validatorId)
- {
- NotificationChain msgs = null;
- if (validatorId != null)
- msgs = ((InternalEObject)validatorId).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - FaceletTaglibPackage.FACELET_TAGLIB_TAG_VALIDATOR__VALIDATOR_ID, null, msgs);
- if (newValidatorId != null)
- msgs = ((InternalEObject)newValidatorId).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - FaceletTaglibPackage.FACELET_TAGLIB_TAG_VALIDATOR__VALIDATOR_ID, null, msgs);
- msgs = basicSetValidatorId(newValidatorId, msgs);
- if (msgs != null) msgs.dispatch();
- }
- else if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, FaceletTaglibPackage.FACELET_TAGLIB_TAG_VALIDATOR__VALIDATOR_ID, newValidatorId, newValidatorId));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public FullyQualifiedClass getHandlerClass()
- {
- return handlerClass;
- }
-
- /**
- * <!-- begin-user-doc -->
- * @param newHandlerClass
- * @param msgs
- * @return the notification chain
- * <!-- end-user-doc -->
- * @generated
- */
- public NotificationChain basicSetHandlerClass(FullyQualifiedClass newHandlerClass, NotificationChain msgs)
- {
- FullyQualifiedClass oldHandlerClass = handlerClass;
- handlerClass = newHandlerClass;
- if (eNotificationRequired())
- {
- ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, FaceletTaglibPackage.FACELET_TAGLIB_TAG_VALIDATOR__HANDLER_CLASS, oldHandlerClass, newHandlerClass);
- if (msgs == null) msgs = notification; else msgs.add(notification);
- }
- return msgs;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setHandlerClass(FullyQualifiedClass newHandlerClass)
- {
- if (newHandlerClass != handlerClass)
- {
- NotificationChain msgs = null;
- if (handlerClass != null)
- msgs = ((InternalEObject)handlerClass).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - FaceletTaglibPackage.FACELET_TAGLIB_TAG_VALIDATOR__HANDLER_CLASS, null, msgs);
- if (newHandlerClass != null)
- msgs = ((InternalEObject)newHandlerClass).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - FaceletTaglibPackage.FACELET_TAGLIB_TAG_VALIDATOR__HANDLER_CLASS, null, msgs);
- msgs = basicSetHandlerClass(newHandlerClass, msgs);
- if (msgs != null) msgs.dispatch();
- }
- else if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, FaceletTaglibPackage.FACELET_TAGLIB_TAG_VALIDATOR__HANDLER_CLASS, newHandlerClass, newHandlerClass));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EList<FaceletTaglibTagValidatorExtension> getValidatorExtension()
- {
- if (validatorExtension == null)
- {
- validatorExtension = new EObjectContainmentEList<FaceletTaglibTagValidatorExtension>(FaceletTaglibTagValidatorExtension.class, this, FaceletTaglibPackage.FACELET_TAGLIB_TAG_VALIDATOR__VALIDATOR_EXTENSION);
- }
- return validatorExtension;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)
- {
- switch (featureID)
- {
- case FaceletTaglibPackage.FACELET_TAGLIB_TAG_VALIDATOR__VALIDATOR_ID:
- return basicSetValidatorId(null, msgs);
- case FaceletTaglibPackage.FACELET_TAGLIB_TAG_VALIDATOR__HANDLER_CLASS:
- return basicSetHandlerClass(null, msgs);
- case FaceletTaglibPackage.FACELET_TAGLIB_TAG_VALIDATOR__VALIDATOR_EXTENSION:
- return ((InternalEList<?>)getValidatorExtension()).basicRemove(otherEnd, msgs);
- }
- return super.eInverseRemove(otherEnd, featureID, msgs);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public Object eGet(int featureID, boolean resolve, boolean coreType)
- {
- switch (featureID)
- {
- case FaceletTaglibPackage.FACELET_TAGLIB_TAG_VALIDATOR__VALIDATOR_ID:
- return getValidatorId();
- case FaceletTaglibPackage.FACELET_TAGLIB_TAG_VALIDATOR__HANDLER_CLASS:
- return getHandlerClass();
- case FaceletTaglibPackage.FACELET_TAGLIB_TAG_VALIDATOR__VALIDATOR_EXTENSION:
- return getValidatorExtension();
- }
- return super.eGet(featureID, resolve, coreType);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @SuppressWarnings("unchecked")
- @Override
- public void eSet(int featureID, Object newValue)
- {
- switch (featureID)
- {
- case FaceletTaglibPackage.FACELET_TAGLIB_TAG_VALIDATOR__VALIDATOR_ID:
- setValidatorId((IdentifiableStringValue)newValue);
- return;
- case FaceletTaglibPackage.FACELET_TAGLIB_TAG_VALIDATOR__HANDLER_CLASS:
- setHandlerClass((FullyQualifiedClass)newValue);
- return;
- case FaceletTaglibPackage.FACELET_TAGLIB_TAG_VALIDATOR__VALIDATOR_EXTENSION:
- getValidatorExtension().clear();
- getValidatorExtension().addAll((Collection<? extends FaceletTaglibTagValidatorExtension>)newValue);
- return;
- }
- super.eSet(featureID, newValue);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public void eUnset(int featureID)
- {
- switch (featureID)
- {
- case FaceletTaglibPackage.FACELET_TAGLIB_TAG_VALIDATOR__VALIDATOR_ID:
- setValidatorId((IdentifiableStringValue)null);
- return;
- case FaceletTaglibPackage.FACELET_TAGLIB_TAG_VALIDATOR__HANDLER_CLASS:
- setHandlerClass((FullyQualifiedClass)null);
- return;
- case FaceletTaglibPackage.FACELET_TAGLIB_TAG_VALIDATOR__VALIDATOR_EXTENSION:
- getValidatorExtension().clear();
- return;
- }
- super.eUnset(featureID);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public boolean eIsSet(int featureID)
- {
- switch (featureID)
- {
- case FaceletTaglibPackage.FACELET_TAGLIB_TAG_VALIDATOR__VALIDATOR_ID:
- return validatorId != null;
- case FaceletTaglibPackage.FACELET_TAGLIB_TAG_VALIDATOR__HANDLER_CLASS:
- return handlerClass != null;
- case FaceletTaglibPackage.FACELET_TAGLIB_TAG_VALIDATOR__VALIDATOR_EXTENSION:
- return validatorExtension != null && !validatorExtension.isEmpty();
- }
- return super.eIsSet(featureID);
- }
-
-} //FaceletTaglibTagValidatorImpl
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib/impl/FullyQualifiedClassImpl.java b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib/impl/FullyQualifiedClassImpl.java
deleted file mode 100644
index f188958..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib/impl/FullyQualifiedClassImpl.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: FullyQualifiedClassImpl.java,v 1.1 2010/03/18 06:24:38 cbateman Exp $
- */
-package org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibPackage;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FullyQualifiedClass;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Fully Qualified Class</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * </p>
- *
- * @generated
- */
-public class FullyQualifiedClassImpl extends IdentifiableStringValueImpl implements FullyQualifiedClass
-{
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected FullyQualifiedClassImpl()
- {
- super();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- protected EClass eStaticClass()
- {
- return FaceletTaglibPackage.Literals.FULLY_QUALIFIED_CLASS;
- }
-
-} //FullyQualifiedClassImpl
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib/impl/GenericBooleanImpl.java b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib/impl/GenericBooleanImpl.java
deleted file mode 100644
index 6632e66..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib/impl/GenericBooleanImpl.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: GenericBooleanImpl.java,v 1.1 2010/03/18 06:24:39 cbateman Exp $
- */
-package org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibPackage;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.GenericBoolean;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Generic Boolean</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * </p>
- *
- * @generated
- */
-public class GenericBooleanImpl extends IdentifiableStringValueImpl implements GenericBoolean
-{
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected GenericBooleanImpl()
- {
- super();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- protected EClass eStaticClass()
- {
- return FaceletTaglibPackage.Literals.GENERIC_BOOLEAN;
- }
-
-} //GenericBooleanImpl
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib/impl/IconImpl.java b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib/impl/IconImpl.java
deleted file mode 100644
index d9b9bde..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib/impl/IconImpl.java
+++ /dev/null
@@ -1,399 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: IconImpl.java,v 1.1 2010/03/18 06:24:37 cbateman Exp $
- */
-package org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibPackage;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.Icon;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.Path;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Icon</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- * <li>{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl.IconImpl#getSmallIcon <em>Small Icon</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl.IconImpl#getLargeIcon <em>Large Icon</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl.IconImpl#getId <em>Id</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl.IconImpl#getLang <em>Lang</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class IconImpl extends EObjectImpl implements Icon
-{
- /**
- * The cached value of the '{@link #getSmallIcon() <em>Small Icon</em>}' containment reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getSmallIcon()
- * @generated
- * @ordered
- */
- protected Path smallIcon;
-
- /**
- * The cached value of the '{@link #getLargeIcon() <em>Large Icon</em>}' containment reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getLargeIcon()
- * @generated
- * @ordered
- */
- protected Path largeIcon;
-
- /**
- * The default value of the '{@link #getId() <em>Id</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getId()
- * @generated
- * @ordered
- */
- protected static final String ID_EDEFAULT = null;
-
- /**
- * The cached value of the '{@link #getId() <em>Id</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getId()
- * @generated
- * @ordered
- */
- protected String id = ID_EDEFAULT;
-
- /**
- * The default value of the '{@link #getLang() <em>Lang</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getLang()
- * @generated
- * @ordered
- */
- protected static final String LANG_EDEFAULT = null;
-
- /**
- * The cached value of the '{@link #getLang() <em>Lang</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getLang()
- * @generated
- * @ordered
- */
- protected String lang = LANG_EDEFAULT;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected IconImpl()
- {
- super();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- protected EClass eStaticClass()
- {
- return FaceletTaglibPackage.Literals.ICON;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public Path getSmallIcon()
- {
- return smallIcon;
- }
-
- /**
- * <!-- begin-user-doc -->
- * @param newSmallIcon
- * @param msgs
- * @return the notification chain
- * <!-- end-user-doc -->
- * @generated
- */
- public NotificationChain basicSetSmallIcon(Path newSmallIcon, NotificationChain msgs)
- {
- Path oldSmallIcon = smallIcon;
- smallIcon = newSmallIcon;
- if (eNotificationRequired())
- {
- ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, FaceletTaglibPackage.ICON__SMALL_ICON, oldSmallIcon, newSmallIcon);
- if (msgs == null) msgs = notification; else msgs.add(notification);
- }
- return msgs;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setSmallIcon(Path newSmallIcon)
- {
- if (newSmallIcon != smallIcon)
- {
- NotificationChain msgs = null;
- if (smallIcon != null)
- msgs = ((InternalEObject)smallIcon).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - FaceletTaglibPackage.ICON__SMALL_ICON, null, msgs);
- if (newSmallIcon != null)
- msgs = ((InternalEObject)newSmallIcon).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - FaceletTaglibPackage.ICON__SMALL_ICON, null, msgs);
- msgs = basicSetSmallIcon(newSmallIcon, msgs);
- if (msgs != null) msgs.dispatch();
- }
- else if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, FaceletTaglibPackage.ICON__SMALL_ICON, newSmallIcon, newSmallIcon));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public Path getLargeIcon()
- {
- return largeIcon;
- }
-
- /**
- * <!-- begin-user-doc -->
- * @param newLargeIcon
- * @param msgs
- * @return the notification chain.
- * <!-- end-user-doc -->
- * @generated
- */
- public NotificationChain basicSetLargeIcon(Path newLargeIcon, NotificationChain msgs)
- {
- Path oldLargeIcon = largeIcon;
- largeIcon = newLargeIcon;
- if (eNotificationRequired())
- {
- ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, FaceletTaglibPackage.ICON__LARGE_ICON, oldLargeIcon, newLargeIcon);
- if (msgs == null) msgs = notification; else msgs.add(notification);
- }
- return msgs;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setLargeIcon(Path newLargeIcon)
- {
- if (newLargeIcon != largeIcon)
- {
- NotificationChain msgs = null;
- if (largeIcon != null)
- msgs = ((InternalEObject)largeIcon).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - FaceletTaglibPackage.ICON__LARGE_ICON, null, msgs);
- if (newLargeIcon != null)
- msgs = ((InternalEObject)newLargeIcon).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - FaceletTaglibPackage.ICON__LARGE_ICON, null, msgs);
- msgs = basicSetLargeIcon(newLargeIcon, msgs);
- if (msgs != null) msgs.dispatch();
- }
- else if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, FaceletTaglibPackage.ICON__LARGE_ICON, newLargeIcon, newLargeIcon));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public String getId()
- {
- return id;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setId(String newId)
- {
- String oldId = id;
- id = newId;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, FaceletTaglibPackage.ICON__ID, oldId, id));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public String getLang()
- {
- return lang;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setLang(String newLang)
- {
- String oldLang = lang;
- lang = newLang;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, FaceletTaglibPackage.ICON__LANG, oldLang, lang));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)
- {
- switch (featureID)
- {
- case FaceletTaglibPackage.ICON__SMALL_ICON:
- return basicSetSmallIcon(null, msgs);
- case FaceletTaglibPackage.ICON__LARGE_ICON:
- return basicSetLargeIcon(null, msgs);
- }
- return super.eInverseRemove(otherEnd, featureID, msgs);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public Object eGet(int featureID, boolean resolve, boolean coreType)
- {
- switch (featureID)
- {
- case FaceletTaglibPackage.ICON__SMALL_ICON:
- return getSmallIcon();
- case FaceletTaglibPackage.ICON__LARGE_ICON:
- return getLargeIcon();
- case FaceletTaglibPackage.ICON__ID:
- return getId();
- case FaceletTaglibPackage.ICON__LANG:
- return getLang();
- }
- return super.eGet(featureID, resolve, coreType);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public void eSet(int featureID, Object newValue)
- {
- switch (featureID)
- {
- case FaceletTaglibPackage.ICON__SMALL_ICON:
- setSmallIcon((Path)newValue);
- return;
- case FaceletTaglibPackage.ICON__LARGE_ICON:
- setLargeIcon((Path)newValue);
- return;
- case FaceletTaglibPackage.ICON__ID:
- setId((String)newValue);
- return;
- case FaceletTaglibPackage.ICON__LANG:
- setLang((String)newValue);
- return;
- }
- super.eSet(featureID, newValue);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public void eUnset(int featureID)
- {
- switch (featureID)
- {
- case FaceletTaglibPackage.ICON__SMALL_ICON:
- setSmallIcon((Path)null);
- return;
- case FaceletTaglibPackage.ICON__LARGE_ICON:
- setLargeIcon((Path)null);
- return;
- case FaceletTaglibPackage.ICON__ID:
- setId(ID_EDEFAULT);
- return;
- case FaceletTaglibPackage.ICON__LANG:
- setLang(LANG_EDEFAULT);
- return;
- }
- super.eUnset(featureID);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public boolean eIsSet(int featureID)
- {
- switch (featureID)
- {
- case FaceletTaglibPackage.ICON__SMALL_ICON:
- return smallIcon != null;
- case FaceletTaglibPackage.ICON__LARGE_ICON:
- return largeIcon != null;
- case FaceletTaglibPackage.ICON__ID:
- return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
- case FaceletTaglibPackage.ICON__LANG:
- return LANG_EDEFAULT == null ? lang != null : !LANG_EDEFAULT.equals(lang);
- }
- return super.eIsSet(featureID);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public String toString()
- {
- if (eIsProxy()) return super.toString();
-
- StringBuffer result = new StringBuffer(super.toString());
- result.append(" (id: "); //$NON-NLS-1$
- result.append(id);
- result.append(", lang: "); //$NON-NLS-1$
- result.append(lang);
- result.append(')');
- return result.toString();
- }
-
-} //IconImpl
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib/impl/IdentifiableLangStringValueImpl.java b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib/impl/IdentifiableLangStringValueImpl.java
deleted file mode 100644
index 8f5721a..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib/impl/IdentifiableLangStringValueImpl.java
+++ /dev/null
@@ -1,177 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: IdentifiableLangStringValueImpl.java,v 1.1 2010/03/18 06:24:39 cbateman Exp $
- */
-package org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibPackage;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.IdentifiableLangStringValue;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Identifiable Lang String Value</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- * <li>{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl.IdentifiableLangStringValueImpl#getLang <em>Lang</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public abstract class IdentifiableLangStringValueImpl extends IdentifiableStringValueImpl implements IdentifiableLangStringValue
-{
- /**
- * The default value of the '{@link #getLang() <em>Lang</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getLang()
- * @generated
- * @ordered
- */
- protected static final String LANG_EDEFAULT = null;
-
- /**
- * The cached value of the '{@link #getLang() <em>Lang</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getLang()
- * @generated
- * @ordered
- */
- protected String lang = LANG_EDEFAULT;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected IdentifiableLangStringValueImpl()
- {
- super();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- protected EClass eStaticClass()
- {
- return FaceletTaglibPackage.Literals.IDENTIFIABLE_LANG_STRING_VALUE;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public String getLang()
- {
- return lang;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setLang(String newLang)
- {
- String oldLang = lang;
- lang = newLang;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, FaceletTaglibPackage.IDENTIFIABLE_LANG_STRING_VALUE__LANG, oldLang, lang));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public Object eGet(int featureID, boolean resolve, boolean coreType)
- {
- switch (featureID)
- {
- case FaceletTaglibPackage.IDENTIFIABLE_LANG_STRING_VALUE__LANG:
- return getLang();
- }
- return super.eGet(featureID, resolve, coreType);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public void eSet(int featureID, Object newValue)
- {
- switch (featureID)
- {
- case FaceletTaglibPackage.IDENTIFIABLE_LANG_STRING_VALUE__LANG:
- setLang((String)newValue);
- return;
- }
- super.eSet(featureID, newValue);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public void eUnset(int featureID)
- {
- switch (featureID)
- {
- case FaceletTaglibPackage.IDENTIFIABLE_LANG_STRING_VALUE__LANG:
- setLang(LANG_EDEFAULT);
- return;
- }
- super.eUnset(featureID);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public boolean eIsSet(int featureID)
- {
- switch (featureID)
- {
- case FaceletTaglibPackage.IDENTIFIABLE_LANG_STRING_VALUE__LANG:
- return LANG_EDEFAULT == null ? lang != null : !LANG_EDEFAULT.equals(lang);
- }
- return super.eIsSet(featureID);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public String toString()
- {
- if (eIsProxy()) return super.toString();
-
- StringBuffer result = new StringBuffer(super.toString());
- result.append(" (lang: "); //$NON-NLS-1$
- result.append(lang);
- result.append(')');
- return result.toString();
- }
-
-} //IdentifiableLangStringValueImpl
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib/impl/IdentifiableStringValueImpl.java b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib/impl/IdentifiableStringValueImpl.java
deleted file mode 100644
index b380e98..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib/impl/IdentifiableStringValueImpl.java
+++ /dev/null
@@ -1,234 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: IdentifiableStringValueImpl.java,v 1.1 2010/03/18 06:24:39 cbateman Exp $
- */
-package org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.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.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibPackage;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.IdentifiableStringValue;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Identifiable String Value</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- * <li>{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl.IdentifiableStringValueImpl#getValue <em>Value</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl.IdentifiableStringValueImpl#getId <em>Id</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class IdentifiableStringValueImpl extends EObjectImpl implements IdentifiableStringValue
-{
- /**
- * The default value of the '{@link #getValue() <em>Value</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getValue()
- * @generated
- * @ordered
- */
- protected static final String VALUE_EDEFAULT = null;
-
- /**
- * The cached value of the '{@link #getValue() <em>Value</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getValue()
- * @generated
- * @ordered
- */
- protected String value = VALUE_EDEFAULT;
-
- /**
- * The default value of the '{@link #getId() <em>Id</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getId()
- * @generated
- * @ordered
- */
- protected static final String ID_EDEFAULT = null;
-
- /**
- * The cached value of the '{@link #getId() <em>Id</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getId()
- * @generated
- * @ordered
- */
- protected String id = ID_EDEFAULT;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected IdentifiableStringValueImpl()
- {
- super();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- protected EClass eStaticClass()
- {
- return FaceletTaglibPackage.Literals.IDENTIFIABLE_STRING_VALUE;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public String getValue()
- {
- return value;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setValue(String newValue)
- {
- String oldValue = value;
- value = newValue;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, FaceletTaglibPackage.IDENTIFIABLE_STRING_VALUE__VALUE, oldValue, value));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public String getId()
- {
- return id;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setId(String newId)
- {
- String oldId = id;
- id = newId;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, FaceletTaglibPackage.IDENTIFIABLE_STRING_VALUE__ID, oldId, id));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public Object eGet(int featureID, boolean resolve, boolean coreType)
- {
- switch (featureID)
- {
- case FaceletTaglibPackage.IDENTIFIABLE_STRING_VALUE__VALUE:
- return getValue();
- case FaceletTaglibPackage.IDENTIFIABLE_STRING_VALUE__ID:
- return getId();
- }
- return super.eGet(featureID, resolve, coreType);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public void eSet(int featureID, Object newValue)
- {
- switch (featureID)
- {
- case FaceletTaglibPackage.IDENTIFIABLE_STRING_VALUE__VALUE:
- setValue((String)newValue);
- return;
- case FaceletTaglibPackage.IDENTIFIABLE_STRING_VALUE__ID:
- setId((String)newValue);
- return;
- }
- super.eSet(featureID, newValue);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public void eUnset(int featureID)
- {
- switch (featureID)
- {
- case FaceletTaglibPackage.IDENTIFIABLE_STRING_VALUE__VALUE:
- setValue(VALUE_EDEFAULT);
- return;
- case FaceletTaglibPackage.IDENTIFIABLE_STRING_VALUE__ID:
- setId(ID_EDEFAULT);
- return;
- }
- super.eUnset(featureID);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public boolean eIsSet(int featureID)
- {
- switch (featureID)
- {
- case FaceletTaglibPackage.IDENTIFIABLE_STRING_VALUE__VALUE:
- return VALUE_EDEFAULT == null ? value != null : !VALUE_EDEFAULT.equals(value);
- case FaceletTaglibPackage.IDENTIFIABLE_STRING_VALUE__ID:
- return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
- }
- return super.eIsSet(featureID);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public String toString()
- {
- if (eIsProxy()) return super.toString();
-
- StringBuffer result = new StringBuffer(super.toString());
- result.append(" (value: "); //$NON-NLS-1$
- result.append(value);
- result.append(", id: "); //$NON-NLS-1$
- result.append(id);
- result.append(')');
- return result.toString();
- }
-
-} //IdentifiableStringValueImpl
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib/impl/JavaIdentifierImpl.java b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib/impl/JavaIdentifierImpl.java
deleted file mode 100644
index 18287c9..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib/impl/JavaIdentifierImpl.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: JavaIdentifierImpl.java,v 1.1 2010/03/18 06:24:39 cbateman Exp $
- */
-package org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibPackage;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.JavaIdentifier;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Java Identifier</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * </p>
- *
- * @generated
- */
-public class JavaIdentifierImpl extends IdentifiableStringValueImpl implements JavaIdentifier
-{
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected JavaIdentifierImpl()
- {
- super();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- protected EClass eStaticClass()
- {
- return FaceletTaglibPackage.Literals.JAVA_IDENTIFIER;
- }
-
-} //JavaIdentifierImpl
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib/impl/PathImpl.java b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib/impl/PathImpl.java
deleted file mode 100644
index 0da2c86..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib/impl/PathImpl.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: PathImpl.java,v 1.1 2010/03/18 06:24:38 cbateman Exp $
- */
-package org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibPackage;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.Path;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Path</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * </p>
- *
- * @generated
- */
-public class PathImpl extends IdentifiableStringValueImpl implements Path
-{
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected PathImpl()
- {
- super();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- protected EClass eStaticClass()
- {
- return FaceletTaglibPackage.Literals.PATH;
- }
-
-} //PathImpl
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib/impl/UserVisibleTaglibObjectImpl.java b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib/impl/UserVisibleTaglibObjectImpl.java
deleted file mode 100644
index 06a0d91..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib/impl/UserVisibleTaglibObjectImpl.java
+++ /dev/null
@@ -1,284 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: UserVisibleTaglibObjectImpl.java,v 1.1 2010/03/18 06:24:38 cbateman Exp $
- */
-package org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.Description;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.DisplayName;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibPackage;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.Icon;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.UserVisibleTaglibObject;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>User Visible Taglib Object</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- * <li>{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl.UserVisibleTaglibObjectImpl#getDescription <em>Description</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl.UserVisibleTaglibObjectImpl#getDisplayName <em>Display Name</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl.UserVisibleTaglibObjectImpl#getIcon <em>Icon</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public abstract class UserVisibleTaglibObjectImpl extends EObjectImpl implements UserVisibleTaglibObject
-{
- /**
- * The cached value of the '{@link #getDescription() <em>Description</em>}' containment reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getDescription()
- * @generated
- * @ordered
- */
- protected EList<Description> description;
-
- /**
- * The cached value of the '{@link #getDisplayName() <em>Display Name</em>}' containment reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getDisplayName()
- * @generated
- * @ordered
- */
- protected EList<DisplayName> displayName;
-
- /**
- * The cached value of the '{@link #getIcon() <em>Icon</em>}' containment reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getIcon()
- * @generated
- * @ordered
- */
- protected EList<Icon> icon;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected UserVisibleTaglibObjectImpl()
- {
- super();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- protected EClass eStaticClass()
- {
- return FaceletTaglibPackage.Literals.USER_VISIBLE_TAGLIB_OBJECT;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EList<Description> getDescription()
- {
- if (description == null)
- {
- description = new EObjectContainmentEList<Description>(Description.class, this, FaceletTaglibPackage.USER_VISIBLE_TAGLIB_OBJECT__DESCRIPTION);
- }
- return description;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EList<DisplayName> getDisplayName()
- {
- if (displayName == null)
- {
- displayName = new EObjectContainmentEList<DisplayName>(DisplayName.class, this, FaceletTaglibPackage.USER_VISIBLE_TAGLIB_OBJECT__DISPLAY_NAME);
- }
- return displayName;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EList<Icon> getIcon()
- {
- if (icon == null)
- {
- icon = new EObjectContainmentEList<Icon>(Icon.class, this, FaceletTaglibPackage.USER_VISIBLE_TAGLIB_OBJECT__ICON);
- }
- return icon;
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated NOT
- */
- public String getDescription(String language, String separationString)
- {
- return Util.concat(this, getDescription(), language, separationString);
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated NOT
- */
- public String getDefaultDescription(String separationString)
- {
- return getDescription("", separationString); //$NON-NLS-1$
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated NOT
- */
- public String getDisplayName(String language, String separationString)
- {
- return Util.concat(this, getDescription(), language, separationString);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated NOT
- */
- public String getDefaultDisplayName(String separationString)
- {
- return getDisplayName("", separationString); //$NON-NLS-1$
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)
- {
- switch (featureID)
- {
- case FaceletTaglibPackage.USER_VISIBLE_TAGLIB_OBJECT__DESCRIPTION:
- return ((InternalEList<?>)getDescription()).basicRemove(otherEnd, msgs);
- case FaceletTaglibPackage.USER_VISIBLE_TAGLIB_OBJECT__DISPLAY_NAME:
- return ((InternalEList<?>)getDisplayName()).basicRemove(otherEnd, msgs);
- case FaceletTaglibPackage.USER_VISIBLE_TAGLIB_OBJECT__ICON:
- return ((InternalEList<?>)getIcon()).basicRemove(otherEnd, msgs);
- }
- return super.eInverseRemove(otherEnd, featureID, msgs);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public Object eGet(int featureID, boolean resolve, boolean coreType)
- {
- switch (featureID)
- {
- case FaceletTaglibPackage.USER_VISIBLE_TAGLIB_OBJECT__DESCRIPTION:
- return getDescription();
- case FaceletTaglibPackage.USER_VISIBLE_TAGLIB_OBJECT__DISPLAY_NAME:
- return getDisplayName();
- case FaceletTaglibPackage.USER_VISIBLE_TAGLIB_OBJECT__ICON:
- return getIcon();
- }
- return super.eGet(featureID, resolve, coreType);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @SuppressWarnings("unchecked")
- @Override
- public void eSet(int featureID, Object newValue)
- {
- switch (featureID)
- {
- case FaceletTaglibPackage.USER_VISIBLE_TAGLIB_OBJECT__DESCRIPTION:
- getDescription().clear();
- getDescription().addAll((Collection<? extends Description>)newValue);
- return;
- case FaceletTaglibPackage.USER_VISIBLE_TAGLIB_OBJECT__DISPLAY_NAME:
- getDisplayName().clear();
- getDisplayName().addAll((Collection<? extends DisplayName>)newValue);
- return;
- case FaceletTaglibPackage.USER_VISIBLE_TAGLIB_OBJECT__ICON:
- getIcon().clear();
- getIcon().addAll((Collection<? extends Icon>)newValue);
- return;
- }
- super.eSet(featureID, newValue);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public void eUnset(int featureID)
- {
- switch (featureID)
- {
- case FaceletTaglibPackage.USER_VISIBLE_TAGLIB_OBJECT__DESCRIPTION:
- getDescription().clear();
- return;
- case FaceletTaglibPackage.USER_VISIBLE_TAGLIB_OBJECT__DISPLAY_NAME:
- getDisplayName().clear();
- return;
- case FaceletTaglibPackage.USER_VISIBLE_TAGLIB_OBJECT__ICON:
- getIcon().clear();
- return;
- }
- super.eUnset(featureID);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public boolean eIsSet(int featureID)
- {
- switch (featureID)
- {
- case FaceletTaglibPackage.USER_VISIBLE_TAGLIB_OBJECT__DESCRIPTION:
- return description != null && !description.isEmpty();
- case FaceletTaglibPackage.USER_VISIBLE_TAGLIB_OBJECT__DISPLAY_NAME:
- return displayName != null && !displayName.isEmpty();
- case FaceletTaglibPackage.USER_VISIBLE_TAGLIB_OBJECT__ICON:
- return icon != null && !icon.isEmpty();
- }
- return super.eIsSet(featureID);
- }
-
-} //UserVisibleTaglibObjectImpl
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib/impl/Util.java b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib/impl/Util.java
deleted file mode 100644
index dd6f85c..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib/impl/Util.java
+++ /dev/null
@@ -1,86 +0,0 @@
-package org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.impl;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.IdentifiableLangStringValue;
-
-/**
- * A private utility class for use by Facelet Taglib model impls.
- *
- * @author cbateman
- *
- */
-class Util
-{
- public static String concat(final EObject listOwner,
- final EList<? extends IdentifiableLangStringValue> list,
- final String filterString,
- final String separationString)
- {
- if (filterString == null)
- {
- throw new NullPointerException("language must not be null"); //$NON-NLS-1$
- }
-
- String retString = ""; //$NON-NLS-1$
- for (final IdentifiableLangStringValue obj : list)
- {
- if (obj != null
- && passesFilter(filterString.length() == 0 ? null
- : filterString, obj))
- {
- String value = obj.getValue();
- if (value != null)
- {
- value = value.trim();
- if (retString.length() != 0)
- {
- retString += separationString;
- }
- retString += value;
- }
- }
- }
- return retString;
- }
-
- private static boolean passesFilter(final String expectedLang,
- final IdentifiableLangStringValue langOwner)
- {
- final Object lang = langOwner.getLang();
- return ((expectedLang == null && lang == null) || (expectedLang != null && expectedLang
- .equals(lang)));
- }
-
- public static Object getSimplifiedNestedField(final EObject owner,
- final EReference firstLevelFeature, EAttribute simplifiedFeature)
- {
- Object complexObject = owner.eGet(firstLevelFeature);
- if (complexObject instanceof EObject)
- {
- return ((EObject) complexObject).eGet(simplifiedFeature);
- }
- return null;
- }
-
- public static void setSimplifiedNestedField(final EObject owner,
- final EReference firstLevelFeature, EAttribute simplifiedFeature,
- final Object newSimpleValue)
- {
- Object complexObject = owner.eGet(firstLevelFeature);
- if (complexObject == null)
- {
- complexObject = EcoreUtil.create((EClass) firstLevelFeature.getEType());
- ((EObject) complexObject).eSet(simplifiedFeature, newSimpleValue);
- owner.eSet(firstLevelFeature, complexObject);
- } else
- {
- ((EObject) complexObject).eSet(simplifiedFeature, newSimpleValue);
- }
-
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib/util/FaceletTaglibAdapterFactory.java b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib/util/FaceletTaglibAdapterFactory.java
deleted file mode 100644
index 065e0f8..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib/util/FaceletTaglibAdapterFactory.java
+++ /dev/null
@@ -1,659 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: FaceletTaglibAdapterFactory.java,v 1.2 2010/03/18 06:24:40 cbateman Exp $
- */
-package org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.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.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.Description;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.DisplayName;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.DocumentRoot;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglib;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibCanonicalName;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibExtension;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibFunction;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibPackage;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTag;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagAttribute;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagBehavior;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagBehaviorExtension;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagComponent;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagComponentExtension;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagConverter;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagConverterExtension;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagExtension;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagValidator;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagValidatorExtension;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FullyQualifiedClass;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.GenericBoolean;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.Icon;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.IdentifiableLangStringValue;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.IdentifiableStringValue;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.JavaIdentifier;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.Path;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.UserVisibleTaglibObject;
-
-/**
- * <!-- 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.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibPackage
- * @generated
- */
-public class FaceletTaglibAdapterFactory extends AdapterFactoryImpl
-{
- /**
- * The cached model package.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected static FaceletTaglibPackage modelPackage;
-
- /**
- * Creates an instance of the adapter factory.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public FaceletTaglibAdapterFactory()
- {
- if (modelPackage == null)
- {
- modelPackage = FaceletTaglibPackage.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
- */
- @Override
- 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 FaceletTaglibSwitch<Adapter> modelSwitch =
- new FaceletTaglibSwitch<Adapter>()
- {
- @Override
- public Adapter caseDescription(Description object)
- {
- return createDescriptionAdapter();
- }
- @Override
- public Adapter caseDisplayName(DisplayName object)
- {
- return createDisplayNameAdapter();
- }
- @Override
- public Adapter caseDocumentRoot(DocumentRoot object)
- {
- return createDocumentRootAdapter();
- }
- @Override
- public Adapter caseFaceletTaglibCanonicalName(FaceletTaglibCanonicalName object)
- {
- return createFaceletTaglibCanonicalNameAdapter();
- }
- @Override
- public Adapter caseFaceletTaglibExtension(FaceletTaglibExtension object)
- {
- return createFaceletTaglibExtensionAdapter();
- }
- @Override
- public Adapter caseFaceletTaglibFunction(FaceletTaglibFunction object)
- {
- return createFaceletTaglibFunctionAdapter();
- }
- @Override
- public Adapter caseFaceletTaglibTagAttribute(FaceletTaglibTagAttribute object)
- {
- return createFaceletTaglibTagAttributeAdapter();
- }
- @Override
- public Adapter caseFaceletTaglibTagBehaviorExtension(FaceletTaglibTagBehaviorExtension object)
- {
- return createFaceletTaglibTagBehaviorExtensionAdapter();
- }
- @Override
- public Adapter caseFaceletTaglibTagBehavior(FaceletTaglibTagBehavior object)
- {
- return createFaceletTaglibTagBehaviorAdapter();
- }
- @Override
- public Adapter caseFaceletTaglibTagComponentExtension(FaceletTaglibTagComponentExtension object)
- {
- return createFaceletTaglibTagComponentExtensionAdapter();
- }
- @Override
- public Adapter caseFaceletTaglibTagComponent(FaceletTaglibTagComponent object)
- {
- return createFaceletTaglibTagComponentAdapter();
- }
- @Override
- public Adapter caseFaceletTaglibTagConverterExtension(FaceletTaglibTagConverterExtension object)
- {
- return createFaceletTaglibTagConverterExtensionAdapter();
- }
- @Override
- public Adapter caseFaceletTaglibTagConverter(FaceletTaglibTagConverter object)
- {
- return createFaceletTaglibTagConverterAdapter();
- }
- @Override
- public Adapter caseFaceletTaglibTagExtension(FaceletTaglibTagExtension object)
- {
- return createFaceletTaglibTagExtensionAdapter();
- }
- @Override
- public Adapter caseFaceletTaglibTag(FaceletTaglibTag object)
- {
- return createFaceletTaglibTagAdapter();
- }
- @Override
- public Adapter caseFaceletTaglibTagValidatorExtension(FaceletTaglibTagValidatorExtension object)
- {
- return createFaceletTaglibTagValidatorExtensionAdapter();
- }
- @Override
- public Adapter caseFaceletTaglibTagValidator(FaceletTaglibTagValidator object)
- {
- return createFaceletTaglibTagValidatorAdapter();
- }
- @Override
- public Adapter caseFaceletTaglib(FaceletTaglib object)
- {
- return createFaceletTaglibAdapter();
- }
- @Override
- public Adapter caseFullyQualifiedClass(FullyQualifiedClass object)
- {
- return createFullyQualifiedClassAdapter();
- }
- @Override
- public Adapter caseGenericBoolean(GenericBoolean object)
- {
- return createGenericBooleanAdapter();
- }
- @Override
- public Adapter caseIcon(Icon object)
- {
- return createIconAdapter();
- }
- @Override
- public Adapter caseJavaIdentifier(JavaIdentifier object)
- {
- return createJavaIdentifierAdapter();
- }
- @Override
- public Adapter casePath(Path object)
- {
- return createPathAdapter();
- }
- @Override
- public Adapter caseIdentifiableStringValue(IdentifiableStringValue object)
- {
- return createIdentifiableStringValueAdapter();
- }
- @Override
- public Adapter caseIdentifiableLangStringValue(IdentifiableLangStringValue object)
- {
- return createIdentifiableLangStringValueAdapter();
- }
- @Override
- public Adapter caseUserVisibleTaglibObject(UserVisibleTaglibObject object)
- {
- return createUserVisibleTaglibObjectAdapter();
- }
- @Override
- public Adapter 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
- */
- @Override
- public Adapter createAdapter(Notifier target)
- {
- return modelSwitch.doSwitch((EObject)target);
- }
-
-
- /**
- * Creates a new adapter for an object of class '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.Description <em>Description</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.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.Description
- * @generated
- */
- public Adapter createDescriptionAdapter()
- {
- return null;
- }
-
- /**
- * Creates a new adapter for an object of class '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.DisplayName <em>Display Name</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.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.DisplayName
- * @generated
- */
- public Adapter createDisplayNameAdapter()
- {
- return null;
- }
-
- /**
- * Creates a new adapter for an object of class '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.DocumentRoot <em>Document Root</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.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.DocumentRoot
- * @generated
- */
- public Adapter createDocumentRootAdapter()
- {
- return null;
- }
-
- /**
- * Creates a new adapter for an object of class '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibCanonicalName <em>Canonical Name</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.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibCanonicalName
- * @generated
- */
- public Adapter createFaceletTaglibCanonicalNameAdapter()
- {
- return null;
- }
-
- /**
- * Creates a new adapter for an object of class '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibExtension <em>Extension</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.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibExtension
- * @generated
- */
- public Adapter createFaceletTaglibExtensionAdapter()
- {
- return null;
- }
-
- /**
- * Creates a new adapter for an object of class '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibFunction <em>Function</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.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibFunction
- * @generated
- */
- public Adapter createFaceletTaglibFunctionAdapter()
- {
- return null;
- }
-
- /**
- * Creates a new adapter for an object of class '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagAttribute <em>Tag 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.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagAttribute
- * @generated
- */
- public Adapter createFaceletTaglibTagAttributeAdapter()
- {
- return null;
- }
-
- /**
- * Creates a new adapter for an object of class '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagBehaviorExtension <em>Tag Behavior Extension</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.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagBehaviorExtension
- * @generated
- */
- public Adapter createFaceletTaglibTagBehaviorExtensionAdapter()
- {
- return null;
- }
-
- /**
- * Creates a new adapter for an object of class '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagBehavior <em>Tag Behavior</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.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagBehavior
- * @generated
- */
- public Adapter createFaceletTaglibTagBehaviorAdapter()
- {
- return null;
- }
-
- /**
- * Creates a new adapter for an object of class '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagComponentExtension <em>Tag Component Extension</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.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagComponentExtension
- * @generated
- */
- public Adapter createFaceletTaglibTagComponentExtensionAdapter()
- {
- return null;
- }
-
- /**
- * Creates a new adapter for an object of class '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagComponent <em>Tag Component</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.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagComponent
- * @generated
- */
- public Adapter createFaceletTaglibTagComponentAdapter()
- {
- return null;
- }
-
- /**
- * Creates a new adapter for an object of class '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagConverterExtension <em>Tag Converter Extension</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.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagConverterExtension
- * @generated
- */
- public Adapter createFaceletTaglibTagConverterExtensionAdapter()
- {
- return null;
- }
-
- /**
- * Creates a new adapter for an object of class '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagConverter <em>Tag Converter</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.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagConverter
- * @generated
- */
- public Adapter createFaceletTaglibTagConverterAdapter()
- {
- return null;
- }
-
- /**
- * Creates a new adapter for an object of class '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagExtension <em>Tag Extension</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.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagExtension
- * @generated
- */
- public Adapter createFaceletTaglibTagExtensionAdapter()
- {
- return null;
- }
-
- /**
- * Creates a new adapter for an object of class '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTag <em>Tag</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.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTag
- * @generated
- */
- public Adapter createFaceletTaglibTagAdapter()
- {
- return null;
- }
-
- /**
- * Creates a new adapter for an object of class '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagValidatorExtension <em>Tag Validator Extension</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.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagValidatorExtension
- * @generated
- */
- public Adapter createFaceletTaglibTagValidatorExtensionAdapter()
- {
- return null;
- }
-
- /**
- * Creates a new adapter for an object of class '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagValidator <em>Tag Validator</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.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagValidator
- * @generated
- */
- public Adapter createFaceletTaglibTagValidatorAdapter()
- {
- return null;
- }
-
- /**
- * Creates a new adapter for an object of class '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglib <em>Facelet Taglib</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.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglib
- * @generated
- */
- public Adapter createFaceletTaglibAdapter()
- {
- return null;
- }
-
- /**
- * Creates a new adapter for an object of class '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FullyQualifiedClass <em>Fully Qualified Class</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.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FullyQualifiedClass
- * @generated
- */
- public Adapter createFullyQualifiedClassAdapter()
- {
- return null;
- }
-
- /**
- * Creates a new adapter for an object of class '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.GenericBoolean <em>Generic Boolean</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.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.GenericBoolean
- * @generated
- */
- public Adapter createGenericBooleanAdapter()
- {
- return null;
- }
-
- /**
- * Creates a new adapter for an object of class '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.Icon <em>Icon</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.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.Icon
- * @generated
- */
- public Adapter createIconAdapter()
- {
- return null;
- }
-
- /**
- * Creates a new adapter for an object of class '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.JavaIdentifier <em>Java Identifier</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.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.JavaIdentifier
- * @generated
- */
- public Adapter createJavaIdentifierAdapter()
- {
- return null;
- }
-
- /**
- * Creates a new adapter for an object of class '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.Path <em>Path</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.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.Path
- * @generated
- */
- public Adapter createPathAdapter()
- {
- return null;
- }
-
- /**
- * Creates a new adapter for an object of class '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.IdentifiableStringValue <em>Identifiable String Value</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.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.IdentifiableStringValue
- * @generated
- */
- public Adapter createIdentifiableStringValueAdapter()
- {
- return null;
- }
-
- /**
- * Creates a new adapter for an object of class '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.IdentifiableLangStringValue <em>Identifiable Lang String Value</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.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.IdentifiableLangStringValue
- * @generated
- */
- public Adapter createIdentifiableLangStringValueAdapter()
- {
- return null;
- }
-
- /**
- * Creates a new adapter for an object of class '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.UserVisibleTaglibObject <em>User Visible Taglib Object</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.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.UserVisibleTaglibObject
- * @generated
- */
- public Adapter createUserVisibleTaglibObjectAdapter()
- {
- 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;
- }
-
-} //FaceletTaglibAdapterFactory
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib/util/FaceletTaglibResourceFactoryImpl.java b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib/util/FaceletTaglibResourceFactoryImpl.java
deleted file mode 100644
index 6c438eb..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib/util/FaceletTaglibResourceFactoryImpl.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: FaceletTaglibResourceFactoryImpl.java,v 1.1 2010/03/18 06:24:41 cbateman Exp $
- */
-package org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.util;
-
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.impl.ResourceFactoryImpl;
-import org.eclipse.emf.ecore.xmi.XMLResource;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Resource Factory</b> associated with the package.
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.util.FaceletTaglibResourceImpl
- * @generated
- */
-public class FaceletTaglibResourceFactoryImpl extends ResourceFactoryImpl
-{
- /**
- * Creates an instance of the resource factory.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public FaceletTaglibResourceFactoryImpl()
- {
- super();
- }
-
- /**
- * Creates an instance of the resource.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public Resource createResource(URI uri)
- {
- XMLResource result = new FaceletTaglibResourceImpl(uri);
- result.getDefaultSaveOptions().put(XMLResource.OPTION_EXTENDED_META_DATA, Boolean.TRUE);
- result.getDefaultLoadOptions().put(XMLResource.OPTION_EXTENDED_META_DATA, Boolean.TRUE);
-
- result.getDefaultSaveOptions().put(XMLResource.OPTION_SCHEMA_LOCATION, Boolean.TRUE);
-
- result.getDefaultLoadOptions().put(XMLResource.OPTION_USE_ENCODED_ATTRIBUTE_STYLE, Boolean.TRUE);
- result.getDefaultSaveOptions().put(XMLResource.OPTION_USE_ENCODED_ATTRIBUTE_STYLE, Boolean.TRUE);
-
- result.getDefaultLoadOptions().put(XMLResource.OPTION_USE_LEXICAL_HANDLER, Boolean.TRUE);
- return result;
- }
-
-} //FaceletTaglibResourceFactoryImpl
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib/util/FaceletTaglibResourceImpl.java b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib/util/FaceletTaglibResourceImpl.java
deleted file mode 100644
index b117ffe..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib/util/FaceletTaglibResourceImpl.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: FaceletTaglibResourceImpl.java,v 1.1 2010/03/18 06:24:41 cbateman Exp $
- */
-package org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.util;
-
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.xmi.XMLLoad;
-import org.eclipse.emf.ecore.xmi.impl.SAXXMLHandler;
-import org.eclipse.emf.ecore.xmi.impl.XMLLoadImpl;
-import org.eclipse.emf.ecore.xmi.impl.XMLResourceImpl;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibPackage;
-import org.xml.sax.helpers.DefaultHandler;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Resource </b> associated with the package.
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.util.FaceletTaglibResourceFactoryImpl
- * @generated
- */
-public class FaceletTaglibResourceImpl extends XMLResourceImpl
-{
- /**
- * Creates an instance of the resource.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param uri the URI of the new resource.
- * @generated
- */
- public FaceletTaglibResourceImpl(URI uri)
- {
- super(uri);
- }
-
- @Override
- protected XMLLoad createXMLLoad()
- {
- return new XMLLoadImpl(createXMLHelper())
- {
-
- @Override
- protected DefaultHandler makeDefaultHandler()
- {
- return new SAXXMLHandler(resource, helper, options)
- {
-
- @Override
- protected void handleXMLNSAttribute(final String attrib,
- final String value)
- {
- String useValue = value;
- if ("xmlns".equals(attrib)) //$NON-NLS-1$
- {
- useValue = FaceletTaglibPackage.eNS_URI;
- }
- super.handleXMLNSAttribute(attrib, useValue);
- }
-
- };
- }
-
- };
- }
-
-} //FaceletTaglibResourceImpl
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib/util/FaceletTaglibSwitch.java b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib/util/FaceletTaglibSwitch.java
deleted file mode 100644
index b0c1b46..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib/util/FaceletTaglibSwitch.java
+++ /dev/null
@@ -1,762 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: FaceletTaglibSwitch.java,v 1.2 2010/03/18 06:24:41 cbateman Exp $
- */
-package org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.util;
-
-import java.util.List;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.Description;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.DisplayName;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.DocumentRoot;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglib;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibCanonicalName;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibExtension;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibFunction;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibPackage;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTag;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagAttribute;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagBehavior;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagBehaviorExtension;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagComponent;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagComponentExtension;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagConverter;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagConverterExtension;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagExtension;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagValidator;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagValidatorExtension;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FullyQualifiedClass;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.GenericBoolean;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.Icon;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.IdentifiableLangStringValue;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.IdentifiableStringValue;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.JavaIdentifier;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.Path;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.UserVisibleTaglibObject;
-
-/**
- * <!-- 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.
- * @param <T>
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibPackage
- * @generated
- */
-public class FaceletTaglibSwitch<T>
-{
- /**
- * The cached model package
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected static FaceletTaglibPackage modelPackage;
-
- /**
- * Creates an instance of the switch.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public FaceletTaglibSwitch()
- {
- if (modelPackage == null)
- {
- modelPackage = FaceletTaglibPackage.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 -->
- * @param theEObject
- * <!-- end-user-doc -->
- * @return the first non-null result returned by a <code>caseXXX</code> call.
- * @generated
- */
- public T 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 -->
- * @param theEClass
- * @param theEObject
- * <!-- end-user-doc -->
- * @return the first non-null result returned by a <code>caseXXX</code> call.
- * @generated
- */
- protected T doSwitch(EClass theEClass, EObject theEObject)
- {
- if (theEClass.eContainer() == modelPackage)
- {
- return doSwitch(theEClass.getClassifierID(), theEObject);
- }
- List<EClass> eSuperTypes = theEClass.getESuperTypes();
- return
- eSuperTypes.isEmpty() ?
- defaultCase(theEObject) :
- doSwitch(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 -->
- * @param classifierID
- * @param theEObject
- * <!-- end-user-doc -->
- * @return the first non-null result returned by a <code>caseXXX</code> call.
- * @generated
- */
- protected T doSwitch(int classifierID, EObject theEObject)
- {
- switch (classifierID)
- {
- case FaceletTaglibPackage.DESCRIPTION:
- {
- Description description = (Description)theEObject;
- T result = caseDescription(description);
- if (result == null) result = caseIdentifiableLangStringValue(description);
- if (result == null) result = caseIdentifiableStringValue(description);
- if (result == null) result = defaultCase(theEObject);
- return result;
- }
- case FaceletTaglibPackage.DISPLAY_NAME:
- {
- DisplayName displayName = (DisplayName)theEObject;
- T result = caseDisplayName(displayName);
- if (result == null) result = caseIdentifiableLangStringValue(displayName);
- if (result == null) result = caseIdentifiableStringValue(displayName);
- if (result == null) result = defaultCase(theEObject);
- return result;
- }
- case FaceletTaglibPackage.DOCUMENT_ROOT:
- {
- DocumentRoot documentRoot = (DocumentRoot)theEObject;
- T result = caseDocumentRoot(documentRoot);
- if (result == null) result = defaultCase(theEObject);
- return result;
- }
- case FaceletTaglibPackage.FACELET_TAGLIB_CANONICAL_NAME:
- {
- FaceletTaglibCanonicalName faceletTaglibCanonicalName = (FaceletTaglibCanonicalName)theEObject;
- T result = caseFaceletTaglibCanonicalName(faceletTaglibCanonicalName);
- if (result == null) result = defaultCase(theEObject);
- return result;
- }
- case FaceletTaglibPackage.FACELET_TAGLIB_EXTENSION:
- {
- FaceletTaglibExtension faceletTaglibExtension = (FaceletTaglibExtension)theEObject;
- T result = caseFaceletTaglibExtension(faceletTaglibExtension);
- if (result == null) result = defaultCase(theEObject);
- return result;
- }
- case FaceletTaglibPackage.FACELET_TAGLIB_FUNCTION:
- {
- FaceletTaglibFunction faceletTaglibFunction = (FaceletTaglibFunction)theEObject;
- T result = caseFaceletTaglibFunction(faceletTaglibFunction);
- if (result == null) result = caseUserVisibleTaglibObject(faceletTaglibFunction);
- if (result == null) result = defaultCase(theEObject);
- return result;
- }
- case FaceletTaglibPackage.FACELET_TAGLIB_TAG_ATTRIBUTE:
- {
- FaceletTaglibTagAttribute faceletTaglibTagAttribute = (FaceletTaglibTagAttribute)theEObject;
- T result = caseFaceletTaglibTagAttribute(faceletTaglibTagAttribute);
- if (result == null) result = caseUserVisibleTaglibObject(faceletTaglibTagAttribute);
- if (result == null) result = defaultCase(theEObject);
- return result;
- }
- case FaceletTaglibPackage.FACELET_TAGLIB_TAG_BEHAVIOR_EXTENSION:
- {
- FaceletTaglibTagBehaviorExtension faceletTaglibTagBehaviorExtension = (FaceletTaglibTagBehaviorExtension)theEObject;
- T result = caseFaceletTaglibTagBehaviorExtension(faceletTaglibTagBehaviorExtension);
- if (result == null) result = defaultCase(theEObject);
- return result;
- }
- case FaceletTaglibPackage.FACELET_TAGLIB_TAG_BEHAVIOR:
- {
- FaceletTaglibTagBehavior faceletTaglibTagBehavior = (FaceletTaglibTagBehavior)theEObject;
- T result = caseFaceletTaglibTagBehavior(faceletTaglibTagBehavior);
- if (result == null) result = caseUserVisibleTaglibObject(faceletTaglibTagBehavior);
- if (result == null) result = defaultCase(theEObject);
- return result;
- }
- case FaceletTaglibPackage.FACELET_TAGLIB_TAG_COMPONENT_EXTENSION:
- {
- FaceletTaglibTagComponentExtension faceletTaglibTagComponentExtension = (FaceletTaglibTagComponentExtension)theEObject;
- T result = caseFaceletTaglibTagComponentExtension(faceletTaglibTagComponentExtension);
- if (result == null) result = defaultCase(theEObject);
- return result;
- }
- case FaceletTaglibPackage.FACELET_TAGLIB_TAG_COMPONENT:
- {
- FaceletTaglibTagComponent faceletTaglibTagComponent = (FaceletTaglibTagComponent)theEObject;
- T result = caseFaceletTaglibTagComponent(faceletTaglibTagComponent);
- if (result == null) result = caseUserVisibleTaglibObject(faceletTaglibTagComponent);
- if (result == null) result = defaultCase(theEObject);
- return result;
- }
- case FaceletTaglibPackage.FACELET_TAGLIB_TAG_CONVERTER_EXTENSION:
- {
- FaceletTaglibTagConverterExtension faceletTaglibTagConverterExtension = (FaceletTaglibTagConverterExtension)theEObject;
- T result = caseFaceletTaglibTagConverterExtension(faceletTaglibTagConverterExtension);
- if (result == null) result = defaultCase(theEObject);
- return result;
- }
- case FaceletTaglibPackage.FACELET_TAGLIB_TAG_CONVERTER:
- {
- FaceletTaglibTagConverter faceletTaglibTagConverter = (FaceletTaglibTagConverter)theEObject;
- T result = caseFaceletTaglibTagConverter(faceletTaglibTagConverter);
- if (result == null) result = caseUserVisibleTaglibObject(faceletTaglibTagConverter);
- if (result == null) result = defaultCase(theEObject);
- return result;
- }
- case FaceletTaglibPackage.FACELET_TAGLIB_TAG_EXTENSION:
- {
- FaceletTaglibTagExtension faceletTaglibTagExtension = (FaceletTaglibTagExtension)theEObject;
- T result = caseFaceletTaglibTagExtension(faceletTaglibTagExtension);
- if (result == null) result = defaultCase(theEObject);
- return result;
- }
- case FaceletTaglibPackage.FACELET_TAGLIB_TAG:
- {
- FaceletTaglibTag faceletTaglibTag = (FaceletTaglibTag)theEObject;
- T result = caseFaceletTaglibTag(faceletTaglibTag);
- if (result == null) result = caseUserVisibleTaglibObject(faceletTaglibTag);
- if (result == null) result = defaultCase(theEObject);
- return result;
- }
- case FaceletTaglibPackage.FACELET_TAGLIB_TAG_VALIDATOR_EXTENSION:
- {
- FaceletTaglibTagValidatorExtension faceletTaglibTagValidatorExtension = (FaceletTaglibTagValidatorExtension)theEObject;
- T result = caseFaceletTaglibTagValidatorExtension(faceletTaglibTagValidatorExtension);
- if (result == null) result = defaultCase(theEObject);
- return result;
- }
- case FaceletTaglibPackage.FACELET_TAGLIB_TAG_VALIDATOR:
- {
- FaceletTaglibTagValidator faceletTaglibTagValidator = (FaceletTaglibTagValidator)theEObject;
- T result = caseFaceletTaglibTagValidator(faceletTaglibTagValidator);
- if (result == null) result = caseUserVisibleTaglibObject(faceletTaglibTagValidator);
- if (result == null) result = defaultCase(theEObject);
- return result;
- }
- case FaceletTaglibPackage.FACELET_TAGLIB:
- {
- FaceletTaglib faceletTaglib = (FaceletTaglib)theEObject;
- T result = caseFaceletTaglib(faceletTaglib);
- if (result == null) result = caseUserVisibleTaglibObject(faceletTaglib);
- if (result == null) result = defaultCase(theEObject);
- return result;
- }
- case FaceletTaglibPackage.FULLY_QUALIFIED_CLASS:
- {
- FullyQualifiedClass fullyQualifiedClass = (FullyQualifiedClass)theEObject;
- T result = caseFullyQualifiedClass(fullyQualifiedClass);
- if (result == null) result = caseIdentifiableStringValue(fullyQualifiedClass);
- if (result == null) result = defaultCase(theEObject);
- return result;
- }
- case FaceletTaglibPackage.GENERIC_BOOLEAN:
- {
- GenericBoolean genericBoolean = (GenericBoolean)theEObject;
- T result = caseGenericBoolean(genericBoolean);
- if (result == null) result = caseIdentifiableStringValue(genericBoolean);
- if (result == null) result = defaultCase(theEObject);
- return result;
- }
- case FaceletTaglibPackage.ICON:
- {
- Icon icon = (Icon)theEObject;
- T result = caseIcon(icon);
- if (result == null) result = defaultCase(theEObject);
- return result;
- }
- case FaceletTaglibPackage.JAVA_IDENTIFIER:
- {
- JavaIdentifier javaIdentifier = (JavaIdentifier)theEObject;
- T result = caseJavaIdentifier(javaIdentifier);
- if (result == null) result = caseIdentifiableStringValue(javaIdentifier);
- if (result == null) result = defaultCase(theEObject);
- return result;
- }
- case FaceletTaglibPackage.PATH:
- {
- Path path = (Path)theEObject;
- T result = casePath(path);
- if (result == null) result = caseIdentifiableStringValue(path);
- if (result == null) result = defaultCase(theEObject);
- return result;
- }
- case FaceletTaglibPackage.IDENTIFIABLE_STRING_VALUE:
- {
- IdentifiableStringValue identifiableStringValue = (IdentifiableStringValue)theEObject;
- T result = caseIdentifiableStringValue(identifiableStringValue);
- if (result == null) result = defaultCase(theEObject);
- return result;
- }
- case FaceletTaglibPackage.IDENTIFIABLE_LANG_STRING_VALUE:
- {
- IdentifiableLangStringValue identifiableLangStringValue = (IdentifiableLangStringValue)theEObject;
- T result = caseIdentifiableLangStringValue(identifiableLangStringValue);
- if (result == null) result = caseIdentifiableStringValue(identifiableLangStringValue);
- if (result == null) result = defaultCase(theEObject);
- return result;
- }
- case FaceletTaglibPackage.USER_VISIBLE_TAGLIB_OBJECT:
- {
- UserVisibleTaglibObject userVisibleTaglibObject = (UserVisibleTaglibObject)theEObject;
- T result = caseUserVisibleTaglibObject(userVisibleTaglibObject);
- if (result == null) result = defaultCase(theEObject);
- return result;
- }
- default: return defaultCase(theEObject);
- }
- }
-
- /**
- * Returns the result of interpreting the object as an instance of '<em>Description</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>Description</em>'.
- * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
- * @generated
- */
- public T caseDescription(Description object)
- {
- return null;
- }
-
- /**
- * Returns the result of interpreting the object as an instance of '<em>Display Name</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>Display Name</em>'.
- * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
- * @generated
- */
- public T caseDisplayName(DisplayName object)
- {
- return null;
- }
-
- /**
- * Returns the result of interpreting the object as an instance of '<em>Document Root</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>Document Root</em>'.
- * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
- * @generated
- */
- public T caseDocumentRoot(DocumentRoot object)
- {
- return null;
- }
-
- /**
- * Returns the result of interpreting the object as an instance of '<em>Canonical Name</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>Canonical Name</em>'.
- * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
- * @generated
- */
- public T caseFaceletTaglibCanonicalName(FaceletTaglibCanonicalName object)
- {
- return null;
- }
-
- /**
- * Returns the result of interpreting the object as an instance of '<em>Extension</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>Extension</em>'.
- * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
- * @generated
- */
- public T caseFaceletTaglibExtension(FaceletTaglibExtension object)
- {
- return null;
- }
-
- /**
- * Returns the result of interpreting the object as an instance of '<em>Function</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>Function</em>'.
- * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
- * @generated
- */
- public T caseFaceletTaglibFunction(FaceletTaglibFunction object)
- {
- return null;
- }
-
- /**
- * Returns the result of interpreting the object as an instance of '<em>Tag 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>Tag Attribute</em>'.
- * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
- * @generated
- */
- public T caseFaceletTaglibTagAttribute(FaceletTaglibTagAttribute object)
- {
- return null;
- }
-
- /**
- * Returns the result of interpreting the object as an instance of '<em>Tag Behavior Extension</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>Tag Behavior Extension</em>'.
- * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
- * @generated
- */
- public T caseFaceletTaglibTagBehaviorExtension(FaceletTaglibTagBehaviorExtension object)
- {
- return null;
- }
-
- /**
- * Returns the result of interpreting the object as an instance of '<em>Tag Behavior</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>Tag Behavior</em>'.
- * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
- * @generated
- */
- public T caseFaceletTaglibTagBehavior(FaceletTaglibTagBehavior object)
- {
- return null;
- }
-
- /**
- * Returns the result of interpreting the object as an instance of '<em>Tag Component Extension</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>Tag Component Extension</em>'.
- * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
- * @generated
- */
- public T caseFaceletTaglibTagComponentExtension(FaceletTaglibTagComponentExtension object)
- {
- return null;
- }
-
- /**
- * Returns the result of interpreting the object as an instance of '<em>Tag Component</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>Tag Component</em>'.
- * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
- * @generated
- */
- public T caseFaceletTaglibTagComponent(FaceletTaglibTagComponent object)
- {
- return null;
- }
-
- /**
- * Returns the result of interpreting the object as an instance of '<em>Tag Converter Extension</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>Tag Converter Extension</em>'.
- * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
- * @generated
- */
- public T caseFaceletTaglibTagConverterExtension(FaceletTaglibTagConverterExtension object)
- {
- return null;
- }
-
- /**
- * Returns the result of interpreting the object as an instance of '<em>Tag Converter</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>Tag Converter</em>'.
- * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
- * @generated
- */
- public T caseFaceletTaglibTagConverter(FaceletTaglibTagConverter object)
- {
- return null;
- }
-
- /**
- * Returns the result of interpreting the object as an instance of '<em>Tag Extension</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>Tag Extension</em>'.
- * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
- * @generated
- */
- public T caseFaceletTaglibTagExtension(FaceletTaglibTagExtension object)
- {
- return null;
- }
-
- /**
- * Returns the result of interpreting the object as an instance of '<em>Tag</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>Tag</em>'.
- * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
- * @generated
- */
- public T caseFaceletTaglibTag(FaceletTaglibTag object)
- {
- return null;
- }
-
- /**
- * Returns the result of interpreting the object as an instance of '<em>Tag Validator Extension</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>Tag Validator Extension</em>'.
- * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
- * @generated
- */
- public T caseFaceletTaglibTagValidatorExtension(FaceletTaglibTagValidatorExtension object)
- {
- return null;
- }
-
- /**
- * Returns the result of interpreting the object as an instance of '<em>Tag Validator</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>Tag Validator</em>'.
- * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
- * @generated
- */
- public T caseFaceletTaglibTagValidator(FaceletTaglibTagValidator object)
- {
- return null;
- }
-
- /**
- * Returns the result of interpreting the object as an instance of '<em>Facelet Taglib</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>Facelet Taglib</em>'.
- * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
- * @generated
- */
- public T caseFaceletTaglib(FaceletTaglib object)
- {
- return null;
- }
-
- /**
- * Returns the result of interpreting the object as an instance of '<em>Fully Qualified Class</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>Fully Qualified Class</em>'.
- * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
- * @generated
- */
- public T caseFullyQualifiedClass(FullyQualifiedClass object)
- {
- return null;
- }
-
- /**
- * Returns the result of interpreting the object as an instance of '<em>Generic Boolean</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>Generic Boolean</em>'.
- * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
- * @generated
- */
- public T caseGenericBoolean(GenericBoolean object)
- {
- return null;
- }
-
- /**
- * Returns the result of interpreting the object as an instance of '<em>Icon</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>Icon</em>'.
- * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
- * @generated
- */
- public T caseIcon(Icon object)
- {
- return null;
- }
-
- /**
- * Returns the result of interpreting the object as an instance of '<em>Java Identifier</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>Java Identifier</em>'.
- * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
- * @generated
- */
- public T caseJavaIdentifier(JavaIdentifier object)
- {
- return null;
- }
-
- /**
- * Returns the result of interpreting the object as an instance of '<em>Path</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>Path</em>'.
- * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
- * @generated
- */
- public T casePath(Path object)
- {
- return null;
- }
-
- /**
- * Returns the result of interpreting the object as an instance of '<em>Identifiable String Value</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>Identifiable String Value</em>'.
- * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
- * @generated
- */
- public T caseIdentifiableStringValue(IdentifiableStringValue object)
- {
- return null;
- }
-
- /**
- * Returns the result of interpreting the object as an instance of '<em>Identifiable Lang String Value</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>Identifiable Lang String Value</em>'.
- * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
- * @generated
- */
- public T caseIdentifiableLangStringValue(IdentifiableLangStringValue object)
- {
- return null;
- }
-
- /**
- * Returns the result of interpreting the object as an instance of '<em>User Visible Taglib Object</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>User Visible Taglib Object</em>'.
- * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
- * @generated
- */
- public T caseUserVisibleTaglibObject(UserVisibleTaglibObject 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 T defaultCase(EObject object)
- {
- return null;
- }
-
-} //FaceletTaglibSwitch
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib/util/FaceletTaglibValidator.java b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib/util/FaceletTaglibValidator.java
deleted file mode 100644
index 2faf923..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib/util/FaceletTaglibValidator.java
+++ /dev/null
@@ -1,698 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: FaceletTaglibValidator.java,v 1.1 2010/03/18 06:24:40 cbateman Exp $
- */
-package org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.util;
-
-import java.util.Map;
-
-import org.eclipse.emf.common.util.DiagnosticChain;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.util.EObjectValidator;
-import org.eclipse.emf.ecore.xml.type.util.XMLTypeUtil;
-import org.eclipse.emf.ecore.xml.type.util.XMLTypeValidator;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.Description;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.DisplayName;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.DocumentRoot;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglib;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibCanonicalName;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibExtension;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibFunction;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibPackage;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTag;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagAttribute;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagBehavior;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagBehaviorExtension;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagComponent;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagComponentExtension;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagConverter;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagConverterExtension;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagExtension;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagValidator;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagValidatorExtension;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibVersion;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FullyQualifiedClass;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.GenericBoolean;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.GenericBooleanBase;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.Icon;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.IdentifiableLangStringValue;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.IdentifiableStringValue;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.JavaIdentifier;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.Path;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.UserVisibleTaglibObject;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Validator</b> for the model.
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibPackage
- * @generated
- */
-public class FaceletTaglibValidator extends EObjectValidator
-{
- /**
- * The cached model package
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @SuppressWarnings("hiding")
- public static final FaceletTaglibValidator INSTANCE = new FaceletTaglibValidator();
-
- /**
- * A constant for the {@link org.eclipse.emf.common.util.Diagnostic#getSource() source} of diagnostic {@link org.eclipse.emf.common.util.Diagnostic#getCode() codes} from this package.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.emf.common.util.Diagnostic#getSource()
- * @see org.eclipse.emf.common.util.Diagnostic#getCode()
- * @generated
- */
- @SuppressWarnings("hiding")
- public static final String DIAGNOSTIC_SOURCE = "org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib"; //$NON-NLS-1$
-
- /**
- * A constant with a fixed name that can be used as the base value for additional hand written constants.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private static final int GENERATED_DIAGNOSTIC_CODE_COUNT = 0;
-
- /**
- * A constant with a fixed name that can be used as the base value for additional hand written constants in a derived class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected static final int DIAGNOSTIC_CODE_COUNT = GENERATED_DIAGNOSTIC_CODE_COUNT;
-
- /**
- * The cached base package validator.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected XMLTypeValidator xmlTypeValidator;
-
- /**
- * Creates an instance of the switch.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public FaceletTaglibValidator()
- {
- super();
- xmlTypeValidator = XMLTypeValidator.INSTANCE;
- }
-
- /**
- * Returns the package of this validator switch.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- protected EPackage getEPackage()
- {
- return FaceletTaglibPackage.eINSTANCE;
- }
-
- /**
- * Calls <code>validateXXX</code> for the corresponding classifier of the model.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- protected boolean validate(int classifierID, Object value, DiagnosticChain diagnostics, Map<Object, Object> context)
- {
- switch (classifierID)
- {
- case FaceletTaglibPackage.DESCRIPTION:
- return validateDescription((Description)value, diagnostics, context);
- case FaceletTaglibPackage.DISPLAY_NAME:
- return validateDisplayName((DisplayName)value, diagnostics, context);
- case FaceletTaglibPackage.DOCUMENT_ROOT:
- return validateDocumentRoot((DocumentRoot)value, diagnostics, context);
- case FaceletTaglibPackage.FACELET_TAGLIB_CANONICAL_NAME:
- return validateFaceletTaglibCanonicalName((FaceletTaglibCanonicalName)value, diagnostics, context);
- case FaceletTaglibPackage.FACELET_TAGLIB_EXTENSION:
- return validateFaceletTaglibExtension((FaceletTaglibExtension)value, diagnostics, context);
- case FaceletTaglibPackage.FACELET_TAGLIB_FUNCTION:
- return validateFaceletTaglibFunction((FaceletTaglibFunction)value, diagnostics, context);
- case FaceletTaglibPackage.FACELET_TAGLIB_TAG_ATTRIBUTE:
- return validateFaceletTaglibTagAttribute((FaceletTaglibTagAttribute)value, diagnostics, context);
- case FaceletTaglibPackage.FACELET_TAGLIB_TAG_BEHAVIOR_EXTENSION:
- return validateFaceletTaglibTagBehaviorExtension((FaceletTaglibTagBehaviorExtension)value, diagnostics, context);
- case FaceletTaglibPackage.FACELET_TAGLIB_TAG_BEHAVIOR:
- return validateFaceletTaglibTagBehavior((FaceletTaglibTagBehavior)value, diagnostics, context);
- case FaceletTaglibPackage.FACELET_TAGLIB_TAG_COMPONENT_EXTENSION:
- return validateFaceletTaglibTagComponentExtension((FaceletTaglibTagComponentExtension)value, diagnostics, context);
- case FaceletTaglibPackage.FACELET_TAGLIB_TAG_COMPONENT:
- return validateFaceletTaglibTagComponent((FaceletTaglibTagComponent)value, diagnostics, context);
- case FaceletTaglibPackage.FACELET_TAGLIB_TAG_CONVERTER_EXTENSION:
- return validateFaceletTaglibTagConverterExtension((FaceletTaglibTagConverterExtension)value, diagnostics, context);
- case FaceletTaglibPackage.FACELET_TAGLIB_TAG_CONVERTER:
- return validateFaceletTaglibTagConverter((FaceletTaglibTagConverter)value, diagnostics, context);
- case FaceletTaglibPackage.FACELET_TAGLIB_TAG_EXTENSION:
- return validateFaceletTaglibTagExtension((FaceletTaglibTagExtension)value, diagnostics, context);
- case FaceletTaglibPackage.FACELET_TAGLIB_TAG:
- return validateFaceletTaglibTag((FaceletTaglibTag)value, diagnostics, context);
- case FaceletTaglibPackage.FACELET_TAGLIB_TAG_VALIDATOR_EXTENSION:
- return validateFaceletTaglibTagValidatorExtension((FaceletTaglibTagValidatorExtension)value, diagnostics, context);
- case FaceletTaglibPackage.FACELET_TAGLIB_TAG_VALIDATOR:
- return validateFaceletTaglibTagValidator((FaceletTaglibTagValidator)value, diagnostics, context);
- case FaceletTaglibPackage.FACELET_TAGLIB:
- return validateFaceletTaglib((FaceletTaglib)value, diagnostics, context);
- case FaceletTaglibPackage.FULLY_QUALIFIED_CLASS:
- return validateFullyQualifiedClass((FullyQualifiedClass)value, diagnostics, context);
- case FaceletTaglibPackage.GENERIC_BOOLEAN:
- return validateGenericBoolean((GenericBoolean)value, diagnostics, context);
- case FaceletTaglibPackage.ICON:
- return validateIcon((Icon)value, diagnostics, context);
- case FaceletTaglibPackage.JAVA_IDENTIFIER:
- return validateJavaIdentifier((JavaIdentifier)value, diagnostics, context);
- case FaceletTaglibPackage.PATH:
- return validatePath((Path)value, diagnostics, context);
- case FaceletTaglibPackage.IDENTIFIABLE_STRING_VALUE:
- return validateIdentifiableStringValue((IdentifiableStringValue)value, diagnostics, context);
- case FaceletTaglibPackage.IDENTIFIABLE_LANG_STRING_VALUE:
- return validateIdentifiableLangStringValue((IdentifiableLangStringValue)value, diagnostics, context);
- case FaceletTaglibPackage.USER_VISIBLE_TAGLIB_OBJECT:
- return validateUserVisibleTaglibObject((UserVisibleTaglibObject)value, diagnostics, context);
- case FaceletTaglibPackage.FACELET_TAGLIB_VERSION:
- return validateFaceletTaglibVersion((FaceletTaglibVersion)value, diagnostics, context);
- case FaceletTaglibPackage.GENERIC_BOOLEAN_BASE:
- return validateGenericBooleanBase((GenericBooleanBase)value, diagnostics, context);
- case FaceletTaglibPackage.FACELET_TAGLIB_VERSION_TYPE_OBJECT:
- return validateFaceletTaglibVersionTypeObject((FaceletTaglibVersion)value, diagnostics, context);
- case FaceletTaglibPackage.FULLY_QUALIFIED_CLASS_BASE:
- return validateFullyQualifiedClassBase((String)value, diagnostics, context);
- case FaceletTaglibPackage.JAVA_IDENTIFIER_BASE:
- return validateJavaIdentifierBase((String)value, diagnostics, context);
- case FaceletTaglibPackage.PATH_TYPE_BASE:
- return validatePathTypeBase((String)value, diagnostics, context);
- default:
- return true;
- }
- }
-
- /**
- * <!-- begin-user-doc -->
- * @param description
- * @param diagnostics
- * @param context
- * @return
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean validateDescription(Description description, DiagnosticChain diagnostics, Map<Object, Object> context)
- {
- return validate_EveryDefaultConstraint(description, diagnostics, context);
- }
-
- /**
- * <!-- begin-user-doc -->
- * @param displayName
- * @param diagnostics
- * @param context
- * @return
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean validateDisplayName(DisplayName displayName, DiagnosticChain diagnostics, Map<Object, Object> context)
- {
- return validate_EveryDefaultConstraint(displayName, diagnostics, context);
- }
-
- /**
- * <!-- begin-user-doc -->
- * @param documentRoot
- * @param diagnostics
- * @param context
- * @return
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean validateDocumentRoot(DocumentRoot documentRoot, DiagnosticChain diagnostics, Map<Object, Object> context)
- {
- return validate_EveryDefaultConstraint(documentRoot, diagnostics, context);
- }
-
- /**
- * <!-- begin-user-doc -->
- * @param faceletTaglibCanonicalName
- * @param diagnostics
- * @param context
- * @return
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean validateFaceletTaglibCanonicalName(FaceletTaglibCanonicalName faceletTaglibCanonicalName, DiagnosticChain diagnostics, Map<Object, Object> context)
- {
- return validate_EveryDefaultConstraint(faceletTaglibCanonicalName, diagnostics, context);
- }
-
- /**
- * <!-- begin-user-doc -->
- * @param faceletTaglibExtension
- * @param diagnostics
- * @param context
- * @return
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean validateFaceletTaglibExtension(FaceletTaglibExtension faceletTaglibExtension, DiagnosticChain diagnostics, Map<Object, Object> context)
- {
- return validate_EveryDefaultConstraint(faceletTaglibExtension, diagnostics, context);
- }
-
- /**
- * <!-- begin-user-doc -->
- * @param faceletTaglibFunction
- * @param diagnostics
- * @param context
- * @return
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean validateFaceletTaglibFunction(FaceletTaglibFunction faceletTaglibFunction, DiagnosticChain diagnostics, Map<Object, Object> context)
- {
- return validate_EveryDefaultConstraint(faceletTaglibFunction, diagnostics, context);
- }
-
- /**
- * <!-- begin-user-doc -->
- * @param faceletTaglibTagAttribute
- * @param diagnostics
- * @param context
- * @return
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean validateFaceletTaglibTagAttribute(FaceletTaglibTagAttribute faceletTaglibTagAttribute, DiagnosticChain diagnostics, Map<Object, Object> context)
- {
- return validate_EveryDefaultConstraint(faceletTaglibTagAttribute, diagnostics, context);
- }
-
- /**
- * <!-- begin-user-doc -->
- * @param faceletTaglibTagBehaviorExtension
- * @param diagnostics
- * @param context
- * @return
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean validateFaceletTaglibTagBehaviorExtension(FaceletTaglibTagBehaviorExtension faceletTaglibTagBehaviorExtension, DiagnosticChain diagnostics, Map<Object, Object> context)
- {
- return validate_EveryDefaultConstraint(faceletTaglibTagBehaviorExtension, diagnostics, context);
- }
-
- /**
- * <!-- begin-user-doc -->
- * @param faceletTaglibTagBehavior
- * @param diagnostics
- * @param context
- * @return
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean validateFaceletTaglibTagBehavior(FaceletTaglibTagBehavior faceletTaglibTagBehavior, DiagnosticChain diagnostics, Map<Object, Object> context)
- {
- return validate_EveryDefaultConstraint(faceletTaglibTagBehavior, diagnostics, context);
- }
-
- /**
- * <!-- begin-user-doc -->
- * @param faceletTaglibTagComponentExtension
- * @param diagnostics
- * @param context
- * @return
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean validateFaceletTaglibTagComponentExtension(FaceletTaglibTagComponentExtension faceletTaglibTagComponentExtension, DiagnosticChain diagnostics, Map<Object, Object> context)
- {
- return validate_EveryDefaultConstraint(faceletTaglibTagComponentExtension, diagnostics, context);
- }
-
- /**
- * <!-- begin-user-doc -->
- * @param faceletTaglibTagComponent
- * @param diagnostics
- * @param context
- * @return
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean validateFaceletTaglibTagComponent(FaceletTaglibTagComponent faceletTaglibTagComponent, DiagnosticChain diagnostics, Map<Object, Object> context)
- {
- return validate_EveryDefaultConstraint(faceletTaglibTagComponent, diagnostics, context);
- }
-
- /**
- * <!-- begin-user-doc -->
- * @param faceletTaglibTagConverterExtension
- * @param diagnostics
- * @param context
- * @return
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean validateFaceletTaglibTagConverterExtension(FaceletTaglibTagConverterExtension faceletTaglibTagConverterExtension, DiagnosticChain diagnostics, Map<Object, Object> context)
- {
- return validate_EveryDefaultConstraint(faceletTaglibTagConverterExtension, diagnostics, context);
- }
-
- /**
- * <!-- begin-user-doc -->
- * @param faceletTaglibTagConverter
- * @param diagnostics
- * @param context
- * @return
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean validateFaceletTaglibTagConverter(FaceletTaglibTagConverter faceletTaglibTagConverter, DiagnosticChain diagnostics, Map<Object, Object> context)
- {
- return validate_EveryDefaultConstraint(faceletTaglibTagConverter, diagnostics, context);
- }
-
- /**
- * <!-- begin-user-doc -->
- * @param faceletTaglibTagExtension
- * @param diagnostics
- * @param context
- * @return
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean validateFaceletTaglibTagExtension(FaceletTaglibTagExtension faceletTaglibTagExtension, DiagnosticChain diagnostics, Map<Object, Object> context)
- {
- return validate_EveryDefaultConstraint(faceletTaglibTagExtension, diagnostics, context);
- }
-
- /**
- * <!-- begin-user-doc -->
- * @param faceletTaglibTag
- * @param diagnostics
- * @param context
- * @return
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean validateFaceletTaglibTag(FaceletTaglibTag faceletTaglibTag, DiagnosticChain diagnostics, Map<Object, Object> context)
- {
- return validate_EveryDefaultConstraint(faceletTaglibTag, diagnostics, context);
- }
-
- /**
- * <!-- begin-user-doc -->
- * @param faceletTaglibTagValidatorExtension
- * @param diagnostics
- * @param context
- * @return
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean validateFaceletTaglibTagValidatorExtension(FaceletTaglibTagValidatorExtension faceletTaglibTagValidatorExtension, DiagnosticChain diagnostics, Map<Object, Object> context)
- {
- return validate_EveryDefaultConstraint(faceletTaglibTagValidatorExtension, diagnostics, context);
- }
-
- /**
- * <!-- begin-user-doc -->
- * @param faceletTaglibTagValidator
- * @param diagnostics
- * @param context
- * @return
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean validateFaceletTaglibTagValidator(FaceletTaglibTagValidator faceletTaglibTagValidator, DiagnosticChain diagnostics, Map<Object, Object> context)
- {
- return validate_EveryDefaultConstraint(faceletTaglibTagValidator, diagnostics, context);
- }
-
- /**
- * <!-- begin-user-doc -->
- * @param faceletTaglib
- * @param diagnostics
- * @param context
- * @return
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean validateFaceletTaglib(FaceletTaglib faceletTaglib, DiagnosticChain diagnostics, Map<Object, Object> context)
- {
- return validate_EveryDefaultConstraint(faceletTaglib, diagnostics, context);
- }
-
- /**
- * <!-- begin-user-doc -->
- * @param fullyQualifiedClass
- * @param diagnostics
- * @param context
- * @return
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean validateFullyQualifiedClass(FullyQualifiedClass fullyQualifiedClass, DiagnosticChain diagnostics, Map<Object, Object> context)
- {
- return validate_EveryDefaultConstraint(fullyQualifiedClass, diagnostics, context);
- }
-
- /**
- * <!-- begin-user-doc -->
- * @param genericBoolean
- * @param diagnostics
- * @param context
- * @return
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean validateGenericBoolean(GenericBoolean genericBoolean, DiagnosticChain diagnostics, Map<Object, Object> context)
- {
- return validate_EveryDefaultConstraint(genericBoolean, diagnostics, context);
- }
-
- /**
- * <!-- begin-user-doc -->
- * @param icon
- * @param diagnostics
- * @param context
- * @return
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean validateIcon(Icon icon, DiagnosticChain diagnostics, Map<Object, Object> context)
- {
- return validate_EveryDefaultConstraint(icon, diagnostics, context);
- }
-
- /**
- * <!-- begin-user-doc -->
- * @param javaIdentifier
- * @param diagnostics
- * @param context
- * @return
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean validateJavaIdentifier(JavaIdentifier javaIdentifier, DiagnosticChain diagnostics, Map<Object, Object> context)
- {
- return validate_EveryDefaultConstraint(javaIdentifier, diagnostics, context);
- }
-
- /**
- * <!-- begin-user-doc -->
- * @param path
- * @param diagnostics
- * @param context
- * @return
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean validatePath(Path path, DiagnosticChain diagnostics, Map<Object, Object> context)
- {
- return validate_EveryDefaultConstraint(path, diagnostics, context);
- }
-
- /**
- * <!-- begin-user-doc -->
- * @param identifiableStringValue
- * @param diagnostics
- * @param context
- * @return
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean validateIdentifiableStringValue(IdentifiableStringValue identifiableStringValue, DiagnosticChain diagnostics, Map<Object, Object> context)
- {
- return validate_EveryDefaultConstraint(identifiableStringValue, diagnostics, context);
- }
-
- /**
- * <!-- begin-user-doc -->
- * @param identifiableLangStringValue
- * @param diagnostics
- * @param context
- * @return
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean validateIdentifiableLangStringValue(IdentifiableLangStringValue identifiableLangStringValue, DiagnosticChain diagnostics, Map<Object, Object> context)
- {
- return validate_EveryDefaultConstraint(identifiableLangStringValue, diagnostics, context);
- }
-
- /**
- * <!-- begin-user-doc -->
- * @param userVisibleTaglibObject
- * @param diagnostics
- * @param context
- * @return
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean validateUserVisibleTaglibObject(UserVisibleTaglibObject userVisibleTaglibObject, DiagnosticChain diagnostics, Map<Object, Object> context)
- {
- return validate_EveryDefaultConstraint(userVisibleTaglibObject, diagnostics, context);
- }
-
- /**
- * <!-- begin-user-doc -->
- * @param faceletTaglibVersion
- * @param diagnostics
- * @param context
- * @return
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean validateFaceletTaglibVersion(FaceletTaglibVersion faceletTaglibVersion, DiagnosticChain diagnostics, Map<Object, Object> context)
- {
- return true;
- }
-
- /**
- * <!-- begin-user-doc -->
- * @param genericBooleanBase
- * @param diagnostics
- * @param context
- * @return
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean validateGenericBooleanBase(GenericBooleanBase genericBooleanBase, DiagnosticChain diagnostics, Map<Object, Object> context)
- {
- return true;
- }
-
- /**
- * <!-- begin-user-doc -->
- * @param faceletTaglibVersionTypeObject
- * @param diagnostics
- * @param context
- * @return
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean validateFaceletTaglibVersionTypeObject(FaceletTaglibVersion faceletTaglibVersionTypeObject, DiagnosticChain diagnostics, Map<Object, Object> context)
- {
- return true;
- }
-
- /**
- * <!-- begin-user-doc -->
- * @param fullyQualifiedClassBase
- * @param diagnostics
- * @param context
- * @return
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean validateFullyQualifiedClassBase(String fullyQualifiedClassBase, DiagnosticChain diagnostics, Map<Object, Object> context)
- {
- return true;
- }
-
- /**
- * <!-- begin-user-doc -->
- * @param javaIdentifierBase
- * @param diagnostics
- * @param context
- * @return
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean validateJavaIdentifierBase(String javaIdentifierBase, DiagnosticChain diagnostics, Map<Object, Object> context)
- {
- boolean result = validateJavaIdentifierBase_Pattern(javaIdentifierBase, diagnostics, context);
- return result;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @see #validateJavaIdentifierBase_Pattern
- */
- public static final PatternMatcher [][] JAVA_IDENTIFIER_BASE__PATTERN__VALUES =
- new PatternMatcher [][]
- {
- new PatternMatcher []
- {
- XMLTypeUtil.createPatternMatcher("($|_|\\p{L})(\\p{L}|\\p{Nd}|_|$)*") //$NON-NLS-1$
- }
- };
-
- /**
- * Validates the Pattern constraint of '<em>Java Identifier Base</em>'.
- * <!-- begin-user-doc -->
- * @param javaIdentifierBase
- * @param diagnostics
- * @param context
- * @return
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean validateJavaIdentifierBase_Pattern(String javaIdentifierBase, DiagnosticChain diagnostics, Map<Object, Object> context)
- {
- return validatePattern(FaceletTaglibPackage.Literals.JAVA_IDENTIFIER_BASE, javaIdentifierBase, JAVA_IDENTIFIER_BASE__PATTERN__VALUES, diagnostics, context);
- }
-
- /**
- * <!-- begin-user-doc -->
- * @param pathTypeBase
- * @param diagnostics
- * @param context
- * @return
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean validatePathTypeBase(String pathTypeBase, DiagnosticChain diagnostics, Map<Object, Object> context)
- {
- return true;
- }
-
- /**
- * Returns the resource locator that will be used to fetch messages for this validator's diagnostics.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public ResourceLocator getResourceLocator()
- {
- // TODO
- // Specialize this to return a resource locator for messages specific to this validator.
- // Ensure that you remove @generated or mark it @generated NOT
- return super.getResourceLocator();
- }
-
-} //FaceletTaglibValidator
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib/util/FaceletTaglibXMLProcessor.java b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib/util/FaceletTaglibXMLProcessor.java
deleted file mode 100644
index 0e962dd..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib/util/FaceletTaglibXMLProcessor.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: FaceletTaglibXMLProcessor.java,v 1.1 2010/03/18 06:24:40 cbateman Exp $
- */
-package org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.util;
-
-import java.util.Map;
-
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.xmi.util.XMLProcessor;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibPackage;
-
-/**
- * This class contains helper methods to serialize and deserialize XML documents
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class FaceletTaglibXMLProcessor extends XMLProcessor
-{
-
- /**
- * Public constructor to instantiate the helper.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public FaceletTaglibXMLProcessor()
- {
- super((EPackage.Registry.INSTANCE));
- FaceletTaglibPackage.eINSTANCE.eClass();
- }
-
- /**
- * Register for "*" and "xml" file extensions the FaceletTaglibResourceFactoryImpl factory.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- protected Map<String, Resource.Factory> getRegistrations()
- {
- if (registrations == null)
- {
- super.getRegistrations();
- registrations.put(XML_EXTENSION, new FaceletTaglibResourceFactoryImpl());
- registrations.put(STAR_EXTENSION, new FaceletTaglibResourceFactoryImpl());
- }
- return registrations;
- }
-
-} //FaceletTaglibXMLProcessor
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib_1_0/ComponentTagDefn.java b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib_1_0/ComponentTagDefn.java
deleted file mode 100644
index 73816dd..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib_1_0/ComponentTagDefn.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: ComponentTagDefn.java,v 1.1 2010/03/18 06:24:40 cbateman Exp $
- */
-package org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Component Tag Defn</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- * <li>{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.ComponentTagDefn#getComponentType <em>Component Type</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.ComponentTagDefn#getRendererType <em>Renderer Type</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.FaceletTaglib_1_0Package#getComponentTagDefn()
- * @model
- * @generated
- */
-public interface ComponentTagDefn extends HandlerTagDefn
-{
- /**
- * Returns the value of the '<em><b>Component Type</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Component Type</em>' attribute isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @return the value of the '<em>Component Type</em>' attribute.
- * @see #setComponentType(String)
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.FaceletTaglib_1_0Package#getComponentTagDefn_ComponentType()
- * @model
- * @generated
- */
- String getComponentType();
-
- /**
- * Sets the value of the '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.ComponentTagDefn#getComponentType <em>Component Type</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Component Type</em>' attribute.
- * @see #getComponentType()
- * @generated
- */
- void setComponentType(String value);
-
- /**
- * Returns the value of the '<em><b>Renderer Type</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Renderer Type</em>' attribute isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @return the value of the '<em>Renderer Type</em>' attribute.
- * @see #setRendererType(String)
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.FaceletTaglib_1_0Package#getComponentTagDefn_RendererType()
- * @model
- * @generated
- */
- String getRendererType();
-
- /**
- * Sets the value of the '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.ComponentTagDefn#getRendererType <em>Renderer Type</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Renderer Type</em>' attribute.
- * @see #getRendererType()
- * @generated
- */
- void setRendererType(String value);
-
-} // ComponentTagDefn
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib_1_0/ConverterTagDefn.java b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib_1_0/ConverterTagDefn.java
deleted file mode 100644
index 82ac3e8..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib_1_0/ConverterTagDefn.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: ConverterTagDefn.java,v 1.1 2010/03/18 06:24:40 cbateman Exp $
- */
-package org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Converter Tag Defn</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- * <li>{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.ConverterTagDefn#getConverterId <em>Converter Id</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.FaceletTaglib_1_0Package#getConverterTagDefn()
- * @model
- * @generated
- */
-public interface ConverterTagDefn extends HandlerTagDefn
-{
- /**
- * Returns the value of the '<em><b>Converter Id</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Converter Id</em>' attribute isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @return the value of the '<em>Converter Id</em>' attribute.
- * @see #setConverterId(String)
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.FaceletTaglib_1_0Package#getConverterTagDefn_ConverterId()
- * @model
- * @generated
- */
- String getConverterId();
-
- /**
- * Sets the value of the '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.ConverterTagDefn#getConverterId <em>Converter Id</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Converter Id</em>' attribute.
- * @see #getConverterId()
- * @generated
- */
- void setConverterId(String value);
-
-} // ConverterTagDefn
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib_1_0/FaceletLibraryClassTagLib.java b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib_1_0/FaceletLibraryClassTagLib.java
deleted file mode 100644
index c56fffa..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib_1_0/FaceletLibraryClassTagLib.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: FaceletLibraryClassTagLib.java,v 1.1 2010/03/18 06:24:40 cbateman Exp $
- */
-package org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Facelet Library Class Tag Lib</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- * <li>{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.FaceletLibraryClassTagLib#getLibraryClass <em>Library Class</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.FaceletTaglib_1_0Package#getFaceletLibraryClassTagLib()
- * @model
- * @generated
- */
-public interface FaceletLibraryClassTagLib extends FaceletTaglibDefn
-{
- /**
- * Returns the value of the '<em><b>Library Class</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Library Class</em>' attribute isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @return the value of the '<em>Library Class</em>' attribute.
- * @see #setLibraryClass(String)
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.FaceletTaglib_1_0Package#getFaceletLibraryClassTagLib_LibraryClass()
- * @model
- * @generated
- */
- String getLibraryClass();
-
- /**
- * Sets the value of the '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.FaceletLibraryClassTagLib#getLibraryClass <em>Library Class</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Library Class</em>' attribute.
- * @see #getLibraryClass()
- * @generated
- */
- void setLibraryClass(String value);
-
-} // FaceletLibraryClassTagLib
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib_1_0/FaceletTaglibDefn.java b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib_1_0/FaceletTaglibDefn.java
deleted file mode 100644
index 2acac15..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib_1_0/FaceletTaglibDefn.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: FaceletTaglibDefn.java,v 1.1 2010/03/18 06:24:40 cbateman Exp $
- */
-package org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Defn</b></em>'.
- * <!-- end-user-doc -->
- *
- *
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.FaceletTaglib_1_0Package#getFaceletTaglibDefn()
- * @model
- * @generated
- */
-public interface FaceletTaglibDefn extends EObject
-{
- // nuthin'
-} // FaceletTaglibDefn
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib_1_0/FaceletTaglibFactory.java b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib_1_0/FaceletTaglibFactory.java
deleted file mode 100644
index 9d7b851..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib_1_0/FaceletTaglibFactory.java
+++ /dev/null
@@ -1,128 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: FaceletTaglibFactory.java,v 1.1 2010/03/18 06:24:40 cbateman Exp $
- */
-package org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0;
-
-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.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.FaceletTaglibPackage
- * @generated
- */
-public interface FaceletTaglibFactory extends EFactory
-{
- /**
- * The singleton instance of the factory.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- FaceletTaglibFactory eINSTANCE = org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.impl.FaceletTaglibFactoryImpl.init();
-
- /**
- * Returns a new object of class '<em>Facelet Library Class Tag Lib</em>'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return a new object of class '<em>Facelet Library Class Tag Lib</em>'.
- * @generated
- */
- FaceletLibraryClassTagLib createFaceletLibraryClassTagLib();
-
- /**
- * Returns a new object of class '<em>Facelet XML Defn Taglib</em>'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return a new object of class '<em>Facelet XML Defn Taglib</em>'.
- * @generated
- */
- FaceletXMLDefnTaglib createFaceletXMLDefnTaglib();
-
- /**
- * Returns a new object of class '<em>Defn</em>'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return a new object of class '<em>Defn</em>'.
- * @generated
- */
- FaceletTaglibDefn createFaceletTaglibDefn();
-
- /**
- * Returns a new object of class '<em>Component Tag Defn</em>'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return a new object of class '<em>Component Tag Defn</em>'.
- * @generated
- */
- ComponentTagDefn createComponentTagDefn();
-
- /**
- * Returns a new object of class '<em>Validator Tag Defn</em>'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return a new object of class '<em>Validator Tag Defn</em>'.
- * @generated
- */
- ValidatorTagDefn createValidatorTagDefn();
-
- /**
- * Returns a new object of class '<em>Converter Tag Defn</em>'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return a new object of class '<em>Converter Tag Defn</em>'.
- * @generated
- */
- ConverterTagDefn createConverterTagDefn();
-
- /**
- * Returns a new object of class '<em>Handler Tag Defn</em>'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return a new object of class '<em>Handler Tag Defn</em>'.
- * @generated
- */
- HandlerTagDefn createHandlerTagDefn();
-
- /**
- * Returns a new object of class '<em>Source Tag Defn</em>'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return a new object of class '<em>Source Tag Defn</em>'.
- * @generated
- */
- SourceTagDefn createSourceTagDefn();
-
- /**
- * Returns a new object of class '<em>Tag Defn</em>'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return a new object of class '<em>Tag Defn</em>'.
- * @generated
- */
- TagDefn createTagDefn();
-
- /**
- * Returns a new object of class '<em>Function Defn</em>'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return a new object of class '<em>Function Defn</em>'.
- * @generated
- */
- FunctionDefn createFunctionDefn();
-
- /**
- * Returns the package supported by this factory.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the package supported by this factory.
- * @generated
- */
- FaceletTaglibPackage getFaceletTaglibPackage();
-
-} //FaceletTaglibFactory
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib_1_0/FaceletTaglibPackage.java b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib_1_0/FaceletTaglibPackage.java
deleted file mode 100644
index 89e51e7..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib_1_0/FaceletTaglibPackage.java
+++ /dev/null
@@ -1,944 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: FaceletTaglibPackage.java,v 1.1 2010/03/18 06:24:40 cbateman Exp $
- */
-package org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0;
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EReference;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Package</b> for the model.
- * It contains accessors for the meta objects to represent
- * <ul>
- * <li>each class,</li>
- * <li>each feature of each class,</li>
- * <li>each enum,</li>
- * <li>and each data type</li>
- * </ul>
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.FaceletTaglibFactory
- * @model kind="package"
- * @generated
- */
-public interface FaceletTaglibPackage extends EPackage
-{
- /**
- * The package name.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- String eNAME = "faceletTaglib"; //$NON-NLS-1$
-
- /**
- * The package namespace URI.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- String eNS_URI = "http://org.eclipse.jst.jsf.facelet.core/faceletTaglib.ecore"; //$NON-NLS-1$
-
- /**
- * The package namespace name.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- String eNS_PREFIX = "faceletTaglib"; //$NON-NLS-1$
-
- /**
- * The singleton instance of the package.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- FaceletTaglibPackage eINSTANCE = org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.impl.FaceletTaglibPackageImpl.init();
-
- /**
- * The meta object id for the '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.impl.FaceletTaglibDefnImpl <em>Defn</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.impl.FaceletTaglibDefnImpl
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.impl.FaceletTaglibPackageImpl#getFaceletTaglibDefn()
- * @generated
- */
- int FACELET_TAGLIB_DEFN = 2;
-
- /**
- * The number of structural features of the '<em>Defn</em>' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int FACELET_TAGLIB_DEFN_FEATURE_COUNT = 0;
-
- /**
- * The meta object id for the '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.impl.FaceletLibraryClassTagLibImpl <em>Facelet Library Class Tag Lib</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.impl.FaceletLibraryClassTagLibImpl
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.impl.FaceletTaglibPackageImpl#getFaceletLibraryClassTagLib()
- * @generated
- */
- int FACELET_LIBRARY_CLASS_TAG_LIB = 0;
-
- /**
- * The feature id for the '<em><b>Library Class</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int FACELET_LIBRARY_CLASS_TAG_LIB__LIBRARY_CLASS = FACELET_TAGLIB_DEFN_FEATURE_COUNT + 0;
-
- /**
- * The number of structural features of the '<em>Facelet Library Class Tag Lib</em>' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int FACELET_LIBRARY_CLASS_TAG_LIB_FEATURE_COUNT = FACELET_TAGLIB_DEFN_FEATURE_COUNT + 1;
-
- /**
- * The meta object id for the '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.impl.FaceletXMLDefnTaglibImpl <em>Facelet XML Defn Taglib</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.impl.FaceletXMLDefnTaglibImpl
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.impl.FaceletTaglibPackageImpl#getFaceletXMLDefnTaglib()
- * @generated
- */
- int FACELET_XML_DEFN_TAGLIB = 1;
-
- /**
- * The feature id for the '<em><b>Namespace</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int FACELET_XML_DEFN_TAGLIB__NAMESPACE = FACELET_TAGLIB_DEFN_FEATURE_COUNT + 0;
-
- /**
- * The feature id for the '<em><b>Tags</b></em>' reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int FACELET_XML_DEFN_TAGLIB__TAGS = FACELET_TAGLIB_DEFN_FEATURE_COUNT + 1;
-
- /**
- * The feature id for the '<em><b>Functions</b></em>' reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int FACELET_XML_DEFN_TAGLIB__FUNCTIONS = FACELET_TAGLIB_DEFN_FEATURE_COUNT + 2;
-
- /**
- * The number of structural features of the '<em>Facelet XML Defn Taglib</em>' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int FACELET_XML_DEFN_TAGLIB_FEATURE_COUNT = FACELET_TAGLIB_DEFN_FEATURE_COUNT + 3;
-
- /**
- * The meta object id for the '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.impl.TagDefnImpl <em>Tag Defn</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.impl.TagDefnImpl
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.impl.FaceletTaglibPackageImpl#getTagDefn()
- * @generated
- */
- int TAG_DEFN = 8;
-
- /**
- * The feature id for the '<em><b>Name</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int TAG_DEFN__NAME = 0;
-
- /**
- * The number of structural features of the '<em>Tag Defn</em>' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int TAG_DEFN_FEATURE_COUNT = 1;
-
- /**
- * The meta object id for the '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.impl.HandlerTagDefnImpl <em>Handler Tag Defn</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.impl.HandlerTagDefnImpl
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.impl.FaceletTaglibPackageImpl#getHandlerTagDefn()
- * @generated
- */
- int HANDLER_TAG_DEFN = 6;
-
- /**
- * The feature id for the '<em><b>Name</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int HANDLER_TAG_DEFN__NAME = TAG_DEFN__NAME;
-
- /**
- * The feature id for the '<em><b>Handler Class</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int HANDLER_TAG_DEFN__HANDLER_CLASS = TAG_DEFN_FEATURE_COUNT + 0;
-
- /**
- * The number of structural features of the '<em>Handler Tag Defn</em>' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int HANDLER_TAG_DEFN_FEATURE_COUNT = TAG_DEFN_FEATURE_COUNT + 1;
-
- /**
- * The meta object id for the '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.impl.ComponentTagDefnImpl <em>Component Tag Defn</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.impl.ComponentTagDefnImpl
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.impl.FaceletTaglibPackageImpl#getComponentTagDefn()
- * @generated
- */
- int COMPONENT_TAG_DEFN = 3;
-
- /**
- * The feature id for the '<em><b>Name</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int COMPONENT_TAG_DEFN__NAME = HANDLER_TAG_DEFN__NAME;
-
- /**
- * The feature id for the '<em><b>Handler Class</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int COMPONENT_TAG_DEFN__HANDLER_CLASS = HANDLER_TAG_DEFN__HANDLER_CLASS;
-
- /**
- * The feature id for the '<em><b>Component Type</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int COMPONENT_TAG_DEFN__COMPONENT_TYPE = HANDLER_TAG_DEFN_FEATURE_COUNT + 0;
-
- /**
- * The feature id for the '<em><b>Renderer Type</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int COMPONENT_TAG_DEFN__RENDERER_TYPE = HANDLER_TAG_DEFN_FEATURE_COUNT + 1;
-
- /**
- * The number of structural features of the '<em>Component Tag Defn</em>' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int COMPONENT_TAG_DEFN_FEATURE_COUNT = HANDLER_TAG_DEFN_FEATURE_COUNT + 2;
-
- /**
- * The meta object id for the '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.impl.ValidatorTagDefnImpl <em>Validator Tag Defn</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.impl.ValidatorTagDefnImpl
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.impl.FaceletTaglibPackageImpl#getValidatorTagDefn()
- * @generated
- */
- int VALIDATOR_TAG_DEFN = 4;
-
- /**
- * The feature id for the '<em><b>Name</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int VALIDATOR_TAG_DEFN__NAME = HANDLER_TAG_DEFN__NAME;
-
- /**
- * The feature id for the '<em><b>Handler Class</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int VALIDATOR_TAG_DEFN__HANDLER_CLASS = HANDLER_TAG_DEFN__HANDLER_CLASS;
-
- /**
- * The feature id for the '<em><b>Validator Id</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int VALIDATOR_TAG_DEFN__VALIDATOR_ID = HANDLER_TAG_DEFN_FEATURE_COUNT + 0;
-
- /**
- * The number of structural features of the '<em>Validator Tag Defn</em>' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int VALIDATOR_TAG_DEFN_FEATURE_COUNT = HANDLER_TAG_DEFN_FEATURE_COUNT + 1;
-
- /**
- * The meta object id for the '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.impl.ConverterTagDefnImpl <em>Converter Tag Defn</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.impl.ConverterTagDefnImpl
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.impl.FaceletTaglibPackageImpl#getConverterTagDefn()
- * @generated
- */
- int CONVERTER_TAG_DEFN = 5;
-
- /**
- * The feature id for the '<em><b>Name</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int CONVERTER_TAG_DEFN__NAME = HANDLER_TAG_DEFN__NAME;
-
- /**
- * The feature id for the '<em><b>Handler Class</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int CONVERTER_TAG_DEFN__HANDLER_CLASS = HANDLER_TAG_DEFN__HANDLER_CLASS;
-
- /**
- * The feature id for the '<em><b>Converter Id</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int CONVERTER_TAG_DEFN__CONVERTER_ID = HANDLER_TAG_DEFN_FEATURE_COUNT + 0;
-
- /**
- * The number of structural features of the '<em>Converter Tag Defn</em>' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int CONVERTER_TAG_DEFN_FEATURE_COUNT = HANDLER_TAG_DEFN_FEATURE_COUNT + 1;
-
- /**
- * The meta object id for the '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.impl.SourceTagDefnImpl <em>Source Tag Defn</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.impl.SourceTagDefnImpl
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.impl.FaceletTaglibPackageImpl#getSourceTagDefn()
- * @generated
- */
- int SOURCE_TAG_DEFN = 7;
-
- /**
- * The feature id for the '<em><b>Name</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int SOURCE_TAG_DEFN__NAME = TAG_DEFN__NAME;
-
- /**
- * The feature id for the '<em><b>Source</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int SOURCE_TAG_DEFN__SOURCE = TAG_DEFN_FEATURE_COUNT + 0;
-
- /**
- * The number of structural features of the '<em>Source Tag Defn</em>' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int SOURCE_TAG_DEFN_FEATURE_COUNT = TAG_DEFN_FEATURE_COUNT + 1;
-
- /**
- * The meta object id for the '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.impl.FunctionDefnImpl <em>Function Defn</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.impl.FunctionDefnImpl
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.impl.FaceletTaglibPackageImpl#getFunctionDefn()
- * @generated
- */
- int FUNCTION_DEFN = 9;
-
- /**
- * The feature id for the '<em><b>Function Name</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int FUNCTION_DEFN__FUNCTION_NAME = 0;
-
- /**
- * The feature id for the '<em><b>Function Class</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int FUNCTION_DEFN__FUNCTION_CLASS = 1;
-
- /**
- * The feature id for the '<em><b>Function Signature</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int FUNCTION_DEFN__FUNCTION_SIGNATURE = 2;
-
- /**
- * The number of structural features of the '<em>Function Defn</em>' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int FUNCTION_DEFN_FEATURE_COUNT = 3;
-
-
- /**
- * Returns the meta object for class '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.FaceletLibraryClassTagLib <em>Facelet Library Class Tag Lib</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for class '<em>Facelet Library Class Tag Lib</em>'.
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.FaceletLibraryClassTagLib
- * @generated
- */
- EClass getFaceletLibraryClassTagLib();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.FaceletLibraryClassTagLib#getLibraryClass <em>Library Class</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Library Class</em>'.
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.FaceletLibraryClassTagLib#getLibraryClass()
- * @see #getFaceletLibraryClassTagLib()
- * @generated
- */
- EAttribute getFaceletLibraryClassTagLib_LibraryClass();
-
- /**
- * Returns the meta object for class '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.FaceletXMLDefnTaglib <em>Facelet XML Defn Taglib</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for class '<em>Facelet XML Defn Taglib</em>'.
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.FaceletXMLDefnTaglib
- * @generated
- */
- EClass getFaceletXMLDefnTaglib();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.FaceletXMLDefnTaglib#getNamespace <em>Namespace</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Namespace</em>'.
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.FaceletXMLDefnTaglib#getNamespace()
- * @see #getFaceletXMLDefnTaglib()
- * @generated
- */
- EAttribute getFaceletXMLDefnTaglib_Namespace();
-
- /**
- * Returns the meta object for the reference list '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.FaceletXMLDefnTaglib#getTags <em>Tags</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the reference list '<em>Tags</em>'.
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.FaceletXMLDefnTaglib#getTags()
- * @see #getFaceletXMLDefnTaglib()
- * @generated
- */
- EReference getFaceletXMLDefnTaglib_Tags();
-
- /**
- * Returns the meta object for the reference list '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.FaceletXMLDefnTaglib#getFunctions <em>Functions</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the reference list '<em>Functions</em>'.
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.FaceletXMLDefnTaglib#getFunctions()
- * @see #getFaceletXMLDefnTaglib()
- * @generated
- */
- EReference getFaceletXMLDefnTaglib_Functions();
-
- /**
- * Returns the meta object for class '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.FaceletTaglibDefn <em>Defn</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for class '<em>Defn</em>'.
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.FaceletTaglibDefn
- * @generated
- */
- EClass getFaceletTaglibDefn();
-
- /**
- * Returns the meta object for class '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.ComponentTagDefn <em>Component Tag Defn</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for class '<em>Component Tag Defn</em>'.
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.ComponentTagDefn
- * @generated
- */
- EClass getComponentTagDefn();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.ComponentTagDefn#getComponentType <em>Component Type</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Component Type</em>'.
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.ComponentTagDefn#getComponentType()
- * @see #getComponentTagDefn()
- * @generated
- */
- EAttribute getComponentTagDefn_ComponentType();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.ComponentTagDefn#getRendererType <em>Renderer Type</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Renderer Type</em>'.
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.ComponentTagDefn#getRendererType()
- * @see #getComponentTagDefn()
- * @generated
- */
- EAttribute getComponentTagDefn_RendererType();
-
- /**
- * Returns the meta object for class '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.ValidatorTagDefn <em>Validator Tag Defn</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for class '<em>Validator Tag Defn</em>'.
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.ValidatorTagDefn
- * @generated
- */
- EClass getValidatorTagDefn();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.ValidatorTagDefn#getValidatorId <em>Validator Id</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Validator Id</em>'.
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.ValidatorTagDefn#getValidatorId()
- * @see #getValidatorTagDefn()
- * @generated
- */
- EAttribute getValidatorTagDefn_ValidatorId();
-
- /**
- * Returns the meta object for class '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.ConverterTagDefn <em>Converter Tag Defn</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for class '<em>Converter Tag Defn</em>'.
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.ConverterTagDefn
- * @generated
- */
- EClass getConverterTagDefn();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.ConverterTagDefn#getConverterId <em>Converter Id</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Converter Id</em>'.
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.ConverterTagDefn#getConverterId()
- * @see #getConverterTagDefn()
- * @generated
- */
- EAttribute getConverterTagDefn_ConverterId();
-
- /**
- * Returns the meta object for class '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.HandlerTagDefn <em>Handler Tag Defn</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for class '<em>Handler Tag Defn</em>'.
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.HandlerTagDefn
- * @generated
- */
- EClass getHandlerTagDefn();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.HandlerTagDefn#getHandlerClass <em>Handler Class</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Handler Class</em>'.
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.HandlerTagDefn#getHandlerClass()
- * @see #getHandlerTagDefn()
- * @generated
- */
- EAttribute getHandlerTagDefn_HandlerClass();
-
- /**
- * Returns the meta object for class '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.SourceTagDefn <em>Source Tag Defn</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for class '<em>Source Tag Defn</em>'.
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.SourceTagDefn
- * @generated
- */
- EClass getSourceTagDefn();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.SourceTagDefn#getSource <em>Source</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Source</em>'.
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.SourceTagDefn#getSource()
- * @see #getSourceTagDefn()
- * @generated
- */
- EAttribute getSourceTagDefn_Source();
-
- /**
- * Returns the meta object for class '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.TagDefn <em>Tag Defn</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for class '<em>Tag Defn</em>'.
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.TagDefn
- * @generated
- */
- EClass getTagDefn();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.TagDefn#getName <em>Name</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Name</em>'.
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.TagDefn#getName()
- * @see #getTagDefn()
- * @generated
- */
- EAttribute getTagDefn_Name();
-
- /**
- * Returns the meta object for class '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.FunctionDefn <em>Function Defn</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for class '<em>Function Defn</em>'.
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.FunctionDefn
- * @generated
- */
- EClass getFunctionDefn();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.FunctionDefn#getFunctionName <em>Function Name</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Function Name</em>'.
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.FunctionDefn#getFunctionName()
- * @see #getFunctionDefn()
- * @generated
- */
- EAttribute getFunctionDefn_FunctionName();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.FunctionDefn#getFunctionClass <em>Function Class</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Function Class</em>'.
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.FunctionDefn#getFunctionClass()
- * @see #getFunctionDefn()
- * @generated
- */
- EAttribute getFunctionDefn_FunctionClass();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.FunctionDefn#getFunctionSignature <em>Function Signature</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Function Signature</em>'.
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.FunctionDefn#getFunctionSignature()
- * @see #getFunctionDefn()
- * @generated
- */
- EAttribute getFunctionDefn_FunctionSignature();
-
- /**
- * 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
- */
- FaceletTaglibFactory getFaceletTaglibFactory();
-
- /**
- * <!-- 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
- */
- @SuppressWarnings("hiding")
- interface Literals
- {
- /**
- * The meta object literal for the '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.impl.FaceletLibraryClassTagLibImpl <em>Facelet Library Class Tag Lib</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.impl.FaceletLibraryClassTagLibImpl
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.impl.FaceletTaglibPackageImpl#getFaceletLibraryClassTagLib()
- * @generated
- */
- EClass FACELET_LIBRARY_CLASS_TAG_LIB = eINSTANCE.getFaceletLibraryClassTagLib();
-
- /**
- * The meta object literal for the '<em><b>Library Class</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EAttribute FACELET_LIBRARY_CLASS_TAG_LIB__LIBRARY_CLASS = eINSTANCE.getFaceletLibraryClassTagLib_LibraryClass();
-
- /**
- * The meta object literal for the '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.impl.FaceletXMLDefnTaglibImpl <em>Facelet XML Defn Taglib</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.impl.FaceletXMLDefnTaglibImpl
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.impl.FaceletTaglibPackageImpl#getFaceletXMLDefnTaglib()
- * @generated
- */
- EClass FACELET_XML_DEFN_TAGLIB = eINSTANCE.getFaceletXMLDefnTaglib();
-
- /**
- * The meta object literal for the '<em><b>Namespace</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EAttribute FACELET_XML_DEFN_TAGLIB__NAMESPACE = eINSTANCE.getFaceletXMLDefnTaglib_Namespace();
-
- /**
- * The meta object literal for the '<em><b>Tags</b></em>' reference list feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EReference FACELET_XML_DEFN_TAGLIB__TAGS = eINSTANCE.getFaceletXMLDefnTaglib_Tags();
-
- /**
- * The meta object literal for the '<em><b>Functions</b></em>' reference list feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EReference FACELET_XML_DEFN_TAGLIB__FUNCTIONS = eINSTANCE.getFaceletXMLDefnTaglib_Functions();
-
- /**
- * The meta object literal for the '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.impl.FaceletTaglibDefnImpl <em>Defn</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.impl.FaceletTaglibDefnImpl
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.impl.FaceletTaglibPackageImpl#getFaceletTaglibDefn()
- * @generated
- */
- EClass FACELET_TAGLIB_DEFN = eINSTANCE.getFaceletTaglibDefn();
-
- /**
- * The meta object literal for the '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.impl.ComponentTagDefnImpl <em>Component Tag Defn</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.impl.ComponentTagDefnImpl
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.impl.FaceletTaglibPackageImpl#getComponentTagDefn()
- * @generated
- */
- EClass COMPONENT_TAG_DEFN = eINSTANCE.getComponentTagDefn();
-
- /**
- * The meta object literal for the '<em><b>Component Type</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EAttribute COMPONENT_TAG_DEFN__COMPONENT_TYPE = eINSTANCE.getComponentTagDefn_ComponentType();
-
- /**
- * The meta object literal for the '<em><b>Renderer Type</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EAttribute COMPONENT_TAG_DEFN__RENDERER_TYPE = eINSTANCE.getComponentTagDefn_RendererType();
-
- /**
- * The meta object literal for the '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.impl.ValidatorTagDefnImpl <em>Validator Tag Defn</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.impl.ValidatorTagDefnImpl
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.impl.FaceletTaglibPackageImpl#getValidatorTagDefn()
- * @generated
- */
- EClass VALIDATOR_TAG_DEFN = eINSTANCE.getValidatorTagDefn();
-
- /**
- * The meta object literal for the '<em><b>Validator Id</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EAttribute VALIDATOR_TAG_DEFN__VALIDATOR_ID = eINSTANCE.getValidatorTagDefn_ValidatorId();
-
- /**
- * The meta object literal for the '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.impl.ConverterTagDefnImpl <em>Converter Tag Defn</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.impl.ConverterTagDefnImpl
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.impl.FaceletTaglibPackageImpl#getConverterTagDefn()
- * @generated
- */
- EClass CONVERTER_TAG_DEFN = eINSTANCE.getConverterTagDefn();
-
- /**
- * The meta object literal for the '<em><b>Converter Id</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EAttribute CONVERTER_TAG_DEFN__CONVERTER_ID = eINSTANCE.getConverterTagDefn_ConverterId();
-
- /**
- * The meta object literal for the '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.impl.HandlerTagDefnImpl <em>Handler Tag Defn</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.impl.HandlerTagDefnImpl
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.impl.FaceletTaglibPackageImpl#getHandlerTagDefn()
- * @generated
- */
- EClass HANDLER_TAG_DEFN = eINSTANCE.getHandlerTagDefn();
-
- /**
- * The meta object literal for the '<em><b>Handler Class</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EAttribute HANDLER_TAG_DEFN__HANDLER_CLASS = eINSTANCE.getHandlerTagDefn_HandlerClass();
-
- /**
- * The meta object literal for the '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.impl.SourceTagDefnImpl <em>Source Tag Defn</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.impl.SourceTagDefnImpl
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.impl.FaceletTaglibPackageImpl#getSourceTagDefn()
- * @generated
- */
- EClass SOURCE_TAG_DEFN = eINSTANCE.getSourceTagDefn();
-
- /**
- * The meta object literal for the '<em><b>Source</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EAttribute SOURCE_TAG_DEFN__SOURCE = eINSTANCE.getSourceTagDefn_Source();
-
- /**
- * The meta object literal for the '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.impl.TagDefnImpl <em>Tag Defn</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.impl.TagDefnImpl
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.impl.FaceletTaglibPackageImpl#getTagDefn()
- * @generated
- */
- EClass TAG_DEFN = eINSTANCE.getTagDefn();
-
- /**
- * The meta object literal for the '<em><b>Name</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EAttribute TAG_DEFN__NAME = eINSTANCE.getTagDefn_Name();
-
- /**
- * The meta object literal for the '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.impl.FunctionDefnImpl <em>Function Defn</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.impl.FunctionDefnImpl
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.impl.FaceletTaglibPackageImpl#getFunctionDefn()
- * @generated
- */
- EClass FUNCTION_DEFN = eINSTANCE.getFunctionDefn();
-
- /**
- * The meta object literal for the '<em><b>Function Name</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EAttribute FUNCTION_DEFN__FUNCTION_NAME = eINSTANCE.getFunctionDefn_FunctionName();
-
- /**
- * The meta object literal for the '<em><b>Function Class</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EAttribute FUNCTION_DEFN__FUNCTION_CLASS = eINSTANCE.getFunctionDefn_FunctionClass();
-
- /**
- * The meta object literal for the '<em><b>Function Signature</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EAttribute FUNCTION_DEFN__FUNCTION_SIGNATURE = eINSTANCE.getFunctionDefn_FunctionSignature();
-
- }
-
-} //FaceletTaglibPackage
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib_1_0/FaceletTaglib_1_0Factory.java b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib_1_0/FaceletTaglib_1_0Factory.java
deleted file mode 100644
index 3ceb1eb..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib_1_0/FaceletTaglib_1_0Factory.java
+++ /dev/null
@@ -1,128 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: FaceletTaglib_1_0Factory.java,v 1.1 2010/03/18 06:24:39 cbateman Exp $
- */
-package org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0;
-
-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.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.FaceletTaglib_1_0Package
- * @generated
- */
-public interface FaceletTaglib_1_0Factory extends EFactory
-{
- /**
- * The singleton instance of the factory.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- FaceletTaglib_1_0Factory eINSTANCE = org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.impl.FaceletTaglib_1_0FactoryImpl.init();
-
- /**
- * Returns a new object of class '<em>Facelet Library Class Tag Lib</em>'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return a new object of class '<em>Facelet Library Class Tag Lib</em>'.
- * @generated
- */
- FaceletLibraryClassTagLib createFaceletLibraryClassTagLib();
-
- /**
- * Returns a new object of class '<em>Facelet XML Defn Taglib</em>'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return a new object of class '<em>Facelet XML Defn Taglib</em>'.
- * @generated
- */
- FaceletXMLDefnTaglib createFaceletXMLDefnTaglib();
-
- /**
- * Returns a new object of class '<em>Facelet Taglib Defn</em>'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return a new object of class '<em>Facelet Taglib Defn</em>'.
- * @generated
- */
- FaceletTaglibDefn createFaceletTaglibDefn();
-
- /**
- * Returns a new object of class '<em>Component Tag Defn</em>'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return a new object of class '<em>Component Tag Defn</em>'.
- * @generated
- */
- ComponentTagDefn createComponentTagDefn();
-
- /**
- * Returns a new object of class '<em>Validator Tag Defn</em>'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return a new object of class '<em>Validator Tag Defn</em>'.
- * @generated
- */
- ValidatorTagDefn createValidatorTagDefn();
-
- /**
- * Returns a new object of class '<em>Converter Tag Defn</em>'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return a new object of class '<em>Converter Tag Defn</em>'.
- * @generated
- */
- ConverterTagDefn createConverterTagDefn();
-
- /**
- * Returns a new object of class '<em>Handler Tag Defn</em>'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return a new object of class '<em>Handler Tag Defn</em>'.
- * @generated
- */
- HandlerTagDefn createHandlerTagDefn();
-
- /**
- * Returns a new object of class '<em>Source Tag Defn</em>'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return a new object of class '<em>Source Tag Defn</em>'.
- * @generated
- */
- SourceTagDefn createSourceTagDefn();
-
- /**
- * Returns a new object of class '<em>Tag Defn</em>'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return a new object of class '<em>Tag Defn</em>'.
- * @generated
- */
- TagDefn createTagDefn();
-
- /**
- * Returns a new object of class '<em>Function Defn</em>'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return a new object of class '<em>Function Defn</em>'.
- * @generated
- */
- FunctionDefn createFunctionDefn();
-
- /**
- * Returns the package supported by this factory.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the package supported by this factory.
- * @generated
- */
- FaceletTaglib_1_0Package getFaceletTaglib_1_0Package();
-
-} //FaceletTaglib_1_0Factory
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib_1_0/FaceletTaglib_1_0Package.java b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib_1_0/FaceletTaglib_1_0Package.java
deleted file mode 100644
index 5428931..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib_1_0/FaceletTaglib_1_0Package.java
+++ /dev/null
@@ -1,944 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: FaceletTaglib_1_0Package.java,v 1.1 2010/03/18 06:24:40 cbateman Exp $
- */
-package org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0;
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EReference;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Package</b> for the model.
- * It contains accessors for the meta objects to represent
- * <ul>
- * <li>each class,</li>
- * <li>each feature of each class,</li>
- * <li>each enum,</li>
- * <li>and each data type</li>
- * </ul>
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.FaceletTaglib_1_0Factory
- * @model kind="package"
- * @generated
- */
-public interface FaceletTaglib_1_0Package extends EPackage
-{
- /**
- * The package name.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- String eNAME = "faceletTaglib_1_0"; //$NON-NLS-1$
-
- /**
- * The package namespace URI.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- String eNS_URI = "http://org.eclipse.jst.jsf.facelet.core/faceletTaglib_1_0"; //$NON-NLS-1$
-
- /**
- * The package namespace name.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- String eNS_PREFIX = "faceletTaglib_1_0"; //$NON-NLS-1$
-
- /**
- * The singleton instance of the package.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- FaceletTaglib_1_0Package eINSTANCE = org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.impl.FaceletTaglib_1_0PackageImpl.init();
-
- /**
- * The meta object id for the '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.impl.FaceletTaglibDefnImpl <em>Facelet Taglib Defn</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.impl.FaceletTaglibDefnImpl
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.impl.FaceletTaglib_1_0PackageImpl#getFaceletTaglibDefn()
- * @generated
- */
- int FACELET_TAGLIB_DEFN = 2;
-
- /**
- * The number of structural features of the '<em>Facelet Taglib Defn</em>' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int FACELET_TAGLIB_DEFN_FEATURE_COUNT = 0;
-
- /**
- * The meta object id for the '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.impl.FaceletLibraryClassTagLibImpl <em>Facelet Library Class Tag Lib</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.impl.FaceletLibraryClassTagLibImpl
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.impl.FaceletTaglib_1_0PackageImpl#getFaceletLibraryClassTagLib()
- * @generated
- */
- int FACELET_LIBRARY_CLASS_TAG_LIB = 0;
-
- /**
- * The feature id for the '<em><b>Library Class</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int FACELET_LIBRARY_CLASS_TAG_LIB__LIBRARY_CLASS = FACELET_TAGLIB_DEFN_FEATURE_COUNT + 0;
-
- /**
- * The number of structural features of the '<em>Facelet Library Class Tag Lib</em>' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int FACELET_LIBRARY_CLASS_TAG_LIB_FEATURE_COUNT = FACELET_TAGLIB_DEFN_FEATURE_COUNT + 1;
-
- /**
- * The meta object id for the '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.impl.FaceletXMLDefnTaglibImpl <em>Facelet XML Defn Taglib</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.impl.FaceletXMLDefnTaglibImpl
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.impl.FaceletTaglib_1_0PackageImpl#getFaceletXMLDefnTaglib()
- * @generated
- */
- int FACELET_XML_DEFN_TAGLIB = 1;
-
- /**
- * The feature id for the '<em><b>Namespace</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int FACELET_XML_DEFN_TAGLIB__NAMESPACE = FACELET_TAGLIB_DEFN_FEATURE_COUNT + 0;
-
- /**
- * The feature id for the '<em><b>Tags</b></em>' reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int FACELET_XML_DEFN_TAGLIB__TAGS = FACELET_TAGLIB_DEFN_FEATURE_COUNT + 1;
-
- /**
- * The feature id for the '<em><b>Functions</b></em>' reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int FACELET_XML_DEFN_TAGLIB__FUNCTIONS = FACELET_TAGLIB_DEFN_FEATURE_COUNT + 2;
-
- /**
- * The number of structural features of the '<em>Facelet XML Defn Taglib</em>' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int FACELET_XML_DEFN_TAGLIB_FEATURE_COUNT = FACELET_TAGLIB_DEFN_FEATURE_COUNT + 3;
-
- /**
- * The meta object id for the '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.impl.TagDefnImpl <em>Tag Defn</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.impl.TagDefnImpl
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.impl.FaceletTaglib_1_0PackageImpl#getTagDefn()
- * @generated
- */
- int TAG_DEFN = 8;
-
- /**
- * The feature id for the '<em><b>Name</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int TAG_DEFN__NAME = 0;
-
- /**
- * The number of structural features of the '<em>Tag Defn</em>' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int TAG_DEFN_FEATURE_COUNT = 1;
-
- /**
- * The meta object id for the '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.impl.HandlerTagDefnImpl <em>Handler Tag Defn</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.impl.HandlerTagDefnImpl
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.impl.FaceletTaglib_1_0PackageImpl#getHandlerTagDefn()
- * @generated
- */
- int HANDLER_TAG_DEFN = 6;
-
- /**
- * The feature id for the '<em><b>Name</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int HANDLER_TAG_DEFN__NAME = TAG_DEFN__NAME;
-
- /**
- * The feature id for the '<em><b>Handler Class</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int HANDLER_TAG_DEFN__HANDLER_CLASS = TAG_DEFN_FEATURE_COUNT + 0;
-
- /**
- * The number of structural features of the '<em>Handler Tag Defn</em>' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int HANDLER_TAG_DEFN_FEATURE_COUNT = TAG_DEFN_FEATURE_COUNT + 1;
-
- /**
- * The meta object id for the '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.impl.ComponentTagDefnImpl <em>Component Tag Defn</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.impl.ComponentTagDefnImpl
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.impl.FaceletTaglib_1_0PackageImpl#getComponentTagDefn()
- * @generated
- */
- int COMPONENT_TAG_DEFN = 3;
-
- /**
- * The feature id for the '<em><b>Name</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int COMPONENT_TAG_DEFN__NAME = HANDLER_TAG_DEFN__NAME;
-
- /**
- * The feature id for the '<em><b>Handler Class</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int COMPONENT_TAG_DEFN__HANDLER_CLASS = HANDLER_TAG_DEFN__HANDLER_CLASS;
-
- /**
- * The feature id for the '<em><b>Component Type</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int COMPONENT_TAG_DEFN__COMPONENT_TYPE = HANDLER_TAG_DEFN_FEATURE_COUNT + 0;
-
- /**
- * The feature id for the '<em><b>Renderer Type</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int COMPONENT_TAG_DEFN__RENDERER_TYPE = HANDLER_TAG_DEFN_FEATURE_COUNT + 1;
-
- /**
- * The number of structural features of the '<em>Component Tag Defn</em>' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int COMPONENT_TAG_DEFN_FEATURE_COUNT = HANDLER_TAG_DEFN_FEATURE_COUNT + 2;
-
- /**
- * The meta object id for the '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.impl.ValidatorTagDefnImpl <em>Validator Tag Defn</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.impl.ValidatorTagDefnImpl
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.impl.FaceletTaglib_1_0PackageImpl#getValidatorTagDefn()
- * @generated
- */
- int VALIDATOR_TAG_DEFN = 4;
-
- /**
- * The feature id for the '<em><b>Name</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int VALIDATOR_TAG_DEFN__NAME = HANDLER_TAG_DEFN__NAME;
-
- /**
- * The feature id for the '<em><b>Handler Class</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int VALIDATOR_TAG_DEFN__HANDLER_CLASS = HANDLER_TAG_DEFN__HANDLER_CLASS;
-
- /**
- * The feature id for the '<em><b>Validator Id</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int VALIDATOR_TAG_DEFN__VALIDATOR_ID = HANDLER_TAG_DEFN_FEATURE_COUNT + 0;
-
- /**
- * The number of structural features of the '<em>Validator Tag Defn</em>' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int VALIDATOR_TAG_DEFN_FEATURE_COUNT = HANDLER_TAG_DEFN_FEATURE_COUNT + 1;
-
- /**
- * The meta object id for the '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.impl.ConverterTagDefnImpl <em>Converter Tag Defn</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.impl.ConverterTagDefnImpl
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.impl.FaceletTaglib_1_0PackageImpl#getConverterTagDefn()
- * @generated
- */
- int CONVERTER_TAG_DEFN = 5;
-
- /**
- * The feature id for the '<em><b>Name</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int CONVERTER_TAG_DEFN__NAME = HANDLER_TAG_DEFN__NAME;
-
- /**
- * The feature id for the '<em><b>Handler Class</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int CONVERTER_TAG_DEFN__HANDLER_CLASS = HANDLER_TAG_DEFN__HANDLER_CLASS;
-
- /**
- * The feature id for the '<em><b>Converter Id</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int CONVERTER_TAG_DEFN__CONVERTER_ID = HANDLER_TAG_DEFN_FEATURE_COUNT + 0;
-
- /**
- * The number of structural features of the '<em>Converter Tag Defn</em>' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int CONVERTER_TAG_DEFN_FEATURE_COUNT = HANDLER_TAG_DEFN_FEATURE_COUNT + 1;
-
- /**
- * The meta object id for the '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.impl.SourceTagDefnImpl <em>Source Tag Defn</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.impl.SourceTagDefnImpl
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.impl.FaceletTaglib_1_0PackageImpl#getSourceTagDefn()
- * @generated
- */
- int SOURCE_TAG_DEFN = 7;
-
- /**
- * The feature id for the '<em><b>Name</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int SOURCE_TAG_DEFN__NAME = TAG_DEFN__NAME;
-
- /**
- * The feature id for the '<em><b>Source</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int SOURCE_TAG_DEFN__SOURCE = TAG_DEFN_FEATURE_COUNT + 0;
-
- /**
- * The number of structural features of the '<em>Source Tag Defn</em>' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int SOURCE_TAG_DEFN_FEATURE_COUNT = TAG_DEFN_FEATURE_COUNT + 1;
-
- /**
- * The meta object id for the '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.impl.FunctionDefnImpl <em>Function Defn</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.impl.FunctionDefnImpl
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.impl.FaceletTaglib_1_0PackageImpl#getFunctionDefn()
- * @generated
- */
- int FUNCTION_DEFN = 9;
-
- /**
- * The feature id for the '<em><b>Function Name</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int FUNCTION_DEFN__FUNCTION_NAME = 0;
-
- /**
- * The feature id for the '<em><b>Function Class</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int FUNCTION_DEFN__FUNCTION_CLASS = 1;
-
- /**
- * The feature id for the '<em><b>Function Signature</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int FUNCTION_DEFN__FUNCTION_SIGNATURE = 2;
-
- /**
- * The number of structural features of the '<em>Function Defn</em>' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int FUNCTION_DEFN_FEATURE_COUNT = 3;
-
-
- /**
- * Returns the meta object for class '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.FaceletLibraryClassTagLib <em>Facelet Library Class Tag Lib</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for class '<em>Facelet Library Class Tag Lib</em>'.
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.FaceletLibraryClassTagLib
- * @generated
- */
- EClass getFaceletLibraryClassTagLib();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.FaceletLibraryClassTagLib#getLibraryClass <em>Library Class</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Library Class</em>'.
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.FaceletLibraryClassTagLib#getLibraryClass()
- * @see #getFaceletLibraryClassTagLib()
- * @generated
- */
- EAttribute getFaceletLibraryClassTagLib_LibraryClass();
-
- /**
- * Returns the meta object for class '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.FaceletXMLDefnTaglib <em>Facelet XML Defn Taglib</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for class '<em>Facelet XML Defn Taglib</em>'.
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.FaceletXMLDefnTaglib
- * @generated
- */
- EClass getFaceletXMLDefnTaglib();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.FaceletXMLDefnTaglib#getNamespace <em>Namespace</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Namespace</em>'.
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.FaceletXMLDefnTaglib#getNamespace()
- * @see #getFaceletXMLDefnTaglib()
- * @generated
- */
- EAttribute getFaceletXMLDefnTaglib_Namespace();
-
- /**
- * Returns the meta object for the reference list '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.FaceletXMLDefnTaglib#getTags <em>Tags</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the reference list '<em>Tags</em>'.
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.FaceletXMLDefnTaglib#getTags()
- * @see #getFaceletXMLDefnTaglib()
- * @generated
- */
- EReference getFaceletXMLDefnTaglib_Tags();
-
- /**
- * Returns the meta object for the reference list '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.FaceletXMLDefnTaglib#getFunctions <em>Functions</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the reference list '<em>Functions</em>'.
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.FaceletXMLDefnTaglib#getFunctions()
- * @see #getFaceletXMLDefnTaglib()
- * @generated
- */
- EReference getFaceletXMLDefnTaglib_Functions();
-
- /**
- * Returns the meta object for class '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.FaceletTaglibDefn <em>Facelet Taglib Defn</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for class '<em>Facelet Taglib Defn</em>'.
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.FaceletTaglibDefn
- * @generated
- */
- EClass getFaceletTaglibDefn();
-
- /**
- * Returns the meta object for class '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.ComponentTagDefn <em>Component Tag Defn</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for class '<em>Component Tag Defn</em>'.
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.ComponentTagDefn
- * @generated
- */
- EClass getComponentTagDefn();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.ComponentTagDefn#getComponentType <em>Component Type</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Component Type</em>'.
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.ComponentTagDefn#getComponentType()
- * @see #getComponentTagDefn()
- * @generated
- */
- EAttribute getComponentTagDefn_ComponentType();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.ComponentTagDefn#getRendererType <em>Renderer Type</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Renderer Type</em>'.
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.ComponentTagDefn#getRendererType()
- * @see #getComponentTagDefn()
- * @generated
- */
- EAttribute getComponentTagDefn_RendererType();
-
- /**
- * Returns the meta object for class '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.ValidatorTagDefn <em>Validator Tag Defn</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for class '<em>Validator Tag Defn</em>'.
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.ValidatorTagDefn
- * @generated
- */
- EClass getValidatorTagDefn();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.ValidatorTagDefn#getValidatorId <em>Validator Id</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Validator Id</em>'.
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.ValidatorTagDefn#getValidatorId()
- * @see #getValidatorTagDefn()
- * @generated
- */
- EAttribute getValidatorTagDefn_ValidatorId();
-
- /**
- * Returns the meta object for class '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.ConverterTagDefn <em>Converter Tag Defn</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for class '<em>Converter Tag Defn</em>'.
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.ConverterTagDefn
- * @generated
- */
- EClass getConverterTagDefn();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.ConverterTagDefn#getConverterId <em>Converter Id</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Converter Id</em>'.
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.ConverterTagDefn#getConverterId()
- * @see #getConverterTagDefn()
- * @generated
- */
- EAttribute getConverterTagDefn_ConverterId();
-
- /**
- * Returns the meta object for class '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.HandlerTagDefn <em>Handler Tag Defn</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for class '<em>Handler Tag Defn</em>'.
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.HandlerTagDefn
- * @generated
- */
- EClass getHandlerTagDefn();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.HandlerTagDefn#getHandlerClass <em>Handler Class</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Handler Class</em>'.
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.HandlerTagDefn#getHandlerClass()
- * @see #getHandlerTagDefn()
- * @generated
- */
- EAttribute getHandlerTagDefn_HandlerClass();
-
- /**
- * Returns the meta object for class '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.SourceTagDefn <em>Source Tag Defn</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for class '<em>Source Tag Defn</em>'.
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.SourceTagDefn
- * @generated
- */
- EClass getSourceTagDefn();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.SourceTagDefn#getSource <em>Source</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Source</em>'.
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.SourceTagDefn#getSource()
- * @see #getSourceTagDefn()
- * @generated
- */
- EAttribute getSourceTagDefn_Source();
-
- /**
- * Returns the meta object for class '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.TagDefn <em>Tag Defn</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for class '<em>Tag Defn</em>'.
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.TagDefn
- * @generated
- */
- EClass getTagDefn();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.TagDefn#getName <em>Name</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Name</em>'.
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.TagDefn#getName()
- * @see #getTagDefn()
- * @generated
- */
- EAttribute getTagDefn_Name();
-
- /**
- * Returns the meta object for class '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.FunctionDefn <em>Function Defn</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for class '<em>Function Defn</em>'.
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.FunctionDefn
- * @generated
- */
- EClass getFunctionDefn();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.FunctionDefn#getFunctionName <em>Function Name</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Function Name</em>'.
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.FunctionDefn#getFunctionName()
- * @see #getFunctionDefn()
- * @generated
- */
- EAttribute getFunctionDefn_FunctionName();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.FunctionDefn#getFunctionClass <em>Function Class</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Function Class</em>'.
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.FunctionDefn#getFunctionClass()
- * @see #getFunctionDefn()
- * @generated
- */
- EAttribute getFunctionDefn_FunctionClass();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.FunctionDefn#getFunctionSignature <em>Function Signature</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Function Signature</em>'.
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.FunctionDefn#getFunctionSignature()
- * @see #getFunctionDefn()
- * @generated
- */
- EAttribute getFunctionDefn_FunctionSignature();
-
- /**
- * 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
- */
- FaceletTaglib_1_0Factory getFaceletTaglib_1_0Factory();
-
- /**
- * <!-- 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
- */
- @SuppressWarnings("hiding")
- interface Literals
- {
- /**
- * The meta object literal for the '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.impl.FaceletLibraryClassTagLibImpl <em>Facelet Library Class Tag Lib</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.impl.FaceletLibraryClassTagLibImpl
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.impl.FaceletTaglib_1_0PackageImpl#getFaceletLibraryClassTagLib()
- * @generated
- */
- EClass FACELET_LIBRARY_CLASS_TAG_LIB = eINSTANCE.getFaceletLibraryClassTagLib();
-
- /**
- * The meta object literal for the '<em><b>Library Class</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EAttribute FACELET_LIBRARY_CLASS_TAG_LIB__LIBRARY_CLASS = eINSTANCE.getFaceletLibraryClassTagLib_LibraryClass();
-
- /**
- * The meta object literal for the '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.impl.FaceletXMLDefnTaglibImpl <em>Facelet XML Defn Taglib</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.impl.FaceletXMLDefnTaglibImpl
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.impl.FaceletTaglib_1_0PackageImpl#getFaceletXMLDefnTaglib()
- * @generated
- */
- EClass FACELET_XML_DEFN_TAGLIB = eINSTANCE.getFaceletXMLDefnTaglib();
-
- /**
- * The meta object literal for the '<em><b>Namespace</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EAttribute FACELET_XML_DEFN_TAGLIB__NAMESPACE = eINSTANCE.getFaceletXMLDefnTaglib_Namespace();
-
- /**
- * The meta object literal for the '<em><b>Tags</b></em>' reference list feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EReference FACELET_XML_DEFN_TAGLIB__TAGS = eINSTANCE.getFaceletXMLDefnTaglib_Tags();
-
- /**
- * The meta object literal for the '<em><b>Functions</b></em>' reference list feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EReference FACELET_XML_DEFN_TAGLIB__FUNCTIONS = eINSTANCE.getFaceletXMLDefnTaglib_Functions();
-
- /**
- * The meta object literal for the '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.impl.FaceletTaglibDefnImpl <em>Facelet Taglib Defn</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.impl.FaceletTaglibDefnImpl
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.impl.FaceletTaglib_1_0PackageImpl#getFaceletTaglibDefn()
- * @generated
- */
- EClass FACELET_TAGLIB_DEFN = eINSTANCE.getFaceletTaglibDefn();
-
- /**
- * The meta object literal for the '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.impl.ComponentTagDefnImpl <em>Component Tag Defn</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.impl.ComponentTagDefnImpl
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.impl.FaceletTaglib_1_0PackageImpl#getComponentTagDefn()
- * @generated
- */
- EClass COMPONENT_TAG_DEFN = eINSTANCE.getComponentTagDefn();
-
- /**
- * The meta object literal for the '<em><b>Component Type</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EAttribute COMPONENT_TAG_DEFN__COMPONENT_TYPE = eINSTANCE.getComponentTagDefn_ComponentType();
-
- /**
- * The meta object literal for the '<em><b>Renderer Type</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EAttribute COMPONENT_TAG_DEFN__RENDERER_TYPE = eINSTANCE.getComponentTagDefn_RendererType();
-
- /**
- * The meta object literal for the '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.impl.ValidatorTagDefnImpl <em>Validator Tag Defn</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.impl.ValidatorTagDefnImpl
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.impl.FaceletTaglib_1_0PackageImpl#getValidatorTagDefn()
- * @generated
- */
- EClass VALIDATOR_TAG_DEFN = eINSTANCE.getValidatorTagDefn();
-
- /**
- * The meta object literal for the '<em><b>Validator Id</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EAttribute VALIDATOR_TAG_DEFN__VALIDATOR_ID = eINSTANCE.getValidatorTagDefn_ValidatorId();
-
- /**
- * The meta object literal for the '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.impl.ConverterTagDefnImpl <em>Converter Tag Defn</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.impl.ConverterTagDefnImpl
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.impl.FaceletTaglib_1_0PackageImpl#getConverterTagDefn()
- * @generated
- */
- EClass CONVERTER_TAG_DEFN = eINSTANCE.getConverterTagDefn();
-
- /**
- * The meta object literal for the '<em><b>Converter Id</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EAttribute CONVERTER_TAG_DEFN__CONVERTER_ID = eINSTANCE.getConverterTagDefn_ConverterId();
-
- /**
- * The meta object literal for the '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.impl.HandlerTagDefnImpl <em>Handler Tag Defn</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.impl.HandlerTagDefnImpl
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.impl.FaceletTaglib_1_0PackageImpl#getHandlerTagDefn()
- * @generated
- */
- EClass HANDLER_TAG_DEFN = eINSTANCE.getHandlerTagDefn();
-
- /**
- * The meta object literal for the '<em><b>Handler Class</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EAttribute HANDLER_TAG_DEFN__HANDLER_CLASS = eINSTANCE.getHandlerTagDefn_HandlerClass();
-
- /**
- * The meta object literal for the '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.impl.SourceTagDefnImpl <em>Source Tag Defn</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.impl.SourceTagDefnImpl
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.impl.FaceletTaglib_1_0PackageImpl#getSourceTagDefn()
- * @generated
- */
- EClass SOURCE_TAG_DEFN = eINSTANCE.getSourceTagDefn();
-
- /**
- * The meta object literal for the '<em><b>Source</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EAttribute SOURCE_TAG_DEFN__SOURCE = eINSTANCE.getSourceTagDefn_Source();
-
- /**
- * The meta object literal for the '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.impl.TagDefnImpl <em>Tag Defn</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.impl.TagDefnImpl
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.impl.FaceletTaglib_1_0PackageImpl#getTagDefn()
- * @generated
- */
- EClass TAG_DEFN = eINSTANCE.getTagDefn();
-
- /**
- * The meta object literal for the '<em><b>Name</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EAttribute TAG_DEFN__NAME = eINSTANCE.getTagDefn_Name();
-
- /**
- * The meta object literal for the '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.impl.FunctionDefnImpl <em>Function Defn</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.impl.FunctionDefnImpl
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.impl.FaceletTaglib_1_0PackageImpl#getFunctionDefn()
- * @generated
- */
- EClass FUNCTION_DEFN = eINSTANCE.getFunctionDefn();
-
- /**
- * The meta object literal for the '<em><b>Function Name</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EAttribute FUNCTION_DEFN__FUNCTION_NAME = eINSTANCE.getFunctionDefn_FunctionName();
-
- /**
- * The meta object literal for the '<em><b>Function Class</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EAttribute FUNCTION_DEFN__FUNCTION_CLASS = eINSTANCE.getFunctionDefn_FunctionClass();
-
- /**
- * The meta object literal for the '<em><b>Function Signature</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EAttribute FUNCTION_DEFN__FUNCTION_SIGNATURE = eINSTANCE.getFunctionDefn_FunctionSignature();
-
- }
-
-} //FaceletTaglib_1_0Package
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib_1_0/FaceletXMLDefnTaglib.java b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib_1_0/FaceletXMLDefnTaglib.java
deleted file mode 100644
index 9332034..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib_1_0/FaceletXMLDefnTaglib.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: FaceletXMLDefnTaglib.java,v 1.1 2010/03/18 06:24:40 cbateman Exp $
- */
-package org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0;
-
-import org.eclipse.emf.common.util.EList;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Facelet XML Defn Taglib</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- * <li>{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.FaceletXMLDefnTaglib#getNamespace <em>Namespace</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.FaceletXMLDefnTaglib#getTags <em>Tags</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.FaceletXMLDefnTaglib#getFunctions <em>Functions</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.FaceletTaglib_1_0Package#getFaceletXMLDefnTaglib()
- * @model
- * @generated
- */
-public interface FaceletXMLDefnTaglib extends FaceletTaglibDefn
-{
- /**
- * Returns the value of the '<em><b>Namespace</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Namespace</em>' attribute isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @return the value of the '<em>Namespace</em>' attribute.
- * @see #setNamespace(String)
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.FaceletTaglib_1_0Package#getFaceletXMLDefnTaglib_Namespace()
- * @model
- * @generated
- */
- String getNamespace();
-
- /**
- * Sets the value of the '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.FaceletXMLDefnTaglib#getNamespace <em>Namespace</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Namespace</em>' attribute.
- * @see #getNamespace()
- * @generated
- */
- void setNamespace(String value);
-
- /**
- * Returns the value of the '<em><b>Tags</b></em>' reference list.
- * The list contents are of type {@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.TagDefn}.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Tags</em>' reference list isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @return the value of the '<em>Tags</em>' reference list.
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.FaceletTaglib_1_0Package#getFaceletXMLDefnTaglib_Tags()
- * @model
- * @generated
- */
- EList<TagDefn> getTags();
-
- /**
- * Returns the value of the '<em><b>Functions</b></em>' reference list.
- * The list contents are of type {@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.FunctionDefn}.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Functions</em>' reference list isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @return the value of the '<em>Functions</em>' reference list.
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.FaceletTaglib_1_0Package#getFaceletXMLDefnTaglib_Functions()
- * @model
- * @generated
- */
- EList<FunctionDefn> getFunctions();
-
-} // FaceletXMLDefnTaglib
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib_1_0/FunctionDefn.java b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib_1_0/FunctionDefn.java
deleted file mode 100644
index d7d03e9..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib_1_0/FunctionDefn.java
+++ /dev/null
@@ -1,109 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: FunctionDefn.java,v 1.1 2010/03/18 06:24:40 cbateman Exp $
- */
-package org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Function Defn</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- * <li>{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.FunctionDefn#getFunctionName <em>Function Name</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.FunctionDefn#getFunctionClass <em>Function Class</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.FunctionDefn#getFunctionSignature <em>Function Signature</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.FaceletTaglib_1_0Package#getFunctionDefn()
- * @model
- * @generated
- */
-public interface FunctionDefn extends EObject
-{
- /**
- * Returns the value of the '<em><b>Function Name</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Function Name</em>' attribute isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @return the value of the '<em>Function Name</em>' attribute.
- * @see #setFunctionName(String)
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.FaceletTaglib_1_0Package#getFunctionDefn_FunctionName()
- * @model
- * @generated
- */
- String getFunctionName();
-
- /**
- * Sets the value of the '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.FunctionDefn#getFunctionName <em>Function Name</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Function Name</em>' attribute.
- * @see #getFunctionName()
- * @generated
- */
- void setFunctionName(String value);
-
- /**
- * Returns the value of the '<em><b>Function Class</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Function Class</em>' attribute isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @return the value of the '<em>Function Class</em>' attribute.
- * @see #setFunctionClass(String)
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.FaceletTaglib_1_0Package#getFunctionDefn_FunctionClass()
- * @model
- * @generated
- */
- String getFunctionClass();
-
- /**
- * Sets the value of the '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.FunctionDefn#getFunctionClass <em>Function Class</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Function Class</em>' attribute.
- * @see #getFunctionClass()
- * @generated
- */
- void setFunctionClass(String value);
-
- /**
- * Returns the value of the '<em><b>Function Signature</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Function Signature</em>' attribute isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @return the value of the '<em>Function Signature</em>' attribute.
- * @see #setFunctionSignature(String)
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.FaceletTaglib_1_0Package#getFunctionDefn_FunctionSignature()
- * @model
- * @generated
- */
- String getFunctionSignature();
-
- /**
- * Sets the value of the '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.FunctionDefn#getFunctionSignature <em>Function Signature</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Function Signature</em>' attribute.
- * @see #getFunctionSignature()
- * @generated
- */
- void setFunctionSignature(String value);
-
-} // FunctionDefn
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib_1_0/HandlerTagDefn.java b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib_1_0/HandlerTagDefn.java
deleted file mode 100644
index bf4416e..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib_1_0/HandlerTagDefn.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: HandlerTagDefn.java,v 1.1 2010/03/18 06:24:40 cbateman Exp $
- */
-package org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Handler Tag Defn</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- * <li>{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.HandlerTagDefn#getHandlerClass <em>Handler Class</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.FaceletTaglib_1_0Package#getHandlerTagDefn()
- * @model
- * @generated
- */
-public interface HandlerTagDefn extends TagDefn
-{
- /**
- * Returns the value of the '<em><b>Handler Class</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Handler Class</em>' attribute isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @return the value of the '<em>Handler Class</em>' attribute.
- * @see #setHandlerClass(String)
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.FaceletTaglib_1_0Package#getHandlerTagDefn_HandlerClass()
- * @model
- * @generated
- */
- String getHandlerClass();
-
- /**
- * Sets the value of the '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.HandlerTagDefn#getHandlerClass <em>Handler Class</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Handler Class</em>' attribute.
- * @see #getHandlerClass()
- * @generated
- */
- void setHandlerClass(String value);
-
-} // HandlerTagDefn
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib_1_0/SourceTagDefn.java b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib_1_0/SourceTagDefn.java
deleted file mode 100644
index 1867c34..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib_1_0/SourceTagDefn.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: SourceTagDefn.java,v 1.1 2010/03/18 06:24:40 cbateman Exp $
- */
-package org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Source Tag Defn</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- * <li>{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.SourceTagDefn#getSource <em>Source</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.FaceletTaglib_1_0Package#getSourceTagDefn()
- * @model
- * @generated
- */
-public interface SourceTagDefn extends TagDefn
-{
- /**
- * Returns the value of the '<em><b>Source</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Source</em>' attribute isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @return the value of the '<em>Source</em>' attribute.
- * @see #setSource(String)
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.FaceletTaglib_1_0Package#getSourceTagDefn_Source()
- * @model
- * @generated
- */
- String getSource();
-
- /**
- * Sets the value of the '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.SourceTagDefn#getSource <em>Source</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Source</em>' attribute.
- * @see #getSource()
- * @generated
- */
- void setSource(String value);
-
-} // SourceTagDefn
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib_1_0/TagDefn.java b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib_1_0/TagDefn.java
deleted file mode 100644
index a44baee..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib_1_0/TagDefn.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: TagDefn.java,v 1.1 2010/03/18 06:24:40 cbateman Exp $
- */
-package org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Tag Defn</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- * <li>{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.TagDefn#getName <em>Name</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.FaceletTaglib_1_0Package#getTagDefn()
- * @model
- * @generated
- */
-public interface TagDefn extends EObject
-{
- /**
- * Returns the value of the '<em><b>Name</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Name</em>' attribute isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @return the value of the '<em>Name</em>' attribute.
- * @see #setName(String)
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.FaceletTaglib_1_0Package#getTagDefn_Name()
- * @model
- * @generated
- */
- String getName();
-
- /**
- * Sets the value of the '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.TagDefn#getName <em>Name</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Name</em>' attribute.
- * @see #getName()
- * @generated
- */
- void setName(String value);
-
-} // TagDefn
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib_1_0/ValidatorTagDefn.java b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib_1_0/ValidatorTagDefn.java
deleted file mode 100644
index f925b27..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib_1_0/ValidatorTagDefn.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: ValidatorTagDefn.java,v 1.1 2010/03/18 06:24:40 cbateman Exp $
- */
-package org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Validator Tag Defn</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- * <li>{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.ValidatorTagDefn#getValidatorId <em>Validator Id</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.FaceletTaglib_1_0Package#getValidatorTagDefn()
- * @model
- * @generated
- */
-public interface ValidatorTagDefn extends HandlerTagDefn
-{
- /**
- * Returns the value of the '<em><b>Validator Id</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Validator Id</em>' attribute isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @return the value of the '<em>Validator Id</em>' attribute.
- * @see #setValidatorId(String)
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.FaceletTaglib_1_0Package#getValidatorTagDefn_ValidatorId()
- * @model
- * @generated
- */
- String getValidatorId();
-
- /**
- * Sets the value of the '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.ValidatorTagDefn#getValidatorId <em>Validator Id</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Validator Id</em>' attribute.
- * @see #getValidatorId()
- * @generated
- */
- void setValidatorId(String value);
-
-} // ValidatorTagDefn
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib_1_0/impl/ComponentTagDefnImpl.java b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib_1_0/impl/ComponentTagDefnImpl.java
deleted file mode 100644
index cd170e2..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib_1_0/impl/ComponentTagDefnImpl.java
+++ /dev/null
@@ -1,233 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: ComponentTagDefnImpl.java,v 1.1 2010/03/18 06:24:28 cbateman Exp $
- */
-package org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.ComponentTagDefn;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.FaceletTaglib_1_0Package;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Component Tag Defn</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- * <li>{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.impl.ComponentTagDefnImpl#getComponentType <em>Component Type</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.impl.ComponentTagDefnImpl#getRendererType <em>Renderer Type</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class ComponentTagDefnImpl extends HandlerTagDefnImpl implements ComponentTagDefn
-{
- /**
- * The default value of the '{@link #getComponentType() <em>Component Type</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getComponentType()
- * @generated
- * @ordered
- */
- protected static final String COMPONENT_TYPE_EDEFAULT = null;
-
- /**
- * The cached value of the '{@link #getComponentType() <em>Component Type</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getComponentType()
- * @generated
- * @ordered
- */
- protected String componentType = COMPONENT_TYPE_EDEFAULT;
-
- /**
- * The default value of the '{@link #getRendererType() <em>Renderer Type</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getRendererType()
- * @generated
- * @ordered
- */
- protected static final String RENDERER_TYPE_EDEFAULT = null;
-
- /**
- * The cached value of the '{@link #getRendererType() <em>Renderer Type</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getRendererType()
- * @generated
- * @ordered
- */
- protected String rendererType = RENDERER_TYPE_EDEFAULT;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected ComponentTagDefnImpl()
- {
- super();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- protected EClass eStaticClass()
- {
- return FaceletTaglib_1_0Package.Literals.COMPONENT_TAG_DEFN;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public String getComponentType()
- {
- return componentType;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setComponentType(String newComponentType)
- {
- String oldComponentType = componentType;
- componentType = newComponentType;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, FaceletTaglib_1_0Package.COMPONENT_TAG_DEFN__COMPONENT_TYPE, oldComponentType, componentType));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public String getRendererType()
- {
- return rendererType;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setRendererType(String newRendererType)
- {
- String oldRendererType = rendererType;
- rendererType = newRendererType;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, FaceletTaglib_1_0Package.COMPONENT_TAG_DEFN__RENDERER_TYPE, oldRendererType, rendererType));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public Object eGet(int featureID, boolean resolve, boolean coreType)
- {
- switch (featureID)
- {
- case FaceletTaglib_1_0Package.COMPONENT_TAG_DEFN__COMPONENT_TYPE:
- return getComponentType();
- case FaceletTaglib_1_0Package.COMPONENT_TAG_DEFN__RENDERER_TYPE:
- return getRendererType();
- }
- return super.eGet(featureID, resolve, coreType);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public void eSet(int featureID, Object newValue)
- {
- switch (featureID)
- {
- case FaceletTaglib_1_0Package.COMPONENT_TAG_DEFN__COMPONENT_TYPE:
- setComponentType((String)newValue);
- return;
- case FaceletTaglib_1_0Package.COMPONENT_TAG_DEFN__RENDERER_TYPE:
- setRendererType((String)newValue);
- return;
- }
- super.eSet(featureID, newValue);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public void eUnset(int featureID)
- {
- switch (featureID)
- {
- case FaceletTaglib_1_0Package.COMPONENT_TAG_DEFN__COMPONENT_TYPE:
- setComponentType(COMPONENT_TYPE_EDEFAULT);
- return;
- case FaceletTaglib_1_0Package.COMPONENT_TAG_DEFN__RENDERER_TYPE:
- setRendererType(RENDERER_TYPE_EDEFAULT);
- return;
- }
- super.eUnset(featureID);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public boolean eIsSet(int featureID)
- {
- switch (featureID)
- {
- case FaceletTaglib_1_0Package.COMPONENT_TAG_DEFN__COMPONENT_TYPE:
- return COMPONENT_TYPE_EDEFAULT == null ? componentType != null : !COMPONENT_TYPE_EDEFAULT.equals(componentType);
- case FaceletTaglib_1_0Package.COMPONENT_TAG_DEFN__RENDERER_TYPE:
- return RENDERER_TYPE_EDEFAULT == null ? rendererType != null : !RENDERER_TYPE_EDEFAULT.equals(rendererType);
- }
- return super.eIsSet(featureID);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public String toString()
- {
- if (eIsProxy()) return super.toString();
-
- StringBuffer result = new StringBuffer(super.toString());
- result.append(" (componentType: "); //$NON-NLS-1$
- result.append(componentType);
- result.append(", rendererType: "); //$NON-NLS-1$
- result.append(rendererType);
- result.append(')');
- return result.toString();
- }
-
-} //ComponentTagDefnImpl
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib_1_0/impl/ConverterTagDefnImpl.java b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib_1_0/impl/ConverterTagDefnImpl.java
deleted file mode 100644
index a7ff950..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib_1_0/impl/ConverterTagDefnImpl.java
+++ /dev/null
@@ -1,177 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: ConverterTagDefnImpl.java,v 1.1 2010/03/18 06:24:28 cbateman Exp $
- */
-package org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.ConverterTagDefn;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.FaceletTaglib_1_0Package;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Converter Tag Defn</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- * <li>{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.impl.ConverterTagDefnImpl#getConverterId <em>Converter Id</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class ConverterTagDefnImpl extends HandlerTagDefnImpl implements ConverterTagDefn
-{
- /**
- * The default value of the '{@link #getConverterId() <em>Converter Id</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getConverterId()
- * @generated
- * @ordered
- */
- protected static final String CONVERTER_ID_EDEFAULT = null;
-
- /**
- * The cached value of the '{@link #getConverterId() <em>Converter Id</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getConverterId()
- * @generated
- * @ordered
- */
- protected String converterId = CONVERTER_ID_EDEFAULT;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected ConverterTagDefnImpl()
- {
- super();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- protected EClass eStaticClass()
- {
- return FaceletTaglib_1_0Package.Literals.CONVERTER_TAG_DEFN;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public String getConverterId()
- {
- return converterId;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setConverterId(String newConverterId)
- {
- String oldConverterId = converterId;
- converterId = newConverterId;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, FaceletTaglib_1_0Package.CONVERTER_TAG_DEFN__CONVERTER_ID, oldConverterId, converterId));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public Object eGet(int featureID, boolean resolve, boolean coreType)
- {
- switch (featureID)
- {
- case FaceletTaglib_1_0Package.CONVERTER_TAG_DEFN__CONVERTER_ID:
- return getConverterId();
- }
- return super.eGet(featureID, resolve, coreType);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public void eSet(int featureID, Object newValue)
- {
- switch (featureID)
- {
- case FaceletTaglib_1_0Package.CONVERTER_TAG_DEFN__CONVERTER_ID:
- setConverterId((String)newValue);
- return;
- }
- super.eSet(featureID, newValue);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public void eUnset(int featureID)
- {
- switch (featureID)
- {
- case FaceletTaglib_1_0Package.CONVERTER_TAG_DEFN__CONVERTER_ID:
- setConverterId(CONVERTER_ID_EDEFAULT);
- return;
- }
- super.eUnset(featureID);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public boolean eIsSet(int featureID)
- {
- switch (featureID)
- {
- case FaceletTaglib_1_0Package.CONVERTER_TAG_DEFN__CONVERTER_ID:
- return CONVERTER_ID_EDEFAULT == null ? converterId != null : !CONVERTER_ID_EDEFAULT.equals(converterId);
- }
- return super.eIsSet(featureID);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public String toString()
- {
- if (eIsProxy()) return super.toString();
-
- StringBuffer result = new StringBuffer(super.toString());
- result.append(" (converterId: "); //$NON-NLS-1$
- result.append(converterId);
- result.append(')');
- return result.toString();
- }
-
-} //ConverterTagDefnImpl
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib_1_0/impl/FaceletLibraryClassTagLibImpl.java b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib_1_0/impl/FaceletLibraryClassTagLibImpl.java
deleted file mode 100644
index 117892f..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib_1_0/impl/FaceletLibraryClassTagLibImpl.java
+++ /dev/null
@@ -1,177 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: FaceletLibraryClassTagLibImpl.java,v 1.1 2010/03/18 06:24:28 cbateman Exp $
- */
-package org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.FaceletLibraryClassTagLib;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.FaceletTaglib_1_0Package;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Facelet Library Class Tag Lib</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- * <li>{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.impl.FaceletLibraryClassTagLibImpl#getLibraryClass <em>Library Class</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class FaceletLibraryClassTagLibImpl extends FaceletTaglibDefnImpl implements FaceletLibraryClassTagLib
-{
- /**
- * The default value of the '{@link #getLibraryClass() <em>Library Class</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getLibraryClass()
- * @generated
- * @ordered
- */
- protected static final String LIBRARY_CLASS_EDEFAULT = null;
-
- /**
- * The cached value of the '{@link #getLibraryClass() <em>Library Class</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getLibraryClass()
- * @generated
- * @ordered
- */
- protected String libraryClass = LIBRARY_CLASS_EDEFAULT;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected FaceletLibraryClassTagLibImpl()
- {
- super();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- protected EClass eStaticClass()
- {
- return FaceletTaglib_1_0Package.Literals.FACELET_LIBRARY_CLASS_TAG_LIB;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public String getLibraryClass()
- {
- return libraryClass;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setLibraryClass(String newLibraryClass)
- {
- String oldLibraryClass = libraryClass;
- libraryClass = newLibraryClass;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, FaceletTaglib_1_0Package.FACELET_LIBRARY_CLASS_TAG_LIB__LIBRARY_CLASS, oldLibraryClass, libraryClass));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public Object eGet(int featureID, boolean resolve, boolean coreType)
- {
- switch (featureID)
- {
- case FaceletTaglib_1_0Package.FACELET_LIBRARY_CLASS_TAG_LIB__LIBRARY_CLASS:
- return getLibraryClass();
- }
- return super.eGet(featureID, resolve, coreType);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public void eSet(int featureID, Object newValue)
- {
- switch (featureID)
- {
- case FaceletTaglib_1_0Package.FACELET_LIBRARY_CLASS_TAG_LIB__LIBRARY_CLASS:
- setLibraryClass((String)newValue);
- return;
- }
- super.eSet(featureID, newValue);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public void eUnset(int featureID)
- {
- switch (featureID)
- {
- case FaceletTaglib_1_0Package.FACELET_LIBRARY_CLASS_TAG_LIB__LIBRARY_CLASS:
- setLibraryClass(LIBRARY_CLASS_EDEFAULT);
- return;
- }
- super.eUnset(featureID);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public boolean eIsSet(int featureID)
- {
- switch (featureID)
- {
- case FaceletTaglib_1_0Package.FACELET_LIBRARY_CLASS_TAG_LIB__LIBRARY_CLASS:
- return LIBRARY_CLASS_EDEFAULT == null ? libraryClass != null : !LIBRARY_CLASS_EDEFAULT.equals(libraryClass);
- }
- return super.eIsSet(featureID);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public String toString()
- {
- if (eIsProxy()) return super.toString();
-
- StringBuffer result = new StringBuffer(super.toString());
- result.append(" (libraryClass: "); //$NON-NLS-1$
- result.append(libraryClass);
- result.append(')');
- return result.toString();
- }
-
-} //FaceletLibraryClassTagLibImpl
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib_1_0/impl/FaceletTaglibDefnImpl.java b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib_1_0/impl/FaceletTaglibDefnImpl.java
deleted file mode 100644
index 409ea42..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib_1_0/impl/FaceletTaglibDefnImpl.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: FaceletTaglibDefnImpl.java,v 1.1 2010/03/18 06:24:28 cbateman Exp $
- */
-package org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.impl;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.FaceletTaglibDefn;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.FaceletTaglib_1_0Package;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Defn</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * </p>
- *
- * @generated
- */
-public class FaceletTaglibDefnImpl extends EObjectImpl implements FaceletTaglibDefn
-{
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected FaceletTaglibDefnImpl()
- {
- super();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- protected EClass eStaticClass()
- {
- return FaceletTaglib_1_0Package.Literals.FACELET_TAGLIB_DEFN;
- }
-
-} //FaceletTaglibDefnImpl
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib_1_0/impl/FaceletTaglibFactoryImpl.java b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib_1_0/impl/FaceletTaglibFactoryImpl.java
deleted file mode 100644
index f5c7069..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib_1_0/impl/FaceletTaglibFactoryImpl.java
+++ /dev/null
@@ -1,228 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: FaceletTaglibFactoryImpl.java,v 1.1 2010/03/18 06:24:28 cbateman Exp $
- */
-package org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.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.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.ComponentTagDefn;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.ConverterTagDefn;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.FaceletLibraryClassTagLib;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.FaceletTaglibDefn;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.FaceletTaglibFactory;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.FaceletTaglibPackage;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.FaceletXMLDefnTaglib;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.FunctionDefn;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.HandlerTagDefn;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.SourceTagDefn;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.TagDefn;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.ValidatorTagDefn;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model <b>Factory</b>.
- * <!-- end-user-doc -->
- * @generated
- */
-public class FaceletTaglibFactoryImpl extends EFactoryImpl implements FaceletTaglibFactory
-{
- /**
- * Creates the default factory implementation.
- * <!-- begin-user-doc -->
- * @return the factory
- * <!-- end-user-doc -->
- * @generated
- */
- public static FaceletTaglibFactory init()
- {
- try
- {
- FaceletTaglibFactory theFaceletTaglibFactory = (FaceletTaglibFactory)EPackage.Registry.INSTANCE.getEFactory("http://org.eclipse.jst.jsf.facelet.core/faceletTaglib.ecore"); //$NON-NLS-1$
- if (theFaceletTaglibFactory != null)
- {
- return theFaceletTaglibFactory;
- }
- }
- catch (Exception exception)
- {
- EcorePlugin.INSTANCE.log(exception);
- }
- return new FaceletTaglibFactoryImpl();
- }
-
- /**
- * Creates an instance of the factory.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public FaceletTaglibFactoryImpl()
- {
- super();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public EObject create(EClass eClass)
- {
- switch (eClass.getClassifierID())
- {
- case FaceletTaglibPackage.FACELET_LIBRARY_CLASS_TAG_LIB: return createFaceletLibraryClassTagLib();
- case FaceletTaglibPackage.FACELET_XML_DEFN_TAGLIB: return createFaceletXMLDefnTaglib();
- case FaceletTaglibPackage.FACELET_TAGLIB_DEFN: return createFaceletTaglibDefn();
- case FaceletTaglibPackage.COMPONENT_TAG_DEFN: return createComponentTagDefn();
- case FaceletTaglibPackage.VALIDATOR_TAG_DEFN: return createValidatorTagDefn();
- case FaceletTaglibPackage.CONVERTER_TAG_DEFN: return createConverterTagDefn();
- case FaceletTaglibPackage.HANDLER_TAG_DEFN: return createHandlerTagDefn();
- case FaceletTaglibPackage.SOURCE_TAG_DEFN: return createSourceTagDefn();
- case FaceletTaglibPackage.TAG_DEFN: return createTagDefn();
- case FaceletTaglibPackage.FUNCTION_DEFN: return createFunctionDefn();
- default:
- throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$
- }
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public FaceletLibraryClassTagLib createFaceletLibraryClassTagLib()
- {
- FaceletLibraryClassTagLibImpl faceletLibraryClassTagLib = new FaceletLibraryClassTagLibImpl();
- return faceletLibraryClassTagLib;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public FaceletXMLDefnTaglib createFaceletXMLDefnTaglib()
- {
- FaceletXMLDefnTaglibImpl faceletXMLDefnTaglib = new FaceletXMLDefnTaglibImpl();
- return faceletXMLDefnTaglib;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public FaceletTaglibDefn createFaceletTaglibDefn()
- {
- FaceletTaglibDefnImpl faceletTaglibDefn = new FaceletTaglibDefnImpl();
- return faceletTaglibDefn;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public ComponentTagDefn createComponentTagDefn()
- {
- ComponentTagDefnImpl componentTagDefn = new ComponentTagDefnImpl();
- return componentTagDefn;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public ValidatorTagDefn createValidatorTagDefn()
- {
- ValidatorTagDefnImpl validatorTagDefn = new ValidatorTagDefnImpl();
- return validatorTagDefn;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public ConverterTagDefn createConverterTagDefn()
- {
- ConverterTagDefnImpl converterTagDefn = new ConverterTagDefnImpl();
- return converterTagDefn;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public HandlerTagDefn createHandlerTagDefn()
- {
- HandlerTagDefnImpl handlerTagDefn = new HandlerTagDefnImpl();
- return handlerTagDefn;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public SourceTagDefn createSourceTagDefn()
- {
- SourceTagDefnImpl sourceTagDefn = new SourceTagDefnImpl();
- return sourceTagDefn;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public TagDefn createTagDefn()
- {
- TagDefnImpl tagDefn = new TagDefnImpl();
- return tagDefn;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public FunctionDefn createFunctionDefn()
- {
- FunctionDefnImpl functionDefn = new FunctionDefnImpl();
- return functionDefn;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public FaceletTaglibPackage getFaceletTaglibPackage()
- {
- return (FaceletTaglibPackage)getEPackage();
- }
-
- /**
- * <!-- begin-user-doc -->
- * @return the package
- * <!-- end-user-doc -->
- * @deprecated
- * @generated
- */
- @Deprecated
- public static FaceletTaglibPackage getPackage()
- {
- return FaceletTaglibPackage.eINSTANCE;
- }
-
-} //FaceletTaglibFactoryImpl
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib_1_0/impl/FaceletTaglibPackageImpl.java b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib_1_0/impl/FaceletTaglibPackageImpl.java
deleted file mode 100644
index 4c3117e..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib_1_0/impl/FaceletTaglibPackageImpl.java
+++ /dev/null
@@ -1,557 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: FaceletTaglibPackageImpl.java,v 1.1 2010/03/18 06:24:28 cbateman Exp $
- */
-package org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.impl;
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.ecore.impl.EPackageImpl;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.ComponentTagDefn;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.ConverterTagDefn;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.FaceletLibraryClassTagLib;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.FaceletTaglibDefn;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.FaceletTaglibFactory;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.FaceletTaglibPackage;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.FaceletXMLDefnTaglib;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.FunctionDefn;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.HandlerTagDefn;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.SourceTagDefn;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.TagDefn;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.ValidatorTagDefn;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model <b>Package</b>.
- * <!-- end-user-doc -->
- * @generated
- */
-public class FaceletTaglibPackageImpl extends EPackageImpl implements FaceletTaglibPackage
-{
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private EClass faceletLibraryClassTagLibEClass = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private EClass faceletXMLDefnTaglibEClass = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private EClass faceletTaglibDefnEClass = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private EClass componentTagDefnEClass = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private EClass validatorTagDefnEClass = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private EClass converterTagDefnEClass = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private EClass handlerTagDefnEClass = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private EClass sourceTagDefnEClass = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private EClass tagDefnEClass = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private EClass functionDefnEClass = 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.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.FaceletTaglibPackage#eNS_URI
- * @see #init()
- * @generated
- */
- private FaceletTaglibPackageImpl()
- {
- super(eNS_URI, FaceletTaglibFactory.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 -->
- * @return the package
- * <!-- end-user-doc -->
- * @see #eNS_URI
- * @see #createPackageContents()
- * @see #initializePackageContents()
- * @generated
- */
- public static FaceletTaglibPackage init()
- {
- if (isInited) return (FaceletTaglibPackage)EPackage.Registry.INSTANCE.getEPackage(FaceletTaglibPackage.eNS_URI);
-
- // Obtain or create and register package
- FaceletTaglibPackageImpl theFaceletTaglibPackage = (FaceletTaglibPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(eNS_URI) instanceof FaceletTaglibPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(eNS_URI) : new FaceletTaglibPackageImpl());
-
- isInited = true;
-
- // Create package meta-data objects
- theFaceletTaglibPackage.createPackageContents();
-
- // Initialize created meta-data
- theFaceletTaglibPackage.initializePackageContents();
-
- // Mark meta-data to indicate it can't be changed
- theFaceletTaglibPackage.freeze();
-
- return theFaceletTaglibPackage;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EClass getFaceletLibraryClassTagLib()
- {
- return faceletLibraryClassTagLibEClass;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getFaceletLibraryClassTagLib_LibraryClass()
- {
- return (EAttribute)faceletLibraryClassTagLibEClass.getEStructuralFeatures().get(0);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EClass getFaceletXMLDefnTaglib()
- {
- return faceletXMLDefnTaglibEClass;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getFaceletXMLDefnTaglib_Namespace()
- {
- return (EAttribute)faceletXMLDefnTaglibEClass.getEStructuralFeatures().get(0);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EReference getFaceletXMLDefnTaglib_Tags()
- {
- return (EReference)faceletXMLDefnTaglibEClass.getEStructuralFeatures().get(1);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EReference getFaceletXMLDefnTaglib_Functions()
- {
- return (EReference)faceletXMLDefnTaglibEClass.getEStructuralFeatures().get(2);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EClass getFaceletTaglibDefn()
- {
- return faceletTaglibDefnEClass;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EClass getComponentTagDefn()
- {
- return componentTagDefnEClass;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getComponentTagDefn_ComponentType()
- {
- return (EAttribute)componentTagDefnEClass.getEStructuralFeatures().get(0);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getComponentTagDefn_RendererType()
- {
- return (EAttribute)componentTagDefnEClass.getEStructuralFeatures().get(1);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EClass getValidatorTagDefn()
- {
- return validatorTagDefnEClass;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getValidatorTagDefn_ValidatorId()
- {
- return (EAttribute)validatorTagDefnEClass.getEStructuralFeatures().get(0);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EClass getConverterTagDefn()
- {
- return converterTagDefnEClass;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getConverterTagDefn_ConverterId()
- {
- return (EAttribute)converterTagDefnEClass.getEStructuralFeatures().get(0);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EClass getHandlerTagDefn()
- {
- return handlerTagDefnEClass;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getHandlerTagDefn_HandlerClass()
- {
- return (EAttribute)handlerTagDefnEClass.getEStructuralFeatures().get(0);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EClass getSourceTagDefn()
- {
- return sourceTagDefnEClass;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getSourceTagDefn_Source()
- {
- return (EAttribute)sourceTagDefnEClass.getEStructuralFeatures().get(0);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EClass getTagDefn()
- {
- return tagDefnEClass;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getTagDefn_Name()
- {
- return (EAttribute)tagDefnEClass.getEStructuralFeatures().get(0);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EClass getFunctionDefn()
- {
- return functionDefnEClass;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getFunctionDefn_FunctionName()
- {
- return (EAttribute)functionDefnEClass.getEStructuralFeatures().get(0);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getFunctionDefn_FunctionClass()
- {
- return (EAttribute)functionDefnEClass.getEStructuralFeatures().get(1);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getFunctionDefn_FunctionSignature()
- {
- return (EAttribute)functionDefnEClass.getEStructuralFeatures().get(2);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public FaceletTaglibFactory getFaceletTaglibFactory()
- {
- return (FaceletTaglibFactory)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
- faceletLibraryClassTagLibEClass = createEClass(FACELET_LIBRARY_CLASS_TAG_LIB);
- createEAttribute(faceletLibraryClassTagLibEClass, FACELET_LIBRARY_CLASS_TAG_LIB__LIBRARY_CLASS);
-
- faceletXMLDefnTaglibEClass = createEClass(FACELET_XML_DEFN_TAGLIB);
- createEAttribute(faceletXMLDefnTaglibEClass, FACELET_XML_DEFN_TAGLIB__NAMESPACE);
- createEReference(faceletXMLDefnTaglibEClass, FACELET_XML_DEFN_TAGLIB__TAGS);
- createEReference(faceletXMLDefnTaglibEClass, FACELET_XML_DEFN_TAGLIB__FUNCTIONS);
-
- faceletTaglibDefnEClass = createEClass(FACELET_TAGLIB_DEFN);
-
- componentTagDefnEClass = createEClass(COMPONENT_TAG_DEFN);
- createEAttribute(componentTagDefnEClass, COMPONENT_TAG_DEFN__COMPONENT_TYPE);
- createEAttribute(componentTagDefnEClass, COMPONENT_TAG_DEFN__RENDERER_TYPE);
-
- validatorTagDefnEClass = createEClass(VALIDATOR_TAG_DEFN);
- createEAttribute(validatorTagDefnEClass, VALIDATOR_TAG_DEFN__VALIDATOR_ID);
-
- converterTagDefnEClass = createEClass(CONVERTER_TAG_DEFN);
- createEAttribute(converterTagDefnEClass, CONVERTER_TAG_DEFN__CONVERTER_ID);
-
- handlerTagDefnEClass = createEClass(HANDLER_TAG_DEFN);
- createEAttribute(handlerTagDefnEClass, HANDLER_TAG_DEFN__HANDLER_CLASS);
-
- sourceTagDefnEClass = createEClass(SOURCE_TAG_DEFN);
- createEAttribute(sourceTagDefnEClass, SOURCE_TAG_DEFN__SOURCE);
-
- tagDefnEClass = createEClass(TAG_DEFN);
- createEAttribute(tagDefnEClass, TAG_DEFN__NAME);
-
- functionDefnEClass = createEClass(FUNCTION_DEFN);
- createEAttribute(functionDefnEClass, FUNCTION_DEFN__FUNCTION_NAME);
- createEAttribute(functionDefnEClass, FUNCTION_DEFN__FUNCTION_CLASS);
- createEAttribute(functionDefnEClass, FUNCTION_DEFN__FUNCTION_SIGNATURE);
- }
-
- /**
- * <!-- 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);
-
- // Create type parameters
-
- // Set bounds for type parameters
-
- // Add supertypes to classes
- faceletLibraryClassTagLibEClass.getESuperTypes().add(this.getFaceletTaglibDefn());
- faceletXMLDefnTaglibEClass.getESuperTypes().add(this.getFaceletTaglibDefn());
- componentTagDefnEClass.getESuperTypes().add(this.getHandlerTagDefn());
- validatorTagDefnEClass.getESuperTypes().add(this.getHandlerTagDefn());
- converterTagDefnEClass.getESuperTypes().add(this.getHandlerTagDefn());
- handlerTagDefnEClass.getESuperTypes().add(this.getTagDefn());
- sourceTagDefnEClass.getESuperTypes().add(this.getTagDefn());
-
- // Initialize classes and features; add operations and parameters
- initEClass(faceletLibraryClassTagLibEClass, FaceletLibraryClassTagLib.class, "FaceletLibraryClassTagLib", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEAttribute(getFaceletLibraryClassTagLib_LibraryClass(), ecorePackage.getEString(), "libraryClass", null, 0, 1, FaceletLibraryClassTagLib.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
- initEClass(faceletXMLDefnTaglibEClass, FaceletXMLDefnTaglib.class, "FaceletXMLDefnTaglib", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEAttribute(getFaceletXMLDefnTaglib_Namespace(), ecorePackage.getEString(), "namespace", null, 0, 1, FaceletXMLDefnTaglib.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getFaceletXMLDefnTaglib_Tags(), this.getTagDefn(), null, "tags", null, 0, -1, FaceletXMLDefnTaglib.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getFaceletXMLDefnTaglib_Functions(), this.getFunctionDefn(), null, "functions", null, 0, -1, FaceletXMLDefnTaglib.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
- initEClass(faceletTaglibDefnEClass, FaceletTaglibDefn.class, "FaceletTaglibDefn", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-
- initEClass(componentTagDefnEClass, ComponentTagDefn.class, "ComponentTagDefn", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEAttribute(getComponentTagDefn_ComponentType(), ecorePackage.getEString(), "componentType", null, 0, 1, ComponentTagDefn.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getComponentTagDefn_RendererType(), ecorePackage.getEString(), "rendererType", null, 0, 1, ComponentTagDefn.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
- initEClass(validatorTagDefnEClass, ValidatorTagDefn.class, "ValidatorTagDefn", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEAttribute(getValidatorTagDefn_ValidatorId(), ecorePackage.getEString(), "validatorId", null, 0, 1, ValidatorTagDefn.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
- initEClass(converterTagDefnEClass, ConverterTagDefn.class, "ConverterTagDefn", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEAttribute(getConverterTagDefn_ConverterId(), ecorePackage.getEString(), "converterId", null, 0, 1, ConverterTagDefn.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
- initEClass(handlerTagDefnEClass, HandlerTagDefn.class, "HandlerTagDefn", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEAttribute(getHandlerTagDefn_HandlerClass(), ecorePackage.getEString(), "handlerClass", null, 0, 1, HandlerTagDefn.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
- initEClass(sourceTagDefnEClass, SourceTagDefn.class, "SourceTagDefn", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEAttribute(getSourceTagDefn_Source(), ecorePackage.getEString(), "source", null, 0, 1, SourceTagDefn.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
- initEClass(tagDefnEClass, TagDefn.class, "TagDefn", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEAttribute(getTagDefn_Name(), ecorePackage.getEString(), "name", null, 0, 1, TagDefn.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
- initEClass(functionDefnEClass, FunctionDefn.class, "FunctionDefn", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEAttribute(getFunctionDefn_FunctionName(), ecorePackage.getEString(), "functionName", null, 0, 1, FunctionDefn.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getFunctionDefn_FunctionClass(), ecorePackage.getEString(), "functionClass", null, 0, 1, FunctionDefn.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getFunctionDefn_FunctionSignature(), ecorePackage.getEString(), "functionSignature", null, 0, 1, FunctionDefn.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
- // Create resource
- createResource(eNS_URI);
- }
-
-} //FaceletTaglibPackageImpl
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib_1_0/impl/FaceletTaglib_1_0FactoryImpl.java b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib_1_0/impl/FaceletTaglib_1_0FactoryImpl.java
deleted file mode 100644
index 3d91d60..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib_1_0/impl/FaceletTaglib_1_0FactoryImpl.java
+++ /dev/null
@@ -1,228 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: FaceletTaglib_1_0FactoryImpl.java,v 1.1 2010/03/18 06:24:28 cbateman Exp $
- */
-package org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.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.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.ComponentTagDefn;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.ConverterTagDefn;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.FaceletLibraryClassTagLib;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.FaceletTaglibDefn;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.FaceletTaglib_1_0Factory;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.FaceletTaglib_1_0Package;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.FaceletXMLDefnTaglib;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.FunctionDefn;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.HandlerTagDefn;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.SourceTagDefn;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.TagDefn;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.ValidatorTagDefn;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model <b>Factory</b>.
- * <!-- end-user-doc -->
- * @generated
- */
-public class FaceletTaglib_1_0FactoryImpl extends EFactoryImpl implements FaceletTaglib_1_0Factory
-{
- /**
- * Creates the default factory implementation.
- * <!-- begin-user-doc -->
- * @return the factory
- * <!-- end-user-doc -->
- * @generated
- */
- public static FaceletTaglib_1_0Factory init()
- {
- try
- {
- FaceletTaglib_1_0Factory theFaceletTaglib_1_0Factory = (FaceletTaglib_1_0Factory)EPackage.Registry.INSTANCE.getEFactory("http://org.eclipse.jst.jsf.facelet.core/faceletTaglib_1_0"); //$NON-NLS-1$
- if (theFaceletTaglib_1_0Factory != null)
- {
- return theFaceletTaglib_1_0Factory;
- }
- }
- catch (Exception exception)
- {
- EcorePlugin.INSTANCE.log(exception);
- }
- return new FaceletTaglib_1_0FactoryImpl();
- }
-
- /**
- * Creates an instance of the factory.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public FaceletTaglib_1_0FactoryImpl()
- {
- super();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public EObject create(EClass eClass)
- {
- switch (eClass.getClassifierID())
- {
- case FaceletTaglib_1_0Package.FACELET_LIBRARY_CLASS_TAG_LIB: return createFaceletLibraryClassTagLib();
- case FaceletTaglib_1_0Package.FACELET_XML_DEFN_TAGLIB: return createFaceletXMLDefnTaglib();
- case FaceletTaglib_1_0Package.FACELET_TAGLIB_DEFN: return createFaceletTaglibDefn();
- case FaceletTaglib_1_0Package.COMPONENT_TAG_DEFN: return createComponentTagDefn();
- case FaceletTaglib_1_0Package.VALIDATOR_TAG_DEFN: return createValidatorTagDefn();
- case FaceletTaglib_1_0Package.CONVERTER_TAG_DEFN: return createConverterTagDefn();
- case FaceletTaglib_1_0Package.HANDLER_TAG_DEFN: return createHandlerTagDefn();
- case FaceletTaglib_1_0Package.SOURCE_TAG_DEFN: return createSourceTagDefn();
- case FaceletTaglib_1_0Package.TAG_DEFN: return createTagDefn();
- case FaceletTaglib_1_0Package.FUNCTION_DEFN: return createFunctionDefn();
- default:
- throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$
- }
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public FaceletLibraryClassTagLib createFaceletLibraryClassTagLib()
- {
- FaceletLibraryClassTagLibImpl faceletLibraryClassTagLib = new FaceletLibraryClassTagLibImpl();
- return faceletLibraryClassTagLib;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public FaceletXMLDefnTaglib createFaceletXMLDefnTaglib()
- {
- FaceletXMLDefnTaglibImpl faceletXMLDefnTaglib = new FaceletXMLDefnTaglibImpl();
- return faceletXMLDefnTaglib;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public FaceletTaglibDefn createFaceletTaglibDefn()
- {
- FaceletTaglibDefnImpl faceletTaglibDefn = new FaceletTaglibDefnImpl();
- return faceletTaglibDefn;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public ComponentTagDefn createComponentTagDefn()
- {
- ComponentTagDefnImpl componentTagDefn = new ComponentTagDefnImpl();
- return componentTagDefn;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public ValidatorTagDefn createValidatorTagDefn()
- {
- ValidatorTagDefnImpl validatorTagDefn = new ValidatorTagDefnImpl();
- return validatorTagDefn;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public ConverterTagDefn createConverterTagDefn()
- {
- ConverterTagDefnImpl converterTagDefn = new ConverterTagDefnImpl();
- return converterTagDefn;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public HandlerTagDefn createHandlerTagDefn()
- {
- HandlerTagDefnImpl handlerTagDefn = new HandlerTagDefnImpl();
- return handlerTagDefn;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public SourceTagDefn createSourceTagDefn()
- {
- SourceTagDefnImpl sourceTagDefn = new SourceTagDefnImpl();
- return sourceTagDefn;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public TagDefn createTagDefn()
- {
- TagDefnImpl tagDefn = new TagDefnImpl();
- return tagDefn;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public FunctionDefn createFunctionDefn()
- {
- FunctionDefnImpl functionDefn = new FunctionDefnImpl();
- return functionDefn;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public FaceletTaglib_1_0Package getFaceletTaglib_1_0Package()
- {
- return (FaceletTaglib_1_0Package)getEPackage();
- }
-
- /**
- * <!-- begin-user-doc -->
- * @return the package.
- * <!-- end-user-doc -->
- * @deprecated
- * @generated
- */
- @Deprecated
- public static FaceletTaglib_1_0Package getPackage()
- {
- return FaceletTaglib_1_0Package.eINSTANCE;
- }
-
-} //FaceletTaglib_1_0FactoryImpl
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib_1_0/impl/FaceletTaglib_1_0PackageImpl.java b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib_1_0/impl/FaceletTaglib_1_0PackageImpl.java
deleted file mode 100644
index ca7436d..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib_1_0/impl/FaceletTaglib_1_0PackageImpl.java
+++ /dev/null
@@ -1,550 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: FaceletTaglib_1_0PackageImpl.java,v 1.1 2010/03/18 06:24:27 cbateman Exp $
- */
-package org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.impl;
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.ecore.impl.EPackageImpl;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.ComponentTagDefn;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.ConverterTagDefn;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.FaceletLibraryClassTagLib;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.FaceletTaglibDefn;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.FaceletTaglib_1_0Factory;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.FaceletTaglib_1_0Package;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.FaceletXMLDefnTaglib;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.FunctionDefn;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.HandlerTagDefn;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.SourceTagDefn;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.TagDefn;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.ValidatorTagDefn;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model <b>Package</b>.
- * <!-- end-user-doc -->
- * @generated
- */
-public class FaceletTaglib_1_0PackageImpl extends EPackageImpl implements FaceletTaglib_1_0Package
-{
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private EClass faceletLibraryClassTagLibEClass = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private EClass faceletXMLDefnTaglibEClass = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private EClass faceletTaglibDefnEClass = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private EClass componentTagDefnEClass = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private EClass validatorTagDefnEClass = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private EClass converterTagDefnEClass = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private EClass handlerTagDefnEClass = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private EClass sourceTagDefnEClass = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private EClass tagDefnEClass = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private EClass functionDefnEClass = 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.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.FaceletTaglib_1_0Package#eNS_URI
- * @see #init()
- * @generated
- */
- private FaceletTaglib_1_0PackageImpl()
- {
- super(eNS_URI, FaceletTaglib_1_0Factory.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.
- *
- * <p>This method is used to initialize {@link FaceletTaglib_1_0Package#eINSTANCE} when that field is accessed.
- * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.
- * <!-- begin-user-doc -->
- * @return the package.
- * <!-- end-user-doc -->
- * @see #eNS_URI
- * @see #createPackageContents()
- * @see #initializePackageContents()
- * @generated
- */
- public static FaceletTaglib_1_0Package init()
- {
- if (isInited) return (FaceletTaglib_1_0Package)EPackage.Registry.INSTANCE.getEPackage(FaceletTaglib_1_0Package.eNS_URI);
-
- // Obtain or create and register package
- FaceletTaglib_1_0PackageImpl theFaceletTaglib_1_0Package = (FaceletTaglib_1_0PackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof FaceletTaglib_1_0PackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new FaceletTaglib_1_0PackageImpl());
-
- isInited = true;
-
- // Create package meta-data objects
- theFaceletTaglib_1_0Package.createPackageContents();
-
- // Initialize created meta-data
- theFaceletTaglib_1_0Package.initializePackageContents();
-
- // Mark meta-data to indicate it can't be changed
- theFaceletTaglib_1_0Package.freeze();
-
-
- // Update the registry and return the package
- EPackage.Registry.INSTANCE.put(FaceletTaglib_1_0Package.eNS_URI, theFaceletTaglib_1_0Package);
- return theFaceletTaglib_1_0Package;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EClass getFaceletLibraryClassTagLib()
- {
- return faceletLibraryClassTagLibEClass;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getFaceletLibraryClassTagLib_LibraryClass()
- {
- return (EAttribute)faceletLibraryClassTagLibEClass.getEStructuralFeatures().get(0);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EClass getFaceletXMLDefnTaglib()
- {
- return faceletXMLDefnTaglibEClass;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getFaceletXMLDefnTaglib_Namespace()
- {
- return (EAttribute)faceletXMLDefnTaglibEClass.getEStructuralFeatures().get(0);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EReference getFaceletXMLDefnTaglib_Tags()
- {
- return (EReference)faceletXMLDefnTaglibEClass.getEStructuralFeatures().get(1);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EReference getFaceletXMLDefnTaglib_Functions()
- {
- return (EReference)faceletXMLDefnTaglibEClass.getEStructuralFeatures().get(2);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EClass getFaceletTaglibDefn()
- {
- return faceletTaglibDefnEClass;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EClass getComponentTagDefn()
- {
- return componentTagDefnEClass;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getComponentTagDefn_ComponentType()
- {
- return (EAttribute)componentTagDefnEClass.getEStructuralFeatures().get(0);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getComponentTagDefn_RendererType()
- {
- return (EAttribute)componentTagDefnEClass.getEStructuralFeatures().get(1);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EClass getValidatorTagDefn()
- {
- return validatorTagDefnEClass;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getValidatorTagDefn_ValidatorId()
- {
- return (EAttribute)validatorTagDefnEClass.getEStructuralFeatures().get(0);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EClass getConverterTagDefn()
- {
- return converterTagDefnEClass;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getConverterTagDefn_ConverterId()
- {
- return (EAttribute)converterTagDefnEClass.getEStructuralFeatures().get(0);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EClass getHandlerTagDefn()
- {
- return handlerTagDefnEClass;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getHandlerTagDefn_HandlerClass()
- {
- return (EAttribute)handlerTagDefnEClass.getEStructuralFeatures().get(0);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EClass getSourceTagDefn()
- {
- return sourceTagDefnEClass;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getSourceTagDefn_Source()
- {
- return (EAttribute)sourceTagDefnEClass.getEStructuralFeatures().get(0);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EClass getTagDefn()
- {
- return tagDefnEClass;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getTagDefn_Name()
- {
- return (EAttribute)tagDefnEClass.getEStructuralFeatures().get(0);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EClass getFunctionDefn()
- {
- return functionDefnEClass;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getFunctionDefn_FunctionName()
- {
- return (EAttribute)functionDefnEClass.getEStructuralFeatures().get(0);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getFunctionDefn_FunctionClass()
- {
- return (EAttribute)functionDefnEClass.getEStructuralFeatures().get(1);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getFunctionDefn_FunctionSignature()
- {
- return (EAttribute)functionDefnEClass.getEStructuralFeatures().get(2);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public FaceletTaglib_1_0Factory getFaceletTaglib_1_0Factory()
- {
- return (FaceletTaglib_1_0Factory)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
- faceletLibraryClassTagLibEClass = createEClass(FACELET_LIBRARY_CLASS_TAG_LIB);
- createEAttribute(faceletLibraryClassTagLibEClass, FACELET_LIBRARY_CLASS_TAG_LIB__LIBRARY_CLASS);
-
- faceletXMLDefnTaglibEClass = createEClass(FACELET_XML_DEFN_TAGLIB);
- createEAttribute(faceletXMLDefnTaglibEClass, FACELET_XML_DEFN_TAGLIB__NAMESPACE);
- createEReference(faceletXMLDefnTaglibEClass, FACELET_XML_DEFN_TAGLIB__TAGS);
- createEReference(faceletXMLDefnTaglibEClass, FACELET_XML_DEFN_TAGLIB__FUNCTIONS);
-
- faceletTaglibDefnEClass = createEClass(FACELET_TAGLIB_DEFN);
-
- componentTagDefnEClass = createEClass(COMPONENT_TAG_DEFN);
- createEAttribute(componentTagDefnEClass, COMPONENT_TAG_DEFN__COMPONENT_TYPE);
- createEAttribute(componentTagDefnEClass, COMPONENT_TAG_DEFN__RENDERER_TYPE);
-
- validatorTagDefnEClass = createEClass(VALIDATOR_TAG_DEFN);
- createEAttribute(validatorTagDefnEClass, VALIDATOR_TAG_DEFN__VALIDATOR_ID);
-
- converterTagDefnEClass = createEClass(CONVERTER_TAG_DEFN);
- createEAttribute(converterTagDefnEClass, CONVERTER_TAG_DEFN__CONVERTER_ID);
-
- handlerTagDefnEClass = createEClass(HANDLER_TAG_DEFN);
- createEAttribute(handlerTagDefnEClass, HANDLER_TAG_DEFN__HANDLER_CLASS);
-
- sourceTagDefnEClass = createEClass(SOURCE_TAG_DEFN);
- createEAttribute(sourceTagDefnEClass, SOURCE_TAG_DEFN__SOURCE);
-
- tagDefnEClass = createEClass(TAG_DEFN);
- createEAttribute(tagDefnEClass, TAG_DEFN__NAME);
-
- functionDefnEClass = createEClass(FUNCTION_DEFN);
- createEAttribute(functionDefnEClass, FUNCTION_DEFN__FUNCTION_NAME);
- createEAttribute(functionDefnEClass, FUNCTION_DEFN__FUNCTION_CLASS);
- createEAttribute(functionDefnEClass, FUNCTION_DEFN__FUNCTION_SIGNATURE);
- }
-
- /**
- * <!-- 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);
-
- // Create type parameters
-
- // Set bounds for type parameters
-
- // Add supertypes to classes
- faceletLibraryClassTagLibEClass.getESuperTypes().add(this.getFaceletTaglibDefn());
- faceletXMLDefnTaglibEClass.getESuperTypes().add(this.getFaceletTaglibDefn());
- componentTagDefnEClass.getESuperTypes().add(this.getHandlerTagDefn());
- validatorTagDefnEClass.getESuperTypes().add(this.getHandlerTagDefn());
- converterTagDefnEClass.getESuperTypes().add(this.getHandlerTagDefn());
- handlerTagDefnEClass.getESuperTypes().add(this.getTagDefn());
- sourceTagDefnEClass.getESuperTypes().add(this.getTagDefn());
-
- // Initialize classes and features; add operations and parameters
- initEClass(faceletLibraryClassTagLibEClass, FaceletLibraryClassTagLib.class, "FaceletLibraryClassTagLib", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEAttribute(getFaceletLibraryClassTagLib_LibraryClass(), ecorePackage.getEString(), "libraryClass", null, 0, 1, FaceletLibraryClassTagLib.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
- initEClass(faceletXMLDefnTaglibEClass, FaceletXMLDefnTaglib.class, "FaceletXMLDefnTaglib", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEAttribute(getFaceletXMLDefnTaglib_Namespace(), ecorePackage.getEString(), "namespace", null, 0, 1, FaceletXMLDefnTaglib.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getFaceletXMLDefnTaglib_Tags(), this.getTagDefn(), null, "tags", null, 0, -1, FaceletXMLDefnTaglib.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getFaceletXMLDefnTaglib_Functions(), this.getFunctionDefn(), null, "functions", null, 0, -1, FaceletXMLDefnTaglib.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
- initEClass(faceletTaglibDefnEClass, FaceletTaglibDefn.class, "FaceletTaglibDefn", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-
- initEClass(componentTagDefnEClass, ComponentTagDefn.class, "ComponentTagDefn", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEAttribute(getComponentTagDefn_ComponentType(), ecorePackage.getEString(), "componentType", null, 0, 1, ComponentTagDefn.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getComponentTagDefn_RendererType(), ecorePackage.getEString(), "rendererType", null, 0, 1, ComponentTagDefn.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
- initEClass(validatorTagDefnEClass, ValidatorTagDefn.class, "ValidatorTagDefn", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEAttribute(getValidatorTagDefn_ValidatorId(), ecorePackage.getEString(), "validatorId", null, 0, 1, ValidatorTagDefn.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
- initEClass(converterTagDefnEClass, ConverterTagDefn.class, "ConverterTagDefn", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEAttribute(getConverterTagDefn_ConverterId(), ecorePackage.getEString(), "converterId", null, 0, 1, ConverterTagDefn.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
- initEClass(handlerTagDefnEClass, HandlerTagDefn.class, "HandlerTagDefn", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEAttribute(getHandlerTagDefn_HandlerClass(), ecorePackage.getEString(), "handlerClass", null, 0, 1, HandlerTagDefn.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
- initEClass(sourceTagDefnEClass, SourceTagDefn.class, "SourceTagDefn", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEAttribute(getSourceTagDefn_Source(), ecorePackage.getEString(), "source", null, 0, 1, SourceTagDefn.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
- initEClass(tagDefnEClass, TagDefn.class, "TagDefn", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEAttribute(getTagDefn_Name(), ecorePackage.getEString(), "name", null, 0, 1, TagDefn.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
- initEClass(functionDefnEClass, FunctionDefn.class, "FunctionDefn", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEAttribute(getFunctionDefn_FunctionName(), ecorePackage.getEString(), "functionName", null, 0, 1, FunctionDefn.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getFunctionDefn_FunctionClass(), ecorePackage.getEString(), "functionClass", null, 0, 1, FunctionDefn.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(getFunctionDefn_FunctionSignature(), ecorePackage.getEString(), "functionSignature", null, 0, 1, FunctionDefn.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
- // Create resource
- createResource(eNS_URI);
- }
-
-} //FaceletTaglib_1_0PackageImpl
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib_1_0/impl/FaceletXMLDefnTaglibImpl.java b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib_1_0/impl/FaceletXMLDefnTaglibImpl.java
deleted file mode 100644
index e461e93..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib_1_0/impl/FaceletXMLDefnTaglibImpl.java
+++ /dev/null
@@ -1,256 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: FaceletXMLDefnTaglibImpl.java,v 1.1 2010/03/18 06:24:28 cbateman Exp $
- */
-package org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.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.util.EObjectResolvingEList;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.FaceletTaglib_1_0Package;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.FaceletXMLDefnTaglib;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.FunctionDefn;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.TagDefn;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Facelet XML Defn Taglib</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- * <li>{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.impl.FaceletXMLDefnTaglibImpl#getNamespace <em>Namespace</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.impl.FaceletXMLDefnTaglibImpl#getTags <em>Tags</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.impl.FaceletXMLDefnTaglibImpl#getFunctions <em>Functions</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class FaceletXMLDefnTaglibImpl extends FaceletTaglibDefnImpl implements FaceletXMLDefnTaglib
-{
- /**
- * The default value of the '{@link #getNamespace() <em>Namespace</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getNamespace()
- * @generated
- * @ordered
- */
- protected static final String NAMESPACE_EDEFAULT = null;
-
- /**
- * The cached value of the '{@link #getNamespace() <em>Namespace</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getNamespace()
- * @generated
- * @ordered
- */
- protected String namespace = NAMESPACE_EDEFAULT;
-
- /**
- * The cached value of the '{@link #getTags() <em>Tags</em>}' reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getTags()
- * @generated
- * @ordered
- */
- protected EList<TagDefn> tags;
-
- /**
- * The cached value of the '{@link #getFunctions() <em>Functions</em>}' reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getFunctions()
- * @generated
- * @ordered
- */
- protected EList<FunctionDefn> functions;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected FaceletXMLDefnTaglibImpl()
- {
- super();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- protected EClass eStaticClass()
- {
- return FaceletTaglib_1_0Package.Literals.FACELET_XML_DEFN_TAGLIB;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public String getNamespace()
- {
- return namespace;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setNamespace(String newNamespace)
- {
- String oldNamespace = namespace;
- namespace = newNamespace;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, FaceletTaglib_1_0Package.FACELET_XML_DEFN_TAGLIB__NAMESPACE, oldNamespace, namespace));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EList<TagDefn> getTags()
- {
- if (tags == null)
- {
- tags = new EObjectResolvingEList<TagDefn>(TagDefn.class, this, FaceletTaglib_1_0Package.FACELET_XML_DEFN_TAGLIB__TAGS);
- }
- return tags;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EList<FunctionDefn> getFunctions()
- {
- if (functions == null)
- {
- functions = new EObjectResolvingEList<FunctionDefn>(FunctionDefn.class, this, FaceletTaglib_1_0Package.FACELET_XML_DEFN_TAGLIB__FUNCTIONS);
- }
- return functions;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public Object eGet(int featureID, boolean resolve, boolean coreType)
- {
- switch (featureID)
- {
- case FaceletTaglib_1_0Package.FACELET_XML_DEFN_TAGLIB__NAMESPACE:
- return getNamespace();
- case FaceletTaglib_1_0Package.FACELET_XML_DEFN_TAGLIB__TAGS:
- return getTags();
- case FaceletTaglib_1_0Package.FACELET_XML_DEFN_TAGLIB__FUNCTIONS:
- return getFunctions();
- }
- return super.eGet(featureID, resolve, coreType);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @SuppressWarnings("unchecked")
- @Override
- public void eSet(int featureID, Object newValue)
- {
- switch (featureID)
- {
- case FaceletTaglib_1_0Package.FACELET_XML_DEFN_TAGLIB__NAMESPACE:
- setNamespace((String)newValue);
- return;
- case FaceletTaglib_1_0Package.FACELET_XML_DEFN_TAGLIB__TAGS:
- getTags().clear();
- getTags().addAll((Collection<? extends TagDefn>)newValue);
- return;
- case FaceletTaglib_1_0Package.FACELET_XML_DEFN_TAGLIB__FUNCTIONS:
- getFunctions().clear();
- getFunctions().addAll((Collection<? extends FunctionDefn>)newValue);
- return;
- }
- super.eSet(featureID, newValue);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public void eUnset(int featureID)
- {
- switch (featureID)
- {
- case FaceletTaglib_1_0Package.FACELET_XML_DEFN_TAGLIB__NAMESPACE:
- setNamespace(NAMESPACE_EDEFAULT);
- return;
- case FaceletTaglib_1_0Package.FACELET_XML_DEFN_TAGLIB__TAGS:
- getTags().clear();
- return;
- case FaceletTaglib_1_0Package.FACELET_XML_DEFN_TAGLIB__FUNCTIONS:
- getFunctions().clear();
- return;
- }
- super.eUnset(featureID);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public boolean eIsSet(int featureID)
- {
- switch (featureID)
- {
- case FaceletTaglib_1_0Package.FACELET_XML_DEFN_TAGLIB__NAMESPACE:
- return NAMESPACE_EDEFAULT == null ? namespace != null : !NAMESPACE_EDEFAULT.equals(namespace);
- case FaceletTaglib_1_0Package.FACELET_XML_DEFN_TAGLIB__TAGS:
- return tags != null && !tags.isEmpty();
- case FaceletTaglib_1_0Package.FACELET_XML_DEFN_TAGLIB__FUNCTIONS:
- return functions != null && !functions.isEmpty();
- }
- return super.eIsSet(featureID);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public String toString()
- {
- if (eIsProxy()) return super.toString();
-
- StringBuffer result = new StringBuffer(super.toString());
- result.append(" (namespace: "); //$NON-NLS-1$
- result.append(namespace);
- result.append(')');
- return result.toString();
- }
-
-} //FaceletXMLDefnTaglibImpl
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib_1_0/impl/FunctionDefnImpl.java b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib_1_0/impl/FunctionDefnImpl.java
deleted file mode 100644
index d11932c..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib_1_0/impl/FunctionDefnImpl.java
+++ /dev/null
@@ -1,290 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: FunctionDefnImpl.java,v 1.1 2010/03/18 06:24:28 cbateman Exp $
- */
-package org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.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.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.FaceletTaglib_1_0Package;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.FunctionDefn;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Function Defn</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- * <li>{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.impl.FunctionDefnImpl#getFunctionName <em>Function Name</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.impl.FunctionDefnImpl#getFunctionClass <em>Function Class</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.impl.FunctionDefnImpl#getFunctionSignature <em>Function Signature</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class FunctionDefnImpl extends EObjectImpl implements FunctionDefn
-{
- /**
- * The default value of the '{@link #getFunctionName() <em>Function Name</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getFunctionName()
- * @generated
- * @ordered
- */
- protected static final String FUNCTION_NAME_EDEFAULT = null;
-
- /**
- * The cached value of the '{@link #getFunctionName() <em>Function Name</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getFunctionName()
- * @generated
- * @ordered
- */
- protected String functionName = FUNCTION_NAME_EDEFAULT;
-
- /**
- * The default value of the '{@link #getFunctionClass() <em>Function Class</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getFunctionClass()
- * @generated
- * @ordered
- */
- protected static final String FUNCTION_CLASS_EDEFAULT = null;
-
- /**
- * The cached value of the '{@link #getFunctionClass() <em>Function Class</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getFunctionClass()
- * @generated
- * @ordered
- */
- protected String functionClass = FUNCTION_CLASS_EDEFAULT;
-
- /**
- * The default value of the '{@link #getFunctionSignature() <em>Function Signature</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getFunctionSignature()
- * @generated
- * @ordered
- */
- protected static final String FUNCTION_SIGNATURE_EDEFAULT = null;
-
- /**
- * The cached value of the '{@link #getFunctionSignature() <em>Function Signature</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getFunctionSignature()
- * @generated
- * @ordered
- */
- protected String functionSignature = FUNCTION_SIGNATURE_EDEFAULT;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected FunctionDefnImpl()
- {
- super();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- protected EClass eStaticClass()
- {
- return FaceletTaglib_1_0Package.Literals.FUNCTION_DEFN;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public String getFunctionName()
- {
- return functionName;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setFunctionName(String newFunctionName)
- {
- String oldFunctionName = functionName;
- functionName = newFunctionName;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, FaceletTaglib_1_0Package.FUNCTION_DEFN__FUNCTION_NAME, oldFunctionName, functionName));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public String getFunctionClass()
- {
- return functionClass;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setFunctionClass(String newFunctionClass)
- {
- String oldFunctionClass = functionClass;
- functionClass = newFunctionClass;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, FaceletTaglib_1_0Package.FUNCTION_DEFN__FUNCTION_CLASS, oldFunctionClass, functionClass));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public String getFunctionSignature()
- {
- return functionSignature;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setFunctionSignature(String newFunctionSignature)
- {
- String oldFunctionSignature = functionSignature;
- functionSignature = newFunctionSignature;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, FaceletTaglib_1_0Package.FUNCTION_DEFN__FUNCTION_SIGNATURE, oldFunctionSignature, functionSignature));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public Object eGet(int featureID, boolean resolve, boolean coreType)
- {
- switch (featureID)
- {
- case FaceletTaglib_1_0Package.FUNCTION_DEFN__FUNCTION_NAME:
- return getFunctionName();
- case FaceletTaglib_1_0Package.FUNCTION_DEFN__FUNCTION_CLASS:
- return getFunctionClass();
- case FaceletTaglib_1_0Package.FUNCTION_DEFN__FUNCTION_SIGNATURE:
- return getFunctionSignature();
- }
- return super.eGet(featureID, resolve, coreType);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public void eSet(int featureID, Object newValue)
- {
- switch (featureID)
- {
- case FaceletTaglib_1_0Package.FUNCTION_DEFN__FUNCTION_NAME:
- setFunctionName((String)newValue);
- return;
- case FaceletTaglib_1_0Package.FUNCTION_DEFN__FUNCTION_CLASS:
- setFunctionClass((String)newValue);
- return;
- case FaceletTaglib_1_0Package.FUNCTION_DEFN__FUNCTION_SIGNATURE:
- setFunctionSignature((String)newValue);
- return;
- }
- super.eSet(featureID, newValue);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public void eUnset(int featureID)
- {
- switch (featureID)
- {
- case FaceletTaglib_1_0Package.FUNCTION_DEFN__FUNCTION_NAME:
- setFunctionName(FUNCTION_NAME_EDEFAULT);
- return;
- case FaceletTaglib_1_0Package.FUNCTION_DEFN__FUNCTION_CLASS:
- setFunctionClass(FUNCTION_CLASS_EDEFAULT);
- return;
- case FaceletTaglib_1_0Package.FUNCTION_DEFN__FUNCTION_SIGNATURE:
- setFunctionSignature(FUNCTION_SIGNATURE_EDEFAULT);
- return;
- }
- super.eUnset(featureID);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public boolean eIsSet(int featureID)
- {
- switch (featureID)
- {
- case FaceletTaglib_1_0Package.FUNCTION_DEFN__FUNCTION_NAME:
- return FUNCTION_NAME_EDEFAULT == null ? functionName != null : !FUNCTION_NAME_EDEFAULT.equals(functionName);
- case FaceletTaglib_1_0Package.FUNCTION_DEFN__FUNCTION_CLASS:
- return FUNCTION_CLASS_EDEFAULT == null ? functionClass != null : !FUNCTION_CLASS_EDEFAULT.equals(functionClass);
- case FaceletTaglib_1_0Package.FUNCTION_DEFN__FUNCTION_SIGNATURE:
- return FUNCTION_SIGNATURE_EDEFAULT == null ? functionSignature != null : !FUNCTION_SIGNATURE_EDEFAULT.equals(functionSignature);
- }
- return super.eIsSet(featureID);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public String toString()
- {
- if (eIsProxy()) return super.toString();
-
- StringBuffer result = new StringBuffer(super.toString());
- result.append(" (functionName: "); //$NON-NLS-1$
- result.append(functionName);
- result.append(", functionClass: "); //$NON-NLS-1$
- result.append(functionClass);
- result.append(", functionSignature: "); //$NON-NLS-1$
- result.append(functionSignature);
- result.append(')');
- return result.toString();
- }
-
-} //FunctionDefnImpl
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib_1_0/impl/HandlerTagDefnImpl.java b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib_1_0/impl/HandlerTagDefnImpl.java
deleted file mode 100644
index 0fbc010..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib_1_0/impl/HandlerTagDefnImpl.java
+++ /dev/null
@@ -1,177 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: HandlerTagDefnImpl.java,v 1.1 2010/03/18 06:24:28 cbateman Exp $
- */
-package org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.FaceletTaglib_1_0Package;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.HandlerTagDefn;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Handler Tag Defn</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- * <li>{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.impl.HandlerTagDefnImpl#getHandlerClass <em>Handler Class</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class HandlerTagDefnImpl extends TagDefnImpl implements HandlerTagDefn
-{
- /**
- * The default value of the '{@link #getHandlerClass() <em>Handler Class</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getHandlerClass()
- * @generated
- * @ordered
- */
- protected static final String HANDLER_CLASS_EDEFAULT = null;
-
- /**
- * The cached value of the '{@link #getHandlerClass() <em>Handler Class</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getHandlerClass()
- * @generated
- * @ordered
- */
- protected String handlerClass = HANDLER_CLASS_EDEFAULT;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected HandlerTagDefnImpl()
- {
- super();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- protected EClass eStaticClass()
- {
- return FaceletTaglib_1_0Package.Literals.HANDLER_TAG_DEFN;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public String getHandlerClass()
- {
- return handlerClass;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setHandlerClass(String newHandlerClass)
- {
- String oldHandlerClass = handlerClass;
- handlerClass = newHandlerClass;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, FaceletTaglib_1_0Package.HANDLER_TAG_DEFN__HANDLER_CLASS, oldHandlerClass, handlerClass));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public Object eGet(int featureID, boolean resolve, boolean coreType)
- {
- switch (featureID)
- {
- case FaceletTaglib_1_0Package.HANDLER_TAG_DEFN__HANDLER_CLASS:
- return getHandlerClass();
- }
- return super.eGet(featureID, resolve, coreType);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public void eSet(int featureID, Object newValue)
- {
- switch (featureID)
- {
- case FaceletTaglib_1_0Package.HANDLER_TAG_DEFN__HANDLER_CLASS:
- setHandlerClass((String)newValue);
- return;
- }
- super.eSet(featureID, newValue);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public void eUnset(int featureID)
- {
- switch (featureID)
- {
- case FaceletTaglib_1_0Package.HANDLER_TAG_DEFN__HANDLER_CLASS:
- setHandlerClass(HANDLER_CLASS_EDEFAULT);
- return;
- }
- super.eUnset(featureID);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public boolean eIsSet(int featureID)
- {
- switch (featureID)
- {
- case FaceletTaglib_1_0Package.HANDLER_TAG_DEFN__HANDLER_CLASS:
- return HANDLER_CLASS_EDEFAULT == null ? handlerClass != null : !HANDLER_CLASS_EDEFAULT.equals(handlerClass);
- }
- return super.eIsSet(featureID);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public String toString()
- {
- if (eIsProxy()) return super.toString();
-
- StringBuffer result = new StringBuffer(super.toString());
- result.append(" (handlerClass: "); //$NON-NLS-1$
- result.append(handlerClass);
- result.append(')');
- return result.toString();
- }
-
-} //HandlerTagDefnImpl
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib_1_0/impl/SourceTagDefnImpl.java b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib_1_0/impl/SourceTagDefnImpl.java
deleted file mode 100644
index 95b98bf..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib_1_0/impl/SourceTagDefnImpl.java
+++ /dev/null
@@ -1,177 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: SourceTagDefnImpl.java,v 1.1 2010/03/18 06:24:28 cbateman Exp $
- */
-package org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.FaceletTaglib_1_0Package;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.SourceTagDefn;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Source Tag Defn</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- * <li>{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.impl.SourceTagDefnImpl#getSource <em>Source</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class SourceTagDefnImpl extends TagDefnImpl implements SourceTagDefn
-{
- /**
- * The default value of the '{@link #getSource() <em>Source</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getSource()
- * @generated
- * @ordered
- */
- protected static final String SOURCE_EDEFAULT = null;
-
- /**
- * The cached value of the '{@link #getSource() <em>Source</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getSource()
- * @generated
- * @ordered
- */
- protected String source = SOURCE_EDEFAULT;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected SourceTagDefnImpl()
- {
- super();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- protected EClass eStaticClass()
- {
- return FaceletTaglib_1_0Package.Literals.SOURCE_TAG_DEFN;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public String getSource()
- {
- return source;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setSource(String newSource)
- {
- String oldSource = source;
- source = newSource;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, FaceletTaglib_1_0Package.SOURCE_TAG_DEFN__SOURCE, oldSource, source));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public Object eGet(int featureID, boolean resolve, boolean coreType)
- {
- switch (featureID)
- {
- case FaceletTaglib_1_0Package.SOURCE_TAG_DEFN__SOURCE:
- return getSource();
- }
- return super.eGet(featureID, resolve, coreType);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public void eSet(int featureID, Object newValue)
- {
- switch (featureID)
- {
- case FaceletTaglib_1_0Package.SOURCE_TAG_DEFN__SOURCE:
- setSource((String)newValue);
- return;
- }
- super.eSet(featureID, newValue);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public void eUnset(int featureID)
- {
- switch (featureID)
- {
- case FaceletTaglib_1_0Package.SOURCE_TAG_DEFN__SOURCE:
- setSource(SOURCE_EDEFAULT);
- return;
- }
- super.eUnset(featureID);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public boolean eIsSet(int featureID)
- {
- switch (featureID)
- {
- case FaceletTaglib_1_0Package.SOURCE_TAG_DEFN__SOURCE:
- return SOURCE_EDEFAULT == null ? source != null : !SOURCE_EDEFAULT.equals(source);
- }
- return super.eIsSet(featureID);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public String toString()
- {
- if (eIsProxy()) return super.toString();
-
- StringBuffer result = new StringBuffer(super.toString());
- result.append(" (source: "); //$NON-NLS-1$
- result.append(source);
- result.append(')');
- return result.toString();
- }
-
-} //SourceTagDefnImpl
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib_1_0/impl/TagDefnImpl.java b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib_1_0/impl/TagDefnImpl.java
deleted file mode 100644
index 68a7c59..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib_1_0/impl/TagDefnImpl.java
+++ /dev/null
@@ -1,178 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: TagDefnImpl.java,v 1.1 2010/03/18 06:24:28 cbateman Exp $
- */
-package org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.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.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.FaceletTaglib_1_0Package;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.TagDefn;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Tag Defn</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- * <li>{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.impl.TagDefnImpl#getName <em>Name</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class TagDefnImpl extends EObjectImpl implements TagDefn
-{
- /**
- * The default value of the '{@link #getName() <em>Name</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getName()
- * @generated
- * @ordered
- */
- protected static final String NAME_EDEFAULT = null;
-
- /**
- * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getName()
- * @generated
- * @ordered
- */
- protected String name = NAME_EDEFAULT;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected TagDefnImpl()
- {
- super();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- protected EClass eStaticClass()
- {
- return FaceletTaglib_1_0Package.Literals.TAG_DEFN;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public String getName()
- {
- return name;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setName(String newName)
- {
- String oldName = name;
- name = newName;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, FaceletTaglib_1_0Package.TAG_DEFN__NAME, oldName, name));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public Object eGet(int featureID, boolean resolve, boolean coreType)
- {
- switch (featureID)
- {
- case FaceletTaglib_1_0Package.TAG_DEFN__NAME:
- return getName();
- }
- return super.eGet(featureID, resolve, coreType);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public void eSet(int featureID, Object newValue)
- {
- switch (featureID)
- {
- case FaceletTaglib_1_0Package.TAG_DEFN__NAME:
- setName((String)newValue);
- return;
- }
- super.eSet(featureID, newValue);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public void eUnset(int featureID)
- {
- switch (featureID)
- {
- case FaceletTaglib_1_0Package.TAG_DEFN__NAME:
- setName(NAME_EDEFAULT);
- return;
- }
- super.eUnset(featureID);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public boolean eIsSet(int featureID)
- {
- switch (featureID)
- {
- case FaceletTaglib_1_0Package.TAG_DEFN__NAME:
- return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
- }
- return super.eIsSet(featureID);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public String toString()
- {
- if (eIsProxy()) return super.toString();
-
- StringBuffer result = new StringBuffer(super.toString());
- result.append(" (name: "); //$NON-NLS-1$
- result.append(name);
- result.append(')');
- return result.toString();
- }
-
-} //TagDefnImpl
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib_1_0/impl/ValidatorTagDefnImpl.java b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib_1_0/impl/ValidatorTagDefnImpl.java
deleted file mode 100644
index 3cc23ac..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib_1_0/impl/ValidatorTagDefnImpl.java
+++ /dev/null
@@ -1,177 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: ValidatorTagDefnImpl.java,v 1.1 2010/03/18 06:24:28 cbateman Exp $
- */
-package org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.FaceletTaglib_1_0Package;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.ValidatorTagDefn;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Validator Tag Defn</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- * <li>{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.impl.ValidatorTagDefnImpl#getValidatorId <em>Validator Id</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class ValidatorTagDefnImpl extends HandlerTagDefnImpl implements ValidatorTagDefn
-{
- /**
- * The default value of the '{@link #getValidatorId() <em>Validator Id</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getValidatorId()
- * @generated
- * @ordered
- */
- protected static final String VALIDATOR_ID_EDEFAULT = null;
-
- /**
- * The cached value of the '{@link #getValidatorId() <em>Validator Id</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getValidatorId()
- * @generated
- * @ordered
- */
- protected String validatorId = VALIDATOR_ID_EDEFAULT;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected ValidatorTagDefnImpl()
- {
- super();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- protected EClass eStaticClass()
- {
- return FaceletTaglib_1_0Package.Literals.VALIDATOR_TAG_DEFN;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public String getValidatorId()
- {
- return validatorId;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setValidatorId(String newValidatorId)
- {
- String oldValidatorId = validatorId;
- validatorId = newValidatorId;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, FaceletTaglib_1_0Package.VALIDATOR_TAG_DEFN__VALIDATOR_ID, oldValidatorId, validatorId));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public Object eGet(int featureID, boolean resolve, boolean coreType)
- {
- switch (featureID)
- {
- case FaceletTaglib_1_0Package.VALIDATOR_TAG_DEFN__VALIDATOR_ID:
- return getValidatorId();
- }
- return super.eGet(featureID, resolve, coreType);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public void eSet(int featureID, Object newValue)
- {
- switch (featureID)
- {
- case FaceletTaglib_1_0Package.VALIDATOR_TAG_DEFN__VALIDATOR_ID:
- setValidatorId((String)newValue);
- return;
- }
- super.eSet(featureID, newValue);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public void eUnset(int featureID)
- {
- switch (featureID)
- {
- case FaceletTaglib_1_0Package.VALIDATOR_TAG_DEFN__VALIDATOR_ID:
- setValidatorId(VALIDATOR_ID_EDEFAULT);
- return;
- }
- super.eUnset(featureID);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public boolean eIsSet(int featureID)
- {
- switch (featureID)
- {
- case FaceletTaglib_1_0Package.VALIDATOR_TAG_DEFN__VALIDATOR_ID:
- return VALIDATOR_ID_EDEFAULT == null ? validatorId != null : !VALIDATOR_ID_EDEFAULT.equals(validatorId);
- }
- return super.eIsSet(featureID);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public String toString()
- {
- if (eIsProxy()) return super.toString();
-
- StringBuffer result = new StringBuffer(super.toString());
- result.append(" (validatorId: "); //$NON-NLS-1$
- result.append(validatorId);
- result.append(')');
- return result.toString();
- }
-
-} //ValidatorTagDefnImpl
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib_1_0/util/FaceletTaglibAdapterFactory.java b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib_1_0/util/FaceletTaglibAdapterFactory.java
deleted file mode 100644
index e7bc103..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib_1_0/util/FaceletTaglibAdapterFactory.java
+++ /dev/null
@@ -1,323 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: FaceletTaglibAdapterFactory.java,v 1.1 2010/03/18 06:24:40 cbateman Exp $
- */
-package org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.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.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.ComponentTagDefn;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.ConverterTagDefn;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.FaceletLibraryClassTagLib;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.FaceletTaglibDefn;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.FaceletTaglibPackage;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.FaceletXMLDefnTaglib;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.FunctionDefn;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.HandlerTagDefn;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.SourceTagDefn;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.TagDefn;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.ValidatorTagDefn;
-
-/**
- * <!-- 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.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.FaceletTaglibPackage
- * @generated
- */
-public class FaceletTaglibAdapterFactory extends AdapterFactoryImpl
-{
- /**
- * The cached model package.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected static FaceletTaglibPackage modelPackage;
-
- /**
- * Creates an instance of the adapter factory.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public FaceletTaglibAdapterFactory()
- {
- if (modelPackage == null)
- {
- modelPackage = FaceletTaglibPackage.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
- */
- @Override
- 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 FaceletTaglibSwitch<Adapter> modelSwitch =
- new FaceletTaglibSwitch<Adapter>()
- {
- @Override
- public Adapter caseFaceletLibraryClassTagLib(FaceletLibraryClassTagLib object)
- {
- return createFaceletLibraryClassTagLibAdapter();
- }
- @Override
- public Adapter caseFaceletXMLDefnTaglib(FaceletXMLDefnTaglib object)
- {
- return createFaceletXMLDefnTaglibAdapter();
- }
- @Override
- public Adapter caseFaceletTaglibDefn(FaceletTaglibDefn object)
- {
- return createFaceletTaglibDefnAdapter();
- }
- @Override
- public Adapter caseComponentTagDefn(ComponentTagDefn object)
- {
- return createComponentTagDefnAdapter();
- }
- @Override
- public Adapter caseValidatorTagDefn(ValidatorTagDefn object)
- {
- return createValidatorTagDefnAdapter();
- }
- @Override
- public Adapter caseConverterTagDefn(ConverterTagDefn object)
- {
- return createConverterTagDefnAdapter();
- }
- @Override
- public Adapter caseHandlerTagDefn(HandlerTagDefn object)
- {
- return createHandlerTagDefnAdapter();
- }
- @Override
- public Adapter caseSourceTagDefn(SourceTagDefn object)
- {
- return createSourceTagDefnAdapter();
- }
- @Override
- public Adapter caseTagDefn(TagDefn object)
- {
- return createTagDefnAdapter();
- }
- @Override
- public Adapter caseFunctionDefn(FunctionDefn object)
- {
- return createFunctionDefnAdapter();
- }
- @Override
- public Adapter 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
- */
- @Override
- public Adapter createAdapter(Notifier target)
- {
- return modelSwitch.doSwitch((EObject)target);
- }
-
-
- /**
- * Creates a new adapter for an object of class '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.FaceletLibraryClassTagLib <em>Facelet Library Class Tag Lib</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.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.FaceletLibraryClassTagLib
- * @generated
- */
- public Adapter createFaceletLibraryClassTagLibAdapter()
- {
- return null;
- }
-
- /**
- * Creates a new adapter for an object of class '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.FaceletXMLDefnTaglib <em>Facelet XML Defn Taglib</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.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.FaceletXMLDefnTaglib
- * @generated
- */
- public Adapter createFaceletXMLDefnTaglibAdapter()
- {
- return null;
- }
-
- /**
- * Creates a new adapter for an object of class '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.FaceletTaglibDefn <em>Defn</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.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.FaceletTaglibDefn
- * @generated
- */
- public Adapter createFaceletTaglibDefnAdapter()
- {
- return null;
- }
-
- /**
- * Creates a new adapter for an object of class '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.ComponentTagDefn <em>Component Tag Defn</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.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.ComponentTagDefn
- * @generated
- */
- public Adapter createComponentTagDefnAdapter()
- {
- return null;
- }
-
- /**
- * Creates a new adapter for an object of class '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.ValidatorTagDefn <em>Validator Tag Defn</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.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.ValidatorTagDefn
- * @generated
- */
- public Adapter createValidatorTagDefnAdapter()
- {
- return null;
- }
-
- /**
- * Creates a new adapter for an object of class '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.ConverterTagDefn <em>Converter Tag Defn</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.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.ConverterTagDefn
- * @generated
- */
- public Adapter createConverterTagDefnAdapter()
- {
- return null;
- }
-
- /**
- * Creates a new adapter for an object of class '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.HandlerTagDefn <em>Handler Tag Defn</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.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.HandlerTagDefn
- * @generated
- */
- public Adapter createHandlerTagDefnAdapter()
- {
- return null;
- }
-
- /**
- * Creates a new adapter for an object of class '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.SourceTagDefn <em>Source Tag Defn</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.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.SourceTagDefn
- * @generated
- */
- public Adapter createSourceTagDefnAdapter()
- {
- return null;
- }
-
- /**
- * Creates a new adapter for an object of class '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.TagDefn <em>Tag Defn</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.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.TagDefn
- * @generated
- */
- public Adapter createTagDefnAdapter()
- {
- return null;
- }
-
- /**
- * Creates a new adapter for an object of class '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.FunctionDefn <em>Function Defn</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.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.FunctionDefn
- * @generated
- */
- public Adapter createFunctionDefnAdapter()
- {
- 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;
- }
-
-} //FaceletTaglibAdapterFactory
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib_1_0/util/FaceletTaglibSwitch.java b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib_1_0/util/FaceletTaglibSwitch.java
deleted file mode 100644
index 7fbbaee..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib_1_0/util/FaceletTaglibSwitch.java
+++ /dev/null
@@ -1,371 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: FaceletTaglibSwitch.java,v 1.1 2010/03/18 06:24:40 cbateman Exp $
- */
-package org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.util;
-
-import java.util.List;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.ComponentTagDefn;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.ConverterTagDefn;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.FaceletLibraryClassTagLib;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.FaceletTaglibDefn;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.FaceletTaglibPackage;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.FaceletXMLDefnTaglib;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.FunctionDefn;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.HandlerTagDefn;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.SourceTagDefn;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.TagDefn;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.ValidatorTagDefn;
-
-/**
- * <!-- 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.
- * @param <T>
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.FaceletTaglibPackage
- * @generated
- */
-public class FaceletTaglibSwitch<T>
-{
- /**
- * The cached model package
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected static FaceletTaglibPackage modelPackage;
-
- /**
- * Creates an instance of the switch.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public FaceletTaglibSwitch()
- {
- if (modelPackage == null)
- {
- modelPackage = FaceletTaglibPackage.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 -->
- * @param theEObject
- * <!-- end-user-doc -->
- * @return the first non-null result returned by a <code>caseXXX</code> call.
- * @generated
- */
- public T 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 -->
- * @param theEClass
- * @param theEObject
- * <!-- end-user-doc -->
- * @return the first non-null result returned by a <code>caseXXX</code> call.
- * @generated
- */
- protected T doSwitch(EClass theEClass, EObject theEObject)
- {
- if (theEClass.eContainer() == modelPackage)
- {
- return doSwitch(theEClass.getClassifierID(), theEObject);
- }
- List<EClass> eSuperTypes = theEClass.getESuperTypes();
- return
- eSuperTypes.isEmpty() ?
- defaultCase(theEObject) :
- doSwitch(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 -->
- * @param classifierID
- * @param theEObject
- * <!-- end-user-doc -->
- * @return the first non-null result returned by a <code>caseXXX</code> call.
- * @generated
- */
- protected T doSwitch(int classifierID, EObject theEObject)
- {
- switch (classifierID)
- {
- case FaceletTaglibPackage.FACELET_LIBRARY_CLASS_TAG_LIB:
- {
- FaceletLibraryClassTagLib faceletLibraryClassTagLib = (FaceletLibraryClassTagLib)theEObject;
- T result = caseFaceletLibraryClassTagLib(faceletLibraryClassTagLib);
- if (result == null) result = caseFaceletTaglibDefn(faceletLibraryClassTagLib);
- if (result == null) result = defaultCase(theEObject);
- return result;
- }
- case FaceletTaglibPackage.FACELET_XML_DEFN_TAGLIB:
- {
- FaceletXMLDefnTaglib faceletXMLDefnTaglib = (FaceletXMLDefnTaglib)theEObject;
- T result = caseFaceletXMLDefnTaglib(faceletXMLDefnTaglib);
- if (result == null) result = caseFaceletTaglibDefn(faceletXMLDefnTaglib);
- if (result == null) result = defaultCase(theEObject);
- return result;
- }
- case FaceletTaglibPackage.FACELET_TAGLIB_DEFN:
- {
- FaceletTaglibDefn faceletTaglibDefn = (FaceletTaglibDefn)theEObject;
- T result = caseFaceletTaglibDefn(faceletTaglibDefn);
- if (result == null) result = defaultCase(theEObject);
- return result;
- }
- case FaceletTaglibPackage.COMPONENT_TAG_DEFN:
- {
- ComponentTagDefn componentTagDefn = (ComponentTagDefn)theEObject;
- T result = caseComponentTagDefn(componentTagDefn);
- if (result == null) result = caseHandlerTagDefn(componentTagDefn);
- if (result == null) result = caseTagDefn(componentTagDefn);
- if (result == null) result = defaultCase(theEObject);
- return result;
- }
- case FaceletTaglibPackage.VALIDATOR_TAG_DEFN:
- {
- ValidatorTagDefn validatorTagDefn = (ValidatorTagDefn)theEObject;
- T result = caseValidatorTagDefn(validatorTagDefn);
- if (result == null) result = caseHandlerTagDefn(validatorTagDefn);
- if (result == null) result = caseTagDefn(validatorTagDefn);
- if (result == null) result = defaultCase(theEObject);
- return result;
- }
- case FaceletTaglibPackage.CONVERTER_TAG_DEFN:
- {
- ConverterTagDefn converterTagDefn = (ConverterTagDefn)theEObject;
- T result = caseConverterTagDefn(converterTagDefn);
- if (result == null) result = caseHandlerTagDefn(converterTagDefn);
- if (result == null) result = caseTagDefn(converterTagDefn);
- if (result == null) result = defaultCase(theEObject);
- return result;
- }
- case FaceletTaglibPackage.HANDLER_TAG_DEFN:
- {
- HandlerTagDefn handlerTagDefn = (HandlerTagDefn)theEObject;
- T result = caseHandlerTagDefn(handlerTagDefn);
- if (result == null) result = caseTagDefn(handlerTagDefn);
- if (result == null) result = defaultCase(theEObject);
- return result;
- }
- case FaceletTaglibPackage.SOURCE_TAG_DEFN:
- {
- SourceTagDefn sourceTagDefn = (SourceTagDefn)theEObject;
- T result = caseSourceTagDefn(sourceTagDefn);
- if (result == null) result = caseTagDefn(sourceTagDefn);
- if (result == null) result = defaultCase(theEObject);
- return result;
- }
- case FaceletTaglibPackage.TAG_DEFN:
- {
- TagDefn tagDefn = (TagDefn)theEObject;
- T result = caseTagDefn(tagDefn);
- if (result == null) result = defaultCase(theEObject);
- return result;
- }
- case FaceletTaglibPackage.FUNCTION_DEFN:
- {
- FunctionDefn functionDefn = (FunctionDefn)theEObject;
- T result = caseFunctionDefn(functionDefn);
- if (result == null) result = defaultCase(theEObject);
- return result;
- }
- default: return defaultCase(theEObject);
- }
- }
-
- /**
- * Returns the result of interpreting the object as an instance of '<em>Facelet Library Class Tag Lib</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>Facelet Library Class Tag Lib</em>'.
- * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
- * @generated
- */
- public T caseFaceletLibraryClassTagLib(FaceletLibraryClassTagLib object)
- {
- return null;
- }
-
- /**
- * Returns the result of interpreting the object as an instance of '<em>Facelet XML Defn Taglib</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>Facelet XML Defn Taglib</em>'.
- * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
- * @generated
- */
- public T caseFaceletXMLDefnTaglib(FaceletXMLDefnTaglib object)
- {
- return null;
- }
-
- /**
- * Returns the result of interpreting the object as an instance of '<em>Defn</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>Defn</em>'.
- * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
- * @generated
- */
- public T caseFaceletTaglibDefn(FaceletTaglibDefn object)
- {
- return null;
- }
-
- /**
- * Returns the result of interpreting the object as an instance of '<em>Component Tag Defn</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>Component Tag Defn</em>'.
- * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
- * @generated
- */
- public T caseComponentTagDefn(ComponentTagDefn object)
- {
- return null;
- }
-
- /**
- * Returns the result of interpreting the object as an instance of '<em>Validator Tag Defn</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>Validator Tag Defn</em>'.
- * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
- * @generated
- */
- public T caseValidatorTagDefn(ValidatorTagDefn object)
- {
- return null;
- }
-
- /**
- * Returns the result of interpreting the object as an instance of '<em>Converter Tag Defn</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>Converter Tag Defn</em>'.
- * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
- * @generated
- */
- public T caseConverterTagDefn(ConverterTagDefn object)
- {
- return null;
- }
-
- /**
- * Returns the result of interpreting the object as an instance of '<em>Handler Tag Defn</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>Handler Tag Defn</em>'.
- * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
- * @generated
- */
- public T caseHandlerTagDefn(HandlerTagDefn object)
- {
- return null;
- }
-
- /**
- * Returns the result of interpreting the object as an instance of '<em>Source Tag Defn</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>Source Tag Defn</em>'.
- * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
- * @generated
- */
- public T caseSourceTagDefn(SourceTagDefn object)
- {
- return null;
- }
-
- /**
- * Returns the result of interpreting the object as an instance of '<em>Tag Defn</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>Tag Defn</em>'.
- * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
- * @generated
- */
- public T caseTagDefn(TagDefn object)
- {
- return null;
- }
-
- /**
- * Returns the result of interpreting the object as an instance of '<em>Function Defn</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>Function Defn</em>'.
- * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
- * @generated
- */
- public T caseFunctionDefn(FunctionDefn 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 T defaultCase(EObject object)
- {
- return null;
- }
-
-} //FaceletTaglibSwitch
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib_1_0/util/FaceletTaglib_1_0AdapterFactory.java b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib_1_0/util/FaceletTaglib_1_0AdapterFactory.java
deleted file mode 100644
index e99e8c9..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib_1_0/util/FaceletTaglib_1_0AdapterFactory.java
+++ /dev/null
@@ -1,323 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: FaceletTaglib_1_0AdapterFactory.java,v 1.1 2010/03/18 06:24:40 cbateman Exp $
- */
-package org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.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.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.ComponentTagDefn;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.ConverterTagDefn;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.FaceletLibraryClassTagLib;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.FaceletTaglibDefn;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.FaceletTaglib_1_0Package;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.FaceletXMLDefnTaglib;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.FunctionDefn;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.HandlerTagDefn;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.SourceTagDefn;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.TagDefn;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.ValidatorTagDefn;
-
-/**
- * <!-- 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.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.FaceletTaglib_1_0Package
- * @generated
- */
-public class FaceletTaglib_1_0AdapterFactory extends AdapterFactoryImpl
-{
- /**
- * The cached model package.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected static FaceletTaglib_1_0Package modelPackage;
-
- /**
- * Creates an instance of the adapter factory.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public FaceletTaglib_1_0AdapterFactory()
- {
- if (modelPackage == null)
- {
- modelPackage = FaceletTaglib_1_0Package.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
- */
- @Override
- 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 FaceletTaglib_1_0Switch<Adapter> modelSwitch =
- new FaceletTaglib_1_0Switch<Adapter>()
- {
- @Override
- public Adapter caseFaceletLibraryClassTagLib(FaceletLibraryClassTagLib object)
- {
- return createFaceletLibraryClassTagLibAdapter();
- }
- @Override
- public Adapter caseFaceletXMLDefnTaglib(FaceletXMLDefnTaglib object)
- {
- return createFaceletXMLDefnTaglibAdapter();
- }
- @Override
- public Adapter caseFaceletTaglibDefn(FaceletTaglibDefn object)
- {
- return createFaceletTaglibDefnAdapter();
- }
- @Override
- public Adapter caseComponentTagDefn(ComponentTagDefn object)
- {
- return createComponentTagDefnAdapter();
- }
- @Override
- public Adapter caseValidatorTagDefn(ValidatorTagDefn object)
- {
- return createValidatorTagDefnAdapter();
- }
- @Override
- public Adapter caseConverterTagDefn(ConverterTagDefn object)
- {
- return createConverterTagDefnAdapter();
- }
- @Override
- public Adapter caseHandlerTagDefn(HandlerTagDefn object)
- {
- return createHandlerTagDefnAdapter();
- }
- @Override
- public Adapter caseSourceTagDefn(SourceTagDefn object)
- {
- return createSourceTagDefnAdapter();
- }
- @Override
- public Adapter caseTagDefn(TagDefn object)
- {
- return createTagDefnAdapter();
- }
- @Override
- public Adapter caseFunctionDefn(FunctionDefn object)
- {
- return createFunctionDefnAdapter();
- }
- @Override
- public Adapter 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
- */
- @Override
- public Adapter createAdapter(Notifier target)
- {
- return modelSwitch.doSwitch((EObject)target);
- }
-
-
- /**
- * Creates a new adapter for an object of class '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.FaceletLibraryClassTagLib <em>Facelet Library Class Tag Lib</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.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.FaceletLibraryClassTagLib
- * @generated
- */
- public Adapter createFaceletLibraryClassTagLibAdapter()
- {
- return null;
- }
-
- /**
- * Creates a new adapter for an object of class '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.FaceletXMLDefnTaglib <em>Facelet XML Defn Taglib</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.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.FaceletXMLDefnTaglib
- * @generated
- */
- public Adapter createFaceletXMLDefnTaglibAdapter()
- {
- return null;
- }
-
- /**
- * Creates a new adapter for an object of class '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.FaceletTaglibDefn <em>Facelet Taglib Defn</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.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.FaceletTaglibDefn
- * @generated
- */
- public Adapter createFaceletTaglibDefnAdapter()
- {
- return null;
- }
-
- /**
- * Creates a new adapter for an object of class '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.ComponentTagDefn <em>Component Tag Defn</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.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.ComponentTagDefn
- * @generated
- */
- public Adapter createComponentTagDefnAdapter()
- {
- return null;
- }
-
- /**
- * Creates a new adapter for an object of class '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.ValidatorTagDefn <em>Validator Tag Defn</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.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.ValidatorTagDefn
- * @generated
- */
- public Adapter createValidatorTagDefnAdapter()
- {
- return null;
- }
-
- /**
- * Creates a new adapter for an object of class '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.ConverterTagDefn <em>Converter Tag Defn</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.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.ConverterTagDefn
- * @generated
- */
- public Adapter createConverterTagDefnAdapter()
- {
- return null;
- }
-
- /**
- * Creates a new adapter for an object of class '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.HandlerTagDefn <em>Handler Tag Defn</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.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.HandlerTagDefn
- * @generated
- */
- public Adapter createHandlerTagDefnAdapter()
- {
- return null;
- }
-
- /**
- * Creates a new adapter for an object of class '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.SourceTagDefn <em>Source Tag Defn</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.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.SourceTagDefn
- * @generated
- */
- public Adapter createSourceTagDefnAdapter()
- {
- return null;
- }
-
- /**
- * Creates a new adapter for an object of class '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.TagDefn <em>Tag Defn</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.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.TagDefn
- * @generated
- */
- public Adapter createTagDefnAdapter()
- {
- return null;
- }
-
- /**
- * Creates a new adapter for an object of class '{@link org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.FunctionDefn <em>Function Defn</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.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.FunctionDefn
- * @generated
- */
- public Adapter createFunctionDefnAdapter()
- {
- 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;
- }
-
-} //FaceletTaglib_1_0AdapterFactory
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib_1_0/util/FaceletTaglib_1_0Switch.java b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib_1_0/util/FaceletTaglib_1_0Switch.java
deleted file mode 100644
index 4375e3c..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/faceletTaglib_1_0/util/FaceletTaglib_1_0Switch.java
+++ /dev/null
@@ -1,371 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: FaceletTaglib_1_0Switch.java,v 1.1 2010/03/18 06:24:40 cbateman Exp $
- */
-package org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.util;
-
-import java.util.List;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.ComponentTagDefn;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.ConverterTagDefn;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.FaceletLibraryClassTagLib;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.FaceletTaglibDefn;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.FaceletTaglib_1_0Package;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.FaceletXMLDefnTaglib;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.FunctionDefn;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.HandlerTagDefn;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.SourceTagDefn;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.TagDefn;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.ValidatorTagDefn;
-
-/**
- * <!-- 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.
- * @param <T>
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.FaceletTaglib_1_0Package
- * @generated
- */
-public class FaceletTaglib_1_0Switch<T>
-{
- /**
- * The cached model package
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected static FaceletTaglib_1_0Package modelPackage;
-
- /**
- * Creates an instance of the switch.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public FaceletTaglib_1_0Switch()
- {
- if (modelPackage == null)
- {
- modelPackage = FaceletTaglib_1_0Package.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 -->
- * @param theEObject
- * <!-- end-user-doc -->
- * @return the first non-null result returned by a <code>caseXXX</code> call.
- * @generated
- */
- public T 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 -->
- * @param theEClass
- * @param theEObject
- * <!-- end-user-doc -->
- * @return the first non-null result returned by a <code>caseXXX</code> call.
- * @generated
- */
- protected T doSwitch(EClass theEClass, EObject theEObject)
- {
- if (theEClass.eContainer() == modelPackage)
- {
- return doSwitch(theEClass.getClassifierID(), theEObject);
- }
- List<EClass> eSuperTypes = theEClass.getESuperTypes();
- return
- eSuperTypes.isEmpty() ?
- defaultCase(theEObject) :
- doSwitch(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 -->
- * @param classifierID
- * @param theEObject
- * <!-- end-user-doc -->
- * @return the first non-null result returned by a <code>caseXXX</code> call.
- * @generated
- */
- protected T doSwitch(int classifierID, EObject theEObject)
- {
- switch (classifierID)
- {
- case FaceletTaglib_1_0Package.FACELET_LIBRARY_CLASS_TAG_LIB:
- {
- FaceletLibraryClassTagLib faceletLibraryClassTagLib = (FaceletLibraryClassTagLib)theEObject;
- T result = caseFaceletLibraryClassTagLib(faceletLibraryClassTagLib);
- if (result == null) result = caseFaceletTaglibDefn(faceletLibraryClassTagLib);
- if (result == null) result = defaultCase(theEObject);
- return result;
- }
- case FaceletTaglib_1_0Package.FACELET_XML_DEFN_TAGLIB:
- {
- FaceletXMLDefnTaglib faceletXMLDefnTaglib = (FaceletXMLDefnTaglib)theEObject;
- T result = caseFaceletXMLDefnTaglib(faceletXMLDefnTaglib);
- if (result == null) result = caseFaceletTaglibDefn(faceletXMLDefnTaglib);
- if (result == null) result = defaultCase(theEObject);
- return result;
- }
- case FaceletTaglib_1_0Package.FACELET_TAGLIB_DEFN:
- {
- FaceletTaglibDefn faceletTaglibDefn = (FaceletTaglibDefn)theEObject;
- T result = caseFaceletTaglibDefn(faceletTaglibDefn);
- if (result == null) result = defaultCase(theEObject);
- return result;
- }
- case FaceletTaglib_1_0Package.COMPONENT_TAG_DEFN:
- {
- ComponentTagDefn componentTagDefn = (ComponentTagDefn)theEObject;
- T result = caseComponentTagDefn(componentTagDefn);
- if (result == null) result = caseHandlerTagDefn(componentTagDefn);
- if (result == null) result = caseTagDefn(componentTagDefn);
- if (result == null) result = defaultCase(theEObject);
- return result;
- }
- case FaceletTaglib_1_0Package.VALIDATOR_TAG_DEFN:
- {
- ValidatorTagDefn validatorTagDefn = (ValidatorTagDefn)theEObject;
- T result = caseValidatorTagDefn(validatorTagDefn);
- if (result == null) result = caseHandlerTagDefn(validatorTagDefn);
- if (result == null) result = caseTagDefn(validatorTagDefn);
- if (result == null) result = defaultCase(theEObject);
- return result;
- }
- case FaceletTaglib_1_0Package.CONVERTER_TAG_DEFN:
- {
- ConverterTagDefn converterTagDefn = (ConverterTagDefn)theEObject;
- T result = caseConverterTagDefn(converterTagDefn);
- if (result == null) result = caseHandlerTagDefn(converterTagDefn);
- if (result == null) result = caseTagDefn(converterTagDefn);
- if (result == null) result = defaultCase(theEObject);
- return result;
- }
- case FaceletTaglib_1_0Package.HANDLER_TAG_DEFN:
- {
- HandlerTagDefn handlerTagDefn = (HandlerTagDefn)theEObject;
- T result = caseHandlerTagDefn(handlerTagDefn);
- if (result == null) result = caseTagDefn(handlerTagDefn);
- if (result == null) result = defaultCase(theEObject);
- return result;
- }
- case FaceletTaglib_1_0Package.SOURCE_TAG_DEFN:
- {
- SourceTagDefn sourceTagDefn = (SourceTagDefn)theEObject;
- T result = caseSourceTagDefn(sourceTagDefn);
- if (result == null) result = caseTagDefn(sourceTagDefn);
- if (result == null) result = defaultCase(theEObject);
- return result;
- }
- case FaceletTaglib_1_0Package.TAG_DEFN:
- {
- TagDefn tagDefn = (TagDefn)theEObject;
- T result = caseTagDefn(tagDefn);
- if (result == null) result = defaultCase(theEObject);
- return result;
- }
- case FaceletTaglib_1_0Package.FUNCTION_DEFN:
- {
- FunctionDefn functionDefn = (FunctionDefn)theEObject;
- T result = caseFunctionDefn(functionDefn);
- if (result == null) result = defaultCase(theEObject);
- return result;
- }
- default: return defaultCase(theEObject);
- }
- }
-
- /**
- * Returns the result of interpreting the object as an instance of '<em>Facelet Library Class Tag Lib</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>Facelet Library Class Tag Lib</em>'.
- * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
- * @generated
- */
- public T caseFaceletLibraryClassTagLib(FaceletLibraryClassTagLib object)
- {
- return null;
- }
-
- /**
- * Returns the result of interpreting the object as an instance of '<em>Facelet XML Defn Taglib</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>Facelet XML Defn Taglib</em>'.
- * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
- * @generated
- */
- public T caseFaceletXMLDefnTaglib(FaceletXMLDefnTaglib object)
- {
- return null;
- }
-
- /**
- * Returns the result of interpreting the object as an instance of '<em>Facelet Taglib Defn</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>Facelet Taglib Defn</em>'.
- * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
- * @generated
- */
- public T caseFaceletTaglibDefn(FaceletTaglibDefn object)
- {
- return null;
- }
-
- /**
- * Returns the result of interpreting the object as an instance of '<em>Component Tag Defn</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>Component Tag Defn</em>'.
- * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
- * @generated
- */
- public T caseComponentTagDefn(ComponentTagDefn object)
- {
- return null;
- }
-
- /**
- * Returns the result of interpreting the object as an instance of '<em>Validator Tag Defn</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>Validator Tag Defn</em>'.
- * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
- * @generated
- */
- public T caseValidatorTagDefn(ValidatorTagDefn object)
- {
- return null;
- }
-
- /**
- * Returns the result of interpreting the object as an instance of '<em>Converter Tag Defn</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>Converter Tag Defn</em>'.
- * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
- * @generated
- */
- public T caseConverterTagDefn(ConverterTagDefn object)
- {
- return null;
- }
-
- /**
- * Returns the result of interpreting the object as an instance of '<em>Handler Tag Defn</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>Handler Tag Defn</em>'.
- * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
- * @generated
- */
- public T caseHandlerTagDefn(HandlerTagDefn object)
- {
- return null;
- }
-
- /**
- * Returns the result of interpreting the object as an instance of '<em>Source Tag Defn</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>Source Tag Defn</em>'.
- * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
- * @generated
- */
- public T caseSourceTagDefn(SourceTagDefn object)
- {
- return null;
- }
-
- /**
- * Returns the result of interpreting the object as an instance of '<em>Tag Defn</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>Tag Defn</em>'.
- * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
- * @generated
- */
- public T caseTagDefn(TagDefn object)
- {
- return null;
- }
-
- /**
- * Returns the result of interpreting the object as an instance of '<em>Function Defn</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>Function Defn</em>'.
- * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
- * @generated
- */
- public T caseFunctionDefn(FunctionDefn 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 T defaultCase(EObject object)
- {
- return null;
- }
-
-} //FaceletTaglib_1_0Switch
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/messages.properties b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/messages.properties
deleted file mode 100644
index 635e1ab..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/registry/taglib/messages.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-ContextParamSpecifiedFaceletTaglibLocator_0=Facelet Taglib Locator for Context Params
-JarFileFaceletTaglibLocator_0=Facelet Taglib Locator for Jar Files
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/tagmodel/AttributeHandlerMapAdapter.java b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/tagmodel/AttributeHandlerMapAdapter.java
deleted file mode 100644
index d699df2..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/tagmodel/AttributeHandlerMapAdapter.java
+++ /dev/null
@@ -1,191 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Oracle 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:
- * Cameron Bateman - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facelet.core.internal.tagmodel;
-
-import java.io.IOException;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.atomic.AtomicBoolean;
-
-import org.eclipse.jst.jsf.common.runtime.internal.view.model.common.ITagAttributeHandler;
-import org.eclipse.jst.jsf.core.internal.JSFCorePlugin;
-import org.eclipse.jst.jsf.designtime.internal.view.model.jsp.IAttributeAdvisor;
-import org.eclipse.jst.jsf.designtime.internal.view.model.jsp.IAttributeAdvisor.UnknownAttributeException;
-import org.eclipse.jst.jsf.facelet.core.internal.cm.TagInfo;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMAttributeDeclaration;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNode;
-
-/**
- * TODO: merge back with common elements of AttributeHandlerMapAdapter
- *
- * Adapts TLDDocument attributes to a simple map of ITagAttributeHandler. Map is
- * unmodifiable.
- *
- * @author cbateman
- *
- */
-public class AttributeHandlerMapAdapter implements
- Map<String, ITagAttributeHandler>, Serializable
-{
- /**
- *
- */
- private static final long serialVersionUID = -6052662048278098351L;
- private transient final IAttributeAdvisor _advisor;
- private transient AtomicBoolean _isInitialized = new AtomicBoolean(
- false);
- private final transient TagInfo _tagInfo;
- private final Map<String, ITagAttributeHandler> _cache;
- private final String _tagName;
-
- /**
- * @param tagInfo
- * @param advisor
- * @param tagName
- */
- public AttributeHandlerMapAdapter(final TagInfo tagInfo,
- final IAttributeAdvisor advisor, final String tagName)
- {
- _tagInfo = tagInfo;
- _advisor = advisor;
- _tagName = tagName;
- _cache = new HashMap<String, ITagAttributeHandler>();
- }
-
- public boolean containsKey(final Object key)
- {
- ensureAllAttributes();
- return _cache.containsKey(key);
- }
-
- public boolean containsValue(final Object value)
- {
- ensureAllAttributes();
- return _cache.containsValue(value);
- }
-
- public Set<java.util.Map.Entry<String, ITagAttributeHandler>> entrySet()
- {
- ensureAllAttributes();
- return _cache.entrySet();
- }
-
- public ITagAttributeHandler get(final Object key)
- {
- if (key instanceof String)
- {
- return getOrCreateAttribute((String) key);
- }
- return null;
- }
-
- public boolean isEmpty()
- {
- return size() == 0;
- }
-
- public Set<String> keySet()
- {
- ensureAllAttributes();
- return Collections.unmodifiableSet(_cache.keySet());
- }
-
- public int size()
- {
- if (_tagInfo != null)
- {
- return _tagInfo.getAttributes(_tagName).getLength();
- }
- return _cache.size();
- }
-
- public Collection<ITagAttributeHandler> values()
- {
- ensureAllAttributes();
- return Collections.unmodifiableCollection(_cache.values());
- }
-
- private synchronized ITagAttributeHandler getOrCreateAttribute(
- final String name)
- {
- ITagAttributeHandler tagAttr = _cache.get(name);
-
- if (tagAttr == null)
- {
- try
- {
- tagAttr = _advisor.createAttributeHandler(name);
- _cache.put(name, tagAttr);
- }
- catch (final UnknownAttributeException e)
- {
- JSFCorePlugin.log(e, "Trying to get attribute for " + name); //$NON-NLS-1$
- }
- }
-
- return tagAttr;
- }
-
- private void ensureAllAttributes()
- {
- if (_isInitialized.compareAndSet(false, true))
- {
- for (final Iterator<?> it = _tagInfo.getAttributes(_tagName)
- .iterator(); it.hasNext();)
- {
- final CMNode attrDecl = (CMAttributeDeclaration) it.next();
- getOrCreateAttribute(attrDecl.getNodeName());
- }
- }
- }
-
- public void clear()
- {
- throw new UnsupportedOperationException("Cannot modify map"); //$NON-NLS-1$
- }
-
- public ITagAttributeHandler put(final String key,
- final ITagAttributeHandler value)
- {
- throw new UnsupportedOperationException("Cannot modify map"); //$NON-NLS-1$
- }
-
- public void putAll(
- final Map<? extends String, ? extends ITagAttributeHandler> t)
- {
- throw new UnsupportedOperationException("Cannot modify map"); //$NON-NLS-1$
- }
-
- public ITagAttributeHandler remove(final Object key)
- {
- throw new UnsupportedOperationException("Cannot modify map"); //$NON-NLS-1$
- }
-
- private void readObject(final ObjectInputStream in) throws IOException,
- ClassNotFoundException
- {
- in.defaultReadObject();
- _isInitialized = new AtomicBoolean(true);
- }
-
- private void writeObject(final ObjectOutputStream out) throws IOException
- {
- ensureAllAttributes();
- out.defaultWriteObject();
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/tagmodel/ComponentTag.java b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/tagmodel/ComponentTag.java
deleted file mode 100644
index 5e381fd..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/tagmodel/ComponentTag.java
+++ /dev/null
@@ -1,76 +0,0 @@
-package org.eclipse.jst.jsf.facelet.core.internal.tagmodel;
-
-import org.eclipse.jst.jsf.common.runtime.internal.model.component.ComponentTypeInfo;
-import org.eclipse.jst.jsf.common.runtime.internal.view.model.common.IComponentTagElement;
-import org.eclipse.jst.jsf.designtime.internal.view.model.jsp.IAttributeAdvisor;
-import org.eclipse.jst.jsf.facelet.core.internal.cm.FaceletDocumentFactory;
-
-
-
-
-/**
- * A basic JSF component facelet tag element
- *
- * @author cbateman
- *
- */
-public class ComponentTag extends FaceletTag implements IComponentTagElement
-{
- /**
- *
- */
- private static final long serialVersionUID = -7457091811357699617L;
- private final ComponentTypeInfo _typeInfo;
-
-// public ComponentTag(final String uri, final String name, final String componentType)
-// {
-// // renderType and handlerClass are (?) in the dtd
-// this(uri, name, componentType, null);
-// }
-
- /**
- * @param uri
- * @param name
- * @param typeInfo
- * @param handlerClass
- * @param factory
- * @param advisor
- */
- public ComponentTag(final String uri,
- final String name,
- final ComponentTypeInfo typeInfo,
- final String handlerClass,
- final FaceletDocumentFactory factory,
- final IAttributeAdvisor advisor)
- {
- super(uri, name, TagType.COMPONENT, handlerClass, factory, advisor);
- _typeInfo = typeInfo;
- }
-
- @Override
- public String toString() {
- String toString = super.toString();
- toString += "; Component Type: " + _typeInfo.getComponentType(); //$NON-NLS-1$
-
- final String rendererType = _typeInfo.getRenderFamily();
- if (rendererType != null)
- {
- toString += "; Renderer Type: " + rendererType; //$NON-NLS-1$
- }
-
- final String handlerClass = getTagHandlerClassName();
- if (handlerClass != null)
- {
- toString += "; Handler Class: " + handlerClass; //$NON-NLS-1$
- }
-
- return toString;
- }
-
- public ComponentTypeInfo getComponent()
- {
- return _typeInfo;
- }
-
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/tagmodel/ConverterTag.java b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/tagmodel/ConverterTag.java
deleted file mode 100644
index 6c8b015..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/tagmodel/ConverterTag.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package org.eclipse.jst.jsf.facelet.core.internal.tagmodel;
-
-import org.eclipse.jst.jsf.common.runtime.internal.model.decorator.ConverterTypeInfo;
-import org.eclipse.jst.jsf.common.runtime.internal.view.model.common.IConverterTagElement;
-import org.eclipse.jst.jsf.designtime.internal.view.model.jsp.IAttributeAdvisor;
-import org.eclipse.jst.jsf.facelet.core.internal.cm.FaceletDocumentFactory;
-
-
-/**
- * A basic JSF converter facelet tag element
- *
- * @author cbateman
- *
- */
-public class ConverterTag extends FaceletTag implements IConverterTagElement
-{
- /**
- *
- */
- private static final long serialVersionUID = -5310748504219020605L;
- private final ConverterTypeInfo _converter;
-
- /**
- * @param uri
- * @param name
- * @param converter
- * @param handler
- * @param factory
- * @param advisor
- */
- public ConverterTag(final String uri, final String name, final ConverterTypeInfo converter, final String handler, final FaceletDocumentFactory factory,
- final IAttributeAdvisor advisor)
- {
- super(uri, name, TagType.CONVERTER, handler, factory, advisor);
- _converter = converter;
- }
-
- /**
- * @return the converter id
- */
- public ConverterTypeInfo getConverter()
- {
- return _converter;
- }
-
- @Override
- public String toString()
- {
- String toString = super.toString();
-
- toString += "Converter Id: "+getConverter()+"\n"; //$NON-NLS-1$ //$NON-NLS-2$
-
- if (getTagHandlerClassName() != null)
- {
- toString += "Handler Class: "+getTagHandlerClassName()+"\n"; //$NON-NLS-1$ //$NON-NLS-2$
- }
-
- return toString;
- }
-
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/tagmodel/FaceletAttribute.java b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/tagmodel/FaceletAttribute.java
deleted file mode 100644
index ebc6b6a..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/tagmodel/FaceletAttribute.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package org.eclipse.jst.jsf.facelet.core.internal.tagmodel;
-
-import org.eclipse.jst.jsf.common.runtime.internal.view.model.common.AbstractTagAttribute;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTagAttribute;
-
-/**
- * Adapts a FaceletTaglibTagAttribute to the ITagAttribute interface.
- *
- * @author cbateman
- *
- */
-public class FaceletAttribute extends AbstractTagAttribute
-{
-
- /**
- *
- */
- private static final long serialVersionUID = 5909354642079229663L;
-
- private final FaceletTaglibTagAttribute _attr;
-
- /**
- * @param attr
- */
- public FaceletAttribute(final FaceletTaglibTagAttribute attr)
- {
- _attr = attr;
- }
-
- @Override
- public String getName()
- {
- return _attr.getName();
- }
-
- @Override
- public String getTargetNamespace()
- {
- return null;
- }
-
- @Override
- public String getDescription()
- {
- return _attr.getDefaultDescription("\n"); //$NON-NLS-1$
- }
-
- @Override
- public String getDisplayName()
- {
- return _attr.getDefaultDescription("\n"); //$NON-NLS-1$
- }
-
- @Override
- public boolean isRequired()
- {
- return _attr.isRequired();
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/tagmodel/FaceletNamespace.java b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/tagmodel/FaceletNamespace.java
deleted file mode 100644
index dcb211b..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/tagmodel/FaceletNamespace.java
+++ /dev/null
@@ -1,214 +0,0 @@
-package org.eclipse.jst.jsf.facelet.core.internal.tagmodel;
-
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.jst.jsf.common.runtime.internal.view.model.common.ITagElement;
-import org.eclipse.jst.jsf.designtime.internal.view.model.jsp.ITagResolvingStrategy;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.IFaceletTagResolvingStrategy.TLDWrapper;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.IFaceletTagRecord;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib.FaceletTaglibTag;
-
-/**
- * A description about a facelet tag library descriptor (facelet-taglib_1_0.dtd)
- *
- * @author cbateman
- *
- */
-public class FaceletNamespace extends
- org.eclipse.jst.jsf.common.runtime.internal.view.model.common.Namespace
-{
- /**
- *
- */
- private static final long serialVersionUID = 2133853120220947741L;
- /**
- * The namespace that this tag library is associated with
- */
- private final FaceletNamespaceData _data;
-
- /**
- * @param record
- * @param resolver
- */
- public FaceletNamespace(final IFaceletTagRecord record,
- final ITagResolvingStrategy<TLDWrapper, String> resolver)
- {
- _data = new TaglibFaceletNamespaceData(record, resolver);
- }
-
- @Override
- public String getDisplayName()
- {
- return _data.getDisplayName();
- }
-
- @Override
- public String getNSUri()
- {
- return _data.getUri();
- }
-
- @Override
- public Collection<? extends ITagElement> getViewElements()
- {
- return _data.getAllViewElements().values();
- }
-
- @Override
- public String toString()
- {
- return "Namespace: " + getNSUri() + "\n"; //$NON-NLS-1$ //$NON-NLS-2$
- }
-
- @Override
- public ITagElement getViewElement(final String name)
- {
- return _data.getViewElement(name);
- }
-
- @Override
- public boolean hasViewElements()
- {
- return _data.getNumTags() > 0;
- }
-
- @Override
- public boolean isInitialized()
- {
- return _data.isInitialized();
- }
-
- /**
- * Namespace data driven off a record.
- *
- */
- private static class TaglibFaceletNamespaceData extends
- FaceletNamespaceData
- {
- /**
- *
- */
- private static final long serialVersionUID = -562720162853425804L;
- private transient final IFaceletTagRecord _record;
- private transient final ITagResolvingStrategy<TLDWrapper, String> _resolver;
- private final Map<String, ITagElement> _tags;
-
- public TaglibFaceletNamespaceData(final IFaceletTagRecord record,
- final ITagResolvingStrategy<TLDWrapper, String> resolver)
- {
- _record = record;
- _tags = new HashMap<String, ITagElement>();
- _resolver = resolver;
- }
-
- @Override
- public synchronized Map<String, ITagElement> getAllViewElements()
- {
- if (!isInitialized())
- {
- for (final FaceletTaglibTag tagDefn : _record.getTags())
- {
- getViewElement(tagDefn.getTagName());
- }
- }
- return _tags;
- }
-
- @Override
- public synchronized ITagElement getViewElement(final String name)
- {
- final FaceletTaglibTag tagDefn = _record.getTag(name);
- if (tagDefn != null)
- {
- return getAndInitIfMissing(tagDefn);
- }
- return null;
- }
-
- private ITagElement getAndInitIfMissing(final FaceletTaglibTag tagDefn)
- {
- ITagElement tagElement = _tags.get(tagDefn.getTagName());
- if (tagElement == null)
- {
- tagElement = _resolver
- .resolve(new TLDWrapper(tagDefn, getUri()));
- _tags.put(tagDefn.getTagName(), tagElement);
- }
- return tagElement;
- }
-
- @Override
- public synchronized boolean isInitialized()
- {
- return _tags.size() == _record.getNumTags();
- }
-
- @Override
- public String getDisplayName()
- {
- return _record.getURI();
- }
-
- @Override
- public int getNumTags()
- {
- return _record.getNumTags();
- }
-
- @Override
- public String getUri()
- {
- return _record.getURI();
- }
- }
-
- /**
- * Encapsulates all the data for a TLDNamespace. Allows the model to be
- * separated from the Namespace interface for ease of serialization and
- * controlled subclassing.
- *
- */
- public abstract static class FaceletNamespaceData implements Serializable
- {
- /**
- *
- */
- private static final long serialVersionUID = 1697605990460247389L;
-
- /**
- * @return the displayb
- */
- public abstract String getDisplayName();
-
- /**
- * @return the number of tags
- */
- public abstract int getNumTags();
-
- /**
- * @return the namespace uri
- */
- public abstract String getUri();
-
- /**
- * @param name
- * @return the view element for name or null if not found.
- */
- public abstract ITagElement getViewElement(final String name);
-
- /**
- * May be long running since it will lazily calculate all unloaded tags.
- *
- * @return all view elements for this namespace
- */
- public abstract Map<String, ITagElement> getAllViewElements();
-
- /**
- * @return true if all elements have been lazily loaded
- */
- public abstract boolean isInitialized();
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/tagmodel/FaceletTag.java b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/tagmodel/FaceletTag.java
deleted file mode 100644
index 8b8a4ad..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/tagmodel/FaceletTag.java
+++ /dev/null
@@ -1,96 +0,0 @@
-package org.eclipse.jst.jsf.facelet.core.internal.tagmodel;
-
-import java.util.Map;
-
-import org.eclipse.jst.jsf.common.runtime.internal.view.model.common.IJSFTagElement;
-import org.eclipse.jst.jsf.common.runtime.internal.view.model.common.ITagAttribute;
-import org.eclipse.jst.jsf.common.runtime.internal.view.model.common.TagElement;
-import org.eclipse.jst.jsf.designtime.internal.view.model.jsp.IAttributeAdvisor;
-import org.eclipse.jst.jsf.facelet.core.internal.cm.FaceletDocumentFactory;
-import org.eclipse.jst.jsf.facelet.core.internal.cm.TagInfo;
-
-/**
- * A description of the a facelet tag
- *
- * @author cbateman
- *
- */
-public abstract class FaceletTag extends TagElement implements IJSFTagElement
-{
- /**
- *
- */
- private static final long serialVersionUID = 3027895246947365781L;
- private final String _uri;
- private final String _name;
- private final TagType _type;
- private final String _tagHandlerClass;
- private final AttributeHandlerMapAdapter _attributeHandlerMapAdapter;
- private final IAttributeAdvisor _advisor;
-
- /**
- * @param uri
- * @param name
- * @param type
- * @param tagHandlerClassName
- * @param docFactory
- * @param advisor
- */
- protected FaceletTag(final String uri, final String name,
- final TagType type, final String tagHandlerClassName,
- final FaceletDocumentFactory docFactory,
- final IAttributeAdvisor advisor)
- {
- _uri = uri;
- _name = name;
- _type = type;
- _tagHandlerClass = tagHandlerClassName;
- final TagInfo tagInfo = docFactory.getOrCreateExtraTagInfo(uri);
- _attributeHandlerMapAdapter = new AttributeHandlerMapAdapter(tagInfo, advisor, name);
- _advisor = advisor;
- }
-
- /**
- * @return the name of the tag
- */
- @Override
- public final String getName()
- {
- return _name;
- }
-
- public final TagType getType()
- {
- return _type;
- }
-
- @Override
- public String getUri()
- {
- return _uri;
- }
-
- @Override
- public String getTagHandlerClassName()
- {
- return _tagHandlerClass;
- }
-
- @Override
- public String toString()
- {
- return "Tag Name: " + getName() + "Tag Type: " + getType(); //$NON-NLS-1$ //$NON-NLS-2$
- }
-
- @Override
- public Map<?, ?> getAttributeHandlers()
- {
- return _attributeHandlerMapAdapter;
- }
-
- public Map<String, ? extends ITagAttribute> getAttributes()
- {
- return _advisor.getAttributes();
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/tagmodel/HandlerTag.java b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/tagmodel/HandlerTag.java
deleted file mode 100644
index b2257c1..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/tagmodel/HandlerTag.java
+++ /dev/null
@@ -1,56 +0,0 @@
-package org.eclipse.jst.jsf.facelet.core.internal.tagmodel;
-
-import org.eclipse.jst.jsf.common.runtime.internal.view.model.common.IHandlerTagElement;
-import org.eclipse.jst.jsf.designtime.internal.view.model.jsp.IAttributeAdvisor;
-import org.eclipse.jst.jsf.facelet.core.internal.cm.FaceletDocumentFactory;
-
-
-/**
- * A basic handler tag that has no direct effect on creation of components,
- * converters or validators.
- *
- * @author cbateman
- *
- */
-public class HandlerTag extends FaceletTag
-{
- /**
- *
- */
- private static final long serialVersionUID = 8882557774865456522L;
- private final IHandlerTagElement.TagHandlerType _handlerType;
- /**
- * @param uri
- * @param name
- * @param handlerType
- * @param handlerClassName
- * @param factory
- * @param advisor
- */
- public HandlerTag(final String uri, final String name, final IHandlerTagElement.TagHandlerType handlerType,
- final String handlerClassName, final FaceletDocumentFactory factory,
- final IAttributeAdvisor advisor) {
- super(uri, name, TagType.HANDLER, handlerClassName, factory, advisor);
- _handlerType = handlerType;
- }
-
- /**
- * @return the handler type
- */
- public IHandlerTagElement.TagHandlerType getHandlerType()
- {
- return _handlerType;
- }
-
- @Override
- public String toString()
- {
- String toString = super.toString();
-
- toString += "Handler Class: " + getTagHandlerClassName() + "\n"; //$NON-NLS-1$ //$NON-NLS-2$
-
- return toString;
- }
-
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/tagmodel/IFaceletTagConstants.java b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/tagmodel/IFaceletTagConstants.java
deleted file mode 100644
index dd86647..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/tagmodel/IFaceletTagConstants.java
+++ /dev/null
@@ -1,149 +0,0 @@
-package org.eclipse.jst.jsf.facelet.core.internal.tagmodel;
-
-import org.eclipse.jst.jsf.common.dom.TagIdentifier;
-import org.eclipse.jst.jsf.core.internal.tld.TagIdentifierFactory;
-
-/**
- * Common constants for Facelet ui tags.
- * @author cbateman
- *
- */
-public interface IFaceletTagConstants
-{
- /**
- * The JSF tag library uri
- */
- final static public String URI_JSF_FACELETS = "http://java.sun.com/jsf/facelets"; //$NON-NLS-1$
-
- /**
- * component tagname
- */
- final static public String TAG_COMPONENT = "component"; //$NON-NLS-1$
-
- /**
- * composition tagname
- */
- final static public String TAG_COMPOSITION = "composition"; //$NON-NLS-1$
- /**
- * debug tagname
- */
- final static public String TAG_DEBUG = "debug"; //$NON-NLS-1$
- /**
- * decorate tagname
- */
- final static public String TAG_DECORATE = "decorate"; //$NON-NLS-1$
- /**
- * define tagname
- */
- final static public String TAG_DEFINE = "define"; //$NON-NLS-1$
- /**
- * fragment tagname
- */
- final static public String TAG_FRAGMENT = "fragment"; //$NON-NLS-1$
- /**
- * include tagname
- */
- final static public String TAG_INCLUDE = "include"; //$NON-NLS-1$
- /**
- * insert tagname
- */
- final static public String TAG_INSERT = "insert"; //$NON-NLS-1$
- /**
- * param tagname
- */
- final static public String TAG_PARAM = "param"; //$NON-NLS-1$
-
- /**
- * remove tagname
- */
- final static public String TAG_REMOVE = "remove"; //$NON-NLS-1$
- /**
- * repeat tagname
- */
- final static public String TAG_REPEAT = "repeat"; //$NON-NLS-1$
-
- /**
- * TagIdentifier for COMPONENT
- */
- final static TagIdentifier TAG_IDENTIFIER_COMPONENT = TagIdentifierFactory
- .createJSPTagWrapper(
- URI_JSF_FACELETS,
- TAG_COMPONENT);
- /**
- * TagIdentifier for COMPOSITE
- */
- final static TagIdentifier TAG_IDENTIFIER_COMPOSITION = TagIdentifierFactory
- .createJSPTagWrapper(
- URI_JSF_FACELETS,
- TAG_COMPOSITION);
-
- /**
- * TagIdentifier for DEBUG
- */
- final static TagIdentifier TAG_IDENTIFIER_DEBUG = TagIdentifierFactory
- .createJSPTagWrapper(
- URI_JSF_FACELETS,
- TAG_DEBUG);
-
- /**
- * TagIdentifier for DEBUG
- */
- final static TagIdentifier TAG_IDENTIFIER_DECORATE = TagIdentifierFactory
- .createJSPTagWrapper(
- URI_JSF_FACELETS,
- TAG_DECORATE);
-
- /**
- * TagIdentifier for DEFINE
- */
- final static TagIdentifier TAG_IDENTIFIER_DEFINE = TagIdentifierFactory
- .createJSPTagWrapper(
- URI_JSF_FACELETS,
- TAG_DEFINE);
-
- /**
- * TagIdentifier for FRAGMENT
- */
- final static TagIdentifier TAG_IDENTIFIER_FRAGMENT = TagIdentifierFactory
- .createJSPTagWrapper(
- URI_JSF_FACELETS,
- TAG_FRAGMENT);
-
- /**
- * TagIdentifier for INCLUDE
- */
- final static TagIdentifier TAG_IDENTIFIER_INCLUDE = TagIdentifierFactory
- .createJSPTagWrapper(
- URI_JSF_FACELETS,
- TAG_INCLUDE);
-
- /**
- * TagIdentifier for INCLUDE
- */
- final static TagIdentifier TAG_IDENTIFIER_INSERT = TagIdentifierFactory
- .createJSPTagWrapper(
- URI_JSF_FACELETS,
- TAG_INSERT);
-
- /**
- * TagIdentifier for PARAM
- */
- final static TagIdentifier TAG_IDENTIFIER_PARAM = TagIdentifierFactory
- .createJSPTagWrapper(
- URI_JSF_FACELETS,
- TAG_PARAM);
- /**
- * TagIdentifier for REPEAT
- */
- final static TagIdentifier TAG_IDENTIFIER_REMOVE = TagIdentifierFactory
- .createJSPTagWrapper(
- URI_JSF_FACELETS,
- TAG_REMOVE);
- /**
- * TagIdentifier for REPEAT
- */
- final static TagIdentifier TAG_IDENTIFIER_REPEAT = TagIdentifierFactory
- .createJSPTagWrapper(
- URI_JSF_FACELETS,
- TAG_REPEAT);
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/tagmodel/Messages.java b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/tagmodel/Messages.java
deleted file mode 100644
index 7bebac4..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/tagmodel/Messages.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Oracle 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:
- * Cameron Bateman - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facelet.core.internal.tagmodel;
-
-import org.eclipse.osgi.util.NLS;
-
-/**
- * Externalizable string support.
- *
- * @author cbateman
- *
- */
-public final class Messages extends NLS
-{
- private static final String BUNDLE_NAME = "org.eclipse.jst.jsf.facelet.core.internal.tagmodel.messages"; //$NON-NLS-1$
- /**
- *
- */
- public static String FaceletTaglibWithLibraryClass_TAG_LIBRARY_TYPE_DESCRIPTION;
- /**
- *
- */
- public static String FaceletTaglibWithTags_TAG_LIBRARY_WITH_TAGS_TYPE_DESCRIPTION;
- static
- {
- // initialize resource bundle
- NLS.initializeMessages(BUNDLE_NAME, Messages.class);
- }
-
- private Messages()
- {
- // no instantiation
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/tagmodel/NoArchetypeFaceletTag.java b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/tagmodel/NoArchetypeFaceletTag.java
deleted file mode 100644
index 142ff3b..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/tagmodel/NoArchetypeFaceletTag.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package org.eclipse.jst.jsf.facelet.core.internal.tagmodel;
-
-import org.eclipse.jst.jsf.designtime.internal.view.model.jsp.IAttributeAdvisor;
-import org.eclipse.jst.jsf.facelet.core.internal.cm.FaceletDocumentFactory;
-
-
-/**
- * A facelet tag with no information about it than its name
- *
- * @author cbateman
- *
- */
-public final class NoArchetypeFaceletTag extends FaceletTag {
-
- /**
- *
- */
- private static final long serialVersionUID = 4810723162936027305L;
-
- /**
- * @param uri
- * @param name
- * @param factory
- * @param advisor
- */
- public NoArchetypeFaceletTag(final String uri, final String name, final FaceletDocumentFactory factory,
- final IAttributeAdvisor advisor) {
- super(uri, name, TagType.HANDLER, null, factory, advisor);
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/tagmodel/SourceTag.java b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/tagmodel/SourceTag.java
deleted file mode 100644
index 59365a6..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/tagmodel/SourceTag.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package org.eclipse.jst.jsf.facelet.core.internal.tagmodel;
-
-import org.eclipse.jst.jsf.designtime.internal.view.model.jsp.IAttributeAdvisor;
-import org.eclipse.jst.jsf.facelet.core.internal.cm.FaceletDocumentFactory;
-
-
-/**
- * A facet "source" tag as defined in the dtd.
- *
- * @author cbateman
- *
- */
-public class SourceTag extends FaceletTag
-{
- /**
- *
- */
- private static final long serialVersionUID = 4648054050352065079L;
- private final String _source;
-
- /**
- * @param uri
- * @param name
- * @param source
- * @param factory
- * @param advisor
- */
- public SourceTag(final String uri, final String name, final String source, final FaceletDocumentFactory factory,
- final IAttributeAdvisor advisor) {
- super(uri, name, TagType.HANDLER, null, factory, advisor);
- _source = source;
- }
-
- /**
- * @return the source
- */
- public final String getSource() {
- return _source;
- }
-}
\ No newline at end of file
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/tagmodel/ValidatorTag.java b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/tagmodel/ValidatorTag.java
deleted file mode 100644
index f64623c..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/tagmodel/ValidatorTag.java
+++ /dev/null
@@ -1,53 +0,0 @@
-package org.eclipse.jst.jsf.facelet.core.internal.tagmodel;
-
-import org.eclipse.jst.jsf.common.runtime.internal.model.decorator.ValidatorTypeInfo;
-import org.eclipse.jst.jsf.designtime.internal.view.model.jsp.IAttributeAdvisor;
-import org.eclipse.jst.jsf.facelet.core.internal.cm.FaceletDocumentFactory;
-
-
-/**
- *
- *
- */
-public class ValidatorTag extends FaceletTag
-{
- /**
- *
- */
- private static final long serialVersionUID = 3898280066837027347L;
- private final ValidatorTypeInfo _validatorTypeInfo;
-
- /**
- * @param name
- * @param uri
- * @param validatorTypeInfo
- * @param handlerClass
- * @param factory
- * @param advisor
- */
- public ValidatorTag(final String uri, final String name, final ValidatorTypeInfo validatorTypeInfo, final String handlerClass, final FaceletDocumentFactory factory,
- final IAttributeAdvisor advisor)
- {
- super(uri, name, TagType.VALIDATOR, handlerClass, factory, advisor);
- _validatorTypeInfo = validatorTypeInfo;
- }
- /**
- * @return the validator id
- */
- public ValidatorTypeInfo getValidatorId()
- {
- return _validatorTypeInfo;
- }
- @Override
- public String toString()
- {
- String toString = super.toString();
- toString += "Validator Id: "+getValidatorId()+"\n"; //$NON-NLS-1$ //$NON-NLS-2$
-
- if (getTagHandlerClassName() != null)
- {
- toString += "Handler Class: "+getTagHandlerClassName()+"\n"; //$NON-NLS-1$ //$NON-NLS-2$
- }
- return toString;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/tagmodel/messages.properties b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/tagmodel/messages.properties
deleted file mode 100644
index 4fb97d1..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/tagmodel/messages.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-FaceletTaglibWithLibraryClass_TAG_LIBRARY_TYPE_DESCRIPTION=Facelet Tag Library With Library Class
-FaceletTaglibWithTags_TAG_LIBRARY_WITH_TAGS_TYPE_DESCRIPTION=Facelet Tag Library with Tag/Function Definitions
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/util/TagMetadataLoader.java b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/util/TagMetadataLoader.java
deleted file mode 100644
index e4425db..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/util/TagMetadataLoader.java
+++ /dev/null
@@ -1,162 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Oracle 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:
- * Cameron Bateman - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facelet.core.internal.util;
-
-import java.util.Iterator;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.jst.jsf.common.metadata.Entity;
-import org.eclipse.jst.jsf.common.metadata.Model;
-import org.eclipse.jst.jsf.common.metadata.Trait;
-import org.eclipse.jst.jsf.common.metadata.query.ITaglibDomainMetaDataModelContext;
-import org.eclipse.jst.jsf.common.metadata.query.TaglibDomainMetaDataQueryHelper;
-import org.eclipse.jst.jsf.facelet.core.internal.cm.addtagmd.ElementData;
-import org.eclipse.jst.jsf.tagdisplay.internal.paletteinfos.PaletteInfo;
-import org.eclipse.jst.jsf.tagdisplay.internal.paletteinfos.PaletteInfos;
-
-/**
- * Loads tag meta-data.
- *
- * @author cbateman
- *
- */
-public class TagMetadataLoader
-{
- private static final String PALETTE_INFOS = "paletteInfos"; //$NON-NLS-1$
-
- private static final String TRAIT_DISPLAY_NAME = "displayName"; //$NON-NLS-1$
-
- private static final String TRAIT_DESCRIPTION = "description"; //$NON-NLS-1$
-
- private static final String TRAIT_ADDITIONALELEMENTDATA = "additionalElementData"; //$NON-NLS-1$
-
- private final IProject _project;
-
- /**
- * @param project
- */
- public TagMetadataLoader(final IProject project)
- {
- _project = project;
- }
-
- /**
- * @param nsUri
- * @param tagName
- * @return the display name for tagName or null if not found.
- */
- public String getDisplayName(final String nsUri, final String tagName)
- {
- return getString(nsUri, tagName, TRAIT_DISPLAY_NAME);
- }
-
- /**
- * @param nsUri
- * @param tagName
- * @return the description for tagName or null if not found.
- */
- public String getDescription(final String nsUri, final String tagName)
- {
- return getString(nsUri, tagName, TRAIT_DESCRIPTION);
- }
-
- /**
- * @param nsUri
- * @param tagName
- * @return attribute data identified by the name or null.
- */
- public ElementData getElementData(final String nsUri,
- final String tagName)
- {
- final ITaglibDomainMetaDataModelContext modelContext = TaglibDomainMetaDataQueryHelper
- .createMetaDataModelContext(_project, nsUri);
-
- final Entity entity = TaglibDomainMetaDataQueryHelper.getEntity(
- modelContext, tagName);
-
- if (entity != null)
- {
- Trait trait =
- TaglibDomainMetaDataQueryHelper.getTrait(entity, TRAIT_ADDITIONALELEMENTDATA);
- if (trait != null)
- {
- EObject value= trait.getValue();
- if (value instanceof ElementData)
- {
- return (ElementData) value;
- }
- }
- }
- return null;
- }
-
- private String getString(final String nsUri, final String tagName,
- final String key)
- {
- String value = null;
- final Model model = getModel(nsUri);
- if (model != null)
- {
- value = getString(key, model, tagName);
- }
- return value;
- }
-
- private String getString(final String key, final Model model,
- final String tagName)
- {
- String value = null;
-
- // use palette infos if available
- final Trait trait = TaglibDomainMetaDataQueryHelper.getTrait(model,
- PALETTE_INFOS);
- if (trait != null)
- {
- final PaletteInfos tags = (PaletteInfos) trait.getValue();
- for (final Iterator it = tags.getInfos().iterator(); it.hasNext();)
- {
- final PaletteInfo tag = (PaletteInfo) it.next();
- if (tag.getId().equalsIgnoreCase(tagName))
- {
- final EStructuralFeature feature = tag.eClass()
- .getEStructuralFeature(key);
- if (feature != null)
- {
- if (tag.eIsSet(feature))
- {
- final Object strValue = tag.eGet(feature);
- if (strValue instanceof String)
- {
- value = (String) strValue;
- }
- }
- }
- }
- }
- }
- return value;
- }
-
- private Model getModel(final String nsUri)
- {
- final ITaglibDomainMetaDataModelContext modelContext = TaglibDomainMetaDataQueryHelper
- .createMetaDataModelContext(_project, nsUri);
- final Model model = TaglibDomainMetaDataQueryHelper
- .getModel(modelContext);
- // no caching at this time so there is no need to listen to model
- // notifications
- // if (model != null && !hasAdapter(model))
- // addAdapter(model);
- return model;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/util/ViewUtil.java b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/util/ViewUtil.java
deleted file mode 100644
index 1429e93..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/util/ViewUtil.java
+++ /dev/null
@@ -1,262 +0,0 @@
-package org.eclipse.jst.jsf.facelet.core.internal.util;
-
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.content.IContentType;
-import org.eclipse.jst.jsf.core.internal.CompositeTagRegistryFactory;
-import org.eclipse.jst.jsf.core.internal.CompositeTagRegistryFactory.TagRegistryIdentifier;
-import org.eclipse.jst.jsf.designtime.DesignTimeApplicationManager;
-import org.eclipse.jst.jsf.designtime.internal.view.IDTViewHandler;
-import org.eclipse.jst.jsf.designtime.internal.view.model.ITagRegistry;
-import org.eclipse.jst.jsf.designtime.internal.view.model.TagRegistryFactory.TagRegistryFactoryException;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.FaceletRegistryManager.MyRegistryFactory;
-import org.eclipse.jst.jsp.core.internal.contentmodel.tld.CMDocumentFactoryTLD;
-import org.eclipse.jst.jsp.core.internal.contentmodel.tld.provisional.TLDDocument;
-import org.eclipse.jst.jsp.core.taglib.ITaglibRecord;
-import org.eclipse.jst.jsp.core.taglib.TaglibIndex;
-import org.w3c.dom.Attr;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-
-/**
- * Facelet view utilities
- *
- * @author cbateman
- */
-public final class ViewUtil
-{
- private static final String HTMLSOURCE_CONTENT_TYPE_ID = "org.eclipse.wst.html.core.htmlsource"; //$NON-NLS-1$
- private static final String XMLNS = "xmlns"; //$NON-NLS-1$
-
- /**
- * Warning! This call can be very expensive. Cache results whenever
- * possible.
- *
- * @param project
- * @param uri
- * @return the tld document for uri in project or null if not found
- */
- public static TLDDocument findTLDDocument(final IProject project,
- final String uri)
- {
- final ITaglibRecord[] tldrecs = TaglibIndex
- .getAvailableTaglibRecords(project.getFullPath());
-
- for (final ITaglibRecord rec : tldrecs)
- {
- final String matchUri = rec.getDescriptor().getURI();
- if (uri.equals(matchUri))
- {
- final CMDocumentFactoryTLD factory = new CMDocumentFactoryTLD();
- return (TLDDocument) factory.createCMDocument(rec);
- }
- }
- return null;
- }
-
- /**
- * @param attributes
- * @return the set of uri's that declared in attributes
- */
- public static Set<Attr> getDeclaredNamespaces(final NamedNodeMap attributes)
- {
- final Set<Attr> alreadyUsed = new HashSet<Attr>();
- for (int i = 0; i < attributes.getLength(); i++)
- {
- final Node node = attributes.item(i);
- if (XMLNS.equals(node.getNodeName())
- || XMLNS.equals(node.getPrefix()))
- {
- final String attrValue = node.getNodeValue();
-
- if (attrValue != null && !"".equals(attrValue.trim()) //$NON-NLS-1$
- && node instanceof Attr)
- {
- alreadyUsed.add((Attr) node);
- }
- }
- }
-
- return alreadyUsed;
- }
-
- /**
- * @param attrSet
- * @param value
- * @return true if attrSet contains an attribute whose value is <i>value</i>
- */
- public static boolean hasAttributeValue(final Set<Attr> attrSet,
- final String value)
- {
- for (final Attr attr : attrSet)
- {
- if (value.equals(attr.getValue()))
- {
- return true;
- }
- }
- return false;
- }
-
- /**
- * @param project
- * @return the html source type tag registry for project
- */
- public static ITagRegistry getHtmlTagRegistry(final IProject project)
- {
- final IContentType contentType = Platform.getContentTypeManager()
- .getContentType(HTMLSOURCE_CONTENT_TYPE_ID);
- final TagRegistryIdentifier id = new TagRegistryIdentifier(project,
- contentType);
- final ITagRegistry tagRegistry = CompositeTagRegistryFactory
- .getInstance().getRegistry(id);
- return tagRegistry;
- }
-
- /**
- * @param doc
- * @return all of the prefixed namespaces defined in doc
- */
- public static Map<String, PrefixEntry> getDocumentNamespaces(
- final Document doc)
- {
- final Map<String, PrefixEntry> namespaces = new HashMap<String, PrefixEntry>();
-
- final Element rootElement = doc.getDocumentElement();
-
- if (rootElement != null)
- {
- final NamedNodeMap attrs = rootElement.getAttributes();
- for (int i = 0; i < attrs.getLength(); i++)
- {
- final Attr a = (Attr) attrs.item(i);
- final PrefixEntry ns = PrefixEntry.parseNamespace(a);
- if (ns != null)
- {
- namespaces.put(ns._prefix, ns);
- }
- }
- }
- return namespaces;
- }
-
- /**
- * @param file
- * @return true if the file is a Facelet VDL file
- */
- public static boolean isFaceletVDLFile(final IFile file)
- {
- final DesignTimeApplicationManager instance = DesignTimeApplicationManager.getInstance(file.getProject());
- if (instance != null)
- {
- final IDTViewHandler viewHandler = instance.getViewHandler();
- if (viewHandler != null)
- {
- return viewHandler.supportsViewDefinition(file);
- }
- }
- return false;
- }
-
- /**
- * @param project
- * @return the facelet tag registry for the project or null if none.
- */
- public static ITagRegistry getTagRegistry(final IProject project)
- {
- final MyRegistryFactory factory = new MyRegistryFactory();
-
- ITagRegistry registry = null;
- try
- {
- registry = factory.createTagRegistry(project);
- }
- catch (final TagRegistryFactoryException e)
- {
- // fall-through
- }
- return registry;
- }
- /**
- * Encapsulates a single namespace/prefix use declaration in an XML document
- * @author cbateman
- *
- */
- public static class PrefixEntry
- {
- private final String _uri;
- private final String _prefix;
-
- /**
- * @param attr
- * @return the prefix entry for attr or null
- */
- public static PrefixEntry parseNamespace(final Attr attr)
- {
- final String prefix = attr.getPrefix();
-
- if (XMLNS.equals(prefix))
- {
- final String prefixName = attr.getLocalName();
- if (prefixName != null)
- {
- final String uri = attr.getNodeValue();
-
- if (uri != null)
- {
- return new PrefixEntry(uri, prefixName);
- }
- }
- }
-
- return null;
- }
-
- /**
- * @param uri
- * @param prefix
- */
- public PrefixEntry(final String uri, final String prefix)
- {
- _uri = uri;
- _prefix = prefix;
- }
-
- /**
- * @return the namespace uri
- */
- public final String getUri()
- {
- return _uri;
- }
-
- /**
- * @return the namespace prefix
- */
- public final String getPrefix()
- {
- return _prefix;
- }
-
- @Override
- public int hashCode()
- {
- return _uri.hashCode();
- }
-
- @Override
- public boolean equals(final Object obj)
- {
- return _uri.equals(obj);
- }
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/validation/TaglibValidator.java b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/validation/TaglibValidator.java
deleted file mode 100644
index 7e35aa6..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/validation/TaglibValidator.java
+++ /dev/null
@@ -1,183 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Oracle 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:
- * Cameron Bateman - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facelet.core.internal.validation;
-
-import java.io.IOException;
-import java.io.InputStream;
-
-import javax.xml.parsers.ParserConfigurationException;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.jobs.ISchedulingRule;
-import org.eclipse.jst.j2ee.model.ModelProviderManager;
-import org.eclipse.jst.jsf.common.internal.componentcore.AbstractVirtualComponentQuery.DefaultVirtualComponentQuery;
-import org.eclipse.jst.jsf.facelet.core.internal.FaceletCorePlugin;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.TagModelParser;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.WebappConfiguration;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.taglib.faceletTaglib_1_0.FaceletTaglibDefn;
-import org.eclipse.jst.jsf.facelet.core.internal.util.ViewUtil;
-import org.eclipse.jst.jsp.core.internal.Logger;
-import org.eclipse.wst.common.componentcore.resources.IVirtualFolder;
-import org.eclipse.wst.validation.internal.core.ValidationException;
-import org.eclipse.wst.validation.internal.provisional.core.IReporter;
-import org.eclipse.wst.validation.internal.provisional.core.IValidationContext;
-import org.eclipse.wst.validation.internal.provisional.core.IValidatorJob;
-import org.xml.sax.SAXException;
-
-/**
- * FUTURE USE: a build validator for source taglib definition files.
- *
- * @author cbateman
- *
- */
-public class TaglibValidator implements IValidatorJob
-{
-
- public ISchedulingRule getSchedulingRule(IValidationContext helper)
- {
- // no scheduling rule
- return null;
- }
-
- public IStatus validateInJob(IValidationContext helper, IReporter reporter)
- throws ValidationException
- {
- IStatus status = Status.OK_STATUS;
- try
- {
- validate(helper, reporter);
- }
- catch (ValidationException e)
- {
- Logger.logException(e);
- status = new Status(IStatus.ERROR, FaceletCorePlugin.PLUGIN_ID,
- IStatus.ERROR, e.getLocalizedMessage(), e);
- }
- return status;
-
- }
-
- public void cleanup(IReporter reporter)
- {
- // no cleanup
- }
-
- public void validate(IValidationContext helper, IReporter reporter)
- throws ValidationException
- {
- String[] uris = helper.getURIs();
- IWorkspaceRoot wsRoot = ResourcesPlugin.getWorkspace().getRoot();
- if (uris.length > 0)
- {
- IFile currentFile = null;
-
- for (int i = 0; i < uris.length && !reporter.isCancelled(); i++)
- {
- currentFile = wsRoot.getFile(new Path(uris[i]));
- if (currentFile != null && currentFile.exists())
- {
- if (shouldValidate(currentFile))
- {
-
- validateFile(currentFile, reporter);
- }
- }
- }
- }
- }
-
- private boolean shouldValidate(IFile currentFile)
- {
- final IProject project = currentFile.getProject();
- final IVirtualFolder folder = new DefaultVirtualComponentQuery().getWebContentFolder(project);
- final IPath filePath = currentFile.getProjectRelativePath();
- final IPath webFolderPath = folder.getUnderlyingFolder().getProjectRelativePath();
- boolean isInValidPath = ViewUtil.isFaceletVDLFile(currentFile)
- && webFolderPath.isPrefixOf(filePath);
-
- if (isInValidPath)
- {
- for (final String configuredPath : WebappConfiguration.getConfigFilesFromContextParam(project, ModelProviderManager.getModelProvider(project)))
- {
- final IPath path = webFolderPath.append(configuredPath);
- if (path.equals(filePath))
- {
- return true;
- }
- }
- }
- return false;
- }
-
- private void validateFile(IFile file, IReporter reporter)
- {
- InputStream is = null;
- try
- {
- is = file.getContents();
- FaceletTaglibDefn taglib = TagModelParser.loadFromInputStream(is, null);
- if (taglib != null)
- {
- validate(taglib);
- }
- }
- catch (CoreException e)
- {
- FaceletCorePlugin.log("Validating taglib file: "+file.getName(), e); //$NON-NLS-1$
- }
- catch (IOException e)
- {
- FaceletCorePlugin.log("Validating taglib file: "+file.getName(), e); //$NON-NLS-1$
- }
- catch (ParserConfigurationException e)
- {
- FaceletCorePlugin.log("Validating taglib file: "+file.getName(), e); //$NON-NLS-1$
- }
- catch (SAXException e)
- {
- FaceletCorePlugin.log("Validating taglib file: "+file.getName(), e); //$NON-NLS-1$
- }
- finally
- {
- if (is != null)
- {
- try
- {
- is.close();
- }
- catch (IOException e)
- {
- FaceletCorePlugin.log("Closing taglib file: "+file.getName(), e); //$NON-NLS-1$
- }
- }
- }
- }
-
- private void validate(FaceletTaglibDefn taglib)
- {
-// if (taglib instanceof FaceletXMLDefnTaglib)
-// {
-//
-// }
-// else if (taglib instanceof FaceletLibraryClassTagLib)
-// {
-//
-// }
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/view/DTFaceletViewHandler.java b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/view/DTFaceletViewHandler.java
deleted file mode 100644
index 794c385..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/view/DTFaceletViewHandler.java
+++ /dev/null
@@ -1,149 +0,0 @@
-package org.eclipse.jst.jsf.facelet.core.internal.view;
-
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.content.IContentType;
-import org.eclipse.core.runtime.content.IContentTypeManager;
-import org.eclipse.jst.jsf.common.internal.JSPUtil;
-import org.eclipse.jst.jsf.common.runtime.internal.model.component.ComponentInfo;
-import org.eclipse.jst.jsf.core.jsfappconfig.JSFAppConfigUtils;
-import org.eclipse.jst.jsf.designtime.context.DTFacesContext;
-import org.eclipse.jst.jsf.designtime.internal.view.DTUIViewRoot;
-import org.eclipse.jst.jsf.designtime.internal.view.DTUIViewRoot.VersionStamp;
-import org.eclipse.jst.jsf.designtime.internal.view.DefaultDTViewHandler;
-import org.eclipse.jst.jsf.designtime.internal.view.IViewDefnAdapterFactory;
-import org.eclipse.jst.jsf.designtime.internal.view.XMLComponentTreeConstructionStrategy;
-import org.eclipse.jst.jsf.designtime.internal.view.XMLViewDefnAdapter;
-
-/**
- * The Facelet design time view handler implementation.
- *
- * @author cbateman
- *
- */
-public class DTFaceletViewHandler extends DefaultDTViewHandler
-{
-
- private static final String ORG_ECLIPSE_WST_HTML_CORE_HTMLSOURCE = "org.eclipse.wst.html.core.htmlsource"; //$NON-NLS-1$
- private static final String JAVAX_FACES_VIEW_ROOT = "javax.faces.ViewRoot"; //$NON-NLS-1$
-
- @Override
- public String calculateLocale(DTFacesContext context)
- throws ViewHandlerException
- {
- // TODO Auto-generated method stub
- return null;
- }
-
- @Override
- public IResource getActionDefinition(DTFacesContext context, String viewId)
- throws ViewHandlerException
- {
- // TODO: this seems like a bit of a cope out...
- return context.adaptContextObject();
- }
-
- @Override
- public IPath getActionURL(DTFacesContext context, IResource resource,
- IPath requestPath) throws ViewHandlerException
- {
- // TODO Auto-generated method stub
- return null;
- }
-
- @Override
- public IPath getRelativeActionPath(DTFacesContext context,
- String relativeToViewId, String uri) throws ViewHandlerException
- {
- // TODO Auto-generated method stub
- return null;
- }
-
- @Override
- public IViewDefnAdapterFactory getViewMetadataAdapterFactory(
- DTFacesContext context) throws ViewHandlerException
- {
- final IResource res = context.adaptContextObject();
-
- if (res instanceof IFile)
- {
- return new ViewDefnAdapterFactory(this, getDefaultViewMetadataAdapterFactory(context));
- }
-
- return null;
- }
-
- @Override
- protected DTUIViewRoot newView(DTFacesContext facesContext, String viewId)
- {
- return new FaceletUIViewRoot(facesContext);
- }
-
- @Override
- protected XMLComponentTreeConstructionStrategy createTreeConstructionStrategy(
- XMLViewDefnAdapter adapter, IProject project)
- {
- return new XMLComponentTreeConstructionStrategy(adapter, project)
- {
- @SuppressWarnings("unchecked")
- @Override
- protected void populateViewRoot(DTUIViewRoot viewRoot, List children)
- {
- // facelets effectively ignores view roots created by the view
- // defn. So we simply need to loop through all of children
- // and add them to viewRoot unless they are view roots, in which
- // case we add their children
- for (final Iterator<?> it = children.iterator(); it.hasNext();)
- {
- final ComponentInfo child = (ComponentInfo) it.next();
-
- if (child instanceof DTUIViewRoot ||
- JAVAX_FACES_VIEW_ROOT.equals(child.getComponentTypeInfo().getComponentType()))
- {
- // add recursively
- populateViewRoot(viewRoot, child.getChildren());
- }
- else
- {
- viewRoot.addChild(child);
- }
- }
- }
- };
- }
-
- @Override
- public boolean supportsViewDefinition(final IFile file)
- {
- // XXX: cover case where we are in a JSF 1.2 project and the file is facelet.
- return JSFAppConfigUtils.isValidJSFProject(file.getProject(), "2.0") && //$NON-NLS-1$
- (JSPUtil.isJSPContentType(file) || isHTMLContent(file));
- }
-
- boolean isHTMLContent(final IFile file)
- {
- final IContentTypeManager typeManager = Platform
- .getContentTypeManager();
- IContentType htmlContentType = typeManager
- .getContentType(ORG_ECLIPSE_WST_HTML_CORE_HTMLSOURCE);
- if (htmlContentType != null
- && htmlContentType.isAssociatedWith(file.getName()))
- {
- return true;
- }
- return false;
- }
-
- @Override
- protected VersionStamp createVersionStamp(DTFacesContext facesContext,
- String viewId)
- {
- return new TimeBasedVersionStamp();
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/view/FaceletUIViewRoot.java b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/view/FaceletUIViewRoot.java
deleted file mode 100644
index 9a329cf..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/view/FaceletUIViewRoot.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package org.eclipse.jst.jsf.facelet.core.internal.view;
-
-import org.eclipse.jst.jsf.designtime.context.DTFacesContext;
-import org.eclipse.jst.jsf.designtime.internal.view.DefaultDTUIViewRoot;
-
-/**
- * Facelet view root
- *
- * @author cbateman
- *
- */
-public class FaceletUIViewRoot extends DefaultDTUIViewRoot
-{
- /**
- *
- */
- private static final long serialVersionUID = -7289148553566455867L;
-
- /**
- * @param facesContext
- */
- public FaceletUIViewRoot(final DTFacesContext facesContext)
- {
- super(facesContext);
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/view/FaceletViewDefnAdapter.java b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/view/FaceletViewDefnAdapter.java
deleted file mode 100644
index 6eb5021..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/view/FaceletViewDefnAdapter.java
+++ /dev/null
@@ -1,257 +0,0 @@
-package org.eclipse.jst.jsf.facelet.core.internal.view;
-
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jst.jsf.context.IModelContext;
-import org.eclipse.jst.jsf.context.resolver.structureddocument.IDOMContextResolver;
-import org.eclipse.jst.jsf.context.resolver.structureddocument.IStructuredDocumentContextResolverFactory;
-import org.eclipse.jst.jsf.context.resolver.structureddocument.internal.ITextRegionContextResolver;
-import org.eclipse.jst.jsf.context.structureddocument.IStructuredDocumentContext;
-import org.eclipse.jst.jsf.context.structureddocument.IStructuredDocumentContextFactory;
-import org.eclipse.jst.jsf.core.internal.JSFCorePlugin;
-import org.eclipse.jst.jsf.designtime.context.DTFacesContext;
-import org.eclipse.jst.jsf.designtime.internal.view.TaglibBasedViewDefnAdapter;
-import org.eclipse.jst.jsf.designtime.internal.view.IDTViewHandler.ViewHandlerException;
-import org.eclipse.jst.jsf.designtime.internal.view.IDTViewHandler.ViewHandlerException.Cause;
-import org.eclipse.jst.jsf.designtime.internal.view.model.ITagRegistry;
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.xml.core.internal.regions.DOMRegionContext;
-import org.w3c.dom.Attr;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.NamedNodeMap;
-
-/**
- * The facelet view definition adapter.
- *
- * @author cbateman
- *
- */
-public class FaceletViewDefnAdapter extends TaglibBasedViewDefnAdapter
-{
- FaceletViewDefnAdapter(final ITagRegistry tagRegistry)
- {
- super(tagRegistry);
- }
-
- @Override
- public IDocument getContainer(final DTFacesContext context, final String viewId)
- {
- final IResource viewDefn = context.adaptContextObject();
-
- if (viewDefn instanceof IFile)
- {
- final IFile viewDefnFile = (IFile) viewDefn;
- IStructuredModel model = null;
- try
- {
- model = StructuredModelManager.getModelManager()
- .getModelForRead(viewDefnFile);
-
- return model.getStructuredDocument();
- }
- catch (final IOException e)
- {
- JSFCorePlugin.log(e, "Acquiring model for view root"); //$NON-NLS-1$
- }
- catch (final CoreException e)
- {
- JSFCorePlugin.log(e, "Acquiring model for view root"); //$NON-NLS-1$
- }
- finally
- {
- if (model != null)
- {
- model.releaseFromRead();
- }
- }
- }
- return null;
- }
-
- @Override
- public DTELExpression getELExpression(final IModelContext genericContext)
- throws ViewHandlerException
- {
- final IStructuredDocumentContext context = (IStructuredDocumentContext) genericContext
- .getAdapter(IStructuredDocumentContext.class);
-
- if (context == null)
- {
- throw new ViewHandlerException(Cause.EL_NOT_FOUND);
- }
-
- final ITextRegionContextResolver resolver =
- IStructuredDocumentContextResolverFactory.INSTANCE
- .getTextRegionResolver(context);
-
- if (resolver != null)
- {
- final String regionType = resolver.getRegionType();
- int startOffset = resolver.getStartOffset();
- int relativeOffset = context.getDocumentPosition() - startOffset;
-
- if (DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE.equals(regionType))
- {
- final String attributeText = resolver.getRegionText();
- int elOpenIdx = attributeText.indexOf("#"); //$NON-NLS-1$
-
- if (elOpenIdx >= 0 && elOpenIdx < relativeOffset
- && elOpenIdx+1 < attributeText.length()
- && attributeText.charAt(elOpenIdx+1) == '{')
- {
- // we may have a hit
- int elCloseIdx = attributeText.indexOf('}', elOpenIdx+1);
- if (elCloseIdx != -1)
- {
- final IStructuredDocumentContext elContext =
- IStructuredDocumentContextFactory.INSTANCE.getContext(
- context.getStructuredDocument(), resolver
- .getStartOffset()+elOpenIdx+2);
- final String elText = attributeText.substring(
- elOpenIdx + 2, elCloseIdx);
- return new DTELExpression(elContext, elText);
- }
- }
- }
- }
-
- return null;
- }
-
- @Override
- public String getNamespace(final Element element, final IDocument doc)
- {
- final Map<String, PrefixEntry> namespaces = getDocumentNamespaces(element
- .getOwnerDocument());
- final String prefix = element.getPrefix();
-
- final PrefixEntry prefixEntry = namespaces.get(prefix);
-
- if (prefixEntry != null)
- {
- return prefixEntry.getUri();
- }
-
- return null;
- }
-
- @Override
- public String getPrefix(String namespace, IDocument document)
- {
- if (namespace == null || "".equals(namespace.trim())) //$NON-NLS-1$
- {
- return null;
- }
- final IStructuredDocumentContext context = IStructuredDocumentContextFactory.INSTANCE
- .getContext(document, -1);
- if (context != null)
- {
- final IDOMContextResolver resolver = IStructuredDocumentContextResolverFactory.INSTANCE
- .getDOMContextResolver(context);
-
- if (resolver != null)
- {
- final Document xmlDoc = resolver.getDOMDocument();
-
- if (xmlDoc != null)
- {
- Map<String, PrefixEntry> map = getDocumentNamespaces(xmlDoc);
-
- for (final Map.Entry<String, PrefixEntry> mapEntry : map.entrySet())
- {
- if (namespace.equals(mapEntry.getValue().getUri()))
- {
- return mapEntry.getKey();
- }
- }
- }
- }
- }
- return null;
- }
-
- /**
- * @param doc
- * @return map of available prefices in doc keyed by tag prefix
- */
- private Map<String, PrefixEntry> getDocumentNamespaces(final Document doc)
- {
- final Map<String, PrefixEntry> namespaces = new HashMap<String, PrefixEntry>();
-
- final Element rootElement = doc.getDocumentElement();
-
- if (rootElement != null)
- {
- final NamedNodeMap attrs = rootElement.getAttributes();
- for (int i = 0; i < attrs.getLength(); i++)
- {
- final Attr a = (Attr) attrs.item(i);
- final PrefixEntry ns = PrefixEntry.parseNamespace(a);
- if (ns != null)
- {
- namespaces.put(ns._prefix, ns);
- }
- }
- }
- return namespaces;
- }
-
- private static class PrefixEntry
- {
- private static final String XMLNS = "xmlns"; //$NON-NLS-1$
- private final String _uri;
- private final String _prefix;
-
- public static PrefixEntry parseNamespace(final Attr attr)
- {
- final String prefix = attr.getPrefix();
-
- if (XMLNS.equals(prefix))
- {
- final String prefixName = attr.getLocalName();
- if (prefixName != null)
- {
- final String uri = attr.getNodeValue();
-
- if (uri != null)
- {
- return new PrefixEntry(uri, prefixName);
- }
- }
- }
-
- return null;
- }
-
- public PrefixEntry(final String uri, final String prefix)
- {
- _uri = uri;
- _prefix = prefix;
- }
-
- public final String getUri()
- {
- return _uri;
- }
-
- @Override
- public int hashCode()
- {
- return _uri.hashCode();
- }
-
- @Override
- public boolean equals(final Object obj)
- {
- return _uri.equals(obj);
- }
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/view/ViewDefnAdapterFactory.java b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/view/ViewDefnAdapterFactory.java
deleted file mode 100644
index c1de79a..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/view/ViewDefnAdapterFactory.java
+++ /dev/null
@@ -1,56 +0,0 @@
-package org.eclipse.jst.jsf.facelet.core.internal.view;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.jst.jsf.core.internal.JSFCorePlugin;
-import org.eclipse.jst.jsf.designtime.context.DTFacesContext;
-import org.eclipse.jst.jsf.designtime.internal.view.AbstractViewDefnAdapterFactory;
-import org.eclipse.jst.jsf.designtime.internal.view.IViewDefnAdapter;
-import org.eclipse.jst.jsf.designtime.internal.view.IViewDefnAdapterFactory;
-import org.eclipse.jst.jsf.designtime.internal.view.IDTViewHandler.ViewHandlerException;
-import org.eclipse.jst.jsf.designtime.internal.view.model.ITagRegistry;
-
-class ViewDefnAdapterFactory extends AbstractViewDefnAdapterFactory
-{
- private final DTFaceletViewHandler _myViewHandler;
- private final IViewDefnAdapterFactory _defaultViewDefnAdapterFactory;
-
- ViewDefnAdapterFactory(final DTFaceletViewHandler viewHandler, final IViewDefnAdapterFactory defaultViewDefnAdapterFactory)
- {
- _myViewHandler = viewHandler;
- _defaultViewDefnAdapterFactory = defaultViewDefnAdapterFactory;
- }
-
- @Override
- public IViewDefnAdapter<?, ?> createAdapter(DTFacesContext context, String viewId)
- {
- try
- {
- final IResource res =
- _myViewHandler.getActionDefinition(context, viewId);
-
- if (res instanceof IFile)
- {
- final IFile srcFile = (IFile) res;
- final ITagRegistry registry = findTagRegistry(srcFile);
- if (registry != null) {
- if (_myViewHandler.isHTMLContent(srcFile))
- {
- return new FaceletViewDefnAdapter(registry);
- }
- // if we have a jsp file, then return the default
- // adapter
- return _defaultViewDefnAdapterFactory.createAdapter(context, viewId);
- }
- }
- }
- catch (final ViewHandlerException vhe)
- {
- JSFCorePlugin.log(vhe, "While acquiring view adapter"); //$NON-NLS-1$
- }
-
- // not found or failed
- return null;
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/std-taglibs/composite.taglib.xml b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/std-taglibs/composite.taglib.xml
deleted file mode 100644
index 32f722f..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/std-taglibs/composite.taglib.xml
+++ /dev/null
@@ -1,1710 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!--
- DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
- Copyright 2009 Sun Microsystems, Inc. All rights reserved.
-
- The contents of this file are subject to the terms of either the GNU
- General Public License Version 2 only ("GPL") or the Common Development
- and Distribution License("CDDL") (collectively, the "License"). You
- may not use this file except in compliance with the License. You can obtain
- a copy of the License at https://glassfish.dev.java.net/public/CDDL+GPL.html
- or glassfish/bootstrap/legal/LICENSE.txt. See the License for the specific
- language governing permissions and limitations under the License.
-
- When distributing the software, include this License Header Notice in each
- file and include the License file at glassfish/bootstrap/legal/LICENSE.txt.
- Sun designates this particular file as subject to the "Classpath" exception
- as provided by Sun in the GPL Version 2 section of the License file that
- accompanied this code. If applicable, add the following below the License
- Header, with the fields enclosed by brackets [] replaced by your own
- identifying information: "Portions Copyrighted [year]
- [name of copyright owner]"
-
- Contributor(s):
-
- If you wish your version of this file to be governed by only the CDDL or
- only the GPL Version 2, indicate your decision by adding "[Contributor]
- elects to include this software in this distribution under the [CDDL or GPL
- Version 2] license." If you don't indicate a single choice of license, a
- recipient has the option to distribute your version of this file under
- either the CDDL, the GPL Version 2 or to extend the choice of license to
- its licensees as provided above. However, if you add GPL Version 2 code
- and therefore, elected the GPL Version 2 license, then the option applies
- only if the new code is made subject to such option by the copyright
- holder.
--->
-
-<facelet-taglib xmlns="http://java.sun.com/xml/ns/javaee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facelettaglibrary_2_0.xsd"
- version="2.0">
- <description>
-
-
- </pre>
-
- <div class="changed_added_2_0">
-
- <p>Describes the Facelets2 tag library used for declaring and
- defining
- the usage contract for composite UI Components. When authoring a
- composite component, use of this tag library is largely optional,
- though always recommended. Declaring and defining a composite
- component with this taglib provides valuable information about the
- component that can be used by tools and users of the composite
- component. In most cases, a composite component can be authored
- without declaring and defining its usage contract with this taglib.
- PENDING: the limit of what one can do without declaring and defining a
- usage contract must be cleary specified and documented. PENDING: The
- implementation team must help discover these limits.
- </p>
-
- <h2>Creating a Composite Component</h2>
-
- <p>The default implementation must support authoring A composite
- component is declared by creating a Facelets2 file inside of a resource
- library. (See section JSF.2.6 of the specification prose document for
- more information about resource libraries.) A composite component
- must reside within a resource library. It is not possible to create a
- composite component without putting it inside of a resource
- library.</p>
-
- <p>The default XML namespace URI of the taglib that contains the
- composite component, for use in <em>the using page</em>, is
- <code>http://java.sun.com/jsf/composite/&lt;composite-library-name&gt;</code>,
- where <code>&lt;composite-library-name&gt;</code> is
- the name of the
- resource library. For example:</p>
-
- <pre><code>
- &lt;!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
- <br />
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"&gt;<br
- />
- &lt;html xmlns="http://www.w3.org/1999/xhtml"<br />
- xmlns:h="http://java.sun.com/jsf/html"<br />
- xmlns:f="http://java.sun.com/jsf/core"<br />
- xmlns:ui="http://java.sun.com/jsf/facelets"<br />
- xmlns:ez="<i>http://java.sun.com/jsf/composite/<b>ezcomp</b></i>"&gt;<br
- />
- ...<br />
- </code></pre>
-
- <p>This declares that any Facelets2 file in the resource
- library called <code>ezcomp</code> can be used as a regular
- JSF UI
- component in a page with the above namespace declaration by using the
- "<code>ez</code>" prefix. For example, placing a file called
- <code>foo.xhtml</code> in a resource library called <code>ezcomp</code>
- would make that file accessible like this.</p>
-
- <pre><code>
- &lt;ez:foo /&gt;
- </code></pre>
-
-
- <p>The implementation must also support declaring the
- namespace of the tag library in a JSF PDL tag library descriptor.
- This descriptor file is optional and is useful for component vendors
- that do not want to use the default XML namespace. This version of
- the proposal currently uses the facelet taglib descriptor syntax. For
- example: </p>
-
- <pre><code>
- &lt;facelet-taglib&gt;<br />
- &lt;namespace&gt;http://domain.com/path&lt;/namespace&gt;
- <br />
- &lt;composite-library-name&gt;compositeTest&lt;/composite-library-name&gt;
- <br />
- &lt;/facelet-taglib&gt; <br />
- </code></pre>
-
- <p>Components from that taglibrary may be used in a using page by
- declaring them in the XML namespace for that page:</p>
-
- <pre><code>
- &lt;!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
- <br />
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"&gt;<br
- />
- &lt;html xmlns="http://www.w3.org/1999/xhtml"<br />
- xmlns:h="http://java.sun.com/jsf/html"<br />
- xmlns:f="http://java.sun.com/jsf/core"<br />
- xmlns:ui="http://java.sun.com/jsf/facelets"<br />
- xmlns:ez="<i><b>http://domain.com/path/namespace</b></i>"&gt;<br
- />
- ...<br />
- </code></pre>
-
-
- <p><a name="composite_example">Below is an example of a
- fairly
- involved composite component declaration. Such a declaration might
- appear in <code>foo.xhtml</code>.</a></p>
-
- <div class="syntax"><div class="html4strict"
- style="font-family: monospace;"><ol><li class="li1"><div
- class="de1"><span class="sc2">&lt;<a
- href="interface.html">composite:interface</a> <span
- class="kw3">name</span>=<span class="st0">&quot;foo&quot;</span></div></li>
- <li class="li2"><div class="de2">&nbsp; &nbsp; &nbsp;
- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;
- &nbsp;displayName=<span class="st0">&quot;Very Simple
- Login Panel&quot;</span></div></li>
- <li class="li1"><div class="de1">&nbsp; &nbsp; &nbsp;
- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;
- &nbsp;preferred=<span class="st0">&quot;true&quot;</span></div></li>
- <li class="li2"><div class="de2">&nbsp; &nbsp; &nbsp;
- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;
- &nbsp;expert=<span class="st0">&quot;false&quot;</span></div></li>
- <li class="li1"><div class="de1">&nbsp; &nbsp; &nbsp;
- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;
- &nbsp;shortDescription=<span class="st0">&quot;An
- illustration of the composite component feature&quot;</span><span
- class="kw2">&gt;</span></span></div></li>
- <li class="li2"><div class="de2">&nbsp; <span
- class="sc2">&lt;<a href="attribute.html">composite:attribute</a>
- <span class="kw3">name</span>=<span class="st0">&quot;model&quot;</span>
- required=<span class="st0">&quot;true&quot;</span><span
- class="kw2">&gt;</span></span></div></li>
- <li class="li1"><div class="de1">&nbsp; &nbsp; <span
- class="sc2">&lt;composite:attribute <span class="kw3">name</span>=<span
- class="st0">&quot;loginAction&quot;</span> required=<span
- class="st0">&quot;true&quot;</span> method-signature=<span
- class="st0">&quot;java.lang.Object action()&quot;</span>/
- <span class="kw2">&gt;</span></span></div></li>
- <li class="li2"><div class="de2">&nbsp; <span
- class="sc2"><span class="kw2">&lt;</span>/composite:attribute&gt;</span></div></li>
- <li class="li1"><div class="de1">&nbsp; <span
- class="sc2">&lt;composite:attribute <span class="kw3">name</span>=<span
- class="st0">&quot;valueChangeListener&quot;</span>
- targets=<span class="st0">&quot;username&quot;</span>
- /<span class="kw2">&gt;</span></span></div></li>
- <li class="li2"><div class="de2">&nbsp; <span
- class="sc2">&lt;composite:attribute <span class="kw3">name</span>=<span
- class="st0">&quot;specialMethodExpression&quot;</span></div></li>
- <li class="li1"><div class="de1">&nbsp; &nbsp; &nbsp;
- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;
- &nbsp; &nbsp;method-signature=<span class="st0">&quot;com.foo.User
- validateCurrentUser()&quot;</span> /<span class="kw2">&gt;</span></span></div></li>
- <li class="li2"><div class="de2">&nbsp; <span
- class="sc2">&lt;composite:attribute <span class="kw3">name</span>=<span
- class="st0">&quot;loginButtonLabel&quot;</span>
- default=<span class="st0">&quot;Login&quot;</span> /<span
- class="kw2">&gt;</span></span></div></li>
- <li class="li1"><div class="de1">&nbsp; <span
- class="sc2">&lt;<a href="editableValueHolder.html">composite:editableValueHolder</a>
- <span class="kw3">name</span>=<span class="st0">&quot;username&quot;</span>
- /<span class="kw2">&gt;</span></span></div></li>
- <li class="li2"><div class="de2">&nbsp; <span
- class="sc2">&lt;composite:actionSource <span class="kw3">name</span>=<span
- class="st0">&quot;loginEvent&quot;</span> /<span
- class="kw2">&gt;</span></span></div></li>
- <li class="li1"><div class="de1">&nbsp; <span
- class="sc2">&lt;composite:actionSource <span class="kw3">name</span>=<span
- class="st0">&quot;cancelEvent&quot;</span> /<span
- class="kw2">&gt;</span></span></div></li>
- <li class="li2"><div class="de2">&nbsp; <span
- class="sc2">&lt;composite:actionSource <span class="kw3">name</span>=<span
- class="st0">&quot;allEvents&quot;</span> targets=<span
- class="st0">&quot;loginEvent,cancelEvent&quot;</span> /<span
- class="kw2">&gt;</span></span></div></li>
- <li class="li1"><div class="de1"><span class="sc2"><span
- class="kw2">&lt;</span>/composite:interface&gt;</span></div></li>
- <li class="li2"><div class="de2"><span class="sc2">&lt;<a
- href="implementation.html">composite:implementation</a> <span
- class="kw2">&gt;</span></span></div></li>
- <li class="li1"><div class="de1">&nbsp;</div></li>
- <li class="li2"><div class="de2">&nbsp; <span
- class="sc2">&lt;ui:decorate template=<span class="st0">&quot;fooTemplate.xhtml&quot;</span><span
- class="kw2">&gt;</span></span></div></li>
- <li class="li1"><div class="de1">&nbsp;</div></li>
- <li class="li2"><div class="de2">&nbsp; &nbsp; <span
- class="sc2">&lt;ui:define <span class="kw3">name</span>=<span
- class="st0">&quot;header&quot;</span><span
- class="kw2">&gt;</span></span></div></li>
- <li class="li1"><div class="de1">&nbsp;</div></li>
- <li class="li2"><div class="de2">&nbsp; &nbsp; &nbsp;
- <span class="sc2"><span class="kw2">&lt;p&gt;</span></span>This
- is the login panel header<span class="sc2"><span class="kw2">&lt;/p&gt;</span></span></div></li>
- <li class="li1"><div class="de1">&nbsp;</div></li>
- <li class="li2"><div class="de2">&nbsp; &nbsp; <span
- class="sc2"><span class="kw2">&lt;</span>/ui:define&gt;</span></div></li>
- <li class="li1"><div class="de1">&nbsp;</div></li>
- <li class="li2"><div class="de2">&nbsp; &nbsp; <span
- class="sc2">&lt;ui:define <span class="kw3">name</span>=<span
- class="st0">&quot;body&quot;</span><span class="kw2">&gt;</span></span></div></li>
- <li class="li1"><div class="de1">&nbsp;</div></li>
- <li class="li2"><div class="de2">&nbsp; &nbsp; &nbsp;
- <span class="sc2"><span class="kw2">&lt;p&gt;</span></span></div></li>
- <li class="li1"><div class="de1">&nbsp;</div></li>
- <li class="li2"><div class="de2">&nbsp; &nbsp; &nbsp;
- &nbsp; &nbsp;<span class="sc2">&lt;h:inputText <span
- class="kw3">id</span>=<span class="st0">&quot;username&quot;</span>
- /<span class="kw2">&gt;</span></span></div></li>
- <li class="li1"><div class="de1">&nbsp;</div></li>
- <li class="li2"><div class="de2">&nbsp; &nbsp; &nbsp;
- <span class="sc2"><span class="kw2">&lt;/p&gt;</span></span></div></li>
- <li class="li1"><div class="de1">&nbsp;</div></li>
- <li class="li2"><div class="de2">&nbsp; &nbsp; &nbsp;
- <span class="sc2"><span class="kw2">&lt;p&gt;</span></span></div></li>
- <li class="li1"><div class="de1">&nbsp;</div></li>
- <li class="li2"><div class="de2">&nbsp; &nbsp; &nbsp;
- &nbsp; <span class="sc2">&lt;h:commandButton <span
- class="kw3">id</span>=<span class="st0">&quot;loginEvent&quot;</span>
- </div></li>
- <li class="li1"><div class="de1">&nbsp; &nbsp; &nbsp;
- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;
- &nbsp; &nbsp; &nbsp;<span class="kw3">value</span>=<span
- class="st0">&quot;#{cc.attrs.loginButtonLabel}&quot;</span><span
- class="kw2">&gt;</span></span></div></li>
- <li class="li2"><div class="de2">&nbsp;</div></li>
- <li class="li1"><div class="de1">&nbsp; &nbsp; &nbsp;
- &nbsp; <span class="sc2"><span class="kw2">&lt;</span>/h:commandButton&gt;</span></div></li>
- <li class="li2"><div class="de2">&nbsp;</div></li>
- <li class="li1"><div class="de1">&nbsp; &nbsp; &nbsp;
- &nbsp; <span class="sc2">&lt;h:commandButton <span
- class="kw3">id</span>=<span class="st0">&quot;cancelEvent&quot;</span>
- <span class="kw3">value</span>=<span class="st0">&quot;Cancel&quot;</span>
- <span class="kw3">action</span>=<span class="st0">&quot;cancel&quot;</span><span
- class="kw2">&gt;</span></span></div></li>
- <li class="li2"><div class="de2">&nbsp;</div></li>
- <li class="li1"><div class="de1">&nbsp; &nbsp; &nbsp;
- &nbsp; <span class="sc2"><span class="kw2">&lt;</span>/h:commandButton&gt;</span></div></li>
- <li class="li2"><div class="de2">&nbsp;</div></li>
- <li class="li1"><div class="de1">&nbsp; &nbsp; &nbsp;
- &nbsp; <span class="sc2">&lt;special:validateUserButton
- </div></li>
- <li class="li2"><div class="de2">&nbsp; &nbsp; &nbsp;
- &nbsp; &nbsp; validateUser=<span class="st0">&quot;#{cc.attrs.specialMethodExpression}&quot;</span>
- /<span class="kw2">&gt;</span></span></div></li>
- <li class="li1"><div class="de1">&nbsp;</div></li>
- <li class="li2"><div class="de2">&nbsp;</div></li>
- <li class="li1"><div class="de1">&nbsp; &nbsp; &nbsp;
- <span class="sc2"><span class="kw2">&lt;/p&gt;</span></span></div></li>
- <li class="li2"><div class="de2">&nbsp;</div></li>
- <li class="li1"><div class="de1">&nbsp; &nbsp; <span
- class="sc2"><span class="kw2">&lt;</span>/ui:define&gt;</span></div></li>
- <li class="li2"><div class="de2">&nbsp;</div></li>
- <li class="li1"><div class="de1">&nbsp; &nbsp; <span
- class="sc2">&lt;ui:define <span class="kw3">name</span>=<span
- class="st0">&quot;footer&quot;</span><span
- class="kw2">&gt;</span></span></div></li>
- <li class="li2"><div class="de2">&nbsp;</div></li>
- <li class="li1"><div class="de1">&nbsp; &nbsp; &nbsp;<span
- class="sc2"><span class="kw2">&lt;p&gt;</span></span>This
- is the login panel footer<span class="sc2"><span class="kw2">&lt;/p&gt;</span></span></div></li>
- <li class="li2"><div class="de2">&nbsp;</div></li>
- <li class="li1"><div class="de1">&nbsp; &nbsp; <span
- class="sc2"><span class="kw2">&lt;</span>/ui:define&gt;</span></div></li>
- <li class="li2"><div class="de2">&nbsp;</div></li>
- <li class="li1"><div class="de1">&nbsp; <span
- class="sc2"><span class="kw2">&lt;</span>/ui:decorate&gt;</span></div></li>
- <li class="li2"><div class="de2">&nbsp;</div></li>
- <li class="li1"><div class="de1"><span class="sc2"><span
- class="kw2">&lt;</span>/composite:implementation&gt;</span>
- </div></li></ol></div></div>
-
- <p>The values for attributes in a composite component PDL file can
- be
- fully localized by putting them inside a ResourceBundle in the same
- directory as the PDL page and accessing them with the per-component
- resource bundle syntax. Consider the file <code>foo.xhtml</code>,
- in
- the resource library <code>ezcomp</code>. The
- <code>shortDescription</code> element could be changed to
- be:</p>
-
- <pre><code>
- &lt;composite:interface
- shortDescription="#{cc.resourceBundleMap.shortDescription}" &gt;
- </code></pre>
-
- <p>In this case, In the same <code>ezcomp</code>
- directory as
- <code>foo.xhtml</code>, there would be a <code>foo.properties</code>
- file that would contain this entry:</p>
-
- <pre><code>
- shortDescription=A really nifty login panel.
- </code></pre>
-
- <p>The normal localization rules for <code>ResourceBundle</code>
- would
- apply.</p>
-
- </div>
-
-
- <pre>
-
-
- </description>
- <namespace>http://java.sun.com/jsf/composite</namespace>
- <tag>
- <description>
-
-
- <div class="changed_added_2_0">
-
- <p>This element declares the usage contract for a composite
- component. Optionally, and at the component author's
- discretion, this contract exposes the features of one or
- more inner components to the page author. The page author
- can work with the composite component as a single component
- whose feature set is the union of the features declared in
- the usage contract.</p>
-
- <p>For example, consider a composite component that
- implements the functionality of a "login panel". Such a
- component would likely have two text fields and one button.
- The user of such a component might like to do one or more of
- the following.</p>
-
- <ul>
-
- <li><p>Be able to listen for the <code>ActionEvent</code>
- on the button.</p>
-
- <p>In this case, a
- <code>&lt;composite:actionSource&gt;</code>
- element is
- included in the usage contract that refers to the inner
- button in the <code>&lt;composite:implementation&gt;</code>
- section.</p>
-
- </li>
-
- <li><p>Provide an "action" to invoke when the button is
- pressed.
- </p>
-
- <p>In this case, a
- <code>&lt;composite:attribute&gt;</code> element
- is included
- in the usage contract that refers to the inner button in the
- <code>&lt;composite:implementation&gt;</code>
- section and
- declares the proper method signature for an "action".</p>
-
- </li>
-
- <li><p>Provide parameters to the composite component for
- labels and other rendering specific aspects of the composite
- component.</p>
-
- <p>In this case, one or more
- <code>&lt;composite:attribute&gt;</code>
- elements are included
- in the usage contract and those parameters are referred to in
- the <code>&lt;composite:implementation&gt;</code>
- section
- using EL expressions like
- <code>#{cc.attrs.usernameLabel}</code>,
- assuming <code>usernameLabel</code> is the <code>name</code>
- of one of the <code>&lt;composite:attribute&gt;</code>
- elements in the usage contract.</p>
-
- </li>
-
-
- <li><p>Add <code>ValueChangeListener</code>s,
- <code>Converter</code>s, or <code>Validator</code>s
- to either
- or both text fields.
- </p>
-
- <p>In this case, a
- <code>&lt;composite:editableValueHolder&gt;</code>
- element is
- included in the usage contract that refers to the inner text
- field in the <code>&lt;composite:implementation&gt;</code>
- section. In the case of wanting to enable only adding a
- <code>Converter</code> (and not a
- <code>ValueChangeListener</code> or <code>Validator</code>,
- a
- <code>&lt;composite:valueHolder&gt;</code>
- element would be
- used.</p>
-
- </li>
-
- <li><p>Add facet children to the login panel.</p>
-
- <p>In this case, a <code>&lt;composite:facet&gt;</code>
- element is included in the usage contract that refers to the
- inner <code>&lt;composite:renderFacet&gt;</code>
- element in
- the <code>&lt;composite:implementation&gt;</code>
- section.
- </p>
-
- </li>
-
-
- </ul>
-
- <p>For each of the behaviorial interfaces in Section JSF.3.2
- of
- the specification, there is a tag in the
- <code>composite:</code> library to nest inside of the
- <code>&lt;composite:interface&gt;</code>
- section.
- </p>
-
-
- <p>If the <code>&lt;composite:interface&gt;</code>
- section
- is not present in a <em>PDL page</em>, the contract will
- be
- inferred as described in the specification. There must be
- zero or one of these elements in a composite component PDL
- file. If a <code>&lt;composite:interface&gt;</code>
- element
- does appear, there must be an accompanying
- <code>&lt;composite:implementation&gt;</code>
- element in the
- same PDL file. </p>
-
- <p><b>Nesting of composite components</b></p>
-
- <p>The implementation must support nesting of composite
- components. Specifically, it must be possible for the
- <code>&lt;composite:implementation&gt;</code>
- section of a
- composite component to act as the <em>using page</em>
- for
- another composite component. When a composite component
- exposes a behavioral interface to the <em>using page</em>,
- such as a <code>&lt;composite:actionSource&gt;</code>,
- <code>&lt;composite:editableValueHolder&gt;</code>,
- <code>&lt;composite:valueHolder&gt;</code> or
- other
- behavioral interface, it must be possible to
- &#8220;propogate&#8221; the exposure of such an interface in
- the case of a nested composite component. The composite
- component author must ensure that the value of the
- <code>name</code> attributes exactly match at all levels
- of
- the nesting to enable this exposure to work. The
- implementation is not required to support
- &#8220;re-mapping&#8221; of names in a nested composite
- component.</p>
-
- <p>For example, consider this nested composite component.</p>
-
- <p>Using page</p>
-
- <div class="syntax"><div class="html4strict"
- style="font-family: monospace;"><ol><li class="li1"><div
- class="de1"><span class="sc2">&lt;ez:actionSourceOuter&gt;</span></div></li>
- <li class="li2"><div class="de2">&nbsp; <span
- class="sc2">&lt;f:actionListener <span class="kw3">for</span>=<span
- class="st0">&quot;button1&quot;</span> /<span
- class="kw2">&gt;</span></span></div></li>
- <li class="li1"><div class="de1"><span class="sc2"><span
- class="kw2">&lt;</span>/ez:actionSourceOuter&gt;</span>
- </div></li></ol></div></div>
-
- <p>actionSourceOuter.xhtml: Outer composite component</p>
-
- <div class="syntax"><div class="html4strict"
- style="font-family: monospace;"><ol><li class="li1"><div
- class="de1"><span class="sc2">&lt;composite:interface&gt;</span></div></li>
- <li class="li2"><div class="de2">&nbsp; <span
- class="sc2">&lt;composite:actionSource <span class="kw3">name</span>=<span
- class="st0">&quot;button1&quot;</span> /<span
- class="kw2">&gt;</span></span></div></li>
- <li class="li1"><div class="de1"><span class="sc2"><span
- class="kw2">&lt;</span>/composite:interface&gt;</span></div></li>
- <li class="li2"><div class="de2">&nbsp;</div></li>
- <li class="li1"><div class="de1"><span class="sc2">&lt;composite:implementation&gt;</span></div></li>
- <li class="li2"><div class="de2">&nbsp; <span
- class="sc2">&lt;ez:actionSourceInner /<span class="kw2">&gt;</span></span></div></li>
- <li class="li1"><div class="de1"><span class="sc2"><span
- class="kw2">&lt;</span>/composite:implementation&gt;</span>
- </div></li></ol></div></div>
-
- <p>actionSourceInner.xhtml: the composite component used
- within a
- composite component.</p>
-
- <div class="syntax"><div class="html4strict"
- style="font-family: monospace;"><ol><li class="li1"><div
- class="de1"><span class="sc2">&lt;composite:interface&gt;</span></div></li>
- <li class="li2"><div class="de2">&nbsp; <span
- class="sc2">&lt;composite:actionSource <span class="kw3">name</span>=<span
- class="st0">&quot;button1&quot;</span> /<span
- class="kw2">&gt;</span></span></div></li>
- <li class="li1"><div class="de1"><span class="sc2"><span
- class="kw2">&lt;</span>/composite:interface&gt;</span></div></li>
- <li class="li2"><div class="de2">&nbsp;</div></li>
- <li class="li1"><div class="de1"><span class="sc2">&lt;composite:implementation&gt;</span></div></li>
- <li class="li2"><div class="de2">&nbsp; <span
- class="sc2">&lt;h:commandButton <span class="kw3">id</span>=<span
- class="st0">&quot;button1&quot;</span> <span
- class="kw3">value</span>=<span class="st0">&quot;the
- real button&quot;</span> /<span class="kw2">&gt;</span></span></div></li>
- <li class="li1"><div class="de1"><span class="sc2"><span
- class="kw2">&lt;</span>/composite:implementation&gt;</span>
- </div></li></ol></div></div>
-
- <p>The <code>id</code> of the <code>&lt;h:commandButton&gt;</code>
- on
- line 6 of actionSourceInner.xhtml must match the <code>name</code>
- on
- line 2 of that file (this is a standard requirement for all
- composite
- components, nested or not). That <code>id</code> must
- also match the
- <code>name</code> on line 2 of actionSourceOuter.xhtml,
- and the
- <code>for</code> on line 2 of the using page.</p>
-
- <p>The implementation must support any level of nesting as
- long as the
- <code>for</code>, <code>name</code>, and
- <code>id</code> values match
- up. Furthermore, the <code>targets</code> attribute is
- also valid for
- use in this nested fashion.</p>
-
- <p><b>Naming containers within composite components</b></p>
-
- <p>Composite components are themselves naming containers so
- that any
- possible id conflicts between inner components and components in the
- using page are avoided. However, special care must be taken when
- using
- naming containers in the <code>&lt;composite:implementation&gt;</code>
- section. In such cases the value of the &#8220;name&#8221;
- attribute,
- or the values of the &#8220;targets&#8221; attribute must be
- used with a
- clientId relative to the <em>top level component</em> to
- expose any
- attached object targets to the using page. For example:</p>
-
- <p>Using page</p>
-
- <div class="syntax"><div class="html4strict"
- style="font-family: monospace;"><ol><li class="li1"><div
- class="de1"><span class="sc2">&lt;ez:loginButton&gt;</span></div></li>
- <li class="li2"><div class="de2">&nbsp; <span
- class="sc2">&lt;f:actionListener <span class="kw3">for</span>=<span
- class="st0">&quot;button&quot;</span> <span
- class="kw3">binding</span>=<span class="st0">&quot;#{foo.actionListener}&quot;</span>
- /<span class="kw2">&gt;</span></span></div></li>
- <li class="li1"><div class="de1"><span class="sc2"><span
- class="kw2">&lt;</span>/ez:loginButton&gt;</span>
- </div></li></ol></div></div>
-
-
- <p>loginButton.xhtml</p>
-
- <div class="syntax"><div class="html4strict"
- style="font-family: monospace;"><ol><li class="li1"><div
- class="de1"><span class="sc2">&lt;composite:interface&gt;</span></div></li>
- <li class="li2"><div class="de2">&nbsp; <span
- class="sc2">&lt;composite:actionSource <span class="kw3">name</span>=<span
- class="st0">&quot;button&quot;</span> targets=<span
- class="st0">&quot;form:button&quot;</span> /<span
- class="kw2">&gt;</span></span></div></li>
- <li class="li1"><div class="de1"><span class="sc2"><span
- class="kw2">&lt;</span>/composite:interface&gt;</span></div></li>
- <li class="li2"><div class="de2">&nbsp;</div></li>
- <li class="li1"><div class="de1"><span class="sc2">&lt;composite:implementation&gt;</span></div></li>
- <li class="li2"><div class="de2">&nbsp;</div></li>
- <li class="li1"><div class="de1">&nbsp; <span
- class="sc2">&lt;h:form <span class="kw3">id</span>=<span
- class="st0">&quot;form&quot;</span><span
- class="kw2">&gt;</span></span></div></li>
- <li class="li2"><div class="de2">&nbsp; &nbsp;
- <span class="sc2">&lt;h:commandButton <span class="kw3">id</span>=<span
- class="st0">&quot;button&quot;</span> <span
- class="kw3">value</span>=<span class="st0">&quot;Submit&quot;</span>
- /<span class="kw2">&gt;</span></span></div></li>
- <li class="li1"><div class="de1">&nbsp; <span
- class="sc2"><span class="kw2">&lt;</span>/h:form&gt;</span></div></li>
- <li class="li2"><div class="de2"><span class="sc2"><span
- class="kw2">&lt;</span>/composite:implementation&gt;</span>
- </div></li></ol></div></div>
-
- <p>Because the button on line 8 resides within a form, it must
- be
- referred to using a client id, relative to the <em>top level
- component</em>, in the "targets" attribute on line 2. Using a
- relative
- clientId is required due to the semantics of
- <code>UIComponent.findComponent()</code>.</p>
-
- </div>
-
- </description>
- <tag-name>interface</tag-name>
- <handler-class>com.sun.faces.facelets.tag.composite.InterfaceHandler</handler-class>
- <attribute>
- <description>
-
-
- <div class="changed_added_2_0">
- <p>The name of this composite component.
- Advisory only. The real name is taken from the
- filename. The value of this attribute will be set as
- the value for this property on the <em>composite
- component bean descriptor</em>.</p></div>
-
- </description>
- <name>name</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
-
-
- <div class="changed_added_2_0">
- <p>The <code>component-type</code> of the <code>UIComponent</code>
- that
- will serve as the <em>composite component root</em>
- for this composite
- component. The declared <code>component-family</code>
- for this
- component must be <code>javax.faces.NamingContainer</code>.</p></div>
-
- </description>
- <name>componentType</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
-
-
- <div class="changed_added_2_0">
- <p>The name to display in a tool palette
- containing this component. The value of this attribute will be
- set as
- the value for this property on the <em>composite
- component bean descriptor</em>.</p></div>
-
- </description>
- <name>displayName</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
-
-
- <div class="changed_added_2_0">
- <p>Is this a "preferred" component. The value
- of this attribute will be set as the value for this
- property on the <em>composite component bean
- descriptor</em>.</p></div>
-
- </description>
- <name>preferred</name>
- <required>false</required>
- <type>boolean</type>
- </attribute>
- <attribute>
- <description>
-
-
- <div class="changed_added_2_0">
- <p>Is this component only for expert users?
- The value of this attribute will be set as the value for
- this property on the <em>composite component bean
- descriptor</em>.</p></div>
-
- </description>
- <name>expert</name>
- <required>false</required>
- <type>boolean</type>
- </attribute>
- <attribute>
- <description>
-
-
- <div class="changed_added_2_0">
- <p>A short description of the purpose of this
- component. The value of this attribute will be set as
- the value for this property on the <em>composite
- component bean descriptor</em>.</p></div>
-
- </description>
- <name>shortDescription</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- </tag>
- <tag>
- <description>
-
- <div class="changed_added_2_0">
- <p>Defines the implementation of the composite
- component. There must be zero or one of these in a
- composite component markup file. If a
- <code>&lt;composite:interface&gt;</code> element
- appears,
- there must be a corresponding
- <code>&lt;composite-implementation&gt;</code>
- element. If no
- <code>&lt;composite:interface&gt;</code> element
- appears,
- the <code>&lt;composite-implementation&gt;</code>
- element is
- optional. </p> </div>
- </description>
- <tag-name>implementation</tag-name>
- <handler-class>com.sun.faces.facelets.tag.composite.ImplementationHandler</handler-class>
- </tag>
- <tag>
- <description>
-
-
- <div class="changed_added_2_0">
- <p>Declares an attribute that may be given to an instance of
- the
- <em>composite component</em> tag for this composite
- component. There
- may be zero or many of these inside of the
- <code>&lt;composite:interface</code>&gt;
- section. This element may be
- nested within other <code>&lt;composite:attribute&gt;</code>
- elements to
- convey a usage contract that includes nested properties.</p>
-
- <p>Please see <a href="tld-summary.html#composite_example">summary
- page</a> for a usage example.</p>
-
- <p>The <em>top level component</em> in which this
- element is
- ultimately nested must be a <code>NamingContainer</code>.
- There are certain component properties that must not be
- exposed using this element. The motivation for this
- restriction is that the mapping of markup attributes to
- component properties/attributes does not allow for these
- attributes to be set. The following properties must not be
- exposed using this element.</p>
-
- <ul>
- <li><p>binding</p></li>
- <li><p>id</p></li>
- <li><p>inView</p></li>
- <li><p>parent</p></li>
- <li><p>rendered</p></li>
- <li><p>rendererType</p></li>
- <li><p>transient</p></li>
- </ul>
-
- </div>
- </description>
- <tag-name>attribute</tag-name>
- <handler-class>com.sun.faces.facelets.tag.composite.AttributeHandler</handler-class>
- <attribute>
- <description>
-
-
- <div class="changed_added_2_0">
- <p>The name of the attribute as it must appear on the <em>composite
- component tag</em> in the <em>using page</em>.
- If the value of the
- <em>name</em> attribute is equal to (without the
- quotes)
- &#8220;action&#8221;, &#8221;actionListener&#8221;,
- &#8220;validator&#8221;, or &#8220;valueChangeListener&#8221;,
- the
- action described in <a target="_"
- href="../../../javadocs/javax/faces/application/ViewHandler.html#retargetMethodExpressions(javax.faces.context.FacesContext,%20javax.faces.component.UIComponent)">ViewHandler.retargetMethodExpressions()</a>
- must be taken to handle the attribute. In these cases, the
- <code>method-signature</code> attribute, if present,
- must be ignored as
- its value is derived as described in
- <code>retargetMethodExpressions()</code>.</div>
-
- </description>
- <name>name</name>
- <required>true</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
-
-
- <div class="changed_added_2_0">
-
- <p>If this element has a <code>method-signature</code>
- attribute, the
- value of the <code>targets</code> attribute must be
- interpreted as a
- space (not tab) separated list of client ids (relative to the
- <em>top
- level component</em>) of components within the
- <code>&lt;composite:implementation&gt;</code>
- section. Space is used as
- the delimiter for compatibility with the IDREFS and NMTOKENS
- data types
- from the XML Schema. Each entry in the list must be interpreted
- as the
- id of an inner component to which the <code>MethodExpression</code>
- from
- the <em>composite component tag</em> in the <em>using
- page</em> must be
- applied. If this element has a <code>method-signature</code>
- attribute,
- but no <code>targets</code> attribute, the value of
- the
- <code>name</code> attribute is used as the single
- entry in the list. If
- the value of the <code>name</code> attribute is <strong>not</strong>
- one
- of the special values listed in the description of the <code>name
- attribute</code>, <code>targets</code> (or its
- derived value) need not
- correspond to the id of an inner component.</p>
-
- </div>
-
- </description>
- <name>targets</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
-
-
- <div class="changed_added_2_0">
- <p>If this attribute is not required, and a
- value is not supplied by the page author, use this as
- the default value.</p></div>
-
- </description>
- <name>default</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
-
-
- <div class="changed_added_2_0">
- <p>The name to display in a tool palette
- containing this component. The value of this attribute will be
- set as
- the value for this property on the <em>composite
- component bean descriptor</em>.</p></div>
-
- </description>
- <name>displayName</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
-
-
- <div class="changed_added_2_0">
- <p>True if the page author must supply a value
- for this attribute.</p></div>
-
- </description>
- <name>required</name>
- <required>false</required>
- <type>boolean</type>
- </attribute>
- <attribute>
- <description>
-
-
- <div class="changed_added_2_0">
- <p>Is this a "preferred" component. The value
- of this attribute will be set as the value for this
- property on the <em>composite component bean
- descriptor</em>.</p></div>
-
- </description>
- <name>preferred</name>
- <required>false</required>
- <type>boolean</type>
- </attribute>
- <attribute>
- <description>
-
-
- <div class="changed_added_2_0">
- <p>Is this component only for expert users?
- The value of this attribute will be set as the value for
- this property on the <em>composite component bean
- descriptor</em>.</p></div>
-
- </description>
- <name>expert</name>
- <required>false</required>
- <type>boolean</type>
- </attribute>
- <attribute>
- <description>
-
-
- <div class="changed_added_2_0">
- <p>A short description of the purpose of this
- component. The value of this attribute will be set as
- the value for this property on the <em>composite
- component bean descriptor</em>.</p></div>
-
- </description>
- <name>shortDescription</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
-
-
- <div class="changed_added_2_0">
- <p>Declares that this attribute must be a <code>MethodExpression</code>
- whose method signature is described by the value of this
- attribute. The
- signature must be described using fully qualified class names
- wherever a
- type is required. This attribute is mutually exclusive with the
- "type"
- attribute. If both attributes are present, the
- "method-signature"
- attribute is ignored.</p>
-
- <p>PENDING: when this file is generated from the
- web-facesuicomponent_2_0.xsd, we will not need to copy the
- content here
- manually.</p>
-
- <p>Provides the signature of the Java method. The syntax
- of
- the method-signature element is as follows (taken from
- function-signature in web-jsptaglibrary_2_1.xsd):</p>
-
- <p>MethodSignature ::= ReturnType S MethodName S?
- '(' S? Parameters? S? ')'</p>
-
- <p>ReturnType ::= Type</p>
-
- <p>MethodName ::= Identifier</p>
-
- <p>Parameters ::= Parameter
- | ( Parameter S? ',' S? Parameters )</p>
-
- <p>Parameter ::= Type</p>
-
- <p>Where:</p>
-
- <ul>
-
- <li><p>Type is a basic type or a fully qualified
- Java class name (including package name),
- as per the 'Type' production in the Java
- Language Specification, Second Edition,
- Chapter 18.</p></li>
-
- <li><p>Identifier is a Java identifier, as per
- the 'Identifier' production in the Java
- Language Specification, Second
- Edition, Chapter 18.</p></li>
-
- </ul>
-
- <p>Example:</p>
-
- <p><code>java.lang.String nickName(
- java.lang.String, int )</code></p>
-
-
- </div>
-
- </description>
- <name>method-signature</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
-
-
- <div class="changed_added_2_0">
- <p>Declares that this attribute must be a <code>ValueExpression</code>
- whose expected type is given by the value of this attribute. If
- not
- specified, and no "method-signature" attribute is present,
- <code>java.lang.Object</code> is assumed. This
- attribute is mutually
- exclusive with the "type" attribute. If both attributes are
- present, the
- "method-signature" attribute is ignored. </p> </div>
-
- </description>
- <name>type</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- </tag>
- <tag>
- <description>
-
-
- <div class="changed_added_2_0">
-
- <p>Declares that this composite component supports a facet
- with the
- name given by the value of the "name" attribute. </p>
-
- <p>Please see <code>&lt;<a
- href="interface.html">composite:interface</a>&gt;</code>
- for a usage
- example.</p>
-
-
- </div>
- </description>
- <tag-name>facet</tag-name>
- <handler-class>com.sun.faces.facelets.tag.composite.DeclareFacetHandler</handler-class>
- <attribute>
- <description>
-
-
- <div class="changed_added_2_0">
- <p>The name of the attribute as it must appear
- on the <em>composite component tag</em> in the
- <em>using page</em>.</p></div>
-
- </description>
- <name>name</name>
- <required>true</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
-
-
- <div class="changed_added_2_0">
- <p>The name to display in a tool palette
- containing this component. The value of this attribute will be
- set as
- the value for this property on the <em>composite
- component bean descriptor</em>.</p></div>
-
- </description>
- <name>displayName</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
-
-
- <div class="changed_added_2_0">
- <p>True if the page author must supply a facet with this
- name.</p></div>
-
- </description>
- <name>required</name>
- <required>false</required>
- <type>boolean</type>
- </attribute>
- <attribute>
- <description>
-
-
- <div class="changed_added_2_0">
- <p>Is this a "preferred" facet. The value
- of this attribute will be set as the value for this
- property on the <em>composite component bean
- descriptor</em>.</p></div>
-
- </description>
- <name>preferred</name>
- <required>false</required>
- <type>boolean</type>
- </attribute>
- <attribute>
- <description>
-
-
- <div class="changed_added_2_0">
- <p>Is this facet only for expert users?
- The value of this attribute will be set as the value for
- this property on the <em>composite component bean
- descriptor</em>.</p></div>
-
- </description>
- <name>expert</name>
- <required>false</required>
- <type>boolean</type>
- </attribute>
- <attribute>
- <description>
-
-
- <div class="changed_added_2_0">
- <p>A short description of the purpose of this
- facet. The value of this attribute will be set as
- the value for this property on the <em>composite
- component bean descriptor</em>.</p></div>
-
- </description>
- <name>shortDescription</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- </tag>
- <tag>
- <description>
-
-
- <div class="changed_added_2_0">
-
- <p>This element is used in the
- <code>&lt;composite:implementation&gt;</code>
- section. The facet with
- the name equal to the value of the name attribute, given by the page
- author in the using page, will be rendered at this point in the
- composite component PDL page. </p>
-
-
- <p>The implementation of this tag handler must insert a
- component with <code>component-type</code>
- <code>javax.faces.Output</code> and <code>renderer-type</code>
- <code>javax.faces.CompositeFacet</code> as a
- child at this point in the component tree.</p>
-
- <p>The implementation of this tag handler must store an
- attribute into
- the created component's attribute map under the key given by the
- value
- of the symbolic constant <code>UIComponent.FACETS_KEY</code>.
- The value
- for this key must be the evaluated value of the "name" attribute.</p>
-
- </div>
- </description>
- <tag-name>renderFacet</tag-name>
- <handler-class>com.sun.faces.facelets.tag.composite.RenderFacetHandler</handler-class>
- <attribute>
- <description>
-
-
- <div class="changed_added_2_0">
- <p>The value of the name attribute as it must appear on an
- <code>&lt;f:facet&gt;</code> tag nested
- within the <em>composite
- component tag</em> in the <em>using page</em>.</p></div>
-
- </description>
- <name>name</name>
- <required>true</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
-
- <div class="changed_added_2_0">
-
- <p>If <code>true</code>, and there is no such
- facet present on the top
- level component, a <code>TagException</code> must be
- thrown, containing
- the <code>Location</code>, the facet name, and a
- localized descriptive
- error message.</p>
-
- </div>
-
- </description>
- <name>required</name>
- <required>false</required>
- <type>boolean</type>
- </attribute>
- </tag>
- <tag>
- <description>
-
-
- <div class="changed_added_2_0">
-
- <p>This element is used in the
- <code>&lt;composite:implementation&gt;</code>
- section. Any child
- components or template text within the composite component tag in
- the
- using page will be re-parented into the composite component at the
- point
- indicated by this tag's placement within the
- <code>&lt;composite:implementation&gt;</code>
- section. The normal
- use-case for this element is to have only one occurrence within the
- <code>&lt;composite:implementation&gt;</code>
- section. Inserting
- multiple occurrences may cause duplicate id errors. The results are
- undefined if there are multiple occurrences of this element in the
- <code>&lt;composite:implementation&gt;</code>
- section.</p>
-
- </div>
- </description>
- <tag-name>insertChildren</tag-name>
- <handler-class>com.sun.faces.facelets.tag.composite.InsertChildrenHandler</handler-class>
- </tag>
- <tag>
- <description>
-
-
- <div class="changed_added_2_0">
- <p>Declares that the composite component whose
- contract is declared by the
- <code>&lt;composite:interface&gt;</code> in
- which this
- element is nested exposes an implementation of
- <code>ValueHolder</code> suitable for use as the target
- of
- <em>attached objects</em> in <em>the using page</em>.
- Any attached objects suitable for implementations of
- <code>ValueHolder</code> may be attached to the
- composite
- component. Consider this excerpt from <em>the using
- page</em>:
- </p>
-
- <div class="syntax"><div class="html4strict"
- style="font-family: monospace;"><ol><li class="li1"><div
- class="de1"><span class="sc2">&lt;ez:foo&gt;</span></div></li>
- <li class="li2"><div class="de2">&nbsp; <span
- class="sc2">&lt;f:converter <span class="kw3">for</span>=<span
- class="st0">&quot;userid&quot;</span> binding=<span
- class="st0">&quot;#{bean.converter}&quot;</span> /<span
- class="kw2">&gt;</span></span></div></li>
- <li class="li1"><div class="de1"><span class="sc2"><span
- class="kw2">&lt;</span>/ez:foo&gt;</span>
- </div></li></ol></div></div>
-
- <p>Line 2 refers to the
- <code>&lt;composite:valueHolder&gt;</code>
- declaration on
- line 2 of <code>foo.xhtml</code>:</p>
-
- <div class="syntax"><div class="html4strict"
- style="font-family: monospace;"><ol><li class="li1"><div
- class="de1"><span class="sc2">&lt;composite:interface&gt;</span></div></li>
- <li class="li2"><div class="de2">&nbsp; <span
- class="sc2">&lt;composite:valueHolder <span class="kw3">name</span>=<span
- class="st0">&quot;userid&quot;</span> /<span
- class="kw2">&gt;</span></span></div></li>
- <li class="li1"><div class="de1"><span class="sc2"><span
- class="kw2">&lt;</span>/composite:interface&gt;</span></div></li>
- <li class="li2"><div class="de2">&nbsp;</div></li>
- <li class="li1"><div class="de1"><span class="sc2">&lt;composite:implementation&gt;</span></div></li>
- <li class="li2"><div class="de2">&nbsp; <span
- class="sc2">&lt;h:inputText <span class="kw3">id</span>=<span
- class="st0">&quot;userid&quot;</span> /<span
- class="kw2">&gt;</span></span></div></li>
- <li class="li1"><div class="de1"><span class="sc2"><span
- class="kw2">&lt;</span>/composite:implementation&gt;</span>
- </div></li></ol></div></div>
-
- <p></p>
-
- <p>It is possible to declare that a single
- <code>&lt;composite:valueHolder&gt;</code>
- element should cause multiple
- components within the <code>&lt;composite:implementation&gt;</code>
- section to be the targets of an <em>attached object</em>
- in the
- using page. Assuming the same <em>using page</em>
- excerpt as
- above, the revised <em>PDL page</em> is:</p>
-
- <div class="syntax"><div class="html4strict"
- style="font-family: monospace;"><ol><li class="li1"><div
- class="de1"><span class="sc2">&lt;composite:interface&gt;</span></div></li>
- <li class="li2"><div class="de2">&nbsp; <span
- class="sc2">&lt;composite:valueHolder targets=<span
- class="st0">&quot;userid,password&quot;</span> /<span
- class="kw2">&gt;</span></span></div></li>
- <li class="li1"><div class="de1"><span class="sc2"><span
- class="kw2">&lt;</span>/composite:interface&gt;</span></div></li>
- <li class="li2"><div class="de2">&nbsp;</div></li>
- <li class="li1"><div class="de1"><span class="sc2">&lt;composite:implementation&gt;</span></div></li>
- <li class="li2"><div class="de2">&nbsp; <span
- class="sc2">&lt;h:inputText <span class="kw3">id</span>=<span
- class="st0">&quot;userid&quot;</span> /<span
- class="kw2">&gt;</span></span></div></li>
- <li class="li1"><div class="de1">&nbsp; <span
- class="sc2">&lt;h:inputText <span class="kw3">id</span>=<span
- class="st0">&quot;password&quot;</span> /<span
- class="kw2">&gt;</span></span></div></li>
- <li class="li2"><div class="de2"><span class="sc2"><span
- class="kw2">&lt;</span>/composite:implementation&gt;</span>
- </div></li></ol></div></div>
-
- <p>In this case, the "targets" attribute on the
- <code>&lt;composite:valueHolder&gt;</code>
- element, on line 2 above,
- replaces the "name" attribute in the previous example. "targets" is
- a
- list of ids of client ids (relative to the <em>top level
- component</em>)
- within the <code>&lt;composite:implementation&gt;</code>
- section. In
- this case, "targets" refers to the <code>&lt;h:inputText&gt;</code>
- components on lines 6 and 7 above.</p>
-
- <p>Please see <code>&lt;<a
- href="interface.html">composite:interface</a>&gt;</code>
- for a usage
- example.</p>
-
- </div>
- </description>
- <tag-name>valueHolder</tag-name>
- <handler-class>com.sun.faces.facelets.tag.composite.ValueHolderAttachedObjectTargetHandler</handler-class>
- <attribute>
- <description>
-
-
- <div class="changed_added_2_0">
- <p>
- The value of this attribute maps back to the "for" attribute on
- an attachable object
- nested within a composite component. If the "targets" attribute
- is not specified,
- this value also represents the component ID of the target
- component within the
- that the <code>&lt;composite:implementation&gt;</code>
- ActionListener should be mapped to.
- </p>
- </div>
-
- </description>
- <name>name</name>
- <required>true</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
-
-
- <div class="changed_added_2_0">
- <p>If present, this must be a space (not tab) separated
- list of client
- ids (relative to the <em>top level component</em>)
- of components within
- the <code>&lt;composite:implementation&gt;</code>
- section. Space is
- used as the delimiter for compatibility with the IDREFS and
- NMTOKENS
- data types from the XML Schema. </p></div>
-
- </description>
- <name>targets</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- </tag>
- <tag>
- <description>
-
-
- <div class="changed_added_2_0">
- <p>Declares that the composite component whose
- contract is declared by the
- <code>&lt;composite:interface&gt;</code> in
- which this
- element is nested exposes an implementation of
- <code>EditableValueHolder</code> suitable for use as the
- target of <em>attached objects</em> in <em>the
- using
- page</em>. Any attached objects suitable for
- implementations of <code>EditableValueHolder</code> may
- be
- attached to the composite component.The example from <a
- href="valueHolder.html"><code>&lt;composite:valueHolder&gt;</code></a>
- still applies.
- </p>
-
- <p>Please see <code>&lt;<a
- href="interface.html">composite:interface</a>&gt;</code>
- for a usage
- example.</p>
-
- </div>
- </description>
- <tag-name>editableValueHolder</tag-name>
- <handler-class>com.sun.faces.facelets.tag.composite.EditableValueHolderAttachedObjectTargetHandler</handler-class>
- <attribute>
- <description>
-
-
- <div class="changed_added_2_0">
- <p>
- The value of this attribute maps back to the "for" attribute on
- an attachable object
- nested within a composite component. If the "targets" attribute
- is not specified,
- this value also represents the component ID of the target
- component within the
- that the <code>&lt;composite:implementation&gt;</code>
- ActionListener should be mapped to.
- </p>
- </div>
-
- </description>
- <name>name</name>
- <required>true</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
-
-
- <div class="changed_added_2_0">
- <p>If present, this must be a space (not tab) separated
- list of client
- ids (relative to the <em>top level component</em>)
- of components within
- the <code>&lt;composite:implementation&gt;</code>
- section. Space is
- used as the delimiter for compatibility with the IDREFS and
- NMTOKENS
- data types from the XML Schema.</p></div>
-
- </description>
- <name>targets</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- </tag>
- <tag>
- <description>
-
-
- <div class="changed_added_2_0">
- <p>Declares that the composite component whose
- contract is declared by the
- <code>&lt;composite:interface&gt;</code> in
- which this
- element is nested exposes an implementation of
- <code>ActionSource2</code> suitable for use as the
- target of
- <em>attached objects</em> in <em>the using page</em>.
- Any attached objects suitable for implementations of
- <code>ActionSource2</code> may be attached to the
- composite
- component. Consider this excerpt from <em>the using
- page</em>:
- </p>
-
- <div class="syntax"><div class="html4strict"
- style="font-family: monospace;"><ol><li class="li1"><div
- class="de1"><span class="sc2">&lt;ez:loginPanel <span
- class="kw3">id</span>=<span class="st0">&quot;loginPanel&quot;</span>
- model=<span class="st0">&quot;#{bean}&quot;</span><span
- class="kw2">&gt;</span></span></div></li>
- <li class="li2"><div class="de2">&nbsp; <span
- class="sc2">&lt;f:valueChangeListener <span class="kw3">for</span>=<span
- class="st0">&quot;username&quot;</span></div></li>
- <li class="li1"><div class="de1">&nbsp; &nbsp;
- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;
- &nbsp; &nbsp; &nbsp; &nbsp;&nbsp; &nbsp;
- &nbsp; binding=<span class="st0">&quot;#{bean.useridValueChangeListener}&quot;</span>
- /<span class="kw2">&gt;</span></span></div></li>
- <li class="li2"><div class="de2">&nbsp; <span
- class="sc2">&lt;f:actionListener <span class="kw3">for</span>=<span
- class="st0">&quot;loginEvent&quot;</span> </div></li>
- <li class="li1"><div class="de1">&nbsp; &nbsp;
- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;
- &nbsp; &nbsp; binding=<span class="st0">&quot;#{bean.loginEventListener}&quot;</span>
- /<span class="kw2">&gt;</span></span></div></li>
- <li class="li2"><div class="de2">&nbsp;</div></li>
- <li class="li1"><div class="de1">&nbsp; <span
- class="sc2">&lt;f:actionListener <span class="kw3">for</span>=<span
- class="st0">&quot;cancelEvent&quot;</span> </div></li>
- <li class="li2"><div class="de2">&nbsp; &nbsp;
- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;
- &nbsp; &nbsp; binding=<span class="st0">&quot;#{bean.cancelEventListener}&quot;</span>
- /<span class="kw2">&gt;</span></span></div></li>
- <li class="li1"><div class="de1">&nbsp;</div></li>
- <li class="li2"><div class="de2">&nbsp; <span
- class="sc2">&lt;f:actionListener <span class="kw3">for</span>=<span
- class="st0">&quot;allEvents&quot;</span> </div></li>
- <li class="li1"><div class="de1">&nbsp; &nbsp;
- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;
- &nbsp; &nbsp; binding=<span class="st0">&quot;#{bean.allEventsListener}&quot;</span>
- /<span class="kw2">&gt;</span></span></div></li>
- <li class="li2"><div class="de2">&nbsp;</div></li>
- <li class="li1"><div class="de1"><span class="sc2"><span
- class="kw2">&lt;</span>/ez:loginPanel&gt;</span>
- </div></li></ol></div></div>
-
- <p>The <code>&lt;f:actionListener&gt;</code>
- elements on lines 4, 7, and 10
- refer to the <em>attached objects</em> declared on lines
- 2, 3 and 4 below.</p>
-
- <div class="syntax"><div class="html4strict"
- style="font-family: monospace;"><ol><li class="li1"><div
- class="de1"><span class="sc2">&lt;composite:interface
- <span class="kw3">name</span>=<span class="st0">&quot;loginPanel&quot;</span><span
- class="kw2">&gt;</span></span></div></li>
- <li class="li2"><div class="de2">&nbsp; <span
- class="sc2">&lt;composite:actionSource <span class="kw3">name</span>=<span
- class="st0">&quot;loginEvent&quot;</span> /<span
- class="kw2">&gt;</span></span></div></li>
- <li class="li1"><div class="de1">&nbsp; <span
- class="sc2">&lt;composite:actionSource <span class="kw3">name</span>=<span
- class="st0">&quot;cancelEvent&quot;</span> /<span
- class="kw2">&gt;</span></span></div></li>
- <li class="li2"><div class="de2">&nbsp; <span
- class="sc2">&lt;composite:actionSource <span class="kw3">name</span>=<span
- class="st0">&quot;allEvents&quot;</span> targets=<span
- class="st0">&quot;loginEvent,cancelEvent&quot;</span>
- /<span class="kw2">&gt;</span></span></div></li>
- <li class="li1"><div class="de1"><span class="sc2"><span
- class="kw2">&lt;</span>/composite:interface&gt;</span>
- </div></li></ol></div></div>
-
- <p>Most of the concepts from example content from <a
- href="valueHolder.html"><code>&lt;composite:valueHolder&gt;</code></a>
- also applies in the case of
- <code>&lt;composite:actionSource&gt;</code>.</p>
-
- <p>Please see <code>&lt;<a
- href="interface.html">composite:interface</a>&gt;</code>
- for a usage
- example.</p>
-
-
- </div>
- </description>
- <tag-name>actionSource</tag-name>
- <handler-class>com.sun.faces.facelets.tag.composite.ActionSource2AttachedObjectTargetHandler</handler-class>
- <attribute>
- <description>
-
-
- <div class="changed_added_2_0">
- <p>
- The value of this attribute maps back to the "for" attribute on
- an attachable object
- nested within a composite component. If the "targets" attribute
- is not specified,
- this value also represents the component ID of the target
- component within the
- that the <code>&lt;composite:implementation&gt;</code>
- ActionListener should be mapped to.
- </p>
- </div>
-
- </description>
- <name>name</name>
- <required>true</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
-
-
- <div class="changed_added_2_0">
- <p>If present, this must be a space (not tab) separated
- list of client
- ids (relative to the <em>top level component</em>)
- of components within
- the <code>&lt;composite:implementation&gt;</code>
- section. Space is
- used as the delimiter for compatibility with the IDREFS and
- NMTOKENS
- data types from the XML Schema.</p></div>
-
- </description>
- <name>targets</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- </tag>
- <tag>
- <description>
-
-
- <div class="changed_added_2_0">
- <p>Used within a <code>&lt;composite:interface&gt;</code>
- section,
- within any sub-element of that section, to include XML content not
- defined by this specification. This element can be used to
- incorporate
- <a target="_" href="http://jcp.org/en/jsr/detail?id=276">JSR-276</a>
- metadata into a composite component.</p>
-
- </div>
- </description>
- <tag-name>extension</tag-name>
- <handler-class>com.sun.faces.facelets.tag.composite.ExtensionHandler</handler-class>
- </tag>
- <tag>
- <description>
-
- <div class="changed_added_2_0">
-
- <p>The presence of this tag in a
- <code>&lt;composite:implementation&gt;</code>
- section must cause the
- named facet to be taken from the facet map of the <em>top
- level
- component</em> and inserted as a facet child of the component
- in which
- this element is nested.</p>
-
- </div>
-
- </description>
- <tag-name>insertFacet</tag-name>
- <handler-class>com.sun.faces.facelets.tag.composite.InsertFacetHandler</handler-class>
- <attribute>
- <description>
-
- <div class="changed_added_2_0">
-
- <p>The name of the facet child on the <em>top level
- component</em> which
- must be inserted as a facet child of the component in which this
- element
- is nested.</p>
-
- </div>
-
- </description>
- <name>name</name>
- <required>true</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
-
- <div class="changed_added_2_0">
-
- <p>If <code>true</code>, and there is no such
- facet present on the top
- level component, a <code>TagException</code> must be
- thrown, containing
- the <code>Location</code>, the facet name, and a
- localized descriptive
- error message.</p>
-
- </div>
-
- </description>
- <name>required</name>
- <required>false</required>
- <type>boolean</type>
- </attribute>
- </tag>
-</facelet-taglib>
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/std-taglibs/facelets_jsf_core.taglib.xml b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/std-taglibs/facelets_jsf_core.taglib.xml
deleted file mode 100644
index 592028c..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/std-taglibs/facelets_jsf_core.taglib.xml
+++ /dev/null
@@ -1,2056 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!--
- DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
- Copyright 2009 Sun Microsystems, Inc. All rights reserved.
-
- The contents of this file are subject to the terms of either the GNU
- General Public License Version 2 only ("GPL") or the Common Development
- and Distribution License("CDDL") (collectively, the "License"). You
- may not use this file except in compliance with the License. You can obtain
- a copy of the License at https://glassfish.dev.java.net/public/CDDL+GPL.html
- or glassfish/bootstrap/legal/LICENSE.txt. See the License for the specific
- language governing permissions and limitations under the License.
-
- When distributing the software, include this License Header Notice in each
- file and include the License file at glassfish/bootstrap/legal/LICENSE.txt.
- Sun designates this particular file as subject to the "Classpath" exception
- as provided by Sun in the GPL Version 2 section of the License file that
- accompanied this code. If applicable, add the following below the License
- Header, with the fields enclosed by brackets [] replaced by your own
- identifying information: "Portions Copyrighted [year]
- [name of copyright owner]"
-
- Contributor(s):
-
- If you wish your version of this file to be governed by only the CDDL or
- only the GPL Version 2, indicate your decision by adding "[Contributor]
- elects to include this software in this distribution under the [CDDL or GPL
- Version 2] license." If you don't indicate a single choice of license, a
- recipient has the option to distribute your version of this file under
- either the CDDL, the GPL Version 2 or to extend the choice of license to
- its licensees as provided above. However, if you add GPL Version 2 code
- and therefore, elected the GPL Version 2 license, then the option applies
- only if the new code is made subject to such option by the copyright
- holder.
--->
-
-<facelet-taglib xmlns="http://java.sun.com/xml/ns/javaee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facelettaglibrary_2_0.xsd"
- version="2.0">
- <description>
- The core JavaServer Faces custom actions that are independent of
- any particular RenderKit.
- </description>
- <namespace>http://java.sun.com/jsf/core</namespace>
- <tag>
- <description>
-
- <p>Register an ActionListener instance on the
- UIComponent associated with the closest parent UIComponent
- custom action.</p>
- </description>
- <tag-name>actionListener</tag-name>
- <handler-class>com.sun.faces.facelets.tag.jsf.core.ActionListenerHandler</handler-class>
- <attribute>
- <description>
- Fully qualified Java class name of an ActionListener to be
- created and registered.
- </description>
- <name>type</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Value binding expression that evaluates to an object that
- implements javax.faces.event.ActionListener.
- </description>
- <name>binding</name>
- <required>false</required>
- <type>javax.faces.event.ActionListener</type>
- </attribute>
- <attribute>
- <description>
-
- <p class="changed_added_2_0">If present, this attribute
- refers
- to the value of one of the exposed attached objects within the
- composite component inside of which this tag is nested.</p>
-
- </description>
- <name>for</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- </tag>
- <tag>
- <description>
- Add an attribute to the UIComponent associated with the closest
- parent UIComponent custom action.
- </description>
- <tag-name>attribute</tag-name>
- <handler-class>com.sun.faces.facelets.tag.jsf.core.AttributeHandler</handler-class>
- <attribute>
- <description>
- The name of the component attribute to be set.
- </description>
- <name>name</name>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- The value of the component attribute to be set.
- </description>
- <name>value</name>
- <type>java.lang.Object</type>
- </attribute>
- </tag>
- <tag>
- <description>
- Register a DateTimeConverter instance on the UIComponent associated
- with the closest parent UIComponent custom action.
- </description>
- <tag-name>convertDateTime</tag-name>
- <converter>
- <converter-id>javax.faces.DateTime</converter-id>
- <handler-class>com.sun.faces.facelets.tag.jsf.core.ConvertDateTimeHandler</handler-class>
- </converter>
- <attribute>
- <description>
- Predefined formatting style which determines how the date
- component of a date string is to be formatted and parsed.
- Applied only if type is "date" or "both". Valid values
- are "default", "short", "medium", "long", and "full".
- Default value is "default".
- </description>
- <name>dateStyle</name>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Locale whose predefined styles for dates and times are used
- during formatting or parsing. If not specified, the Locale
- returned by FacesContext.getViewRoot().getLocale() will be used.
- Value must be either a VB expression that evaluates to a
- java.util.Locale instance, or a String that is valid to pass as
- the first argument to the constructor java.util.Locale(String
- language, String country). The empty string is passed as the
- second argument.
- </description>
- <name>locale</name>
- <required>false</required>
- <type>java.lang.Object</type>
- </attribute>
- <attribute>
- <description>
- Custom formatting pattern which determines how the
- date/time string should be formatted and parsed.
- </description>
- <name>pattern</name>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Predefined formatting style which determines how the
- time component of a date string is to be formatted and
- parsed. Applied only if type is "time" or "both".
- Valid values are "default", "short", "medium", "long",
- and "full". Default value is "default".
- </description>
- <name>timeStyle</name>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Time zone in which to interpret any time information in the date
- String. Value must be either a VB expression that evaluates to
- a java.util.TimeZone instance, or a String that is a timezone ID
- as described in the javadocs for
- java.util.TimeZone.getTimeZone().
- </description>
- <name>timeZone</name>
- <type>java.lang.Object</type>
- </attribute>
- <attribute>
- <description>
- Specifies what contents the string value will be
- formatted to include, or parsed expecting. Valid
- values are "date", "time", and "both". Default
- value is "date".
- </description>
- <name>type</name>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- A ValueExpression that evaluates to an instance of
- javax.faces.convert.DateTimeConverter.
- </description>
- <name>binding</name>
- <type>javax.faces.convert.DateTimeConverter</type>
- </attribute>
- <attribute>
- <description>
-
- <p class="changed_added_2_0">If present, this attribute
- refers
- to the value of one of the exposed attached objects within the
- composite component inside of which this tag is nested.</p>
-
- </description>
- <name>for</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- </tag>
- <tag>
- <description>
- Register a NumberConverter instance on the UIComponent associated
- with the closest parent UIComponent custom action.
- </description>
- <tag-name>convertNumber</tag-name>
- <converter>
- <converter-id>javax.faces.Number</converter-id>
- <handler-class>com.sun.faces.facelets.tag.jsf.core.ConvertNumberHandler</handler-class>
- </converter>
- <attribute>
- <description>
- ISO 4217 currency code, applied only when
- formatting currencies.
- </description>
- <name>currencyCode</name>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Currency symbol, applied only when formatting
- currencies.
- </description>
- <name>currencySymbol</name>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Flag specifying whether formatted output will
- contain grouping separators. Expressions must
- evaluate to a boolean. Default value
- is true.
- </description>
- <name>groupingUsed</name>
- <type>java.lang.Boolean</type>
- </attribute>
- <attribute>
- <description>
- Flag specifying whether only the integer part
- of the value will be formatted and parsed.
- Expressions must evaluate to a boolean.
- Default value is false.
- </description>
- <name>integerOnly</name>
- <type>java.lang.Boolean</type>
- </attribute>
- <attribute>
- <description><p>
-
- <span class="changed_modified_2_0">Locale</span>
- whose
- predefined styles for numbers are used during formatting
- and parsing. If not specified, the Locale returned by
- FacesContext.getViewRoot().getLocale() will be used.
- Expressions must evaluate to a java.util.Locale <span
- class="changed_modified_2_0">or a String that is valid to
- pass as the first argument to the constructor
- java.util.Locale(String language, String country). The
- empty string is passed as the second argument.</span>
-
- </p></description>
- <name>locale</name>
- <type>java.lang.Object</type>
- </attribute>
- <attribute>
- <description>
- Maximum number of digits that will be formatted
- in the fractional portion of the output. Expressions
- must evaluate to an int.
- </description>
- <name>maxFractionDigits</name>
- <type>java.lang.Integer</type>
- </attribute>
- <attribute>
- <description>
- Maximum number of digits that will be formatted
- in the integer portion of the output. Expressions
- must evaluate to an int.
- </description>
- <name>maxIntegerDigits</name>
- <type>java.lang.Integer</type>
- </attribute>
- <attribute>
- <description>
- Minimum number of digits that will be formatted
- in the fractional portion of the output. Expressions
- must evaluate to an int.
- </description>
- <name>minFractionDigits</name>
- <type>java.lang.Integer</type>
- </attribute>
- <attribute>
- <description>
- Minimum number of digits that will be formatted
- in the integer portion of the output. Expressions
- must evaluate to an int.
- </description>
- <name>minIntegerDigits</name>
- <type>java.lang.Integer</type>
- </attribute>
- <attribute>
- <description>
- Custom formatting pattern which determins how the
- number string should be formatted and parsed.
- </description>
- <name>pattern</name>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Specifies how the number string will be formatted
- and parsed. Valid values are "number", "currency",
- and "percent". Default value is "number".
- </description>
- <name>type</name>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- A ValueExpression that evaluates to an instance of
- javax.faces.convert.NumberConverter.
- </description>
- <name>binding</name>
- <type>javax.faces.convert.NumberConverter</type>
- </attribute>
- <attribute>
- <description>
-
- <p class="changed_added_2_0">If present, this attribute
- refers
- to the value of one of the exposed attached objects within the
- composite component inside of which this tag is nested.</p>
-
- </description>
- <name>for</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- </tag>
- <tag>
- <description>
- Register a named Converter instance on the UIComponent
- associated with the closest parent UIComponent custom action.
- </description>
- <tag-name>converter</tag-name>
- <handler-class>com.sun.faces.facelets.tag.jsf.core.ConvertDelegateHandler</handler-class>
- <attribute>
- <description>
- Converter identifier of the Converter instance to be
- created and registered.
- </description>
- <name>converterId</name>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- A ValueExpression that evaluates to an object that
- implements javax.faces.convert.Converter.
- </description>
- <name>binding</name>
- <type>javax.faces.convert.Converter</type>
- </attribute>
- <attribute>
- <description>
-
- <p class="changed_added_2_0">If present, this attribute
- refers
- to the value of one of the exposed attached objects within the
- composite component inside of which this tag is nested.</p>
-
- </description>
- <name>for</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- </tag>
- <tag>
- <description>
-
- <p class="changed_added_2_0">Register an AjaxBehavior instance
- on one or more
- UIComponents implementing the ClientBehaviorHolder interface. This
- tag
- may be nested witin a single component (enabling Ajax for a single
- component),
- or it may be "wrapped" around multiple components (enabling Ajax for
- many components).</p>
-
- </description>
- <tag-name>ajax</tag-name>
- <handler-class>com.sun.faces.facelets.tag.jsf.core.AjaxHandler</handler-class>
- <attribute>
- <description>
- <p class="changed_added_2_0">A value of "true" indicates
- the
- AjaxBehavior should not be rendered. A value of "false"
- indicates
- the AjaxBehavior should be rendered. "false" is the default.</p>
-
- </description>
- <name>disabled</name>
- <required>false</required>
- <type>java.lang.Boolean</type>
- </attribute>
- <attribute>
- <description>
- <p class="changed_added_2_0">A String identifying the type
- of event
- the Ajax action will apply to. If specified, it must be one of
- the
- events supported by the component the Ajax behavior is being
- applied to.
- For HTML components this would be the set of supported DOM
- events for the
- component, plus "action" for Faces ActionSource components and
- "valueChange"
- for Faces EditableValueHolder components. If not specified, the
- default
- event is determined for the component. The DOM event name is the
- actual DOM
- event name (for example: "click") as opposed to (for example:
- "onclick").</p>
-
- </description>
- <name>event</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- <p class="changed_added_2_0">Evaluates to Collection<String>.
- Identifiers of
- components that will participate in the "execute" portion of the
- Request
- Processing Lifecycle. If a literal is specified the identifiers
- must be space
- delimited. Any of the keywords "@this", "@form", "@all", "@none"
- may be specified
- in the identifier list.</p>
-
- </description>
- <name>execute</name>
- <required>false</required>
- <type>java.lang.Object</type>
- </attribute>
- <attribute>
- <description>
- <p class="changed_added_2_0">If "true" behavior events
- generated from this behavior
- are broadcast during Apply Request Values phase. Otherwise, the
- events will be
- broadcast during Invoke Aplications phase</p>
-
- </description>
- <name>immediate</name>
- <required>false</required>
- <type>java.lang.Boolean</type>
- </attribute>
- <attribute>
- <description>
- <p class="changed_added_2_0">Method expression referencing
- a method
- that will be called when an AjaxBehaviorEvent has been
- broadcast for the listener.</p>
-
- </description>
- <name>listener</name>
- <required>false</required>
- <method-signature>public void
- processAjaxBehavior(javax.faces.event.AjaxBehaviorEvent event)
- throws javax.faces.event.AbortProcessingException
- </method-signature>
- </attribute>
- <attribute>
- <description>
- <p class="changed_added_2_0">The name of the JavaScript
- function that will handle UI events.</p>
-
- </description>
- <name>onevent</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- <p class="changed_added_2_0">The name of the JavaScript
- function that will handle errors.</p>
-
- </description>
- <name>oneerror</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- <p class="changed_added_2_0">Evaluates to Collection<String>.
- Identifiers of
- components that will participate in the "render" portion of the
- Request
- Processing Lifecycle. If a literal is specified the identifiers
- must be space
- delimited. Any of the keywords "@this", "@form", "@all", "@none"
- may be specified
- in the identifier list.</p>
-
- </description>
- <name>render</name>
- <required>false</required>
- <type>java.lang.Object</type>
- </attribute>
- </tag>
- <tag>
- <description>
-
- <p class="changed_added_2_0">Allow JSF page authors to
- install <code>ComponentSystemEventListener</code>
- instances
- on a component in a page.</p>
-
- <div class="changed_added_2_0">
-
- <p></p>
-
- </div>
-
- </description>
- <tag-name>event</tag-name>
- <handler-class>com.sun.faces.facelets.tag.jsf.core.EventHandler</handler-class>
- <attribute>
- <description>
-
- <p class="changed_added_2_0">Name of the event for which
- to install a listener. The following table lists the
- valid values for this attribute, and the corresponding
- event type for which the listener action is
- registered.</p>
-
- <table border="1">
- <tr>
-
- <th>value for "<code>type</code>" tag
- attribute</th>
-
- <th>Type of event sent to listener method
- </th>
-
- </tr>
-
- <tr>
-
- <td>preRenderComponent
- </td>
-
- <td>javax.faces.event.PreRenderComponentEvent
- </td>
-
- </tr>
-
- <tr>
-
- <td>PostAddToView
- </td>
-
- <td>javax.faces.event.PostAddToViewEvent
- </td>
-
- </tr>
-
- <tr>
-
- <td>preValidate
- </td>
-
- <td>javax.faces.event.PreValidateEvent
- </td>
-
- </tr>
-
- <tr>
-
- <td>postValidate
- </td>
-
- <td>javax.faces.event.PostValidateEvent
- </td>
-
- </tr>
-
- </table>
-
- <div class="changed_added_2_0">
-
- <p>In addition to these values, the fully qualified class
- name of any
- java class that extends
- <code>javax.faces.event.ComponentSystemEvent</code>
- may be used as the
- value of the "type" attribute.</p>
-
- <p>Also, the <code>@javax.faces.event.NamedEvent</code>
- annotation may
- be attached to any java class that extends
- <code>javax.faces.event.ComponentSystemEvent</code>.
- This enables that
- event to be referenced from this attribute, as descibed in the
- javadocs
- for <code>@NamedEvent</code>.</p>
-
- </div>
-
-
- </description>
- <name>type</name>
- <required>true</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- MethodExpression pointing to a method expression of
- that will be called when the listener's processEvent
- method would have been called.
- </description>
- <name>listener</name>
- <required>true</required>
- <method-signature>public void
- listener(javax.faces.event.ComponentSystemEvent event) throws
- javax.faces.event.AbortProcessingException
- </method-signature>
- </attribute>
- </tag>
- <tag>
- <description>
-
- <p>Register a named facet on the UIComponent associated with
- the closest parent UIComponent custom action.</p>
-
-
- </description>
- <tag-name>facet</tag-name>
- <handler-class>com.sun.faces.facelets.tag.jsf.core.FacetHandler</handler-class>
- <attribute>
- <description>
- Name of the facet to be created.
- </description>
- <name>name</name>
- <required>true</required>
- <type>java.lang.String</type>
- </attribute>
- </tag>
- <tag>
- <description>
-
- <p class="changed_added_2_0">Declare the metadata facet for
- this view. This must be a child of the
- <code>&lt;f:view&gt;</code>. This tag must
- reside within the
- top level XHTML file for the given viewId, not in a
- template. The implementation must insure that the direct
- child of the facet is a <code>UIPanel</code>, even if
- there
- is only one child of the facet. The implementation must set
- the id of the <code>UIPanel</code> to be the value of
- the
- <code>UIViewRoot.METADATA_FACET_NAME</code> symbolic
- constant.</p>
-
- <div class="changed_added_2_0">
-
- <p>The implementation must allow templating for this element
- according
- to the following pattern.</p>
-
- <p>viewId XHTML page, page01.xhtml</p>
-
- </div>
-
- <div class="html4strict" style="font-family: monospace;"><ol><li
- class="li1"><div class="de1"><span class="sc2">&lt;ui:composition
- template=<span class="st0">&quot;template.xhtml&quot;</span><span
- class="kw2">&gt;</span></span></div></li>
- <li class="li2"><div class="de2">&nbsp; &nbsp;
- <span class="sc2">&lt;ui:define <span class="kw3">name</span>=<span
- class="st0">&quot;metadata&quot;</span><span
- class="kw2">&gt;</span></span></div></li>
- <li class="li1"><div class="de1">&nbsp; &nbsp;
- &nbsp; <span class="sc2">&lt;f:metadata&gt;</span></div></li>
- <li class="li2"><div class="de2">&nbsp; &nbsp;
- &nbsp; &nbsp; <span class="sc2">&lt;f:viewParam
- <span class="kw3">name</span>=<span class="st0">&quot;id&quot;</span>/<span
- class="kw2">&gt;</span></span></div></li>
- <li class="li1"><div class="de1">&nbsp; &nbsp;
- &nbsp; <span class="sc2"><span class="kw2">&lt;</span>/f:metadata&gt;</span></div></li>
- <li class="li2"><div class="de2">&nbsp; &nbsp;
- <span class="sc2"><span class="kw2">&lt;</span>/ui:define&gt;</span></div></li>
- <li class="li1"><div class="de1">&nbsp; &nbsp;
- <span class="sc2">&lt;ui:define <span class="kw3">name</span>=<span
- class="st0">&quot;content&quot;</span><span
- class="kw2">&gt;</span></span></div></li>
- <li class="li2"><div class="de2">&nbsp; &nbsp;
- &nbsp; &nbsp; <span class="sc2"><span class="kw2">&lt;h1&gt;</span></span>The
- big news stories of the day<span class="sc2"><span
- class="kw2">&lt;/h1&gt;</span></span></div></li>
- <li class="li1"><div class="de1">&nbsp; &nbsp;
- <span class="sc2"><span class="kw2">&lt;</span>/ui:define&gt;</span></div></li>
- <li class="li2"><div class="de2"><span class="sc2"><span
- class="kw2">&lt;</span>/ui:composition&gt;</span>
- </div></li></ol></div></div>
-
- <div class="changed_added_2_0">
- <p>Note line 4. The page author must ensure that the
- <code>&lt;f:metadata&gt;</code> element does not
- appear on a template or
- included page. It must reside on the root page that corresponds to
- the
- viewId.</p>
-
- <p>The template page, template.xhtml</p>
-
- </div>
-
-
- <div class="html4strict" style="font-family: monospace;"><ol><li
- class="li1"><div class="de1"><span class="sc2"><span
- class="kw2">&lt;html</span> xmlns=<span class="st0">&quot;http://www.w3.org/1999/xhtml&quot;</span></div></li>
- <li class="li2"><div class="de2">&nbsp; &nbsp;
- &nbsp; xmlns:ui=<span class="st0">&quot;http://java.sun.com/jsf/facelets&quot;</span></div></li>
- <li class="li1"><div class="de1">&nbsp; &nbsp;
- &nbsp; xmlns:f=<span class="st0">&quot;http://java.sun.com/jsf/core&quot;</span></div></li>
- <li class="li2"><div class="de2">&nbsp; &nbsp;
- &nbsp; xml:<span class="kw3">lang</span>=<span
- class="st0">&quot;en&quot;</span> <span
- class="kw3">lang</span>=<span class="st0">&quot;en&quot;</span><span
- class="kw2">&gt;</span></span></div></li>
- <li class="li1"><div class="de1">&nbsp;</div></li>
- <li class="li2"><div class="de2"><span class="sc2"><span
- class="kw2">&lt;body&gt;</span></span></div></li>
- <li class="li1"><div class="de1"><span class="sc2">&lt;f:view&gt;</span></div></li>
- <li class="li2"><div class="de2">&nbsp; &nbsp;
- </div></li>
- <li class="li1"><div class="de1">&nbsp; &nbsp;
- &nbsp; &nbsp; <span class="sc2">&lt;ui:insert <span
- class="kw3">name</span>=<span class="st0">&quot;metadata&quot;</span>/<span
- class="kw2">&gt;</span></span></div></li>
- <li class="li2"><div class="de2">&nbsp; &nbsp;</div></li>
- <li class="li1"><div class="de1">&nbsp; &nbsp;
- <span class="sc2"><span class="kw2">&lt;div</span>
- <span class="kw3">id</span>=<span class="st0">&quot;container&quot;</span><span
- class="kw2">&gt;</span></span></div></li>
- <li class="li2"><div class="de2">&nbsp; &nbsp;
- &nbsp; &nbsp; <span class="sc2">&lt;ui:insert <span
- class="kw3">name</span>=<span class="st0">&quot;content&quot;</span>/<span
- class="kw2">&gt;</span></span></div></li>
- <li class="li1"><div class="de1">&nbsp; &nbsp;
- <span class="sc2"><span class="kw2">&lt;/div&gt;</span></span></div></li>
- <li class="li2"><div class="de2"><span class="sc2"><span
- class="kw2">&lt;</span>/f:view&gt;</span></div></li>
- <li class="li1"><div class="de1"><span class="sc2"><span
- class="kw2">&lt;/body&gt;</span></span></div></li>
- <li class="li2"><div class="de2"><span class="sc2"><span
- class="kw2">&lt;/html&gt;</span></span> </div></li></ol></div></div>
-
- <p>The page author is not <em>required</em> to use
- templating, but if
- they do, it must be done as shown above, (or with
- <code>&lt;ui:include&gt;</code> in a similar
- manner).</p>
-
- </div>
-
-
- </description>
- <tag-name>metadata</tag-name>
- <handler-class>com.sun.faces.facelets.tag.jsf.core.MetadataHandler</handler-class>
- </tag>
- <tag>
- <description>
- Load a resource bundle localized for the Locale of the current
- view, and expose it as a java.util.Map in the request attributes
- of the current request under the key specified by the value of the
- "var" attribute of this tag. The Map must behave such that if a
- get() call is made for a key that does not exist in the Map, the
- literal string ???KEY??? is returned from the Map, where KEY is
- the key being looked up in the Map, instead of a
- MissingResourceException being thrown. If the ResourceBundle does
- not exist, a JspException must be thrown.
- </description>
- <tag-name>loadBundle</tag-name>
- <handler-class>com.sun.faces.facelets.tag.jsf.core.LoadBundleHandler</handler-class>
- <attribute>
- <description>
- Base name of the resource bundle
- to be loaded.
- </description>
- <name>basename</name>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Name of a request scope attribute under which
- the resource bundle will be exposed as a Map.
- </description>
- <name>var</name>
- <required>true</required>
- <type>java.lang.String</type>
- </attribute>
- </tag>
- <tag>
- <description>
- Add a child UIParameter component to the UIComponent
- associated with the closest parent UIComponent custom
- action.
- </description>
- <tag-name>param</tag-name>
- <component>
- <component-type>javax.faces.Parameter</component-type>
- <renderer-type/>
- </component>
- <attribute>
- <description>
- ValueExpression to a backing bean
- property bound to the component instance for
- the UIComponent created by this custom action.
- </description>
- <name>binding</name>
- <type>javax.faces.component.UIComponent</type>
- </attribute>
- <attribute>
- <description>
- Component identifier of the UIParameter component
- to be created.
- </description>
- <name>id</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Name of the parameter to be created.
- </description>
- <name>name</name>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Value of the parameter to be set.
- </description>
- <name>value</name>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- RELEASE_PENDING
- - Also update spec for bookmarkable URL (don't forget the two
- sources for include-view-params).
- - convey precendence feature using non-normative language
- vs algorithmic
- Flag enabling or disabling the inclusion of the parameter
- </description>
- <name>disable</name>
- <type>boolean</type>
- </attribute>
- </tag>
- <tag>
- <description>
-
- <p class="changed_added_2_0">Used inside of the metada facet
- of a view, this tag causes a <a target="_"
- href="../../../javadocs/javax/faces/component/UIViewParameter.html">UIViewParameter</a>
- to be attached as metadata for the current view. Because
- <code>UIViewParameter</code> extends <code>UIInput</code>
- all of the attributes and nested child content for any
- <code>UIInput</code> tags are valid on this tag as well.</p>
-
- </description>
- <tag-name>viewParam</tag-name>
- <component>
- <component-type>javax.faces.Parameter</component-type>
- <renderer-type/>
- </component>
- <attribute>
- <description>
- The name of the request parameter from which the value for this component
- is retrieved on an initial request or to override the stored value on a
- postback.
- </description>
- <name>name</name>
- <required>true</required>
- <type>java.lang.String</type>
- </attribute>
-
- <attribute>
- <description>
- Converter instance registered with this component.
- </description>
- <name>converter</name>
- <required>false</required>
- <type>javax.faces.convert.Converter</type>
- </attribute>
- <attribute>
- <description>
- A ValueExpression enabled attribute that, if present, will be
- used as the text of the converter message, replacing any message
- that comes from the converter.
- </description>
- <name>converterMessage</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- The component identifier for this component. This value must be
- unique within the closest parent component that is a naming
- container.
- </description>
- <name>id</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Flag indicating that the user is required to provide a submitted
- value for this input component.
- </description>
- <name>required</name>
- <required>false</required>
- <type>boolean</type>
- </attribute>
- <attribute>
- <description>
- A ValueExpression enabled attribute that, if present, will be
- used as the text of the validation message for the "required"
- facility, if the "required" facility is used.
- </description>
- <name>requiredMessage</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- MethodExpression representing a validator method that will be
- called
- during Process Validations to perform correctness checks on the
- value of this component. The expression must evaluate to a
- public
- method that takes FacesContext, UIComponent, and Object
- parameters,
- with a return type of void.
- </description>
- <name>validator</name>
- <required>false</required>
- <method-signature>void validate(javax.faces.context.FacesContext,
- javax.faces.component.UIComponent, java.lang.Object)
- </method-signature>
- </attribute>
- <attribute>
- <description>
- A ValueExpression enabled attribute that, if present, will be
- used as the text of the validator message, replacing any
- message that comes from the validator.
- </description>
- <name>validatorMessage</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- A ValueExpression to which the value of the request parameter, as
- determined by the name attribute, is bound. The resolved value of this
- expression is used when encoding the view parameter into a bookmarkable link or
- redirect URL with view parameter encoding enabled. If this attribute is omitted,
- the value of the request parameter will instead be the local value of the
- UIViewParameter.
- </description>
- <name>value</name>
- <required>false</required>
- <type>java.lang.Object</type>
- </attribute>
- <attribute>
- <description>
- <p>
-
- MethodExpression representing a value change listener method
- that will be notified when a new value has been set for this
- input component. The expression must evaluate to a public
- method that takes a <code>ValueChangeEvent</code>
- parameter,
- with a return type of void, <span class="changed_added_2_0">or
- to a public method that takes no arguments with a return type
- of void. In the latter case, the method has no way of easily
- knowing what the new value is, but this can be useful in cases
- where a notification is needed that "this value
- changed".</span>
-
- </p>
- </description>
- <name>valueChangeListener</name>
- <required>false</required>
- <method-signature>void
- valueChange(javax.faces.event.ValueChangeEvent)
- </method-signature>
- </attribute>
- <attribute>
- <description>
- The maximum number of characters that may
- be entered in this field.
- </description>
- <name>maxlength</name>
- <required>false</required>
- <type>int</type>
- </attribute>
- <attribute>
- <description>
- The ValueExpression linking this component to a property in a
- backing bean
- </description>
- <name>binding</name>
- <required>false</required>
- <type>javax.faces.component.UIComponent</type>
- </attribute>
- <attribute>
- <description>
-
- <p class="changed_added_2_0">If present, this attribute
- refers
- to the value of one of the exposed attached objects within the
- composite component inside of which this tag is nested.</p>
-
- </description>
- <name>for</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- </tag>
- <tag>
- <description>
- Register a PhaseListener instance on the UIViewRoot in which
- this tag is nested.
- </description>
- <tag-name>phaseListener</tag-name>
- <handler-class>com.sun.faces.facelets.tag.jsf.core.PhaseListenerHandler</handler-class>
- <attribute>
- <description>
- Fully qualified Java class name of an PhaseListener to be
- created and registered.
- </description>
- <name>type</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Value binding expression that evaluates to an object that
- implements javax.faces.event.PhaseListener.
- </description>
- <name>binding</name>
- <required>false</required>
- <type>javax.faces.event.PhaseListener</type>
- </attribute>
- </tag>
- <tag>
- <description>
- Add a child UISelectItem component to the UIComponent
- associated with the closest parent UIComponent custom
- action.
- </description>
- <tag-name>selectItem</tag-name>
- <component>
- <component-type>javax.faces.SelectItem</component-type>
- <renderer-type/>
- </component>
- <attribute>
- <description>
- Value binding expression to a backing bean
- property bound to the component instance for
- the UIComponent created by this custom action.
- </description>
- <name>binding</name>
- <type>javax.faces.component.UIComponent</type>
- </attribute>
- <attribute>
- <description>
- Component identifier of the UISelectItem
- component to be created.
- </description>
- <name>id</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Description of this option, for use in
- development tools.
- </description>
- <name>itemDescription</name>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Flag indicating whether the option created
- by this component is disabled. Expressions
- must evaluate to a boolean. Default value
- is false.
- </description>
- <name>itemDisabled</name>
- <type>java.lang.Boolean</type>
- </attribute>
- <attribute>
- <description>
- Label to be displayed to the user
- for this option.
- </description>
- <name>itemLabel</name>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Flag indicating that characters that are sensitive in
- the value of the <code>itemLabel</code>
- attribute must be escaped. This flag is set to "true" by
- default.
- </description>
- <name>escape</name>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Value to be returned to the server if this
- option is selected by the user.
- </description>
- <name>itemValue</name>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Value binding expression pointing at a
- SelectItem instance containing the
- information for this option.
- </description>
- <name>value</name>
- <type>javax.faces.model.SelectItem</type>
- </attribute>
- <attribute>
- <description>
- Flag indicating whether the option created by this
- component represents the special "no selection"
- option. Expressions must evaluate to a boolean.
- Default value is false.
- </description>
- <name>noSelectionOption</name>
- <type>java.lang.Boolean</type>
- </attribute>
- </tag>
- <tag>
- <description>
- <p><span class="changed_modified_2_0">Add</span> a
- child UISelectItems component to the UIComponent associated
- with the closed parent UIComponent custom action.</p>
-
- <p class="changed_modified_2_0">When iterating over the
- select items, <code>toString()</code> mest be called on
- the
- string rendered attribute values.</p>
-
- <p class="changed_added_2_0">Version 2 of the specification
- introduces
- several new attributes, described below. These are: var, itemValue,
- itemLabel, itemDescription, itemDisabled, and itemLabelEscaped.</p>
-
-
- </description>
- <tag-name>selectItems</tag-name>
- <component>
- <component-type>javax.faces.SelectItems</component-type>
- <renderer-type/>
- </component>
- <attribute>
- <description>
- Value binding expression to a backing bean
- property bound to the component instance for
- the UIComponent created by this custom action.
- </description>
- <name>binding</name>
- <type>javax.faces.component.UIComponent</type>
- </attribute>
- <attribute>
- <description>
- Component identifier of the UISelectItems
- component to be created.
- </description>
- <name>id</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
-
-
- <p>Value expression pointing at <span
- class="changed_modified_2_0">any <code>Collection</code>
- or array.</span> The member elements may be instances of
- <code>SelectItem</code> <span
- class="changed_added_2_0">or any Java Object. In the
- case where the member elements are plain Java Objects,
- several additional attributes must be used by the page
- author to correctly identify the data to the enclosing
- <code>UISelectOne</code> or <code>UISelectMany</code>
- component, as shown in the following example.</span>
-
- <div class="syntax"><div class="html4strict"
- style="font-family: monospace;"><ol><li class="li1"><div
- class="de1"><span class="sc2">&lt;h:selectOneListbox
- <span class="kw3">size</span>=<span class="st0">&quot;1&quot;</span>
- <span class="kw3">id</span>=<span class="st0">&quot;escape02&quot;</span>
- <span class="kw3">value</span>=<span class="st0">&quot;#{select05NoSelection.initialCollectionValues}&quot;</span><span
- class="kw2">&gt;</span></span></div></li>
- <li class="li2"><div class="de2">&nbsp; <span
- class="sc2">&lt;f:selectItems <span class="kw3">value</span>=<span
- class="st0">&quot;#{select05NoSelection.hobbitList}&quot;</span></div></li>
- <li class="li1"><div class="de1">&nbsp; &nbsp;
- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;
- &nbsp;var=<span class="st0">&quot;n&quot;</span></div></li>
- <li class="li2"><div class="de2">&nbsp; &nbsp;
- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;
- &nbsp;itemValue=<span class="st0">&quot;#{n}&quot;</span></div></li>
- <li class="li1"><div class="de1">&nbsp; &nbsp;
- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;
- &nbsp;itemLabel=<span class="st0">&quot;#{n.bio}&quot;</span></div></li>
- <li class="li2"><div class="de2">&nbsp; &nbsp;
- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;
- &nbsp;itemDescription=<span class="st0">&quot;#{n.description}&quot;</span></div></li>
- <li class="li1"><div class="de1">&nbsp; &nbsp;
- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;
- &nbsp;itemDisabled=<span class="st0">&quot;#{n.disabled}&quot;</span></div></li>
- <li class="li2"><div class="de2">&nbsp; &nbsp;
- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;
- &nbsp;itemLabelEscaped=<span class="st0">&quot;true&quot;</span></div></li>
- <li class="li1"><div class="de1">&nbsp; &nbsp;
- &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;
- &nbsp;noSelectionValue=<span class="st0">&quot;#{select05NoSelection.hobbitList[0]}&quot;</span>/<span
- class="kw2">&gt;</span></span></div></li>
- <li class="li2"><div class="de2"><span
- class="sc2"><span class="kw2">&lt;</span>/h:selectOneListbox&gt;</span>
- </div></li></ol></div></div>
-
- <p class="changed_added_2_0">In the preceding example, the
- <code>value</code> attribute on line 1 points to a
- <code>Collection&lt;HobbitBean&gt;</code>.
- <code>HobbitBean</code> is
- just a regular Java Object (POJO) that conforms to JavaBeans
- naming
- conventions for its properties. The <code>value</code>
- attribute on
- line 2 points to a <code>List&lt;HobbitBean&gt;</code>,
- though it could
- just as well point to a <code>Collection</code>,
- array, or
- <code>javax.faces.model.DataModel</code>. The
- attributes on lines 3
- through 9, inclusive, leverage the fact that the value is a
- collection
- of POJOs.
- </p>
-
-
- </p>
-
-
- </description>
- <name>value</name>
- <type>java.lang.Object</type>
- </attribute>
- <attribute>
- <description>
-
-
- <p class="changed_added_2_0">Expose the value from the
- <code>value</code> attribute under this request
- scoped key so that it
- may be referred to in EL for the value of other attributes.</p>
-
-
- </description>
- <name>var</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
-
- <p class="changed_added_2_0">evaluates to a
- <code>Collection</code>, array, or <code>Map</code>
- from which the items
- to be shown will be rendered.</p>
-
- </description>
- <name>itemValue</name>
- <type>java.lang.Object</type>
- </attribute>
- <attribute>
- <description>
-
- <p class="changed_added_2_0">evaluates to a String that
- will
- serve as the label to be shown for the item.</p>
-
- </description>
- <name>itemLabel</name>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
-
-
- <p class="changed_added_2_0">evaluates to a String that
- will
- serve as the description to be shown for the item.</p>
-
- </description>
- <name>itemDescription</name>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
-
- <p class="changed_added_2_0">evaluates to a boolean that
- will
- determine if the item value is selectable or not.</p>
-
- </description>
- <name>itemDisabled</name>
- <type>java.lang.Boolean</type>
- </attribute>
- <attribute>
- <description>
-
- <p class="changed_added_2_0">evaluates to a boolean that
- will
- determine if the rendered markup for the item receives normal
- JSF HTML escaping or not.</p>
-
- </description>
- <name>itemLabelEscaped</name>
- <type>java.lang.Boolean</type>
- </attribute>
- <attribute>
- <description>
-
- <p class="changed_added_2_0">Is either an EL expression
- pointing to the element in the value collection whose value
- should be
- marked as a &#8220;no selection&#8221; item, or a
- literal string that
- exactly matches the value of the item in the collection that
- must be
- marked as the &#8220;no selection&#8221; item. If the
- user selects such
- an item <strong>and</strong> the field is marked as
- required, then it
- will not pass validation.</p>
-
- </description>
- <name>itemLabelEscaped</name>
- <type>java.lang.Boolean</type>
- </attribute>
- </tag>
- <tag>
- <description>
- <p>Register an ActionListener instance on the UIComponent
- associated with the closest parent UIComponent custom action.
- This actionListener will cause the value given by the "value"
- attribute to be set into the ValueExpression given by the "target"
- attribute.</p>
-
- <p>The implementation of this tag creates a special
- <code>ActionListener</code> instance and registers it on
- the
- <code>ActionSource</code> associated with our most
- immediate surrounding
- instance of a tag whose implementation class is a subclass of
- <code>UIComponentTag</code>. This tag creates no output
- to the page
- currently being created.</p>
-
- <p>The <code>ActionListener</code> instance
- created and installed by
- this tag has the following behavior and contract.</p>
-
- <ul>
-
- <li>Only create and register the <code>ActionListener</code>
- instance
- the first time the component for this tag is created</li>
-
- <li>The "target" and "value" tag attributes are
- ValueExpression
- instances and are stored unevaluated as instance variables of the
- listener.</li>
-
- <li>When the listener executes, perform the following:
- <ul>
- Call getValue() on the "value" ValueExpression.
- </ul>
- <ul>
- If value of the "value" expression is null, call setValue() on
- the "target" ValueExpression with the null value.
- </ul>
- <ul>
- If the value of the "value" expression is not null, call getType()
- on the "value" and "target" ValueExpressions to determine their
- property types.
- </ul>
- <ul>
- Coerce the value of the "value" expression to the "target"
- expression value type following the Expression Language coercion
- rules. Call setValue() on the "target" ValueExpression with the
- resulting value.
- </ul>
- <ul>
- If either coercion or the execution of setValue() fails throw an
- AbortProcessingException.
- </ul>
- </li>
-
- </ul>
- </description>
- <tag-name>setPropertyActionListener</tag-name>
- <handler-class>com.sun.faces.facelets.tag.jsf.core.SetPropertyActionListenerHandler</handler-class>
- <attribute>
- <description>
- ValueExpression to be stored as the value of the target
- attribute.
- </description>
- <name>value</name>
- <required>true</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- ValueExpression that is the destination of the value
- attribute.
- </description>
- <name>target</name>
- <required>true</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
-
- <p class="changed_added_2_0">If present, this attribute
- refers
- to the value of one of the exposed attached objects within the
- composite component inside of which this tag is nested.</p>
-
- </description>
- <name>for</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- </tag>
- <tag>
- <description>
- Container action for all JavaServer Faces core and
- custom component actions used on a nested page via
- "jsp:include" or any custom action that dynamically
- includes another page from the same web application,
- such as JSTL's "c:import".
- </description>
- <tag-name>subview</tag-name>
- <component>
- <component-type>javax.faces.NamingContainer</component-type>
- <renderer-type/>
- </component>
- <attribute>
- <description>
- Value binding expression to a backing bean
- property bound to the component instance for
- the UIComponent created by this custom action.
- </description>
- <name>binding</name>
- <type>javax.faces.component.UIComponent</type>
- </attribute>
- <attribute>
- <description>
- Component identifier of the UINamingContainer
- component to be created.
- </description>
- <name>id</name>
- <required>true</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Flag indicating whether this component (and its
- children) should be rendered. Expressions must
- evaluate to a boolean.
- </description>
- <name>rendered</name>
- <type>java.lang.Boolean</type>
- </attribute>
- </tag>
- <tag>
- <description>
- Register a DoubleRangeValidator instance on the
- UIComponent associated with the closest parent
- UIComponent custom action.
- </description>
- <tag-name>validateDoubleRange</tag-name>
- <validator>
- <validator-id>javax.faces.DoubleRange</validator-id>
- <handler-class>com.sun.faces.facelets.tag.jsf.core.ValidateDelegateHandler</handler-class>
- </validator>
- <attribute>
- <description>
- <p class="changed_added_2_0">A boolean value
- enabling page level determination of whether or not this
- validator is enabled on the enclosing component.</p>
-
-
- </description>
- <name>disabled</name>
- <type>java.lang.Boolean</type>
- </attribute>
- <attribute>
- <description>
- Maximum value allowed for this component.
- </description>
- <name>maximum</name>
- <type>java.lang.Double</type>
- </attribute>
- <attribute>
- <description>
- Minimum value allowed for this component.
- </description>
- <name>minimum</name>
- <type>java.lang.Double</type>
- </attribute>
- <attribute>
- <description>
- A ValueExpression that evaluates to an instance of
- DoubleRangeValidator.
- </description>
- <name>binding</name>
- <type>javax.faces.validator.DoubleRangeValidator</type>
- </attribute>
- <attribute>
- <description>
-
- <p class="changed_added_2_0">If present, this attribute
- refers
- to the value of one of the exposed attached objects within the
- composite component inside of which this tag is nested.</p>
-
- </description>
- <name>for</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- </tag>
- <tag>
- <description>
- Register a LengthValidator instance on the
- UIComponent associated with the closest parent
- UIComponent custom action.
- </description>
- <tag-name>validateLength</tag-name>
- <validator>
- <validator-id>javax.faces.Length</validator-id>
- <handler-class>com.sun.faces.facelets.tag.jsf.core.ValidateDelegateHandler</handler-class>
- </validator>
- <attribute>
- <description>
- <p class="changed_added_2_0">A boolean value
- enabling page level determination of whether or not this
- validator is enabled on the enclosing component.</p>
-
-
- </description>
- <name>disabled</name>
- <type>java.lang.Boolean</type>
- </attribute>
- <attribute>
- <description>
- Maximum length allowed for this component.
- </description>
- <name>maximum</name>
- <type>java.lang.Integer</type>
- </attribute>
- <attribute>
- <description>
- Minimum length allowed for this component.
- </description>
- <name>minimum</name>
- <type>java.lang.Integer</type>
- </attribute>
- <attribute>
- <description>
- A ValueExpression that evaluates to an instance of
- LenghtValidator.
- </description>
- <name>binding</name>
- <type>javax.faces.validator.LengthValidator</type>
- </attribute>
- <attribute>
- <description>
-
- <p class="changed_added_2_0">If present, this attribute
- refers
- to the value of one of the exposed attached objects within the
- composite component inside of which this tag is nested.</p>
-
- </description>
- <name>for</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- </tag>
- <tag>
- <description>
- Register a LongRangeValidator instance on the
- UIComponent associated with the closest parent
- UIComponent custom action.
- </description>
- <tag-name>validateLongRange</tag-name>
- <validator>
- <validator-id>javax.faces.LongRange</validator-id>
- <handler-class>com.sun.faces.facelets.tag.jsf.core.ValidateDelegateHandler</handler-class>
- </validator>
- <attribute>
- <description>
- <p class="changed_added_2_0">A boolean value
- enabling page level determination of whether or not this
- validator is enabled on the enclosing component.</p>
-
-
- </description>
- <name>disabled</name>
- <type>java.lang.Boolean</type>
- </attribute>
- <attribute>
- <description>
- Maximum value allowed for this component.
- </description>
- <name>maximum</name>
- <type>java.lang.Long</type>
- </attribute>
- <attribute>
- <description>
- Minimum value allowed for this component.
- </description>
- <name>minimum</name>
- <type>java.lang.Long</type>
- </attribute>
- <attribute>
- <description>
- A ValueExpression that evaluates to an instance of
- LongRangeValidator.
- </description>
- <name>binding</name>
- <type>javax.faces.validator.LongRangeValidator</type>
- </attribute>
- <attribute>
- <description>
-
- <p class="changed_added_2_0">If present, this attribute
- refers
- to the value of one of the exposed attached objects within the
- composite component inside of which this tag is nested.</p>
-
- </description>
- <name>for</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- </tag>
- <tag>
- <description><p>
-
- <span class="changed_added_2_0">
- A validator that delegates the validation of the local value
- to the Bean Validation API. The validationGroups attribute
- serves as a filter that instructs the Bean Validation API which
- contraints to enforce. If there are any constraint violations
- reported by Bean Validation, the value is considered invalid.
-
- </p>
- </description>
- <tag-name>validateBean</tag-name>
- <validator>
- <validator-id>javax.faces.Bean</validator-id>
- <handler-class>com.sun.faces.facelets.tag.jsf.core.ValidateDelegateHandler</handler-class>
- </validator>
- <attribute>
- <description>
- A comma-separated list of validation groups. A validation group
- is a fully-qualified class name.
- </description>
- <name>validationGroups</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- <p class="changed_added_2_0">A boolean value
- enabling page level determination of whether or not this
- validator is enabled on the enclosing component.</p>
-
-
- </description>
- <name>disabled</name>
- <type>java.lang.Boolean</type>
- </attribute>
- <attribute>
- <description>
- A ValueExpression that evaluates to an instance of
- BeanValidator.
- </description>
- <name>binding</name>
- <type>javax.faces.validator.BeanValidator</type>
- </attribute>
- <attribute>
- <description>
-
- <p class="changed_added_2_0">If present, this attribute
- refers
- to the value of one of the exposed attached objects within the
- composite component inside of which this tag is nested.</p>
-
- </description>
- <name>for</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- </tag>
- <tag>
- <description><p>
-
- <span class="changed_added_2_0">
- A validator that uses the pattern attribute to validate the
- wrapping component. The entire pattern is matched against
- the String value of the component. If it matches, it's
- valid.
-
- </p>
- </description>
- <tag-name>validateRegex</tag-name>
- <validator>
- <validator-id>javax.faces.RegularExpression</validator-id>
- <handler-class>com.sun.faces.facelets.tag.jsf.core.ValidateDelegateHandler</handler-class>
- </validator>
- <attribute>
- <description>
- <p class="changed_added_2_0">A boolean value
- enabling page level determination of whether or not this
- validator is enabled on the enclosing component.</p>
-
-
- </description>
- <name>disabled</name>
- <type>java.lang.Boolean</type>
- </attribute>
- <attribute>
- <description>
- A regular expression pattern. Remember that, like in
- all Java strings, backslash must be escaped with another
- backslash.
- </description>
- <name>pattern</name>
- <required>true</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- A ValueExpression that evaluates to an instance of
- RegexpValidator.
- </description>
- <name>binding</name>
- <type>javax.faces.validator.RegexValidator</type>
- </attribute>
- <attribute>
- <description>
-
- <p class="changed_added_2_0">If present, this attribute
- refers
- to the value of one of the exposed attached objects within the
- composite component inside of which this tag is nested.</p>
-
- </description>
- <name>for</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- </tag>
- <tag>
- <description>
-
- <p class="changed_added_2_0">A validator that enforces
- the presence of a value. It has the same affect as setting the
- required attribute on a UIInput to true.</p>
-
- </description>
- <tag-name>validateRequired</tag-name>
- <validator>
- <validator-id>javax.faces.Required</validator-id>
- <handler-class>com.sun.faces.facelets.tag.jsf.core.ValidateDelegateHandler</handler-class>
- </validator>
- <attribute>
- <description>
- <p class="changed_added_2_0">A boolean value
- enabling page level determination of whether or not this
- validator is enabled on the enclosing component.</p>
-
-
- </description>
- <name>disabled</name>
- <type>java.lang.Boolean</type>
- </attribute>
- <attribute>
- <description>
- A ValueExpression that evaluates to an instance of
- RequiredValidator.
- </description>
- <name>binding</name>
- <type>javax.faces.validator.RequiredValidator</type>
- </attribute>
- <attribute>
- <description>
-
- <p class="changed_added_2_0">If present, this attribute
- refers
- to the value of one of the exposed attached objects within the
- composite component inside of which this tag is nested.</p>
-
- </description>
- <name>for</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- </tag>
- <tag>
- <description>
-
- <p><span class="changed_modified_2_0">Register</span>
- a named
- Validator instance on the UIComponent associated with the
- closest parent UIComponent custom action.</p>
-
- <div class="changed_added_2_0">
-
- <p>Usage outside of an <code>EditableValueHolder</code>
- parent</p>
-
- <p>If this element is nested within a
- <code>UIComponent</code> tag that has other
- <code>UIComponent</code> children, the validator will be
- automatically added to all the child components as well as
- this one. The implementation must ensure this occurs even if
- the parent of this element is not an instance of
- <code>EditableValueHolder</code>.</p>
-
- </div>
-
- </description>
- <tag-name>validator</tag-name>
- <handler-class>com.sun.faces.facelets.tag.jsf.core.ValidateDelegateHandler</handler-class>
- <attribute>
- <description>
- <p class="changed_added_2_0">A boolean value
- enabling page level determination of whether or not this
- validator is enabled on the enclosing component.</p>
-
-
- </description>
- <name>disabled</name>
- <type>java.lang.Boolean</type>
- </attribute>
- <attribute>
- <description>
- Validator identifier of the Validator
- to be created and registered.
- </description>
- <name>validatorId</name>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- A ValueExpression that evaluates to an object that implements
- the javax.faces.validator.Validator interface.
- </description>
- <name>binding</name>
- <type>javax.faces.validator.Validator</type>
- </attribute>
- <attribute>
- <description>
-
- <p class="changed_added_2_0">If present, this attribute
- refers
- to the value of one of the exposed attached objects within the
- composite component inside of which this tag is nested.</p>
-
- </description>
- <name>for</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- </tag>
- <tag>
- <description>
- Register a ValueChangeListener instance on the UIComponent
- associated with the closest parent UIComponent custom
- action.
- </description>
- <tag-name>valueChangeListener</tag-name>
- <handler-class>com.sun.faces.facelets.tag.jsf.core.ValueChangeListenerHandler</handler-class>
- <attribute>
- <description>
- Fully qualified Java class name of a
- ValueChangeListener to be created and registered.
- </description>
- <name>type</name>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Value binding expression that evaluates to an object that
- implements javax.faces.event.ValueChangeListener.
- </description>
- <name>binding</name>
- <required>false</required>
- <type>javax.faces.event.ValueChangeListener</type>
- </attribute>
- <attribute>
- <description>
-
- <p class="changed_added_2_0">If present, this attribute
- refers
- to the value of one of the exposed attached objects within the
- composite component inside of which this tag is nested.</p>
-
- </description>
- <name>for</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- </tag>
- <tag>
- <description>
- Create and register a child UIOutput component
- associated with the closest parent UIComponent
- custom action, which renders nested body content.
- </description>
- <tag-name>verbatim</tag-name>
- <component>
- <component-type>javax.faces.Output</component-type>
- <renderer-type>javax.faces.Text</renderer-type>
- </component>
- <attribute>
- <description>
- Flag indicating that generated markup must
- be escaped in a manner that is appropriate
- for the markup language to be rendered.
- Expressions must evaluate to a boolean.
- Default value is false.
- </description>
- <name>escape</name>
- <type>java.lang.Boolean</type>
- </attribute>
- <attribute>
- <description>
- Flag indicating whether or not this component should be rendered
- (during Render Response Phase), or processed on any subsequent
- form submit. The default value for this property is true.
- </description>
- <name>rendered</name>
- <required>false</required>
- <type>java.lang.Boolean</type>
- </attribute>
- </tag>
- <tag>
- <description>
- Container for all JavaServer Faces core and custom
- component actions used on a page.
- </description>
- <tag-name>view</tag-name>
- <component>
- <component-type>javax.faces.ViewRoot</component-type>
- <renderer-type/>
- </component>
- <attribute>
- <description>
- Locale to use for localizing this page. Expressions
- must evaluate to a java.util.Locale or to a String
- that is converted to a Locale.
- </description>
- <name>locale</name>
- <type>java.lang.Object</type>
- </attribute>
- <attribute>
- <description>
- Identifier for the RenderKit to use for
- rendering this page.
- </description>
- <name>renderKitId</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Specifies the content-type of the response.
- </description>
- <name>contentType</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
-
- <attribute>
- <description>
- Specifies the character encoding that should be used for the
- response.
- </description>
- <name>encoding</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
-
- MethodBinding pointing to a method that takes a
- javax.faces.event.PhaseEvent and returns void. This method
- will be called before every phase except for restore view.
- </description>
- <name>beforePhase</name>
- <required>false</required>
- <method-signature>void beforePhase(javax.faces.event.PhaseEvent)
- </method-signature>
- </attribute>
- <attribute>
- <description>
-
- MethodBinding pointing to a method that takes a
- javax.faces.event.PhaseEvent and returns void. This method
- will be called after every phase except for restore view.
- </description>
- <name>afterPhase</name>
- <required>false</required>
- <method-signature>void afterPhase(javax.faces.event.PhaseEvent)
- </method-signature>
- </attribute>
- </tag>
-</facelet-taglib>
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/std-taglibs/html_basic.taglib.xml b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/std-taglibs/html_basic.taglib.xml
deleted file mode 100644
index 7426c4f..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/std-taglibs/html_basic.taglib.xml
+++ /dev/null
@@ -1,10465 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!--
- DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
- Copyright 2009 Sun Microsystems, Inc. All rights reserved.
-
- The contents of this file are subject to the terms of either the GNU
- General Public License Version 2 only ("GPL") or the Common Development
- and Distribution License("CDDL") (collectively, the "License"). You
- may not use this file except in compliance with the License. You can obtain
- a copy of the License at https://glassfish.dev.java.net/public/CDDL+GPL.html
- or glassfish/bootstrap/legal/LICENSE.txt. See the License for the specific
- language governing permissions and limitations under the License.
-
- When distributing the software, include this License Header Notice in each
- file and include the License file at glassfish/bootstrap/legal/LICENSE.txt.
- Sun designates this particular file as subject to the "Classpath" exception
- as provided by Sun in the GPL Version 2 section of the License file that
- accompanied this code. If applicable, add the following below the License
- Header, with the fields enclosed by brackets [] replaced by your own
- identifying information: "Portions Copyrighted [year]
- [name of copyright owner]"
-
- Contributor(s):
-
- If you wish your version of this file to be governed by only the CDDL or
- only the GPL Version 2, indicate your decision by adding "[Contributor]
- elects to include this software in this distribution under the [CDDL or GPL
- Version 2] license." If you don't indicate a single choice of license, a
- recipient has the option to distribute your version of this file under
- either the CDDL, the GPL Version 2 or to extend the choice of license to
- its licensees as provided above. However, if you add GPL Version 2 code
- and therefore, elected the GPL Version 2 license, then the option applies
- only if the new code is made subject to such option by the copyright
- holder.
--->
-<facelet-taglib xmlns="http://java.sun.com/xml/ns/javaee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facelettaglibrary_2_0.xsd"
- version="2.0">
- <description>
- This tag library contains JavaServer Faces component tags for all
- UIComponent + HTML RenderKit Renderer combinations defined in the
- JavaServer Faces Specification.
- </description>
- <namespace>http://java.sun.com/jsf/html</namespace>
- <tag>
- <description>
- <![CDATA[<div class="changed_added_2_0">Render an HTML "input" element of type "button".
- The value of the component is rendered as the button text and the outcome of the
- component is used to determine the target URL which is activated by onclick. If
- "image" attribute is specified, render it as the value of the "src" attribute after
- passing it to the <code>getResourceURL()</code> method of the <code>ViewHandler</code>
- for this application, and passing the result through the <code>encodeResourceURL()</code>
- method of the <code>ExternalContext</code>. Any child <code>UIParameter</code> components
- are appended to the String to be used as the target URL as query parameters before rendering.
- The entire target URL string must be passed through a call to the <code>encodeResourceURL()</code>
- method of the <code>ExternalContext</code>. The name of the <code>UIParameter</code> goes on the
- left hand side, and the value of the <code>UIParameter</code> on the right hand side. The name
- and the value must be URLEncoded. Each <code>UIParameter</code> instance is separeted by an
- ampersand, as dictated in the URL spec. The final encoded result will be written out to the
- onclick attribute of the button as "window.location.href = '<encoded HREF value>'".
- If the developer has specified a custom onlclick the window.location.href name/value
- pair will be appended at the end of the developer specified script.
- If the "fragment" attribute is specified, the value will be included at the end
- of the resulting URL preceded by a hash mark. If the "styleClass" attribute is specified,
- render its value as the value of the "class" attribute. If the "id" attribute is specified,
- follow the same steps as mentioned in the "<a href="../../../renderkitdocs/HTML_BASIC/renderkit-summary.html#general_encoding">General
- Notes on Encoding</a>" regarding the "id" attribute for UIInput components. If the
- "disabled" attribute is specified, do not render the "onclick" element and assign the
- "disabled" attribute a value of true.</div>]]>
- </description>
- <tag-name>
- button
- </tag-name>
- <component>
- <component-type>javax.faces.HtmlOutcomeTargetButton</component-type>
- <renderer-type>javax.faces.Button</renderer-type>
- </component>
- <attribute>
- <description>
- <![CDATA[The component identifier for this component. This value must be
- unique within the closest parent component that is a naming
- container.]]>
- </description>
- <name>
- id
- </name>
- <required>
- false
- </required>
- <type>
- java.lang.String
- </type>
- </attribute>
- <attribute>
- <description>
- <![CDATA[Whether to include page parameters in the target URI.]]>
- </description>
- <name>
- includeViewParams
- </name>
- <required>
- false
- </required>
- <type>
- java.lang.Boolean
- </type>
- </attribute>
- <attribute>
- <description>
- <![CDATA[The logical outcome used to resolve a navigation case.]]>
- </description>
- <name>
- outcome
- </name>
- <required>
- false
- </required>
- <type>
- java.lang.String
- </type>
- </attribute>
- <attribute>
- <description>
- <![CDATA[Flag indicating whether or not this component should be rendered
- (during Render Response Phase), or processed on any subsequent
- form submit. The default value for this property is true.]]>
- </description>
- <name>
- rendered
- </name>
- <required>
- false
- </required>
- <type>
- boolean
- </type>
- </attribute>
- <attribute>
- <description>
- <![CDATA[The current value of this component.]]>
- </description>
- <name>
- value
- </name>
- <required>
- false
- </required>
- <type>
- java.lang.Object
- </type>
- </attribute>
- <attribute>
- <description>
- <![CDATA[Access key that, when pressed, transfers focus
- to this element.]]>
- </description>
- <name>
- accesskey
- </name>
- <required>
- false
- </required>
- <type>
- java.lang.String
- </type>
- </attribute>
- <attribute>
- <description>
- <![CDATA[Alternate textual description of the
- element rendered by this component.]]>
- </description>
- <name>
- alt
- </name>
- <required>
- false
- </required>
- <type>
- java.lang.String
- </type>
- </attribute>
- <attribute>
- <description>
- <![CDATA[Direction indication for text that does not inherit directionality.
- Valid values are "LTR" (left-to-right) and "RTL" (right-to-left).]]>
- </description>
- <name>
- dir
- </name>
- <required>
- false
- </required>
- <type>
- java.lang.String
- </type>
- </attribute>
- <attribute>
- <description>
- <![CDATA[The identifier of the page fragment which should
- be brought into focus when the target page is
- rendered. The value of this attribute is appended
- to the end of target URL following a hash (#) mark.
- This notation is part of the standard URL syntax.]]>
- </description>
- <name>
- fragment
- </name>
- <required>
- false
- </required>
- <type>
- java.lang.String
- </type>
- </attribute>
- <attribute>
- <description>
- <![CDATA[<p>
- Absolute or relative URL of the
- image to be displayed for this
- button. If specified, this
- "input" element will be of type
- "image". Otherwise, it will be
- of the type specified by the
- "type" property with a label
- specified by the "value"
- property. <span
- class="changed_added_2_0">Note
- that if the value of this
- attribute starts with "/", the
- rendered value for this
- attribute will be prefixed with
- the context-root for this
- application.</span>
- </p>]]>
- </description>
- <name>
- image
- </name>
- <required>
- false
- </required>
- <type>
- java.lang.String
- </type>
- </attribute>
- <attribute>
- <description>
- <![CDATA[Code describing the language used in the generated markup
- for this component.]]>
- </description>
- <name>
- lang
- </name>
- <required>
- false
- </required>
- <type>
- java.lang.String
- </type>
- </attribute>
- <attribute>
- <description>
- <![CDATA[Javascript code executed when this element loses focus.]]>
- </description>
- <name>
- onblur
- </name>
- <required>
- false
- </required>
- <type>
- java.lang.String
- </type>
- </attribute>
- <attribute>
- <description>
- <![CDATA[Javascript code executed when a pointer button is
- clicked over this element.]]>
- </description>
- <name>
- onclick
- </name>
- <required>
- false
- </required>
- <type>
- java.lang.String
- </type>
- </attribute>
- <attribute>
- <description>
- <![CDATA[Javascript code executed when a pointer button is
- double clicked over this element.]]>
- </description>
- <name>
- ondblclick
- </name>
- <required>
- false
- </required>
- <type>
- java.lang.String
- </type>
- </attribute>
- <attribute>
- <description>
- <![CDATA[Javascript code executed when this element receives focus.]]>
- </description>
- <name>
- onfocus
- </name>
- <required>
- false
- </required>
- <type>
- java.lang.String
- </type>
- </attribute>
- <attribute>
- <description>
- <![CDATA[Javascript code executed when a key is
- pressed down over this element.]]>
- </description>
- <name>
- onkeydown
- </name>
- <required>
- false
- </required>
- <type>
- java.lang.String
- </type>
- </attribute>
- <attribute>
- <description>
- <![CDATA[Javascript code executed when a key is
- pressed and released over this element.]]>
- </description>
- <name>
- onkeypress
- </name>
- <required>
- false
- </required>
- <type>
- java.lang.String
- </type>
- </attribute>
- <attribute>
- <description>
- <![CDATA[Javascript code executed when a key is
- released over this element.]]>
- </description>
- <name>
- onkeyup
- </name>
- <required>
- false
- </required>
- <type>
- java.lang.String
- </type>
- </attribute>
- <attribute>
- <description>
- <![CDATA[Javascript code executed when a pointer button is
- pressed down over this element.]]>
- </description>
- <name>
- onmousedown
- </name>
- <required>
- false
- </required>
- <type>
- java.lang.String
- </type>
- </attribute>
- <attribute>
- <description>
- <![CDATA[Javascript code executed when a pointer button is
- moved within this element.]]>
- </description>
- <name>
- onmousemove
- </name>
- <required>
- false
- </required>
- <type>
- java.lang.String
- </type>
- </attribute>
- <attribute>
- <description>
- <![CDATA[Javascript code executed when a pointer button is
- moved away from this element.]]>
- </description>
- <name>
- onmouseout
- </name>
- <required>
- false
- </required>
- <type>
- java.lang.String
- </type>
- </attribute>
- <attribute>
- <description>
- <![CDATA[Javascript code executed when a pointer button is
- moved onto this element.]]>
- </description>
- <name>
- onmouseover
- </name>
- <required>
- false
- </required>
- <type>
- java.lang.String
- </type>
- </attribute>
- <attribute>
- <description>
- <![CDATA[Javascript code executed when a pointer button is
- released over this element.]]>
- </description>
- <name>
- onmouseup
- </name>
- <required>
- false
- </required>
- <type>
- java.lang.String
- </type>
- </attribute>
- <attribute>
- <description>
- <![CDATA[CSS style(s) to be applied when this component is rendered.]]>
- </description>
- <name>
- style
- </name>
- <required>
- false
- </required>
- <type>
- java.lang.String
- </type>
- </attribute>
- <attribute>
- <description>
- <![CDATA[Space-separated list of CSS style class(es) to be applied when
- this element is rendered. This value must be passed through
- as the "class" attribute on generated markup.]]>
- </description>
- <name>
- styleClass
- </name>
- <required>
- false
- </required>
- <type>
- java.lang.String
- </type>
- </attribute>
- <attribute>
- <description>
- <![CDATA[Position of this element in the tabbing order
- for the current document. This value must be
- an integer between 0 and 32767.]]>
- </description>
- <name>
- tabindex
- </name>
- <required>
- false
- </required>
- <type>
- java.lang.String
- </type>
- </attribute>
- <attribute>
- <description>
- <![CDATA[Advisory title information about markup elements generated
- for this component.]]>
- </description>
- <name>
- title
- </name>
- <required>
- false
- </required>
- <type>
- java.lang.String
- </type>
- </attribute>
- <attribute>
- <description>
- The ValueExpression linking this component to a property in a
- backing bean
- </description>
- <name>
- binding
- </name>
- <required>
- false
- </required>
- <type>
- javax.faces.component.UIComponent
- </type>
- </attribute>
- </tag>
- <tag>
- <description>
- <![CDATA[<div class="changed_added_2_0">Render an HTML "a" anchor element. The value of the
- component is rendered as the anchor text and the outcome of the component is used
- to determine the target URL rendered in the "href" attribute. Any
- child <code>UIParameter</code> components are appended to the String to be
- output as the value of the "href" attribute as query parameters
- before rendering. The entire "href" string must be passed through
- a call to the <code>encodeResourceURL()</code> method of the
- <code>ExternalContext</code>. The name of the <code>UIParameter</code> goes on
- the left hand side, and the value of the <code>UIParameter</code> on the right
- hand side. The name and the value must be URLEncoded. Each
- <code>UIParameter</code> instance is separated by an ampersand, as dictated in
- the URL spec. If the "fragment" attribute is specified, the value will be
- included at the end of the resulting URL preceded by a hash mark.
- If the "styleClass" attribute is specified, render
- its value as the value of the "class" attribute. If the "id" attribute
- is specified, follow the same steps as mentioned in the
- "<a href="../../../renderkitdocs/HTML_BASIC/renderkit-summary.html#general_encoding">General
- Notes on Encoding</a>" regarding the "id" attribute for UIInput components.
- If the "disabled" attribute is specified, do not render the HTML "a"
- anchor element or the "href" element. Instead, render a "span" element.
- If the "styleClass" attribute is specified, render its value as the value
- of the "class" attribute on the "span". Render any pass-through attributes
- on the "span".</div>]]>
- </description>
- <tag-name>
- link
- </tag-name>
- <component>
- <component-type>javax.faces.HtmlOutcomeTargetLink</component-type>
- <renderer-type>javax.faces.Link</renderer-type>
- </component>
- <attribute>
- <description>
- <![CDATA[The component identifier for this component. This value must be
- unique within the closest parent component that is a naming
- container.]]>
- </description>
- <name>
- id
- </name>
- <required>
- false
- </required>
- <type>
- java.lang.String
- </type>
- </attribute>
- <attribute>
- <description>
- <![CDATA[Whether to include page parameters in the target URI.]]>
- </description>
- <name>
- includeViewParams
- </name>
- <required>
- false
- </required>
- <type>
- java.lang.Boolean
- </type>
- </attribute>
- <attribute>
- <description>
- <![CDATA[The logical outcome used to resolve a navigation case.]]>
- </description>
- <name>
- outcome
- </name>
- <required>
- false
- </required>
- <type>
- java.lang.String
- </type>
- </attribute>
- <attribute>
- <description>
- <![CDATA[Flag indicating whether or not this component should be rendered
- (during Render Response Phase), or processed on any subsequent
- form submit. The default value for this property is true.]]>
- </description>
- <name>
- rendered
- </name>
- <required>
- false
- </required>
- <type>
- boolean
- </type>
- </attribute>
- <attribute>
- <description>
- <![CDATA[The current value of this component.]]>
- </description>
- <name>
- value
- </name>
- <required>
- false
- </required>
- <type>
- java.lang.Object
- </type>
- </attribute>
- <attribute>
- <description>
- <![CDATA[Access key that, when pressed, transfers focus
- to this element.]]>
- </description>
- <name>
- accesskey
- </name>
- <required>
- false
- </required>
- <type>
- java.lang.String
- </type>
- </attribute>
- <attribute>
- <description>
- <![CDATA[The character encoding of the resource designated
- by this hyperlink.]]>
- </description>
- <name>
- charset
- </name>
- <required>
- false
- </required>
- <type>
- java.lang.String
- </type>
- </attribute>
- <attribute>
- <description>
- <![CDATA[The position and shape of the hot spot on the screen
- (for use in client-side image maps).]]>
- </description>
- <name>
- coords
- </name>
- <required>
- false
- </required>
- <type>
- java.lang.String
- </type>
- </attribute>
- <attribute>
- <description>
- <![CDATA[Direction indication for text that does not inherit directionality.
- Valid values are "LTR" (left-to-right) and "RTL" (right-to-left).]]>
- </description>
- <name>
- dir
- </name>
- <required>
- false
- </required>
- <type>
- java.lang.String
- </type>
- </attribute>
- <attribute>
- <description>
- <![CDATA[Flag indicating that this element must never
- receive focus or be included in a subsequent
- submit.]]>
- </description>
- <name>
- disabled
- </name>
- <required>
- false
- </required>
- <type>
- boolean
- </type>
- </attribute>
- <attribute>
- <description>
- <![CDATA[The identifier of the page fragment which should
- be brought into focus when the target page is
- rendered. The value of this attribute is appended
- to the end of target URL following a hash (#) mark.
- This notation is part of the standard URL syntax.]]>
- </description>
- <name>
- fragment
- </name>
- <required>
- false
- </required>
- <type>
- java.lang.String
- </type>
- </attribute>
- <attribute>
- <description>
- <![CDATA[The language code of the resource designated
- by this hyperlink.]]>
- </description>
- <name>
- hreflang
- </name>
- <required>
- false
- </required>
- <type>
- java.lang.String
- </type>
- </attribute>
- <attribute>
- <description>
- <![CDATA[Code describing the language used in the generated markup
- for this component.]]>
- </description>
- <name>
- lang
- </name>
- <required>
- false
- </required>
- <type>
- java.lang.String
- </type>
- </attribute>
- <attribute>
- <description>
- <![CDATA[Javascript code executed when this element loses focus.]]>
- </description>
- <name>
- onblur
- </name>
- <required>
- false
- </required>
- <type>
- java.lang.String
- </type>
- </attribute>
- <attribute>
- <description>
- <![CDATA[Javascript code executed when a pointer button is
- clicked over this element.]]>
- </description>
- <name>
- onclick
- </name>
- <required>
- false
- </required>
- <type>
- java.lang.String
- </type>
- </attribute>
- <attribute>
- <description>
- <![CDATA[Javascript code executed when a pointer button is
- double clicked over this element.]]>
- </description>
- <name>
- ondblclick
- </name>
- <required>
- false
- </required>
- <type>
- java.lang.String
- </type>
- </attribute>
- <attribute>
- <description>
- <![CDATA[Javascript code executed when this element receives focus.]]>
- </description>
- <name>
- onfocus
- </name>
- <required>
- false
- </required>
- <type>
- java.lang.String
- </type>
- </attribute>
- <attribute>
- <description>
- <![CDATA[Javascript code executed when a key is
- pressed down over this element.]]>
- </description>
- <name>
- onkeydown
- </name>
- <required>
- false
- </required>
- <type>
- java.lang.String
- </type>
- </attribute>
- <attribute>
- <description>
- <![CDATA[Javascript code executed when a key is
- pressed and released over this element.]]>
- </description>
- <name>
- onkeypress
- </name>
- <required>
- false
- </required>
- <type>
- java.lang.String
- </type>
- </attribute>
- <attribute>
- <description>
- <![CDATA[Javascript code executed when a key is
- released over this element.]]>
- </description>
- <name>
- onkeyup
- </name>
- <required>
- false
- </required>
- <type>
- java.lang.String
- </type>
- </attribute>
- <attribute>
- <description>
- <![CDATA[Javascript code executed when a pointer button is
- pressed down over this element.]]>
- </description>
- <name>
- onmousedown
- </name>
- <required>
- false
- </required>
- <type>
- java.lang.String
- </type>
- </attribute>
- <attribute>
- <description>
- <![CDATA[Javascript code executed when a pointer button is
- moved within this element.]]>
- </description>
- <name>
- onmousemove
- </name>
- <required>
- false
- </required>
- <type>
- java.lang.String
- </type>
- </attribute>
- <attribute>
- <description>
- <![CDATA[Javascript code executed when a pointer button is
- moved away from this element.]]>
- </description>
- <name>
- onmouseout
- </name>
- <required>
- false
- </required>
- <type>
- java.lang.String
- </type>
- </attribute>
- <attribute>
- <description>
- <![CDATA[Javascript code executed when a pointer button is
- moved onto this element.]]>
- </description>
- <name>
- onmouseover
- </name>
- <required>
- false
- </required>
- <type>
- java.lang.String
- </type>
- </attribute>
- <attribute>
- <description>
- <![CDATA[Javascript code executed when a pointer button is
- released over this element.]]>
- </description>
- <name>
- onmouseup
- </name>
- <required>
- false
- </required>
- <type>
- java.lang.String
- </type>
- </attribute>
- <attribute>
- <description>
- <![CDATA[The relationship from the current document
- to the anchor specified by this hyperlink.
- The value of this attribute is a space-separated
- list of link types.]]>
- </description>
- <name>
- rel
- </name>
- <required>
- false
- </required>
- <type>
- java.lang.String
- </type>
- </attribute>
- <attribute>
- <description>
- <![CDATA[A reverse link from the anchor specified
- by this hyperlink to the current document.
- The value of this attribute is a space-separated
- list of link types.]]>
- </description>
- <name>
- rev
- </name>
- <required>
- false
- </required>
- <type>
- java.lang.String
- </type>
- </attribute>
- <attribute>
- <description>
- <![CDATA[The shape of the hot spot on the screen
- (for use in client-side image maps). Valid
- values are: default (entire region); rect
- (rectangular region); circle (circular region);
- and poly (polygonal region).]]>
- </description>
- <name>
- shape
- </name>
- <required>
- false
- </required>
- <type>
- java.lang.String
- </type>
- </attribute>
- <attribute>
- <description>
- <![CDATA[CSS style(s) to be applied when this component is rendered.]]>
- </description>
- <name>
- style
- </name>
- <required>
- false
- </required>
- <type>
- java.lang.String
- </type>
- </attribute>
- <attribute>
- <description>
- <![CDATA[Space-separated list of CSS style class(es) to be applied when
- this element is rendered. This value must be passed through
- as the "class" attribute on generated markup.]]>
- </description>
- <name>
- styleClass
- </name>
- <required>
- false
- </required>
- <type>
- java.lang.String
- </type>
- </attribute>
- <attribute>
- <description>
- <![CDATA[Position of this element in the tabbing order
- for the current document. This value must be
- an integer between 0 and 32767.]]>
- </description>
- <name>
- tabindex
- </name>
- <required>
- false
- </required>
- <type>
- java.lang.String
- </type>
- </attribute>
- <attribute>
- <description>
- <![CDATA[Name of a frame where the resource
- retrieved via this hyperlink is to
- be displayed.]]>
- </description>
- <name>
- target
- </name>
- <required>
- false
- </required>
- <type>
- java.lang.String
- </type>
- </attribute>
- <attribute>
- <description>
- <![CDATA[Advisory title information about markup elements generated
- for this component.]]>
- </description>
- <name>
- title
- </name>
- <required>
- false
- </required>
- <type>
- java.lang.String
- </type>
- </attribute>
- <attribute>
- <description>
- <![CDATA[The content type of the resource designated
- by this hyperlink.]]>
- </description>
- <name>
- type
- </name>
- <required>
- false
- </required>
- <type>
- java.lang.String
- </type>
- </attribute>
- <attribute>
- <description>
- The ValueExpression linking this component to a property in a
- backing bean
- </description>
- <name>
- binding
- </name>
- <required>
- false
- </required>
- <type>
- javax.faces.component.UIComponent
- </type>
- </attribute>
- </tag>
- <tag>
- <description>
- <![CDATA[
-
- <p>Render the markup for a <code><head></code> element.</p>
-
- <p>Decode Behavior</p>
-
- <ul>
-
- <p>No action is required during decode for this renderer.</p>
-
- </ul>
-
- <p>Encode Behavior</p>
-
- <ul>
-
- <p>Render the starting <code><head></code> element tag. Any attributes declared on the element must be passed through
- unmodified to the rendered output.
- Just before rendering the
- closing <code></head></code> element tag, render any resources that have been targeted
- for this "head" element:
- <ul>
- <li>Obtain a <code>UIViewRoot</code> instance.</li>
- <li>Obtain a <code>List</code> of component resources targeted for
- this "head" element with a call to <code>UIViewRoot.getComponentResources()</code>
- with the <code>String "head"</code> as the argument.</li>
- <li>Iterate over the returned <code>List</code> of <code>UIComponent</code> instances
- and call <code>encodeAll</code> on each <code>UIComponent</code> instance.
-
- <p>Any attributes declared on the element must be passed through
- unmodified to the rendered output.</p>
-
- </ul>
- Render the ending <code></head></code> element tag.</p>
-
- ]]>
- </description>
- <tag-name>
- head
- </tag-name>
- <component>
- <component-type>javax.faces.Output</component-type>
- <renderer-type>javax.faces.Head</renderer-type>
- </component>
- <attribute>
- <description>
- <![CDATA[Direction indication for text that does not inherit directionality.
- Valid values are "LTR" (left-to-right) and "RTL" (right-to-left).]]>
- </description>
- <name>
- dir
- </name>
- <required>
- false
- </required>
- <type>
- java.lang.String
- </type>
- </attribute>
- <attribute>
- <description>
- <![CDATA[Code describing the language used in the generated markup
- for this component.]]>
- </description>
- <name>
- lang
- </name>
- <required>
- false
- </required>
- <type>
- java.lang.String
- </type>
- </attribute>
- <attribute>
- <description>
- The ValueExpression linking this component to a property in a
- backing bean
- </description>
- <name>
- binding
- </name>
- <required>
- false
- </required>
- <type>
- javax.faces.component.UIComponent
- </type>
- </attribute>
- </tag>
- <tag>
- <description>
- <![CDATA[
-
- <p>Render the markup for a <code><body></code> element.</p>
-
- <p>Decode Behavior</p>
-
- <ul>
-
- <p>No action is required during decode for this renderer.</p>
-
- </ul>
-
- <p>Encode Behavior</p>
-
- <ul>
-
- <p>Render the starting <code><body></code> element tag. Just before rendering the
- closing <code></body></code> element tag, render any resources that have been targeted
- for this "body" element:
- <ul>
- <li>Obtain a <code>UIViewRoot</code> instance.</li>
-
- <li>Obtain a <code>List</code> of component resources targeted for
- this "body" element with a call to
- <code>UIViewRoot.getComponentResources()</code> with the
- <code>String "body"</code> as the argument. Render the ending
- <code></body></code> element tag.</li>
-
- <li>Iterate over the returned <code>List</code> of <code>UIComponent</code> instances
- and call <code>encodeAll</code> on each <code>UIComponent</code> instance.
- </ul>
-
- <p>Any attributes declared on the element must be passed through
- unmodified to the rendered output.</p>
-
- ]]>
- </description>
- <tag-name>
- body
- </tag-name>
- <component>
- <component-type>javax.faces.Output</component-type>
- <renderer-type>javax.faces.Body</renderer-type>
- </component>
- <attribute>
- <description>
- <![CDATA[Direction indication for text that does not inherit directionality.
- Valid values are "LTR" (left-to-right) and "RTL" (right-to-left).]]>
- </description>
- <name>
- dir
- </name>
- <required>
- false
- </required>
- <type>
- java.lang.String
- </type>
- </attribute>
- <attribute>
- <description>
- <![CDATA[Code describing the language used in the generated markup
- for this component.]]>
- </description>
- <name>
- lang
- </name>
- <required>
- false
- </required>
- <type>
- java.lang.String
- </type>
- </attribute>
- <attribute>
- <description>
- <![CDATA[Javascript code executed when a pointer button is
- clicked over this element.]]>
- </description>
- <name>
- onclick
- </name>
- <required>
- false
- </required>
- <type>
- java.lang.String
- </type>
- </attribute>
- <attribute>
- <description>
- <![CDATA[Javascript code executed when a pointer button is
- double clicked over this element.]]>
- </description>
- <name>
- ondblclick
- </name>
- <required>
- false
- </required>
- <type>
- java.lang.String
- </type>
- </attribute>
- <attribute>
- <description>
- <![CDATA[Javascript code executed when a key is
- pressed down over this element.]]>
- </description>
- <name>
- onkeydown
- </name>
- <required>
- false
- </required>
- <type>
- java.lang.String
- </type>
- </attribute>
- <attribute>
- <description>
- <![CDATA[Javascript code executed when a key is
- pressed and released over this element.]]>
- </description>
- <name>
- onkeypress
- </name>
- <required>
- false
- </required>
- <type>
- java.lang.String
- </type>
- </attribute>
- <attribute>
- <description>
- <![CDATA[Javascript code executed when a key is
- released over this element.]]>
- </description>
- <name>
- onkeyup
- </name>
- <required>
- false
- </required>
- <type>
- java.lang.String
- </type>
- </attribute>
- <attribute>
- <description>
- <![CDATA[Javascript code executed when the user agent finishes loading
- a window or all frames within a frameset.]]>
- </description>
- <name>
- onload
- </name>
- <required>
- false
- </required>
- <type>
- java.lang.String
- </type>
- </attribute>
- <attribute>
- <description>
- <![CDATA[Javascript code executed when a pointer button is
- pressed down over this element.]]>
- </description>
- <name>
- onmousedown
- </name>
- <required>
- false
- </required>
- <type>
- java.lang.String
- </type>
- </attribute>
- <attribute>
- <description>
- <![CDATA[Javascript code executed when a pointer button is
- moved within this element.]]>
- </description>
- <name>
- onmousemove
- </name>
- <required>
- false
- </required>
- <type>
- java.lang.String
- </type>
- </attribute>
- <attribute>
- <description>
- <![CDATA[Javascript code executed when a pointer button is
- moved away from this element.]]>
- </description>
- <name>
- onmouseout
- </name>
- <required>
- false
- </required>
- <type>
- java.lang.String
- </type>
- </attribute>
- <attribute>
- <description>
- <![CDATA[Javascript code executed when a pointer button is
- moved onto this element.]]>
- </description>
- <name>
- onmouseover
- </name>
- <required>
- false
- </required>
- <type>
- java.lang.String
- </type>
- </attribute>
- <attribute>
- <description>
- <![CDATA[Javascript code executed when a pointer button is
- released over this element.]]>
- </description>
- <name>
- onmouseup
- </name>
- <required>
- false
- </required>
- <type>
- java.lang.String
- </type>
- </attribute>
- <attribute>
- <description>
- <![CDATA[Javascript code executed when the user agent removes
- a document from a window or frame.]]>
- </description>
- <name>
- onunload
- </name>
- <required>
- false
- </required>
- <type>
- java.lang.String
- </type>
- </attribute>
- <attribute>
- <description>
- <![CDATA[CSS style(s) to be applied when this component is rendered.]]>
- </description>
- <name>
- style
- </name>
- <required>
- false
- </required>
- <type>
- java.lang.String
- </type>
- </attribute>
- <attribute>
- <description>
- <![CDATA[Space-separated list of CSS style class(es) to be applied when
- this element is rendered. This value must be passed through
- as the "class" attribute on generated markup.]]>
- </description>
- <name>
- styleClass
- </name>
- <required>
- false
- </required>
- <type>
- java.lang.String
- </type>
- </attribute>
- <attribute>
- <description>
- <![CDATA[Advisory title information about markup elements generated
- for this component.]]>
- </description>
- <name>
- title
- </name>
- <required>
- false
- </required>
- <type>
- java.lang.String
- </type>
- </attribute>
- <attribute>
- <description>
- The ValueExpression linking this component to a property in a
- backing bean
- </description>
- <name>
- binding
- </name>
- <required>
- false
- </required>
- <type>
- javax.faces.component.UIComponent
- </type>
- </attribute>
- </tag>
- <tag>
- <description>
- <p><span
- class="changed_modified_2_0">Renders an HTML "input"
- element.</p>
- <p>Decode Behavior</p>
- <ul>
- <p>Obtain the <code>Map</code> from the
- "requestParameterMap"
- property of the <code>ExternalContext</code>. If the
- value in the
- <code>Map</code> for the value of the "clientId"
- property of the
- component is <code>null</code>, create a String by
- concatenating
- the value of the "clientId" property of the component with the
- String ".x" (without the quotes). Create another String in the
- same manner, but concatenate ".y" (without the quotes). If
- <code>null</code> is the value in the <code>Map</code>
- for both
- Strings, return from <code>decode()</code>. If the value
- in the
- <code>Map</code> for the value of the "clientId"
- property of the
- component is not <code>null</code>, get the value of the
- "type"
- attribute, and convert it to lower case. If the result is equal
- to the String "reset" (without the quotes), return from
- <code>decode()</code>. Otherwise, create a
- <code>javax.faces.event.ActionEvent</code> around the
- component,
- and pass it to the <code>queueEvent()</code> method of
- the
- component, which must be an instance of
- <code>UICommand</code>.</p>
- </ul>
- <p>Encode Behavior</p>
- <ul>
- <p>Render the clientId of the component as the value of the
- "name"
- attribute. Render the current value of the component as the value
- of the "value" attribute. If "image" attribute is specified render
- it as the value of the "src" attribute after passing it to the
- <code>getResourceURL()</code> method of the
- <code>ViewHandler</code> for this application, and
- passing the
- result through the <code>encodeResourceURL()</code>
- method of the
- <code>ExternalContext</code>. <span
- class="changed_added_2_0">Note that calling
- <code>getResourceURL()</code> will prefix the
- context-root of the
- current application if the value of the "src" attribute starts
- with "/".</span> When handling the "image" attribute, the
- value must not
- be escaped. For example, <code>&</code> must not be
- turned into
- <code>&amp;amp;</code>. If the "styleClass"
- attribute is
- specified, render its value as the value of the "class" attribute.
- If the user has specified an "onclick" attribute, append that
- JavaScript to any existing JavaScript before rendering.</p>
- <p class="changed_added_2_0">If the component being rendered
- by
- this renderer has any <code>UIParameter</code> children,
- each one
- of them must be rendered using the renderer for component-family:
- "javax.faces.Input" and renderer-type: "javax.faces.Hidden". For
- discussion, this is called the hiddenRenderer. A component with
- component-type "javax.faces.Input" must be created for local use
- in rendering each <code>UIParameter</code> child. The
- "id"
- property of the temporary component must be set to the "name" of
- the <code>UIParameter</code>. The "value" property of
- the
- temporary component must be set to the "value" of the
- <code>UIParameter</code>. For each <code>UIParameter</code>
- child, the hiddenRenderer must have its
- <code>encodeBegin()</code>, <code>encodeChildren()</code>,
- and
- <code>encodeEnd()</code> methods called, in order,
- passing the
- temporary component as the second argument.</p>
- </ul>
- </description>
- <tag-name>commandButton</tag-name>
- <component>
- <component-type>javax.faces.HtmlCommandButton</component-type>
- <renderer-type>javax.faces.Button</renderer-type>
- </component>
- <attribute>
- <description>
- MethodExpression representing the application action to invoke
- when this component is activated by the user. The expression
- must evaluate to a public method that takes no parameters, and
- returns an Object (the toString() of which is called to derive
- the logical outcome) which is passed to the NavigationHandler
- for this application.
- </description>
- <name>action</name>
- <required>false</required>
- <method-signature>java.lang.Object action()</method-signature>
- </attribute>
- <attribute>
- <description>
- <p>
- MethodExpression representing an action listener method that
- will be notified when this component is activated by the user.
- The expression must evaluate to a public method that takes an
- ActionEvent parameter, with a return type of void, <span
- class="changed_added_2_0">or to a public method that takes no
- arguments with a return type of void. In the latter case, the
- method has no way of easily knowing where the event came from,
- but this can be useful in cases where a notification is needed
- that "some action happened".</span>
- </p>
- </description>
- <name>actionListener</name>
- <required>false</required>
- <method-signature>void actionListener(javax.faces.event.ActionEvent)
- </method-signature>
- </attribute>
- <attribute>
- <description>
- The component identifier for this component. This value must be
- unique within the closest parent component that is a naming
- container.
- </description>
- <name>id</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Flag indicating that, if this component is activated by the
- user,
- notifications should be delivered to interested listeners and
- actions
- immediately (that is, during Apply Request Values phase) rather
- than
- waiting until Invoke Application phase.
- </description>
- <name>immediate</name>
- <required>false</required>
- <type>boolean</type>
- </attribute>
- <attribute>
- <description>
- Flag indicating whether or not this component should be rendered
- (during Render Response Phase), or processed on any subsequent
- form submit. The default value for this property is true.
- </description>
- <name>rendered</name>
- <required>false</required>
- <type>boolean</type>
- </attribute>
- <attribute>
- <description>
- The current value of this component.
- </description>
- <name>value</name>
- <required>false</required>
- <type>java.lang.Object</type>
- </attribute>
- <attribute>
- <description>
- Access key that, when pressed, transfers focus
- to this element.
- </description>
- <name>accesskey</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Alternate textual description of the
- element rendered by this component.
- </description>
- <name>alt</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Direction indication for text that does not inherit
- directionality.
- Valid values are "LTR" (left-to-right) and "RTL"
- (right-to-left).
- </description>
- <name>dir</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Flag indicating that this element must never receive focus or
- be included in a subsequent submit. A value of false causes
- no attribute to be rendered, while a value of true causes the
- attribute to be rendered as disabled="disabled".
- </description>
- <name>disabled</name>
- <required>false</required>
- <type>boolean</type>
- </attribute>
- <attribute>
- <description>
- <p>
- Absolute or relative URL of the
- image to be displayed for this
- button. If specified, this
- "input" element will be of type
- "image". Otherwise, it will be
- of the type specified by the
- "type" property with a label
- specified by the "value"
- property. <span
- class="changed_added_2_0">Note
- that if the value of this
- attribute starts with "/", the
- rendered value for this
- attribute will be prefixed with
- the context-root for this
- application.</span>
- </p>
- </description>
- <name>image</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- A localized user presentable name for this component.
- </description>
- <name>label</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Code describing the language used in the generated markup
- for this component.
- </description>
- <name>lang</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Javascript code executed when this element loses focus.
- </description>
- <name>onblur</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Javascript code executed when this element loses focus
- and its value has been modified since gaining focus.
- </description>
- <name>onchange</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Javascript code executed when a pointer button is
- clicked over this element.
- </description>
- <name>onclick</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Javascript code executed when a pointer button is
- double clicked over this element.
- </description>
- <name>ondblclick</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Javascript code executed when this element receives focus.
- </description>
- <name>onfocus</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Javascript code executed when a key is
- pressed down over this element.
- </description>
- <name>onkeydown</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Javascript code executed when a key is
- pressed and released over this element.
- </description>
- <name>onkeypress</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Javascript code executed when a key is
- released over this element.
- </description>
- <name>onkeyup</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Javascript code executed when a pointer button is
- pressed down over this element.
- </description>
- <name>onmousedown</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Javascript code executed when a pointer button is
- moved within this element.
- </description>
- <name>onmousemove</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Javascript code executed when a pointer button is
- moved away from this element.
- </description>
- <name>onmouseout</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Javascript code executed when a pointer button is
- moved onto this element.
- </description>
- <name>onmouseover</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Javascript code executed when a pointer button is
- released over this element.
- </description>
- <name>onmouseup</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Javascript code executed when text within this
- element is selected by the user.
- </description>
- <name>onselect</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Flag indicating that this component will prohibit changes by
- the user. The element may receive focus unless it has also
- been disabled. A value of false causes
- no attribute to be rendered, while a value of true causes the
- attribute to be rendered as readonly="readonly".
- </description>
- <name>readonly</name>
- <required>false</required>
- <type>boolean</type>
- </attribute>
- <attribute>
- <description>
- CSS style(s) to be applied when this component is rendered.
- </description>
- <name>style</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Space-separated list of CSS style class(es) to be applied when
- this element is rendered. This value must be passed through
- as the "class" attribute on generated markup.
- </description>
- <name>styleClass</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Position of this element in the tabbing order
- for the current document. This value must be
- an integer between 0 and 32767.
- </description>
- <name>tabindex</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Advisory title information about markup elements generated
- for this component.
- </description>
- <name>title</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Type of button to create. Valid values are "submit", "button",
- and "reset". If not specified, or not a valid value, the default
- value is "submit".
- </description>
- <name>type</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- The ValueExpression linking this component to a property in a
- backing bean
- </description>
- <name>binding</name>
- <required>false</required>
- <type>javax.faces.component.UIComponent</type>
- </attribute>
- </tag>
- <tag>
- <description>
- <p><span
- class="changed_modified_2_0">Render</span> an HTML "a"
- anchor
- element that acts like a form submit button when
- clicked.</p>
- <p>General Behaviour</p>
- <p>Both the encode and decode behavior require the ability to
- get
- the id/name for a hidden field, <span
- class="changed_added_2_0">which may be rendered in markup or
- which
- may be programmatically added via client DOM manipulation</span>,
- whose value is set by the JavaScript form submit. This name must
- be constructed as follows:</p>
- <ul>
- <li><p>Get the clientId for the form of which this
- component is a
- child.</p></li>
- <li><p>Append
- <code>NamingContainer.SEPARATOR_CHAR</code>.</p></li>
- <li><p>Append a constant string that is the same for all
- command
- link components in the tree.</p></li>
- </ul>
- <p>In the following text, this String is called
- hiddenFieldName.</p>
- <p>Decode Behavior</p>
- <ul>
- <p>Obtain the "clientId" property of the component. Obtain the
- <code>Map</code> from the "requestParameterMap" property
- of the
- <code>ExternalContext</code>. Derive hiddenFieldName as
- above.
- Get the entry in the <code>Map</code> under the key that
- is the
- hiddenFieldName. If the there is no entry, or the entry is the
- empty String, or the entry is not equal to the value of the
- "clientId" property, return immediately. If there is an entry,
- and its value is equal to the value of the "clientId" property,
- create a new <code>javax.faces.event.ActionEvent</code>
- instance
- around the component and call <code>queueActionEvent()</code>
- on
- the component, passing the event.</p>
- </ul>
- <p>Encode Behavior</p>
- <ul>
- <p>If the value of the <code>disabled</code>
- attribute is
- <code>true</code>, render a span element. Render all the
- passthru
- attributes and the <code>target</code> attribute as
- pass-through
- attributes on the span, even though the <code>target</code>
- attribute will have no effect on a span. Render the current value
- of the component as the content of the span. Return.</p>
- <p>If the <code>disabled</code> attribute is not
- present, or its
- value is <code>false</code>, render an HTML <code>a</code>
- element. Render "#" as the value of the "href" attribute. Render
- the current value of the component as the link text if it is
- specified. Render JavaScript that is functionally equivalent to
- the following as the value of the "onclick" attribute:</p>
- <p><code>document.forms['CLIENT_ID']['hiddenFieldName'].value='CLIENT_ID';
- document.forms['CLIENT_ID']['PARAM1_NAME'].value='PARAM1_VALUE';
- document.forms['CLIENT_ID']['PARAM2_NAME'].value='PARAM2_VALUE';
- return false;</code></p>
- <p>document.forms['CLIENT_ID'].submit()" where hiddenFieldName
- is
- as described above, CLIENT_ID is the clientId of the UICommand
- component, PARAM*_NAME and PARAM*_VALUE are the names and values,
- respectively, of any nested UIParameter children. The name and
- the value must be URLEncoded. If an "onclick" attribute was
- specified by the user, render this JavaScript in a function,
- and render the user's JavaScript in a function. Render both
- functions
- in a choice function as follows:</p>
- <p><code>var a=function(){#USER_FUNCTION#};
- var b=function(){#JSF_FUNCTION#};
- return (a()==false) ? false : b();</code></p>
- <p>where #USER_FUNCTION# is the user's JavaScript and
- #JSF_FUNCTION# is the JavaScript rendered by JSF. The choice
- function should operate such that if the user's JavaScript returns
- true, then the rendered JavaScript will also execute.</p>
- <p>If the "styleClass" attribute is specified, render its
- value as
- the value of the "class" attribute. Render any non-UIParameter
- output children as normal inside of the "a" element. These will
- appear as the link text. Allow the form renderer to output a
- single "input" element (for the entire page, regardless of how
- many command link components are in the page) of "type" "hidden"
- whose "name" is the value of hiddenFieldName, and which must not
- have a "value" attribute. Multiple occurrences of command link
- components in the tree should not cause multiple hiddenFieldName
- hidden fields. Allow the form renderer to output an "input"
- element of "type" "hidden" for each of the nested UIParameter
- children, taking the name property (but not the value) from each
- one in turn. If the "disabled" attribute is specified, do not
- render the HTML "a" anchor element or its "href" attribute.
- Instead, render a "span" element. If the "styleClass" attribute
- is specified, render its value as the value of the "class"
- attribute on the "span". Render any pass-through attributes on
- the "span". The content of the span element comes from the value
- of the component or its children as specified above.</p>
- <p>If the user specified a <code>target</code>
- attribute, its
- value must be set using javascript since the <code>onclick</code>
- handler will prevent the target attribute from being generated.
- This must be accomplished using JavaScript that is equivalent to
- the following.</p>
- <p><code>document.forms['CLIENT_ID'].target='TARGET';</code></p>
- <p>Where TARGET is the value of the target attribute on the
- JSP
- tag.</p>
- </ul>
- </description>
- <tag-name>commandLink</tag-name>
- <component>
- <component-type>javax.faces.HtmlCommandLink</component-type>
- <renderer-type>javax.faces.Link</renderer-type>
- </component>
- <attribute>
- <description>
- MethodExpression representing the application action to invoke
- when this component is activated by the user. The expression
- must evaluate to a public method that takes no parameters, and
- returns an Object (the toString() of which is called to derive
- the logical outcome) which is passed to the NavigationHandler
- for this application.
- </description>
- <name>action</name>
- <required>false</required>
- <method-signature>java.lang.Object action()</method-signature>
- </attribute>
- <attribute>
- <description>
- <p>
- MethodExpression representing an action listener method that
- will be notified when this component is activated by the user.
- The expression must evaluate to a public method that takes an
- ActionEvent parameter, with a return type of void, <span
- class="changed_added_2_0">or to a public method that takes no
- arguments with a return type of void. In the latter case, the
- method has no way of easily knowing where the event came from,
- but this can be useful in cases where a notification is needed
- that "some action happened".</span>
- </p>
- </description>
- <name>actionListener</name>
- <required>false</required>
- <method-signature>void actionListener(javax.faces.event.ActionEvent)
- </method-signature>
- </attribute>
- <attribute>
- <description>
- The component identifier for this component. This value must be
- unique within the closest parent component that is a naming
- container.
- </description>
- <name>id</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Flag indicating that, if this component is activated by the
- user,
- notifications should be delivered to interested listeners and
- actions
- immediately (that is, during Apply Request Values phase) rather
- than
- waiting until Invoke Application phase.
- </description>
- <name>immediate</name>
- <required>false</required>
- <type>boolean</type>
- </attribute>
- <attribute>
- <description>
- Flag indicating whether or not this component should be rendered
- (during Render Response Phase), or processed on any subsequent
- form submit. The default value for this property is true.
- </description>
- <name>rendered</name>
- <required>false</required>
- <type>boolean</type>
- </attribute>
- <attribute>
- <description>
- The current value of this component.
- </description>
- <name>value</name>
- <required>false</required>
- <type>java.lang.Object</type>
- </attribute>
- <attribute>
- <description>
- Access key that, when pressed, transfers focus
- to this element.
- </description>
- <name>accesskey</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- The character encoding of the resource designated
- by this hyperlink.
- </description>
- <name>charset</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- The position and shape of the hot spot on the screen
- (for use in client-side image maps).
- </description>
- <name>coords</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Direction indication for text that does not inherit
- directionality.
- Valid values are "LTR" (left-to-right) and "RTL"
- (right-to-left).
- </description>
- <name>dir</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Flag indicating that this element must never
- receive focus or be included in a subsequent
- submit.
- </description>
- <name>disabled</name>
- <required>false</required>
- <type>boolean</type>
- </attribute>
- <attribute>
- <description>
- The language code of the resource designated
- by this hyperlink.
- </description>
- <name>hreflang</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Code describing the language used in the generated markup
- for this component.
- </description>
- <name>lang</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Javascript code executed when this element loses focus.
- </description>
- <name>onblur</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Javascript code executed when a pointer button is
- clicked over this element.
- </description>
- <name>onclick</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Javascript code executed when a pointer button is
- double clicked over this element.
- </description>
- <name>ondblclick</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Javascript code executed when this element receives focus.
- </description>
- <name>onfocus</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Javascript code executed when a key is
- pressed down over this element.
- </description>
- <name>onkeydown</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Javascript code executed when a key is
- pressed and released over this element.
- </description>
- <name>onkeypress</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Javascript code executed when a key is
- released over this element.
- </description>
- <name>onkeyup</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Javascript code executed when a pointer button is
- pressed down over this element.
- </description>
- <name>onmousedown</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Javascript code executed when a pointer button is
- moved within this element.
- </description>
- <name>onmousemove</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Javascript code executed when a pointer button is
- moved away from this element.
- </description>
- <name>onmouseout</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Javascript code executed when a pointer button is
- moved onto this element.
- </description>
- <name>onmouseover</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Javascript code executed when a pointer button is
- released over this element.
- </description>
- <name>onmouseup</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- The relationship from the current document
- to the anchor specified by this hyperlink.
- The value of this attribute is a space-separated
- list of link types.
- </description>
- <name>rel</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- A reverse link from the anchor specified
- by this hyperlink to the current document.
- The value of this attribute is a space-separated
- list of link types.
- </description>
- <name>rev</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- The shape of the hot spot on the screen
- (for use in client-side image maps). Valid
- values are: default (entire region); rect
- (rectangular region); circle (circular region);
- and poly (polygonal region).
- </description>
- <name>shape</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- CSS style(s) to be applied when this component is rendered.
- </description>
- <name>style</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Space-separated list of CSS style class(es) to be applied when
- this element is rendered. This value must be passed through
- as the "class" attribute on generated markup.
- </description>
- <name>styleClass</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Position of this element in the tabbing order
- for the current document. This value must be
- an integer between 0 and 32767.
- </description>
- <name>tabindex</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Name of a frame where the resource
- retrieved via this hyperlink is to
- be displayed.
- </description>
- <name>target</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Advisory title information about markup elements generated
- for this component.
- </description>
- <name>title</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- The content type of the resource designated
- by this hyperlink.
- </description>
- <name>type</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- The ValueExpression linking this component to a property in a
- backing bean
- </description>
- <name>binding</name>
- <required>false</required>
- <type>javax.faces.component.UIComponent</type>
- </attribute>
- </tag>
- <tag>
- <description>
- <p>Renders an HTML "table" element compliant with the HTML 401
- specification. Render the "caption" facet, if present, inside a
- "caption" element immediately below the "table" element. If the
- "captionClass" attribute is specified, render its value as the
- value of the "class" attribute on the "caption" element. If the
- "captionStyle" attribute is specified, render its value as the
- value of the "style" attribute on the "caption" element.</p>
- <p>Please consult the javadoc for <code>UIData</code>
- to
- supplement this specification. If the "styleClass" attribute is
- specified, render its value as the value of the "class" attribute
- on the "table" element. Any pass-through attributes are also
- rendered on the "table" element. </p>
- <p>Column Groups</p>
- <ul>
- <p>If the <code>UIData</code> component has a
- "colgroups" facet,
- render its contents. Consistent with the rules of facets in
- general, this facet must have only one child. In general, this
- will be a <code>panel group</code> component that will
- contain
- <code>colgroup</code> and <code>col</code>
- elements per the HTML
- Table specification. Use of column grouping can improve
- accessibility. This facet must be rendered before the table
- header and footer.</p>
- </ul>
- <p>Rendering the header</p>
- <ul>
- <p>If the <code>UIData</code> component has a
- "header" facet, or
- any of the child <code>UIColumn</code> components has a
- "header"
- facet, render a "thead" element. If the <code>UIData</code>
- component has a "header" facet, encode its contents inside of "tr"
- and "th" elements, respectively. Output the value of the
- "headerClass" attribute of the <code>UIData</code>
- component, if
- present, as the value of the "class" attribute on the "th".
- Output the number of child <code>UIColumn</code>
- components of the
- <code>UIData</code> component as the value of the
- "colspan"
- attribute on the "th". Output "colgroup" as the value of the
- "scope" attribute on the "th" element. </p>
- <p>If any of the child <code>UIColumn</code>
- components has a
- "header" facet render a "tr" element. For each
- <code>UIColumn</code> that actually has a "header"
- facet, render
- it inside of a "th" element. Columns that don't have a "header"
- facet cause an empty "th" element to be rendered. Output the
- value of the "headerClass" attribute of the <code>UIColumn</code>
- component, if present, as the value of the "class" attribute on
- the "th". If the "headerClass" attribute of the <code>UIColumn</code>
- component is not present, output the value of the "headerClass"
- attribute of the <code>UIData</code> component, if
- present, as
- the value of the "class" attribute on the "th". Output "col" as
- the value of the "scope" attribute on the "th" element.
- </p>
- <p>Close out the "thead" element.</p>
- </ul>
- <p>Rendering the footer</p>
- <ul>
- <p>Follow the same process as for the header, except replace
- "header" with "footer", "th" with "td", "thead" with "tfoot", and
- "headerClass" with "footerClass". Do not render any "scope"
- attribute for the footer.</p>
- </ul>
- <p>Rendering the table body</p>
- <ul>
- <p>Look at the value of the "bodyrows" attribute. If present,
- this must be a comma separated list of integers. Each entry in
- this list is the row index of the row before which a "tbody"
- element should be rendered.</p>
- <p>If there was no "bodyrows" attribute, or it was empty,
- render a
- "tbody" element. Keep track of the result of the "rows" property
- on the <code>UIData</code> component. Keep track of the
- number of
- rows we have rendered so far. Iterate through the rows. Set the
- "rowIndex" property of the <code>UIData</code> component
- to be
- correct as we iterate through the rows. Stop rendering children
- and close out the "tbody" element if the "rowAvailable" property
- of the <code>UIData</code> returned false. If the
- current row
- index is contained in the "bodyrows" attribute, check if a "tbody"
- start element was rendered that needs to be closed, and if so,
- close the "tbody" element. Then render a "tbody" element start.
- Otherwise, do not render a "tbody" element.</p>
- <p>Output a "tr" element. Output the value of the "rowClasses"
- per the attribute description below. For each
- <code>UIColumn</code> child, if the column component has
- a
- "rowHeader" attribute with a value of "true", output a "th"
- element with a "scope" attribute with the value of "row".
- Otherwise, if the column component has no "rowHeader" attribute,
- or its value is false, output a "td" element. In either case
- attach the value of the "columnClasses" attribute of the
- <code>UIData</code> component per the attribute
- description below.
- Recursively encode each child of each <code>UIColumn</code>
- child.
- Close out the "td" or "th" element. When done with the row, close
- out the "tr" element. When done with all the rows, close out the
- "tbody" element.</p>
- </ul>
- <p>When done rendering all the rows, set the "rowIndex"
- property of
- the <code>UIData</code> to -1, and close out the "table"
- element.</p>
- </description>
- <tag-name>dataTable</tag-name>
- <component>
- <component-type>javax.faces.HtmlDataTable</component-type>
- <renderer-type>javax.faces.Table</renderer-type>
- </component>
- <attribute>
- <description>
- Zero-relative row number of the first row to be displayed. If
- this
- property is set to zero, rendering will begin with the first row
- of
- the underlying data.
- </description>
- <name>first</name>
- <required>false</required>
- <type>int</type>
- </attribute>
- <attribute>
- <description>
- The component identifier for this component. This value must be
- unique within the closest parent component that is a naming
- container.
- </description>
- <name>id</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Flag indicating whether or not this component should be rendered
- (during Render Response Phase), or processed on any subsequent
- form submit. The default value for this property is true.
- </description>
- <name>rendered</name>
- <required>false</required>
- <type>boolean</type>
- </attribute>
- <attribute>
- <description>
- The number of rows to display, starting with the one identified
- by the
- "first" property. If this value is set to zero, all available
- rows in
- the underlying data model will be displayed.
- </description>
- <name>rows</name>
- <required>false</required>
- <type>int</type>
- </attribute>
- <attribute>
- <description>
- The current value of this component.
- </description>
- <name>value</name>
- <required>false</required>
- <type>java.lang.Object</type>
- </attribute>
- <attribute>
- <description>
- Name of a request-scope attribute under which the model data for
- the
- row selected by the current value of the "rowIndex" property
- (i.e.
- also the current value of the "rowData" property) will be
- exposed.
- </description>
- <name>var</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Name or code of the background color for this table.
- </description>
- <name>bgcolor</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Comma separated list of row indices for which a new
- "tbody" element should be started (and any
- previously opened one should be ended).
- </description>
- <name>bodyrows</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Width (in pixels) of the border to be drawn
- around this table.
- </description>
- <name>border</name>
- <required>false</required>
- <type>int</type>
- </attribute>
- <attribute>
- <description>
- Space-separated list of CSS style class(es) that will be
- applied to any caption generated for this table.
- </description>
- <name>captionClass</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- CSS style(s) to be applied when this caption is rendered.
- </description>
- <name>captionStyle</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Definition of how much space the user agent should
- leave between the border of each cell and its contents.
- </description>
- <name>cellpadding</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Definition of how much space the user agent should
- leave between the left side of the table and the
- leftmost column, the top of the table and the top of
- the top side of the topmost row, and so on for the
- right and bottom of the table. It also specifies
- the amount of space to leave between cells.
- </description>
- <name>cellspacing</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Comma-delimited list of CSS style classes that will be applied
- to the columns of this table. A space separated list of
- classes may also be specified for any individual column. If
- the number of elements in this list is less than the number of
- actual column children of the UIData, no "class"
- attribute is output for each column greater than the number of
- elements in the list. If the number of elements in the list
- is greater than the number of actual column children of the
- UIData, the elements at the posisiton in the list
- after the last column are ignored.
- </description>
- <name>columnClasses</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Direction indication for text that does not inherit
- directionality.
- Valid values are "LTR" (left-to-right) and "RTL"
- (right-to-left).
- </description>
- <name>dir</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Space-separated list of CSS style class(es) that will be
- applied to any footer generated for this table.
- </description>
- <name>footerClass</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Code specifying which sides of the frame surrounding
- this table will be visible. Valid values are:
- none (no sides, default value); above (top side only);
- below (bottom side only); hsides (top and bottom sides
- only); vsides (right and left sides only); lhs (left
- hand side only); rhs (right hand side only); box
- (all four sides); and border (all four sides).
- </description>
- <name>frame</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Space-separated list of CSS style class(es) that will be
- applied to any header generated for this table.
- </description>
- <name>headerClass</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Code describing the language used in the generated markup
- for this component.
- </description>
- <name>lang</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Javascript code executed when a pointer button is
- clicked over this element.
- </description>
- <name>onclick</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Javascript code executed when a pointer button is
- double clicked over this element.
- </description>
- <name>ondblclick</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Javascript code executed when a key is
- pressed down over this element.
- </description>
- <name>onkeydown</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Javascript code executed when a key is
- pressed and released over this element.
- </description>
- <name>onkeypress</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Javascript code executed when a key is
- released over this element.
- </description>
- <name>onkeyup</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Javascript code executed when a pointer button is
- pressed down over this element.
- </description>
- <name>onmousedown</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Javascript code executed when a pointer button is
- moved within this element.
- </description>
- <name>onmousemove</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Javascript code executed when a pointer button is
- moved away from this element.
- </description>
- <name>onmouseout</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Javascript code executed when a pointer button is
- moved onto this element.
- </description>
- <name>onmouseover</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Javascript code executed when a pointer button is
- released over this element.
- </description>
- <name>onmouseup</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Comma-delimited list of CSS style classes that will be applied
- to the rows of this table. A space separated list of classes
- may also be specified for any individual row. Thes styles are
- applied, in turn, to each row in the table. For example, if
- the list has two elements, the first style class in the list
- is applied to the first row, the second to the second row, the
- first to the third row, the second to the fourth row, etc. In
- other words, we keep iterating through the list until we reach
- the end, and then we start at the beginning again.
- </description>
- <name>rowClasses</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Code specifying which rules will appear between cells
- within this table. Valid values are: none (no rules,
- default value); groups (between row groups); rows
- (between rows only); cols (between columns only); and
- all (between all rows and columns).
- </description>
- <name>rules</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- CSS style(s) to be applied when this component is rendered.
- </description>
- <name>style</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Space-separated list of CSS style class(es) to be applied when
- this element is rendered. This value must be passed through
- as the "class" attribute on generated markup.
- </description>
- <name>styleClass</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Summary of this table's purpose and structure, for
- user agents rendering to non-visual media such as
- speech and Braille.
- </description>
- <name>summary</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Advisory title information about markup elements generated
- for this component.
- </description>
- <name>title</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Width of the entire table, for visual user agents.
- </description>
- <name>width</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- The ValueExpression linking this component to a property in a
- backing bean
- </description>
- <name>binding</name>
- <required>false</required>
- <type>javax.faces.component.UIComponent</type>
- </attribute>
- </tag>
- <tag>
- <description>
- <span class="changed_modified_2_0">
- Renders</span> an HTML "form" element.
- <p>Decode Behavior</p>
- <ul>
- <p>Obtain the <code>Map</code> from the
- "requestParameterMap"
- property of the <code>ExternalContext</code>. If the map
- contains
- an entry for the "clientId" of this <code>UIForm</code>
- component,
- call <code>setSubmitted(true)</code> on the form,
- otherwise call
- <code>setSubmitted(false)</code> on the form.</p>
- </ul>
- <p>Encode Behavior</p>
- <ul>
- <p>The value of the "method" attribute must be "post". The
- value
- of the "action" attribute must be the result of passing the view
- identifier of the current view to the <code>getActionURL()</code>
- method of the <code>ViewHandler</code> for this
- application, then
- passing that String to the <code>encodeActionURL()</code>
- method
- on the <code>ExternalContext</code>. The value of the
- acceptcharset
- attribute must be rendered as the value of "accept-charset".
- If the "styleClass" attribute is specified, render its value as the
- value of the "class" attribute. Render a "name"
- attribute with a value the same as the "id" attribute as described
- in "<a
- href="../../../renderkitdocs/HTML_BASIC/renderkit-summary.html#general_encoding">General
- Notes on
- Encoding</a>" regarding the "id" attribute for UIInput
- components. <p class="changed_added_2_0">Obtain the <code>UIViewRoot
- view identifier</code> and
- use it to obtain an <code>action URL</code> by calling
- <code>ViewHandler.getActionURL</code>.
- Use the <code>action URL</code> to obtain an <code>encoded
- action URL</code> by calling
- <code>ExternalContext.encodeActionURL</code>. Obtain an
- <code>encoded partial action URL</code> by calling
- <code>ExternalContext.encodePartialActionURL</code>
- using <code>action URL</code> as the argument.
- Compare the result from <code>ExternalContext.encodePartialActionURL</code>
- with the
- value from <code>ExternalContext.encodeActionURL()</code>.
- If they are different,
- render a hidden field with the name <code>javax.faces.encodedURL</code>
- and the value
- of this hidden field as the value from <code>ExternalContext.encodePartialActionURL</code>.</p>
- Call <code>ViewHandler.writeState()</code>
- before the the close of the "form" element. Render all the
- necessary hidden fields for all commandLink instances in the page
- just before the close of the "form" element.
- <div class="changed_modified_2_0">
- Just before rendering the closing <code>&lt;/form&gt;</code>
- element tag, render
- any resources that have been targeted for this form:
- <ul>
- <li>Obtain a <code>UIViewRoot</code> instance.</li>
- <li>Obtain a <code>List</code> of component
- resources targeted for
- this form with a call to <code>UIViewRoot.getComponentResources()</code>
- with the <code>String "form"</code> as the argument.</li>
- <li>Iterate over the returned <code>List</code> of
- <code>UIComponent</code> instances
- and call <code>encodeAll</code> on each <code>UIComponent</code>
- instance.
- </ul>
- </div>
- </p>
- </ul>
- </div>
- </description>
- <tag-name>form</tag-name>
- <component>
- <component-type>javax.faces.HtmlForm</component-type>
- <renderer-type>javax.faces.Form</renderer-type>
- </component>
- <attribute>
- <description>
- The component identifier for this component. This value must be
- unique within the closest parent component that is a naming
- container.
- </description>
- <name>id</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Flag indicating whether or not this form should prepend its id
- to its descendent's id during the clientId generation process.
- If this flag is not set, the default value is true.
- </description>
- <name>prependId</name>
- <required>false</required>
- <type>boolean</type>
- </attribute>
- <attribute>
- <description>
- Flag indicating whether or not this component should be rendered
- (during Render Response Phase), or processed on any subsequent
- form submit. The default value for this property is true.
- </description>
- <name>rendered</name>
- <required>false</required>
- <type>boolean</type>
- </attribute>
- <attribute>
- <description>
- List of content types that a server processing this form
- will handle correctly
- </description>
- <name>accept</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- List of character encodings for input data
- that are accepted by the server processing
- this form.
- </description>
- <name>acceptcharset</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Direction indication for text that does not inherit
- directionality.
- Valid values are "LTR" (left-to-right) and "RTL"
- (right-to-left).
- </description>
- <name>dir</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Content type used to submit the form to the server. If not
- specified, the default value is
- "application/x-www-form-urlencoded".
- </description>
- <name>enctype</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Code describing the language used in the generated markup
- for this component.
- </description>
- <name>lang</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Javascript code executed when a pointer button is
- clicked over this element.
- </description>
- <name>onclick</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Javascript code executed when a pointer button is
- double clicked over this element.
- </description>
- <name>ondblclick</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Javascript code executed when a key is
- pressed down over this element.
- </description>
- <name>onkeydown</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Javascript code executed when a key is
- pressed and released over this element.
- </description>
- <name>onkeypress</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Javascript code executed when a key is
- released over this element.
- </description>
- <name>onkeyup</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Javascript code executed when a pointer button is
- pressed down over this element.
- </description>
- <name>onmousedown</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Javascript code executed when a pointer button is
- moved within this element.
- </description>
- <name>onmousemove</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Javascript code executed when a pointer button is
- moved away from this element.
- </description>
- <name>onmouseout</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Javascript code executed when a pointer button is
- moved onto this element.
- </description>
- <name>onmouseover</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Javascript code executed when a pointer button is
- released over this element.
- </description>
- <name>onmouseup</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Javascript code executed when this form is reset.
- </description>
- <name>onreset</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Javascript code executed when this form is submitted.
- </description>
- <name>onsubmit</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- CSS style(s) to be applied when this component is rendered.
- </description>
- <name>style</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Space-separated list of CSS style class(es) to be applied when
- this element is rendered. This value must be passed through
- as the "class" attribute on generated markup.
- </description>
- <name>styleClass</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Name of a frame where the response
- retrieved after this form submit is to
- be displayed.
- </description>
- <name>target</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Advisory title information about markup elements generated
- for this component.
- </description>
- <name>title</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- The ValueExpression linking this component to a property in a
- backing bean
- </description>
- <name>binding</name>
- <required>false</required>
- <type>javax.faces.component.UIComponent</type>
- </attribute>
- </tag>
- <tag>
- <description>
- <p><span
- class="changed_modified_2_0">Renders</span> an HTML "img"
- element. Render the clientId as the value of the "id"
- attribute.</p>
- <div class="changed_modified_2_0">
- <p>Handling the Value</p>
- <ul>
- <p>If the "name" attribute is present, execute algorithm <a
- href="javax.faces.Outputjavax.faces.resource.Script.html#ResourceCommonGetResource">Common
- Algorithm for Obtaining A Resource to Render</a> to obtain a
- <code>Resource</code> instance. Call
- <code>Resource.getRequestPath()</code> and output the
- result as the
- value of the "src" attribute on the rendered markup.</p>
- <p>Otherwise, if the "url" attribute is present, treat its
- value as
- if it was the value of the "value" attribute. Otherwise, if the
- "value" attribute is present, render the value of the component as
- the value of the "src" attribute, after passing it to the
- <code>getResourceURL()</code> method of the <code>ViewHandler</code>
- for this application, and passing the result through the
- <code>encodeResourceURL()</code> method of the
- <code>ExternalContext</code>.</p>
- <p>When handling the "src" attribute,
- the value must not be escaped. For example, <code>&</code>
- must not
- be turned into <code>&amp;amp;</code>. If the
- "styleClass"
- attribute is specified, render its value as the value of the "class"
- attribute.</p>
- </ul>
- </div>
- </description>
- <tag-name>graphicImage</tag-name>
- <component>
- <component-type>javax.faces.HtmlGraphicImage</component-type>
- <renderer-type>javax.faces.Image</renderer-type>
- </component>
- <attribute>
- <description>
- The component identifier for this component. This value must be
- unique within the closest parent component that is a naming
- container.
- </description>
- <name>id</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Flag indicating whether or not this component should be rendered
- (during Render Response Phase), or processed on any subsequent
- form submit. The default value for this property is true.
- </description>
- <name>rendered</name>
- <required>false</required>
- <type>boolean</type>
- </attribute>
- <attribute>
- <description>
- Context-relative URL to retrieve the resource associated with
- this component. This is an alias for the "value" property.
- </description>
- <name>url</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- The current value of this component.
- </description>
- <name>value</name>
- <required>false</required>
- <type>java.lang.Object</type>
- </attribute>
- <attribute>
- <description>
- Alternate textual description of the
- element rendered by this component.
- </description>
- <name>alt</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Direction indication for text that does not inherit
- directionality.
- Valid values are "LTR" (left-to-right) and "RTL"
- (right-to-left).
- </description>
- <name>dir</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Override for the height of this image.
- </description>
- <name>height</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Flag indicating that this image is to be used as a server side
- image map. Such an image must be enclosed within a hyperlink
- ("a"). A value of false causes no attribute to be rendered,
- while a value of true causes the attribute to be rendered as
- ismap="ismap".
- </description>
- <name>ismap</name>
- <required>false</required>
- <type>boolean</type>
- </attribute>
- <attribute>
- <description>
- Code describing the language used in the generated markup
- for this component.
- </description>
- <name>lang</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- <div class="changed_added_2_0"><p>The <em>libraryName</em>
- for this resource.</p></div>
- </description>
- <name>library</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- URI to a long description of the image
- represented by this element.
- </description>
- <name>longdesc</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- <div class="changed_added_2_0"><p>The <em>resourceName</em>
- for this resource.</p></div>
- </description>
- <name>name</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Javascript code executed when a pointer button is
- clicked over this element.
- </description>
- <name>onclick</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Javascript code executed when a pointer button is
- double clicked over this element.
- </description>
- <name>ondblclick</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Javascript code executed when a key is
- pressed down over this element.
- </description>
- <name>onkeydown</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Javascript code executed when a key is
- pressed and released over this element.
- </description>
- <name>onkeypress</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Javascript code executed when a key is
- released over this element.
- </description>
- <name>onkeyup</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Javascript code executed when a pointer button is
- pressed down over this element.
- </description>
- <name>onmousedown</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Javascript code executed when a pointer button is
- moved within this element.
- </description>
- <name>onmousemove</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Javascript code executed when a pointer button is
- moved away from this element.
- </description>
- <name>onmouseout</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Javascript code executed when a pointer button is
- moved onto this element.
- </description>
- <name>onmouseover</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Javascript code executed when a pointer button is
- released over this element.
- </description>
- <name>onmouseup</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- CSS style(s) to be applied when this component is rendered.
- </description>
- <name>style</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Space-separated list of CSS style class(es) to be applied when
- this element is rendered. This value must be passed through
- as the "class" attribute on generated markup.
- </description>
- <name>styleClass</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Advisory title information about markup elements generated
- for this component.
- </description>
- <name>title</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- The name of a client side image map (an HTML "map"
- element) for which this element provides the image.
- </description>
- <name>usemap</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Override for the width of this image.
- </description>
- <name>width</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- The ValueExpression linking this component to a property in a
- backing bean
- </description>
- <name>binding</name>
- <required>false</required>
- <type>javax.faces.component.UIComponent</type>
- </attribute>
- </tag>
- <tag>
- <description>
- <p>Renders an HTML "input" element of type
- "hidden".</p>
- <p>Decode Behavior</p>
- <ul>
- <p>See the decode description for the <a
- href="javax.faces.Inputjavax.faces.Text.html#encode">Input
- Text</a> renderer.</p>
- </ul>
- <p>Encode Behavior</p>
- <ul>
- <p>Render the clientId of the component as the value of the
- "name" attribute. Render the current value of the component as
- the value of the "value" attribute.</p>
- </ul>
- </description>
- <tag-name>inputHidden</tag-name>
- <component>
- <component-type>javax.faces.HtmlInputHidden</component-type>
- <renderer-type>javax.faces.Hidden</renderer-type>
- </component>
- <attribute>
- <description>
- Converter instance registered with this component.
- </description>
- <name>converter</name>
- <required>false</required>
- <type>javax.faces.convert.Converter</type>
- </attribute>
- <attribute>
- <description>
- A ValueExpression enabled attribute that, if present, will be
- used as the text of the converter message, replacing any message
- that comes from the converter.
- </description>
- <name>converterMessage</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- The component identifier for this component. This value must be
- unique within the closest parent component that is a naming
- container.
- </description>
- <name>id</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Flag indicating that this component's value must be
- converted and validated immediately (that is, during
- Apply Request Values phase), rather than waiting
- until Process Validations phase.
- </description>
- <name>immediate</name>
- <required>false</required>
- <type>boolean</type>
- </attribute>
- <attribute>
- <description>
- Flag indicating whether or not this component should be rendered
- (during Render Response Phase), or processed on any subsequent
- form submit. The default value for this property is true.
- </description>
- <name>rendered</name>
- <required>false</required>
- <type>boolean</type>
- </attribute>
- <attribute>
- <description>
- Flag indicating that the user is required to provide a submitted
- value for this input component.
- </description>
- <name>required</name>
- <required>false</required>
- <type>boolean</type>
- </attribute>
- <attribute>
- <description>
- A ValueExpression enabled attribute that, if present, will be
- used as the text of the validation message for the "required"
- facility, if the "required" facility is used.
- </description>
- <name>requiredMessage</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- MethodExpression representing a validator method that will be
- called
- during Process Validations to perform correctness checks on the
- value of this component. The expression must evaluate to a
- public
- method that takes FacesContext, UIComponent, and Object
- parameters,
- with a return type of void.
- </description>
- <name>validator</name>
- <required>false</required>
- <method-signature>void validate(javax.faces.context.FacesContext,
- javax.faces.component.UIComponent, java.lang.Object)
- </method-signature>
- </attribute>
- <attribute>
- <description>
- A ValueExpression enabled attribute that, if present, will be
- used as the text of the validator message, replacing any
- message that comes from the validator.
- </description>
- <name>validatorMessage</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- The current value of this component.
- </description>
- <name>value</name>
- <required>false</required>
- <type>java.lang.Object</type>
- </attribute>
- <attribute>
- <description>
- <p>
- MethodExpression representing a value change listener method
- that will be notified when a new value has been set for this
- input component. The expression must evaluate to a public
- method that takes a <code>ValueChangeEvent</code>
- parameter,
- with a return type of void, <span class="changed_added_2_0">or
- to a public method that takes no arguments with a return type
- of void. In the latter case, the method has no way of easily
- knowing what the new value is, but this can be useful in cases
- where a notification is needed that "this value
- changed".</span>
- </p>
- </description>
- <name>valueChangeListener</name>
- <required>false</required>
- <method-signature>void
- valueChange(javax.faces.event.ValueChangeEvent)
- </method-signature>
- </attribute>
- <attribute>
- <description>
- The ValueExpression linking this component to a property in a
- backing bean
- </description>
- <name>binding</name>
- <required>false</required>
- <type>javax.faces.component.UIComponent</type>
- </attribute>
- </tag>
- <tag>
- <description>
- <p>Renders an HTML "input" element of "type" "password".</p>
- <p>Decode Behavior</p>
- <ul>
- <p>See the decode description for the <a
- href="javax.faces.Inputjavax.faces.Text.html#encode">Input
- Text</a> renderer.</p>
- </ul>
- <p>Encode Behavior</p>
- <ul>
- <p>
- Render the clientId of the component as the value of the "name"
- attribute. Render the current value of the component as the value
- of the "value" attribute, if and only if the "redisplay" component
- attribute is the string "true". If the "styleClass" attribute is
- specified, render its value as the value of the "class"
- attribute.</p>
- </ul>
- </description>
- <tag-name>inputSecret</tag-name>
- <component>
- <component-type>javax.faces.HtmlInputSecret</component-type>
- <renderer-type>javax.faces.Secret</renderer-type>
- </component>
- <attribute>
- <description>
- Converter instance registered with this component.
- </description>
- <name>converter</name>
- <required>false</required>
- <type>javax.faces.convert.Converter</type>
- </attribute>
- <attribute>
- <description>
- A ValueExpression enabled attribute that, if present, will be
- used as the text of the converter message, replacing any message
- that comes from the converter.
- </description>
- <name>converterMessage</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- The component identifier for this component. This value must be
- unique within the closest parent component that is a naming
- container.
- </description>
- <name>id</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Flag indicating that this component's value must be
- converted and validated immediately (that is, during
- Apply Request Values phase), rather than waiting
- until Process Validations phase.
- </description>
- <name>immediate</name>
- <required>false</required>
- <type>boolean</type>
- </attribute>
- <attribute>
- <description>
- Flag indicating whether or not this component should be rendered
- (during Render Response Phase), or processed on any subsequent
- form submit. The default value for this property is true.
- </description>
- <name>rendered</name>
- <required>false</required>
- <type>boolean</type>
- </attribute>
- <attribute>
- <description>
- Flag indicating that the user is required to provide a submitted
- value for this input component.
- </description>
- <name>required</name>
- <required>false</required>
- <type>boolean</type>
- </attribute>
- <attribute>
- <description>
- A ValueExpression enabled attribute that, if present, will be
- used as the text of the validation message for the "required"
- facility, if the "required" facility is used.
- </description>
- <name>requiredMessage</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- MethodExpression representing a validator method that will be
- called
- during Process Validations to perform correctness checks on the
- value of this component. The expression must evaluate to a
- public
- method that takes FacesContext, UIComponent, and Object
- parameters,
- with a return type of void.
- </description>
- <name>validator</name>
- <required>false</required>
- <method-signature>void validate(javax.faces.context.FacesContext,
- javax.faces.component.UIComponent, java.lang.Object)
- </method-signature>
- </attribute>
- <attribute>
- <description>
- A ValueExpression enabled attribute that, if present, will be
- used as the text of the validator message, replacing any
- message that comes from the validator.
- </description>
- <name>validatorMessage</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- The current value of this component.
- </description>
- <name>value</name>
- <required>false</required>
- <type>java.lang.Object</type>
- </attribute>
- <attribute>
- <description>
- <p>
- MethodExpression representing a value change listener method
- that will be notified when a new value has been set for this
- input component. The expression must evaluate to a public
- method that takes a <code>ValueChangeEvent</code>
- parameter,
- with a return type of void, <span class="changed_added_2_0">or
- to a public method that takes no arguments with a return type
- of void. In the latter case, the method has no way of easily
- knowing what the new value is, but this can be useful in cases
- where a notification is needed that "this value
- changed".</span>
- </p>
- </description>
- <name>valueChangeListener</name>
- <required>false</required>
- <method-signature>void
- valueChange(javax.faces.event.ValueChangeEvent)
- </method-signature>
- </attribute>
- <attribute>
- <description>
- Access key that, when pressed, transfers focus
- to this element.
- </description>
- <name>accesskey</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Alternate textual description of the
- element rendered by this component.
- </description>
- <name>alt</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- If the value of this attribute is "off", render "off" as the
- value
- of the attribute. This indicates that the browser should
- disable its autocomplete feature for this component. This is
- useful for components that perform autocompletion and do not
- want the browser interfering. If this attribute is not set or
- the value
- is "on", render nothing.
- </description>
- <name>autocomplete</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Direction indication for text that does not inherit
- directionality.
- Valid values are "LTR" (left-to-right) and "RTL"
- (right-to-left).
- </description>
- <name>dir</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Flag indicating that this element must never receive focus or
- be included in a subsequent submit. A value of false causes
- no attribute to be rendered, while a value of true causes the
- attribute to be rendered as disabled="disabled".
- </description>
- <name>disabled</name>
- <required>false</required>
- <type>boolean</type>
- </attribute>
- <attribute>
- <description>
- A localized user presentable name for this component.
- </description>
- <name>label</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Code describing the language used in the generated markup
- for this component.
- </description>
- <name>lang</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- The maximum number of characters that may
- be entered in this field.
- </description>
- <name>maxlength</name>
- <required>false</required>
- <type>int</type>
- </attribute>
- <attribute>
- <description>
- Javascript code executed when this element loses focus.
- </description>
- <name>onblur</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Javascript code executed when this element loses focus
- and its value has been modified since gaining focus.
- </description>
- <name>onchange</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Javascript code executed when a pointer button is
- clicked over this element.
- </description>
- <name>onclick</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Javascript code executed when a pointer button is
- double clicked over this element.
- </description>
- <name>ondblclick</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Javascript code executed when this element receives focus.
- </description>
- <name>onfocus</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Javascript code executed when a key is
- pressed down over this element.
- </description>
- <name>onkeydown</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Javascript code executed when a key is
- pressed and released over this element.
- </description>
- <name>onkeypress</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Javascript code executed when a key is
- released over this element.
- </description>
- <name>onkeyup</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Javascript code executed when a pointer button is
- pressed down over this element.
- </description>
- <name>onmousedown</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Javascript code executed when a pointer button is
- moved within this element.
- </description>
- <name>onmousemove</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Javascript code executed when a pointer button is
- moved away from this element.
- </description>
- <name>onmouseout</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Javascript code executed when a pointer button is
- moved onto this element.
- </description>
- <name>onmouseover</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Javascript code executed when a pointer button is
- released over this element.
- </description>
- <name>onmouseup</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Javascript code executed when text within this
- element is selected by the user.
- </description>
- <name>onselect</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Flag indicating that this component will prohibit changes by
- the user. The element may receive focus unless it has also
- been disabled. A value of false causes
- no attribute to be rendered, while a value of true causes the
- attribute to be rendered as readonly="readonly".
- </description>
- <name>readonly</name>
- <required>false</required>
- <type>boolean</type>
- </attribute>
- <attribute>
- <description>
- Flag indicating that any existing value
- in this field should be rendered when the
- form is created. Because this is a potential
- security risk, password values are not
- displayed by default.
- </description>
- <name>redisplay</name>
- <required>false</required>
- <type>boolean</type>
- </attribute>
- <attribute>
- <description>
- The number of characters used to determine
- the width of this field.
- </description>
- <name>size</name>
- <required>false</required>
- <type>int</type>
- </attribute>
- <attribute>
- <description>
- CSS style(s) to be applied when this component is rendered.
- </description>
- <name>style</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Space-separated list of CSS style class(es) to be applied when
- this element is rendered. This value must be passed through
- as the "class" attribute on generated markup.
- </description>
- <name>styleClass</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Position of this element in the tabbing order
- for the current document. This value must be
- an integer between 0 and 32767.
- </description>
- <name>tabindex</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Advisory title information about markup elements generated
- for this component.
- </description>
- <name>title</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- The ValueExpression linking this component to a property in a
- backing bean
- </description>
- <name>binding</name>
- <required>false</required>
- <type>javax.faces.component.UIComponent</type>
- </attribute>
- </tag>
- <tag>
- <description>
- <p>Renders an HTML "input"
- element of "type" "text".</p>
- <p><a name="decode">Decode Behavior</a></p>
- <ul>
- <p>Obtain the <code>Map</code> from the
- "requestParameterMap"
- property of the <code>ExternalContext</code>. If the
- <code>Map</code> contains an entry for the "clientId" of
- the
- component, pass the value of the entry to the
- <code>setSubmittedValue()</code> method of the
- component, which
- must be an instance of <code>EditableValueHolder</code>.</p>
- </ul>
- <p>Encode Behavior</p>
- <ul>
- <p> Render the clientId of the component as
- the value of the "name" attribute. Render the current value of
- the component as the value of the "value" attribute. If the
- "styleClass" attribute is specified, render its value as the value
- of the "class" attribute.
- </p>
- </ul>
- </description>
- <tag-name>inputText</tag-name>
- <component>
- <component-type>javax.faces.HtmlInputText</component-type>
- <renderer-type>javax.faces.Text</renderer-type>
- </component>
- <attribute>
- <description>
- Converter instance registered with this component.
- </description>
- <name>converter</name>
- <required>false</required>
- <type>javax.faces.convert.Converter</type>
- </attribute>
- <attribute>
- <description>
- A ValueExpression enabled attribute that, if present, will be
- used as the text of the converter message, replacing any message
- that comes from the converter.
- </description>
- <name>converterMessage</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- The component identifier for this component. This value must be
- unique within the closest parent component that is a naming
- container.
- </description>
- <name>id</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Flag indicating that this component's value must be
- converted and validated immediately (that is, during
- Apply Request Values phase), rather than waiting
- until Process Validations phase.
- </description>
- <name>immediate</name>
- <required>false</required>
- <type>boolean</type>
- </attribute>
- <attribute>
- <description>
- Flag indicating whether or not this component should be rendered
- (during Render Response Phase), or processed on any subsequent
- form submit. The default value for this property is true.
- </description>
- <name>rendered</name>
- <required>false</required>
- <type>boolean</type>
- </attribute>
- <attribute>
- <description>
- Flag indicating that the user is required to provide a submitted
- value for this input component.
- </description>
- <name>required</name>
- <required>false</required>
- <type>boolean</type>
- </attribute>
- <attribute>
- <description>
- A ValueExpression enabled attribute that, if present, will be
- used as the text of the validation message for the "required"
- facility, if the "required" facility is used.
- </description>
- <name>requiredMessage</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- MethodExpression representing a validator method that will be
- called
- during Process Validations to perform correctness checks on the
- value of this component. The expression must evaluate to a
- public
- method that takes FacesContext, UIComponent, and Object
- parameters,
- with a return type of void.
- </description>
- <name>validator</name>
- <required>false</required>
- <method-signature>void validate(javax.faces.context.FacesContext,
- javax.faces.component.UIComponent, java.lang.Object)
- </method-signature>
- </attribute>
- <attribute>
- <description>
- A ValueExpression enabled attribute that, if present, will be
- used as the text of the validator message, replacing any
- message that comes from the validator.
- </description>
- <name>validatorMessage</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- The current value of this component.
- </description>
- <name>value</name>
- <required>false</required>
- <type>java.lang.Object</type>
- </attribute>
- <attribute>
- <description>
- <p>
- MethodExpression representing a value change listener method
- that will be notified when a new value has been set for this
- input component. The expression must evaluate to a public
- method that takes a <code>ValueChangeEvent</code>
- parameter,
- with a return type of void, <span class="changed_added_2_0">or
- to a public method that takes no arguments with a return type
- of void. In the latter case, the method has no way of easily
- knowing what the new value is, but this can be useful in cases
- where a notification is needed that "this value
- changed".</span>
- </p>
- </description>
- <name>valueChangeListener</name>
- <required>false</required>
- <method-signature>void
- valueChange(javax.faces.event.ValueChangeEvent)
- </method-signature>
- </attribute>
- <attribute>
- <description>
- Access key that, when pressed, transfers focus
- to this element.
- </description>
- <name>accesskey</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Alternate textual description of the
- element rendered by this component.
- </description>
- <name>alt</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- If the value of this attribute is "off", render "off" as the
- value
- of the attribute. This indicates that the browser should
- disable its autocomplete feature for this component. This is
- useful for components that perform autocompletion and do not
- want the browser interfering. If this attribute is not set or
- the value
- is "on", render nothing.
- </description>
- <name>autocomplete</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Direction indication for text that does not inherit
- directionality.
- Valid values are "LTR" (left-to-right) and "RTL"
- (right-to-left).
- </description>
- <name>dir</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Flag indicating that this element must never receive focus or
- be included in a subsequent submit. A value of false causes
- no attribute to be rendered, while a value of true causes the
- attribute to be rendered as disabled="disabled".
- </description>
- <name>disabled</name>
- <required>false</required>
- <type>boolean</type>
- </attribute>
- <attribute>
- <description>
- A localized user presentable name for this component.
- </description>
- <name>label</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Code describing the language used in the generated markup
- for this component.
- </description>
- <name>lang</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- The maximum number of characters that may
- be entered in this field.
- </description>
- <name>maxlength</name>
- <required>false</required>
- <type>int</type>
- </attribute>
- <attribute>
- <description>
- Javascript code executed when this element loses focus.
- </description>
- <name>onblur</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Javascript code executed when this element loses focus
- and its value has been modified since gaining focus.
- </description>
- <name>onchange</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Javascript code executed when a pointer button is
- clicked over this element.
- </description>
- <name>onclick</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Javascript code executed when a pointer button is
- double clicked over this element.
- </description>
- <name>ondblclick</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Javascript code executed when this element receives focus.
- </description>
- <name>onfocus</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Javascript code executed when a key is
- pressed down over this element.
- </description>
- <name>onkeydown</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Javascript code executed when a key is
- pressed and released over this element.
- </description>
- <name>onkeypress</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Javascript code executed when a key is
- released over this element.
- </description>
- <name>onkeyup</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Javascript code executed when a pointer button is
- pressed down over this element.
- </description>
- <name>onmousedown</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Javascript code executed when a pointer button is
- moved within this element.
- </description>
- <name>onmousemove</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Javascript code executed when a pointer button is
- moved away from this element.
- </description>
- <name>onmouseout</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Javascript code executed when a pointer button is
- moved onto this element.
- </description>
- <name>onmouseover</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Javascript code executed when a pointer button is
- released over this element.
- </description>
- <name>onmouseup</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Javascript code executed when text within this
- element is selected by the user.
- </description>
- <name>onselect</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Flag indicating that this component will prohibit changes by
- the user. The element may receive focus unless it has also
- been disabled. A value of false causes
- no attribute to be rendered, while a value of true causes the
- attribute to be rendered as readonly="readonly".
- </description>
- <name>readonly</name>
- <required>false</required>
- <type>boolean</type>
- </attribute>
- <attribute>
- <description>
- The number of characters used to determine
- the width of this field.
- </description>
- <name>size</name>
- <required>false</required>
- <type>int</type>
- </attribute>
- <attribute>
- <description>
- CSS style(s) to be applied when this component is rendered.
- </description>
- <name>style</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Space-separated list of CSS style class(es) to be applied when
- this element is rendered. This value must be passed through
- as the "class" attribute on generated markup.
- </description>
- <name>styleClass</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Position of this element in the tabbing order
- for the current document. This value must be
- an integer between 0 and 32767.
- </description>
- <name>tabindex</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Advisory title information about markup elements generated
- for this component.
- </description>
- <name>title</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- The ValueExpression linking this component to a property in a
- backing bean
- </description>
- <name>binding</name>
- <required>false</required>
- <type>javax.faces.component.UIComponent</type>
- </attribute>
- </tag>
- <tag>
- <description>
- <p>Renders an HTML "textarea" element.</p>
- <p>Decode Behavior</p>
- <ul>
- <p>See the encode description for the <a
- href="javax.faces.Inputjavax.faces.Text.html#encode">Input
- Text</a> renderer.</p>
- </ul>
- <p>Encode Behavior</p>
- <ul>
- <p> Render the
- clientId as the value of the "name" attribute. Render the current
- valu eof the component inside the "textarea"
- element.</p> </ul>
- </description>
- <tag-name>inputTextarea</tag-name>
- <component>
- <component-type>javax.faces.HtmlInputTextarea</component-type>
- <renderer-type>javax.faces.Textarea</renderer-type>
- </component>
- <attribute>
- <description>
- Converter instance registered with this component.
- </description>
- <name>converter</name>
- <required>false</required>
- <type>javax.faces.convert.Converter</type>
- </attribute>
- <attribute>
- <description>
- A ValueExpression enabled attribute that, if present, will be
- used as the text of the converter message, replacing any message
- that comes from the converter.
- </description>
- <name>converterMessage</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- The component identifier for this component. This value must be
- unique within the closest parent component that is a naming
- container.
- </description>
- <name>id</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Flag indicating that this component's value must be
- converted and validated immediately (that is, during
- Apply Request Values phase), rather than waiting
- until Process Validations phase.
- </description>
- <name>immediate</name>
- <required>false</required>
- <type>boolean</type>
- </attribute>
- <attribute>
- <description>
- Flag indicating whether or not this component should be rendered
- (during Render Response Phase), or processed on any subsequent
- form submit. The default value for this property is true.
- </description>
- <name>rendered</name>
- <required>false</required>
- <type>boolean</type>
- </attribute>
- <attribute>
- <description>
- Flag indicating that the user is required to provide a submitted
- value for this input component.
- </description>
- <name>required</name>
- <required>false</required>
- <type>boolean</type>
- </attribute>
- <attribute>
- <description>
- A ValueExpression enabled attribute that, if present, will be
- used as the text of the validation message for the "required"
- facility, if the "required" facility is used.
- </description>
- <name>requiredMessage</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- MethodExpression representing a validator method that will be
- called
- during Process Validations to perform correctness checks on the
- value of this component. The expression must evaluate to a
- public
- method that takes FacesContext, UIComponent, and Object
- parameters,
- with a return type of void.
- </description>
- <name>validator</name>
- <required>false</required>
- <method-signature>void validate(javax.faces.context.FacesContext,
- javax.faces.component.UIComponent, java.lang.Object)
- </method-signature>
- </attribute>
- <attribute>
- <description>
- A ValueExpression enabled attribute that, if present, will be
- used as the text of the validator message, replacing any
- message that comes from the validator.
- </description>
- <name>validatorMessage</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- The current value of this component.
- </description>
- <name>value</name>
- <required>false</required>
- <type>java.lang.Object</type>
- </attribute>
- <attribute>
- <description>
- <p>
- MethodExpression representing a value change listener method
- that will be notified when a new value has been set for this
- input component. The expression must evaluate to a public
- method that takes a <code>ValueChangeEvent</code>
- parameter,
- with a return type of void, <span class="changed_added_2_0">or
- to a public method that takes no arguments with a return type
- of void. In the latter case, the method has no way of easily
- knowing what the new value is, but this can be useful in cases
- where a notification is needed that "this value
- changed".</span>
- </p>
- </description>
- <name>valueChangeListener</name>
- <required>false</required>
- <method-signature>void
- valueChange(javax.faces.event.ValueChangeEvent)
- </method-signature>
- </attribute>
- <attribute>
- <description>
- Access key that, when pressed, transfers focus
- to this element.
- </description>
- <name>accesskey</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- The number of columns to be displayed.
- </description>
- <name>cols</name>
- <required>false</required>
- <type>int</type>
- </attribute>
- <attribute>
- <description>
- Direction indication for text that does not inherit
- directionality.
- Valid values are "LTR" (left-to-right) and "RTL"
- (right-to-left).
- </description>
- <name>dir</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Flag indicating that this element must never receive focus or
- be included in a subsequent submit. A value of false causes
- no attribute to be rendered, while a value of true causes the
- attribute to be rendered as disabled="disabled".
- </description>
- <name>disabled</name>
- <required>false</required>
- <type>boolean</type>
- </attribute>
- <attribute>
- <description>
- A localized user presentable name for this component.
- </description>
- <name>label</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Code describing the language used in the generated markup
- for this component.
- </description>
- <name>lang</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Javascript code executed when this element loses focus.
- </description>
- <name>onblur</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Javascript code executed when this element loses focus
- and its value has been modified since gaining focus.
- </description>
- <name>onchange</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Javascript code executed when a pointer button is
- clicked over this element.
- </description>
- <name>onclick</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Javascript code executed when a pointer button is
- double clicked over this element.
- </description>
- <name>ondblclick</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Javascript code executed when this element receives focus.
- </description>
- <name>onfocus</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Javascript code executed when a key is
- pressed down over this element.
- </description>
- <name>onkeydown</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Javascript code executed when a key is
- pressed and released over this element.
- </description>
- <name>onkeypress</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Javascript code executed when a key is
- released over this element.
- </description>
- <name>onkeyup</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Javascript code executed when a pointer button is
- pressed down over this element.
- </description>
- <name>onmousedown</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Javascript code executed when a pointer button is
- moved within this element.
- </description>
- <name>onmousemove</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Javascript code executed when a pointer button is
- moved away from this element.
- </description>
- <name>onmouseout</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Javascript code executed when a pointer button is
- moved onto this element.
- </description>
- <name>onmouseover</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Javascript code executed when a pointer button is
- released over this element.
- </description>
- <name>onmouseup</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Javascript code executed when text within this
- element is selected by the user.
- </description>
- <name>onselect</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Flag indicating that this component will prohibit changes by
- the user. The element may receive focus unless it has also
- been disabled. A value of false causes
- no attribute to be rendered, while a value of true causes the
- attribute to be rendered as readonly="readonly".
- </description>
- <name>readonly</name>
- <required>false</required>
- <type>boolean</type>
- </attribute>
- <attribute>
- <description>
- The number of rows to be displayed.
- </description>
- <name>rows</name>
- <required>false</required>
- <type>int</type>
- </attribute>
- <attribute>
- <description>
- CSS style(s) to be applied when this component is rendered.
- </description>
- <name>style</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Space-separated list of CSS style class(es) to be applied when
- this element is rendered. This value must be passed through
- as the "class" attribute on generated markup.
- </description>
- <name>styleClass</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Position of this element in the tabbing order
- for the current document. This value must be
- an integer between 0 and 32767.
- </description>
- <name>tabindex</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Advisory title information about markup elements generated
- for this component.
- </description>
- <name>title</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- The ValueExpression linking this component to a property in a
- backing bean
- </description>
- <name>binding</name>
- <required>false</required>
- <type>javax.faces.component.UIComponent</type>
- </attribute>
- </tag>
- <tag>
- <description>
- <p>Render a single message for a specific component.</p>
- <p>Set-up for Rendering</p>
- <ul>
- <p>Obtain the "summary" and "detail" properties from
- <code>UIMessage</code> component. If not present, keep
- the
- empty string as the value, respectively. Obtain the first
- <code>FacesMessage</code> to render from the component,
- using
- the "for" property of the <code>UIMessage</code>. This
- will be
- the only message we render. Obtain the severity style for this
- message. If the severity of the message is
- <code>FacesMessage.SEVERITY_INFO</code>, the severity
- style
- comes from the value of the "infoStyle" attribute. If the
- severity of the message is
- <code>FacesMessage.SEVERITY_WARN</code>, the severity
- style
- comes from the value of the "warnStyle" attribute, and so on for
- each of the severities, <code>INFO, WARN, ERROR</code>
- and
- <code>FATAL</code>. The same rules apply for obtaining
- the
- severity style class, but instead of "infoStyle, warnStyle", etc
- use "infoClass, warnClass", etc. Obtain the "style",
- "styleClass" and "layout" attributes from the
- <code>UIMessage</code> component. If we have a "style"
- attribute and a severity style attribute, use the severity style
- attribute as the value of the "style" attribute. If we have no
- "style" attribute, but do have a severity style, use the
- severity style as the value of the "style" attribute. The same
- precedence rules apply for the style class. Obtain the value of
- the <code>dir</code> and <code>lang</code>
- attributes.</p>
- </ul>
- <p>Rendering</p>
- <ul>
- <p>For the message renderer, we only render one row, for the
- first
- message. For the messages renderer, we render as many rows as we
- have messages. If any of the "dir", "lang", "style" or
- "styleClass" attributes has a non-null value (as determined
- above), render a "span" element, outputting the value of the
- "style" attribute as the the value of the "style" attribute, and
- outputting the value of the "styleClass" attribute as the value of
- the "class" attribute on the "span" element. Output the "dir" and
- "lang" attributes as well, if they are present. If the
- <code>UIMessage</code> has a "tooltip" attribute with
- the value of
- "true", and the <code>UIMessage</code> has "showSummary"
- and
- "showDetail" properties with the value "true", if we haven't
- already written out the "span", output the "summary" as the value
- of the "title" attribute on the "span". If we haven't already
- written out a "title" attribute, and "showSummary" is true, output
- the summary. If "showDetail" is true, output the detail. Close
- out the span if necessary.</p>
- </ul>
- </description>
- <tag-name>message</tag-name>
- <component>
- <component-type>javax.faces.HtmlMessage</component-type>
- <renderer-type>javax.faces.Message</renderer-type>
- </component>
- <attribute>
- <description>
- Client identifier of the component for which to display
- messages.
- </description>
- <name>for</name>
- <required>true</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- The component identifier for this component. This value must be
- unique within the closest parent component that is a naming
- container.
- </description>
- <name>id</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Flag indicating whether or not this component should be rendered
- (during Render Response Phase), or processed on any subsequent
- form submit. The default value for this property is true.
- </description>
- <name>rendered</name>
- <required>false</required>
- <type>boolean</type>
- </attribute>
- <attribute>
- <description>
- Flag indicating whether the detail portion of displayed messages
- should be included. Default value is "true".
- </description>
- <name>showDetail</name>
- <required>false</required>
- <type>boolean</type>
- </attribute>
- <attribute>
- <description>
- Flag indicating whether the summary portion of displayed
- messages
- should be included. Default value is "false".
- </description>
- <name>showSummary</name>
- <required>false</required>
- <type>boolean</type>
- </attribute>
- <attribute>
- <description>
- Direction indication for text that does not inherit
- directionality.
- Valid values are "LTR" (left-to-right) and "RTL"
- (right-to-left).
- </description>
- <name>dir</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- CSS style class to apply to any message
- with a severity class of "ERROR".
- </description>
- <name>errorClass</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- CSS style(s) to apply to any message
- with a severity class of "ERROR".
- </description>
- <name>errorStyle</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- CSS style class to apply to any message
- with a severity class of "FATAL".
- </description>
- <name>fatalClass</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- CSS style(s) to apply to any message
- with a severity class of "FATAL".
- </description>
- <name>fatalStyle</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- CSS style class to apply to any message
- with a severity class of "INFO".
- </description>
- <name>infoClass</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- CSS style(s) to apply to any message
- with a severity class of "INFO".
- </description>
- <name>infoStyle</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Code describing the language used in the generated markup
- for this component.
- </description>
- <name>lang</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- CSS style(s) to be applied when this component is rendered.
- </description>
- <name>style</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Space-separated list of CSS style class(es) to be applied when
- this element is rendered. This value must be passed through
- as the "class" attribute on generated markup.
- </description>
- <name>styleClass</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Advisory title information about markup elements generated
- for this component.
- </description>
- <name>title</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Flag indicating whether the detail portion of the
- message should be displayed as a tooltip.
- </description>
- <name>tooltip</name>
- <required>false</required>
- <type>boolean</type>
- </attribute>
- <attribute>
- <description>
- CSS style class to apply to any message
- with a severity class of "WARN".
- </description>
- <name>warnClass</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- CSS style(s) to apply to any message
- with a severity class of "WARN".
- </description>
- <name>warnStyle</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- The ValueExpression linking this component to a property in a
- backing bean
- </description>
- <name>binding</name>
- <required>false</required>
- <type>javax.faces.component.UIComponent</type>
- </attribute>
- </tag>
- <tag>
- <description>
- <p><span class="changed_modified_2_0">The</span>
- same as for the
- Message renderer, but output all the messages. <span
- class="changed_added_2_0">If an "id" attribute has been
- specified,
- it must be rendered on the outermost markup corresponding to this
- component.</span> If the value of the "layout" attribute is
- "table", render nested "table", "tr", and "td" elements, in that
- order. If the value of the "layout" attribute is "list", or the
- "layout" attribute is not specified, render nested "ul", "li"
- elements, in that order. Output the value of the "style" attribute
- as the value of the "style" attribute, output the value of the
- "styleClass" attribute as the value of the "class" attribute, and
- output the dir and lang attributes. Output these values on the
- "table" element or the "ul" element. Output the values of the
- "errorStyle", "fatalStyle", "infoStyle", "warnStyle" attributes as
- the value of the "style" attribute on either the "tr" element or
- the "li" element. Output the values of the "errorClass",
- "fatalClass", "infoClass", "warnClass" attributes as the value of
- the "class" attribute on either the "tr" element or the "li"
- element. The component is a <code>UIMessages</code>, and
- there is
- no "for" attribute. Therefore, use either <code>null</code>
- to
- obtain the messages from the <code>FacesContext</code>
- or the empty
- string if the components "globalOnly" property is
- <code>true</code>. If the layout was "table" close out
- the table
- elements, otherwise, close out the list elements.</p>
- </description>
- <tag-name>messages</tag-name>
- <component>
- <component-type>javax.faces.HtmlMessages</component-type>
- <renderer-type>javax.faces.Messages</renderer-type>
- </component>
- <attribute>
- <description>
- Client identifier of the component for which to display
- messages. This
- attribute is mutually exclusive with globalOnly and take
- precedence
- if used.
- </description>
- <name>for</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Flag indicating that only global messages (that is, messages not
- associated with any client identifier) are to be displayed.
- Default value is "false".
- </description>
- <name>globalOnly</name>
- <required>false</required>
- <type>boolean</type>
- </attribute>
- <attribute>
- <description>
- The component identifier for this component. This value must be
- unique within the closest parent component that is a naming
- container.
- </description>
- <name>id</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Flag indicating whether or not this component should be rendered
- (during Render Response Phase), or processed on any subsequent
- form submit. The default value for this property is true.
- </description>
- <name>rendered</name>
- <required>false</required>
- <type>boolean</type>
- </attribute>
- <attribute>
- <description>
- Flag indicating whether the detail portion of displayed messages
- should be included. Default value is "false".
- </description>
- <name>showDetail</name>
- <required>false</required>
- <type>boolean</type>
- </attribute>
- <attribute>
- <description>
- Flag indicating whether the summary portion of displayed
- messages
- should be included. Default value is "true".
- </description>
- <name>showSummary</name>
- <required>false</required>
- <type>boolean</type>
- </attribute>
- <attribute>
- <description>
- Direction indication for text that does not inherit
- directionality.
- Valid values are "LTR" (left-to-right) and "RTL"
- (right-to-left).
- </description>
- <name>dir</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- CSS style class to apply to any message
- with a severity class of "ERROR".
- </description>
- <name>errorClass</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- CSS style(s) to apply to any message
- with a severity class of "ERROR".
- </description>
- <name>errorStyle</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- CSS style class to apply to any message
- with a severity class of "FATAL".
- </description>
- <name>fatalClass</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- CSS style(s) to apply to any message
- with a severity class of "FATAL".
- </description>
- <name>fatalStyle</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- CSS style class to apply to any message
- with a severity class of "INFO".
- </description>
- <name>infoClass</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- CSS style(s) to apply to any message
- with a severity class of "INFO".
- </description>
- <name>infoStyle</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Code describing the language used in the generated markup
- for this component.
- </description>
- <name>lang</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- The type of layout markup to use when rendering
- error messages. Valid values are "table" (an HTML
- table) and "list" (an HTML list). If not specified,
- the default value is "list".
- </description>
- <name>layout</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- CSS style(s) to be applied when this component is rendered.
- </description>
- <name>style</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Space-separated list of CSS style class(es) to be applied when
- this element is rendered. This value must be passed through
- as the "class" attribute on generated markup.
- </description>
- <name>styleClass</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Advisory title information about markup elements generated
- for this component.
- </description>
- <name>title</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Flag indicating whether the detail portion of the
- message should be displayed as a tooltip.
- </description>
- <name>tooltip</name>
- <required>false</required>
- <type>boolean</type>
- </attribute>
- <attribute>
- <description>
- CSS style class to apply to any message
- with a severity class of "WARN".
- </description>
- <name>warnClass</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- CSS style(s) to apply to any message
- with a severity class of "WARN".
- </description>
- <name>warnStyle</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- The ValueExpression linking this component to a property in a
- backing bean
- </description>
- <name>binding</name>
- <required>false</required>
- <type>javax.faces.component.UIComponent</type>
- </attribute>
- </tag>
- <tag>
- <description>
- <p>Render parameterized text. Obtain the
- <code>style</code>, <code>styleClass</code>,
- <code>dir</code>, and
- <code>lang</code> attributees from this component. If
- any are
- present, render a "span" element. Output the
- <code>styleClass</code> attribute (if present) as the
- value of the
- <code>class</code> attribute. Output the <code>style</code>
- attribute as the value of the <code>style</code>
- attribute.
- Output the <code>dir</code> and <code>lang</code>
- attributes as
- pass through attributes. Accrue a list of the values of all child
- <code>UIParameter</code> components of this component.
- If there
- are one or more accumulated parameter values, convert the list of
- parameter values to an <code>Object</code> array, call
- <code>MessageFormat.format()</code>, passing the
- <code>value</code> of this component as the first
- argument, and
- the array of parameter values as the second argument, and render
- the result. Otherwise, render the <code>value</code> of
- this
- component unmodified.</p>
- </description>
- <tag-name>outputFormat</tag-name>
- <component>
- <component-type>javax.faces.HtmlOutputFormat</component-type>
- <renderer-type>javax.faces.Format</renderer-type>
- </component>
- <attribute>
- <description>
- Converter instance registered with this component.
- </description>
- <name>converter</name>
- <required>false</required>
- <type>javax.faces.convert.Converter</type>
- </attribute>
- <attribute>
- <description>
- The component identifier for this component. This value must be
- unique within the closest parent component that is a naming
- container.
- </description>
- <name>id</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Flag indicating whether or not this component should be rendered
- (during Render Response Phase), or processed on any subsequent
- form submit. The default value for this property is true.
- </description>
- <name>rendered</name>
- <required>false</required>
- <type>boolean</type>
- </attribute>
- <attribute>
- <description>
- The current value of this component.
- </description>
- <name>value</name>
- <required>false</required>
- <type>java.lang.Object</type>
- </attribute>
- <attribute>
- <description>
- Direction indication for text that does not inherit
- directionality.
- Valid values are "LTR" (left-to-right) and "RTL"
- (right-to-left).
- </description>
- <name>dir</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Flag indicating that characters that are sensitive
- in HTML and XML markup must be escaped. This flag
- is set to "true" by default.
- </description>
- <name>escape</name>
- <required>false</required>
- <type>boolean</type>
- </attribute>
- <attribute>
- <description>
- Code describing the language used in the generated markup
- for this component.
- </description>
- <name>lang</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- CSS style(s) to be applied when this component is rendered.
- </description>
- <name>style</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Space-separated list of CSS style class(es) to be applied when
- this element is rendered. This value must be passed through
- as the "class" attribute on generated markup.
- </description>
- <name>styleClass</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Advisory title information about markup elements generated
- for this component.
- </description>
- <name>title</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- The ValueExpression linking this component to a property in a
- backing bean
- </description>
- <name>binding</name>
- <required>false</required>
- <type>javax.faces.component.UIComponent</type>
- </attribute>
- </tag>
- <tag>
- <description>
- Renders an HTML "label" element. Render the current value
- of the component as label text if it is specified. If a "for"
- attribute is
- specified, find the component specified by the value of the "for"
- attribute, and render its client id as the value of the "for"
- attribute.
- If "styleClass" attribute is specified, render its value as the
- value
- of the "class" attribute.
- </description>
- <tag-name>outputLabel</tag-name>
- <component>
- <component-type>javax.faces.HtmlOutputLabel</component-type>
- <renderer-type>javax.faces.Label</renderer-type>
- </component>
- <attribute>
- <description>
- Converter instance registered with this component.
- </description>
- <name>converter</name>
- <required>false</required>
- <type>javax.faces.convert.Converter</type>
- </attribute>
- <attribute>
- <description>
- The component identifier for this component. This value must be
- unique within the closest parent component that is a naming
- container.
- </description>
- <name>id</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Flag indicating whether or not this component should be rendered
- (during Render Response Phase), or processed on any subsequent
- form submit. The default value for this property is true.
- </description>
- <name>rendered</name>
- <required>false</required>
- <type>boolean</type>
- </attribute>
- <attribute>
- <description>
- The current value of this component.
- </description>
- <name>value</name>
- <required>false</required>
- <type>java.lang.Object</type>
- </attribute>
- <attribute>
- <description>
- Access key that, when pressed, transfers focus
- to this element.
- </description>
- <name>accesskey</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Direction indication for text that does not inherit
- directionality.
- Valid values are "LTR" (left-to-right) and "RTL"
- (right-to-left).
- </description>
- <name>dir</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Flag indicating that characters that are sensitive
- in HTML and XML markup must be escaped. If omitted, this
- flag is assumed to be "true".
- </description>
- <name>escape</name>
- <required>false</required>
- <type>boolean</type>
- </attribute>
- <attribute>
- <description>
- Client identifier of the component for which this element
- is a label.
- </description>
- <name>for</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Code describing the language used in the generated markup
- for this component.
- </description>
- <name>lang</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Javascript code executed when this element loses focus.
- </description>
- <name>onblur</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Javascript code executed when a pointer button is
- clicked over this element.
- </description>
- <name>onclick</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Javascript code executed when a pointer button is
- double clicked over this element.
- </description>
- <name>ondblclick</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Javascript code executed when this element receives focus.
- </description>
- <name>onfocus</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Javascript code executed when a key is
- pressed down over this element.
- </description>
- <name>onkeydown</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Javascript code executed when a key is
- pressed and released over this element.
- </description>
- <name>onkeypress</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Javascript code executed when a key is
- released over this element.
- </description>
- <name>onkeyup</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Javascript code executed when a pointer button is
- pressed down over this element.
- </description>
- <name>onmousedown</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Javascript code executed when a pointer button is
- moved within this element.
- </description>
- <name>onmousemove</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Javascript code executed when a pointer button is
- moved away from this element.
- </description>
- <name>onmouseout</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Javascript code executed when a pointer button is
- moved onto this element.
- </description>
- <name>onmouseover</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Javascript code executed when a pointer button is
- released over this element.
- </description>
- <name>onmouseup</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- CSS style(s) to be applied when this component is rendered.
- </description>
- <name>style</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Space-separated list of CSS style class(es) to be applied when
- this element is rendered. This value must be passed through
- as the "class" attribute on generated markup.
- </description>
- <name>styleClass</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Position of this element in the tabbing order
- for the current document. This value must be
- an integer between 0 and 32767.
- </description>
- <name>tabindex</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Advisory title information about markup elements generated
- for this component.
- </description>
- <name>title</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- The ValueExpression linking this component to a property in a
- backing bean
- </description>
- <name>binding</name>
- <required>false</required>
- <type>javax.faces.component.UIComponent</type>
- </attribute>
- </tag>
- <tag>
- <description>
- Render an HTML "a" anchor element. The value of the
- component is rendered as the value of the "href" attribute. Any
- child UIParameter components are appended to the String to be
- output as the value of the "href" attribute as query parameters
- before rendering. The entire "href" string must be passed through
- a call to the <code>encodeResourceURL()</code> method of
- the
- <code>ExternalContext</code>. The name of the
- UIParameter goes on
- the left hand side, and the value of the UIParameter on the right
- hand side. The name and the value must be URLEncoded. Each
- UIParameter instance is separeted by an ampersand, as dictated in
- the URL spec. If the "styleClass" attribute is specified, render
- its value as the value of the "class" attribute. If the "id"
- attribute
- is specified, follow the same steps as mentioned in the
- "<a
- href="../../../renderkitdocs/HTML_BASIC/renderkit-summary.html#general_encoding">General
- Notes on Encoding</a>" regarding the "id" attribute for
- UIInput components.
- If the "disabled" attribute is specified, do not render the HTML "a"
- anchor element or the "href" element. Instead, render a "span"
- element.
- If the "styleClass" attribute is specified, render its value as the
- value
- of the "class" attribute on the "span". Render any pass-through
- attributes
- on the "span".
- </description>
- <tag-name>outputLink</tag-name>
- <component>
- <component-type>javax.faces.HtmlOutputLink</component-type>
- <renderer-type>javax.faces.Link</renderer-type>
- </component>
- <attribute>
- <description>
- Converter instance registered with this component.
- </description>
- <name>converter</name>
- <required>false</required>
- <type>javax.faces.convert.Converter</type>
- </attribute>
- <attribute>
- <description>
- The component identifier for this component. This value must be
- unique within the closest parent component that is a naming
- container.
- </description>
- <name>id</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Flag indicating whether or not this component should be rendered
- (during Render Response Phase), or processed on any subsequent
- form submit. The default value for this property is true.
- </description>
- <name>rendered</name>
- <required>false</required>
- <type>boolean</type>
- </attribute>
- <attribute>
- <description>
- The current value of this component.
- </description>
- <name>value</name>
- <required>false</required>
- <type>java.lang.Object</type>
- </attribute>
- <attribute>
- <description>
- Access key that, when pressed, transfers focus
- to this element.
- </description>
- <name>accesskey</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- The character encoding of the resource designated
- by this hyperlink.
- </description>
- <name>charset</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- The position and shape of the hot spot on the screen
- (for use in client-side image maps).
- </description>
- <name>coords</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Direction indication for text that does not inherit
- directionality.
- Valid values are "LTR" (left-to-right) and "RTL"
- (right-to-left).
- </description>
- <name>dir</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Flag indicating that this element must never
- receive focus or be included in a subsequent
- submit.
- </description>
- <name>disabled</name>
- <required>false</required>
- <type>boolean</type>
- </attribute>
- <attribute>
- <description>
- The language code of the resource designated
- by this hyperlink.
- </description>
- <name>hreflang</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Code describing the language used in the generated markup
- for this component.
- </description>
- <name>lang</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Javascript code executed when this element loses focus.
- </description>
- <name>onblur</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Javascript code executed when a pointer button is
- clicked over this element.
- </description>
- <name>onclick</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Javascript code executed when a pointer button is
- double clicked over this element.
- </description>
- <name>ondblclick</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Javascript code executed when this element receives focus.
- </description>
- <name>onfocus</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Javascript code executed when a key is
- pressed down over this element.
- </description>
- <name>onkeydown</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Javascript code executed when a key is
- pressed and released over this element.
- </description>
- <name>onkeypress</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Javascript code executed when a key is
- released over this element.
- </description>
- <name>onkeyup</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Javascript code executed when a pointer button is
- pressed down over this element.
- </description>
- <name>onmousedown</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Javascript code executed when a pointer button is
- moved within this element.
- </description>
- <name>onmousemove</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Javascript code executed when a pointer button is
- moved away from this element.
- </description>
- <name>onmouseout</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Javascript code executed when a pointer button is
- moved onto this element.
- </description>
- <name>onmouseover</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Javascript code executed when a pointer button is
- released over this element.
- </description>
- <name>onmouseup</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- The relationship from the current document
- to the anchor specified by this hyperlink.
- The value of this attribute is a space-separated
- list of link types.
- </description>
- <name>rel</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- A reverse link from the anchor specified
- by this hyperlink to the current document.
- The value of this attribute is a space-separated
- list of link types.
- </description>
- <name>rev</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- The shape of the hot spot on the screen
- (for use in client-side image maps). Valid
- values are: default (entire region); rect
- (rectangular region); circle (circular region);
- and poly (polygonal region).
- </description>
- <name>shape</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- CSS style(s) to be applied when this component is rendered.
- </description>
- <name>style</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Space-separated list of CSS style class(es) to be applied when
- this element is rendered. This value must be passed through
- as the "class" attribute on generated markup.
- </description>
- <name>styleClass</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Position of this element in the tabbing order
- for the current document. This value must be
- an integer between 0 and 32767.
- </description>
- <name>tabindex</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Name of a frame where the resource
- retrieved via this hyperlink is to
- be displayed.
- </description>
- <name>target</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Advisory title information about markup elements generated
- for this component.
- </description>
- <name>title</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- The content type of the resource designated
- by this hyperlink.
- </description>
- <name>type</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- The ValueExpression linking this component to a property in a
- backing bean
- </description>
- <name>binding</name>
- <required>false</required>
- <type>javax.faces.component.UIComponent</type>
- </attribute>
- </tag>
- <tag>
- <description>
- If the "styleClass", "style", "dir" or "lang"
- attributes are present, render a "span" element. If the
- "styleClass" attribute is present, render its value as the value
- of the "class" attribute. If the "style" attribute is present,
- pass it thru. If the "escape" attribute is not present, or it is
- present and its value is "true" all angle brackets should be
- converted to the ampersand xx semicolon syntax when rendering the
- value of the "value" attribute as the value of the component. If
- the "escape" attribute is present and is "false" the value of the
- component should be rendered as text without escaping.
- </description>
- <tag-name>outputText</tag-name>
- <component>
- <component-type>javax.faces.HtmlOutputText</component-type>
- <renderer-type>javax.faces.Text</renderer-type>
- </component>
- <attribute>
- <description>
- Converter instance registered with this component.
- </description>
- <name>converter</name>
- <required>false</required>
- <type>javax.faces.convert.Converter</type>
- </attribute>
- <attribute>
- <description>
- The component identifier for this component. This value must be
- unique within the closest parent component that is a naming
- container.
- </description>
- <name>id</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Flag indicating whether or not this component should be rendered
- (during Render Response Phase), or processed on any subsequent
- form submit. The default value for this property is true.
- </description>
- <name>rendered</name>
- <required>false</required>
- <type>boolean</type>
- </attribute>
- <attribute>
- <description>
- The current value of this component.
- </description>
- <name>value</name>
- <required>false</required>
- <type>java.lang.Object</type>
- </attribute>
- <attribute>
- <description>
- Direction indication for text that does not inherit
- directionality.
- Valid values are "LTR" (left-to-right) and "RTL"
- (right-to-left).
- </description>
- <name>dir</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Flag indicating that characters that are sensitive
- in HTML and XML markup must be escaped. This flag
- is set to "true" by default.
- </description>
- <name>escape</name>
- <required>false</required>
- <type>boolean</type>
- </attribute>
- <attribute>
- <description>
- Code describing the language used in the generated markup
- for this component.
- </description>
- <name>lang</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- CSS style(s) to be applied when this component is rendered.
- </description>
- <name>style</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Space-separated list of CSS style class(es) to be applied when
- this element is rendered. This value must be passed through
- as the "class" attribute on generated markup.
- </description>
- <name>styleClass</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Advisory title information about markup elements generated
- for this component.
- </description>
- <name>title</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- The ValueExpression linking this component to a property in a
- backing bean
- </description>
- <name>binding</name>
- <required>false</required>
- <type>javax.faces.component.UIComponent</type>
- </attribute>
- </tag>
- <tag>
- <description>
- <![CDATA[<div class="changed_added_2_0">
-
- <p>Render the markup for a <code><script></code> element that
- renders the script <code>Resource</code> specified by the optional
- <code>name</code> attribute and <code>library</code> attributes.</p>
-
- <p>The implementation of this renderer must have a <a target="_"
- href="../../javadocs/javax/faces/event/ListenerFor.html"><code>@ListenerFor</code></a>
- annotation attached to it, at the class level, declaring <a target="_"
- href="../../javadocs/javax/faces/event/PostAddToViewEvent.html"><code>PostAddToViewEvent.class</code></a>
- as the value of the <code>systemEventClass</code> attribute. The presence of
- this annotation on a renderer implies the renderer implements <a
- target="_"
- href="../../javadocs/javax/faces/event/ComponentSystemEventListener.html"><code>ComponentSystemEventListener</code></a>,
- which this renderer must do. The implementation of
- <code>processEvent()</code> must extract the <code>UIComponent</code>
- from the argument event and look for the presence of the key
- "<code>target</code>" in the component's attribute <code>Map</code>. If
- and only if such a key is present, the implementation of
- <code>processEvent()</code> must pass the component to <a target="_"
- href="../../javadocs/javax/faces/component/UIViewRoot.html#addComponentResource(javax.faces.context.FacesContext,%20javax.faces.component.UIComponent)"><code>UIViewRoot.addComponentResource()</code></a>.</p>
-
- <p>Decode Behavior</p>
-
- <ul>
-
- <p>No action is required during decode for this renderer.</p>
-
- </ul>
-
- <p>Encode Behavior</p>
-
- <ul>
-
- <p><a name="ResourceCommonGetResource">Common Algorithm for Obtaining A Resource to Render</a></p>
-
- <ul>
-
- <p>This algorithm is used by all resource renderers to obtain
- a <code>Resource</code> instance which is then rendered in a
- specific way depending on what kind of renderer is doing the
- encoding.</p>
-
- <ul>
-
- <li><p>Look in the component attribute <code>Map</code> for a
- value under the key <em>name</em>.</p></li>
-
- <li><p>Look in the component attribute <code>Map</code> for a
- value under the key <em>library</em>. This attribute is
- optional, therefore, <em>library</em> may be
- <code>null</code>.</p></li>
-
- <li><p>Create the resource by calling
- <code>Application.getResourceHandler.createResource(<em>name</em>,
- <em>library</em>);</code>.</p></li>
-
- </p></li>
-
- </ul>
-
- </ul>
-
- <p><a name="ResourceCommonEncode">Common Encode Behavior</a></p>
-
- <ul>
-
- <p>This algorithm is used by all resource renderers to render the
- resource.</p>
-
- <p><code>encodeBegin()</code> must take no action.</p>
-
- <p>Because this renderer returns <code>true</code> from
- <code>getRendersChildren()</code>, the <code>encodeChildren()
- method must take the following action.</code></p>
-
- <ul>
-
- <li><p>If there is no <em>name</em> attribute, and the
- argument <code>component</code> has no children, and
- <code>ProjectStage</code> is not
- <code>ProjectStage.Production</code>, add a
- <code>FacesMessage</code> for this component's clientId to the
- <code>FacesContext</code> stating that if no name attribute is
- present, and no body content is present either, then the user
- should take action to correct this problem. In this case,
- <code>encodeChildren()</code> must take no further
- action.</p></li>
-
- <li><p>If there is no <em>name</em> attribute and the argument
- <code>component</code> <b>does</b> have children, the renderer
- must ensure that those children are encoded as usual.</p></li>
-
- <li><p>If there <b>is</b> a <em>name</em> attribute and the
- argument <code>component</code> <b>does</b> have children, the
- renderer must log a descriptive localized message stating that
- the child content will be ignored. The resource referenced by
- the <em>name</em> attribute will be rendered in
- <code>encodeEnd()</code>.</p></li>
-
- <li><p>If there <b>is</b> a <em>name attribute</em> and the
- argument <code>component</code> <b>does not</b> have children,
- <code>encodeChildren()</code> must take no action.</p></li>
-
- </ul>
-
- <p><code>encodeEnd()</code> must take specific action based on
- the specific kind of resource being rendered.</p>
-
- </ul>
-
- <p>Use the algorithm <em>Common Encode Behavior</em> for
- <code>encodeBegin()</code>, <code>encodeChildren()</code> and
- <code>getRendersChildren()</code>.</p>
-
- <p>For <code>encodeEnd()</code>, use the algorithm <em>Common
- Algorithm for Obtaining A Resource to Render</em> above to
- obtain a reference to the <code>Resource</code> to be
- encoded.</p>
-
- <p>If this is NOT the first time this <code>Resource</code> has
- been referenced on this request take no action and return.</p>
-
- <p>Render a script element. Use the result from calling
- <code>resource.getRequestPath()</code> as the value of the "src"
- attribue and the result from calling
- <code>resource.getContentType()</code> as the value of the "type"
- attribute.</p>
-
- </p>
-
-
-
- </ul>
-
-
-
- </div>]]>
- </description>
- <tag-name>
- outputScript
- </tag-name>
- <component>
- <component-type>javax.faces.Output</component-type>
- <renderer-type>javax.faces.resource.Script</renderer-type>
- </component>
- <attribute>
- <description>
- <![CDATA[Converter instance registered with this component.]]>
- </description>
- <name>
- converter
- </name>
- <required>
- false
- </required>
- <type>
- javax.faces.convert.Converter
- </type>
- </attribute>
- <attribute>
- <description>
- <![CDATA[The component identifier for this component. This value must be
- unique within the closest parent component that is a naming
- container.]]>
- </description>
- <name>
- id
- </name>
- <required>
- false
- </required>
- <type>
- java.lang.String
- </type>
- </attribute>
- <attribute>
- <description>
- <![CDATA[Flag indicating whether or not this component should be rendered
- (during Render Response Phase), or processed on any subsequent
- form submit. The default value for this property is true.]]>
- </description>
- <name>
- rendered
- </name>
- <required>
- false
- </required>
- <type>
- boolean
- </type>
- </attribute>
- <attribute>
- <description>
- <![CDATA[The current value of this component.]]>
- </description>
- <name>
- value
- </name>
- <required>
- false
- </required>
- <type>
- java.lang.Object
- </type>
- </attribute>
- <attribute>
- <description>
- <![CDATA[<div class="changed_added_2_0"><p>The <em>libraryName</em> for this resource.</p></div>]]>
- </description>
- <name>
- library
- </name>
- <required>
- false
- </required>
- <type>
- java.lang.String
- </type>
- </attribute>
- <attribute>
- <description>
- <![CDATA[<div class="changed_added_2_0"><p>The <em>resourceName</em> for this resource.</p></div>]]>
- </description>
- <name>
- name
- </name>
- <required>
- false
- </required>
- <type>
- java.lang.String
- </type>
- </attribute>
- <attribute>
- <description>
- <![CDATA[<div class="changed_added_2_0"><p>The <em>target</em> area for which this resource will be rendered. For example, <em>target="head"</em> would cause the resource to be rendered within the <em>head</em> element.</p></div>]]>
- </description>
- <name>
- target
- </name>
- <required>
- false
- </required>
- <type>
- java.lang.String
- </type>
- </attribute>
- <attribute>
- <description>
- The ValueExpression linking this component to a property in a
- backing bean
- </description>
- <name>
- binding
- </name>
- <required>
- false
- </required>
- <type>
- javax.faces.component.UIComponent
- </type>
- </attribute>
- </tag>
- <tag>
- <description>
- <![CDATA[<div class="changed_added_2_0">
-
- <p>Render the markup for a <code><link></code> element that
- renders the style <code>Resource</code> specified by the optional
- <code>name</code> and <code>library</code> attributes.</p>
-
- <p>Decode Behavior</p>
-
- <ul>
-
- <p>No action is required during decode for this renderer.</p>
-
- </ul>
-
- <p>Encode Behavior</p>
-
- <ul>
-
- <p>Use the algorithm <em>Common Encode Behavior</em> for
- <code>encodeBegin()</code>, <code>encodeChildren()</code> and
- <code>getRendersChildren()</code>.</p>
-
- <p>For <code>encodeEnd()</code>, use the algorithm <a
- href="javax.faces.Outputjavax.faces.resource.Script.html#ResourceCommonGetResource">Common
- Algorithm for Obtaining A Resource to Render</a> to obtain a
- reference to the <code>Resource</code> to be encoded.</p>
-
- <p>Output a <code><link></code> element. Use the result from
- calling <code>resource.getRequestPath()</code> as the value of the
- "href" attribute, the result from calling
- <code>resource.getContentType()</code> as the value of the "type"
- attribute, the literal string "stylesheet" as the value of the "rel"
- attribute, and the literal string "screen" as the value of the "media"
- attribute.</p>
-
- <p>The implementation of this renderer must have a <a target="_"
- href="../../javadocs/javax/faces/event/ListenerFor.html"><code>@ListenerFor</code></a>
- annotation attached to it, at the class level, declaring <a target="_"
- href="../../javadocs/javax/faces/event/PostAddToViewEvent.html"><code>PostAddToViewEvent.class</code></a>
- as the value of the <code>systemEventClass</code> attribute. The presence of
- this annotation on a renderer implies the renderer implements <a target="_"
- href="../../javadocs/javax/faces/event/ComponentSystemEventListener.html"><code>ComponentSystemEventListener</code></a>,
- which this renderer must do. The implementation of
- <code>processEvent()</code> must extract the <code>UIComponent</code>
- from the argument event pass it to <a target="_"
- href="../../javadocs/javax/faces/component/UIViewRoot.html#addComponentResource(javax.faces.context.FacesContext,%20javax.faces.component.UIComponent,%20java.lang.String)"><code>UIViewRoot.addComponentResource()</code></a>, specifying
- the literal string "<code>head</code>" as the last argument.</p>
-
- <p>The stylsheet renderer must ensure that any stylesheets are included in the <head> of the document.
- </p>
-
- </div>]]>
- </description>
- <tag-name>
- outputStylesheet
- </tag-name>
- <component>
- <component-type>javax.faces.Output</component-type>
- <renderer-type>javax.faces.resource.Stylesheet</renderer-type>
- </component>
- <attribute>
- <description>
- <![CDATA[Converter instance registered with this component.]]>
- </description>
- <name>
- converter
- </name>
- <required>
- false
- </required>
- <type>
- javax.faces.convert.Converter
- </type>
- </attribute>
- <attribute>
- <description>
- <![CDATA[The component identifier for this component. This value must be
- unique within the closest parent component that is a naming
- container.]]>
- </description>
- <name>
- id
- </name>
- <required>
- false
- </required>
- <type>
- java.lang.String
- </type>
- </attribute>
- <attribute>
- <description>
- <![CDATA[Flag indicating whether or not this component should be rendered
- (during Render Response Phase), or processed on any subsequent
- form submit. The default value for this property is true.]]>
- </description>
- <name>
- rendered
- </name>
- <required>
- false
- </required>
- <type>
- boolean
- </type>
- </attribute>
- <attribute>
- <description>
- <![CDATA[The current value of this component.]]>
- </description>
- <name>
- value
- </name>
- <required>
- false
- </required>
- <type>
- java.lang.Object
- </type>
- </attribute>
- <attribute>
- <description>
- <![CDATA[<div class="changed_added_2_0"><p>The <em>libraryName</em> for this resource.</p></div>]]>
- </description>
- <name>
- library
- </name>
- <required>
- false
- </required>
- <type>
- java.lang.String
- </type>
- </attribute>
- <attribute>
- <description>
- <![CDATA[<div class="changed_added_2_0"><p>The <em>resourceName</em> for this resource.</p></div>]]>
- </description>
- <name>
- name
- </name>
- <required>
- false
- </required>
- <type>
- java.lang.String
- </type>
- </attribute>
- <attribute>
- <description>
- The ValueExpression linking this component to a property in a
- backing bean
- </description>
- <name>
- binding
- </name>
- <required>
- false
- </required>
- <type>
- javax.faces.component.UIComponent
- </type>
- </attribute>
- </tag>
- <tag>
- <description>
- Renders an HTML "table" element, conforming to the
- rules in the HTML 401 specification. Render the "caption" facet,
- if present, inside a "caption" element immediately below the "table"
- element.
- If the "captionClass" attribute is specified, render its value as
- the value
- of the "class" attribute on the "caption" element. If the
- "captionStyle" attribute
- is specified, render its value as the value of the "style" attribute
- on the "caption" element. If the "styleClass" attribute is
- specified, render
- its value as the value of the "class" attribute. Render the
- pass-through
- attributes in the table below. Render the "header" facet, if
- present, inside of
- "thead", "tr", and "th" elements, nested in that order. If the
- "headerClass" attribute is specifed, render its value as the value
- of the "class" attribute on the "th" element. Render "colgroup"
- as the value of the "scope" attribute. Render the value of the
- "columns" attribute as the value of the "colspan" attribute on the
- "th" element. Render the "footer" facet if present, using similar
- logic to the rendering of the "header", but replacing "thead" with
- "tfoot", "th" with "td", and "headerClass" with "footerClass".
- Render the children of the <code>UIPanel</code>
- component inside
- of a "tbody" element. Render the children based on the value of
- the "columns" attribute, creating a new row each time a "columns"
- worth of children have been rendered. For the start of each row,
- render a "tr" element. Output the value of the "rowClasses" per
- the attribute description below. For each child, output a "td"
- element, attaching the value of the "columnClasses" attribute per
- the attribute description below. Recursively encode each child.
- Close out the "td" element. When done with the row, close out the
- "tr" element. If a child has "rendered==false" it is not rendered,
- and the column counter must not be incremented.
- </description>
- <tag-name>panelGrid</tag-name>
- <component>
- <component-type>javax.faces.HtmlPanelGrid</component-type>
- <renderer-type>javax.faces.Grid</renderer-type>
- </component>
- <attribute>
- <description>
- The component identifier for this component. This value must be
- unique within the closest parent component that is a naming
- container.
- </description>
- <name>id</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Flag indicating whether or not this component should be rendered
- (during Render Response Phase), or processed on any subsequent
- form submit. The default value for this property is true.
- </description>
- <name>rendered</name>
- <required>false</required>
- <type>boolean</type>
- </attribute>
- <attribute>
- <description>
- Name or code of the background color for this table.
- </description>
- <name>bgcolor</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Comma separated list of row indices for which a new
- "tbody" element should be started (and any
- previously opened one should be ended).
- </description>
- <name>bodyrows</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Width (in pixels) of the border to be drawn
- around this table.
- </description>
- <name>border</name>
- <required>false</required>
- <type>int</type>
- </attribute>
- <attribute>
- <description>
- Space-separated list of CSS style class(es) that will be
- applied to any caption generated for this table.
- </description>
- <name>captionClass</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- CSS style(s) to be applied when this caption is rendered.
- </description>
- <name>captionStyle</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Definition of how much space the user agent should
- leave between the border of each cell and its contents.
- </description>
- <name>cellpadding</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Definition of how much space the user agent should
- leave between the left side of the table and the
- leftmost column, the top of the table and the top of
- the top side of the topmost row, and so on for the
- right and bottom of the table. It also specifies
- the amount of space to leave between cells.
- </description>
- <name>cellspacing</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Comma-delimited list of CSS style classes that will be applied
- to the columns of this table. A space separated list of
- classes may also be specified for any individual column. If
- the number of elements in this list is less than the number of
- actual column children of the UIData, no "class"
- attribute is output for each column greater than the number of
- elements in the list. If the number of elements in the list
- is greater than the number of actual column children of the
- UIData, the elements at the posisiton in the list
- after the last column are ignored.
- </description>
- <name>columnClasses</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- The number of columns to render before
- starting a new row.
- </description>
- <name>columns</name>
- <required>false</required>
- <type>int</type>
- </attribute>
- <attribute>
- <description>
- Direction indication for text that does not inherit
- directionality.
- Valid values are "LTR" (left-to-right) and "RTL"
- (right-to-left).
- </description>
- <name>dir</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Space-separated list of CSS style class(es) that will be
- applied to any footer generated for this table.
- </description>
- <name>footerClass</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Code specifying which sides of the frame surrounding
- this table will be visible. Valid values are:
- none (no sides, default value); above (top side only);
- below (bottom side only); hsides (top and bottom sides
- only); vsides (right and left sides only); lhs (left
- hand side only); rhs (right hand side only); box
- (all four sides); and border (all four sides).
- </description>
- <name>frame</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Space-separated list of CSS style class(es) that will be
- applied to any header generated for this table.
- </description>
- <name>headerClass</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Code describing the language used in the generated markup
- for this component.
- </description>
- <name>lang</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Javascript code executed when a pointer button is
- clicked over this element.
- </description>
- <name>onclick</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Javascript code executed when a pointer button is
- double clicked over this element.
- </description>
- <name>ondblclick</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Javascript code executed when a key is
- pressed down over this element.
- </description>
- <name>onkeydown</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Javascript code executed when a key is
- pressed and released over this element.
- </description>
- <name>onkeypress</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Javascript code executed when a key is
- released over this element.
- </description>
- <name>onkeyup</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Javascript code executed when a pointer button is
- pressed down over this element.
- </description>
- <name>onmousedown</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Javascript code executed when a pointer button is
- moved within this element.
- </description>
- <name>onmousemove</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Javascript code executed when a pointer button is
- moved away from this element.
- </description>
- <name>onmouseout</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Javascript code executed when a pointer button is
- moved onto this element.
- </description>
- <name>onmouseover</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Javascript code executed when a pointer button is
- released over this element.
- </description>
- <name>onmouseup</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Comma-delimited list of CSS style classes that will be applied
- to the rows of this table. A space separated list of classes
- may also be specified for any individual row. Thes styles are
- applied, in turn, to each row in the table. For example, if
- the list has two elements, the first style class in the list
- is applied to the first row, the second to the second row, the
- first to the third row, the second to the fourth row, etc. In
- other words, we keep iterating through the list until we reach
- the end, and then we start at the beginning again.
- </description>
- <name>rowClasses</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Code specifying which rules will appear between cells
- within this table. Valid values are: none (no rules,
- default value); groups (between row groups); rows
- (between rows only); cols (between columns only); and
- all (between all rows and columns).
- </description>
- <name>rules</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- CSS style(s) to be applied when this component is rendered.
- </description>
- <name>style</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Space-separated list of CSS style class(es) to be applied when
- this element is rendered. This value must be passed through
- as the "class" attribute on generated markup.
- </description>
- <name>styleClass</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Summary of this table's purpose and structure, for
- user agents rendering to non-visual media such as
- speech and Braille.
- </description>
- <name>summary</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Advisory title information about markup elements generated
- for this component.
- </description>
- <name>title</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Width of the entire table, for visual user agents.
- </description>
- <name>width</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- The ValueExpression linking this component to a property in a
- backing bean
- </description>
- <name>binding</name>
- <required>false</required>
- <type>javax.faces.component.UIComponent</type>
- </attribute>
- </tag>
- <tag>
- <description>
- Intended for use in situations when only one
- UIComponent child can be nested, such as in the case of facets.
- If the "style" or "styleClass" attributes are present, and the
- "layout"
- attribute is present with a value of "block", render a "div"
- element,
- outputting the value of the "style" attribute as the value of the
- "style" attribute and the value of the "styleClass" attribute as the
- value of the "class" attribute. Otherwise, if the "layout" attribute
- is not present, or the "layout" attribute contains a value other
- than
- "block", render a "span" element, outputting the value of the
- "style" attribute as the value of the "style" attribute, and the
- value
- of the "styleClass" attribute as the value of the "class"
- attribute.
- </description>
- <tag-name>panelGroup</tag-name>
- <component>
- <component-type>javax.faces.HtmlPanelGroup</component-type>
- <renderer-type>javax.faces.Group</renderer-type>
- </component>
- <attribute>
- <description>
- The component identifier for this component. This value must be
- unique within the closest parent component that is a naming
- container.
- </description>
- <name>id</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Flag indicating whether or not this component should be rendered
- (during Render Response Phase), or processed on any subsequent
- form submit. The default value for this property is true.
- </description>
- <name>rendered</name>
- <required>false</required>
- <type>boolean</type>
- </attribute>
- <attribute>
- <description>
- The type of layout markup to use when rendering this group.
- If the value is "block" the renderer must produce an HTML
- "div" element. Otherwise HTML "span" element must
- be produced.
- </description>
- <name>layout</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- CSS style(s) to be applied when this component is rendered.
- </description>
- <name>style</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Space-separated list of CSS style class(es) to be applied when
- this element is rendered. This value must be passed through
- as the "class" property on generated markup.
- </description>
- <name>styleClass</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- The ValueExpression linking this component to a property in a
- backing bean
- </description>
- <name>binding</name>
- <required>false</required>
- <type>javax.faces.component.UIComponent</type>
- </attribute>
- </tag>
- <tag>
- <description>
- <p>Renders an HTML "input" element of type "checkbox".</p>
- <p>Decode Behavior</p>
- <ul>
- <p>Obtain the <code>Map</code> from the
- "requestParameterMap"
- property of the <code>ExternalContext</code>. If there
- is no
- entry in the <code>Map</code> for the "clientId" of this
- component, pass "false" to the <code>setSubmittedValue()</code>
- method of the component, which must be an instance of
- <code>EditableValueHolder</code>. If there is an entry,
- and its
- value is equal, ignoring case and without quotes, to any of the
- Strings: "on", "yes" or "true" pass true to the
- <code>setSubmittedValue()</code> method of the
- component.</p>
- </ul>
- <p>Encode Behavior</p>
- <ul>
- <p>
- Render the clientId of the component as the value of the "name"
- attribute. If the current value of the component is "true",
- output the "checked" attribute (must be rendered as
- checked="checked").
- If the "styleClass" attribute is specified, render its value as the
- value
- of the "class" attribute.</p> </ul>
- </description>
- <tag-name>selectBooleanCheckbox</tag-name>
- <component>
- <component-type>javax.faces.HtmlSelectBooleanCheckbox
- </component-type>
- <renderer-type>javax.faces.Checkbox</renderer-type>
- </component>
- <attribute>
- <description>
- Converter instance registered with this component.
- </description>
- <name>converter</name>
- <required>false</required>
- <type>javax.faces.convert.Converter</type>
- </attribute>
- <attribute>
- <description>
- A ValueExpression enabled attribute that, if present, will be
- used as the text of the converter message, replacing any message
- that comes from the converter.
- </description>
- <name>converterMessage</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- The component identifier for this component. This value must be
- unique within the closest parent component that is a naming
- container.
- </description>
- <name>id</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Flag indicating that this component's value must be
- converted and validated immediately (that is, during
- Apply Request Values phase), rather than waiting
- until Process Validations phase.
- </description>
- <name>immediate</name>
- <required>false</required>
- <type>boolean</type>
- </attribute>
- <attribute>
- <description>
- Flag indicating whether or not this component should be rendered
- (during Render Response Phase), or processed on any subsequent
- form submit. The default value for this property is true.
- </description>
- <name>rendered</name>
- <required>false</required>
- <type>boolean</type>
- </attribute>
- <attribute>
- <description>
- Flag indicating that the user is required to provide a submitted
- value for this input component.
- </description>
- <name>required</name>
- <required>false</required>
- <type>boolean</type>
- </attribute>
- <attribute>
- <description>
- A ValueExpression enabled attribute that, if present, will be
- used as the text of the validation message for the "required"
- facility, if the "required" facility is used.
- </description>
- <name>requiredMessage</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- MethodExpression representing a validator method that will be
- called
- during Process Validations to perform correctness checks on the
- value of this component. The expression must evaluate to a
- public
- method that takes FacesContext, UIComponent, and Object
- parameters,
- with a return type of void.
- </description>
- <name>validator</name>
- <required>false</required>
- <method-signature>void validate(javax.faces.context.FacesContext,
- javax.faces.component.UIComponent, java.lang.Object)
- </method-signature>
- </attribute>
- <attribute>
- <description>
- A ValueExpression enabled attribute that, if present, will be
- used as the text of the validator message, replacing any
- message that comes from the validator.
- </description>
- <name>validatorMessage</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- The current value of this component.
- </description>
- <name>value</name>
- <required>false</required>
- <type>java.lang.Boolean</type>
- </attribute>
- <attribute>
- <description>
- <p>
- MethodExpression representing a value change listener method
- that will be notified when a new value has been set for this
- input component. The expression must evaluate to a public
- method that takes a <code>ValueChangeEvent</code>
- parameter,
- with a return type of void, <span class="changed_added_2_0">or
- to a public method that takes no arguments with a return type
- of void. In the latter case, the method has no way of easily
- knowing what the new value is, but this can be useful in cases
- where a notification is needed that "this value
- changed".</span>
- </p>
- </description>
- <name>valueChangeListener</name>
- <required>false</required>
- <method-signature>void
- valueChange(javax.faces.event.ValueChangeEvent)
- </method-signature>
- </attribute>
- <attribute>
- <description>
- Access key that, when pressed, transfers focus
- to this element.
- </description>
- <name>accesskey</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Direction indication for text that does not inherit
- directionality.
- Valid values are "LTR" (left-to-right) and "RTL"
- (right-to-left).
- </description>
- <name>dir</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Flag indicating that this element must never receive focus or
- be included in a subsequent submit. A value of false causes
- no attribute to be rendered, while a value of true causes the
- attribute to be rendered as disabled="disabled".
- </description>
- <name>disabled</name>
- <required>false</required>
- <type>boolean</type>
- </attribute>
- <attribute>
- <description>
- A localized user presentable name for this component.
- </description>
- <name>label</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Code describing the language used in the generated markup
- for this component.
- </description>
- <name>lang</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Javascript code executed when this element loses focus.
- </description>
- <name>onblur</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Javascript code executed when this element loses focus
- and its value has been modified since gaining focus.
- </description>
- <name>onchange</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Javascript code executed when a pointer button is
- clicked over this element.
- </description>
- <name>onclick</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Javascript code executed when a pointer button is
- double clicked over this element.
- </description>
- <name>ondblclick</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Javascript code executed when this element receives focus.
- </description>
- <name>onfocus</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Javascript code executed when a key is
- pressed down over this element.
- </description>
- <name>onkeydown</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Javascript code executed when a key is
- pressed and released over this element.
- </description>
- <name>onkeypress</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Javascript code executed when a key is
- released over this element.
- </description>
- <name>onkeyup</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Javascript code executed when a pointer button is
- pressed down over this element.
- </description>
- <name>onmousedown</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Javascript code executed when a pointer button is
- moved within this element.
- </description>
- <name>onmousemove</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Javascript code executed when a pointer button is
- moved away from this element.
- </description>
- <name>onmouseout</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Javascript code executed when a pointer button is
- moved onto this element.
- </description>
- <name>onmouseover</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Javascript code executed when a pointer button is
- released over this element.
- </description>
- <name>onmouseup</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Javascript code executed when text within this
- element is selected by the user.
- </description>
- <name>onselect</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Flag indicating that this component will prohibit changes by
- the user. The element may receive focus unless it has also
- been disabled. A value of false causes
- no attribute to be rendered, while a value of true causes the
- attribute to be rendered as readonly="readonly".
- </description>
- <name>readonly</name>
- <required>false</required>
- <type>boolean</type>
- </attribute>
- <attribute>
- <description>
- CSS style(s) to be applied when this component is rendered.
- </description>
- <name>style</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Space-separated list of CSS style class(es) to be applied when
- this element is rendered. This value must be passed through
- as the "class" attribute on generated markup.
- </description>
- <name>styleClass</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Position of this element in the tabbing order
- for the current document. This value must be
- an integer between 0 and 32767.
- </description>
- <name>tabindex</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Advisory title information about markup elements generated
- for this component.
- </description>
- <name>title</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- The ValueExpression linking this component to a property in a
- backing bean
- </description>
- <name>binding</name>
- <required>false</required>
- <type>javax.faces.component.UIComponent</type>
- </attribute>
- </tag>
- <tag>
- <description>
- <p><span
- class="changed_modified_2_0">Render</span> an HTML checkbox
- list.</p>
- <p><a name="decode">Decode Behavior</a></p>
- <ul>
- <p>See the <a
- href="SelectManyListbox.html">"Decode
- Behavior for UISelectMany Components"</a> section.</p>
- </ul>
- <p>Encode Behavior</p>
- <ul>
- <p>Render a "table" element. If the "styleClass" is specified,
- render the value of the "styleClass" attribute as the value of the
- "class" attribute on the "table" element. If the "style", or
- "border" attributes are specified, pass them thru <span
- class="changed_added_2_0">and render their values as the "style"
- and "border" attributes on the "table", respectively.</span>
- If
- the "layout" attribute is specified, and its value is
- "pageDirection", render the children elements vertically,
- otherwise horizontally, in the table. If any of the children are
- an instance of SelectItemGroup, render them as a nested table.
- Each of the children are ultimately rendererd as follows. Render
- an "input" element of "type" "checkbox" for each child component.
- Render the "name" attribute on the "input" element with the value
- of the <code>clientId</code> of the component. Render an
- "id"
- attribute on the "input" element. Each "id" value must be unique.
- If the current SelectItem.isDisabled() returns true, render
- "disabled" as the value of the "disabled" attribute. Close out
- the "input" element. Render a "label" element. Render the "for"
- attribute of the "label" element whose value is the corresponding
- "input" element's "id" value. Render any "style" as the "class"
- attribute on the "label" element. <span
- class="changed_added_2_0">If the current checkbox would be
- rendered as being checked, and there is a "selectedClass"
- attribute, append a space, followed by the value of the
- "selectedClass" attribute to any existing "class" attribute value
- on the label element. Otherwise, render the value of the
- "selectedClass" attribute as the value of the "class" attribute on
- the label element. If the current checkbox would be rendered as
- being not checked, and there is a "unselectedClass" attribute,
- append a space, followed by the value of the "unselectedClass"
- attribute to any existing "class" attribute value on the label
- element. Otherwise, render the value of the "unselectedClass"
- attribute as the value of the "class" attribute on the label
- element.</span> Close out the starting "label" element and
- render
- the label value from SelectItem.getLabel(). Close out the "label"
- element. As an exception to the general rules about how to handle
- the "id" attribute, render it as an attribute on the outer "table"
- element, the value of which is the <code>clientId</code>
- of the
- component per the rules at the beginning of this specification.
- The value of the current SelectItem is rendered as the value of
- the "value" attribute. Coerce the value of the currently rendered
- child to the type of the parent UISelectMany value following the
- Expression Language coercion rules, before comparing the values.
- If the value of the enclosing UISelectMany matches the current
- value, render "checked" as the value of the "checked" attribute.
- See the <a
- href="SelectManyListbox.html">"Rendering
- the option elements" </a> specification for
- <code>ListboxRenderer</code> for more detail on how to
- render the
- "option" elements in this renderer.</p>
- </ul>
- </description>
- <tag-name>selectManyCheckbox</tag-name>
- <component>
- <component-type>javax.faces.HtmlSelectManyCheckbox</component-type>
- <renderer-type>javax.faces.Checkbox</renderer-type>
- </component>
- <attribute>
- <description>
- Converter instance registered with this component.
- </description>
- <name>converter</name>
- <required>false</required>
- <type>javax.faces.convert.Converter</type>
- </attribute>
- <attribute>
- <description>
- A ValueExpression enabled attribute that, if present, will be
- used as the text of the converter message, replacing any message
- that comes from the converter.
- </description>
- <name>converterMessage</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- The component identifier for this component. This value must be
- unique within the closest parent component that is a naming
- container.
- </description>
- <name>id</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Flag indicating that this component's value must be
- converted and validated immediately (that is, during
- Apply Request Values phase), rather than waiting
- until Process Validations phase.
- </description>
- <name>immediate</name>
- <required>false</required>
- <type>boolean</type>
- </attribute>
- <attribute>
- <description>
- Flag indicating whether or not this component should be rendered
- (during Render Response Phase), or processed on any subsequent
- form submit. The default value for this property is true.
- </description>
- <name>rendered</name>
- <required>false</required>
- <type>boolean</type>
- </attribute>
- <attribute>
- <description>
- Flag indicating that the user is required to provide a submitted
- value for this input component.
- </description>
- <name>required</name>
- <required>false</required>
- <type>boolean</type>
- </attribute>
- <attribute>
- <description>
- A ValueExpression enabled attribute that, if present, will be
- used as the text of the validation message for the "required"
- facility, if the "required" facility is used.
- </description>
- <name>requiredMessage</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- MethodExpression representing a validator method that will be
- called
- during Process Validations to perform correctness checks on the
- value of this component. The expression must evaluate to a
- public
- method that takes FacesContext, UIComponent, and Object
- parameters,
- with a return type of void.
- </description>
- <name>validator</name>
- <required>false</required>
- <method-signature>void validate(javax.faces.context.FacesContext,
- javax.faces.component.UIComponent, java.lang.Object)
- </method-signature>
- </attribute>
- <attribute>
- <description>
- A ValueExpression enabled attribute that, if present, will be
- used as the text of the validator message, replacing any
- message that comes from the validator.
- </description>
- <name>validatorMessage</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- The current value of this component.
- </description>
- <name>value</name>
- <required>false</required>
- <type>java.lang.Object</type>
- </attribute>
- <attribute>
- <description>
- <p>
- MethodExpression representing a value change listener method
- that will be notified when a new value has been set for this
- input component. The expression must evaluate to a public
- method that takes a <code>ValueChangeEvent</code>
- parameter,
- with a return type of void, <span class="changed_added_2_0">or
- to a public method that takes no arguments with a return type
- of void. In the latter case, the method has no way of easily
- knowing what the new value is, but this can be useful in cases
- where a notification is needed that "this value
- changed".</span>
- </p>
- </description>
- <name>valueChangeListener</name>
- <required>false</required>
- <method-signature>void
- valueChange(javax.faces.event.ValueChangeEvent)
- </method-signature>
- </attribute>
- <attribute>
- <description>
- Access key that, when pressed, transfers focus
- to this element.
- </description>
- <name>accesskey</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Width (in pixels) of the border to be drawn
- around the table containing the options list.
- </description>
- <name>border</name>
- <required>false</required>
- <type>int</type>
- </attribute>
- <attribute>
- <description>
- <p class="changed_modified_2_0"> Optional
- attribute that is a literal string that is the fully qualified
- class name of a concrete class that implements
- <code>java.util.Collection</code>, or an EL
- expression that
- evaluates to either 1. such a String, or 2. the
- <code>Class</code> object itself. </p>
- </description>
- <name>collectionType</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Direction indication for text that does not inherit
- directionality.
- Valid values are "LTR" (left-to-right) and "RTL"
- (right-to-left).
- </description>
- <name>dir</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Flag indicating that this element must never receive focus or
- be included in a subsequent submit. A value of false causes
- no attribute to be rendered, while a value of true causes the
- attribute to be rendered as disabled="disabled".
- </description>
- <name>disabled</name>
- <required>false</required>
- <type>boolean</type>
- </attribute>
- <attribute>
- <description>
- CSS style class to apply to the rendered label
- on disabled options.
- </description>
- <name>disabledClass</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- CSS style class to apply to the rendered label
- on enabled options.
- </description>
- <name>enabledClass</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- <p class="changed_modified_2_0">
- Flag indicating that, if this component is activated by the
- user,
- The "no selection option", if any, must be hidden.</p>
- </description>
- <name>hideNoSelectionOption</name>
- <required>false</required>
- <type>boolean</type>
- </attribute>
- <attribute>
- <description>
- A localized user presentable name for this component.
- </description>
- <name>label</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Code describing the language used in the generated markup
- for this component.
- </description>
- <name>lang</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Orientation of the options list to be created.
- Valid values are "pageDirection" (list is laid
- out vertically), or "lineDirection" (list is
- laid out horizontally). If not specified, the
- default value is "lineDirection".
- </description>
- <name>layout</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Javascript code executed when this element loses focus.
- </description>
- <name>onblur</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Javascript code executed when this element loses focus
- and its value has been modified since gaining focus.
- </description>
- <name>onchange</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Javascript code executed when a pointer button is
- clicked over this element.
- </description>
- <name>onclick</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Javascript code executed when a pointer button is
- double clicked over this element.
- </description>
- <name>ondblclick</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Javascript code executed when this element receives focus.
- </description>
- <name>onfocus</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Javascript code executed when a key is
- pressed down over this element.
- </description>
- <name>onkeydown</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Javascript code executed when a key is
- pressed and released over this element.
- </description>
- <name>onkeypress</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Javascript code executed when a key is
- released over this element.
- </description>
- <name>onkeyup</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Javascript code executed when a pointer button is
- pressed down over this element.
- </description>
- <name>onmousedown</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Javascript code executed when a pointer button is
- moved within this element.
- </description>
- <name>onmousemove</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Javascript code executed when a pointer button is
- moved away from this element.
- </description>
- <name>onmouseout</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Javascript code executed when a pointer button is
- moved onto this element.
- </description>
- <name>onmouseover</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Javascript code executed when a pointer button is
- released over this element.
- </description>
- <name>onmouseup</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Javascript code executed when text within this
- element is selected by the user.
- </description>
- <name>onselect</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Flag indicating that this component will prohibit changes by
- the user. The element may receive focus unless it has also
- been disabled. A value of false causes
- no attribute to be rendered, while a value of true causes the
- attribute to be rendered as readonly="readonly".
- </description>
- <name>readonly</name>
- <required>false</required>
- <type>boolean</type>
- </attribute>
- <attribute>
- <description>
- CSS style class to apply to the rendered label
- on selected options.
- </description>
- <name>selectedClass</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- CSS style(s) to be applied when this component is rendered.
- </description>
- <name>style</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Space-separated list of CSS style class(es) to be applied when
- this element is rendered. This value must be passed through
- as the "class" attribute on generated markup.
- </description>
- <name>styleClass</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Position of this element in the tabbing order
- for the current document. This value must be
- an integer between 0 and 32767.
- </description>
- <name>tabindex</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Advisory title information about markup elements generated
- for this component.
- </description>
- <name>title</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- CSS style class to apply to the rendered label
- on unselected options.
- </description>
- <name>unselectedClass</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- The ValueExpression linking this component to a property in a
- backing bean
- </description>
- <name>binding</name>
- <required>false</required>
- <type>javax.faces.component.UIComponent</type>
- </attribute>
- </tag>
- <tag>
- <description>
- <p><span
- class="changed_modified_2_0">Render</span> an HTML option
- list.</p>
- <p>Decode Behavior</p>
- <p>This section documents the decode behavior for all
- renderers
- that handle <code>UISelectMany</code> or <code>UISelectOne</code>
- components.</p>
- <ul>
- <p><a name="decodeMany">Decode Behavior for
- <code>UISelectMany</code> components</a></p>
- <ul>
- <p>Obtain the <code>Map</code> from the
- "requestParameterValuesMap" property of the
- <code>ExternalContext</code>. If the <code>Map</code>
- contains
- an entry for the "clientId" of the component, pass the value of
- the entry, cast to a <code>String []</code>, to the
- <code>setSubmittedValue()</code> method of the
- component, which
- must be an <code>EditableValueHolder</code>. If the
- <code>Map</code> does not contain an entry, create an
- empty
- <code>String</code> array and call
- <code>setSubmittedValue()</code> with it.</p>
- <p class="changed_modified_2_0">Please check the javadoc for
- <a
- href="../../javadocs/javax/faces/component/UISelectMany.html#getConvertedvalue">UISelectMany.getConvertedValue()</a>
- for additional requirements for renderers that render this kind
- of component.</p>
- </ul>
- <p><a name="decodeOne">Decode Behavior for
- <code>UISelectOne</code> components</a></p>
- <ul>
- <p>Obtain the <code>Map</code> from the
- "requestParameterMap"
- property of the <code>ExternalContext</code>. If there
- is a
- <code>Map</code> entry for the "clientId" property of
- the
- component, pass it to the <code>setSubmittedValue()</code>
- method
- of the component. <span class="changed_added_2_0">If the
- <code>Map</code> does not contain an entry, call
- <code>setSubmittedValue()</code> passing an empty
- <code>String</code> as the argument.</span> </p>
- </ul>
- <p>Encode Behavior</p>
- <ul>
- <p>Render an HTML "select" element. Render the clientId of
- the component as the value of the "name" attribute. If the
- "styleClass"
- attribute is specified, render its value as the value of the "class"
- attribute on the "select" element. If the component is a
- <code>UISelectMany</code> instance, render "multiple" as
- the value of the
- "multiple" attribute. If the "size" attribute is specified, render
- its
- value as the value of the "size" attribute. Otherwise use the number
- of
- items as the value of the "size" attribute.</p>
- </ul>
- <p><a name="option">Rendering the "option" elements</a></p>
- <ul>
- <p>The only valid children of this component are
- <code>UISelectItem</code> or <code>UISelectItems</code>
- instances. Iterate over the children of this component, and accrue
- a list of <code>javax.faces.model.SelectItem</code>
- instances.
- <span class="changed_added_2_0">If the current child is a
- <code>SelectItem</code> whose <code>noSelctionProperty</code>
- is
- <code>true</code>, <b>and</b> the <code>UISelectOne</code>
- or
- <code>UISelectMany</code> parent of this option has one
- or more
- selected values that <b>are not</b> the "no selection"
- <code>SelectItem</code>, <b>and</b> the
- component has a
- "hideNoSelectionLabel" attribute whose value is <code>true</code>,
- then the current option, which is the "no selection" option, must
- not be rendered.</span> If the current child is a
- <code>UISelectItem</code> create a <code>SelectItem</code>instance
- from its <code>itemValue, itemLabel</code>, <code
- class="changed_added_2_0">itemEscaped</code>, and
- <code>itemDescription</code> properties, add it to the
- list. If
- the current child is a <code>UISelectItems</code>
- instance, call
- its <code>getValue()</code> method. If the result is a
- <code>SelectItem</code> bean, add it to the list. If the
- result
- is an array of <code>SelectItem</code> beans, add each
- one to the
- list. If the result is a <code>Collection</code> of
- <code>SelectItem</code> beans, add each one to the list.
- If the
- result is a <code>Map</code>, create a <code>SelectItem</code>
- bean for each entry in the <code>Map</code> using the
- key as the
- label, the value as the value, and <code>null</code> as
- the
- description.</p>
- <p>Iterate over the list of <code>SelectItem</code>
- beans. If the
- current element is a <code>SelectItemGroup</code>,
- render an
- "optgroup" element with a "label" attribute, the value of which is
- the "label" property from the current element, then call
- <code>getSelectItems()</code> and render each element as
- below.
- If the current element is not a <code>SelectItemGroup</code>,
- render an "option" element. Follow the conversion rules in the
- spec to obtain a renderable <code>String</code> from the
- "value"
- property of the current element, render that as the value of the
- "value" atribute. Now it is time to see if the current element is
- the selected value. Call its <code>getSubmittedValue()</code>
- method, casting the result to an <code>Object []</code>,
- otherwise
- the component must be a <code>UISelectOne</code>
- instance, call
- its <code>getSubmittedValue()</code> method and create
- an
- <code>Object []</code> around the result. Determine the
- type of
- the resultant array, if the resultant array is non-null, otherwise
- the type is <code>String</code>. Coerce the current item
- value to
- this type following the Expression Language coercion rules. If
- the resultant array is non-null, we look in the array for a value
- that, when we pass the renderable value to its
- <code>equals()</code> method, it returns <code>true</code>,
- meaning the current element is selected. If the resultant array
- is <code>null</code>, if the component is a
- <code>UISelectMany</code>, call its <code>getValue()</code>
- method. If the result is a <code>List</code> obtain the
- values in
- the list as an array. Otherwise, the component must be a
- <code>UISelectOne</code> instance. Call its
- <code>getValue()</code> method, which must be an Object
- array.
- Look for an element in the resultant array that, 1. when we pass
- the renderable value to its <code>equals()</code>
- method, it
- returns <code>true</code> , or 2. if the renderable
- value is null,
- and there is a null element in the array, also conclude that the
- current element is selected. Otherwise the current element is not
- selected. Now, if the current value is selected, write out an
- HTML boolean property "selected". If the current
- SelectItem.isDisabled() returns true, render "disabled" as the
- value of the "disabled" attribute. <span
- class="changed_added_2_0">If the value of the <code>escape</code>
- property is true, use the <code>writeText()</code>
- method of
- <code>ResponseWriter</code> to write out the value of
- the
- <code>label</code> property. Otherwise, use the
- <code>write()</code> method of the <code>ResponseWriter</code>
- to
- do so.</span></p>
- </ul>
- </ul>
- </description>
- <tag-name>selectManyListbox</tag-name>
- <component>
- <component-type>javax.faces.HtmlSelectManyListbox</component-type>
- <renderer-type>javax.faces.Listbox</renderer-type>
- </component>
- <attribute>
- <description>
- Converter instance registered with this component.
- </description>
- <name>converter</name>
- <required>false</required>
- <type>javax.faces.convert.Converter</type>
- </attribute>
- <attribute>
- <description>
- A ValueExpression enabled attribute that, if present, will be
- used as the text of the converter message, replacing any message
- that comes from the converter.
- </description>
- <name>converterMessage</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- The component identifier for this component. This value must be
- unique within the closest parent component that is a naming
- container.
- </description>
- <name>id</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Flag indicating that this component's value must be
- converted and validated immediately (that is, during
- Apply Request Values phase), rather than waiting
- until Process Validations phase.
- </description>
- <name>immediate</name>
- <required>false</required>
- <type>boolean</type>
- </attribute>
- <attribute>
- <description>
- Flag indicating whether or not this component should be rendered
- (during Render Response Phase), or processed on any subsequent
- form submit. The default value for this property is true.
- </description>
- <name>rendered</name>
- <required>false</required>
- <type>boolean</type>
- </attribute>
- <attribute>
- <description>
- Flag indicating that the user is required to provide a submitted
- value for this input component.
- </description>
- <name>required</name>
- <required>false</required>
- <type>boolean</type>
- </attribute>
- <attribute>
- <description>
- A ValueExpression enabled attribute that, if present, will be
- used as the text of the validation message for the "required"
- facility, if the "required" facility is used.
- </description>
- <name>requiredMessage</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- MethodExpression representing a validator method that will be
- called
- during Process Validations to perform correctness checks on the
- value of this component. The expression must evaluate to a
- public
- method that takes FacesContext, UIComponent, and Object
- parameters,
- with a return type of void.
- </description>
- <name>validator</name>
- <required>false</required>
- <method-signature>void validate(javax.faces.context.FacesContext,
- javax.faces.component.UIComponent, java.lang.Object)
- </method-signature>
- </attribute>
- <attribute>
- <description>
- A ValueExpression enabled attribute that, if present, will be
- used as the text of the validator message, replacing any
- message that comes from the validator.
- </description>
- <name>validatorMessage</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- The current value of this component.
- </description>
- <name>value</name>
- <required>false</required>
- <type>java.lang.Object</type>
- </attribute>
- <attribute>
- <description>
- <p>
- MethodExpression representing a value change listener method
- that will be notified when a new value has been set for this
- input component. The expression must evaluate to a public
- method that takes a <code>ValueChangeEvent</code>
- parameter,
- with a return type of void, <span class="changed_added_2_0">or
- to a public method that takes no arguments with a return type
- of void. In the latter case, the method has no way of easily
- knowing what the new value is, but this can be useful in cases
- where a notification is needed that "this value
- changed".</span>
- </p>
- </description>
- <name>valueChangeListener</name>
- <required>false</required>
- <method-signature>void
- valueChange(javax.faces.event.ValueChangeEvent)
- </method-signature>
- </attribute>
- <attribute>
- <description>
- Access key that, when pressed, transfers focus
- to this element.
- </description>
- <name>accesskey</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- <p class="changed_modified_2_0"> Optional
- attribute that is a literal string that is the fully qualified
- class name of a concrete class that implements
- <code>java.util.Collection</code>, or an EL
- expression that
- evaluates to either 1. such a String, or 2. the
- <code>Class</code> object itself. </p>
- </description>
- <name>collectionType</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Direction indication for text that does not inherit
- directionality.
- Valid values are "LTR" (left-to-right) and "RTL"
- (right-to-left).
- </description>
- <name>dir</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Flag indicating that this element must never receive focus or
- be included in a subsequent submit. A value of false causes
- no attribute to be rendered, while a value of true causes the
- attribute to be rendered as disabled="disabled".
- </description>
- <name>disabled</name>
- <required>false</required>
- <type>boolean</type>
- </attribute>
- <attribute>
- <description>
- CSS style class to apply to the rendered label
- on disabled options.
- </description>
- <name>disabledClass</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- CSS style class to apply to the rendered label
- on enabled options.
- </description>
- <name>enabledClass</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- <p class="changed_modified_2_0">
- Flag indicating that, if this component is activated by the
- user,
- The "no selection option", if any, must be hidden.</p>
- </description>
- <name>hideNoSelectionOption</name>
- <required>false</required>
- <type>boolean</type>
- </attribute>
- <attribute>
- <description>
- A localized user presentable name for this component.
- </description>
- <name>label</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Code describing the language used in the generated markup
- for this component.
- </description>
- <name>lang</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Javascript code executed when this element loses focus.
- </description>
- <name>onblur</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Javascript code executed when this element loses focus
- and its value has been modified since gaining focus.
- </description>
- <name>onchange</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Javascript code executed when a pointer button is
- clicked over this element.
- </description>
- <name>onclick</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Javascript code executed when a pointer button is
- double clicked over this element.
- </description>
- <name>ondblclick</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Javascript code executed when this element receives focus.
- </description>
- <name>onfocus</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Javascript code executed when a key is
- pressed down over this element.
- </description>
- <name>onkeydown</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Javascript code executed when a key is
- pressed and released over this element.
- </description>
- <name>onkeypress</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Javascript code executed when a key is
- released over this element.
- </description>
- <name>onkeyup</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Javascript code executed when a pointer button is
- pressed down over this element.
- </description>
- <name>onmousedown</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Javascript code executed when a pointer button is
- moved within this element.
- </description>
- <name>onmousemove</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Javascript code executed when a pointer button is
- moved away from this element.
- </description>
- <name>onmouseout</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Javascript code executed when a pointer button is
- moved onto this element.
- </description>
- <name>onmouseover</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Javascript code executed when a pointer button is
- released over this element.
- </description>
- <name>onmouseup</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Javascript code executed when text within this
- element is selected by the user.
- </description>
- <name>onselect</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Flag indicating that this component will prohibit changes by
- the user. The element may receive focus unless it has also
- been disabled. A value of false causes
- no attribute to be rendered, while a value of true causes the
- attribute to be rendered as readonly="readonly".
- </description>
- <name>readonly</name>
- <required>false</required>
- <type>boolean</type>
- </attribute>
- <attribute>
- <description>
- Number of available options to be shown at all times.
- If not specified, all available options are shown.
- </description>
- <name>size</name>
- <required>false</required>
- <type>int</type>
- </attribute>
- <attribute>
- <description>
- CSS style(s) to be applied when this component is rendered.
- </description>
- <name>style</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Space-separated list of CSS style class(es) to be applied when
- this element is rendered. This value must be passed through
- as the "class" attribute on generated markup.
- </description>
- <name>styleClass</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Position of this element in the tabbing order
- for the current document. This value must be
- an integer between 0 and 32767.
- </description>
- <name>tabindex</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Advisory title information about markup elements generated
- for this component.
- </description>
- <name>title</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- The ValueExpression linking this component to a property in a
- backing bean
- </description>
- <name>binding</name>
- <required>false</required>
- <type>javax.faces.component.UIComponent</type>
- </attribute>
- </tag>
- <tag>
- <description>
- <p><span
- class="changed_modified_2_0">Render</span> an HTML option
- list.</p>
- <p><a name="decode">Decode Behavior</a></p>
- <ul>
- <p>See the <a
- href="SelectManyListbox.html">"Decode
- Behavior for UISelectMany Components"</a> section.</p>
- </ul>
- <p>Encode Behavior</p>
- <ul>
- <p>Render an HTML "select" element. Render the clientId of
- the component as the value of the "name" attribute. If the
- "styleClass"
- attribute is specified, render its value as the value of the "class"
- attribute on the "select" element. If the component
- to be rendered is a UISelectMany, render "multiple" as the value of
- the "multiple" attribute. Render "1" as the value of the "size"
- attribute. See the <a
- href="SelectManyListbox.html">"Rendering the option
- elements" </a> specification for <code>ListboxRenderer</code>
- for
- more detail on how to render the "option" elements in this
- renderer.</p>
- </ul>
- </description>
- <tag-name>selectManyMenu</tag-name>
- <component>
- <component-type>javax.faces.HtmlSelectManyMenu</component-type>
- <renderer-type>javax.faces.Menu</renderer-type>
- </component>
- <attribute>
- <description>
- Converter instance registered with this component.
- </description>
- <name>converter</name>
- <required>false</required>
- <type>javax.faces.convert.Converter</type>
- </attribute>
- <attribute>
- <description>
- A ValueExpression enabled attribute that, if present, will be
- used as the text of the converter message, replacing any message
- that comes from the converter.
- </description>
- <name>converterMessage</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- The component identifier for this component. This value must be
- unique within the closest parent component that is a naming
- container.
- </description>
- <name>id</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Flag indicating that this component's value must be
- converted and validated immediately (that is, during
- Apply Request Values phase), rather than waiting
- until Process Validations phase.
- </description>
- <name>immediate</name>
- <required>false</required>
- <type>boolean</type>
- </attribute>
- <attribute>
- <description>
- Flag indicating whether or not this component should be rendered
- (during Render Response Phase), or processed on any subsequent
- form submit. The default value for this property is true.
- </description>
- <name>rendered</name>
- <required>false</required>
- <type>boolean</type>
- </attribute>
- <attribute>
- <description>
- Flag indicating that the user is required to provide a submitted
- value for this input component.
- </description>
- <name>required</name>
- <required>false</required>
- <type>boolean</type>
- </attribute>
- <attribute>
- <description>
- A ValueExpression enabled attribute that, if present, will be
- used as the text of the validation message for the "required"
- facility, if the "required" facility is used.
- </description>
- <name>requiredMessage</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- MethodExpression representing a validator method that will be
- called
- during Process Validations to perform correctness checks on the
- value of this component. The expression must evaluate to a
- public
- method that takes FacesContext, UIComponent, and Object
- parameters,
- with a return type of void.
- </description>
- <name>validator</name>
- <required>false</required>
- <method-signature>void validate(javax.faces.context.FacesContext,
- javax.faces.component.UIComponent, java.lang.Object)
- </method-signature>
- </attribute>
- <attribute>
- <description>
- A ValueExpression enabled attribute that, if present, will be
- used as the text of the validator message, replacing any
- message that comes from the validator.
- </description>
- <name>validatorMessage</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- The current value of this component.
- </description>
- <name>value</name>
- <required>false</required>
- <type>java.lang.Object</type>
- </attribute>
- <attribute>
- <description>
- <p>
- MethodExpression representing a value change listener method
- that will be notified when a new value has been set for this
- input component. The expression must evaluate to a public
- method that takes a <code>ValueChangeEvent</code>
- parameter,
- with a return type of void, <span class="changed_added_2_0">or
- to a public method that takes no arguments with a return type
- of void. In the latter case, the method has no way of easily
- knowing what the new value is, but this can be useful in cases
- where a notification is needed that "this value
- changed".</span>
- </p>
- </description>
- <name>valueChangeListener</name>
- <required>false</required>
- <method-signature>void
- valueChange(javax.faces.event.ValueChangeEvent)
- </method-signature>
- </attribute>
- <attribute>
- <description>
- Access key that, when pressed, transfers focus
- to this element.
- </description>
- <name>accesskey</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- <p class="changed_modified_2_0"> Optional
- attribute that is a literal string that is the fully qualified
- class name of a concrete class that implements
- <code>java.util.Collection</code>, or an EL
- expression that
- evaluates to either 1. such a String, or 2. the
- <code>Class</code> object itself. </p>
- </description>
- <name>collectionType</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Direction indication for text that does not inherit
- directionality.
- Valid values are "LTR" (left-to-right) and "RTL"
- (right-to-left).
- </description>
- <name>dir</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Flag indicating that this element must never receive focus or
- be included in a subsequent submit. A value of false causes
- no attribute to be rendered, while a value of true causes the
- attribute to be rendered as disabled="disabled".
- </description>
- <name>disabled</name>
- <required>false</required>
- <type>boolean</type>
- </attribute>
- <attribute>
- <description>
- CSS style class to apply to the rendered label
- on disabled options.
- </description>
- <name>disabledClass</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- CSS style class to apply to the rendered label
- on enabled options.
- </description>
- <name>enabledClass</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- <p class="changed_modified_2_0">
- Flag indicating that, if this component is activated by the
- user,
- The "no selection option", if any, must be hidden.</p>
- </description>
- <name>hideNoSelectionOption</name>
- <required>false</required>
- <type>boolean</type>
- </attribute>
- <attribute>
- <description>
- A localized user presentable name for this component.
- </description>
- <name>label</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Code describing the language used in the generated markup
- for this component.
- </description>
- <name>lang</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Javascript code executed when this element loses focus.
- </description>
- <name>onblur</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Javascript code executed when this element loses focus
- and its value has been modified since gaining focus.
- </description>
- <name>onchange</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Javascript code executed when a pointer button is
- clicked over this element.
- </description>
- <name>onclick</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Javascript code executed when a pointer button is
- double clicked over this element.
- </description>
- <name>ondblclick</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Javascript code executed when this element receives focus.
- </description>
- <name>onfocus</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Javascript code executed when a key is
- pressed down over this element.
- </description>
- <name>onkeydown</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Javascript code executed when a key is
- pressed and released over this element.
- </description>
- <name>onkeypress</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Javascript code executed when a key is
- released over this element.
- </description>
- <name>onkeyup</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Javascript code executed when a pointer button is
- pressed down over this element.
- </description>
- <name>onmousedown</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Javascript code executed when a pointer button is
- moved within this element.
- </description>
- <name>onmousemove</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Javascript code executed when a pointer button is
- moved away from this element.
- </description>
- <name>onmouseout</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Javascript code executed when a pointer button is
- moved onto this element.
- </description>
- <name>onmouseover</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Javascript code executed when a pointer button is
- released over this element.
- </description>
- <name>onmouseup</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Javascript code executed when text within this
- element is selected by the user.
- </description>
- <name>onselect</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Flag indicating that this component will prohibit changes by
- the user. The element may receive focus unless it has also
- been disabled. A value of false causes
- no attribute to be rendered, while a value of true causes the
- attribute to be rendered as readonly="readonly".
- </description>
- <name>readonly</name>
- <required>false</required>
- <type>boolean</type>
- </attribute>
- <attribute>
- <description>
- CSS style(s) to be applied when this component is rendered.
- </description>
- <name>style</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Space-separated list of CSS style class(es) to be applied when
- this element is rendered. This value must be passed through
- as the "class" attribute on generated markup.
- </description>
- <name>styleClass</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Position of this element in the tabbing order
- for the current document. This value must be
- an integer between 0 and 32767.
- </description>
- <name>tabindex</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Advisory title information about markup elements generated
- for this component.
- </description>
- <name>title</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- The ValueExpression linking this component to a property in a
- backing bean
- </description>
- <name>binding</name>
- <required>false</required>
- <type>javax.faces.component.UIComponent</type>
- </attribute>
- </tag>
- <tag>
- <description>
- <p>Render an HTML option list.</p>
- <p><a name="decode">Decode Behavior</a></p>
- <ul>
- <p>See the <a
- href="SelectManyListbox.html">"Decode
- Behavior for UISelectOne Components"</a> section.</p>
- </ul>
- <p>Encode Behavior</p>
- <ul>
- <p>Render an HTML "select" element. Render the clientId of
- the component as the value of the "name" attribute. If the
- "styleClass"
- attribute is specified, render its value as the value of the "class"
- attribute on the "select" element. If the component
- to be rendered is a UISelectMany, render "multiple" as the value of
- the "multiple" attribute. If the "size" attribute is specified,
- render its value as the value of the "size" attribute. Otherwise
- use the number of items as the value of the "size" attribute. See
- the <a href="SelectManyListbox.html">"Rendering the option
- elements" </a> specification for <code>ListboxRenderer</code>
- for
- more detail on how to render the "option" elements in this
- renderer.</p>
- </ul>
- </description>
- <tag-name>selectOneListbox</tag-name>
- <component>
- <component-type>javax.faces.HtmlSelectOneListbox</component-type>
- <renderer-type>javax.faces.Listbox</renderer-type>
- </component>
- <attribute>
- <description>
- Converter instance registered with this component.
- </description>
- <name>converter</name>
- <required>false</required>
- <type>javax.faces.convert.Converter</type>
- </attribute>
- <attribute>
- <description>
- A ValueExpression enabled attribute that, if present, will be
- used as the text of the converter message, replacing any message
- that comes from the converter.
- </description>
- <name>converterMessage</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- The component identifier for this component. This value must be
- unique within the closest parent component that is a naming
- container.
- </description>
- <name>id</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Flag indicating that this component's value must be
- converted and validated immediately (that is, during
- Apply Request Values phase), rather than waiting
- until Process Validations phase.
- </description>
- <name>immediate</name>
- <required>false</required>
- <type>boolean</type>
- </attribute>
- <attribute>
- <description>
- Flag indicating whether or not this component should be rendered
- (during Render Response Phase), or processed on any subsequent
- form submit. The default value for this property is true.
- </description>
- <name>rendered</name>
- <required>false</required>
- <type>boolean</type>
- </attribute>
- <attribute>
- <description>
- Flag indicating that the user is required to provide a submitted
- value for this input component.
- </description>
- <name>required</name>
- <required>false</required>
- <type>boolean</type>
- </attribute>
- <attribute>
- <description>
- A ValueExpression enabled attribute that, if present, will be
- used as the text of the validation message for the "required"
- facility, if the "required" facility is used.
- </description>
- <name>requiredMessage</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- MethodExpression representing a validator method that will be
- called
- during Process Validations to perform correctness checks on the
- value of this component. The expression must evaluate to a
- public
- method that takes FacesContext, UIComponent, and Object
- parameters,
- with a return type of void.
- </description>
- <name>validator</name>
- <required>false</required>
- <method-signature>void validate(javax.faces.context.FacesContext,
- javax.faces.component.UIComponent, java.lang.Object)
- </method-signature>
- </attribute>
- <attribute>
- <description>
- A ValueExpression enabled attribute that, if present, will be
- used as the text of the validator message, replacing any
- message that comes from the validator.
- </description>
- <name>validatorMessage</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- The current value of this component.
- </description>
- <name>value</name>
- <required>false</required>
- <type>java.lang.Object</type>
- </attribute>
- <attribute>
- <description>
- <p>
- MethodExpression representing a value change listener method
- that will be notified when a new value has been set for this
- input component. The expression must evaluate to a public
- method that takes a <code>ValueChangeEvent</code>
- parameter,
- with a return type of void, <span class="changed_added_2_0">or
- to a public method that takes no arguments with a return type
- of void. In the latter case, the method has no way of easily
- knowing what the new value is, but this can be useful in cases
- where a notification is needed that "this value
- changed".</span>
- </p>
- </description>
- <name>valueChangeListener</name>
- <required>false</required>
- <method-signature>void
- valueChange(javax.faces.event.ValueChangeEvent)
- </method-signature>
- </attribute>
- <attribute>
- <description>
- Access key that, when pressed, transfers focus
- to this element.
- </description>
- <name>accesskey</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Direction indication for text that does not inherit
- directionality.
- Valid values are "LTR" (left-to-right) and "RTL"
- (right-to-left).
- </description>
- <name>dir</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Flag indicating that this element must never receive focus or
- be included in a subsequent submit. A value of false causes
- no attribute to be rendered, while a value of true causes the
- attribute to be rendered as disabled="disabled".
- </description>
- <name>disabled</name>
- <required>false</required>
- <type>boolean</type>
- </attribute>
- <attribute>
- <description>
- CSS style class to apply to the rendered label
- on disabled options.
- </description>
- <name>disabledClass</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- CSS style class to apply to the rendered label
- on enabled options.
- </description>
- <name>enabledClass</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- <p class="changed_modified_2_0">
- Flag indicating that, if this component is activated by the
- user,
- The "no selection option", if any, must be hidden.</p>
- </description>
- <name>hideNoSelectionOption</name>
- <required>false</required>
- <type>boolean</type>
- </attribute>
- <attribute>
- <description>
- A localized user presentable name for this component.
- </description>
- <name>label</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Code describing the language used in the generated markup
- for this component.
- </description>
- <name>lang</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Javascript code executed when this element loses focus.
- </description>
- <name>onblur</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Javascript code executed when this element loses focus
- and its value has been modified since gaining focus.
- </description>
- <name>onchange</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Javascript code executed when a pointer button is
- clicked over this element.
- </description>
- <name>onclick</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Javascript code executed when a pointer button is
- double clicked over this element.
- </description>
- <name>ondblclick</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Javascript code executed when this element receives focus.
- </description>
- <name>onfocus</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Javascript code executed when a key is
- pressed down over this element.
- </description>
- <name>onkeydown</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Javascript code executed when a key is
- pressed and released over this element.
- </description>
- <name>onkeypress</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Javascript code executed when a key is
- released over this element.
- </description>
- <name>onkeyup</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Javascript code executed when a pointer button is
- pressed down over this element.
- </description>
- <name>onmousedown</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Javascript code executed when a pointer button is
- moved within this element.
- </description>
- <name>onmousemove</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Javascript code executed when a pointer button is
- moved away from this element.
- </description>
- <name>onmouseout</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Javascript code executed when a pointer button is
- moved onto this element.
- </description>
- <name>onmouseover</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Javascript code executed when a pointer button is
- released over this element.
- </description>
- <name>onmouseup</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Javascript code executed when text within this
- element is selected by the user.
- </description>
- <name>onselect</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Flag indicating that this component will prohibit changes by
- the user. The element may receive focus unless it has also
- been disabled. A value of false causes
- no attribute to be rendered, while a value of true causes the
- attribute to be rendered as readonly="readonly".
- </description>
- <name>readonly</name>
- <required>false</required>
- <type>boolean</type>
- </attribute>
- <attribute>
- <description>
- Number of available options to be shown at all times.
- If not specified, all available options are shown.
- </description>
- <name>size</name>
- <required>false</required>
- <type>int</type>
- </attribute>
- <attribute>
- <description>
- CSS style(s) to be applied when this component is rendered.
- </description>
- <name>style</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Space-separated list of CSS style class(es) to be applied when
- this element is rendered. This value must be passed through
- as the "class" attribute on generated markup.
- </description>
- <name>styleClass</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Position of this element in the tabbing order
- for the current document. This value must be
- an integer between 0 and 32767.
- </description>
- <name>tabindex</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Advisory title information about markup elements generated
- for this component.
- </description>
- <name>title</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- The ValueExpression linking this component to a property in a
- backing bean
- </description>
- <name>binding</name>
- <required>false</required>
- <type>javax.faces.component.UIComponent</type>
- </attribute>
- </tag>
- <tag>
- <description>
- <p>Render an HTML option list.</p>
- <p><a name="decode">Decode Behavior</a></p>
- <ul>
- <p>See the <a
- href="SelectManyListbox.html">"Decode
- Behavior for UISelectOne Components"</a> section.</p>
- </ul>
- <p>Encode Behavior</p>
- <ul>
- <p>Render an HTML "select" element. Render the clientId of the
- component as the value of the "name" attribute. If the
- "styleClass" attribute is specified, render its value as the value
- of the "class" attribute on the "select" element. If the component
- to be rendered is a UISelectMany, render "true" as the value of
- the "multiple" attribute. Use the number of items as the value of
- the "size" attribute. See the <a
- href="SelectManyListbox.html">"Rendering
- the option elements" </a> specification for
- <code>ListboxRenderer</code> for more detail on how to
- render the
- "option" elements in this renderer.</p>
- </ul>
- </description>
- <tag-name>selectOneMenu</tag-name>
- <component>
- <component-type>javax.faces.HtmlSelectOneMenu</component-type>
- <renderer-type>javax.faces.Menu</renderer-type>
- </component>
- <attribute>
- <description>
- Converter instance registered with this component.
- </description>
- <name>converter</name>
- <required>false</required>
- <type>javax.faces.convert.Converter</type>
- </attribute>
- <attribute>
- <description>
- A ValueExpression enabled attribute that, if present, will be
- used as the text of the converter message, replacing any message
- that comes from the converter.
- </description>
- <name>converterMessage</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- The component identifier for this component. This value must be
- unique within the closest parent component that is a naming
- container.
- </description>
- <name>id</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Flag indicating that this component's value must be
- converted and validated immediately (that is, during
- Apply Request Values phase), rather than waiting
- until Process Validations phase.
- </description>
- <name>immediate</name>
- <required>false</required>
- <type>boolean</type>
- </attribute>
- <attribute>
- <description>
- Flag indicating whether or not this component should be rendered
- (during Render Response Phase), or processed on any subsequent
- form submit. The default value for this property is true.
- </description>
- <name>rendered</name>
- <required>false</required>
- <type>boolean</type>
- </attribute>
- <attribute>
- <description>
- Flag indicating that the user is required to provide a submitted
- value for this input component.
- </description>
- <name>required</name>
- <required>false</required>
- <type>boolean</type>
- </attribute>
- <attribute>
- <description>
- A ValueExpression enabled attribute that, if present, will be
- used as the text of the validation message for the "required"
- facility, if the "required" facility is used.
- </description>
- <name>requiredMessage</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- MethodExpression representing a validator method that will be
- called
- during Process Validations to perform correctness checks on the
- value of this component. The expression must evaluate to a
- public
- method that takes FacesContext, UIComponent, and Object
- parameters,
- with a return type of void.
- </description>
- <name>validator</name>
- <required>false</required>
- <method-signature>void validate(javax.faces.context.FacesContext,
- javax.faces.component.UIComponent, java.lang.Object)
- </method-signature>
- </attribute>
- <attribute>
- <description>
- A ValueExpression enabled attribute that, if present, will be
- used as the text of the validator message, replacing any
- message that comes from the validator.
- </description>
- <name>validatorMessage</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- The current value of this component.
- </description>
- <name>value</name>
- <required>false</required>
- <type>java.lang.Object</type>
- </attribute>
- <attribute>
- <description>
- <p>
- MethodExpression representing a value change listener method
- that will be notified when a new value has been set for this
- input component. The expression must evaluate to a public
- method that takes a <code>ValueChangeEvent</code>
- parameter,
- with a return type of void, <span class="changed_added_2_0">or
- to a public method that takes no arguments with a return type
- of void. In the latter case, the method has no way of easily
- knowing what the new value is, but this can be useful in cases
- where a notification is needed that "this value
- changed".</span>
- </p>
- </description>
- <name>valueChangeListener</name>
- <required>false</required>
- <method-signature>void
- valueChange(javax.faces.event.ValueChangeEvent)
- </method-signature>
- </attribute>
- <attribute>
- <description>
- Access key that, when pressed, transfers focus
- to this element.
- </description>
- <name>accesskey</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Direction indication for text that does not inherit
- directionality.
- Valid values are "LTR" (left-to-right) and "RTL"
- (right-to-left).
- </description>
- <name>dir</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Flag indicating that this element must never receive focus or
- be included in a subsequent submit. A value of false causes
- no attribute to be rendered, while a value of true causes the
- attribute to be rendered as disabled="disabled".
- </description>
- <name>disabled</name>
- <required>false</required>
- <type>boolean</type>
- </attribute>
- <attribute>
- <description>
- CSS style class to apply to the rendered label
- on disabled options.
- </description>
- <name>disabledClass</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- CSS style class to apply to the rendered label
- on enabled options.
- </description>
- <name>enabledClass</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- <p class="changed_modified_2_0">
- Flag indicating that, if this component is activated by the
- user,
- The "no selection option", if any, must be hidden.</p>
- </description>
- <name>hideNoSelectionOption</name>
- <required>false</required>
- <type>boolean</type>
- </attribute>
- <attribute>
- <description>
- A localized user presentable name for this component.
- </description>
- <name>label</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Code describing the language used in the generated markup
- for this component.
- </description>
- <name>lang</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Javascript code executed when this element loses focus.
- </description>
- <name>onblur</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Javascript code executed when this element loses focus
- and its value has been modified since gaining focus.
- </description>
- <name>onchange</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Javascript code executed when a pointer button is
- clicked over this element.
- </description>
- <name>onclick</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Javascript code executed when a pointer button is
- double clicked over this element.
- </description>
- <name>ondblclick</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Javascript code executed when this element receives focus.
- </description>
- <name>onfocus</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Javascript code executed when a key is
- pressed down over this element.
- </description>
- <name>onkeydown</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Javascript code executed when a key is
- pressed and released over this element.
- </description>
- <name>onkeypress</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Javascript code executed when a key is
- released over this element.
- </description>
- <name>onkeyup</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Javascript code executed when a pointer button is
- pressed down over this element.
- </description>
- <name>onmousedown</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Javascript code executed when a pointer button is
- moved within this element.
- </description>
- <name>onmousemove</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Javascript code executed when a pointer button is
- moved away from this element.
- </description>
- <name>onmouseout</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Javascript code executed when a pointer button is
- moved onto this element.
- </description>
- <name>onmouseover</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Javascript code executed when a pointer button is
- released over this element.
- </description>
- <name>onmouseup</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Javascript code executed when text within this
- element is selected by the user.
- </description>
- <name>onselect</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Flag indicating that this component will prohibit changes by
- the user. The element may receive focus unless it has also
- been disabled. A value of false causes
- no attribute to be rendered, while a value of true causes the
- attribute to be rendered as readonly="readonly".
- </description>
- <name>readonly</name>
- <required>false</required>
- <type>boolean</type>
- </attribute>
- <attribute>
- <description>
- CSS style(s) to be applied when this component is rendered.
- </description>
- <name>style</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Space-separated list of CSS style class(es) to be applied when
- this element is rendered. This value must be passed through
- as the "class" attribute on generated markup.
- </description>
- <name>styleClass</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Position of this element in the tabbing order
- for the current document. This value must be
- an integer between 0 and 32767.
- </description>
- <name>tabindex</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Advisory title information about markup elements generated
- for this component.
- </description>
- <name>title</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- The ValueExpression linking this component to a property in a
- backing bean
- </description>
- <name>binding</name>
- <required>false</required>
- <type>javax.faces.component.UIComponent</type>
- </attribute>
- </tag>
- <tag>
- <description>
- <p><span
- class="changed_modified_2_0">Render</span> a set of html
- "input" elements of type "radio".</p>
- <p><a name="decode">Decode Behavior</a></p>
- <ul>
- <p>See the <a
- href="SelectManyListbox.html">"Decode
- Behavior for UISelectOne Components"</a> section.</p>
- </ul>
- <p>Encode Behavior</p>
- <ul>
- <p>Render a "table" element. If the "styleClass" is specified,
- render the value of the "styleClass" attribute as the value of the
- "class" attribute on the "table" element. If the "style", "border"
- attributes are specified, pass them thru <span
- class="changed_added_2_0">and render their values as the "style"
- and "border" attributes on the "table", respectively.</span>.
- If
- the "layout" attribute is specified, and its value is
- "pageDirection", render the children elements vertically,
- otherwise horizontally, in the table. If any of the children are
- an instance of SelectItemGroup, render them as a nested table.
- Each of the children are ultimately rendered as follows. Render
- an "input" element of "type" "radio" for each child component.
- Render the "name" attribute on the "input" element with the value
- of the <code>clientId</code> of the component. Render an
- "id"
- attribute on the "input" element. Each "id" value must be unique.
- If the current SelectItem.isDisabled() returns true, render
- "disabled" as the value of the "disabled" attribute. Close out
- the "input" element. Render a "label" element. Render the "for"
- attribute of the "label" element whose value is the corresponding
- "input" element's "id" value. Render any "style" as the "class"
- attribute on the "label" element. Close out the starting "label"
- element and render the label value from SelectItem.getLabel().
- Close out the "label" element. As an exception to the general
- rules about how to handle the "id" attribute, render it as an
- attribute on the outer "table" element, the value of which is the
- <code>clientId</code> of the component per the rules at
- the
- beginning of this specification. Coerce the value of the
- currently rendered child to the type of the parent UISelectOne
- value using the Expression Language coercion rules before
- comparing the values. If the value of the currently rendered
- child is equal to the value of the parent UISelectOne, render an
- appropriate HTML boolean value indicating "checked" for the
- enclosing "input". See the <a
- href="SelectManyListbox.html">"Rendering
- the option elements" </a> specification for
- <code>ListboxRenderer</code> for more detail on how to
- render the
- "option" elements in this renderer.</p>
- </ul>
- </description>
- <tag-name>selectOneRadio</tag-name>
- <component>
- <component-type>javax.faces.HtmlSelectOneRadio</component-type>
- <renderer-type>javax.faces.Radio</renderer-type>
- </component>
- <attribute>
- <description>
- Converter instance registered with this component.
- </description>
- <name>converter</name>
- <required>false</required>
- <type>javax.faces.convert.Converter</type>
- </attribute>
- <attribute>
- <description>
- A ValueExpression enabled attribute that, if present, will be
- used as the text of the converter message, replacing any message
- that comes from the converter.
- </description>
- <name>converterMessage</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- The component identifier for this component. This value must be
- unique within the closest parent component that is a naming
- container.
- </description>
- <name>id</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Flag indicating that this component's value must be
- converted and validated immediately (that is, during
- Apply Request Values phase), rather than waiting
- until Process Validations phase.
- </description>
- <name>immediate</name>
- <required>false</required>
- <type>boolean</type>
- </attribute>
- <attribute>
- <description>
- Flag indicating whether or not this component should be rendered
- (during Render Response Phase), or processed on any subsequent
- form submit. The default value for this property is true.
- </description>
- <name>rendered</name>
- <required>false</required>
- <type>boolean</type>
- </attribute>
- <attribute>
- <description>
- Flag indicating that the user is required to provide a submitted
- value for this input component.
- </description>
- <name>required</name>
- <required>false</required>
- <type>boolean</type>
- </attribute>
- <attribute>
- <description>
- A ValueExpression enabled attribute that, if present, will be
- used as the text of the validation message for the "required"
- facility, if the "required" facility is used.
- </description>
- <name>requiredMessage</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- MethodExpression representing a validator method that will be
- called
- during Process Validations to perform correctness checks on the
- value of this component. The expression must evaluate to a
- public
- method that takes FacesContext, UIComponent, and Object
- parameters,
- with a return type of void.
- </description>
- <name>validator</name>
- <required>false</required>
- <method-signature>void validate(javax.faces.context.FacesContext,
- javax.faces.component.UIComponent, java.lang.Object)
- </method-signature>
- </attribute>
- <attribute>
- <description>
- A ValueExpression enabled attribute that, if present, will be
- used as the text of the validator message, replacing any
- message that comes from the validator.
- </description>
- <name>validatorMessage</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- The current value of this component.
- </description>
- <name>value</name>
- <required>false</required>
- <type>java.lang.Object</type>
- </attribute>
- <attribute>
- <description>
- <p>
- MethodExpression representing a value change listener method
- that will be notified when a new value has been set for this
- input component. The expression must evaluate to a public
- method that takes a <code>ValueChangeEvent</code>
- parameter,
- with a return type of void, <span class="changed_added_2_0">or
- to a public method that takes no arguments with a return type
- of void. In the latter case, the method has no way of easily
- knowing what the new value is, but this can be useful in cases
- where a notification is needed that "this value
- changed".</span>
- </p>
- </description>
- <name>valueChangeListener</name>
- <required>false</required>
- <method-signature>void
- valueChange(javax.faces.event.ValueChangeEvent)
- </method-signature>
- </attribute>
- <attribute>
- <description>
- Access key that, when pressed, transfers focus
- to this element.
- </description>
- <name>accesskey</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Width (in pixels) of the border to be drawn
- around the table containing the options list.
- </description>
- <name>border</name>
- <required>false</required>
- <type>int</type>
- </attribute>
- <attribute>
- <description>
- Direction indication for text that does not inherit
- directionality.
- Valid values are "LTR" (left-to-right) and "RTL"
- (right-to-left).
- </description>
- <name>dir</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Flag indicating that this element must never receive focus or
- be included in a subsequent submit. A value of false causes
- no attribute to be rendered, while a value of true causes the
- attribute to be rendered as disabled="disabled".
- </description>
- <name>disabled</name>
- <required>false</required>
- <type>boolean</type>
- </attribute>
- <attribute>
- <description>
- CSS style class to apply to the rendered label
- on disabled options.
- </description>
- <name>disabledClass</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- CSS style class to apply to the rendered label
- on enabled options.
- </description>
- <name>enabledClass</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- <p class="changed_modified_2_0">
- Flag indicating that, if this component is activated by the
- user,
- The "no selection option", if any, must be hidden.</p>
- </description>
- <name>hideNoSelectionOption</name>
- <required>false</required>
- <type>boolean</type>
- </attribute>
- <attribute>
- <description>
- A localized user presentable name for this component.
- </description>
- <name>label</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Code describing the language used in the generated markup
- for this component.
- </description>
- <name>lang</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Orientation of the options list to be created.
- Valid values are "pageDirection" (list is laid
- out vertically), or "lineDirection" (list is
- laid out horizontally). If not specified, the
- default value is "lineDirection".
- </description>
- <name>layout</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Javascript code executed when this element loses focus.
- </description>
- <name>onblur</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Javascript code executed when this element loses focus
- and its value has been modified since gaining focus.
- </description>
- <name>onchange</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Javascript code executed when a pointer button is
- clicked over this element.
- </description>
- <name>onclick</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Javascript code executed when a pointer button is
- double clicked over this element.
- </description>
- <name>ondblclick</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Javascript code executed when this element receives focus.
- </description>
- <name>onfocus</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Javascript code executed when a key is
- pressed down over this element.
- </description>
- <name>onkeydown</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Javascript code executed when a key is
- pressed and released over this element.
- </description>
- <name>onkeypress</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Javascript code executed when a key is
- released over this element.
- </description>
- <name>onkeyup</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Javascript code executed when a pointer button is
- pressed down over this element.
- </description>
- <name>onmousedown</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Javascript code executed when a pointer button is
- moved within this element.
- </description>
- <name>onmousemove</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Javascript code executed when a pointer button is
- moved away from this element.
- </description>
- <name>onmouseout</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Javascript code executed when a pointer button is
- moved onto this element.
- </description>
- <name>onmouseover</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Javascript code executed when a pointer button is
- released over this element.
- </description>
- <name>onmouseup</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Javascript code executed when text within this
- element is selected by the user.
- </description>
- <name>onselect</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Flag indicating that this component will prohibit changes by
- the user. The element may receive focus unless it has also
- been disabled. A value of false causes
- no attribute to be rendered, while a value of true causes the
- attribute to be rendered as readonly="readonly".
- </description>
- <name>readonly</name>
- <required>false</required>
- <type>boolean</type>
- </attribute>
- <attribute>
- <description>
- CSS style(s) to be applied when this component is rendered.
- </description>
- <name>style</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Space-separated list of CSS style class(es) to be applied when
- this element is rendered. This value must be passed through
- as the "class" attribute on generated markup.
- </description>
- <name>styleClass</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Position of this element in the tabbing order
- for the current document. This value must be
- an integer between 0 and 32767.
- </description>
- <name>tabindex</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Advisory title information about markup elements generated
- for this component.
- </description>
- <name>title</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- The ValueExpression linking this component to a property in a
- backing bean
- </description>
- <name>binding</name>
- <required>false</required>
- <type>javax.faces.component.UIComponent</type>
- </attribute>
- </tag>
- <tag>
- <description>
- <p>Renders a UIComponent that represents a single column of
- data within a parent <code>UIData</code> component.</p>
- </description>
- <tag-name>column</tag-name>
- <component>
- <component-type>javax.faces.Column</component-type>
- <renderer-type/>
- </component>
- <attribute>
- <description>
- Flag indicating whether or not this component should be rendered
- (during Render Response Phase), or processed on any subsequent
- form submit.
- </description>
- <name>rendered</name>
- <required>false</required>
- <type>java.lang.Boolean</type>
- </attribute>
- <attribute>
- <description>
- The value binding expression linking this component to a
- property in a backing bean
- </description>
- <name>binding</name>
- <required>false</required>
- <type>javax.faces.component.UIComponent</type>
- </attribute>
- <attribute>
- <description>
- The component identifier for the associated component
- </description>
- <name>id</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Space-separated list of CSS style class(es) that will be
- applied to any column footer generated for this table.
- </description>
- <name>footerClass</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Space-separated list of CSS style class(es) that will be
- applied to any column header generated for this table.
- </description>
- <name>headerClass</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Flag indicating that this column is a row header column and
- therefore cells in this column should be rendered with "th"
- instead of "td" and must have the 'scope="row"' attribute.
- </description>
- <name>rowHeader</name>
- <required>false</required>
- <type>boolean</type>
- </attribute>
- </tag>
-</facelet-taglib>
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/std-taglibs/jstl-core.taglib.xml b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/std-taglibs/jstl-core.taglib.xml
deleted file mode 100644
index ea0554c..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/std-taglibs/jstl-core.taglib.xml
+++ /dev/null
@@ -1,283 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!--
- DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
- Copyright 2009 Sun Microsystems, Inc. All rights reserved.
-
- The contents of this file are subject to the terms of either the GNU
- General Public License Version 2 only ("GPL") or the Common Development
- and Distribution License("CDDL") (collectively, the "License"). You
- may not use this file except in compliance with the License. You can obtain
- a copy of the License at https://glassfish.dev.java.net/public/CDDL+GPL.html
- or glassfish/bootstrap/legal/LICENSE.txt. See the License for the specific
- language governing permissions and limitations under the License.
-
- When distributing the software, include this License Header Notice in each
- file and include the License file at glassfish/bootstrap/legal/LICENSE.txt.
- Sun designates this particular file as subject to the "Classpath" exception
- as provided by Sun in the GPL Version 2 section of the License file that
- accompanied this code. If applicable, add the following below the License
- Header, with the fields enclosed by brackets [] replaced by your own
- identifying information: "Portions Copyrighted [year]
- [name of copyright owner]"
-
- Contributor(s):
-
- If you wish your version of this file to be governed by only the CDDL or
- only the GPL Version 2, indicate your decision by adding "[Contributor]
- elects to include this software in this distribution under the [CDDL or GPL
- Version 2] license." If you don't indicate a single choice of license, a
- recipient has the option to distribute your version of this file under
- either the CDDL, the GPL Version 2 or to extend the choice of license to
- its licensees as provided above. However, if you add GPL Version 2 code
- and therefore, elected the GPL Version 2 license, then the option applies
- only if the new code is made subject to such option by the copyright
- holder.
--->
-
-<facelet-taglib xmlns="http://java.sun.com/xml/ns/javaee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facelettaglibrary_2_0.xsd"
- version="2.0">
- <description>JSTL 1.2 core library</description>
- <namespace>http://java.sun.com/jsp/jstl/core</namespace>
- <tag>
- <description>
- Catches any Throwable that occurs in its body and optionally
- exposes it.
- </description>
- <tag-name>catch</tag-name>
- <handler-class>com.sun.faces.facelets.tag.jstl.core.CatchHandler</handler-class>
- <attribute>
- <description>
- Name of the exported scoped variable for the
- exception thrown from a nested action. The type of the
- scoped variable is the type of the exception thrown.
- </description>
- <name>var</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- </tag>
- <tag>
- <description>
- Simple conditional tag that establishes a context for
- mutually exclusive conditional operations, marked by
- <when> and <otherwise>
- </description>
- <tag-name>choose</tag-name>
- <handler-class>com.sun.faces.facelets.tag.jstl.core.ChooseHandler</handler-class>
- </tag>
- <tag>
- <description>
- Simple conditional tag, which evalutes its body if the
- supplied condition is true and optionally exposes a Boolean
- scripting variable representing the evaluation of this condition
- </description>
- <tag-name>if</tag-name>
- <handler-class>com.sun.faces.facelets.tag.jstl.core.IfHandler</handler-class>
- <attribute>
- <description>
- The test condition that determines whether or
- not the body content should be processed.
- </description>
- <name>test</name>
- <required>true</required>
- <type>boolean</type>
- </attribute>
- <attribute>
- <description>
- Name of the exported scoped variable for the
- resulting value of the test condition. The type
- of the scoped variable is Boolean.
- </description>
- <name>var</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Scope for var.
- </description>
- <name>scope</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- </tag>
- <tag>
- <description>
- The basic iteration tag, accepting many different
- collection types and supporting subsetting and other
- functionality
- </description>
- <tag-name>forEach</tag-name>
- <handler-class>com.sun.faces.facelets.tag.jstl.core.ForEachHandler</handler-class>
- <attribute>
- <description>
- Collection of items to iterate over.
- </description>
- <name>items</name>
- <required>false</required>
- <type>java.lang.Object</type>
- </attribute>
- <attribute>
- <description>
- If items specified:
- Iteration begins at the item located at the
- specified index. First item of the collection has
- index 0.
- If items not specified:
- Iteration begins with index set at the value
- specified.
- </description>
- <name>begin</name>
- <required>false</required>
- <type>int</type>
- </attribute>
- <attribute>
- <description>
- If items specified:
- Iteration ends at the item located at the
- specified index (inclusive).
- If items not specified:
- Iteration ends when index reaches the value
- specified.
- </description>
- <name>end</name>
- <required>false</required>
- <type>int</type>
- </attribute>
- <attribute>
- <description>
- Iteration will only process every step items of
- the collection, starting with the first one.
- </description>
- <name>step</name>
- <required>false</required>
- <type>int</type>
- </attribute>
- <attribute>
- <description>
- Name of the exported scoped variable for the
- current item of the iteration. This scoped
- variable has nested visibility. Its type depends
- on the object of the underlying collection.
- </description>
- <name>var</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Name of the exported scoped variable for the
- status of the iteration. Object exported is of type
- javax.servlet.jsp.jstl.core.LoopTagStatus. This scoped variable
- has nested
- visibility.
- </description>
- <name>varStatus</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- </tag>
- <tag>
- <description>
- Subtag of <choose> that follows <when> tags
- and runs only if all of the prior conditions evaluated to
- 'false'
- </description>
- <tag-name>otherwise</tag-name>
- <handler-class>com.sun.faces.facelets.tag.jstl.core.ChooseOtherwiseHandler</handler-class>
- </tag>
- <tag>
- <description>
- <p>Sets the result of an expression evaluation based on the
- value of the attributes. If "scope" the is present, but has a zero
- length or is equal to the string "page", <code>TagException</code>
- is
- thrown with an informative error message, ensuring page location
- information is saved.</p>
-
- <p>This handler operates in one of two ways.
-
- <ol>
-
- <li><p>The user has set "var", "value" and (optionally)
- "scope" attributes.</p></li>
-
- <li><p>The user has set "target", "property", and
- "value"
- attributes.</p></li>
-
-
- </ol>
-
- <p>The first case takes precedence over the second.</p>
-
-
- </description>
- <tag-name>set</tag-name>
- <handler-class>com.sun.faces.facelets.tag.jstl.core.SetHandler</handler-class>
- <attribute>
- <description>
- Name of the exported scoped variable to hold the value
- specified in the action. The type of the scoped variable is
- whatever type the value expression evaluates to.
- </description>
- <name>var</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Expression to be evaluated.
- </description>
- <name>value</name>
- <required>false</required>
- <type>java.lang.Object</type>
- </attribute>
- <attribute>
- <description>
- Target object whose property will be set. Must evaluate to
- a JavaBeans object with setter property property, or to a
- java.util.Map object.
- </description>
- <name>target</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Name of the property to be set in the target object.
- </description>
- <name>property</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
- Scope for var.
- </description>
- <name>scope</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- </tag>
- <tag>
- <description>
- Subtag of <choose> that includes its body if its
- condition evalutes to 'true'
- </description>
- <tag-name>when</tag-name>
- <handler-class>com.sun.faces.facelets.tag.jstl.core.ChooseWhenHandler</handler-class>
- <attribute>
- <description>
- The test condition that determines whether or not the
- body content should be processed.
- </description>
- <name>test</name>
- <required>true</required>
- <type>boolean</type>
- </attribute>
- </tag>
-</facelet-taglib>
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/std-taglibs/jstl-fn.taglib.xml b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/std-taglibs/jstl-fn.taglib.xml
deleted file mode 100644
index 86acd9b..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/std-taglibs/jstl-fn.taglib.xml
+++ /dev/null
@@ -1,173 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!--
- DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
- Copyright 2009 Sun Microsystems, Inc. All rights reserved.
-
- The contents of this file are subject to the terms of either the GNU
- General Public License Version 2 only ("GPL") or the Common Development
- and Distribution License("CDDL") (collectively, the "License"). You
- may not use this file except in compliance with the License. You can obtain
- a copy of the License at https://glassfish.dev.java.net/public/CDDL+GPL.html
- or glassfish/bootstrap/legal/LICENSE.txt. See the License for the specific
- language governing permissions and limitations under the License.
-
- When distributing the software, include this License Header Notice in each
- file and include the License file at glassfish/bootstrap/legal/LICENSE.txt.
- Sun designates this particular file as subject to the "Classpath" exception
- as provided by Sun in the GPL Version 2 section of the License file that
- accompanied this code. If applicable, add the following below the License
- Header, with the fields enclosed by brackets [] replaced by your own
- identifying information: "Portions Copyrighted [year]
- [name of copyright owner]"
-
- Contributor(s):
-
- If you wish your version of this file to be governed by only the CDDL or
- only the GPL Version 2, indicate your decision by adding "[Contributor]
- elects to include this software in this distribution under the [CDDL or GPL
- Version 2] license." If you don't indicate a single choice of license, a
- recipient has the option to distribute your version of this file under
- either the CDDL, the GPL Version 2 or to extend the choice of license to
- its licensees as provided above. However, if you add GPL Version 2 code
- and therefore, elected the GPL Version 2 license, then the option applies
- only if the new code is made subject to such option by the copyright
- holder.
--->
-
-<facelet-taglib xmlns="http://java.sun.com/xml/ns/javaee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facelettaglibrary_2_0.xsd"
- version="2.0">
- <description>JSTL 1.1 functions library</description>
- <namespace>http://java.sun.com/jsp/jstl/functions</namespace>
- <function>
- <description>
- Tests if an input string contains the specified substring.
- </description>
- <function-name>contains</function-name>
- <function-class>com.sun.faces.facelets.tag.jstl.fn.JstlFunction</function-class>
- <function-signature>boolean contains(java.lang.String, java.lang.String)</function-signature>
- </function>
- <function>
- <description>
- Tests if an input string contains the specified substring in a case insensitive way.
- </description>
- <function-name>containsIgnoreCase</function-name>
- <function-class>com.sun.faces.facelets.tag.jstl.fn.JstlFunction</function-class>
- <function-signature>boolean containsIgnoreCase(java.lang.String, java.lang.String)</function-signature>
- </function>
- <function>
- <description>
- Tests if an input string ends with the specified suffix.
- </description>
- <function-name>endsWith</function-name>
- <function-class>com.sun.faces.facelets.tag.jstl.fn.JstlFunction</function-class>
- <function-signature>boolean endsWith(java.lang.String, java.lang.String)</function-signature>
- </function>
- <function>
- <description>
- Escapes characters that could be interpreted as XML markup.
- </description>
- <function-name>escapeXml</function-name>
- <function-class>com.sun.faces.facelets.tag.jstl.fn.JstlFunction</function-class>
- <function-signature>java.lang.String escapeXml(java.lang.String)</function-signature>
- </function>
- <function>
- <description>
- Returns the index withing a string of the first occurrence of a specified substring.
- </description>
- <function-name>indexOf</function-name>
- <function-class>com.sun.faces.facelets.tag.jstl.fn.JstlFunction</function-class>
- <function-signature>int indexOf(java.lang.String, java.lang.String)</function-signature>
- </function>
- <function>
- <description>
- Joins all elements of an array into a string.
- </description>
- <function-name>join</function-name>
- <function-class>com.sun.faces.facelets.tag.jstl.fn.JstlFunction</function-class>
- <function-signature>java.lang.String join(java.lang.String[], java.lang.String)</function-signature>
- </function>
- <function>
- <description>
- Returns the number of items in a collection, or the number of characters in a string.
- </description>
- <function-name>length</function-name>
- <function-class>com.sun.faces.facelets.tag.jstl.fn.JstlFunction</function-class>
- <function-signature>int length(java.lang.Object)</function-signature>
- </function>
- <function>
- <description>
- Returns a string resulting from replacing in an input string all occurrences
- of a "before" string into an "after" substring.
- </description>
- <function-name>replace</function-name>
- <function-class>com.sun.faces.facelets.tag.jstl.fn.JstlFunction</function-class>
- <function-signature>java.lang.String replace(java.lang.String, java.lang.String, java.lang.String)</function-signature>
- </function>
- <function>
- <description>
- Splits a string into an array of substrings.
- </description>
- <function-name>split</function-name>
- <function-class>com.sun.faces.facelets.tag.jstl.fn.JstlFunction</function-class>
- <function-signature>java.lang.String[] split(java.lang.String, java.lang.String)</function-signature>
- </function>
- <function>
- <description>
- Tests if an input string starts with the specified prefix.
- </description>
- <function-name>startsWith</function-name>
- <function-class>com.sun.faces.facelets.tag.jstl.fn.JstlFunction</function-class>
- <function-signature>boolean startsWith(java.lang.String, java.lang.String)</function-signature>
- </function>
- <function>
- <description>
- Returns a subset of a string.
- </description>
- <function-name>substring</function-name>
- <function-class>com.sun.faces.facelets.tag.jstl.fn.JstlFunction</function-class>
- <function-signature>java.lang.String substring(java.lang.String, int, int)</function-signature>
- </function>
- <function>
- <description>
- Returns a subset of a string following a specific substring.
- </description>
- <function-name>substringAfter</function-name>
- <function-class>com.sun.faces.facelets.tag.jstl.fn.JstlFunction</function-class>
- <function-signature>java.lang.String substringAfter(java.lang.String, java.lang.String)</function-signature>
- </function>
- <function>
- <description>
- Returns a subset of a string before a specific substring.
- </description>
- <function-name>substringBefore</function-name>
- <function-class>com.sun.faces.facelets.tag.jstl.fn.JstlFunction</function-class>
- <function-signature>java.lang.String substringBefore(java.lang.String, java.lang.String)</function-signature>
- </function>
- <function>
- <description>
- Converts all of the characters of a string to lower case.
- </description>
- <function-name>toLowerCase</function-name>
- <function-class>com.sun.faces.facelets.tag.jstl.fn.JstlFunction</function-class>
- <function-signature>java.lang.String toLowerCase(java.lang.String)</function-signature>
- </function>
- <function>
- <description>
- Converts all of the characters of a string to upper case.
- </description>
- <function-name>toUpperCase</function-name>
- <function-class>com.sun.faces.facelets.tag.jstl.fn.JstlFunction</function-class>
- <function-signature>java.lang.String toUpperCase(java.lang.String)</function-signature>
- </function>
- <function>
- <description>
- Removes white spaces from both ends of a string.
- </description>
- <function-name>trim</function-name>
- <function-class>com.sun.faces.facelets.tag.jstl.fn.JstlFunction</function-class>
- <function-signature>java.lang.String trim(java.lang.String)</function-signature>
- </function>
-</facelet-taglib>
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/std-taglibs/ui.taglib.xml b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/std-taglibs/ui.taglib.xml
deleted file mode 100644
index a9358d9..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/std-taglibs/ui.taglib.xml
+++ /dev/null
@@ -1,1026 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!--
- DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
- Copyright 2009 Sun Microsystems, Inc. All rights reserved.
-
- The contents of this file are subject to the terms of either the GNU
- General Public License Version 2 only ("GPL") or the Common Development
- and Distribution License("CDDL") (collectively, the "License"). You
- may not use this file except in compliance with the License. You can obtain
- a copy of the License at https://glassfish.dev.java.net/public/CDDL+GPL.html
- or glassfish/bootstrap/legal/LICENSE.txt. See the License for the specific
- language governing permissions and limitations under the License.
-
- When distributing the software, include this License Header Notice in each
- file and include the License file at glassfish/bootstrap/legal/LICENSE.txt.
- Sun designates this particular file as subject to the "Classpath" exception
- as provided by Sun in the GPL Version 2 section of the License file that
- accompanied this code. If applicable, add the following below the License
- Header, with the fields enclosed by brackets [] replaced by your own
- identifying information: "Portions Copyrighted [year]
- [name of copyright owner]"
-
- Contributor(s):
-
- If you wish your version of this file to be governed by only the CDDL or
- only the GPL Version 2, indicate your decision by adding "[Contributor]
- elects to include this software in this distribution under the [CDDL or GPL
- Version 2] license." If you don't indicate a single choice of license, a
- recipient has the option to distribute your version of this file under
- either the CDDL, the GPL Version 2 or to extend the choice of license to
- its licensees as provided above. However, if you add GPL Version 2 code
- and therefore, elected the GPL Version 2 license, then the option applies
- only if the new code is made subject to such option by the copyright
- holder.
--->
-
-<facelet-taglib xmlns="http://java.sun.com/xml/ns/javaee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facelettaglibrary_2_0.xsd"
- version="2.0">
- <description>
-
- </pre>
-
- <div class="changed_added_2_0">
-
- <p>The tags in this library add templating&#8212;a powerful
- view composition technique&#8212;to JSF.
- Templating is so useful that there are entire frameworks, such as Tiles
- and SiteMesh, that are built
- around the concept of templating. So what is templating, how can you
- benefit from it, and how does
- this tag library implement it?
- </p>
-
- <p>If you've used JSP before, you've probably used <code>jsp:include</code>.
- The prototypical example for
- <code>jsp:include</code> is a header on each page in a web
- application. One JSP page, say header.jsp,
- encapsulates the header content, and the header is included by each
- page. You <em>encapsulate and reuse
- content</em>, so that changes to one file, header.jsp, affect the
- header on every page.
- </p>
-
- <p>This tab library contains a tag&#8212<code>ui:include</code>&#8212
- that's analagous to <code>jsp:include</code>,
- but encapsulating and reusing content is only half the templating story,
- because templating also lets you
- <em>encapsulate and reuse <b>layout</b></em>.
- You define a single <em>template</em> (meaning layout), and
- you reuse
- that template with multiple <em>compositions</em>. So now
- you can control the layout of many pages with a single
- template (layout). Let's take a look at an example.
- </p>
-
- <h3>A Templating Example</h3>
-
- <p>
- First, we define a template:
- </p>
- <div class="syntax"><div class="html4strict"
- style="font-family: monospace;"><ol><li class="li1"><div
- class="de1"><span class="sc0">&lt;!DOCTYPE html PUBLIC
- &quot;-//W3C//DTD XHTML 1.0 Transitional//EN&quot;</div></li>
-
- <li class="li2"><div class="de2">&nbsp; &nbsp; &nbsp;
- &nbsp; &nbsp; &nbsp; &nbsp; &quot;http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd&quot;&gt;</span></div></li>
- <li class="li1"><div class="de1">&nbsp;</div></li>
- <li class="li2"><div class="de2"><span class="sc3"><span
- class="re1">&lt;html</span> <span class="re0">xmlns</span>=<span
- class="st0">&quot;http://www.w3.org/1999/xhtml&quot;</span></div></li>
- <li class="li1"><div class="de1">&nbsp; &nbsp; &nbsp;
- &nbsp; &nbsp; &nbsp; xmlns:<span class="re0">ui</span>=<span
- class="st0">&quot;http://java.sun.com/jsf/facelets&quot;</span></div></li>
-
- <li class="li1"><div class="de1">&nbsp; &nbsp; <span
- class="sc3"><span class="re1">&lt;head<span class="re2">&gt;</span></span></span></div></li>
- <li class="li2"><div class="de2">&nbsp; &nbsp; &nbsp;
- <span class="sc3"><span class="re1">&lt;link</span>
- <span class="re0">href</span>=<span class="st0">&quot;styles.css&quot;</span>
- <span class="re0">rel</span>=<span class="st0">&quot;stylesheet&quot;</span>
- <span class="re0">type</span>=<span class="st0">&quot;text/css&quot;</span><span
- class="re2">/&gt;</span></span></div></li>
-
- <li class="li1"><div class="de1">&nbsp; &nbsp; &nbsp;
- <span class="sc3"><span class="re1">&lt;title<span
- class="re2">&gt;</span></span></span><span
- class="sc3"><span class="re1">&lt;ui</span>:insert
- <span class="re0">name</span>=<span class="st0">&quot;title&quot;</span><span
- class="re2">&gt;</span></span>Default Title<span
- class="sc3"><span class="re1">&lt;/ui</span>:insert<span
- class="re2">&gt;</span></span><span class="sc3"><span
- class="re1">&lt;/title<span class="re2">&gt;</span></span></span></div></li>
- <li class="li2"><div class="de2">&nbsp; &nbsp; <span
- class="sc3"><span class="re1">&lt;/head<span class="re2">&gt;</span></span></span></div></li>
-
- <li class="li1"><div class="de1">&nbsp;</div></li>
- <li class="li2"><div class="de2">&nbsp; &nbsp; <span
- class="sc3"><span class="re1">&lt;body<span class="re2">&gt;</span></span></span></div></li>
- <li class="li1"><div class="de1">&nbsp; &nbsp; &nbsp;
- <span class="sc3"><span class="re1">&lt;ui</span>:debug<span
- class="re2">/&gt;</span></span></div></li>
- <li class="li2"><div class="de2">&nbsp; &nbsp; &nbsp;
- <span class="sc3"><span class="re1">&lt;div</span>
- <span class="re0">class</span>=<span class="st0">&quot;heading&quot;</span><span
- class="re2">&gt;</span></span></div></li>
-
- <li class="li1"><div class="de1">&nbsp; &nbsp; &nbsp;
- &nbsp; <span class="sc3"><span class="re1">&lt;ui</span>:insert
- <span class="re0">name</span>=<span class="st0">&quot;heading&quot;</span><span
- class="re2">/&gt;</span></span></div></li>
- <li class="li2"><div class="de2">&nbsp; &nbsp; &nbsp;
- <span class="sc3"><span class="re1">&lt;/div<span
- class="re2">&gt;</span></span></span></div></li>
- <li class="li1"><div class="de1">&nbsp;</div></li>
-
- <li class="li2"><div class="de2">&nbsp; &nbsp; &nbsp;
- <span class="sc3"><span class="re1">&lt;div</span>
- <span class="re0">class</span>=<span class="st0">&quot;content&quot;</span><span
- class="re2">&gt;</span></span></div></li>
- <li class="li1"><div class="de1">&nbsp; &nbsp; &nbsp;
- &nbsp; <span class="sc3"><span class="re1">&lt;ui</span>:insert
- <span class="re0">name</span>=<span class="st0">&quot;content&quot;</span><span
- class="re2">/&gt;</span></span></div></li>
-
- <li class="li2"><div class="de2">&nbsp; &nbsp; &nbsp;
- <span class="sc3"><span class="re1">&lt;/div<span
- class="re2">&gt;</span></span></span></div></li>
- <li class="li1"><div class="de1">&nbsp; &nbsp; <span
- class="sc3"><span class="re1">&lt;/body<span class="re2">&gt;</span></span></span></div></li>
- <li class="li2"><div class="de2"><span class="sc3"><span
- class="re1">&lt;/html<span class="re2">&gt;</span></span></span>
- </div></li></ol></div></div>
-
- <p>
- In the preceeding listing, we've defined a layout, also known as a
- template. That template uses the
- <code>ui:insert</code> tag to insert pieces of a page &#8212namely,
- title, heading, and content&#8212
- defined in a <em>composition</em>. Notice that on line 8, we
- define a default title, in case one isn't provided
- by the composition. Also note that on line 12 we have the <code>ui:debug</code>
- tag, which lets the user activate
- a popup window with debugging information by typing CTRL + Shift + d.
- </p>
-
- <p>
- The title, heading, and content pieces of the page referenced in the
- template are defined in a separate XHTML
- file in a composition, like this:
- </p>
-
- <div class="syntax"><div class="html4strict"
- style="font-family: monospace;"><ol><li class="li1"><div
- class="de1"><span class="sc0">&lt;!DOCTYPE html PUBLIC
- &quot;-//W3C//DTD XHTML 1.0 Transitional//EN&quot;</div></li>
-
- <li class="li2"><div class="de2">&nbsp; &nbsp; &nbsp;
- &nbsp; &quot;http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd&quot;&gt;</span></div></li>
- <li class="li1"><div class="de1">&nbsp;</div></li>
- <li class="li2"><div class="de2"><span class="sc3"><span
- class="re1">&lt;html</span> <span class="re0">xmlns</span>=<span
- class="st0">&quot;http://www.w3.org/1999/xhtml&quot;</span></div></li>
- <li class="li1"><div class="de1">&nbsp; &nbsp;xmlns:<span
- class="re0">ui</span>=<span class="st0">&quot;http://java.sun.com/jsf/facelets&quot;</span><span
- class="re2">&gt;</span></span></div></li>
-
- <li class="li2"><div class="de2">&nbsp;</div></li>
- <li class="li1"><div class="de1">&nbsp; <span
- class="sc3"><span class="re1">&lt;body<span class="re2">&gt;</span></span></span></div></li>
- <li class="li2"><div class="de2">&nbsp; &nbsp; <span
- class="sc3"><span class="re1">&lt;ui</span>:composition
- <span class="re0">template</span>=<span class="st0">&quot;/layout.xhtml&quot;</span><span
- class="re2">&gt;</span></span></div></li>
- <li class="li1"><div class="de1">&nbsp;</div></li>
- <li class="li2"><div class="de2">&nbsp; &nbsp; &nbsp;
- <span class="sc3"><span class="re1">&lt;ui</span>:define
- <span class="re0">name</span>=<span class="st0">&quot;title&quot;</span><span
- class="re2">&gt;</span></span>A List of Contacts<span
- class="sc3"><span class="re1">&lt;/ui</span>:define<span
- class="re2">&gt;</span></span></div></li>
-
- <li class="li1"><div class="de1">&nbsp; &nbsp; &nbsp;
- <span class="sc3"><span class="re1">&lt;ui</span>:define
- <span class="re0">name</span>=<span class="st0">&quot;heading&quot;</span><span
- class="re2">&gt;</span></span>Contacts<span
- class="sc3"><span class="re1">&lt;/ui</span>:define<span
- class="re2">&gt;</span></span></div></li>
- <li class="li2"><div class="de2">&nbsp;</div></li>
- <li class="li1"><div class="de1">&nbsp; &nbsp; &nbsp;
- <span class="sc3"><span class="re1">&lt;ui</span>:define
- <span class="re0">name</span>=<span class="st0">&quot;content&quot;</span><span
- class="re2">&gt;</span></span></div></li>
-
- <li class="li2"><div class="de2">&nbsp; &nbsp; &nbsp;
- &nbsp; <span class="sc3"><span class="re1">&lt;ui</span>:include
- <span class="re0">src</span>=<span class="st0">&quot;contactsTable.xhtml&quot;</span>
- <span class="re2">/&gt;</span></span></div></li>
- <li class="li1"><div class="de1">&nbsp; &nbsp; &nbsp;
- <span class="sc3"><span class="re1">&lt;/ui</span>:define<span
- class="re2">&gt;</span></span></div></li>
-
- <li class="li2"><div class="de2">&nbsp; &nbsp; &nbsp;
- &nbsp; &nbsp;</div></li>
- <li class="li1"><div class="de1">&nbsp; &nbsp; <span
- class="sc3"><span class="re1">&lt;/ui</span>:composition<span
- class="re2">&gt;</span></span></div></li>
- <li class="li2"><div class="de2">&nbsp; <span
- class="sc3"><span class="re1">&lt;/body<span class="re2">&gt;</span></span></span></div></li>
- <li class="li1"><div class="de1"><span class="sc3"><span
- class="re1">&lt;/html<span class="re2">&gt;</span></span></span>
- </div></li></ol></div></div>
-
- <p>
- At runtime, JSF synthesizes the two previous XHTML pages to create a
- single JSF view by inserting the
- pieces defined in the composition into the template (that template is
- layout.xhtml, which is the first
- listing above). JSF also disregards everything outside of the <code>composition</code>
- tag so that we don't
- wind up with two <code>body</code> elements in the view.
- Also, note that we use the <code>ui:include</code>
- tag on line 14 to include content (which happens to be a table) from
- another XHTML page, so that we can reuse
- that table in other views.
- </p>
-
- <p>
- So why do we have two XHTML pages to define a single view? Why not
- simply take the pieces and manually insert
- them into the layout so that we have only a single XHTML page? The
- answer is simple: we have separated layout
- from the content so that we can <em>reuse that layout</em>
- among multiple compositions. For example, now we can
- define another composition that uses the same layout:
- </p>
-
- <div class="syntax"><div class="html4strict"
- style="font-family: monospace;"><ol><li class="li1"><div
- class="de1"><span class="sc0">&lt;!DOCTYPE html PUBLIC
- &quot;-//W3C//DTD XHTML 1.0 Transitional//EN&quot;</div></li>
-
- <li class="li2"><div class="de2">&nbsp; &nbsp; &nbsp;
- &nbsp; &quot;http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd&quot;&gt;</span></div></li>
- <li class="li1"><div class="de1">&nbsp;</div></li>
- <li class="li2"><div class="de2"><span class="sc3"><span
- class="re1">&lt;html</span> <span class="re0">xmlns</span>=<span
- class="st0">&quot;http://www.w3.org/1999/xhtml&quot;</span></div></li>
- <li class="li1"><div class="de1">&nbsp; &nbsp; &nbsp;
- xmlns:<span class="re0">ui</span>=<span class="st0">&quot;http://java.sun.com/jsf/facelets&quot;</span><span
- class="re2">&gt;</span></span></div></li>
-
- <li class="li2"><div class="de2">&nbsp;</div></li>
- <li class="li1"><div class="de1">&nbsp; <span
- class="sc3"><span class="re1">&lt;body<span class="re2">&gt;</span></span></span></div></li>
- <li class="li2"><div class="de2">&nbsp; &nbsp; <span
- class="sc3"><span class="re1">&lt;ui</span>:composition
- <span class="re0">template</span>=<span class="st0">&quot;/layout.xhtml&quot;</span><span
- class="re2">&gt;</span></span></div></li>
-
- <li class="li2"><div class="de2">&nbsp;</div></li>
-
- <li class="li1"><div class="de1">&nbsp; &nbsp; &nbsp;
- <span class="sc3"><span class="re1">&lt;ui</span>:define
- <span class="re0">name</span>=<span class="st0">&quot;title&quot;</span><span
- class="re2">&gt;</span></span>Create a Contact<span
- class="sc3"><span class="re1">&lt;/ui</span>:define<span
- class="re2">&gt;</span></span></div></li>
-
- <li class="li1"><div class="de1">&nbsp; &nbsp; &nbsp;
- <span class="sc3"><span class="re1">&lt;ui</span>:define
- <span class="re0">name</span>=<span class="st0">&quot;heading&quot;</span><span
- class="re2">&gt;</span></span>Create Contact&lt;/ui</span>:define<span
- class="re2">&gt;</span></span></div></li>
-
- <li class="li2"><div class="de2">&nbsp;</div></li>
- <li class="li1"><div class="de1">&nbsp; &nbsp; &nbsp;
- <span class="sc3"><span class="re1">&lt;ui</span>:define
- <span class="re0">name</span>=<span class="st0">&quot;content&quot;</span><span
- class="re2">&gt;</span></span></div></li>
- <li class="li2"><div class="de2">&nbsp; &nbsp; &nbsp;
- &nbsp; <span class="sc3"><span class="re1">&lt;ui</span>:include
- <span class="re0">src</span>=<span class="st0">&quot;createContactForm.xhtml&quot;</span><span
- class="re2">/&gt;</span></span></div></li>
-
- <li class="li1"><div class="de1">&nbsp; &nbsp; &nbsp;
- <span class="sc3"><span class="re1">&lt;/ui</span>:define<span
- class="re2">&gt;</span></span></div></li>
-
- <li class="li2"><div class="de2">&nbsp;</div></li>
-
- <li class="li2"><div class="de2">&nbsp; &nbsp; <span
- class="sc3"><span class="re1">&lt;/ui</span>:composition<span
- class="re2">&gt;</span></span></div></li>
- <li class="li1"><div class="de1">&nbsp; <span
- class="sc3"><span class="re1">&lt;/body<span class="re2">&gt;</span></span></span></div></li>
- <li class="li2"><div class="de2"><span class="sc3"><span
- class="re1">&lt;/html<span class="re2">&gt;</span></span></span>
- </div></li></ol></div></div>
-
- <p>
- By encapsulating the layout, we can reuse that layout among multiple
- compositions. Just like
- <code>ui:include</code> lets us encapsulate and reuse
- conent, JSF compositions let us encapsulate and reuse
- layout, so that changes to a single layout can affect multiple views.
- Fundamentally, that's what this
- tag library is all about.
- </p>
-
- </div>
- <pre>
-
- </description>
- <namespace>http://java.sun.com/jsf/facelets</namespace>
- <tag>
- <description>
-
-
- <div class="changed_added_2_0">
- <p>
- This tag is the same as the <code>ui:composition</code>,
- except for two things:
- JSF creates a component and adds it directly to the tree, and
- there's no associated
- template.
- </p>
-
- <p>
- Use this tag to create a component and specify a filename for the
- component as either the source of a <code>ui:include</code>,
- or the source of a Facelets tag.
- </p>
- </div>
-
- </description>
- <tag-name>component</tag-name>
- <handler-class>com.sun.faces.facelets.tag.ui.ComponentRefHandler</handler-class>
- <attribute>
- <description>
-
-
- <div class="changed_added_2_0">
- <p>
- The identifier of the component that JSF inserts into the
- component tree. If an identifier is
- not explicitly specified by the page author, JSF will assign an
- identifier based on the algorithm
- that it uses for all components.
- </p>
- </div>
-
- </description>
- <name>id</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
-
-
- <div class="changed_added_2_0">
- <p>
- Binds the component to a backing bean property, as specified in
- the JSF specification.
- </p>
- </div>
-
- </description>
- <name>binding</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- </tag>
- <tag>
- <description>
-
-
- <div class="changed_added_2_0">
- <p>
- Defines a composition that optionally uses a template, as outlined
- in the description of the ui tag library. Multiple
- compositions can use the same template, thus encapsulating and
- reusing layout. JSF disregards everything outside of the
- composition, which lets developers embed compositions in well-formed
- XHTML pages that can be viewed in an XHTML viewer,
- such as Dreamweaver or a browser, without including extraneous
- elements such as <code>head</code> and <code>body</code>.
- </p>
- <div class="syntax"><div class="html4strict"
- style="font-family: monospace;"><ol><li class="li1"><div
- class="de1"><span class="sc0">&lt;!DOCTYPE html PUBLIC
- &quot;-//W3C//DTD XHTML 1.0 Transitional//EN&quot;</div></li>
-
- <li class="li2"><div class="de2">&nbsp; &nbsp;
- &nbsp; &nbsp; &quot;http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd&quot;&gt;</span></div></li>
- <li class="li1"><div class="de1">&nbsp;</div></li>
- <li class="li2"><div class="de2"><span class="sc3"><span
- class="re1">&lt;html</span> <span class="re0">xmlns</span>=<span
- class="st0">&quot;http://www.w3.org/1999/xhtml&quot;</span></div></li>
- <li class="li1"><div class="de1">&nbsp; &nbsp;xmlns:<span
- class="re0">ui</span>=<span class="st0">&quot;http://java.sun.com/jsf/facelets&quot;</span><span
- class="re2">&gt;</span></span></div></li>
-
- <li class="li2"><div class="de2">&nbsp;</div></li>
- <li class="li1"><div class="de1">&nbsp; <span
- class="sc3"><span class="re1">&lt;body<span
- class="re2">&gt;</span></span></span></div></li>
- <li class="li2"><div class="de2">&nbsp;</div></li>
- <li class="li1"><div class="de1">&nbsp; &nbsp;
- THIS LINE, AND EVERYTHING ABOVE IT IS DISREGARDED BY JSF</div></li>
- <li class="li2"><div class="de2">&nbsp; &nbsp;
- <span class="sc3"><span class="re1">&lt;ui</span>:composition
- <span class="re0">template</span>=<span class="st0">&quot;/layout.xhtml&quot;</span><span
- class="re2">&gt;</span></span></div></li>
-
- <li class="li1"><div class="de1">&nbsp;</div></li>
- <li class="li2"><div class="de2">&nbsp; &nbsp;
- &nbsp; <span class="sc3"><span class="re1">&lt;ui</span>:define
- <span class="re0">name</span>=<span class="st0">&quot;title&quot;</span><span
- class="re2">&gt;</span></span>#{msgs.contactsWindowTitle}<span
- class="sc3"><span class="re1">&lt;/ui</span>:define<span
- class="re2">&gt;</span></span></div></li>
- <li class="li1"><div class="de1">&nbsp; &nbsp;
- &nbsp; <span class="sc3"><span class="re1">&lt;ui</span>:define
- <span class="re0">name</span>=<span class="st0">&quot;heading&quot;</span><span
- class="re2">&gt;</span></span>#{msgs.contactsHeading}<span
- class="sc3"><span class="re1">&lt;/ui</span>:define<span
- class="re2">&gt;</span></span></div></li>
-
- <li class="li2"><div class="de2">&nbsp;</div></li>
- <li class="li1"><div class="de1">&nbsp; &nbsp;
- &nbsp; <span class="sc3"><span class="re1">&lt;ui</span>:define
- <span class="re0">name</span>=<span class="st0">&quot;content&quot;</span><span
- class="re2">&gt;</span></span></div></li>
- <li class="li2"><div class="de2">&nbsp; &nbsp;
- &nbsp; &nbsp; <span class="sc3"><span class="re1">&lt;ui</span>:include
- <span class="re0">src</span>=<span class="st0">&quot;contactsTable.xhtml&quot;</span>
- <span class="re2">/&gt;</span></span></div></li>
-
- <li class="li1"><div class="de1">&nbsp; &nbsp;
- &nbsp; <span class="sc3"><span class="re1">&lt;/ui</span>:define<span
- class="re2">&gt;</span></span></div></li>
- <li class="li2"><div class="de2">&nbsp; &nbsp;
- &nbsp; &nbsp; &nbsp;</div></li>
- <li class="li1"><div class="de1">&nbsp; &nbsp;
- <span class="sc3"><span class="re1">&lt;/ui</span>:composition<span
- class="re2">&gt;</span></span></div></li>
- <li class="li2"><div class="de2">&nbsp; &nbsp;
- THIS LINE, AND EVERYTHING BELOW IT IS DISREGARDED BY JSF</div></li>
-
- <li class="li1"><div class="de1">&nbsp;</div></li>
- <li class="li2"><div class="de2">&nbsp; <span
- class="sc3"><span class="re1">&lt;/body<span
- class="re2">&gt;</span></span></span></div></li>
- <li class="li1"><div class="de1"><span class="sc3"><span
- class="re1">&lt;/html<span class="re2">&gt;</span></span></span>
- </div></li></ol></div></div>
-
- </div>
-
- </description>
- <tag-name>composition</tag-name>
- <handler-class>com.sun.faces.facelets.tag.ui.CompositionHandler</handler-class>
- <attribute>
- <description>
-
-
- <div class="changed_added_2_0">
- <p>
- A URI that points to a template, also known as a layout, that
- inserts pieces of the page defined in the composition.
- </p>
- </div>
-
- </description>
- <name>template</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- </tag>
- <tag>
- <description>
-
-
- <div class="changed_added_2_0">
- <p>
- When the <code>ui:debug</code> tag is placed in an XHTML
- page, it creates a component and adds it to the
- component tree. That debug component captures debugging information,
- namely the current state of the component
- tree and the scoped variables in the application, when the component
- is rendered. If the user presses CTRL + SHIFT + d,
- JSF opens a window that shows the debugging information captured by
- the debug component.
- </p>
-
- <p>
- Typically, the best place to put the <code>ui:debug</code>
- tag is in an application's main template, which
- lets developers enable or disable viewing of debugging information
- in one central location. Additionally, page
- authors can change the hotkey (which by default is CTRL + SHIFT + d,
- where the d stands for debug) to CTRL + SHIFT + ?,
- where ? represents the key specified as the value of the <code>hotkey</code>
- attribute.
- </p>
-
- <p>
- You can use the <code>rendered</code> attribute to
- control whether the debug component is rendered.
- Using an EL expression as the value for the <code>rendered</code>
- attribute lets you control whether
- debug output is enabled for multiple views based on a single bean
- property.
- </p>
- </div>
-
- </description>
- <tag-name>debug</tag-name>
- <handler-class>com.sun.faces.facelets.tag.ui.UIDebug</handler-class>
- <attribute>
- <description>
-
-
- <div class="changed_added_2_0">
- <p>
- Defines a single character, that, pressed in conjunction with
- CTRL and SHIFT, will display the JSF debug window.
- By default, the hotkey is 'd'. <em>The value for the
- hotkey attribute cannot be an EL expression.</em>
- </p>
-
- </div>
-
- </description>
- <name>hotkey</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
-
-
- <div class="changed_added_2_0">
- <p>
- Controls whether the debug component is rendered. Valid values
- for this attribute are either the strings "true" or "false" or
- an EL expression that evaluates to either "true" or "false".<p>If
- this attribute's value is "false" or the value is an EL
- expression that evaluates to "false", the debug component is not
- rendered in the page, the hotkey attribute is disregarded, and
- users cannot open the debugging information window with a
- hotkey.</p>
- </p>
-
- </div>
-
- </description>
- <name>rendered</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- </tag>
- <tag>
- <description>
-
-
- <div class="changed_added_2_0">
-
- <p>The <code>define</code> tag defines content
- that is inserted into a page by a template. The <code>define</code>
- tag can be used inside <code>ui:composition</code>, <code>ui:component</code>,
- <code>ui:decorate</code>, and <code>ui:fragment</code>
- tags.</p>
-
- <p>Content defined by the <code>define</code> tag
- can be inserted into a page by using <code>ui:insert</code>.
- </p>
-
- </div>
-
- </description>
- <tag-name>define</tag-name>
- <handler-class>com.sun.faces.facelets.tag.ui.DefineHandler</handler-class>
- <attribute>
- <description>
-
-
- <div class="changed_added_2_0">
-
- <p>Assigns a name to the content inside a <code>define</code>
- tag. That name is used by corresponding <code>ui:insert</code>
- tags in a template that insert the named content into a page.</p>
- </div>
-
- </description>
- <name>name</name>
- <required>true</required>
- <type>java.lang.String</type>
- </attribute>
- </tag>
- <tag>
- <description>
-
-
- <div class="changed_added_2_0">
-
- <p>
- The <code>decorate</code> tag is identical to the <code>composition</code>
- tag, except that <code>ui:decorate</code>, unlike <code>ui:composition</code>,
- does not disregard all content outside of the tag. The <code>decorate</code>
- is useful when you want to decorate some content in a page, for
- example, you might want to decorate a list of items, like this:
-
- <div class="syntax"><div class="html4strict"
- style="font-family: monospace;"><ol><li class="li1"><div
- class="de1">
-
- <span class="sc2">&lt;ui:decorate template=<span
- class="st0">&quot;/layout.xhtml&quot;</span><span
- class="kw2">&gt;</span></span></div></li>
- <li class="li2"><div class="de2">&nbsp; <span
- class="sc2">&lt;ui:define <span class="kw3">name</span>=<span
- class="st0">&quot;listHeading&quot;</span><span
- class="kw2">&gt;</span></span></div></li>
-
- <li class="li1"><div class="de1">&nbsp; &nbsp;
- <span class="sc2">&lt;ui:include <span class="kw3">src</span>="shared/listHeading.xhtml"/<span
- class="kw2">&gt;</span></span></div></li>
- <li class="li2"><div class="de2">&nbsp; <span
- class="sc2"><span class="kw2">&lt;</span>/ui:define&gt;</span></div></li>
- <li class="li1"><div class="de1">&nbsp; &nbsp;
- &nbsp; &nbsp; </div></li>
- <li class="li2"><div class="de2">&nbsp; <span
- class="sc2">&lt;c:forEach items="#<span class="br0">&#123;</span>items<span
- class="br0">&#125;"</span> var="item"<span
- class="kw2">&gt;</span></span></div></li>
-
- <li class="li1"><div class="de1">&nbsp; &nbsp;
- ...</div></li>
- <li class="li2"><div class="de2">&nbsp; <span
- class="sc2"><span class="kw2">&lt;</span>/c:forEach&gt;</span></div></li>
- <li class="li1"><div class="de1">&nbsp; ...</div></li>
- <li class="li2"><div class="de2"><span class="sc2"><span
- class="kw2">&lt;</span>/ui:decorate&gt;</span>
- </div></li></ol></div></div>
- </p>
-
- Because JSF does not disregard everything outside of the <code>ui:decorate</code>
- tag, <code>ui:decorate</code> can
- be used to decorate pieces of a page.
-
- </div>
-
- </description>
- <tag-name>decorate</tag-name>
- <handler-class>com.sun.faces.facelets.tag.ui.DecorateHandler</handler-class>
- <attribute>
- <description>
-
-
- <div class="changed_added_2_0">
- A URI that points to a template, also known as a layout, that
- inserts pieces of the page defined in the decorator.
-
- </div>
-
- </description>
- <name>template</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- </tag>
- <tag>
- <description>
-
-
- <div class="changed_added_2_0">
- <p>The <code>fragment</code> tag is identical to
- the <code>component</code> tag, except that <code>ui:fragment</code>,
- unlike <code>ui:component</code>, JSF does not disregard
- all content outside of the tag.</p>
- </div>
-
- </description>
- <tag-name>fragment</tag-name>
- <handler-class>com.sun.faces.facelets.tag.ui.ComponentRefHandler</handler-class>
- <attribute>
- <description>
-
-
- <div class="changed_added_2_0">
- The identifier of the component that JSF inserts into the
- component tree. If an identifier is
- not explicitly specified by the page author, JSF will assign an
- identifier based on the algorithm
- that it uses for all components.
- </div>
-
- </description>
- <name>id</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
-
-
- <div class="changed_added_2_0">
- Binds the component to a backing bean property, as specified in
- the JSF specification.
- </div>
-
- </description>
- <name>binding</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- </tag>
- <tag>
- <description>
-
-
- <div class="changed_added_2_0">
- <p>Use this tag&#8212which is very similar to JSP's <code>jsp:include</code>&#8212to
- encapsulate and reuse content among
- multiple XHTML pages. There are three things this tag can include:
- plain XHTML, and XHTML pages that have either a <code>composition</code>
- tag or a <code>component</code> tag.
- </p>
- <p>You supply a filename, through <code>ui:include</code>'s
- <code>src</code> attribute for JSF to include. That
- filename is relative to the XHTML file that was rendered as a result
- of the last request. So, for example, if JSF loaded
- the view <code>login.xhtml</code>, and that file
- included <code>pageDecorations/header.xhtml</code>, and
- <code>
- pageDecorations/header.xhtml</code> included <code>companyLogo.xhtml</code>,
- then <code>companyLogo.xhtml</code> will
- not be found if it's in the <code>pageDecorations</code>
- directory, because <code>companyLogo.xhtml</code> has to
- be
- in the same directory as <code>login.xhtml</code>.
- </p>
-
- </div>
-
- </description>
- <tag-name>include</tag-name>
- <handler-class>com.sun.faces.facelets.tag.ui.IncludeHandler</handler-class>
- <attribute>
- <description>
-
-
- <div class="changed_added_2_0">
- The filename of an XHTML page to include. The filename is
- relative to the XHTML page that was originally loaded.
- </div>
-
- </description>
- <name>src</name>
- <required>true</required>
- <type>java.lang.String</type>
- </attribute>
- </tag>
- <tag>
- <description>
-
-
- <div class="changed_added_2_0">
- <p>Inserts content into a template. That content is defined&#8212with
- the <code>ui:define</code> tag&#8212 in either a
- <code>ui:composition</code>, <code>ui:component</code>,
- <code>ui:decorate</code>, or <code>ui:fragment</code>.</p>
- </div>
-
- </description>
- <tag-name>insert</tag-name>
- <handler-class>com.sun.faces.facelets.tag.ui.IncludeHandler</handler-class>
- <attribute>
- <description>
-
-
- <div class="changed_added_2_0">
-
- The optional name attribute matches the associated &lt;ui:define/&gt;
- tag in this template's client. If no name is specified, it's
- expected
- that the whole template client will be inserted.
-
- </div>
-
- </description>
- <name>name</name>
- <required>false</required>
- <type>java.lang.String</type>
- </attribute>
- </tag>
- <tag>
- <description>
-
-
- <div class="changed_added_2_0">
- <p>Use this tag to pass parameters to an included file (using
- <code>ui:include</code>), or a template
- (linked to either a composition or decorator). Embed <code>ui:param</code>
- tags in either <code>ui:include</code>,
- <code>ui:composition</code>, or <code>ui:decorate</code>
- to pass the parameters.
- </div>
-
- </description>
- <tag-name>param</tag-name>
- <handler-class>com.sun.faces.facelets.tag.ui.ParamHandler</handler-class>
- <attribute>
- <description>
-
-
- <div class="changed_added_2_0">
- The name of the parameter.
- </div>
-
- </description>
- <name>name</name>
- <required>true</required>
- <type>java.lang.String</type>
- </attribute>
- <attribute>
- <description>
-
-
- <div class="changed_added_2_0">
- The value of the parameter. Notice that this attribute's value
- can be an EL expression, which
- means that you can pass objects to either an included file or a
- template.
- </div>
- </description>
- <name>value</name>
- <required>true</required>
- <type>java.lang.String</type>
- </attribute>
- </tag>
- <tag>
- <description>
-
-
- <div class="changed_added_2_0">
-
- <p>Use this tag as an alternative to <code>h:dataTable</code>
- or
- <code>c:forEach</code>, especially when you are using
- the
- <code>jsfc</code> feature of Facelets. You can specify
- this component as
- the value of the <code>jsfc</code> attribute, like this:
- &lt;div... jsfc="ui:repeat" value="#{contacts}" var="contact"&gt;...
- </p>
- </div>
-
- </description>
- <tag-name>repeat</tag-name>
- <handler-class>com.sun.faces.facelets.tag.ui.RepeatHandler</handler-class>
- <attribute>
- <description>
-
-
- <div class="changed_added_2_0">
-
- <p>Read-write property setting the offset from the
- beginning of the
- collection from which to start the iteration. If not set, this
- offset
- is not considered and iteration will start at the beginning of
- the
- collection.</p>
-
- </div>
-
- </description>
- <name>offset</name>
- <required>false</required>
- <type>int</type>
- </attribute>
- <attribute>
- <description>
-
-
- <div class="changed_added_2_0">
-
- <p>Read-write property setting the size of the collection
- to iterate.
- If this value is less than the actual size of the collection, a
- <code>FacesException</code> must be thrown.</p>
-
- </div>
-
- </description>
- <name>size</name>
- <required>false</required>
- <type>int</type>
- </attribute>
- <attribute>
- <description>
-
- <div class="changed_added_2_0"><p>Iteration
- will only process every step items of the collection,
- starting with the first one.</p></div>
-
- </description>
- <name>step</name>
- <required>false</required>
- <type>int</type>
- </attribute>
- <attribute>
- <description>
-
-
- <div class="changed_added_2_0">
-
- <p>The name of a collection of items that this tag
- iterates over. The
- collection may be a <code>List</code>, <code>array</code>,
- <code>java.sql.ResultSet</code>, or an individual
- java Object. If the
- collection is null, this tag does nothing.</p>
-
- </div>
-
- </description>
- <name>value</name>
- <required>true</required>
- <type>java.lang.Object</type>
- </attribute>
- <attribute>
- <description>
-
- <div class="changed_added_2_0"><p>Name of the
- exported scoped variable for the current item of the
- iteration. This scoped variable has nested
- visibility. Its type depends on the object of the
- underlying collection</p></div>
-
- </description>
- <name>var</name>
- <required>true</required>
- <type>java.lang.Object</type>
- </attribute>
- <attribute>
- <description>
-
- <div class="changed_added_2_0"><p>Name of the
- exported request scoped variable for the status of the
- iteration. Object is a POJO with the following read-only
- JavaBeans properties. This scoped variable has nested
- visibility.</p>
-
- <p><code>begin</code> of type Integer</p>
-
- <p><code>end</code> of type Integer</p>
-
- <p><code>index</code> of type int</p>
-
- <p><code>step</code> of type Integer</p>
-
- <p><code>even</code> of type boolean</p>
-
- <p><code>odd</code> of type boolean</p>
-
- <p><code>first</code> of type boolean</p>
-
- <p><code>last</code> of type boolean</p>
-
- </div>
-
- </description>
- <name>varStatus</name>
- <required>false</required>
- <type>java.lang.Object</type>
- </attribute>
- </tag>
- <tag>
- <description>
-
-
- <div class="changed_added_2_0">
- <p>Remove content from a page. This tag is often used in
- conjunction with the <code>jsfc</code> feature of
- Facelets,
- to wrap additional markup. When Facelets removes markup from a page
- by substituting markup items that have
- a <code>jsfc</code> attribute with the specified
- component, Facelets also removes anything in the page that
- is contained in a <code>ui:remove</code> tag.</p>
- </div>
-
- </description>
- <tag-name>remove</tag-name>
- <handler-class>com.sun.faces.facelets.tag.ui.SchemaCompliantRemoveHandler</handler-class>
-
- </tag>
-</facelet-taglib>
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.ui/.classpath b/jsf/plugins/org.eclipse.jst.jsf.facelet.ui/.classpath
deleted file mode 100644
index 304e861..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.ui/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="con" path="org.eclipse.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/jsf/plugins/org.eclipse.jst.jsf.facelet.ui/.project b/jsf/plugins/org.eclipse.jst.jsf.facelet.ui/.project
deleted file mode 100644
index c7247f3..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.ui/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.jst.jsf.facelet.ui</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.ui/.settings/org.eclipse.jdt.core.prefs b/jsf/plugins/org.eclipse.jst.jsf.facelet.ui/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 42536dd..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.ui/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,79 +0,0 @@
-#Tue Oct 23 12:04:38 PDT 2007
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.doc.comment.support=enabled
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.autoboxing=warning
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=ignore
-org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
-org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled
-org.eclipse.jdt.core.compiler.problem.fieldHiding=warning
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=warning
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
-org.eclipse.jdt.core.compiler.problem.invalidJavadoc=error
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=enabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=disabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=disabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=protected
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=warning
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocComments=warning
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=protected
-org.eclipse.jdt.core.compiler.problem.missingJavadocTags=warning
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=protected
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
-org.eclipse.jdt.core.compiler.problem.nullReference=ignore
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
-org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=ignore
-org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=ignore
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=ignore
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=error
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=warning
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=error
-org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=error
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.5
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.ui/.settings/org.eclipse.pde.prefs b/jsf/plugins/org.eclipse.jst.jsf.facelet.ui/.settings/org.eclipse.pde.prefs
deleted file mode 100644
index cde2584..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.ui/.settings/org.eclipse.pde.prefs
+++ /dev/null
@@ -1,24 +0,0 @@
-#Fri May 30 12:03:18 PDT 2008
-compilers.f.unresolved-features=1
-compilers.f.unresolved-plugins=1
-compilers.incompatible-environment=1
-compilers.p.build=1
-compilers.p.deprecated=1
-compilers.p.discouraged-class=2
-compilers.p.internal=1
-compilers.p.missing-bundle-classpath-entries=1
-compilers.p.missing-packages=0
-compilers.p.no-required-att=0
-compilers.p.not-externalized-att=0
-compilers.p.unknown-attribute=1
-compilers.p.unknown-class=1
-compilers.p.unknown-element=1
-compilers.p.unknown-identifier=1
-compilers.p.unknown-resource=1
-compilers.p.unresolved-ex-points=0
-compilers.p.unresolved-import=0
-compilers.s.create-docs=false
-compilers.s.doc-folder=doc
-compilers.s.open-tags=1
-compilers.use-project=true
-eclipse.preferences.version=1
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.ui/META-INF/MANIFEST.MF b/jsf/plugins/org.eclipse.jst.jsf.facelet.ui/META-INF/MANIFEST.MF
deleted file mode 100644
index 8c082cd..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.ui/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,40 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Bundle-Name.0
-Bundle-SymbolicName: org.eclipse.jst.jsf.facelet.ui;singleton:=true
-Bundle-Version: 1.0.0.qualifier
-Bundle-Activator: org.eclipse.jst.jsf.facelet.ui.internal.FaceletUiPlugin
-Bundle-Localization: plugin
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.wst.html.core;bundle-version="1.1.200",
- org.eclipse.wst.html.ui;bundle-version="1.0.300",
- org.eclipse.wst.xml.ui;bundle-version="1.0.400",
- org.eclipse.jface.text;bundle-version="3.4.0",
- org.eclipse.wst.sse.ui;bundle-version="1.1.0",
- org.eclipse.wst.sse.core;bundle-version="1.1.300",
- org.eclipse.wst.xml.core;bundle-version="1.1.300",
- org.eclipse.jst.jsf.common;bundle-version="1.0.1",
- org.eclipse.core.resources;bundle-version="3.4.0",
- org.eclipse.jst.jsf.core;bundle-version="1.0.1",
- org.eclipse.jst.jsf.common.runtime;bundle-version="1.0.0",
- org.eclipse.wst.validation;bundle-version="1.1.103",
- org.eclipse.emf.common;bundle-version="2.4.0",
- org.eclipse.wst.common.project.facet.ui,
- org.eclipse.wst.common.frameworks;bundle-version="1.1.102",
- org.eclipse.core.databinding;bundle-version="1.1.0",
- org.eclipse.jface.databinding;bundle-version="1.2.0",
- org.eclipse.wst.common.modulecore;bundle-version="1.1.103",
- org.eclipse.core.databinding.beans;bundle-version="1.0.100",
- org.eclipse.wst.common.frameworks.ui;bundle-version="1.1.101",
- org.eclipse.jst.jsf.ui;bundle-version="1.0.1",
- org.eclipse.jst.jsf.facelet.core;bundle-version="1.0.0"
-Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Export-Package: org.eclipse.jst.jsf.facelet.ui.internal;x-internal:=true,
- org.eclipse.jst.jsf.facelet.ui.internal.contentassist;x-internal:=true,
- org.eclipse.jst.jsf.facelet.ui.internal.facet;x-internal:=true,
- org.eclipse.jst.jsf.facelet.ui.internal.hover;x-internal:=true,
- org.eclipse.jst.jsf.facelet.ui.internal.htmleditor;x-internal:=true,
- org.eclipse.jst.jsf.facelet.ui.internal.validation;x-internal:=true
-Bundle-Vendor: %Bundle-Vendor.0
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.ui/about.html b/jsf/plugins/org.eclipse.jst.jsf.facelet.ui/about.html
deleted file mode 100644
index 90bd74d..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.ui/about.html
+++ /dev/null
@@ -1,22 +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>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
-
-<p>June, 2008</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.</p>
-
-</body>
-</html>
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.ui/build.properties b/jsf/plugins/org.eclipse.jst.jsf.facelet.ui/build.properties
deleted file mode 100644
index 28e0ea2..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.ui/build.properties
+++ /dev/null
@@ -1,8 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
- .,\
- plugin.xml,\
- plugin.properties,\
- templates/,\
- about.html
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.ui/plugin.properties b/jsf/plugins/org.eclipse.jst.jsf.facelet.ui/plugin.properties
deleted file mode 100644
index 21fb12e..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.ui/plugin.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-FaceletHTMLValidator_name=Facelet HTML Validator
-EL_Hyperlinkdetector_name=Facelet EL Hyperlink Detector
-FaceletValidatorMarker=Facelet Validator
-Bundle-Name.0 = UI Plug-in
-Bundle-Vendor.0 = Eclipse.org
\ No newline at end of file
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.ui/plugin.xml b/jsf/plugins/org.eclipse.jst.jsf.facelet.ui/plugin.xml
deleted file mode 100644
index d2dab59..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.ui/plugin.xml
+++ /dev/null
@@ -1,147 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.2"?>
-<plugin>
- <extension
- point="org.eclipse.wst.sse.ui.editorConfiguration">
- <sourceViewerConfiguration
- class="org.eclipse.wst.html.ui.StructuredTextViewerConfigurationHTML"
- target="org.eclipse.wst.html.core.htmlsource">
- </sourceViewerConfiguration>
- <provisionalConfiguration
- class="org.eclipse.jst.jsf.facelet.ui.internal.contentassist.XHTMLContentAssistProcessor"
- target="org.eclipse.wst.html.HTML_DEFAULT"
- type="contentassistprocessor">
- </provisionalConfiguration>
- <provisionalConfiguration
- type="contentassistprocessor"
- class="org.eclipse.jst.jsf.facelet.ui.internal.contentassist.CompositeAttributeAssistProcessor"
- target="org.eclipse.wst.html.HTML_DEFAULT" />
- <documentationTextHover
- class="org.eclipse.jst.jsf.facelet.ui.internal.hover.FaceletHover"
- target="org.eclipse.wst.html.HTML_DEFAULT">
- </documentationTextHover>
- </extension>
-
- <extension point="org.eclipse.ui.workbench.texteditor.hyperlinkDetectors">
- <hyperlinkDetector
- class="org.eclipse.jst.jsf.facelet.ui.internal.htmleditor.FaceletELHyperlinkDetector"
- id="org.eclipse.jst.jsf.ui.elhyperlinkdetector"
- name="%EL_Hyperlinkdetector_name"
- targetId="org.eclipse.wst.html.core.htmlsource">
- </hyperlinkDetector>
- </extension>
-
- <extension
- id="FaceletValidationMarker"
- name="%FaceletValidatorMarker"
- point="org.eclipse.core.resources.markers">
- <super
- type="org.eclipse.wst.validation.problemmarker">
- </super>
- </extension>
-
- <extension
- point="org.eclipse.wst.validation.validatorV2"
- id="FaceletHTMLValidator"
- name="%FaceletHTMLValidator_name">
- <validator
- build="true"
- class="org.eclipse.jst.jsf.facelet.ui.internal.validation.HTMLValidator"
- manual="true"
- markerId="org.eclipse.jst.jsf.facelet.ui.FaceletValidationMarker"
- version="1">
-
- <include>
- <rules>
- <projectNature
- id="org.eclipse.wst.common.modulecore.ModuleCoreNature">
- </projectNature>
- </rules>
- </include>
- <include>
- <rules>
- <projectNature
- id="org.eclipse.jdt.core.javanature">
- </projectNature>
- </rules>
- </include>
-
- <include>
- <rules>
- <facet
- id="jst.java">
- </facet>
- </rules>
- </include>
- <include>
- <rules>
- <facet
- id="jst.web">
- </facet>
- </rules>
- </include>
- <include>
- <rules>
- <facet
- id="jst.jsf" version="2.0">
- </facet>
- </rules>
- </include>
- <include>
- <rules>
- <contentType
- exactMatch="false"
- id="jsf.facelet">
- </contentType>
- <contentType
- exactMatch="false"
- id="jsf.facelet.composite">
- </contentType>
- </rules>
- </include>
- <group
- id="org.eclipse.wst.sse.core.structuredModelGroup">
- </group>
-
- </validator>
- </extension>
-
- <!--<extension
- point="org.eclipse.wst.validation.validator"
- id="FaceletTaglibValidator"
- name="%FaceletTaglibValidator">
- <validator>
- <projectNature id="org.eclipse.wst.common.modulecore.ModuleCoreNature" />
- <projectNature id="org.eclipse.jdt.core.javanature" />
- <filter
- objectClass="org.eclipse.core.resources.IFile"
- nameFilter="faces-config.xml">
- </filter>
- <markerId
- markerIdValue="JSPSemanticsValidatorMarker">
- </markerId>
- <helper
- class="org.eclipse.wst.validation.internal.operations.WorkbenchContext">
- </helper>
- <run
- class="org.eclipse.jst.jsf.validation.internal.appconfig.AppConfigValidator"
- incremental="true"
- fullBuild="true"
- />
- </validator>
- </extension>-->
- <extension
- point="org.eclipse.ui.editors.templates">
- <include
- file="templates/templates.xml"
- translations="$nl$/templates/templates.properties">
- </include>
- </extension>
- <!--<extension
- point="org.eclipse.wst.xml.core.modelQueryExtensions">
- <modelQueryExtension
- class="org.eclipse.jst.jsf.facelet.ui.internal.contentassist.MyModelQueryExtension"
- contentType="org.eclipse.wst.html.core.htmlsource">
- </modelQueryExtension>
- </extension>-->
-</plugin>
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.ui/src/org/eclipse/jst/jsf/facelet/ui/internal/FaceletUiPlugin.java b/jsf/plugins/org.eclipse.jst.jsf.facelet.ui/src/org/eclipse/jst/jsf/facelet/ui/internal/FaceletUiPlugin.java
deleted file mode 100644
index 15ed671..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.ui/src/org/eclipse/jst/jsf/facelet/ui/internal/FaceletUiPlugin.java
+++ /dev/null
@@ -1,69 +0,0 @@
-package org.eclipse.jst.jsf.facelet.ui.internal;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.jsf.designtime.internal.view.model.TagRegistryFactory.TagRegistryFactoryException;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * The activator class controls the plug-in life cycle
- */
-public class FaceletUiPlugin extends AbstractUIPlugin
-{
-
- /**
- * The plug-in ID
- */
- public static final String PLUGIN_ID = "org.eclipse.jst.jsf.facelet.ui";
-
- // The shared instance
- private static FaceletUiPlugin plugin;
-
- /*
- * (non-Javadoc)
- *
- * @see
- * org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext
- * )
- */
- @Override
- public void start(final BundleContext context) throws Exception
- {
- super.start(context);
- plugin = this;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see
- * org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext
- * )
- */
- @Override
- public void stop(final BundleContext context) throws Exception
- {
- plugin = null;
- super.stop(context);
- }
-
- /**
- * Returns the shared instance
- *
- * @return the shared instance
- */
- public static FaceletUiPlugin getDefault()
- {
- return plugin;
- }
-
- /**
- * @param e
- */
- public static void log(final TagRegistryFactoryException e)
- {
- getDefault().getLog().log(new Status(IStatus.ERROR, PLUGIN_ID, "", e));
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.ui/src/org/eclipse/jst/jsf/facelet/ui/internal/contentassist/CompositeAttributeAssistProcessor.java b/jsf/plugins/org.eclipse.jst.jsf.facelet.ui/src/org/eclipse/jst/jsf/facelet/ui/internal/contentassist/CompositeAttributeAssistProcessor.java
deleted file mode 100644
index 13312fa..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.ui/src/org/eclipse/jst/jsf/facelet/ui/internal/contentassist/CompositeAttributeAssistProcessor.java
+++ /dev/null
@@ -1,123 +0,0 @@
-package org.eclipse.jst.jsf.facelet.ui.internal.contentassist;
-
-import org.eclipse.jface.text.ITextViewer;
-import org.eclipse.jface.text.contentassist.ICompletionProposal;
-import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
-import org.eclipse.jface.text.contentassist.IContextInformation;
-import org.eclipse.jface.text.contentassist.IContextInformationValidator;
-import org.eclipse.jst.jsf.context.structureddocument.IStructuredDocumentContext;
-import org.eclipse.jst.jsf.context.structureddocument.IStructuredDocumentContextFactory;
-import org.eclipse.jst.jsf.designtime.DTAppManagerUtil;
-import org.eclipse.jst.jsf.designtime.internal.view.XMLViewDefnAdapter;
-import org.eclipse.jst.jsf.designtime.internal.view.IDTViewHandler.ViewHandlerException;
-import org.eclipse.jst.jsf.designtime.internal.view.XMLViewDefnAdapter.DTELExpression;
-import org.eclipse.jst.jsf.ui.internal.contentassist.JSFContentAssistProcessor;
-import org.eclipse.jst.jsf.ui.internal.contentassist.el.JSFELContentAssistProcessor;
-
-/**
- * Composes the EL and non-EL attribute value assist processor for JSF. This
- * is necessary mainly because, without the EL partitioning in HTML, both
- * processors would otherwise activate on every attribute.
- *
- * @author cbateman
- *
- */
-public class CompositeAttributeAssistProcessor implements
- IContentAssistProcessor
-{
- private JSFContentAssistProcessor _nonELProcessor;
- private JSFELContentAssistProcessor _elProcessor;
- private char[] _activationChars;
-
- /**
- * Default constructor
- */
- public CompositeAttributeAssistProcessor()
- {
- _nonELProcessor = new JSFContentAssistProcessor();
- _elProcessor = new JSFELContentAssistProcessor();
-
- char[] nonELChars =
- _nonELProcessor.getCompletionProposalAutoActivationCharacters();
- char[] elChars =
- _elProcessor.getCompletionProposalAutoActivationCharacters();
- _activationChars = new char[nonELChars.length+elChars.length];
- System.arraycopy(nonELChars, 0, _activationChars, 0, nonELChars.length);
- System.arraycopy(elChars, 0, _activationChars, nonELChars.length, elChars.length);
-
-
- }
- public ICompletionProposal[] computeCompletionProposals(ITextViewer viewer,
- int offset)
- {
- if (isEL(viewer, offset))
- {
- return _elProcessor.computeCompletionProposals(viewer, offset);
- }
- return _nonELProcessor.computeCompletionProposals(viewer, offset);
- }
-
- public IContextInformation[] computeContextInformation(ITextViewer viewer,
- int offset)
- {
- if (isEL(viewer, offset))
- {
- return _elProcessor.computeContextInformation(viewer, offset);
- }
- return _nonELProcessor.computeContextInformation(viewer, offset);
- }
-
- public char[] getCompletionProposalAutoActivationCharacters()
- {
- return _activationChars;
- }
-
- public char[] getContextInformationAutoActivationCharacters()
- {
- // disable this functionality
- return null;
- }
-
- public IContextInformationValidator getContextInformationValidator()
- {
- // disable this functionality
- return null;
- }
-
- public String getErrorMessage()
- {
- // TODO Auto-generated method stub
- return null;
- }
-
- private boolean isEL(final ITextViewer viewer, int offset)
- {
- IStructuredDocumentContext context =
- IStructuredDocumentContextFactory.INSTANCE.getContext(viewer, offset);
-
- if (context != null)
- {
- XMLViewDefnAdapter adapter =
- DTAppManagerUtil.getXMLViewDefnAdapter(context);
- if (adapter != null)
- {
- try
- {
- DTELExpression elExpression = adapter.getELExpression(context);
-
- // only return true if we definitively find EL
- if(elExpression != null)
- {
- return true;
- }
- }
- catch (ViewHandlerException e)
- {
- // fall through to false, no el
- }
- }
- }
- // all other cases, return false
- return false;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.ui/src/org/eclipse/jst/jsf/facelet/ui/internal/contentassist/MyModelQueryExtension.java b/jsf/plugins/org.eclipse.jst.jsf.facelet.ui/src/org/eclipse/jst/jsf/facelet/ui/internal/contentassist/MyModelQueryExtension.java
deleted file mode 100644
index f2b80aa..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.ui/src/org/eclipse/jst/jsf/facelet/ui/internal/contentassist/MyModelQueryExtension.java
+++ /dev/null
@@ -1,84 +0,0 @@
-package org.eclipse.jst.jsf.facelet.ui.internal.contentassist;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jst.jsf.context.resolver.structureddocument.IStructuredDocumentContextResolverFactory;
-import org.eclipse.jst.jsf.context.resolver.structureddocument.IWorkspaceContextResolver;
-import org.eclipse.jst.jsf.context.structureddocument.IStructuredDocumentContext;
-import org.eclipse.jst.jsf.context.structureddocument.IStructuredDocumentContextFactory2;
-import org.eclipse.jst.jsf.facelet.core.internal.cm.FaceletDocumentFactory;
-import org.eclipse.jst.jsf.facelet.core.internal.util.ViewUtil;
-import org.eclipse.jst.jsf.facelet.core.internal.util.ViewUtil.PrefixEntry;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMDocument;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNode;
-import org.eclipse.wst.xml.core.internal.contentmodel.modelquery.extension.ModelQueryExtension;
-import org.w3c.dom.Element;
-
-/**
- * A model query extension used to help support content assist in html files.
- *
- * @author cbateman
- *
- */
-public class MyModelQueryExtension extends ModelQueryExtension
-{
-
- @Override
- public String[] getAttributeValues(Element ownerElement, String namespace,
- String name)
- {
- // TODO Auto-generated method stub
- return super.getAttributeValues(ownerElement, namespace, name);
- }
-
- @Override
- public CMNode[] getAvailableElementContent(Element parentElement,
- String namespace, int includeOptions)
- {
- final IStructuredDocumentContext context = IStructuredDocumentContextFactory2.INSTANCE
- .getContext(parentElement);
- if (context != null)
- {
- final IWorkspaceContextResolver resolver = IStructuredDocumentContextResolverFactory.INSTANCE
- .getWorkspaceContextResolver(context);
-
- if (resolver != null)
- {
- final IProject project = resolver.getProject();
- final FaceletDocumentFactory factory =
- new FaceletDocumentFactory(project);
- final Map<String, PrefixEntry> map =
- ViewUtil.getDocumentNamespaces(parentElement.getOwnerDocument());
- String prefix = null;
- for (final Map.Entry<String, PrefixEntry> entry : map.entrySet())
- {
- if (entry.getValue().getUri().equals(namespace))
- {
- prefix = entry.getValue().getPrefix();
- break;
- }
- }
-
- if (prefix != null)
- {
- CMDocument document =
- factory.createCMDocumentForContext(namespace, prefix);
- if (document != null)
- {
- List<CMNode> nodes = new ArrayList<CMNode>();
- for (final Iterator<?> it = document.getElements().iterator(); it.hasNext();)
- {
- nodes.add((CMNode)it.next());
- }
- return nodes.toArray(new CMNode[0]);
- }
- }
- }
- }
- return new CMNode[0];
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.ui/src/org/eclipse/jst/jsf/facelet/ui/internal/contentassist/XHTMLContentAssistProcessor.java b/jsf/plugins/org.eclipse.jst.jsf.facelet.ui/src/org/eclipse/jst/jsf/facelet/ui/internal/contentassist/XHTMLContentAssistProcessor.java
deleted file mode 100644
index 0b2afd4..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.ui/src/org/eclipse/jst/jsf/facelet/ui/internal/contentassist/XHTMLContentAssistProcessor.java
+++ /dev/null
@@ -1,277 +0,0 @@
-package org.eclipse.jst.jsf.facelet.ui.internal.contentassist;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.jface.text.ITextViewer;
-import org.eclipse.jface.text.contentassist.ICompletionProposal;
-import org.eclipse.jst.jsf.common.runtime.internal.view.model.common.Namespace;
-import org.eclipse.jst.jsf.context.resolver.structureddocument.IDOMContextResolver;
-import org.eclipse.jst.jsf.context.resolver.structureddocument.IStructuredDocumentContextResolverFactory;
-import org.eclipse.jst.jsf.context.resolver.structureddocument.IWorkspaceContextResolver;
-import org.eclipse.jst.jsf.context.structureddocument.IStructuredDocumentContext;
-import org.eclipse.jst.jsf.context.structureddocument.IStructuredDocumentContextFactory;
-import org.eclipse.jst.jsf.designtime.internal.view.model.ITagRegistry;
-import org.eclipse.jst.jsf.facelet.core.internal.cm.FaceletDocumentFactory;
-import org.eclipse.jst.jsf.facelet.core.internal.util.ViewUtil;
-import org.eclipse.jst.jsf.facelet.core.internal.util.ViewUtil.PrefixEntry;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegionList;
-import org.eclipse.wst.sse.ui.internal.contentassist.CustomCompletionProposal;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMDocument;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
-import org.eclipse.wst.xml.core.internal.regions.DOMRegionContext;
-import org.eclipse.wst.xml.ui.internal.contentassist.AbstractContentAssistProcessor;
-import org.eclipse.wst.xml.ui.internal.contentassist.ContentAssistRequest;
-import org.eclipse.wst.xml.ui.internal.contentassist.XMLRelevanceConstants;
-import org.w3c.dom.Attr;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-
-/**
- * The main entry point for Facelet content assist in html files.
- * @author cbateman
- *
- */
-public class XHTMLContentAssistProcessor extends AbstractContentAssistProcessor
-{
- private IFile _file;
- private FaceletDocumentFactory _factory;
-
- private final static ICompletionProposal[] NO_PROPOSALS = new ICompletionProposal[0];
-
- @Override
- public ICompletionProposal[] computeCompletionProposals(
- final ITextViewer textViewer, final int documentPosition)
- {
- ICompletionProposal[] proposals = null;
- _file = getFile(textViewer, documentPosition);
-
- if (_file != null && shouldContribute(_file))
- {
- _factory = new FaceletDocumentFactory(_file.getProject());
- proposals = super.computeCompletionProposals(textViewer,
- documentPosition);
- }
- return proposals != null ? proposals : NO_PROPOSALS;
- }
-
- @SuppressWarnings("unchecked")
- @Override
- protected List getAvailableChildElementDeclarations(final Element parent,
- final int childPosition, final int kindOfAction)
- {
- final Map<String, PrefixEntry> namespaces = getDocumentNamespaces(
- _factory, childPosition);
- final List availableChildElements = new ArrayList();
-
- for (final Map.Entry<String, PrefixEntry> entry : namespaces.entrySet())
- {
- final String prefix = entry.getValue().getPrefix();
- final CMDocument cmDocument = _factory.createCMDocumentForContext(
- entry.getValue().getUri(), prefix);
-
- if (cmDocument != null)
- {
- final Iterator it = cmDocument.getElements().iterator();
- while (it.hasNext())
- {
- availableChildElements.add(it.next());
- }
- }
- }
-
- return availableChildElements;
- }
-
- @Override
- protected void addAttributeValueProposals(
- final ContentAssistRequest contentAssistRequest)
- {
- final ITextRegion textRegion = findNameRegionIfIsHTMLRoot(contentAssistRequest);
-
- if (textRegion != null)
- {
- final IDOMNode node = (IDOMNode) contentAssistRequest.getNode();
- final NamedNodeMap attributes = node.getAttributes();
- final String attrName = node.getFirstStructuredDocumentRegion()
- .getText(textRegion);
- if (attrName != null)
- {
- final int colonPos = attrName.indexOf(':');
- // must have a colon && it must not be the last char, otherwise
- // there is no localName
- if (colonPos > -1 && colonPos < attrName.length() - 1)
- {
- final String prefix = attrName.substring(0, colonPos);
-
- if ("xmlns".equals(prefix))
- {
- final ITagRegistry tagRegistry = ViewUtil.getHtmlTagRegistry(_file.getProject());
- if (tagRegistry != null)
- {
- final Set<Attr> alreadyUsed = ViewUtil.getDeclaredNamespaces(attributes);
- final Collection<? extends Namespace> namespaces = tagRegistry
- .getAllTagLibraries();
- NAMESPACE_LOOP: for (final Namespace ns : namespaces)
- {
- final String possibleValue = ns.getNSUri();
-
- if (ViewUtil.hasAttributeValue(alreadyUsed, possibleValue))
- {
- continue NAMESPACE_LOOP;
- }
- // we have an attribute of the form xmlns:X in
- // the
- // html root node. Here we can provide value
- // proposals
- // for all of the known namespaces.
- final String rString = "\"" + possibleValue + "\""; //$NON-NLS-2$//$NON-NLS-1$
- final int rOffset = contentAssistRequest
- .getReplacementBeginPosition();
- final int rLength = contentAssistRequest
- .getReplacementLength();
- final int cursorAfter = possibleValue.length() + 1;
- final String displayString = "\"" + possibleValue + "\""; //$NON-NLS-2$//$NON-NLS-1$
-
- final CustomCompletionProposal proposal = new CustomCompletionProposal(
- rString,
- rOffset,
- rLength,
- cursorAfter,
- null,
- displayString,
- null,
- null,
- XMLRelevanceConstants.R_XML_ATTRIBUTE_VALUE);
- contentAssistRequest.addProposal(proposal);
- }
- }
- // now bail, since super only adds annoying identity completions
- // for this case
- return;
- }
- }
- }
- }
- super.addAttributeValueProposals(contentAssistRequest);
- }
-
- private ITextRegion findNameRegionIfIsHTMLRoot(
- final ContentAssistRequest contentAssistRequest)
- {
- final IDOMNode node = (IDOMNode) contentAssistRequest.getNode();
- if (node.getNodeType() == Node.ELEMENT_NODE
- && "html".equals(node.getNodeName())
- && node.getOwnerDocument().getDocumentElement() == node)
- {
- // Find the attribute region and name for which this position should
- // have a value proposed
- final IStructuredDocumentRegion open = node
- .getFirstStructuredDocumentRegion();
- final ITextRegionList openRegions = open.getRegions();
- int i = openRegions.indexOf(contentAssistRequest.getRegion());
- if (i < 0)
- {
- return null;
- }
- ITextRegion nameRegion = null;
- while (i >= 0)
- {
- nameRegion = openRegions.get(i--);
- if (nameRegion.getType() == DOMRegionContext.XML_TAG_ATTRIBUTE_NAME)
- {
- break;
- }
- }
- return nameRegion;
- }
- return null;
- }
-
- @SuppressWarnings("unchecked")
- private Map<String, PrefixEntry> getDocumentNamespaces(
- final FaceletDocumentFactory factory, final int offset)
- {
- final IStructuredDocumentContext context = IStructuredDocumentContextFactory.INSTANCE
- .getContext(fTextViewer, offset);
-
- Document doc = null;
- if (context != null)
- {
- final IDOMContextResolver domContextResolver = IStructuredDocumentContextResolverFactory.INSTANCE
- .getDOMContextResolver(context);
-
- doc = domContextResolver.getDOMDocument();
-
- if (doc == null)
- {
- return Collections.EMPTY_MAP;
- }
- }
- return ViewUtil.getDocumentNamespaces(doc);
- }
-
- @Override
- protected CMElementDeclaration getCMElementDeclaration(final Node node)
- {
- if (node.getNodeType() == Node.ELEMENT_NODE)
- {
- if (node.getPrefix() != null)
- {
- final Element element = (Element) node;
-
- final CMElementDeclaration elementDecl = _factory
- .createCMElementDeclaration(element);
-
- if (elementDecl != null)
- {
- return elementDecl;
- }
- }
- }
-
- return null;
- // return super.getCMElementDeclaration(node);
- }
-
- private boolean shouldContribute(final IFile file)
- {
- return ViewUtil.isFaceletVDLFile(file);
- }
-
- private IFile getFile(final ITextViewer textViewer,
- final int documentPosition)
- {
- final IStructuredDocumentContext context = IStructuredDocumentContextFactory.INSTANCE
- .getContext(textViewer, documentPosition);
-
- if (context != null)
- {
- final IWorkspaceContextResolver resolver = IStructuredDocumentContextResolverFactory.INSTANCE
- .getWorkspaceContextResolver(context);
-
- if (resolver != null)
- {
- final IResource resource = resolver.getResource();
- if (resource != null &&
- resource.getType() == IResource.FILE)
- {
- return (IFile) resource;
- }
- }
- }
- return null;
- }
-}
\ No newline at end of file
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.ui/src/org/eclipse/jst/jsf/facelet/ui/internal/contentassist/XHTMLContentAssistProcessor2.java b/jsf/plugins/org.eclipse.jst.jsf.facelet.ui/src/org/eclipse/jst/jsf/facelet/ui/internal/contentassist/XHTMLContentAssistProcessor2.java
deleted file mode 100644
index 47ac591..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.ui/src/org/eclipse/jst/jsf/facelet/ui/internal/contentassist/XHTMLContentAssistProcessor2.java
+++ /dev/null
@@ -1,335 +0,0 @@
-package org.eclipse.jst.jsf.facelet.ui.internal.contentassist;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jface.text.ITextViewer;
-import org.eclipse.jface.text.contentassist.CompletionProposal;
-import org.eclipse.jface.text.contentassist.ICompletionProposal;
-import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
-import org.eclipse.jface.text.contentassist.IContextInformation;
-import org.eclipse.jface.text.contentassist.IContextInformationValidator;
-import org.eclipse.jst.jsf.common.runtime.internal.view.model.common.ITagElement;
-import org.eclipse.jst.jsf.common.runtime.internal.view.model.common.Namespace;
-import org.eclipse.jst.jsf.context.resolver.structureddocument.IDOMContextResolver;
-import org.eclipse.jst.jsf.context.resolver.structureddocument.IStructuredDocumentContextResolverFactory;
-import org.eclipse.jst.jsf.context.resolver.structureddocument.IWorkspaceContextResolver;
-import org.eclipse.jst.jsf.context.resolver.structureddocument.internal.ITextRegionContextResolver;
-import org.eclipse.jst.jsf.context.structureddocument.IStructuredDocumentContext;
-import org.eclipse.jst.jsf.context.structureddocument.IStructuredDocumentContextFactory;
-import org.eclipse.jst.jsf.designtime.internal.view.model.ITagRegistry;
-import org.eclipse.jst.jsf.designtime.internal.view.model.TagRegistryFactory.TagRegistryFactoryException;
-import org.eclipse.jst.jsf.facelet.core.internal.registry.FaceletRegistryManager.MyRegistryFactory;
-import org.eclipse.jst.jsf.facelet.ui.internal.FaceletUiPlugin;
-import org.eclipse.wst.xml.core.internal.regions.DOMRegionContext;
-import org.w3c.dom.Attr;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.NamedNodeMap;
-
-/**
- * Temporary.
- *
- * @author cbateman
- *
- */
-public class XHTMLContentAssistProcessor2 implements IContentAssistProcessor
-{
- private final static ICompletionProposal[] NO_PROPOSALS = new ICompletionProposal[0];
-
- public ICompletionProposal[] computeCompletionProposals(ITextViewer viewer,
- int offset)
- {
- List<ICompletionProposal> proposals = new ArrayList<ICompletionProposal>();
- final IStructuredDocumentContext context = IStructuredDocumentContextFactory.INSTANCE
- .getContext(viewer, offset);
-
- if (context != null)
- {
- final IDOMContextResolver domContextResolver = IStructuredDocumentContextResolverFactory.INSTANCE
- .getDOMContextResolver(context);
-
- final Document doc = domContextResolver.getDOMDocument();
-
- if (doc == null)
- {
- return NO_PROPOSALS;
- }
-
- // get the namespaces that are already declared
- final Map<String, PrefixEntry> documentNamespaces = getDocumentNamespaces(doc);
-
- final ITextRegionContextResolver resolver = IStructuredDocumentContextResolverFactory.INSTANCE
- .getTextRegionResolver(context);
-
- if (resolver != null)
- {
- final String regionType = resolver.getRegionType();
-
- if (DOMRegionContext.XML_CONTENT.equals(regionType))
- {
- // TODO: this may be in the open it may occur on the inside
- // of a
- // "<" that doesn't have any further tag name yet
- proposals = getTagCompletionsForDocument(context,
- documentNamespaces, TagPrefix.NO_PREFIX);
- }
- else if (DOMRegionContext.XML_TAG_NAME.equals(regionType))
- {
- final TagPrefix tagPrefix = new TagPrefix(resolver
- .getRegionText());
- proposals = getTagCompletionsForDocument(context,
- documentNamespaces, tagPrefix);
- }
- else
- {
- System.out.println(regionType);
- }
- }
- }
-
- return proposals.toArray(NO_PROPOSALS);
- }
-
- private List<ICompletionProposal> getTagCompletionsForDocument(
- final IStructuredDocumentContext context,
- final Map<String, PrefixEntry> namespaces, final TagPrefix tagPrefix)
- {
- final List<ICompletionProposal> proposals = new ArrayList<ICompletionProposal>();
-
- final IWorkspaceContextResolver wkspaceResolver = IStructuredDocumentContextResolverFactory.INSTANCE
- .getWorkspaceContextResolver(context);
- final IProject project = wkspaceResolver.getProject();
-
- MyRegistryFactory factory = new MyRegistryFactory();
- ITagRegistry registry;
- try
- {
- registry = factory.createTagRegistry(project);
- if (registry == null)
- {
- return proposals;
- }
-
- final Collection<? extends Namespace> tagLibs = registry
- .getAllTagLibraries();
-
- for (final Namespace tagLib : tagLibs)
- {
- final PrefixEntry ns = namespaces.get(tagLib.getNSUri());
-
- // if the tag library is not initialized, don't trigger
- // a potentially expensive operation during the content assist
- if (ns != null && tagLib.isInitialized())
- {
- // only add if this namespace's prefix starts with
- // the prefix that the user provided
- if (ns._prefix.startsWith(tagPrefix.getPrefix()))
- {
- final Collection<?> tags = tagLib.getViewElements();
-
- for (final Iterator<?> it = tags.iterator(); it
- .hasNext();)
- {
- final ITagElement tagElement = (ITagElement) it
- .next();
-
- // only add an element it starts with the prefix
- // provided
- if (tagElement.getName().startsWith(
- tagPrefix.getLocalName()))
- {
- final String userPrefix = tagPrefix
- .getUserPrefix();
-
- final String tagName = ns._prefix + ":"
- + tagElement.getName();
- String replacementText = "";
- if ("".equals(userPrefix))
- {
- replacementText = "<" + tagName + "></"
- + tagName + ">";
- }
- else
- {
- replacementText = tagName
- .substring(userPrefix.length());
- }
- proposals.add(new CompletionProposal(
- replacementText, context
- .getDocumentPosition(), 0, 0,
- null, tagName, null, null));
- }
- }
- }
- }
- }
- }
- catch (TagRegistryFactoryException e)
- {
- FaceletUiPlugin.log(e);
- }
-
- return proposals;
- }
-
- private Map<String, PrefixEntry> getDocumentNamespaces(Document doc)
- {
- final Map<String, PrefixEntry> namespaces = new HashMap<String, PrefixEntry>();
-
- Element rootElement = doc.getDocumentElement();
-
- if (rootElement != null)
- {
- NamedNodeMap attrs = rootElement.getAttributes();
- for (int i = 0; i < attrs.getLength(); i++)
- {
- Attr a = (Attr) attrs.item(i);
- PrefixEntry ns = PrefixEntry.parseNamespace(a);
- if (ns != null)
- {
- namespaces.put(ns.getUri(), ns);
- }
- }
- }
-
- return namespaces;
- }
-
- private static class TagPrefix
- {
- public final static TagPrefix NO_PREFIX = new TagPrefix("");
-
- private final String _prefix;
- private final String _localName;
- private final boolean _hasColon;
-
- public TagPrefix(final String tagName)
- {
- int prefixIdx = tagName.indexOf(':');
-
- if (prefixIdx != -1)
- {
- _prefix = tagName.substring(0, prefixIdx);
- _hasColon = true;
- if (tagName.length() > prefixIdx)
- {
- _localName = tagName.substring(prefixIdx + 1);
- }
- else
- {
- _localName = "";
- }
- }
- else
- {
- _hasColon = false;
- _prefix = tagName;
- _localName = "";
- }
- }
-
- public String getUserPrefix()
- {
- String userPrefix = _prefix;
-
- if (_hasColon)
- {
- userPrefix += ":";
- userPrefix += _localName;
- }
-
- return userPrefix;
- }
-
- public String getPrefix()
- {
- return _prefix;
- }
-
- public String getLocalName()
- {
- return _localName;
- }
- }
-
- private static class PrefixEntry
- {
- private final String _uri;
- private final String _prefix;
-
- public static PrefixEntry parseNamespace(Attr attr)
- {
- final String prefix = attr.getPrefix();
-
- if ("xmlns".equals(prefix))
- {
- final String prefixName = attr.getLocalName();
- if (prefixName != null)
- {
- final String uri = attr.getNodeValue();
-
- if (uri != null)
- {
- return new PrefixEntry(uri, prefixName);
- }
- }
- }
-
- return null;
- }
-
- public PrefixEntry(final String uri, final String prefix)
- {
- _uri = uri;
- _prefix = prefix;
- }
-
- public final String getUri()
- {
- return _uri;
- }
-
- public int hashCode()
- {
- return _uri.hashCode();
- }
-
- public boolean equals(Object obj)
- {
- return _uri.equals(obj);
- }
- }
-
- public IContextInformation[] computeContextInformation(ITextViewer viewer,
- int offset)
- {
- return null;
- }
-
- public char[] getCompletionProposalAutoActivationCharacters()
- {
- return null;
- }
-
- public char[] getContextInformationAutoActivationCharacters()
- {
- return null;
- }
-
- public IContextInformationValidator getContextInformationValidator()
- {
- return null;
- }
-
- public String getErrorMessage()
- {
- return null;
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.ui/src/org/eclipse/jst/jsf/facelet/ui/internal/facet/FaceletChangePage.java b/jsf/plugins/org.eclipse.jst.jsf.facelet.ui/src/org/eclipse/jst/jsf/facelet/ui/internal/facet/FaceletChangePage.java
deleted file mode 100644
index 24996aa..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.ui/src/org/eclipse/jst/jsf/facelet/ui/internal/facet/FaceletChangePage.java
+++ /dev/null
@@ -1,163 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Oracle 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:
- * Cameron Bateman - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facelet.ui.internal.facet;
-
-import org.eclipse.core.databinding.DataBindingContext;
-import org.eclipse.core.databinding.beans.BeansObservables;
-import org.eclipse.core.databinding.observable.value.IObservableValue;
-import org.eclipse.jface.databinding.swt.SWTObservables;
-import org.eclipse.jst.jsf.facelet.core.internal.facet.ChangeActionType;
-import org.eclipse.jst.jsf.facelet.core.internal.facet.FacetChangeModel;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.RowData;
-import org.eclipse.swt.layout.RowLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.wst.common.project.facet.ui.AbstractFacetWizardPage;
-
-/**
- * A common facet change UI page, mainly used for facet install/uninstall.
- *
- * @author cbateman
- *
- */
-public abstract class FaceletChangePage extends AbstractFacetWizardPage
-{
- private Button _chgDefaultSuffix;
- private Button _chgViewHandler;
- private Button _chgConfigureListener;
- private Button _chgWebappLifecycleListener;
-
- private DataBindingContext _bindingContext;
- private FacetChangeModel _dataModel;
-
- /**
- * @param name
- */
- public FaceletChangePage(String name)
- {
- super(name);
- }
-
- public void setConfig(final Object config)
- {
- _dataModel = (FacetChangeModel) config;
- }
-
- /**
- * @return the name of the change based on the actionType enumeration.
- */
- protected String getTextForChangeType()
- {
- final ChangeActionType actionType = _dataModel.getChangeActionType();
-
- switch (actionType)
- {
- case ADD:
- return "Add";
-
- case REMOVE:
- return "Remove";
- }
-
- return "*ERROR*";
- }
-
- private void initDefaultSuffixButton(final Composite parent)
- {
- _chgDefaultSuffix = new Button(parent, SWT.CHECK);
- _chgDefaultSuffix.setText(getTextForChangeType() + " '.xhtml' DEFAULT_SUFFIX parameter");
- _chgDefaultSuffix.setSelection(_dataModel.isChgDefaultSuffix());
- _chgDefaultSuffix.setLayoutData(new RowData());
- IObservableValue modelObservable = BeansObservables.observeValue(
- _dataModel, "chgDefaultSuffix");
-
- _bindingContext.bindValue(SWTObservables
- .observeSelection(_chgDefaultSuffix), modelObservable, null,
- null);
- }
-
- private void initViewHandlerButton(final Composite parent)
- {
- _chgViewHandler = new Button(parent, SWT.CHECK);
- _chgViewHandler.setText(getTextForChangeType() + " Facelet view handler");
- _chgViewHandler.setSelection(_dataModel.isChgViewHandler());
- _chgViewHandler.setLayoutData(new RowData());
- IObservableValue modelObservable = BeansObservables.observeValue(
- _dataModel, "chgViewHandler");
-
- _bindingContext
- .bindValue(SWTObservables.observeSelection(_chgViewHandler),
- modelObservable, null, null);
- }
-
- private void initConfigureListener(final Composite parent)
- {
- _chgConfigureListener = new Button(parent, SWT.CHECK);
- _chgConfigureListener
- .setText(getTextForChangeType() + " configure listener (needed by some Tomcat containers)");
- _chgConfigureListener.setSelection(_dataModel.isChgConfigureListener());
- _chgConfigureListener.setLayoutData(new RowData());
- IObservableValue modelObservable = BeansObservables.observeValue(
- _dataModel, "chgConfigureListener");
-
- _bindingContext.bindValue(SWTObservables
- .observeSelection(_chgConfigureListener), modelObservable,
- null, null);
- }
-
- private void initWebappLifecycleListener(final Composite parent)
- {
- _chgWebappLifecycleListener = new Button(parent, SWT.CHECK);
- _chgWebappLifecycleListener
- .setText(getTextForChangeType() + " web application lifecycle listener (needed by some Tomcat containers)");
- _chgWebappLifecycleListener.setSelection(_dataModel
- .isChgConfigureListener());
- _chgWebappLifecycleListener.setLayoutData(new RowData());
- IObservableValue modelObservable = BeansObservables.observeValue(
- _dataModel, "chgWebAppLifecycleListener");
-
- _bindingContext.bindValue(SWTObservables
- .observeSelection(_chgWebappLifecycleListener),
- modelObservable, null, null);
- }
-
- public void createControl(final Composite parent)
- {
- setTitle("Facelet");
- setMessage("Configure Facelet settings");
-
- _bindingContext = new DataBindingContext();
-
- // WizardPageSupport.create(this, _bindingContext);
-
- final Composite control = new Composite(parent, SWT.NONE);
- final RowLayout rowLayout = new RowLayout(SWT.VERTICAL);
- rowLayout.fill = true;
- control.setLayout(rowLayout);
-
- final Group webXMLGroup = new Group(control, SWT.NONE);
- webXMLGroup.setLayout(rowLayout);
- webXMLGroup.setText("Deployment Descriptor (web.xml) Configuration");
- initDefaultSuffixButton(webXMLGroup);
- initConfigureListener(webXMLGroup);
- initWebappLifecycleListener(webXMLGroup);
-
- final Group facesConfigGroup = new Group(control, SWT.NONE);
- facesConfigGroup.setLayout(rowLayout);
- facesConfigGroup
- .setText("Application (faces-config.xml) Configuration");
- initViewHandlerButton(facesConfigGroup);
-
- setControl(control);
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.ui/src/org/eclipse/jst/jsf/facelet/ui/internal/facet/FaceletInstallPage.java b/jsf/plugins/org.eclipse.jst.jsf.facelet.ui/src/org/eclipse/jst/jsf/facelet/ui/internal/facet/FaceletInstallPage.java
deleted file mode 100644
index 2ef2c5c..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.ui/src/org/eclipse/jst/jsf/facelet/ui/internal/facet/FaceletInstallPage.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package org.eclipse.jst.jsf.facelet.ui.internal.facet;
-
-
-/**
- * The UI page for installing the Facelet facet.
- * @author cbateman
- *
- */
-public class FaceletInstallPage extends FaceletChangePage
-{
- /**
- *
- */
- public FaceletInstallPage()
- {
- super("Facelet Install Page");
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.ui/src/org/eclipse/jst/jsf/facelet/ui/internal/facet/FaceletUninstallPage.java b/jsf/plugins/org.eclipse.jst.jsf.facelet.ui/src/org/eclipse/jst/jsf/facelet/ui/internal/facet/FaceletUninstallPage.java
deleted file mode 100644
index f0e0c2f..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.ui/src/org/eclipse/jst/jsf/facelet/ui/internal/facet/FaceletUninstallPage.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Oracle 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:
- * Cameron Bateman - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facelet.ui.internal.facet;
-
-/**
- * The uninstall page for the Facelet facet.
- *
- * @author cbateman
- *
- */
-public class FaceletUninstallPage extends FaceletChangePage
-{
- /**
- *
- */
- public FaceletUninstallPage()
- {
- super("Facelet Uninstall Page");
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.ui/src/org/eclipse/jst/jsf/facelet/ui/internal/hover/FaceletHover.java b/jsf/plugins/org.eclipse.jst.jsf.facelet.ui/src/org/eclipse/jst/jsf/facelet/ui/internal/hover/FaceletHover.java
deleted file mode 100644
index 9fe5821..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.ui/src/org/eclipse/jst/jsf/facelet/ui/internal/hover/FaceletHover.java
+++ /dev/null
@@ -1,143 +0,0 @@
-package org.eclipse.jst.jsf.facelet.ui.internal.hover;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jface.text.IRegion;
-import org.eclipse.jface.text.ITextHover;
-import org.eclipse.jface.text.ITextViewer;
-import org.eclipse.jst.jsf.context.resolver.structureddocument.IStructuredDocumentContextResolverFactory;
-import org.eclipse.jst.jsf.context.resolver.structureddocument.IWorkspaceContextResolver;
-import org.eclipse.jst.jsf.context.resolver.structureddocument.internal.ITextRegionContextResolver;
-import org.eclipse.jst.jsf.context.structureddocument.IStructuredDocumentContext;
-import org.eclipse.jst.jsf.context.structureddocument.IStructuredDocumentContextFactory;
-import org.eclipse.jst.jsf.facelet.core.internal.cm.FaceletDocumentFactory;
-import org.eclipse.jst.jsf.ui.internal.jspeditor.JSFELHover;
-import org.eclipse.wst.html.ui.internal.taginfo.HTMLTagInfoHoverProcessor;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration;
-import org.eclipse.wst.xml.core.internal.regions.DOMRegionContext;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-
-/**
- * The text hover for Facelets in html documents.
- *
- * @author cbateman
- *
- */
-public class FaceletHover implements ITextHover
-{
- private IProject _project;
- private JSFELHover _elHover;
- private HTMLTagInfoHoverProcessor _htmlHoverProcessor;
-
- /**
- *
- */
- public FaceletHover()
- {
- _elHover = new JSFELHover();
- _htmlHoverProcessor = new MyHTMLTagInfoHoverProcessor();
- }
-
- public String getHoverInfo(ITextViewer textViewer, IRegion hoverRegion)
- {
- final IStructuredDocumentContext context = IStructuredDocumentContextFactory.INSTANCE
- .getContext(textViewer, hoverRegion.getOffset());
- String info = null;
- if (isInAttributeValue(context))
- {
- info = _elHover.getHoverInfo(textViewer, hoverRegion);
- }
-
- if (info == null)
- {
- if (context != null)
- {
- _project = getProject(context);
- }
-
- info = _htmlHoverProcessor.getHoverInfo(textViewer, hoverRegion);
- }
-
- return info;
- }
-
- public IRegion getHoverRegion(ITextViewer textViewer, int offset)
- {
- IRegion region = null;
- final IStructuredDocumentContext context = IStructuredDocumentContextFactory.INSTANCE
- .getContext(textViewer, offset);
-
- // if we are in an attribute value, try to get a region from the
- // el hover first
- if (context != null)
- {
- if (isInAttributeValue(context))
- {
- region = _elHover.getHoverRegion(textViewer, offset);
- }
- }
-
- if (region == null)
- {
- if (context != null)
- {
- _project = getProject(context);
- }
- region = _htmlHoverProcessor.getHoverRegion(textViewer, offset);
- }
-
- return region;
- }
-
- private boolean isInAttributeValue(final IStructuredDocumentContext context)
- {
- final ITextRegionContextResolver resolver = IStructuredDocumentContextResolverFactory.INSTANCE
- .getTextRegionResolver(context);
- final String regionType = resolver.getRegionType();
- if (regionType != null
- && (regionType == DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE || resolver
- .matchesRelative(new String[]
- { DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE })))
- {
- return true;
- }
-
- return false;
- }
-
- private IProject getProject(final IStructuredDocumentContext context)
- {
- final IWorkspaceContextResolver resolver = IStructuredDocumentContextResolverFactory.INSTANCE
- .getWorkspaceContextResolver(context);
-
- if (resolver != null)
- {
- return resolver.getProject();
- }
- return null;
- }
-
- private class MyHTMLTagInfoHoverProcessor extends HTMLTagInfoHoverProcessor
- {
- @Override
- protected CMElementDeclaration getCMElementDeclaration(Node node)
- {
- if (_project != null && node.getNodeType() == Node.ELEMENT_NODE
- && node.getPrefix() != null)
- {
- final Element element = (Element) node;
- final FaceletDocumentFactory factory = new FaceletDocumentFactory(_project);
-
- final CMElementDeclaration elementDecl = factory
- .createCMElementDeclaration(element);
-
- if (elementDecl != null)
- {
- return elementDecl;
- }
- }
-
- return super.getCMElementDeclaration(node);
- }
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.ui/src/org/eclipse/jst/jsf/facelet/ui/internal/htmleditor/FaceletELHyperlinkDetector.java b/jsf/plugins/org.eclipse.jst.jsf.facelet.ui/src/org/eclipse/jst/jsf/facelet/ui/internal/htmleditor/FaceletELHyperlinkDetector.java
deleted file mode 100644
index 703eeee..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.ui/src/org/eclipse/jst/jsf/facelet/ui/internal/htmleditor/FaceletELHyperlinkDetector.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Oracle Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Oracle Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facelet.ui.internal.htmleditor;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.jst.jsf.context.resolver.structureddocument.IStructuredDocumentContextResolverFactory;
-import org.eclipse.jst.jsf.context.resolver.structureddocument.IWorkspaceContextResolver;
-import org.eclipse.jst.jsf.context.structureddocument.IStructuredDocumentContext;
-import org.eclipse.jst.jsf.ui.internal.jspeditor.AbstractELHyperlinkDetector;
-
-/**
- * This HyperlinkDetector creates hyperlinks for symbols in JSF EL expressions
- * inside facelet files.
- */
-public class FaceletELHyperlinkDetector extends AbstractELHyperlinkDetector {
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.jst.jsf.ui.internal.jspeditor.AbstractELHyperlinkDetector#isEnabled(org.eclipse.jst.jsf.context.structureddocument.IStructuredDocumentContext)
- */
- @Override
- protected boolean isEnabled(IStructuredDocumentContext context) {
- boolean enabled = false;
- if (context != null) {
- IWorkspaceContextResolver resolver =
- IStructuredDocumentContextResolverFactory.INSTANCE.getWorkspaceContextResolver(context);
- if (resolver != null) {
- IResource resource = resolver.getResource();
- if (resource instanceof IFile) {
- IFile file = (IFile)resource;
- String filename = file.getFullPath().toString();
- enabled =
- hasContentType(filename, "jsf.facelet") || //$NON-NLS-1$
- hasContentType(filename, "jsf.facelet.composite"); //$NON-NLS-1$
- }
- }
- }
- return enabled;
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.ui/src/org/eclipse/jst/jsf/facelet/ui/internal/validation/HTMLValidator.java b/jsf/plugins/org.eclipse.jst.jsf.facelet.ui/src/org/eclipse/jst/jsf/facelet/ui/internal/validation/HTMLValidator.java
deleted file mode 100644
index b3df148..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.ui/src/org/eclipse/jst/jsf/facelet/ui/internal/validation/HTMLValidator.java
+++ /dev/null
@@ -1,280 +0,0 @@
-package org.eclipse.jst.jsf.facelet.ui.internal.validation;
-
-import java.io.IOException;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Set;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.content.IContentType;
-import org.eclipse.core.runtime.content.IContentTypeManager;
-import org.eclipse.core.runtime.jobs.ISchedulingRule;
-import org.eclipse.emf.common.util.Diagnostic;
-import org.eclipse.jst.jsf.common.runtime.internal.view.model.common.Namespace;
-import org.eclipse.jst.jsf.context.resolver.structureddocument.IDOMContextResolver;
-import org.eclipse.jst.jsf.context.resolver.structureddocument.IStructuredDocumentContextResolverFactory;
-import org.eclipse.jst.jsf.context.structureddocument.IStructuredDocumentContext;
-import org.eclipse.jst.jsf.context.structureddocument.IStructuredDocumentContextFactory;
-import org.eclipse.jst.jsf.core.internal.JSFCorePlugin;
-import org.eclipse.jst.jsf.designtime.internal.view.model.ITagRegistry;
-import org.eclipse.jst.jsf.facelet.core.internal.util.ViewUtil;
-import org.eclipse.jst.jsf.facelet.ui.internal.FaceletUiPlugin;
-import org.eclipse.jst.jsf.validation.internal.IJSFViewValidator;
-import org.eclipse.jst.jsf.validation.internal.JSFValidatorFactory;
-import org.eclipse.jst.jsf.validation.internal.ValidationPreferences;
-import org.eclipse.jst.jsf.validation.internal.facelet.FaceletDiagnosticFactory;
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-import org.eclipse.wst.validation.AbstractValidator;
-import org.eclipse.wst.validation.ValidationResult;
-import org.eclipse.wst.validation.ValidationState;
-import org.eclipse.wst.validation.internal.core.ValidationException;
-import org.eclipse.wst.validation.internal.operations.LocalizedMessage;
-import org.eclipse.wst.validation.internal.provisional.core.IMessage;
-import org.eclipse.wst.validation.internal.provisional.core.IReporter;
-import org.eclipse.wst.validation.internal.provisional.core.IValidationContext;
-import org.eclipse.wst.validation.internal.provisional.core.IValidator;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMAttr;
-import org.w3c.dom.Attr;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-
-/**
- * The Facelet HTML file validator.
- *
- * @author cbateman
- *
- */
-public class HTMLValidator extends AbstractValidator implements IValidator
-{
- private FaceletDiagnosticFactory _diagnosticFactory = new FaceletDiagnosticFactory();
- /**
- * @param helper
- * @return no rule, null
- */
- public ISchedulingRule getSchedulingRule(final IValidationContext helper)
- {
- // no rule...
- return null;
- }
-
- /**
- * @param helper
- * @param reporter
- * @return status of this validation
- * @throws ValidationException
- */
- public IStatus validateInJob(final IValidationContext helper,
- final IReporter reporter) throws ValidationException
- {
- IStatus status = Status.OK_STATUS;
- try
- {
- validate(helper, reporter);
- }
- catch (final ValidationException e)
- {
- status = new Status(IStatus.ERROR, FaceletUiPlugin.PLUGIN_ID,
- IStatus.ERROR, e.getLocalizedMessage(), e);
- }
- return status;
-
- }
-
- public void cleanup(final IReporter reporter)
- {
- // do nothing
- }
-
- @Override
- public ValidationResult validate(IResource resource, int kind, ValidationState state, IProgressMonitor monitor){
- ValidationResult vr = new ValidationResult();
- if (resource == null || !(resource instanceof IFile)) {
- return vr;
- }
- IFile currentFile = (IFile) resource;
- if (shouldValidate(currentFile)) {
- validateFile(currentFile, vr.getReporter(monitor));
- }
- return vr;
- }
-
- public void validate(final IValidationContext helper,
- final IReporter reporter) throws ValidationException
- {
- final String[] uris = helper.getURIs();
- final IWorkspaceRoot wsRoot = ResourcesPlugin.getWorkspace().getRoot();
- if (uris.length > 0)
- {
- IFile currentFile = null;
-
- for (int i = 0; i < uris.length && !reporter.isCancelled(); i++)
- {
- currentFile = wsRoot.getFile(new Path(uris[i]));
- if (currentFile != null && currentFile.exists())
- {
- if (shouldValidate(currentFile))
- {
- final int percent = (i * 100) / uris.length + 1;
- final IMessage message = new LocalizedMessage(
- IMessage.LOW_SEVERITY, percent + "% " + uris[i]);
- reporter.displaySubtask(this, message);
-
- validateFile(currentFile, reporter);
- }
- }
- }
- }
-
- }
-
- private void validateFile(final IFile file, final IReporter reporter)
- {
- final IJSFViewValidator validator = JSFValidatorFactory
- .createDefaultXMLValidator();
- final ValidationPreferences prefs = new ValidationPreferences(
- JSFCorePlugin.getDefault().getPreferenceStore());
- prefs.load();
-
- IStructuredModel model = null;
- try
- {
- model = StructuredModelManager.getModelManager().getModelForRead(
- file);
-
- final ValidationReporter jsfReporter = new ValidationReporter(this,
- reporter, file, prefs, model);
- validator.validateView(file, jsfReporter);
- // TODO: break off into composite strategies
- validateFaceletHtml(file, jsfReporter);
- }
- catch (final CoreException e)
- {
- JSFCorePlugin.log("Error validating JSF", e);
- }
- catch (final IOException e)
- {
- JSFCorePlugin.log("Error validating JSF", e);
- }
- finally
- {
- if (null != model)
- {
- model.releaseFromRead();
- }
- }
- }
-
- private void validateFaceletHtml(final IFile file,
- final ValidationReporter reporter)
- {
- IStructuredModel model = null;
- try
- {
- model = StructuredModelManager.getModelManager().getModelForRead(
- file);
-
- final IStructuredDocument structuredDoc = model
- .getStructuredDocument();
-
- validateDocument(structuredDoc, reporter, file.getProject());
- }
- catch (final CoreException e)
- {
- JSFCorePlugin.log("Error validating JSF", e);
- }
- catch (final IOException e)
- {
- JSFCorePlugin.log("Error validating JSF", e);
- }
- finally
- {
- if (null != model)
- {
- model.releaseFromRead();
- }
- }
- }
-
- private void validateDocument(IStructuredDocument structuredDoc,
- final ValidationReporter reporter, IProject project)
- {
- validateRoot(structuredDoc, reporter, project);
- }
-
- private void validateRoot(IStructuredDocument structuredDoc,
- ValidationReporter reporter, IProject project)
- {
- final IStructuredDocumentContext context = IStructuredDocumentContextFactory.INSTANCE
- .getContext(structuredDoc, -1);
- final IDOMContextResolver resolver = IStructuredDocumentContextResolverFactory.INSTANCE
- .getDOMContextResolver(context);
- final Document document = resolver.getDOMDocument();
- Element rootElement = document.getDocumentElement();
-
- if ("html".equals(rootElement.getNodeName()))
- {
- final Set<Attr> declaredNamespaces = ViewUtil
- .getDeclaredNamespaces(rootElement.getAttributes());
- final ITagRegistry tagRegistry = ViewUtil
- .getHtmlTagRegistry(project);
- final Collection<? extends Namespace> namespaces;
- if (tagRegistry != null)
- {
- namespaces = tagRegistry.getAllTagLibraries();
- }
- else
- {
- // unexpected
- namespaces = Collections.EMPTY_SET;
- JSFCorePlugin.log(IStatus.ERROR, "Program Error: HTML tag registry not found"); //$NON-NLS-1$
- }
-
- for (final Attr attr : declaredNamespaces)
- {
- // only validate prefix declarations
- if (attr.getPrefix() != null && attr instanceof IDOMAttr)
- {
- final String declaredUri = attr.getValue();
- String findUri = null;
- SEARCH_NAMESPACES: for (final Namespace ns : namespaces)
- {
- if (ns.getNSUri().equals(declaredUri))
- {
- findUri = ns.getNSUri();
- break SEARCH_NAMESPACES;
- }
- }
-
- if (findUri == null)
- {
- final Diagnostic diag = _diagnosticFactory.create_CANNOT_FIND_FACELET_TAGLIB(declaredUri);
- final IDOMAttr domAttr = (IDOMAttr) attr;
- reporter.report(diag, domAttr.getValueRegionStartOffset(), domAttr
- .getValue().length());
- }
- }
- }
- }
- }
-
- private boolean shouldValidate(final IFile model)
- {
- final IContentTypeManager manager = Platform.getContentTypeManager();
- final IContentType contentType = manager
- .getContentType("org.eclipse.wst.html.core.htmlsource");
- return (contentType.isAssociatedWith(model.getName()))
- && ViewUtil.isFaceletVDLFile(model);
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.ui/src/org/eclipse/jst/jsf/facelet/ui/internal/validation/ValidationReporter.java b/jsf/plugins/org.eclipse.jst.jsf.facelet.ui/src/org/eclipse/jst/jsf/facelet/ui/internal/validation/ValidationReporter.java
deleted file mode 100644
index 2e87e82..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.ui/src/org/eclipse/jst/jsf/facelet/ui/internal/validation/ValidationReporter.java
+++ /dev/null
@@ -1,69 +0,0 @@
-package org.eclipse.jst.jsf.facelet.ui.internal.validation;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.emf.common.util.Diagnostic;
-import org.eclipse.jst.jsf.ui.internal.validation.ValidationMessageFactory;
-import org.eclipse.jst.jsf.validation.internal.IJSFViewValidator;
-import org.eclipse.jst.jsf.validation.internal.ValidationPreferences;
-import org.eclipse.jst.jsf.validation.internal.strategy.DiagnosticFactory;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.validation.internal.provisional.core.IMessage;
-import org.eclipse.wst.validation.internal.provisional.core.IReporter;
-import org.eclipse.wst.validation.internal.provisional.core.IValidator;
-
-/*package*/class ValidationReporter implements
- IJSFViewValidator.IValidationReporter
-{
- private final IValidator _validator;
- private final IReporter _reporter;
- private final IFile _file;
- private final ValidationMessageFactory _factory;
-
- public ValidationReporter(final IValidator validator,
- final IReporter reporter, final IFile file,
- final ValidationPreferences prefs, final IStructuredModel model)
- {
- _validator = validator;
- _reporter = reporter;
- _file = file;
- _factory = new ValidationMessageFactory(prefs, model);
- }
-
- public void report(final Diagnostic problem, final int start,
- final int length)
- {
- if (shouldReportProblem(problem.getCode()))
- {
- final IMessage message = _factory.createFromDiagnostic(problem,
- start, length, _file);
- if ((message.getSeverity() & IMessage.ALL_MESSAGES) != 0)
- {
- _reporter.addMessage(_validator, message);
- }
- }
- }
-
- /**
- * @param problemCode
- * @return filters out problems to be reported by code
- */
- private boolean shouldReportProblem(final int problemCode)
- {
- switch (problemCode)
- {
- case DiagnosticFactory.CONTAINMENT_ERROR_MISSING_VIEW:
- return false;
- default:
- return true;
- }
- }
-
- public void report(IMessage message)
- {
- // not capable of filtering problems by code... should not be used
- if ((message.getSeverity() & IMessage.ALL_MESSAGES) != 0)
- {
- _reporter.addMessage(_validator, message);
- }
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.ui/templates/templates.properties b/jsf/plugins/org.eclipse.jst.jsf.facelet.ui/templates/templates.properties
deleted file mode 100644
index 1b2b72b..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.ui/templates/templates.properties
+++ /dev/null
@@ -1,15 +0,0 @@
-New_Facelet_Footer=New Facelet Footer
-New_Footer_Description=Creates a footer for use with the Facelet template.
-
-New_Facelet_Header=New Facelet Header
-New_Facelet_Header_Description=Creates a header for use with the Facelet template
-
-New_Facelet_Template=New Facelet Template
-New_Facelet_Template_Description=Creates a basic header/content/footer Facelet template
-
-New_Simple_Facelet_Composition_Page=New Facelet Composition Page
-New_Simple_Facelet_Composition_Page_Description=Creates a new Facelet page for use with a template.
-New_Facelet_Header.header=<?xml version="1.0" encoding="ISO-8859-1" ?>\n<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">\n<html xmlns="http://www.w3.org/1999/xhtml">\n<body>\n<div style="width:100%;font-size:36px;line-height:48px;background-color:navy;color:white">My Facelet Application</div>\n</body>\n</html>\n
-New_Facelet_Footer.footer=<?xml version="1.0" encoding="ISO-8859-1" ?>\n<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">\n<html xmlns="http://www.w3.org/1999/xhtml">\n<head>\n<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />\n<title>Insert title here</title>\n</head>\n<body>\n<div style="background-color:navy;width:100%;color:white"></div>\n</body>\n</html>\n
-New_Facelet_Template.template=<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" \n "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">\n<html xmlns="http://www.w3.org/1999/xhtml"\n xmlns:ui="http://java.sun.com/jsf/facelets">\n<head>\n <title><ui:insert name="title">Default title</ui:insert></title>\n</head>\n\n<body>\n\n<div id="header">\n <ui:insert name="header">\n Header area. See comments below this line in the source.\n <!-- include your header file or uncomment the include below and create header.xhtml in this directory -->\n <!-- <ui:include src="header.xhtml"/> -->\n </ui:insert>\n</div>\n\n\n<div id="content">\n <ui:insert name="content">\n Content area. See comments below this line in the source.\n <!-- include your content file or uncomment the include below and create content.xhtml in this directory -->\n <!-- <div> -->\n <!-- <ui:include src="content.xhtml"/> --> \n <!-- </div> -->\n </ui:insert>\n</div>\n\n<div id="footer">\n <ui:insert name="footer">\n Footer area. See comments below this line in the source.\n <!-- include your header file or uncomment the include below and create footer.xhtml in this directory -->\n <!--<ui:include src="footer.xhtml"/> -->\n </ui:insert>\n</div>\n\n</body>\n\n</html>\n
-New_Simple_Facelet_Composition_Page.composition=<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" \n "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">\n\n<html xmlns="http://www.w3.org/1999/xhtml"\n xmlns:ui="http://java.sun.com/jsf/facelets"\n xmlns:h="http://java.sun.com/jsf/html"\n xmlns:f="http://java.sun.com/jsf/core">\n\n<ui:composition template="">\n <ui:define name="header">\n Add your header here or delete to use the default\n </ui:define>\n <ui:define name="content">\n Add your content here or delete to use the default\n </ui:define>\n <ui:define name="footer">\n Add your footer here or delete to use the default\n </ui:define>\n</ui:composition>\n</html>
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.ui/templates/templates.xml b/jsf/plugins/org.eclipse.jst.jsf.facelet.ui/templates/templates.xml
deleted file mode 100644
index c5f4eb1..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.ui/templates/templates.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<templates>
-<template id="org.eclipse.jst.jsf.facelet.ui.new_simple_footer_xhtml" autoinsert="false" context="html_new" deleted="false" description="%New_Footer_Description" enabled="true" name="%New_Facelet_Footer">%New_Facelet_Footer.footer</template>
-<template id="org.eclipse.jst.jsf.facelet.ui.new_header_xhtml" autoinsert="false" context="html_new" deleted="false" description="%New_Facelet_Header_Description" enabled="true" name="%New_Facelet_Header">%New_Facelet_Header.header</template>
-<template id="org.eclipse.jst.jsf.facelet.ui.new_basic_template_xhtml" autoinsert="false" context="html_new" deleted="false" description="%New_Facelet_Template_Description" enabled="true" name="%New_Facelet_Template">%New_Facelet_Template.template</template>
-<template id="org.eclipse.jst.jsf.facelet.ui.new_basic_composition_xhtml" autoinsert="false" context="html_new" deleted="false" description="%New_Simple_Facelet_Composition_Page_Description" enabled="true" name="%New_Simple_Facelet_Composition_Page">%New_Simple_Facelet_Composition_Page.composition</template>
-</templates>
\ No newline at end of file
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/.classpath b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/.classpath
deleted file mode 100644
index 304e861..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="con" path="org.eclipse.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/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/.cvsignore b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/.cvsignore
deleted file mode 100644
index 40e79ad..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/.cvsignore
+++ /dev/null
@@ -1,3 +0,0 @@
-build.xml
-javaCompiler...args
-@dot
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/.project b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/.project
deleted file mode 100644
index ca987a4..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.jst.jsf.facesconfig.ui</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/.settings/org.eclipse.core.resources.prefs b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index c9896cd..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Sun May 27 16:03:23 EDT 2007
-eclipse.preferences.version=1
-encoding/<project>=ISO-8859-1
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/.settings/org.eclipse.jdt.core.prefs b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 9d11d52..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,82 +0,0 @@
-#Mon Jun 30 15:56:09 PDT 2008
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.doc.comment.support=enabled
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.autoboxing=warning
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=ignore
-org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
-org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled
-org.eclipse.jdt.core.compiler.problem.fieldHiding=warning
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=warning
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
-org.eclipse.jdt.core.compiler.problem.invalidJavadoc=error
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=enabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=disabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=disabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=protected
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=warning
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocComments=warning
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=protected
-org.eclipse.jdt.core.compiler.problem.missingJavadocTags=warning
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=protected
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=error
-org.eclipse.jdt.core.compiler.problem.nullReference=ignore
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
-org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=ignore
-org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
-org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=ignore
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=ignore
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=error
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=warning
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=error
-org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=error
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error
-org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.5
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/.settings/org.eclipse.jdt.ui.prefs b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index 82eb6c1..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Fri Apr 06 18:25:15 PDT 2007
-eclipse.preferences.version=1
-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8"?><templates/>
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/.settings/org.eclipse.pde.prefs b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/.settings/org.eclipse.pde.prefs
deleted file mode 100644
index cd8bbb3..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/.settings/org.eclipse.pde.prefs
+++ /dev/null
@@ -1,22 +0,0 @@
-#Fri May 30 11:55:44 PDT 2008
-compilers.f.unresolved-features=1
-compilers.f.unresolved-plugins=1
-compilers.incompatible-environment=1
-compilers.p.build=1
-compilers.p.deprecated=1
-compilers.p.discouraged-class=1
-compilers.p.internal=1
-compilers.p.missing-packages=0
-compilers.p.no-required-att=0
-compilers.p.not-externalized-att=0
-compilers.p.unknown-attribute=1
-compilers.p.unknown-class=1
-compilers.p.unknown-element=1
-compilers.p.unknown-identifier=1
-compilers.p.unknown-resource=1
-compilers.p.unresolved-ex-points=0
-compilers.p.unresolved-import=0
-compilers.s.create-docs=false
-compilers.s.doc-folder=doc
-compilers.s.open-tags=1
-eclipse.preferences.version=1
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/.settings/org.eclipse.wst.validation.prefs b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/.settings/org.eclipse.wst.validation.prefs
deleted file mode 100644
index 97e2fd2..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/.settings/org.eclipse.wst.validation.prefs
+++ /dev/null
@@ -1,6 +0,0 @@
-#Tue Apr 25 16:26:29 CST 2006
-DELEGATES_PREFERENCE=delegateValidatorListorg.eclipse.wst.wsdl.validation.internal.eclipse.WSDLDelegatingValidator\=org.eclipse.wst.wsdl.validation.internal.eclipse.Validator;org.eclipse.wst.xsd.core.internal.validation.eclipse.XSDDelegatingValidator\=org.eclipse.wst.xsd.core.internal.validation.eclipse.Validator;
-USER_BUILD_PREFERENCE=enabledBuildValidatorListorg.eclipse.wst.dtd.core.internal.validation.eclipse.Validator;org.eclipse.jst.jsp.core.internal.validation.JSPELValidator;org.eclipse.wst.wsdl.validation.internal.eclipse.WSDLDelegatingValidator;org.eclipse.jst.jsp.core.internal.validation.JSPJavaValidator;org.eclipse.wst.xml.core.internal.validation.eclipse.Validator;org.eclipse.wst.html.internal.validation.HTMLValidator;org.eclipse.wst.wsi.ui.internal.WSIMessageValidator;org.eclipse.jst.jsp.core.internal.validation.JSPDirectiveValidator;org.eclipse.wst.xsd.core.internal.validation.eclipse.XSDDelegatingValidator;
-USER_MANUAL_PREFERENCE=enabledManualValidatorListorg.eclipse.wst.dtd.core.internal.validation.eclipse.Validator;org.eclipse.jst.jsp.core.internal.validation.JSPELValidator;org.eclipse.wst.wsdl.validation.internal.eclipse.WSDLDelegatingValidator;org.eclipse.jst.jsp.core.internal.validation.JSPJavaValidator;org.eclipse.wst.xml.core.internal.validation.eclipse.Validator;org.eclipse.wst.html.internal.validation.HTMLValidator;org.eclipse.wst.wsi.ui.internal.WSIMessageValidator;org.eclipse.jst.jsp.core.internal.validation.JSPDirectiveValidator;org.eclipse.wst.xsd.core.internal.validation.eclipse.XSDDelegatingValidator;
-USER_PREFERENCE=overrideGlobalPreferencesfalse
-eclipse.preferences.version=1
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/META-INF/MANIFEST.MF b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/META-INF/MANIFEST.MF
deleted file mode 100644
index 1868385..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,57 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %plugin.name
-Bundle-SymbolicName: org.eclipse.jst.jsf.facesconfig.ui;singleton:=true
-Bundle-Version: 1.2.0.qualifier
-Bundle-Activator: org.eclipse.jst.jsf.facesconfig.ui.EditorPlugin
-Bundle-Vendor: %plugin.provider
-Bundle-Localization: plugin
-Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.jdt.core;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.core.resources;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.help;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.gef;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.wst.xml.core;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.wst.sse.core;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.wst.xml.ui;bundle-version="[1.0.100,1.2.0)",
- org.eclipse.emf.ecore.xmi;bundle-version="[2.2.0,3.0.0)",
- org.eclipse.jst.jsp.core;bundle-version="[1.1.0,1.3.0)",
- org.eclipse.wst.sse.ui;bundle-version="[1.0.101,1.3.0)",
- org.eclipse.jface.text;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.wst.common.emf;bundle-version="[1.1.103,2.0.0)",
- org.eclipse.jst.jsf.facesconfig;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.wst.common.project.facet.core;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.emf.edit.ui;bundle-version="[2.2.0,3.0.0)",
- org.eclipse.jst.jsf.common.ui;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.jdt.ui;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.jst.jsf.core;bundle-version="[1.1.0,2.0.0)",
- org.eclipse.ui.ide;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.wst.common.modulecore;bundle-version="[1.1.0,2.0.0)",
- org.eclipse.ui.views.properties.tabbed;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.jst.jsf.common;bundle-version="[1.0.0,2.0.0)"
-Bundle-ActivationPolicy: lazy
-Export-Package: org.eclipse.jst.jsf.facesconfig.ui;x-internal:=true,
- org.eclipse.jst.jsf.facesconfig.ui.dialog;x-internal:=true,
- org.eclipse.jst.jsf.facesconfig.ui.page;x-internal:=true,
- org.eclipse.jst.jsf.facesconfig.ui.page.detail;x-internal:=true,
- org.eclipse.jst.jsf.facesconfig.ui.pageflow;x-internal:=true,
- org.eclipse.jst.jsf.facesconfig.ui.pageflow.action;x-internal:=true,
- org.eclipse.jst.jsf.facesconfig.ui.pageflow.action.icons;x-internal:=true,
- org.eclipse.jst.jsf.facesconfig.ui.pageflow.command;x-internal:=true,
- org.eclipse.jst.jsf.facesconfig.ui.pageflow.editpart;x-internal:=true,
- org.eclipse.jst.jsf.facesconfig.ui.pageflow.editpolicy;x-internal:=true,
- org.eclipse.jst.jsf.facesconfig.ui.pageflow.figure;x-internal:=true,
- org.eclipse.jst.jsf.facesconfig.ui.pageflow.layout;x-internal:=true,
- org.eclipse.jst.jsf.facesconfig.ui.pageflow.model;x-internal:=true,
- org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.impl;x-internal:=true,
- org.eclipse.jst.jsf.facesconfig.ui.pageflow.properties;x-internal:=true,
- org.eclipse.jst.jsf.facesconfig.ui.pageflow.properties.section;x-internal:=true,
- org.eclipse.jst.jsf.facesconfig.ui.pageflow.synchronization;x-internal:=true,
- org.eclipse.jst.jsf.facesconfig.ui.pageflow.util;x-internal:=true,
- org.eclipse.jst.jsf.facesconfig.ui.preference;x-internal:=true,
- org.eclipse.jst.jsf.facesconfig.ui.provider;x-internal:=true,
- org.eclipse.jst.jsf.facesconfig.ui.section;x-internal:=true,
- org.eclipse.jst.jsf.facesconfig.ui.util;x-internal:=true,
- org.eclipse.jst.jsf.facesconfig.ui.wizard;x-internal:=true
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/about.html b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/about.html
deleted file mode 100644
index 8e56059..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/about.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
-
-<p>June, 2008</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.</p>
-
-</body>
-</html>
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/build.properties b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/build.properties
deleted file mode 100644
index e34e43f..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/build.properties
+++ /dev/null
@@ -1,21 +0,0 @@
-###############################################################################
-# Copyright (c) 2001, 2007 Oracle Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# Oracle Corporation - initial API and implementation
-###############################################################################
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
- .,\
- icons/,\
- plugin.xml,\
- plugin.properties,\
- cheatsheets/,\
- about.html
-javacSource=1.5
-javacTarget=1.5
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/cheatsheets/facesconfigeditor.xml b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/cheatsheets/facesconfigeditor.xml
deleted file mode 100644
index aed958f..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/cheatsheets/facesconfigeditor.xml
+++ /dev/null
@@ -1,276 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<cheatsheet title="Faces Configuration Editor">
-
- <intro
- href="/org.eclipse.platform.doc.user/reference/ref-cheatsheets.htm">
- <description>
- This cheat sheet will demonstrate how to edit a JSF
- configuration file with Faces Config Editor.
- <br />
- <br />
- To learn more about using cheat sheets, click the help
- button in the top right corner (?).
- </description>
- </intro>
-
- <!-- Item -->
-
- <item title="Open the J2EE perspective"
- href="/org.eclipse.jst.j2ee.doc.user/topics/cjpers.html"
- dialog="false" skip="true">
- <description>
- To open the J2EE perspective, select
- <b>Window->Open Perspective->Other...</b>
- and choose
- <b>J2EE</b>
- .
- <br />
- <br />
- Alternatively, click the following button to perform the
- task.
- </description>
- <command
- serialization="org.eclipse.ui.perspectives.showPerspective(org.eclipse.ui.perspectives.showPerspective.perspectiveId=org.eclipse.jst.j2ee.J2EEPerspective)" />
- </item>
-
- <!-- Item -->
-
- <item title="Create the JSF web project"
- href="/org.eclipse.jst.jsf.doc.user/html/tasks/create_jsf_app.html"
- dialog="true" skip="false">
- <description>
- To create the JSF web application perform the following
- steps
- </description>
- <subitem
- label="Select "File->New->Project..." from the main menu and choose "Dynamic Web Project" from the resulting "New Project" dialog box"
- skip="false">
- <command
- serialization="org.eclipse.ui.newWizard(newWizardId=org.eclipse.jst.servlet.ui.project.facet.WebProjectWizard)" />
- </subitem>
- <subitem
- label="Input "JSFApplication" into the "Project Name" text box"
- skip="false" />
- <subitem
- label="Select "JavaServer Faces v1.1 Project" in the "Configurations" dropdown box"
- skip="false" />
- <subitem
- label="Accept the rest of the default preloaded values on the "Dynamic Web Project" page and click "Next""
- skip="false" />
- <subitem
- label="Accept the rest of the default preloaded values on the "Project Facets" page and click "Next""
- skip="false" />
- <subitem
- label="Accept the rest of the default preloaded values on the "Web Module" page and click "Next""
- skip="false" />
- <subitem
- label="Specify JSF Facet Settings on the "JSF Capabilities" page and click "Finish""
- skip="false" />
- </item>
-
- <item title="Open the JSF configuration file"
- href="/org.eclipse.jst.jsf.doc.user/html/tasks/use_facesconfig_editor.html"
- dialog="true" skip="false">
- <description>
- To open the JSF configuration file, Expand the
- WebContent/WEB-INF/ folder in the "Project
- Explorer" view; Double click on the
- "faces-config.xml" file to open it. Or right click
- on it then select "Open With" -> "FacesConfig
- Editor"
- </description>
- <subitem
- label="Expand the /JSFApplication/WebContent/WEB-INF/ folder in the "Project Explorer" view; "
- skip="true">
- </subitem>
- <subitem
- label="Double click on the "faces-config.xml" file to open it.
- Or right click on it then select "Open With" -> "FacesConfig Editor""
- skip="false">
- <command
- serialization="org.eclipse.ui.navigate.openResource(filePath=JSFApplication/WebContent/WEB-INF/faces-config.xml)" />
- </subitem>
- </item>
-
-
- <item href=" " title="Get an introduction on the FacesConfig Editor"
- dialog="false" skip="true">
- <description>
- On the "Introduction " page, there are some
- introductions about the FacesConfig Editor, and some links
- to start work with it, or show user the tutorial and help
- documentation.
- </description>
- </item>
-
-
- <item href=" " title="Get an overview of the content" dialog="false"
- skip="true">
- <description>
- On the "Overview " page, there are several tables
- that list the main elements defined in the current faces
- config file. By double-clicking on an element, user could be
- guided to the corresponding page to edit it.
- </description>
- </item>
-
- <item
- href="/org.eclipse.jst.jsf.doc.user/html/tasks/define_navigations.html"
- title="Create a Navigation Rule">
- <description>
- To create a navigation rule perform the following steps
- </description>
- <subitem
- label="Use the JSP Page wizard to create a page called " login.jsp " in the Web Content folder of the new application.
- In the Select Templates page of the wizard, select the "New JSP(html) " template. Click Finish."
- skip="false">
- <command
- serialization="org.eclipse.ui.newWizard(newWizardId=org.eclipse.jst.jsp.ui.internal.wizard.NewJSPWizard)" />
- </subitem>
- <subitem
- label="In the same way, create a page called "welcome.jsp " ."
- skip="false">
- <command
- serialization="org.eclipse.ui.newWizard(newWizardId=org.eclipse.jst.jsp.ui.internal.wizard.NewJSPWizard)" />
- </subitem>
- <subitem
- label="Select the "Page" control from the "Palette" and drop it on the "Navigation" tab.
- Choose the page in the resulting "Select JSP File" dialog. "
- skip="false" />
- <subitem
- label="Connect the two pages. Click on the "Link" control in the "Palette", select the "login" page and draw a line to the "welcome" page.
- Select the line in the "Navigation" tab and in the property view, set the value of the "from-outcome" to "login" . "
- skip="false" />
- <subitem
- label="Swith to the "Source" page, will find that there is a navigation-rule element created."
- skip="false" />
- </item>
-
- <item
- href="/org.eclipse.jst.jsf.doc.user/html/tasks/create_managedbean.html"
- title="Create a Managed Bean">
- <description>
- To create a managed bean perform the following steps
- </description>
- <subitem
- label="Switch to the "ManagedBean" page; click the "New" button, the new managed bean wizard pops up."
- skip="false" />
- <subitem
- label="On the "Java Class Selection" page, choose "Create a new Java class", then click "Next"."
- skip="false" />
- <subitem
- label="On the "Java Class" page, input "com.tutorial" into the "Package" field and input "LoginBean" into the "Name" field,
- then click "Next" to the next page."
- skip="false" />
- <subitem
- label="On the "Managed Bean Configuration" page, accept the default values and click "Finish" to finish this wizard."
- skip="false" />
- <subitem
- label="Swith to the "Source" page, will find that there is a managed-bean element created."
- skip="true" />
- </item>
-
- <item
- href="/org.eclipse.jst.jsf.doc.user/html/tasks/facesconfig_ui/add_component.html"
- title="Create a Component">
- <description>
- To create a component perform the following steps
- </description>
- <subitem
- label="Switch to the "Component" page; expand the "Components" section; "
- skip="false" />
- <subitem
- label="Click the "New" button, a new empty component element is created."
- skip="false" />
- <subitem
- label="On the right part, fill in the essential fields for this component, for example "Component Type", "Component Class"."
- skip="false" />
- <subitem
- label="Swith to the "Source" page, will find that there is a component element created."
- skip="false" />
- </item>
-
-
- <item
- href="/org.eclipse.jst.jsf.doc.user/html/tasks/facesconfig_ui/add_converter.html"
- title="Create a Converter">
- <description>
- To create a converter perform the following steps
- </description>
- <subitem
- label="Switch to the "Component" page; expand the "Converters" section; "
- skip="false" />
- <subitem
- label="Click the "New" button, a new empty converter element is created."
- skip="false" />
- <subitem
- label="On the right part, fill in the essential fields for this converter, for example "Converter ID", "Converter Class"."
- skip="false" />
- <subitem
- label="Swith to the "Source" page, will find that there is a converter element created."
- skip="false" />
- </item>
-
- <item
- href="/org.eclipse.jst.jsf.doc.user/html/tasks/facesconfig_ui/add_renderkit.html"
- title="Create a Render Kit">
- <description>
- To create a render-kit perform the following steps
- </description>
- <subitem
- label="Switch to the "Component" page; expand the "RenderKits" section; "
- skip="false" />
- <subitem
- label="Click the "New" button, a new empty render-kit element is created."
- skip="false" />
- <subitem
- label="On the right part, fill in the essential fields for this converter, for example "Renderkit ID", "Renderkit Class"."
- skip="false" />
- <subitem
- label="Swith to the "Source" page, will find that there is a render-kit element created."
- skip="false" />
- </item>
-
- <item
- href="/org.eclipse.jst.jsf.doc.user/html/tasks/facesconfig_ui/add_validator.html"
- title="Create a Validator">
- <description>
- To create a validator perform the following steps
- </description>
- <subitem
- label="Switch to the "Component" page; expand the "Validators" section; "
- skip="false" />
- <subitem
- label="Click the "New" button, a new empty validator element is created."
- skip="false" />
- <subitem
- label="On the right part, fill in the essential fields for this converter, for example "Validator ID", "Validator Class"."
- skip="false" />
- <subitem
- label="Swith to the "Source" page, will find that there is a validator element created."
- skip="false" />
- </item>
-
- <item
- href="/org.eclipse.jst.jsf.doc.user/html/tasks/use_facesconfig_editor.html"
- title="Editing other elements on the Others Page">
- <description>
- On the "Others" page, there are several sections
- for editing the elements such as
- "action-listener", "locale-config", and
- so on.
- </description>
- </item>
-
- <item title="Source Page">
- <description>
- The "Source" page is a embeded XML editor, user can edit the xml source of faces config directly here.
- </description>
- </item>
-
- <item title="Completion">
- <description>
- Congratulations, you should now be able to use this editor fluently.
- </description>
- </item>
-</cheatsheet>
\ No newline at end of file
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/icons/FacesConfig_GotoEditor.gif b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/icons/FacesConfig_GotoEditor.gif
deleted file mode 100644
index 0e5bcf6..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/icons/FacesConfig_GotoEditor.gif
+++ /dev/null
Binary files differ
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/icons/FacesConfig_Introduction.gif b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/icons/FacesConfig_Introduction.gif
deleted file mode 100644
index 44cd044..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/icons/FacesConfig_Introduction.gif
+++ /dev/null
Binary files differ
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/icons/FacesConfig_Tutorial.gif b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/icons/FacesConfig_Tutorial.gif
deleted file mode 100644
index ad8e5b6..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/icons/FacesConfig_Tutorial.gif
+++ /dev/null
Binary files differ
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/icons/Scope.gif b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/icons/Scope.gif
deleted file mode 100644
index d49078b..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/icons/Scope.gif
+++ /dev/null
Binary files differ
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/icons/Scope_Application.gif b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/icons/Scope_Application.gif
deleted file mode 100644
index 591ceb2..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/icons/Scope_Application.gif
+++ /dev/null
Binary files differ
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/icons/Scope_None.gif b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/icons/Scope_None.gif
deleted file mode 100644
index 0a96aaa..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/icons/Scope_None.gif
+++ /dev/null
Binary files differ
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/icons/Scope_Request.gif b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/icons/Scope_Request.gif
deleted file mode 100644
index e875d01..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/icons/Scope_Request.gif
+++ /dev/null
Binary files differ
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/icons/Scope_Session.gif b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/icons/Scope_Session.gif
deleted file mode 100644
index cbe011b..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/icons/Scope_Session.gif
+++ /dev/null
Binary files differ
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/icons/facesconfig/FacesConfig_ManagedBean.gif b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/icons/facesconfig/FacesConfig_ManagedBean.gif
deleted file mode 100644
index 6cdef7b..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/icons/facesconfig/FacesConfig_ManagedBean.gif
+++ /dev/null
Binary files differ
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/icons/facesconfig/FacesConfig_Pageflow16.gif b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/icons/facesconfig/FacesConfig_Pageflow16.gif
deleted file mode 100644
index 5ea67da..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/icons/facesconfig/FacesConfig_Pageflow16.gif
+++ /dev/null
Binary files differ
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/icons/facesconfig/FacesConfig_Plugin.gif b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/icons/facesconfig/FacesConfig_Plugin.gif
deleted file mode 100644
index 5ea67da..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/icons/facesconfig/FacesConfig_Plugin.gif
+++ /dev/null
Binary files differ
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/icons/facesconfig/Pageflow_Action16.gif b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/icons/facesconfig/Pageflow_Action16.gif
deleted file mode 100644
index c241f5f..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/icons/facesconfig/Pageflow_Action16.gif
+++ /dev/null
Binary files differ
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/icons/facesconfig/Pageflow_BooleanValue.gif b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/icons/facesconfig/Pageflow_BooleanValue.gif
deleted file mode 100644
index 5002791..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/icons/facesconfig/Pageflow_BooleanValue.gif
+++ /dev/null
Binary files differ
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/icons/facesconfig/Pageflow_GenericValue.gif b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/icons/facesconfig/Pageflow_GenericValue.gif
deleted file mode 100644
index 7ef81e5..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/icons/facesconfig/Pageflow_GenericValue.gif
+++ /dev/null
Binary files differ
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/icons/facesconfig/Pageflow_IntegralValue.gif b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/icons/facesconfig/Pageflow_IntegralValue.gif
deleted file mode 100644
index fea95ce..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/icons/facesconfig/Pageflow_IntegralValue.gif
+++ /dev/null
Binary files differ
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/icons/facesconfig/Pageflow_Link.gif b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/icons/facesconfig/Pageflow_Link.gif
deleted file mode 100644
index 6c10cea..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/icons/facesconfig/Pageflow_Link.gif
+++ /dev/null
Binary files differ
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/icons/facesconfig/Pageflow_Link24.gif b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/icons/facesconfig/Pageflow_Link24.gif
deleted file mode 100644
index 8004b19..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/icons/facesconfig/Pageflow_Link24.gif
+++ /dev/null
Binary files differ
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/icons/facesconfig/Pageflow_Outline.gif b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/icons/facesconfig/Pageflow_Outline.gif
deleted file mode 100644
index f302d8c..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/icons/facesconfig/Pageflow_Outline.gif
+++ /dev/null
Binary files differ
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/icons/facesconfig/Pageflow_Outline_Overview.gif b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/icons/facesconfig/Pageflow_Outline_Overview.gif
deleted file mode 100644
index 852dc81..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/icons/facesconfig/Pageflow_Outline_Overview.gif
+++ /dev/null
Binary files differ
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/icons/facesconfig/Pageflow_Page.gif b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/icons/facesconfig/Pageflow_Page.gif
deleted file mode 100644
index 97cafa9..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/icons/facesconfig/Pageflow_Page.gif
+++ /dev/null
Binary files differ
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/icons/facesconfig/Pageflow_Page16.gif b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/icons/facesconfig/Pageflow_Page16.gif
deleted file mode 100644
index 5b56ee3..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/icons/facesconfig/Pageflow_Page16.gif
+++ /dev/null
Binary files differ
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/icons/facesconfig/Pageflow_Page24.gif b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/icons/facesconfig/Pageflow_Page24.gif
deleted file mode 100644
index 2fc426f..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/icons/facesconfig/Pageflow_Page24.gif
+++ /dev/null
Binary files differ
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/icons/facesconfig/Pageflow_Quickfix_Error.gif b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/icons/facesconfig/Pageflow_Quickfix_Error.gif
deleted file mode 100644
index 1f0002b..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/icons/facesconfig/Pageflow_Quickfix_Error.gif
+++ /dev/null
Binary files differ
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/icons/facesconfig/Pageflow_TextValue.gif b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/icons/facesconfig/Pageflow_TextValue.gif
deleted file mode 100644
index d483f48..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/icons/facesconfig/Pageflow_TextValue.gif
+++ /dev/null
Binary files differ
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/icons/form_banner.gif b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/icons/form_banner.gif
deleted file mode 100644
index aebc0b2..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/icons/form_banner.gif
+++ /dev/null
Binary files differ
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/icons/help.gif b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/icons/help.gif
deleted file mode 100644
index 9d70301..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/icons/help.gif
+++ /dev/null
Binary files differ
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/icons/overview_obj.gif b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/icons/overview_obj.gif
deleted file mode 100644
index 03f656f..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/icons/overview_obj.gif
+++ /dev/null
Binary files differ
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/plugin.properties b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/plugin.properties
deleted file mode 100644
index f8d99a5..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/plugin.properties
+++ /dev/null
@@ -1,60 +0,0 @@
-############################################################################
-# Copyright (c) 2004, 2005 Sybase, Inc. and others.
-#
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# Sybase, Inc. - initial API and implementation
-############################################################################
-plugin.name=JavaServer Faces Tools - FacesConfig Editor
-plugin.provider=Eclipse.org
-
-# Editors
-facesConfigEditor=Faces Config Editor
-facesConfigEditorIcon=icons/facesconfig/FacesConfig_Plugin.gif
-
-# Introduction
-pageflow.editor.intro.name = Introduction
-pageflow.editor.intro.description =
-pageflow.editor.intro.section.heading = The Faces Configuration Editor
-pageflow.editor.intro.section.description = The faces configuration editor helps you to complete the JSF web application development process by allowing you to edit faces configuration. Use the pages in this editor to define and edit page navigations, managed beans, component, converter, validator, renderkit and other element configurations.
-pageflow.editor.intro.cheatsheets.link = Tutorial
-pageflow.editor.intro.cheatsheets.text = Launch the cheat sheet for guidance in working with the editor.
-pageflow.editor.intro.help.link = Help
-pageflow.editor.intro.help.text = Launch the help system and review topics about working with faces configuration descriptor.
-pageflow.editor.intro.start.link = Start
-pageflow.editor.intro.start.text = Start working with the editor by selecting PageFlow and defining page navigations.
-
-#overview Section
-pageflow.editor.overview.name = Editor Information
-pageflow.editor.overview.description = This page summaries the editors information.
-pageflow.editor.overview.pageflow.link = PageFlow Editor
-pageflow.editor.overview.pageflow.text = Editor to create or modify Navigation Rules.
-
-pageflow.editor.intro.overview.mbean.text = Editor to create or modify Managed Beans.
-pageflow.editor.overview.mbean.link = ManagedBeans Editor
-pageflow.editor.intro.overview.components.text = Editor to create or modify component elements.
-pageflow.editor.overview.components.link = Components Editor
-pageflow.editor.intro.overview.others.text = Editor to create or modify other elements.
-pageflow.editor.overview.others.link = Others Editor
-pageflow.editor.intro.overview.source.text = Text Editor source.
-pageflow.editor.overview.source.link = Source Editor
-
-contentType.defaultFacesConfig.name = Default FacesConfig File
-contentType.webdotxmlfile.name = Web Application Description File
-
-#property tab's name
-propertyTab.general=Attributes
-propertyTab.attribute=Quick Edit
-
-# Cheatsheets
-cheatsheet.pagefloweditor.name = Pageflow Editor Cheat Sheet
-cheatsheet.pagefloweditor.description = Cheat Sheet for using the Pageflow Editor
-cheatsheet.jsf.title=JSF Development
-cheatsheet.jsf.facesconfig.title=Faces Configuration Editor
-
-#preference page
-preferencepage.jsffacesconfigui.name=FacesConfig Editor
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/plugin.xml b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/plugin.xml
deleted file mode 100644
index be99224..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/plugin.xml
+++ /dev/null
@@ -1,109 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin>
- <extension
- point="org.eclipse.ui.preferencePages">
- <page
- category="org.eclipse.jst.jsf.ui.JSFRootPage"
- class="org.eclipse.jst.jsf.facesconfig.ui.preference.GEMPreferences"
- id="org.eclipse.jst.jsf.facesconfig.ui.preference.GEMPreferences"
- name="%preferencepage.jsffacesconfigui.name"/>
- </extension>
- <extension point="org.eclipse.ui.editors">
-
- <editor
- class="org.eclipse.jst.jsf.facesconfig.ui.FacesConfigEditor"
- contributorClass="org.eclipse.jst.jsf.facesconfig.ui.FacesConfigActionBarContributor"
- default="false"
- icon="icons/facesconfig/FacesConfig_Plugin.gif"
- id="org.eclipse.jst.jsf.facesconfig.ui.FacesConfigEditor"
- name="%facesConfigEditor">
- <contentTypeBinding
- contentTypeId="org.eclipse.jst.jsf.facesconfig.facesConfigFile" />
- </editor>
- </extension>
-
- <!-- ********** Introduction Page of PageFlow editor************** -->
- <extension id="org.eclipse.jst.jsf.facesconfig.ui.FacesConfigEditor"
- name="%pageflow.editor.intro.name"
- point="org.eclipse.jst.jsf.common.ui.introductionPage">
- <introductionpage name="%pageflow.editor.intro.name"
- description="%pageflow.editor.intro.description">
- <introductionelement icon="icons/FacesConfig_Introduction.gif"
- heading="%pageflow.editor.intro.section.heading"
- text="%pageflow.editor.intro.section.description"/>
- <introductionelement
- actionparameters="org.eclipse.jst.jsf.facesconfig.ui.pageflow.PageflowEditor"
- icon="icons/FacesConfig_GotoEditor.gif"
- hyperlinkaction="org.eclipse.jst.jsf.common.ui.internal.actions.OpenPageAction"
- text="%pageflow.editor.intro.start.text"
- hyperlink="%pageflow.editor.intro.start.link"/>
- <introductionelement
- actionparameters="FacesConfigEditor.CheatSheet"
- icon="icons/FacesConfig_Tutorial.gif"
- hyperlinkaction="org.eclipse.jst.jsf.common.ui.internal.actions.LoadCheatSheetAction"
- text="%pageflow.editor.intro.cheatsheets.text"
- hyperlink="%pageflow.editor.intro.cheatsheets.link"/>
- <introductionelement actionparameters="org.eclipse.jst.jsf.facesconfig.ui.use_facesconfig_editor"
- icon="icons/overview_obj.gif"
- hyperlinkaction="org.eclipse.jst.jsf.common.ui.internal.actions.LoadHelpAction"
- text="%pageflow.editor.intro.help.text"
- hyperlink="%pageflow.editor.intro.help.link"/>
- </introductionpage>
- </extension>
- <!-- ********** End Introduction Page ************** -->
- <!-- ************* properties view ************** -->
- <extension point="org.eclipse.ui.views.properties.tabbed.propertyTabs">
- <propertyTabs
- contributorId="org.eclipse.jst.jsf.facesconfig.ui.FacesConfigEditor">
- <propertyTab label="%propertyTab.attribute" category="attribute"
- id="org.eclipse.jst.jsf.facesconfig.ui.pageflow.properties.attribute"/>
- <propertyTab label="%propertyTab.general" category="general"
- id="org.eclipse.jst.jsf.facesconfig.ui.pageflow.properties.general"/>
- </propertyTabs>
- </extension>
- <extension point="org.eclipse.ui.views.properties.tabbed.propertyContributor">
- <propertyContributor
- sectionDescriptorProvider="org.eclipse.jst.jsf.facesconfig.ui.pageflow.properties.PageflowSectionDescriptorProvider"
- contributorId="org.eclipse.jst.jsf.facesconfig.ui.FacesConfigEditor"
- labelProvider="org.eclipse.jst.jsf.facesconfig.ui.pageflow.properties.PageflowSectionLabelProvider">
- <propertyCategory category="attribute" />
- <propertyCategory category="general"/>
- </propertyContributor>
- </extension>
- <extension
- point="org.eclipse.ui.cheatsheets.cheatSheetContent">
- <cheatsheet
- category="org.eclipse.jst.jsf"
- composite="false"
- contentFile="$nl$/cheatsheets/facesconfigeditor.xml"
- id="FacesConfigEditor.CheatSheet"
- name="%cheatsheet.jsf.facesconfig.title"/>
- <category
- id="org.eclipse.jst.jsf"
- name="%cheatsheet.jsf.title">
- </category>
- </extension>
- <!--<extension
- point="org.eclipse.ui.views.properties.tabbed.propertyContributor">
- <propertyContributor
- contributorId="org.eclipse.jst.jsf.facesconfig.ui.FacesConfigEditor"
- labelProvider="org.eclipse.jst.jsf.facesconfig.ui.pageflow.properties.PageflowSectionLabelProvider">
- <propertyCategory category="attribute"/>
- <propertyCategory category="general"/>
- </propertyContributor>
- </extension>
- <extension
- point="org.eclipse.ui.views.properties.tabbed.propertyTabs">
- <propertyTabs contributorId="org.eclipse.jst.jsf.facesconfig.ui.FacesConfigEditor">
- <propertyTab
- category="attribute"
- id="org.eclipse.jst.jsf.facesconfig.ui.pageflow.properties.attribute"
- label="%propertyTab.attribute"/>
- <propertyTab
- category="general"
- id="org.eclipse.jst.jsf.facesconfig.ui.pageflow.properties.general"
- label="%propertyTab.general"/>
- </propertyTabs>
- </extension>-->
-</plugin>
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/EditorMessages.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/EditorMessages.java
deleted file mode 100644
index 274c5d8..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/EditorMessages.java
+++ /dev/null
@@ -1,1567 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.jsf.facesconfig.ui;
-
-import org.eclipse.osgi.util.NLS;
-
-/**
- * Provides localized messages from EditorMessages.properties.
- */
-public final class EditorMessages extends NLS {
-
- private static final String BUNDLE_NAME = "org.eclipse.jst.jsf.facesconfig.ui.EditorMessages"; //$NON-NLS-1$
-
- private EditorMessages() {
- // Do not instantiate
- }
-
- static {
- NLS.initializeMessages(BUNDLE_NAME, EditorMessages.class);
- }
-
- /**
- * see EditorMessages.properties
- */
- public static String AddEditManagedPropertyDialog_Add;
-
- /**
- * see EditorMessages.properties
- */
- public static String AddEditManagedPropertyDialog_Edit;
-
- /**
- * see EditorMessages.properties
- */
- public static String AddEditMapEntryDialog_NullValue;
-
- /**
- * see EditorMessages.properties
- */
- public static String FacesConfigEditor_ErrorHandlingUndoConflicts_DialogMessage;
-
- /**
- * see EditorMessages.properties
- */
- public static String FacesConfigEditor_ErrorHandlingUndoConflicts_DialogTitle;
-
- /**
- * see EditorMessages.properties
- */
- public static String FacesConfigEditor_WaitForLoad_EditorTabTitle;
-
- /**
- * see EditorMessages.properties
- */
- public static String UI_Button_Add;
-
- /**
- * see EditorMessages.properties
- */
- public static String UI_Button_Edit;
-
- /**
- * see EditorMessages.properties
- */
- public static String UI_Button_Remove;
-
- /**
- * see EditorMessages.properties
- */
- public static String UI_Button_Add_more;
-
- /**
- * see EditorMessages.properties
- */
- public static String UI_Button_Edit_more;
-
- /**
- * see EditorMessages.properties
- */
- public static String Remove_Title;
-
- /**
- * see EditorMessages.properties
- */
- public static String Remove_Msg;
-
- /**
- * see EditorMessages.properties
- */
- public static String FindType;
-
- /**
- * see EditorMessages.properties
- */
- public static String FindType_Filter;
-
- /**
- * see EditorMessages.properties
- */
- public static String FindType_Error_CannotFindType;
-
- /**
- * see EditorMessages.properties
- */
- public static String FacesConfigEditor_Introduction_TabName;
-
- /**
- * see EditorMessages.properties
- */
- public static String FacesConfigEditor_Overview_TabName;
-
- /**
- * see EditorMessages.properties
- */
- public static String FacesConfigEditor_Pageflow_TabName;
-
- /**
- * see EditorMessages.properties
- */
- public static String FacesConfigEditor_ManagedBeans_TabName;
-
- /**
- * see EditorMessages.properties
- */
- public static String FacesConfigEditor_Components_TabName;
-
- /**
- * see EditorMessages.properties
- */
- public static String FacesConfigEditor_Others_TabName;
-
- /**
- * see EditorMessages.properties
- */
- public static String FacesConfigEditor_Source_TabName;
-
- /**
- * see EditorMessages.properties
- */
- public static String editor_pageflow_page_intro_name;
-
- /**
- * see EditorMessages.properties
- */
- public static String editor_pageflow_page_intro_title;
-
- /**
- * see EditorMessages.properties
- */
- public static String editor_pageflow_page_intro_help_HelpContextID;
-
- /**
- * see EditorMessages.properties
- */
- public static String editor_pageflow_page_intro_help_HelpToolTip;
-
- /**
- * see EditorMessages.properties
- */
- public static String ManagedBeanPage_Title;
-
- /**
- * see EditorMessages.properties
- */
- public static String ManagedBeanMasterSection_Name;
-
- /**
- * see EditorMessages.properties
- */
- public static String ManagedBeanMasterSection_Description;
-
-// public static String ManagedBeanMasterSection_HelpContextID;
-//
-// public static String ManagedBeanMasterSection_HelpToolTip;
-
- /**
- * see EditorMessages.properties
- */
- public static String ManagedBeanGeneralSection_Name;
-
- /**
- * see EditorMessages.properties
- */
- public static String ManagedBeanGeneralSection_Desc;
-
-// public static String ManagedBeanGeneralSection_HelpContextID;
-//
-// public static String ManagedBeanGeneralSection_HelpToolTip;
-
- /**
- * see EditorMessages.properties
- */
- public static String ManagedBeanGeneralSection_ManagedBeanName;
-
- /**
- * see EditorMessages.properties
- */
- public static String ManagedBeanGeneralSection_ManagedBeanClass;
-
- /**
- * see EditorMessages.properties
- */
- public static String ManagedBeanGeneralSection_ManagedBeanScope;
-
- /**
- * see EditorMessages.properties
- */
- public static String InitializationSection_Name;
-
- /**
- * see EditorMessages.properties
- */
- public static String InitializationSection_Description;
-
-// public static String InitializationSection_HelpContextID;
-//
-// public static String InitializationSection_HelpToolTip;
-
- /**
- * see EditorMessages.properties
- */
- public static String ManagedBeanPropertyEditDialog_Title_NewPropertyEntry;
-
- /**
- * see EditorMessages.properties
- */
- public static String ManagedBeanPropertyEditDialog_Title_ExistingPropertyEntry;
-
- /**
- * see EditorMessages.properties
- */
- public static String ManagedBeanPropertyEditDialog_PropertyName;
-
- /**
- * see EditorMessages.properties
- */
- public static String ManagedBeanPropertyEditDialog_PropertyClass;
-
- /**
- * see EditorMessages.properties
- */
- public static String ManagedBeanPropertyEditDialog_PropertyClass_Browse;
-
- /**
- * see EditorMessages.properties
- */
- public static String ManagedBeanPropertyEditDialog_ValueType;
-
- /**
- * see EditorMessages.properties
- */
- public static String ManagedBeanProeprtyEditPage_Description;
-
- /**
- * see EditorMessages.properties
- */
- public static String ManagedBeanPropertyEditDialog_Value;
-
- /**
- * see EditorMessages.properties
- */
- public static String ManagedBeanPropertyEditWizard_Title;
-
- /**
- * see EditorMessages.properties
- */
- public static String ManagedBeanProeprtyEditPage_Title;
-
- /**
- * see EditorMessages.properties
- */
- public static String ManagedBeanPropertyEditDialog_Value_Change;
-
- /**
- * see EditorMessages.properties
- */
- public static String ManagedBeanPropertyEditDialog_FindType;
-
- /**
- * see EditorMessages.properties
- */
- public static String ManagedBeanPropertyEditDialog_FindType_Filter;
-
- /**
- * see EditorMessages.properties
- */
- public static String InitializationSection_ClassType;
-
- /**
- * see EditorMessages.properties
- */
- public static String InitializationSection_ClassType_General;
-
- /**
- * see EditorMessages.properties
- */
- public static String InitializationSection_ClassType_Map;
-
- /**
- * see EditorMessages.properties
- */
- public static String InitializationSection_ClassType_List;
-
- /**
- * see EditorMessages.properties
- */
- public static String InitializationSection_PropertyTable_Name;
-
- /**
- * see EditorMessages.properties
- */
- public static String InitializationSection_PropertyTable_Class;
-
- /**
- * see EditorMessages.properties
- */
- public static String InitializationSection_PropertyTable_Value;
-
- /**
- * see EditorMessages.properties
- */
- public static String InitializationSection_MapType_KeyClass;
-
- /**
- * see EditorMessages.properties
- */
- public static String InitializationSection_MapType_ValueClass;
-
- /**
- * see EditorMessages.properties
- */
- public static String InitializationSection_MapTable_Title;
-
- /**
- * see EditorMessages.properties
- */
- public static String InitializationSection_MapTable_Key;
-
- /**
- * see EditorMessages.properties
- */
- public static String InitializationSection_MapTable_Value;
-
- /**
- * see EditorMessages.properties
- */
- public static String InitializationSection_ListType_ValueClass;
-
- /**
- * see EditorMessages.properties
- */
- public static String InitializationSection_ListTable_Title;
-
- /**
- * see EditorMessages.properties
- */
- public static String InitializationSection_ListTable_Value;
-
- /**
- * see EditorMessages.properties
- */
- public static String ListEntriesEditPage_Title;
-
- /**
- * see EditorMessages.properties
- */
- public static String ListEntriesWizard_Title;
-
- /**
- * see EditorMessages.properties
- */
- public static String ListEntriesEditPage_Description;
-
- /**
- * see EditorMessages.properties
- */
- public static String OverviewPage_page_name;
-
- /**
- * see EditorMessages.properties
- */
- public static String OverviewPage_page_id;
-
- /**
- * see EditorMessages.properties
- */
- public static String OverviewPage_page_title;
-
- /**
- * see EditorMessages.properties
- */
- public static String OverviewPage_PageflowOverview_summary;
-
- /**
- * see EditorMessages.properties
- */
- public static String OverviewPage_EditorSection_name;
-
- /**
- * see EditorMessages.properties
- */
- public static String OverviewPage_EditorSection_description;
-
- /**
- * see EditorMessages.properties
- */
- public static String OverviewPage_EditorSection_noplugin;
-
- /**
- * see EditorMessages.properties
- */
- public static String OverviewPage_EditorSection_nooverview;
-
-// public static String OverviewPage_EditorSection_Help_HelpContextID;
-//
-// public static String OverviewPage_EditorSection_Help_HelpToolTip;
-
- /**
- * see EditorMessages.properties
- */
- public static String OverviewPage_GeneralSection_name;
-
- /**
- * see EditorMessages.properties
- */
- public static String OverviewPage_GeneralSection_description;
-
- /**
- * see EditorMessages.properties
- */
- public static String OverviewPage_GeneralSection_label_name;
-
- /**
- * see EditorMessages.properties
- */
- public static String OverviewPage_GeneralSection_label_version;
-
-// public static String OverviewPage_GeneralSection_Help_HelpContextID;
-//
-// public static String OverviewPage_GeneralSection_Help_HelpToolTip;
-
- /**
- * see EditorMessages.properties
- */
- public static String OverviewPage_NavigationSection_name;
-
- /**
- * see EditorMessages.properties
- */
- public static String OverviewPage_NavigationSection_description;
-
- /**
- * see EditorMessages.properties
- */
- public static String OverviewPage_NavigationSection_table_col1;
-
- /**
- * see EditorMessages.properties
- */
- public static String OverviewPage_NavigationSection_table_col2;
-
- /**
- * see EditorMessages.properties
- */
- public static String OverviewPage_NavigationSection_table_col3;
-
- /**
- * see EditorMessages.properties
- */
- public static String OverviewPage_NavigationSection_pageflowPageID;
-
-// public static String OverviewPage_NavigationSection_Help_HelpContextID;
-//
-// public static String OverviewPage_NavigationSection_Help_HelpToolTip;
-
- /**
- * see EditorMessages.properties
- */
- public static String OverviewPage_ManagedBeanSection_name;
-
- /**
- * see EditorMessages.properties
- */
- public static String OverviewPage_ManagedBeanSection_description;
-
- /**
- * see EditorMessages.properties
- */
- public static String OverviewPage_ManagedBeanSection_table_namecol;
-
- /**
- * see EditorMessages.properties
- */
- public static String OverviewPage_ManagedBeanSection_table_scopecol;
-
- /**
- * see EditorMessages.properties
- */
- public static String OverviewPage_ManagedBeanSection_table_classcol;
-
- /**
- * see EditorMessages.properties
- */
- public static String OverviewPage_ManagedBeanSection_managedbeanPageID;
-
-// public static String OverviewPage_ManagedBeanSection_Help_HelpContextID;
-//
-// public static String OverviewPage_ManagedBeanSection_Help_HelpToolTip;
-
- /**
- * see EditorMessages.properties
- */
- public static String OverviewPage_ComponentsSection_name;
-
- /**
- * see EditorMessages.properties
- */
- public static String OverviewPage_ComponentsSection_description;
-
- /**
- * see EditorMessages.properties
- */
- public static String OverviewPage_ComponentsSection_table_typecol;
-
- /**
- * see EditorMessages.properties
- */
- public static String OverviewPage_ComponentsSection_table_namecol;
-
- /**
- * see EditorMessages.properties
- */
- public static String OverviewPage_ComponentsSection_componentsPageID;
-
-// public static String OverviewPage_ComponentsSection_Help_HelpContextID;
-//
-// public static String OverviewPage_ComponentsSection_Help_HelpToolTip;
-
- /**
- * see EditorMessages.properties
- */
- public static String OverviewPage_OthersSection_name;
-
- /**
- * see EditorMessages.properties
- */
- public static String OverviewPage_OthersSection_description;
-
- /**
- * see EditorMessages.properties
- */
- public static String OverviewPage_OthersSection_table_typecol;
-
- /**
- * see EditorMessages.properties
- */
- public static String OverviewPage_OthersSection_table_namecol;
-
- /**
- * see EditorMessages.properties
- */
- public static String OverviewPage_OthersSection_table_valuecol;
-
- /**
- * see EditorMessages.properties
- */
- public static String OverviewPage_OthersSection_othersPageID;
-
-// public static String OverviewPage_OthersSection_Help_HelpContextID;
-//
-// public static String OverviewPage_OthersSection_Help_HelpToolTip;
-
- /**
- * see EditorMessages.properties
- */
- public static String ManagedBeanPropertyGroup_error_EmptyName;
-
- /**
- * see EditorMessages.properties
- */
- public static String ManagedBeanPropertyGroup_error_EmptyClass;
-
- /**
- * see EditorMessages.properties
- */
- public static String MapEntriesEditGroup_Edit;
-
- /**
- * see EditorMessages.properties
- */
- public static String MapEntriesEditPage_Title;
-
- /**
- * see EditorMessages.properties
- */
- public static String MapEntriesWizard_Title;
-
- /**
- * see EditorMessages.properties
- */
- public static String MapEntryEditGroup_Key;
-
- /**
- * see EditorMessages.properties
- */
- public static String MapEntryEditGroup_error_EmptyKey;
-
- /**
- * see EditorMessages.properties
- */
- public static String MapEntryEditGroup_error_DuplicateKey;
-
- /**
- * see EditorMessages.properties
- */
- public static String MapEntryEditPage_Title;
-
- /**
- * see EditorMessages.properties
- */
- public static String MapEntryEditWizard_Title;
-
- /**
- * see EditorMessages.properties
- */
- public static String MapEntriesEditPage_Description;
-
- /**
- * see EditorMessages.properties
- */
- public static String MapEntryEditPage_Description;
-
- /**
- * see EditorMessages.properties
- */
- public static String ValueEditDialog_Title;
-
- /**
- * see EditorMessages.properties
- */
- public static String ValueEditWizard_Title;
-
- /**
- * see EditorMessages.properties
- */
- public static String ValueEditPage_Description;
-
- /**
- * see EditorMessages.properties
- */
- public static String ValueEditGroup_Value;
-
- /**
- * see EditorMessages.properties
- */
- public static String ValueEditPage_Title;
-
- /**
- * see EditorMessages.properties
- */
- public static String ComponentsPage_Title;
-
- /**
- * see EditorMessages.properties
- */
- public static String ComponentMasterSection_Name;
-
- /**
- * see EditorMessages.properties
- */
- public static String ComponentMasterSection_Description;
-
-// public static String ComponentMasterSection_HelpContextID;
-//
-// public static String ComponentMasterSection_HelpToolTip;
-
- /**
- * see EditorMessages.properties
- */
- public static String ComponentGeneralSection_Name;
-
- /**
- * see EditorMessages.properties
- */
- public static String ComponentGeneralSection_Description;
-
-// public static String ComponentGeneralSection_HelpContextID;
-//
-// public static String ComponentGeneralSection_HelpToolTip;
-
- /**
- * see EditorMessages.properties
- */
- public static String ComponentGeneralSection_Label_DisplayName;
-
- /**
- * see EditorMessages.properties
- */
- public static String ComponentGeneralSection_Label_Description;
-
- /**
- * see EditorMessages.properties
- */
- public static String ComponentGeneralSection_Label_ComponentType;
-
- /**
- * see EditorMessages.properties
- */
- public static String ComponentGeneralSection_Label_ComponentClass;
-
- /**
- * see EditorMessages.properties
- */
- public static String RenderKitMasterSection_Name;
-
- /**
- * see EditorMessages.properties
- */
- public static String RenderKitMasterSection_Description;
-
-// public static String RenderKitMasterSection_HelpContextID;
-//
-// public static String RenderKitMasterSection_HelpToolTip;
-
- /**
- * see EditorMessages.properties
- */
- public static String RenderKitGeneralSection_Name;
-
- /**
- * see EditorMessages.properties
- */
- public static String RenderKitGeneralSection_Description;
-
-// public static String RenderKitGeneralSection_HelpContextID;
-//
-// public static String RenderKitGeneralSection_HelpToolTip;
-
- /**
- * see EditorMessages.properties
- */
- public static String RenderKitGeneralSection_Label_DisplayName;
-
- /**
- * see EditorMessages.properties
- */
- public static String RenderKitGeneralSection_Label_Description;
-
- /**
- * see EditorMessages.properties
- */
- public static String RenderKitGeneralSection_Label_RenderKitID;
-
- /**
- * see EditorMessages.properties
- */
- public static String RenderKitGeneralSection_Label_RenderKitClass;
-
- /**
- * see EditorMessages.properties
- */
- public static String RendererSection_Name;
-
- /**
- * see EditorMessages.properties
- */
- public static String RendererSection_Description;
-
-// public static String RendererSection_HelpContextID;
-//
-// public static String RendererSection_HelpToolTip;
-
- /**
- * see EditorMessages.properties
- */
- public static String RendererSection_Table_NameColumn;
-
- /**
- * see EditorMessages.properties
- */
- public static String RendererSection_Table_ComponentFamilyColumn;
-
- /**
- * see EditorMessages.properties
- */
- public static String RendererSection_Table_TypeColumn;
-
- /**
- * see EditorMessages.properties
- */
- public static String RendererSection_Table_ClassColumn;
-
- /**
- * see EditorMessages.properties
- */
- public static String RendererSection_Dialog_Title_Add;
-
- /**
- * see EditorMessages.properties
- */
- public static String RendererSection_Dialog_Title_Edit;
-
- /**
- * see EditorMessages.properties
- */
- public static String RendererSection_Dialog_Tab_General;
-
- /**
- * see EditorMessages.properties
- */
- public static String RendererSection_Dialog_DisplayName;
-
- /**
- * see EditorMessages.properties
- */
- public static String RendererSection_Dialog_ComponentFamilyValue;
-
- /**
- * see EditorMessages.properties
- */
- public static String RendererSection_Dialog_TypeValue;
-
- /**
- * see EditorMessages.properties
- */
- public static String RendererSection_Dialog_RendererClass;
-
- /**
- * see EditorMessages.properties
- */
- public static String RendererSection_Dialog_Error_ComponentFamilyEmpty;
-
- /**
- * see EditorMessages.properties
- */
- public static String RendererSection_Dialog_Error_RendererTypeEmpty;
-
- /**
- * see EditorMessages.properties
- */
- public static String RendererSection_Dialog_Error_RendererClassEmpty;
-
- /**
- * see EditorMessages.properties
- */
- public static String RendererSection_Dialog_SelectComponentFamilyDialog_Title;
-
- /**
- * see EditorMessages.properties
- */
- public static String RendererSection_Dialog_ComponentFamilyCaption;
-
- /**
- * see EditorMessages.properties
- */
- public static String RendererSection_Dialog_ComponentFamilyLabel;
-
- /**
- * see EditorMessages.properties
- */
- public static String ConverterMasterSection_Name;
-
- /**
- * see EditorMessages.properties
- */
- public static String ConverterMasterSection_Description;
-
-// public static String ConverterMasterSection_HelpContextID;
-//
-// public static String ConverterMasterSection_HelpToolTip;
-
- /**
- * see EditorMessages.properties
- */
- public static String ConverterGeneralSection_Name;
-
- /**
- * see EditorMessages.properties
- */
- public static String ConverterGeneralSection_Description;
-
-// public static String ConverterGeneralSection_HelpContextID;
-//
-// public static String ConverterGeneralSection_HelpToolTip;
-
- /**
- * see EditorMessages.properties
- */
- public static String ConverterGeneralSection_Label_DisplayName;
-
- /**
- * see EditorMessages.properties
- */
- public static String ConverterGeneralSection_Label_Description;
-
- /**
- * see EditorMessages.properties
- */
- public static String ConverterGeneralSection_Label_ConverterID;
-
- /**
- * see EditorMessages.properties
- */
- public static String ConverterGeneralSection_Label_ConverterForClass;
-
- /**
- * see EditorMessages.properties
- */
- public static String ConverterGeneralSection_Label_ConverterClass;
-
- /**
- * see EditorMessages.properties
- */
- public static String ValidatorMasterSection_Name;
-
- /**
- * see EditorMessages.properties
- */
- public static String ValidatorMasterSection_Description;
-
-// public static String ValidatorMasterSection_HelpContextID;
-//
-// public static String ValidatorMasterSection_HelpToolTip;
-
- /**
- * see EditorMessages.properties
- */
- public static String ValidatorGeneralSection_Name;
-
- /**
- * see EditorMessages.properties
- */
- public static String ValidatorGeneralSection_Description;
-
-// public static String ValidatorGeneralSection_HelpContextID;
-//
-// public static String ValidatorGeneralSection_HelpToolTip;
-
- /**
- * see EditorMessages.properties
- */
- public static String ValidatorGeneralSection_Label_DisplayName;
-
- /**
- * see EditorMessages.properties
- */
- public static String ValidatorGeneralSection_Label_Description;
-
- /**
- * see EditorMessages.properties
- */
- public static String ValidatorGeneralSection_Label_ValidatorID;
-
- /**
- * see EditorMessages.properties
- */
- public static String ValidatorGeneralSection_Label_ValidatorClass;
-
- /**
- * see EditorMessages.properties
- */
- public static String AttributeSection_Name;
-
- /**
- * see EditorMessages.properties
- */
- public static String AttributeSection_Description;
-
-// public static String AttributeSection_HelpContextID;
-//
-// public static String AttributeSection_HelpToolTip;
-
- /**
- * see EditorMessages.properties
- */
- public static String AttributeSection_Table_NameColumn;
-
- /**
- * see EditorMessages.properties
- */
- public static String AttributeSection_Table_ClassColumn;
-
- /**
- * see EditorMessages.properties
- */
- public static String AttributeSection_Table_DefaultValueColumn;
-
- /**
- * see EditorMessages.properties
- */
- public static String AttributeSection_Table_SuggestedValueColumn;
-
- /**
- * see EditorMessages.properties
- */
- public static String AttributeSection_Dialog_Title_Add;
-
- /**
- * see EditorMessages.properties
- */
- public static String AttributeSection_Dialog_Title_Edit;
-
- /**
- * see EditorMessages.properties
- */
- public static String AttributeSection_Dialog_Tab_General;
-
- /**
- * see EditorMessages.properties
- */
- public static String AttributeSection_Dialog_AttributeName;
-
- /**
- * see EditorMessages.properties
- */
- public static String AttributeSection_Dialog_AttributeClass;
-
- /**
- * see EditorMessages.properties
- */
- public static String AttributeSection_Dialog_DefaultValue;
-
- /**
- * see EditorMessages.properties
- */
- public static String AttributeSection_Dialog_SuggestedValue;
-
- /**
- * see EditorMessages.properties
- */
- public static String AttributeSection_Dialog_Error_NameEmpty;
-
- /**
- * see EditorMessages.properties
- */
- public static String AttributeSection_Dialog_Error_ClassEmpty;
-
- /**
- * see EditorMessages.properties
- */
- public static String PropertySection_Name;
-
- /**
- * see EditorMessages.properties
- */
- public static String PropertySection_Description;
-
-// public static String PropertySection_HelpContextID;
-//
-// public static String PropertySection_HelpToolTip;
-
- /**
- * see EditorMessages.properties
- */
- public static String PropertySection_Table_NameColumn;
-
- /**
- * see EditorMessages.properties
- */
- public static String PropertySection_Table_ClassColumn;
-
- /**
- * see EditorMessages.properties
- */
- public static String PropertySection_Table_DefaultValueColumn;
-
- /**
- * see EditorMessages.properties
- */
- public static String PropertySection_Table_SuggestedValueColumn;
-
- /**
- * see EditorMessages.properties
- */
- public static String PropertySection_Dialog_Title_Add;
-
- /**
- * see EditorMessages.properties
- */
- public static String PropertySection_Dialog_Title_Edit;
-
- /**
- * see EditorMessages.properties
- */
- public static String PropertySection_Dialog_Tab_General;
-
- /**
- * see EditorMessages.properties
- */
- public static String PropertySection_Dialog_PropertyName;
-
- /**
- * see EditorMessages.properties
- */
- public static String PropertySection_Dialog_PropertyClass;
-
- /**
- * see EditorMessages.properties
- */
- public static String PropertySection_Dialog_DefaultValue;
-
- /**
- * see EditorMessages.properties
- */
- public static String PropertySection_Dialog_SuggestedValue;
-
- /**
- * see EditorMessages.properties
- */
- public static String PropertySection_Dialog_Error_NameEmpty;
-
- /**
- * see EditorMessages.properties
- */
- public static String PropertySection_Dialog_Error_ClassEmpty;
-
- /**
- * see EditorMessages.properties
- */
- public static String FacetSection_Name;
-
- /**
- * see EditorMessages.properties
- */
- public static String FacetSection_Description;
-
-// public static String FacetSection_HelpContextID;
-//
-// public static String FacetsSection_HelpToolTip;
-
- /**
- * see EditorMessages.properties
- */
- public static String FacetSection_Table_DisplayNameColumn;
-
- /**
- * see EditorMessages.properties
- */
- public static String FacetSection_Table_FacetNameColumn;
-
- /**
- * see EditorMessages.properties
- */
- public static String FacetSection_Table_DescriptionColumn;
-
- /**
- * see EditorMessages.properties
- */
- public static String FacetSection_Dialog_Title_Add;
-
- /**
- * see EditorMessages.properties
- */
- public static String FacetSection_Dialog_Title_Edit;
-
- /**
- * see EditorMessages.properties
- */
- public static String FacetSection_Dialog_Tab_General;
-
- /**
- * see EditorMessages.properties
- */
- public static String FacetSection_Dialog_FacetName;
-
- /**
- * see EditorMessages.properties
- */
- public static String FacetSection_Dialog_DisplayName;
-
- /**
- * see EditorMessages.properties
- */
- public static String FacetSection_Dialog_Description;
-
- /**
- * see EditorMessages.properties
- */
- public static String FacetSection_Dialog_Error_NameEmpty;
-
- /**
- * see EditorMessages.properties
- */
- public static String OthersPage_Title;
-
- /**
- * see EditorMessages.properties
- */
- public static String ActionListenerSection_Name;
-
- /**
- * see EditorMessages.properties
- */
- public static String ActionListenerSection_Description;
-
-// public static String ActionListenerSection_HelpContextID;
-//
-// public static String ActionListenerSection_HelpToolTip;
-
- /**
- * see EditorMessages.properties
- */
- public static String MessageBundleSection_Name;
-
- /**
- * see EditorMessages.properties
- */
- public static String MessageBundleSection_Description;
-
-// public static String MessageBundleSection_HelpContextID;
-//
-// public static String MessageBundleSection_HelpToolTip;
-
- /**
- * see EditorMessages.properties
- */
- public static String MessageBundleSection_Dialog_Title;
-
- /**
- * see EditorMessages.properties
- */
- public static String MessageBundleSection_Dialog_Message_SelectPropertyFile;
-
- /**
- * see EditorMessages.properties
- */
- public static String MessageBundleSection_Dialog_Message_AlreadyExists;
-
- /**
- * see EditorMessages.properties
- */
- public static String LocaleConfigSection_Name;
-
- /**
- * see EditorMessages.properties
- */
- public static String LocaleConfigSection_Description;
-
-// public static String LocaleConfigSection_HelpContextID;
-//
-// public static String LocaleConfigSection_HelpToolTip;
-
- /**
- * see EditorMessages.properties
- */
- public static String LocaleConfigSection_Wizard_WindowTitle;
-
- /**
- * see EditorMessages.properties
- */
- public static String LocaleConfigSection_Wizard_Page_Name;
-
- /**
- * see EditorMessages.properties
- */
- public static String LocaleConfigSection_Wizard_Page_Title;
-
- /**
- * see EditorMessages.properties
- */
- public static String LocaleConfigSection_Wizard_Page_Description;
-
- /**
- * see EditorMessages.properties
- */
- public static String LocaleConfigSection_Wizard_Page_LabelText;
-
- /**
- * see EditorMessages.properties
- */
- public static String LocaleConfigSection_Wizard_Page_AlreadyExistsError;
-
- /**
- * see EditorMessages.properties
- */
- public static String DefaultRenderKitIDSection_Name;
-
- /**
- * see EditorMessages.properties
- */
- public static String DefaultRenderKitIDSection_Description;
-
-// public static String DefaultRenderKitIDSection_HelpContextID;
-//
-// public static String DefaultRenderKitIDSection_HelpToolTip;
-
- /**
- * see EditorMessages.properties
- */
- public static String DefaultRenderKitIDSection_Wizard_WindowTitle;
-
- /**
- * see EditorMessages.properties
- */
- public static String DefaultRenderKitIDSection_Wizard_Page_Name;
-
- /**
- * see EditorMessages.properties
- */
- public static String DefaultRenderKitIDSection_Wizard_Page_Title;
-
- /**
- * see EditorMessages.properties
- */
- public static String DefaultRenderKitIDSection_Wizard_Page_Description;
-
- /**
- * see EditorMessages.properties
- */
- public static String DefaultRenderKitIDSection_Wizard_Page_LabelText;
-
- /**
- * see EditorMessages.properties
- */
- public static String DefaultRenderKitIDSection_Wizard_Page_AlreadyExistsError;
-
- /**
- * see EditorMessages.properties
- */
- public static String NavigationHandlerSection_Name;
-
- /**
- * see EditorMessages.properties
- */
- public static String NavigationHandlerSection_Description;
-
-// public static String NavigationHandlerSection_HelpContextID;
-//
-// public static String NavigationHandlerSection_HelpToolTip;
-
- /**
- * see EditorMessages.properties
- */
- public static String ViewHandlerSection_Name;
-
- /**
- * see EditorMessages.properties
- */
- public static String ViewHandlerSection_Description;
-
-// public static String ViewHandlerSection_HelpContextID;
-//
-// public static String ViewHandlerSection_HelpToolTip;
-
- /**
- * see EditorMessages.properties
- */
- public static String StateManagerSection_Name;
-
- /**
- * see EditorMessages.properties
- */
- public static String StateManagerSection_Description;
-
-// public static String StateManagerSection_HelpContextID;
-//
-// public static String StateManagerSection_HelpToolTip;
-
- /**
- * see EditorMessages.properties
- */
- public static String PropertyResolverSection_Name;
-
- /**
- * see EditorMessages.properties
- */
- public static String PropertyResolverSection_Description;
-
-// public static String PropertyResolverSection_HelpContextID;
-//
-// public static String PropertyResolverSection_HelpToolTip;
-
- /**
- * see EditorMessages.properties
- */
- public static String VariableResolverSection_Name;
-
- /**
- * see EditorMessages.properties
- */
- public static String VariableResolverSection_Description;
-
-// public static String VariableResolverSection_HelpContextID;
-//
-// public static String VariableResolverSection_HelpToolTip;
-
- /**
- * see EditorMessages.properties
- */
- public static String ApplicationFactorySection_Name;
-
- /**
- * see EditorMessages.properties
- */
- public static String ApplicationFactorySection_Description;
-
-// public static String ApplicationFactorySection_HelpContextID;
-//
-// public static String ApplicationFactorySection_HelpToolTip;
-
- /**
- * see EditorMessages.properties
- */
- public static String FacesContextFactorySection_Name;
-
- /**
- * see EditorMessages.properties
- */
- public static String FacesContextFactorySection_Description;
-
-// public static String FacesContextFactorySection_HelpContextID;
-//
-// public static String FacesContextFactorySection_HelpToolTip;
-
- /**
- * see EditorMessages.properties
- */
- public static String LifecycleFactorySection_Name;
-
- /**
- * see EditorMessages.properties
- */
- public static String LifecycleFactorySection_Description;
-
-// public static String LifecycleFactorySection_HelpContextID;
-//
-// public static String LifecycleFactorySection_HelpToolTip;
-
- /**
- * see EditorMessages.properties
- */
- public static String RenderKitFactorySection_Name;
-
- /**
- * see EditorMessages.properties
- */
- public static String RenderKitFactorySection_Description;
-
-// public static String RenderKitFactorySection_HelpContextID;
-//
-// public static String RenderKitFactorySection_HelpToolTip;
-
- /**
- * see EditorMessages.properties
- */
- public static String PhaseListenerSection_Name;
-
- /**
- * see EditorMessages.properties
- */
- public static String PhaseListenerSection_Description;
-
-// public static String PhaseListenerSection_HelpContextID;
-//
-// public static String PhaseListenerSection_HelpToolTip;
-
- /**
- * see EditorMessages.properties
- */
- public static String MultiPageEditorOutlinePage_noOutline;
-
- /**
- * see EditorMessages.properties
- */
- public static String FacesConfigEditor_Error_OpenModel_Title;
-
- /**
- * see EditorMessages.properties
- */
- public static String FacesConfigEditor_Error_OpenModel;
-
- /**
- * see EditorMessages.properties
- */
- public static String FacesConfigEditor_WaitForLoadPage_Title;
-
- /**
- * see EditorMessages.properties
- */
- public static String ModelLoader_LoadingModelJobName;
-
- /**
- * Align bottom action label.
- */
- public static String AlignmentAction_AlignBottomAction_Label;
-
- /**
- * Align bottom action tooltip.
- */
- public static String AlignmentAction_AlignBottomAction_Tooltip;
-
- /**
- * Align center action label.
- */
- public static String AlignmentAction_AlignCenterAction_Label;
-
- /**
- * Align center action tooltip.
- */
- public static String AlignmentAction_AlignCenterAction_Tooltip;
-
- /**
- * Align left action label.
- */
- public static String AlignmentAction_AlignLeftAction_Label;
-
- /**
- * Align left action tooltip.
- */
- public static String AlignmentAction_AlignLeftAction_Tooltip;
-
- /**
- * Align middle action label.
- */
- public static String AlignmentAction_AlignMiddleAction_Label;
-
- /**
- * Align middle action tooltip.
- */
- public static String AlignmentAction_AlignMiddleAction_Tooltip;
-
- /**
- * Align right action label.
- */
- public static String AlignmentAction_AlignRightAction_Label;
-
- /**
- * Align right action tooltip.
- */
- public static String AlignmentAction_AlignRightAction_Tooltip;
-
- /**
- * Align top action label.
- */
- public static String AlignmentAction_AlignTopAction_Label;
-
- /**
- * Align top action tooltip.
- */
- public static String AlignmentAction_AlignTopAction_Tooltip;
-
- /**
- * see EditorMessages.properties
- */
- public static String EditListEntriesDialog_EditingListEntries;
-
- /**
- * see EditorMessages.properties
- */
- public static String EditMapEntriesDialog_EditingMapEntries;
-
- /**
- * User can turn off intro page in faces-config editor
- */
- public static String editor_pageflow_page_intro_NoIntroPage;
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/EditorMessages.properties b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/EditorMessages.properties
deleted file mode 100644
index 8891323..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/EditorMessages.properties
+++ /dev/null
@@ -1,453 +0,0 @@
-###############################################################################
-# Copyright (c) 2001, 2007 Oracle Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# Oracle Corporation - initial API and implementation
-###############################################################################
-####################################################
-# Common UI resources
-####################################################
-UI_Button_Add = Add
-UI_Button_Edit = Edit
-UI_Button_Remove = Remove
-UI_Button_Add_more = Add...
-UI_Button_Edit_more = Edit...
-
-##Message for remove confirm alerter.
-Remove_Title = Confirm Remove
-Remove_Msg = Are you sure you want to remove {0}?
-
-FindType = Find Type
-FindType_Filter = Choose a type (?=any character, *=any string):
-FindType_Error_CannotFindType = Can not find java class
-
-FacesConfigEditor_Error_OpenModel_Title = Error
-FacesConfigEditor_ErrorHandlingUndoConflicts_DialogTitle=File Conflict
-FacesConfigEditor_ErrorHandlingUndoConflicts_DialogMessage=There are unsaved changes that conflict with changes made outside the editor. Do you wish to discard this editor's changes?
-FacesConfigEditor_Error_OpenModel = Cannot open the faces-config file, this project is not a web project.
-####################################################
-# Tab's name for multipageeditor of faces-config
-####################################################
-FacesConfigEditor_Introduction_TabName = Introduction
-FacesConfigEditor_Overview_TabName = Overview
-FacesConfigEditor_Pageflow_TabName = Navigation Rule
-FacesConfigEditor_ManagedBeans_TabName = ManagedBean
-FacesConfigEditor_Components_TabName = Component
-FacesConfigEditor_Others_TabName = Others
-FacesConfigEditor_Source_TabName = Source
-
-
-####################################################
-#Introduction page
-####################################################
-editor_pageflow_page_intro_name = Introduction
-editor_pageflow_page_intro_title = Faces Configuration Introduction
-editor_pageflow_page_intro_help_HelpContextID = com.sybase.stf.jmt.faces_config_editor_introduction
-editor_pageflow_page_intro_help_HelpToolTip = Introduction
-editor_pageflow_page_intro_NoIntroPage=Don't show this page next time.
-
-####################################################
-#ManagedBean page
-####################################################
-ManagedBeanPage_Title = Faces Configuration Managed Bean
-
-##managed bean section
-ManagedBeanMasterSection_Name = Managed Bean Elements
-ManagedBeanMasterSection_Description = The following managed beans are defined
-
-
-##managed bean general section
-ManagedBeanGeneralSection_Name = Managed Bean
-
-ManagedBeanGeneralSection_Desc = This section describes general configuration of this managed bean
-
-ManagedBeanGeneralSection_ManagedBeanName = Managed Bean name*:
-ManagedBeanGeneralSection_ManagedBeanClass = Managed Bean class*:
-ManagedBeanGeneralSection_ManagedBeanScope = Managed Bean scope*:
-
-##managed bean initialization section
-InitializationSection_Name = Initialization
-InitializationSection_Description = You can initialize the managed bean's properties or itself if it is a subclass of java.util.Map or java.util.List
-
-ManagedBeanPropertyEditDialog_Title_NewPropertyEntry = Create New Property
-ManagedBeanPropertyEditDialog_Title_ExistingPropertyEntry = Edit Existing Property
-ManagedBeanPropertyEditDialog_PropertyName = Property name*:
-ManagedBeanPropertyEditDialog_PropertyClass = Property class*:
-ManagedBeanPropertyEditDialog_PropertyClass_Browse = Browse...
-ManagedBeanPropertyEditDialog_ValueType = Value type:
-ManagedBeanProeprtyEditPage_Description = Editing managed bean property.
-ManagedBeanPropertyEditDialog_Value = Value:
-ManagedBeanPropertyEditWizard_Title = Editing Managed Bean Property
-ManagedBeanProeprtyEditPage_Title = Edit Property
-ManagedBeanPropertyEditDialog_Value_Change = Edit...
-
-ManagedBeanPropertyEditDialog_FindType = Find Type
-ManagedBeanPropertyEditDialog_FindType_Filter = Choose a type (?=any character, *=any string):
-
-InitializationSection_ClassType = Managed Bean class type:
-
-InitializationSection_ClassType_General = General class
-InitializationSection_ClassType_Map = Map
-InitializationSection_ClassType_List = List
-
-InitializationSection_PropertyTable_Name = Name
-InitializationSection_PropertyTable_Class = Class
-InitializationSection_PropertyTable_Value = Value
-
-InitializationSection_MapType_KeyClass = Key class:
-InitializationSection_MapType_ValueClass = Value class:
-
-InitializationSection_MapTable_Title = Values:
-InitializationSection_MapTable_Key = Key
-
-InitializationSection_MapTable_Value = Value
-
-InitializationSection_ListType_ValueClass = Value class:
-InitializationSection_ListTable_Title = Values:
-InitializationSection_ListTable_Value = Value
-
-
-##ListEntriesEditGroup
-ListEntriesEditPage_Title = Editing list-entries
-ListEntriesWizard_Title = Editing list-entries
-ListEntriesEditPage_Description = Editing list-entries of managed bean property.
-
-
-
-####################################################
-#Overview Page
-####################################################
-#OverviewPage.help = Help
-OverviewPage_page_name = Overview
-OverviewPage_page_id = PageflowOverview
-OverviewPage_page_title = PageFlow Overview
-OverviewPage_PageflowOverview_summary = Faces Configuration Overview
-
-# editor section
-OverviewPage_EditorSection_name = Editors Information
-OverviewPage_EditorSection_description = This section information about editors
-OverviewPage_EditorSection_noplugin = No plugin.xml file
-OverviewPage_EditorSection_nooverview = No Overview section found in plugin.xml file
-
-# general section
-OverviewPage_GeneralSection_name = General information of faces-config.xml
-OverviewPage_GeneralSection_description = This section describes general information
-OverviewPage_GeneralSection_label_name = Faces Config Name:
-OverviewPage_GeneralSection_label_version = Version:
-
-#navigation section
-OverviewPage_NavigationSection_name = Navigation Information
-OverviewPage_NavigationSection_description = This section describes the navigation rules
-OverviewPage_NavigationSection_table_col1 = From View ID
-OverviewPage_NavigationSection_table_col2 = From Outcome
-OverviewPage_NavigationSection_table_col3 = To View ID
-OverviewPage_NavigationSection_pageflowPageID = org.eclipse.wtp.jsf.facesconfig.editor.pageflow.PageflowEditor
-
-
-# managed bean section
-OverviewPage_ManagedBeanSection_name = ManagedBean Information
-OverviewPage_ManagedBeanSection_description = This section describes the managed beans
-OverviewPage_ManagedBeanSection_table_namecol = Name
-OverviewPage_ManagedBeanSection_table_scopecol = Scope
-OverviewPage_ManagedBeanSection_table_classcol = Class
-OverviewPage_ManagedBeanSection_managedbeanPageID = com.sybase.stf.jmt.editors.pageflow.managedbean.DataBindingPage
-
-#components section
-OverviewPage_ComponentsSection_name = Component Information
-OverviewPage_ComponentsSection_description = This section describes component, render-kit, converter and validator elements
-OverviewPage_ComponentsSection_table_typecol = Element Type
-OverviewPage_ComponentsSection_table_namecol = Element Name
-OverviewPage_ComponentsSection_componentsPageID = com.sybase.stf.jmt.editors.pageflow.components.ComponentsPage
-
-#other section
-OverviewPage_OthersSection_name = Others Information
-OverviewPage_OthersSection_description = This section describes application, factory and lifecycle elements
-OverviewPage_OthersSection_table_typecol = Element Type
-OverviewPage_OthersSection_table_namecol = Element Name
-OverviewPage_OthersSection_table_valuecol = Element Value
-OverviewPage_OthersSection_othersPageID = com.sybase.stf.jmt.editors.pageflow.OthersPage
-
-ManagedBeanPropertyGroup_error_EmptyName = The property name should be selected.
-ManagedBeanPropertyGroup_error_EmptyClass = The property class should be selected or input.
-MapEntriesEditGroup_Edit = Edit...
-MapEntriesEditPage_Title = Editing map-entries
-MapEntriesWizard_Title = Editing map-entries
-MapEntryEditGroup_Key = Key*:
-MapEntryEditGroup_error_EmptyKey = The key is empty.
-MapEntryEditGroup_error_DuplicateKey = The key ''{0}'' is duplicated.
-
-
-MapEntryEditPage_Title = Edit map-entry
-MapEntryEditWizard_Title = Edit Map Entry
-MapEntriesEditPage_Description = Editing map-entries of managed bean property.
-MapEntryEditPage_Description = Editing map-entry of managed bean property.
-ValueEditDialog_Title = Edit Value
-ValueEditWizard_Title = Edit Value
-ValueEditPage_Description = Editing value of managed bean property.
-ValueEditGroup_Value = Value:
-ValueEditPage_Title = Edit Value
-
-####################################################
-#Components page
-####################################################
-ComponentsPage_Title = Faces Configuration Components
-
-##Component Master Section
-ComponentMasterSection_Name = Components
-ComponentMasterSection_Description = The following components are defined:
-
-
-##Components General Section
-ComponentGeneralSection_Name = General
-ComponentGeneralSection_Description = This section describes the general information of this component.
-ComponentGeneralSection_Label_DisplayName = Display Name:
-ComponentGeneralSection_Label_Description = Description:
-ComponentGeneralSection_Label_ComponentType = Component Type*:
-ComponentGeneralSection_Label_ComponentClass = Component Class*:
-
-##RenderKit Master Section
-RenderKitMasterSection_Name = Render Kits
-RenderKitMasterSection_Description = The following render-kits are defined:
-
-
-##RenderKits General Section
-RenderKitGeneralSection_Name = General
-RenderKitGeneralSection_Description = This section describes the general information of this render-kit.
-RenderKitGeneralSection_Label_DisplayName = Display Name:
-RenderKitGeneralSection_Label_Description = Description:
-RenderKitGeneralSection_Label_RenderKitID = Renderkit ID:
-RenderKitGeneralSection_Label_RenderKitClass = Renderkit Class:
-
-##Renderer Section
-RendererSection_Name = Renderers
-RendererSection_Description = This section lists all the renderers of this render-kit.
-RendererSection_Table_NameColumn = Name
-RendererSection_Table_ComponentFamilyColumn = Component Family
-RendererSection_Table_TypeColumn = Type
-RendererSection_Table_ClassColumn = Class
-
-##Add/Edit Renderer Dialog
-RendererSection_Dialog_Title_Add = Add Renderer
-RendererSection_Dialog_Title_Edit = Edit Renderer
-RendererSection_Dialog_Tab_General = General
-RendererSection_Dialog_DisplayName = Display Name:
-RendererSection_Dialog_ComponentFamilyValue = Component Family*:
-RendererSection_Dialog_TypeValue = Renderer Type*:
-RendererSection_Dialog_RendererClass = Renderer Class*:
-RendererSection_Dialog_Error_ComponentFamilyEmpty = The component family is empty.
-RendererSection_Dialog_Error_RendererTypeEmpty = The renderer type is empty.
-RendererSection_Dialog_Error_RendererClassEmpty = The renderer class is empty.
-
-RendererSection_Dialog_SelectComponentFamilyDialog_Title = Select Component Family
-#RendererSection.Dialog.Page.SelectComponentFamilyDialogPage.Title = Select Component Family
-#RendererSection.Dialog.Page.SelectComponentFamilyDialogPage.Description = Enter or select a component family.
-#RendererSection.Dialog.Page.SelectComponentFamilyDialogPage.LabelText = Enter or select a component family:
-RendererSection_Dialog_ComponentFamilyCaption = Select Component Family
-RendererSection_Dialog_ComponentFamilyLabel = Enter or select a component family:
-##Converter Master Section
-ConverterMasterSection_Name = Converters
-ConverterMasterSection_Description = The following Converters are defined:
-
-
-##Converter General Section
-ConverterGeneralSection_Name = General
-ConverterGeneralSection_Description = This section describes the general information of this converter.
-ConverterGeneralSection_Label_DisplayName = Display Name:
-ConverterGeneralSection_Label_Description = Description:
-ConverterGeneralSection_Label_ConverterID = Converter ID:
-ConverterGeneralSection_Label_ConverterForClass = or Converter For Class:
-ConverterGeneralSection_Label_ConverterClass = Converter Class*:
-
-##Validator Section
-ValidatorMasterSection_Name = Validators
-ValidatorMasterSection_Description = The following Validators are defined:
-
-
-##Validator General Section
-ValidatorGeneralSection_Name = General
-ValidatorGeneralSection_Description = This section describes general information of this Validator
-ValidatorGeneralSection_Label_DisplayName = Display Name:
-ValidatorGeneralSection_Label_Description = Description:
-ValidatorGeneralSection_Label_ValidatorID = Validator ID*:
-ValidatorGeneralSection_Label_ValidatorClass = Validator Class*:
-
-##Attribute Section
-AttributeSection_Name = Attributes
-AttributeSection_Description = This section lists all the attributes.
-
-AttributeSection_Table_NameColumn = Name
-AttributeSection_Table_ClassColumn = Class
-AttributeSection_Table_DefaultValueColumn = Default Value
-AttributeSection_Table_SuggestedValueColumn = Suggested Value
-
-##Add/Edit Attribute Dialog
-AttributeSection_Dialog_Title_Add = Add Attribute
-AttributeSection_Dialog_Title_Edit = Edit Attribute
-AttributeSection_Dialog_Tab_General = General
-AttributeSection_Dialog_AttributeName = Attribute Name*:
-AttributeSection_Dialog_AttributeClass = Attribute Class*:
-AttributeSection_Dialog_DefaultValue = Default value:
-AttributeSection_Dialog_SuggestedValue = Suggested value:
-AttributeSection_Dialog_Error_NameEmpty = The attribute name is empty.
-AttributeSection_Dialog_Error_ClassEmpty = The attribute class is empty.
-
-##Property Section
-PropertySection_Name = Properties
-PropertySection_Description = This section lists all the properties.
-
-PropertySection_Table_NameColumn = Name
-PropertySection_Table_ClassColumn = Class
-PropertySection_Table_DefaultValueColumn = Default Value
-PropertySection_Table_SuggestedValueColumn = Suggested Value
-
-
-##Add/Edit Property Dialog
-PropertySection_Dialog_Title_Add = Add Property
-PropertySection_Dialog_Title_Edit = Edit Property
-PropertySection_Dialog_Tab_General = General
-PropertySection_Dialog_PropertyName = Property Name*:
-PropertySection_Dialog_PropertyClass = Property Class*:
-PropertySection_Dialog_DefaultValue = Default value:
-PropertySection_Dialog_SuggestedValue = Suggested value:
-PropertySection_Dialog_Error_NameEmpty = The property name is empty.
-PropertySection_Dialog_Error_ClassEmpty = The property class is empty.
-
-##Facet Section
-FacetSection_Name = Facets
-FacetSection_Description = This section lists all the facets.
-
-FacetSection_Table_DisplayNameColumn = Display Name
-FacetSection_Table_FacetNameColumn = Facet Name
-FacetSection_Table_DescriptionColumn = Description
-
-FacetSection_Dialog_Title_Add = Add Facet
-FacetSection_Dialog_Title_Edit = Edit Facet
-FacetSection_Dialog_Tab_General = General
-FacetSection_Dialog_FacetName = Facet Name*:
-FacetSection_Dialog_DisplayName = Display Name:
-FacetSection_Dialog_Description = Description:
-FacetSection_Dialog_Error_NameEmpty = The facet name is empty.
-
-####################################################
-#Others page
-####################################################
-OthersPage_Title = Faces Configuration Others
-
-##Application ActionListener Section
-ActionListenerSection_Name = Action Listener
-ActionListenerSection_Description =
-
-
-##Application Message Bundle Section
-MessageBundleSection_Name = Message Bundle
-MessageBundleSection_Description =
-
-
-MessageBundleSection_Dialog_Title = Select Message Bundle
-MessageBundleSection_Dialog_Message_SelectPropertyFile = Please select a message bundle file.
-MessageBundleSection_Dialog_Message_AlreadyExists = This message bundle already exists.
-
-##Application Locale Config Section
-LocaleConfigSection_Name = Locale Config
-LocaleConfigSection_Description =
-
-LocaleConfigSection_Wizard_WindowTitle = Add New Locale
-LocaleConfigSection_Wizard_Page_Name = addLocalePage
-LocaleConfigSection_Wizard_Page_Title = Add Supported Locale
-LocaleConfigSection_Wizard_Page_Description =
-LocaleConfigSection_Wizard_Page_LabelText = Enter or select a locale:
-LocaleConfigSection_Wizard_Page_AlreadyExistsError = This locale already exists.
-
-##Application Default RenderKit ID Section
-DefaultRenderKitIDSection_Name = Default RenderKit ID
-DefaultRenderKitIDSection_Description =
-
-
-DefaultRenderKitIDSection_Wizard_WindowTitle = Add Default Render Kit ID
-DefaultRenderKitIDSection_Wizard_Page_Name = addDefaultRenderKitIDPage
-DefaultRenderKitIDSection_Wizard_Page_Title = Add Default Render Kit ID
-DefaultRenderKitIDSection_Wizard_Page_Description =
-DefaultRenderKitIDSection_Wizard_Page_LabelText = Enter or select a render kit id:
-DefaultRenderKitIDSection_Wizard_Page_AlreadyExistsError = This render kit ID already exists.
-
-##Application Navigation Handler Section
-NavigationHandlerSection_Name = Navigation Handler
-NavigationHandlerSection_Description =
-
-
-##Application View Handler Section
-ViewHandlerSection_Name = View Handler
-ViewHandlerSection_Description =
-
-
-##Application State Manager Section
-StateManagerSection_Name = State Manager
-StateManagerSection_Description =
-
-
-##Application Property Resolver Section
-PropertyResolverSection_Name = Property Resolver
-PropertyResolverSection_Description =
-
-##Application Variable Resolver Section
-VariableResolverSection_Name = Variable Resolver
-VariableResolverSection_Description =
-
-
-##Factory Application Factory Section
-ApplicationFactorySection_Name = Application Factory
-ApplicationFactorySection_Description =
-
-
-##Factory Faces Context Factory Section
-FacesContextFactorySection_Name = Faces Context Factory
-FacesContextFactorySection_Description =
-
-
-##Factory Lifecycle Factory Section
-LifecycleFactorySection_Name = Lifecycle Factory
-LifecycleFactorySection_Description =
-
-
-##Factory Render Kit Factory Section
-RenderKitFactorySection_Name = Render Kit Factory
-RenderKitFactorySection_Description =
-
-##LifeCycle Phase Listener Section
-PhaseListenerSection_Name = Phase Listener
-PhaseListenerSection_Description =
-
-####################################################
-#Resource for MultiPageEditorOutlinePage
-####################################################
-MultiPageEditorOutlinePage_noOutline = An outline is not available.
-
-
-FacesConfigEditor_WaitForLoadPage_Title= Please wait while the editor finishes loading...
-FacesConfigEditor_WaitForLoad_EditorTabTitle=Wait for Load
-ModelLoader_LoadingModelJobName="Loading faces-config model"
-
-###########################
-# AlignmentAction messages
-###########################
-AlignmentAction_AlignLeftAction_Tooltip=Align Left
-AlignmentAction_AlignLeftAction_Label=Align &Left
-AlignmentAction_AlignRightAction_Tooltip=Align Right
-AlignmentAction_AlignRightAction_Label=Align &Right
-AlignmentAction_AlignTopAction_Tooltip=Align Top
-AlignmentAction_AlignTopAction_Label=Align &Top
-AlignmentAction_AlignBottomAction_Tooltip=Align Bottom
-AlignmentAction_AlignBottomAction_Label=Align &Bottom
-AlignmentAction_AlignCenterAction_Tooltip=Align Center
-AlignmentAction_AlignCenterAction_Label=Align &Center
-AlignmentAction_AlignMiddleAction_Tooltip=Align Middle
-AlignmentAction_AlignMiddleAction_Label=Align &Middle
-AddEditManagedPropertyDialog_Add=Add Managed Property
-AddEditManagedPropertyDialog_Edit=Edit Managed Property
-AddEditMapEntryDialog_NullValue=Null Value
-EditListEntriesDialog_EditingListEntries=Editing list-entries
-EditMapEntriesDialog_EditingMapEntries=Editing map-entries
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/EditorPlugin.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/EditorPlugin.java
deleted file mode 100644
index d65ef67..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/EditorPlugin.java
+++ /dev/null
@@ -1,268 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui;
-
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.resource.ImageRegistry;
-import org.eclipse.jst.jsf.common.ui.internal.guiutils.Alerts;
-import org.eclipse.jst.jsf.common.ui.internal.logging.Logger;
-import org.eclipse.jst.jsf.facesconfig.ui.preference.GEMPreferences;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * The main plugin class to be used in the desktop.
- */
-public class EditorPlugin extends AbstractUIPlugin {//implements IStartup {
-
- // The shared instance.
- private static EditorPlugin plugin;
-
- private Logger log;
-
- private ResourceBundle resourceBundle;
-
- private static Alerts alerts;
-
- private URL pluginBase;
-
- /**
- * The constructor.
- */
- public EditorPlugin() {
- super();
- plugin = this;
- }
-
-
- /**
- * This method is called upon plug-in activation
- */
- public void start(BundleContext context) throws Exception {
- super.start(context);
- try {
- // get resource bundle.
- resourceBundle = ResourceBundle
- .getBundle("org.eclipse.jst.jsf.facesconfig.ui.EditorPluginResources"); //$NON-NLS-1$
- alerts = new Alerts(this, resourceBundle);
- pluginBase = getBundle().getEntry("/"); //$NON-NLS-1$
-
- // set up logging for this plugin and everthing under it.
- log = new Logger(this.getBundle(), resourceBundle);
-
- // log.info("log.StartMessage", CommonPlugin.getVersion());
- } catch (Exception ee) {
- // only log if the logger was configured correctly.
- if (log != null) {
- log.error("log.msg", //$NON-NLS-1$
- "Problems starting plug-in Faces Config Editor.", ee); //$NON-NLS-1$
- }
-
- throw new CoreException(new Status(IStatus.ERROR, getBundle()
- .getSymbolicName(), IStatus.OK,
- "Problems starting plug-in Faces Config Editor", ee)); //$NON-NLS-1$
- }
-
- }
-
- /**
- * This method is called when the plug-in is stopped
- */
- public void stop(BundleContext context) throws Exception {
- super.stop(context);
- plugin = null;
- }
-
- /**
- * @return the shared instance.
- */
- public static EditorPlugin getDefault() {
- return plugin;
- }
-
- /**
- * @return the alerts objects associated with this plugin for alerting the user.
- */
- public static Alerts getAlerts() {
- return alerts;
- }
-
- /**
- * Returns a logger for the new class using this plugin for reference.
- * @param theClass
- * @return the default root logger
- */
- public static Logger getLogger(Class theClass) {
- return getDefault().getRootLogger(); // .getLogger(theClass);
- }
-
- /**
- * Returns the plugin's root logger
- * @return the root logger
- */
- public Logger getRootLogger() {
- return log;
- }
-
- /**
- * Returns the plugin's resource bundle,
- * @return the resource bundle
- */
- public ResourceBundle getResourceBundle() {
- return resourceBundle;
- }
-
- /**
- * Returns the string from the plugin's resource bundle, or 'key' if not
- * found.
- * @param key
- * @return the resource bundle string for key
- */
- public static String getResourceString(String key) {
- ResourceBundle bundle = getDefault().getResourceBundle();
- try {
- return (bundle != null) ? bundle.getString(key) : key;
- } catch (MissingResourceException e) {
- return key;
- }
- }
-
- /**
- * Returns the standard display to be used. The method first checks, if the
- * thread calling this method has an associated dispaly. If so, this display
- * is returned. Otherwise the method returns the default display.
- * @return the standard display
- */
- public static Display getStandardDisplay() {
- Display display;
- display = Display.getCurrent();
- if (display == null) {
- display = Display.getDefault();
- }
- return display;
- }
-
- /**
- * Returns the active workbench window.
- *
- * @return the active workbench window. this can be null but I've never seen
- * it.
- */
- public static IWorkbenchWindow getActiveWorkbenchWindow() {
- if (getDefault().getWorkbench() == null) {
- return null;
- }
- return getDefault().getWorkbench().getActiveWorkbenchWindow();
- }
-
- /**
- * @return the active shell
- */
- public static Shell getActiveShell() {
- Shell shell = null;
- IWorkbenchWindow workbenchWindow = getActiveWorkbenchWindow();
- if (workbenchWindow.getShell() != null) {
- shell = workbenchWindow.getShell();
- } else {
- shell = new Shell();
- }
- return shell;
- }
-
- /**
- * Returns a shared image for the given name
- * <p>
- * Note: Images returned from this method will be automitically disposed of
- * when this plug-in shuts down. Callers must not dispose of these images
- * themselves.
- * </p>
- *
- * @param name
- * the image name found in /icons (with extension)
- * @return the image, null on error or not found.
- */
- public Image getImage(String name) {
- if (name == null) {
- return null;
- }
-
- ImageRegistry images = getImageRegistry();
- Image image = images.get(name);
- if (image == null) {
- try {
- ImageDescriptor id = ImageDescriptor.createFromURL(new URL(
- pluginBase, "icons/" + name)); //$NON-NLS-1$
- images.put(name, id);
-
- image = images.get(name);
- } catch (MalformedURLException ee) {
- // log.EditorPlugin.image.error=Image {0} not found.
- log.error("log.msg", "log.EditorPlugin.image.error", name, ee); //$NON-NLS-1$ //$NON-NLS-2$
- }
- }
- return image;
- }
-
- /**
- * Returns an image descriptor for the image file at the given plug-in
- * relative path.
- *
- * @param path
- * the path
- * @return the image descriptor
- */
- public ImageDescriptor getImageDescriptor(String path) {
- if (path == null) {
- return null;
- }
-
- ImageRegistry images = getImageRegistry();
- ImageDescriptor id = images.getDescriptor(path);
- if (id == null) {
- try {
- id = ImageDescriptor.createFromURL(new URL(pluginBase, "icons/" //$NON-NLS-1$
- + path));
- images.put(path, id);
- } catch (MalformedURLException ee) {
- // log.EditorPlugin.image.error=Image {0} not found.
- log.error("log.msg", "log.EditorPlugin.image.error", path, ee); //$NON-NLS-1$ //$NON-NLS-2$
- }
- }
- return id;
- }
-
- /**
- * Returns this plugin's unique identifier
- *
- * @return this plugin's unique identifier
- *
- */
- public static String getPluginId() {
- return getDefault().getBundle().getSymbolicName();
- }
-
- protected void initializeDefaultPluginPreferences() {
- GEMPreferences.initializeDefaults();
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/EditorPluginResources.properties b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/EditorPluginResources.properties
deleted file mode 100644
index a8dd34c..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/EditorPluginResources.properties
+++ /dev/null
@@ -1,85 +0,0 @@
-###############################################################################
-# Copyright (c) 2001, 2008 Oracle Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# Oracle Corporation - initial API and implementation
-###############################################################################
-common.error=Error
-common.warning=Warning
-log.StartMessage=Faces Config Editor initialized on eclipse version {0}.
-####################################################
-# Resource message for Logging
-####################################################
-
-log.msg={0}
-
-log.EditorPlugin=Faces Config Editor Plugin initialized on eclipse version {0}.
-log.EditorPlugin.image.error=Image ''{0}'' not found.
-
-####################################################
-# Resource message for Alert
-####################################################
-
-Pageflow.PageflowEditor.Alert.errorOpenEditorTitle = Open Pageflow Error
-Pageflow.PageflowEditor.Alert.errorOpenEditorInfo = An error occured during opening the editor.
-Pageflow.PageflowEditor.Alert.errorSaveFileTitle = Save Pageflow Error
-Pageflow.PageflowEditor.Alert.errorSaveFileInfo = The current pageflow model could not be saved.
-Pageflow.PageflowEditor.Alert.nullModelManager = No model manager found for saving the file.
-Pageflow.PageflowEditor.Alert.errorOpenEditor4JSFTitle = Open JSF File Error
-Pageflow.PageflowEditor.Alert.errorOpenEditor4JSFInfo = The JSF file ''{0}'' does not exist.
-Pageflow.PageflowEditor.Alert.errorOpenEditor4JSFFolderInfo = Cannot open the page in the page editor.
-
-Pageflow.PageflowEditor.Alert.confirmCreateNewJSFFileTitle = Confirm
-Pageflow.PageflowEditor.Alert.confirmCreateNewJSFFile = No jsp file is related with this page.
-
-Pageflow.PageflowEditor.Alert.syncWithFacesConfigTitle = Confirm
-Pageflow.PageflowEditor.Alert.syncWithFacesConfigInfo = Synchronizing with faces-config will update the current pageflow model! \nThis command CAN NOT undo. Are you sure?
-Pageflow.PageflowEditor.Alert.errorSyncPageflowModel = The current pageflow model could not be synchronized with the specified faces-config file.
-
-Pageflow.PageflowEditor.Alert.updateFacesConfigTitle = Confirm
-Pageflow.PageflowEditor.Alert.updateFacesConfigInfo = Update the related faces config file. Are you sure?
-Pageflow.PageflowEditor.Alert.errorUpdateFacesConfig = The related faces-config file could not be updated.
-
-Pageflow.Transform.Alert.ResourceTitle = Resource Error
-Pageflow.Transform.Alert.LoadResourceError = Error loading resource
-Pageflow.Transform.Alert.SaveResourceError = Error saving resource
-
-Pageflow.PageflowEditor.Alert.DNDResourceTitle = Pageflow Creation Error
-Pageflow.PageflowEditor.Alert.ExistingPage = The web page ''{0}'' already exists in current PageFlow.
-Pageflow.PageflowEditor.Alert.ExistingAction = The action ''{0}'' already exists in current PageFlow.
-Pageflow.PageflowEditor.Alert.PageFromOtherProject = The web page ''{0}'' does not belong to current project.
-
-Pageflow.FacesConfig.Alert.ResourceTitle = Faces Configuration File Warning
-Pageflow.FacesConfig.Alert.LoadFileError = Invalid content in faces configuration file ''{0}''.
-Pageflow.FacesConfig.Alert.ErrorUpdateFacesConfigFromPageflow = Invalid content in faces configuration file. \nThe pageflow diagram can not be transformed.
-Pageflow.FacesConfig.Alert.SaveFileError = Failed to save faces configuration file ''{0}''.
-
-ManagedBeanInitializationSection.Remove.Title = Confirm Remove
-ManagedBeanInitializationSection.RemoveManagedProperty = Are you sure you want to remove all the managed-properties?
-ManagedBeanInitializationSection.RemoveMapEntries = Are you sure you want to remove map-entries?
-ManagedBeanInitializationSection.RemoveListEntries = Are you sure you want to remove list-entries?
-
-Alert.Error.CompletionProcessor.HTML.AttributeCompletionProp=No completions found
-Alert.Info.JSPPageEditorContributor.CreateAction.Message=Sample Action Executed
-
-Pageflow.PageflowEditor.Error.invalidPageflowFile = The specified input is not a valid pageflow.
-Pageflow.PageflowEditor.Error.invalidPageflowModel = The model in the pageflow file is not a valid pageflow model.
-Pageflow.PageflowEditor.Error.canNotOpenEditor4JSF = The jsf file can not be opened in the editor.
-Pageflow.PageflowEditor.Error.ResourceChange = Failed in the resource change.
-Pageflow.PageflowEditor.Error.canNotShowPropertyView = Failed to show property sheet view.
-Pageflow.PageflowEditor.Error.canNotShowPaletteView = Failed to show palette sheet view.
-
-Pageflow.PageflowResources.Error.invalidResourceBundle = The specified resource file is not a valid resourece bundle file.
-Pageflow.Transform.Resource.LoadError = Error loading resource ''{0}''
-
-Pageflow.PageflowEditor.Error.UnableRemoveAllMarkers = Unable to remove all markers
-Pageflow.PageflowEditor.Error.UnableAddMarker = Unable to add a marker
-Pageflow.PageflowEditor.Error.UnableRemoveMarker = Unable to remove a marker
-Pageflow.PageflowEditor.Error.invalidMarkerAttribute = Unable to get marker's attribute
-
-PageflowEditor.Encoding.Unsupported = Unsupported Encoding.
-PageflowEditor.Transform.Error.GetPageflowFromFacesConfig = Failed to get pageflow model from faces-config'a navigation rule.
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/FacesConfigActionBarContributor.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/FacesConfigActionBarContributor.java
deleted file mode 100644
index 7171e35..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/FacesConfigActionBarContributor.java
+++ /dev/null
@@ -1,179 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui;
-
-import org.eclipse.emf.edit.ui.action.EditingDomainActionBarContributor;
-import org.eclipse.jface.action.ICoolBarManager;
-import org.eclipse.jface.action.IMenuManager;
-import org.eclipse.jface.action.IStatusLineManager;
-import org.eclipse.jface.action.IToolBarManager;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.PageflowActionBarContributor;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.PageflowEditor;
-import org.eclipse.ui.IActionBars;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.part.EditorActionBarContributor;
-import org.eclipse.ui.part.MultiPageEditorActionBarContributor;
-import org.eclipse.wst.sse.ui.StructuredTextEditor;
-import org.eclipse.wst.xml.ui.internal.tabletree.SourcePageActionContributor;
-
-/**
- * The faces-config editor itself is composed by a set of pages. Each page has
- * its own action contributor. This FacesConfigActionBarContributor will work as
- * a proxy to delegate the action contributing to target nested action
- * contributor.
- *
- * @author hmeng
- */
-
-public class FacesConfigActionBarContributor extends
- MultiPageEditorActionBarContributor {
- private SourcePageActionContributor sourceActionContributor = null;
-
- private PageflowActionBarContributor pageflowActionContributor = null;
-
- private EditingDomainActionBarContributor formbasedPageActionContributor = null;
-
- private IEditorPart activeNestedEditor;
-
- /**
- * Default constructor
- */
- public FacesConfigActionBarContributor() {
- super();
- }
-
- public void setActivePage(IEditorPart activeEditor) {
- if (activeEditor != activeNestedEditor) {
- if (getActionContributor(activeNestedEditor) != null) {
- getActionContributor(activeNestedEditor).setActiveEditor(
- activeEditor);
- }
- activeNestedEditor = activeEditor;
- EditorActionBarContributor activeContributor = getActionContributor(activeEditor);
- if (activeContributor != null)
- activeContributor.setActiveEditor(activeEditor);
- else
- super.setActiveEditor(activeEditor);
- updateActionBars();
- }
- }
-
- public void contributeToCoolBar(ICoolBarManager coolBarManager) {
- EditorActionBarContributor activeContributor = getActionContributor(activeNestedEditor);
- if (activeContributor != null)
- activeContributor.contributeToCoolBar(coolBarManager);
- }
-
- public void contributeToMenu(IMenuManager menuManager) {
- EditorActionBarContributor activeContributor = getActionContributor(activeNestedEditor);
- if (activeContributor != null) {
- activeContributor.contributeToMenu(menuManager);
- }
- }
-
- public void contributeToStatusLine(IStatusLineManager statusLineManager) {
- EditorActionBarContributor activeContributor = getActionContributor(activeNestedEditor);
- if (activeContributor != null) {
- activeContributor.contributeToStatusLine(statusLineManager);
- }
- }
-
- public void contributeToToolBar(IToolBarManager toolBarManager) {
- EditorActionBarContributor activeContributor = getActionContributor(activeNestedEditor);
- if (activeContributor != null) {
- activeContributor.contributeToToolBar(toolBarManager);
- }
- }
-
- public void dispose() {
- getFormbasedPageActionContributor().dispose();
- getPageflowActionContributor().dispose();
- getSourceActionContributor().dispose();
- }
-
- public IActionBars getActionBars() {
- EditorActionBarContributor activeContributor = getActionContributor(activeNestedEditor);
- if (activeContributor != null) {
- return activeContributor.getActionBars();
- }
- return super.getActionBars();
- }
-
- public IWorkbenchPage getPage() {
- return super.getPage();
- }
-
- public void init(IActionBars bars, IWorkbenchPage page) {
- getPageflowActionContributor().init(bars, page);
- getSourceActionContributor().init(bars, page);
- getFormbasedPageActionContributor().init(bars, page);
- super.init(bars, page);
- }
-
-// private IEditorPart getActiveNestedEditor(IEditorPart targetEditor) {
-// IEditorPart activeNestedEditor_;
-// if (targetEditor instanceof FormEditor) {
-// activeNestedEditor_ = ((FormEditor) targetEditor).getActiveEditor();
-// } else {
-// activeNestedEditor_ = targetEditor;
-// }
-// return activeNestedEditor_;
-// }
-
- private EditorActionBarContributor getActionContributor(
- IEditorPart activeNestedEditor_) {
- EditorActionBarContributor activeContributor = null;
- if (activeNestedEditor_ instanceof PageflowEditor) {
- activeContributor = getPageflowActionContributor();
- } else if (activeNestedEditor_ instanceof StructuredTextEditor) {
- activeContributor = getSourceActionContributor();
- } else if (activeNestedEditor_ != null) {
- activeContributor = getFormbasedPageActionContributor();
- }
- return activeContributor;
- }
-
- private SourcePageActionContributor getSourceActionContributor() {
- if (sourceActionContributor == null) {
- sourceActionContributor = new SourcePageActionContributor();
- }
- return sourceActionContributor;
- }
-
- private EditingDomainActionBarContributor getFormbasedPageActionContributor() {
- if (formbasedPageActionContributor == null) {
- formbasedPageActionContributor = new MyEditingDomainActionContributor();
- }
- return formbasedPageActionContributor;
- }
-
- private PageflowActionBarContributor getPageflowActionContributor() {
- if (pageflowActionContributor == null) {
- pageflowActionContributor = new PageflowActionBarContributor();
- }
- return pageflowActionContributor;
-
- }
-
- /**
- * update the action bars
- */
- public void updateActionBars() {
- EditorActionBarContributor activeContributor = getActionContributor(activeNestedEditor);
- if (activeContributor instanceof INestedActionContributor)
- ((INestedActionContributor) activeContributor).update();
- // getActionBars().getMenuManager().removeAll();
- // activeContributor.contributeToMenu(getActionBars().getMenuManager());
- getActionBars().updateActionBars();
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/FacesConfigEditor.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/FacesConfigEditor.java
deleted file mode 100644
index 15db4c0..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/FacesConfigEditor.java
+++ /dev/null
@@ -1,1411 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.EventObject;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Set;
-import java.util.concurrent.atomic.AtomicBoolean;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IResourceChangeEvent;
-import org.eclipse.core.resources.IResourceChangeListener;
-import org.eclipse.core.resources.IResourceDelta;
-import org.eclipse.core.resources.IResourceDeltaVisitor;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.emf.common.command.BasicCommandStack;
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain;
-import org.eclipse.emf.edit.domain.EditingDomain;
-import org.eclipse.emf.edit.domain.IEditingDomainProvider;
-import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
-import org.eclipse.emf.edit.provider.ReflectiveItemProviderAdapterFactory;
-import org.eclipse.emf.edit.provider.resource.ResourceItemProviderAdapterFactory;
-import org.eclipse.gef.commands.CommandStack;
-import org.eclipse.gef.commands.CommandStackListener;
-import org.eclipse.gef.editparts.ZoomManager;
-import org.eclipse.gef.ui.actions.ActionRegistry;
-import org.eclipse.gef.ui.actions.EditorPartAction;
-import org.eclipse.gef.ui.actions.SaveAction;
-import org.eclipse.gef.ui.actions.UpdateAction;
-import org.eclipse.gef.ui.views.palette.PaletteView;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.ISelectionProvider;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jst.jsf.common.ui.internal.actions.IOpenPage;
-import org.eclipse.jst.jsf.core.IJSFCoreConstants;
-import org.eclipse.jst.jsf.facesconfig.edit.provider.FacesConfigItemProviderAdapterFactory;
-import org.eclipse.jst.jsf.facesconfig.emf.FacesConfigType;
-import org.eclipse.jst.jsf.facesconfig.ui.page.ComponentsPage;
-import org.eclipse.jst.jsf.facesconfig.ui.page.IntroductionPage;
-import org.eclipse.jst.jsf.facesconfig.ui.page.ManagedBeanPage;
-import org.eclipse.jst.jsf.facesconfig.ui.page.OthersPage;
-import org.eclipse.jst.jsf.facesconfig.ui.page.OverviewPage;
-import org.eclipse.jst.jsf.facesconfig.ui.page.WaitForLoadPage;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.DelegatingZoomManager;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.PageflowEditor;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.command.DelegatingCommandStack;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.command.EMFCommandStackGEFAdapter;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.layout.PageflowLayoutManager;
-import org.eclipse.jst.jsf.facesconfig.ui.preference.GEMPreferences;
-import org.eclipse.jst.jsf.facesconfig.util.FacesConfigArtifactEdit;
-import org.eclipse.swt.custom.CTabFolder;
-import org.eclipse.ui.IActionBars;
-import org.eclipse.ui.IEditorActionBarContributor;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IEditorSite;
-import org.eclipse.ui.IFileEditorInput;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.actions.WorkspaceModifyOperation;
-import org.eclipse.ui.dialogs.SaveAsDialog;
-import org.eclipse.ui.forms.editor.FormEditor;
-import org.eclipse.ui.forms.editor.FormPage;
-import org.eclipse.ui.forms.editor.IFormPage;
-import org.eclipse.ui.ide.IDE;
-import org.eclipse.ui.ide.IGotoMarker;
-import org.eclipse.ui.internal.BaseSaveAction;
-import org.eclipse.ui.part.FileEditorInput;
-import org.eclipse.ui.views.contentoutline.IContentOutlinePage;
-import org.eclipse.ui.views.properties.IPropertySheetPage;
-import org.eclipse.ui.views.properties.tabbed.ITabbedPropertySheetPageContributor;
-import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetPage;
-import org.eclipse.wst.common.project.facet.core.IFacetedProject;
-import org.eclipse.wst.common.project.facet.core.IProjectFacet;
-import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
-import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-import org.eclipse.wst.sse.ui.StructuredTextEditor;
-
-/**
- * This is the main editor for the faces-config file. Note that the model
- * load can involve long-running socket operations (shouldn't but can),
- * so the editor UI is load asynchronously. This is means that any
- * operations that need to be executed on editor open should be run
- * using AddPagesTask.pageSafeExecute() to ensure that they occur
- * after all editor pages have finished loading.
- *
- * @author sfshi
- *
- */
-public class FacesConfigEditor extends FormEditor implements
- IEditingDomainProvider, ISelectionProvider {
-
- /**
- * This editor's ID. TODO: this should prob be in plugin.properties?
- */
- public static final String EDITOR_ID = "org.eclipse.jst.jsf.facesconfig.ui.FacesConfigEditor"; //$NON-NLS-1$
-
-
- /**
- * Page id for Source page. Used for testing only.
- */
- public static final String SOURCE_PAGE_ID = "SourcePageId"; //$NON-NLS-1$
- /**
- * editing domain that is used to track all changes to the model
- */
- private AdapterFactoryEditingDomain editingDomain;
-
- /**
- * adapter factory used for providing views of the model
- */
- private ComposedAdapterFactory adapterFactory;
-
- /** id of the pageflowPage */
- private int pageflowPageID;
-
- private int managedBeanPageID;
-
- private int componentsPageID;
-
- private int othersPageID;
-
- private int sourcePageId;
-
- private PageflowEditor pageflowPage;
-
- /** The source text editor. */
- private StructuredTextEditor sourcePage;
-
- private Collection selectionChangedListeners = new ArrayList();
-
- private ISelection editorSelection = StructuredSelection.EMPTY;
-
- private IContentOutlinePage outlinePage;
-
- private IProject currentProject;
-
- private boolean isWebProject;
-
- private ModelLoader _modelLoader;
-
- /**
- * only true once dispose() has been called
- * used to signal that the editor was disposed.
- */
- private boolean _isDisposed; // = false;
-
- /**
- * Used to load editor pages when the model is loaded
- */
- private final AddPagesTask _addPagesTask = new AddPagesTask();
-
- /**
- * Default constructor
- */
- public FacesConfigEditor() {
- initializeEMF();
- }
-
- /**
- * This listens for workspace changes. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected IResourceChangeListener resourceChangeListener = new IResourceChangeListener() {
- public void resourceChanged(IResourceChangeEvent event) {
- // Only listening to these.
- // if (event.getType() == IResourceDelta.POST_CHANGE)
- {
- IResourceDelta delta = event.getDelta();
- try {
- class ResourceDeltaVisitor implements IResourceDeltaVisitor {
- protected ResourceSet resourceSet = editingDomain
- .getResourceSet();
-
- @SuppressWarnings("hiding")
- protected Collection changedResources = new ArrayList();
-
- @SuppressWarnings("hiding")
- protected Collection removedResources = new ArrayList();
-
- public boolean visit(IResourceDelta delta_) {
- if (delta_.getFlags() != IResourceDelta.MARKERS
- && delta_.getResource().getType() == IResource.FILE) {
- if ((delta_.getKind() & (IResourceDelta.CHANGED | IResourceDelta.REMOVED)) != 0) {
- Resource resource = resourceSet
- .getResource(URI.createURI(delta_
- .getFullPath().toString()),
- false);
- if (resource != null) {
- if ((delta_.getKind() & IResourceDelta.REMOVED) != 0) {
- removedResources.add(resource);
- } else {
- changedResources.add(resource);
- }
- }
- }
- }
-
- return true;
- }
-
- public Collection getChangedResources() {
- return changedResources;
- }
-
- public Collection getRemovedResources() {
- return removedResources;
- }
- }
-
- ResourceDeltaVisitor visitor = new ResourceDeltaVisitor();
- delta.accept(visitor);
-
- if (!visitor.getRemovedResources().isEmpty()) {
- removedResources.addAll(visitor.getRemovedResources());
- if (!isDirty()) {
- getSite().getShell().getDisplay().asyncExec(
- new Runnable() {
- public void run() {
- getSite().getPage().closeEditor(
- FacesConfigEditor.this,
- false);
- FacesConfigEditor.this.dispose();
- }
- });
- }
- }
-
- if (!visitor.getChangedResources().isEmpty()) {
- changedResources.addAll(visitor.getChangedResources());
- }
- } catch (CoreException exception) {
- // log it.
- EditorPlugin.getDefault().getLog().log(
- new Status(IStatus.ERROR, EditorPlugin
- .getPluginId(), IStatus.OK, exception
- .getMessage() == null ? "" : exception //$NON-NLS-1$
- .getMessage(), exception));
- }
- }
- }
- };
-
- /**
- * Resources that have been removed since last activation.
- *
- * @generated
- */
- Collection removedResources = new ArrayList();
-
- /**
- * Resources that have been changed since last activation.
- *
- * @generated
- */
- Collection changedResources = new ArrayList();
-
- /**
- * Resources that have been saved.
- *
- * @generated
- */
- Collection savedResources = new ArrayList();
-
- /**
- * Initializes the EMF support.
- */
- private void initializeEMF() {
- // create an adapter factory that yields item providers
- List factories = new ArrayList();
- factories.add(new ResourceItemProviderAdapterFactory());
- factories.add(new FacesConfigItemProviderAdapterFactory());
- factories.add(new ReflectiveItemProviderAdapterFactory());
- adapterFactory = new ComposedAdapterFactory(factories);
-
- // create the command stack that will notify this editor as commands are
- // executed
- BasicCommandStack commandStack = new BasicCommandStack();
- commandStack
- .addCommandStackListener(new org.eclipse.emf.common.command.CommandStackListener() {
- public void commandStackChanged(final EventObject event) {
- getContainer().getShell().getDisplay().asyncExec(
- new Runnable() {
- public void run() {
- editorDirtyStateChanged();
- getActionBarContributor()
- .updateActionBars();
- }
- });
- }
- });
- // commandStack.addCommandStackListener(this);
- // create the editing domain with a special command stack
- editingDomain = new AdapterFactoryEditingDomain(adapterFactory,
- commandStack, new HashMap());
- }
-
- /*
- * @see org.eclipse.ui.IEditorPart#init(org.eclipse.ui.IEditorSite,
- * org.eclipse.ui.IEditorInput)
- */
- public void init(IEditorSite site, IEditorInput input)
- throws PartInitException {
- try {
- super.init(site, input);
- } catch (Exception e) {
- MessageDialog.openError(null,
- EditorMessages.FacesConfigEditor_Error_OpenModel_Title,
- EditorMessages.FacesConfigEditor_Error_OpenModel);
- throw new PartInitException(
- EditorMessages.FacesConfigEditor_Error_OpenModel);
- }
-
- setPartName(input.getName());
- if (!isValidInput(input)) {
- PlatformUI.getWorkbench().getActiveWorkbenchWindow()
- .getActivePage().openEditor(input,
- "org.eclipse.ui.DefaultTextEditor"); //$NON-NLS-1$
-
- close(false);
- return;
- }
-
- createActions();
-
- ResourcesPlugin.getWorkspace().addResourceChangeListener(
- resourceChangeListener, IResourceChangeEvent.POST_CHANGE);
- }
-
- /*
- * @see org.eclipse.ui.part.EditorPart#setInput(org.eclipse.ui.IEditorInput)
- */
- protected void setInput(IEditorInput input)
- {
- isWebProject = matches(input);
- super.setInput(input);
-
- IFile inputFile = (IFile) input.getAdapter(IFile.class);
- if (inputFile != null)
- {
- final IProject project = inputFile.getProject();
- final IPath inputPath = inputFile.getFullPath();
-
- _modelLoader = new ModelLoader();
- _modelLoader.load(project, inputPath, isWebProject, _addPagesTask);
- }
- }
-
-
- protected void addPages()
- {
- // try loading wait page
- // if we get to here before model load completes,
- // then wait page will give the user the indication
- // that something is happening in the background before
- // the editor full loads.
- // if the model is already loaded, this call should do nothing
- _addPagesTask.maybeAddWaitPage();
- }
-
- /**
- * This runnable is used to used to manage the loading of the
- * editor pages for editor in a deferred fashion. Because the model
- * loading for this editor can be noticably long and (unfortunately)
- * may involve socket calls that block, loadModel(), runs this on a
- * separate thread. This class is intended to be used in two ways:
- *
- * 1) by the model loading code to signal it is finished by executing
- * the run() via a display.asyncExec().
- *
- * 2) by the addPages() call back on the the main editor as a way to
- * load a "Please wait for loading" page if the loading is still running
- * by the time the editor is ready to visualize itself.
- *
- * Note that in both cases methods of this class *must* be running on the
- * main display thread.
- *
- * @author cbateman
- *
- */
- private class AddPagesTask extends ModelLoader.ModelLoaderComplete
- {
- private final AtomicBoolean _arePagesLoaded = new AtomicBoolean(false); // set to true when the regular editor pages are loaded
- private FormPage _waitPage;
- private List<Runnable> _deferredRunnables = new ArrayList<Runnable>();
-
- /**
- * If the editor pages are loaded, runnable.run() is invoked immediately
- * If the editor pages are not loaded yet, runnable is queued and will be
- * executed in the order they are added immediately after the pages are loaded
- *
- * @param runnable
- */
- public synchronized void pageSafeExecute(Runnable runnable)
- {
- if (!_isDisposed)
- {
- if (!_arePagesLoaded.get())
- {
- _deferredRunnables.add(runnable);
- }
- else
- {
- runnable.run();
- }
- }
- }
-
- /**
- * @return true if the pages are loaded
- */
- public synchronized boolean getArePagesLoaded()
- {
- return _arePagesLoaded.get();
- }
-
- /**
- * Remove the wait page if present.
- */
- public synchronized void removeWaitPage()
- {
- if (_waitPage != null
- && !_waitPage.getPartControl().isDisposed())
- {
- int index = _waitPage.getIndex();
-
- if (index >= 0)
- {
- removePage(index);
- }
- }
- }
-
- /**
- * Add the wait page if the main pages aren't already loaded
- */
- public synchronized void maybeAddWaitPage()
- {
- // only load the wait page if the other pages haven't been loaded
- if (!getArePagesLoaded())
- {
- _waitPage = new WaitForLoadPage(FacesConfigEditor.this, "WaitForLoad", EditorMessages.FacesConfigEditor_WaitForLoad_EditorTabTitle); //$NON-NLS-1$
-
- try
- {
- addPage(0,_waitPage);
- }
- catch(PartInitException pie)
- {
- _waitPage =null;
- EditorPlugin.getDefault().getLog().log(
- new Status(IStatus.ERROR, EditorPlugin.getPluginId(),
- IStatus.OK, pie.getMessage() == null ? "" : pie //$NON-NLS-1$
- .getMessage(), pie));
- }
- }
- }
-
- /**
- * Must be run on the UI thread
- */
- public void doRun(FacesConfigArtifactEdit edit)
- {
- synchronized(this)
- {
- // ensure wait page gets removed
- removeWaitPage();
-
- if (!getArePagesLoaded()
- && !_isDisposed) // NOTE: we assume that access to variable does not need to
- // to be synchronous since this method must
- // be run on the UI thread. The only way
- // that isDisposed should be true is if model loading took a long
- // time and the user closed the editor before it completed (trigger dispose to be called)
- {
- try
- {
- if (isWebProject && edit != null && edit.getFacesConfig() != null)
- {
- // only add the intro editor if the preference
- // is set to do so.
- if (GEMPreferences.getShowIntroEditor())
- {
- IntroductionPage page1 = new IntroductionPage(FacesConfigEditor.this);
- addPage(page1, FacesConfigEditor.this.getEditorInput());
- }
-
- IFormPage overviewPage = new OverviewPage(FacesConfigEditor.this);
- addPage(overviewPage, FacesConfigEditor.this.getEditorInput());
-
- // Page flow
- createAndAddPageflowPage();
-
- // pages
- IFormPage managedBeanPage = new ManagedBeanPage(FacesConfigEditor.this);
- managedBeanPageID = addPage(managedBeanPage, FacesConfigEditor.this.getEditorInput());
- IFormPage componentsPage = new ComponentsPage(FacesConfigEditor.this);
- componentsPageID = addPage(componentsPage, FacesConfigEditor.this.getEditorInput());
- IFormPage othersPage = new OthersPage(FacesConfigEditor.this);
- othersPageID = addPage(othersPage, FacesConfigEditor.this.getEditorInput());
- }
-
- sourcePage = new StructuredTextEditor();
- sourcePage.setEditorPart(FacesConfigEditor.this);
- sourcePageId = addPage(sourcePage, FacesConfigEditor.this.getEditorInput());
- setPageText(sourcePageId, EditorMessages.FacesConfigEditor_Source_TabName);
- sourcePage.update();
-
- /* Bug 263806 - Problems saving file from source tab of faces-config editor
- *
- * Getting the save action and calling partDeactivated on it will attach
- * the internal listener necessary for the save action to receive subsequent
- * property change events. (There is no public method available to just hook
- * up the internal listener to our part.)
- */
- IAction sourcePageSaveAction = sourcePage.getAction("save"); //$NON-NLS-1$
- if (sourcePageSaveAction instanceof BaseSaveAction) {
- ((BaseSaveAction)sourcePageSaveAction).partDeactivated(FacesConfigEditor.this);
- }
-
- // default active page to 0
- setActivePage(0);
-
- // execute deferred runnables
- for (Runnable runnable : _deferredRunnables)
- {
- runnable.run();
- }
-
- // flag the fact that the regular editor pages have been added
- _arePagesLoaded.set(true);
- } catch (PartInitException e) {
- EditorPlugin.getDefault().getLog().log(
- new Status(IStatus.ERROR, EditorPlugin.getPluginId(),
- IStatus.OK, e.getMessage() == null ? "" : e //$NON-NLS-1$
- .getMessage(), e));
- }
- }
- }
- }
- }
-
- /**
- * Creates the pageflow page of the multi-page editor.
- * @throws PartInitException
- */
- protected void createAndAddPageflowPage() throws PartInitException {
- pageflowPage = new PageflowEditor(this);
- pageflowPageID = addPage(pageflowPage, getEditorInput());
- setPageText(pageflowPageID,
- EditorMessages.FacesConfigEditor_Pageflow_TabName);
- addPageActionRegistry(pageflowPage);
- pageflowPage.getModelsTransform().setFacesConfig(getFacesConfig());
- pageflowPage.getModelsTransform().setPageflow(
- pageflowPage.getPageflow());
- boolean fornew = pageflowPage.getModelsTransform()
- .updatePageflowModelFromEMF();
- pageflowPage.setGraphicalViewerContents(pageflowPage.getPageflow());
- if (fornew) {
- PageflowLayoutManager.getInstance().layoutPageflow(
- pageflowPage.getPageflow());
- }
- pageflowPage.getModelsTransform().setListenToNotify(true);
- }
-
- /**
- * TODO: this is used only for testing
- * @return the page flow editor
- */
- public PageflowEditor getPageflowPage() {
- return pageflowPage;
- }
-
- /**
- * get the action's registry of sub pages.
- * @param page
- *
- */
- protected void addPageActionRegistry(IEditorPart page) {
- if (page != null) {
- ActionRegistry pageActionRegisty = (ActionRegistry) page
- .getAdapter(ActionRegistry.class);
- if (pageActionRegisty != null) {
- for (Iterator iter = pageActionRegisty.getActions(); iter
- .hasNext();) {
- getActionRegistry().registerAction((IAction) iter.next());
- }
- }
- }
- }
-
- /** the editor's action registry */
- private ActionRegistry actionRegistry = null;
-
- /**
- * Returns the action registry of this editor.
- *
- * @return - the action registry
- */
- protected ActionRegistry getActionRegistry() {
- if (null == actionRegistry)
- actionRegistry = new ActionRegistry();
-
- return actionRegistry;
- }
-
- /**
- * Returns the root object of the configuration model.
- *
- * @return the root object. Should not, but may return null.
- */
- public FacesConfigType getFacesConfig()
- {
- FacesConfigArtifactEdit edit = _modelLoader.getEdit();
- if (edit != null)
- {
- return edit.getFacesConfig();
- }
- return null;
- }
-
- /*
- * @see org.eclipse.ui.ISaveablePart#isDirty()
- */
- public boolean isDirty() {
- return ((BasicCommandStack) editingDomain.getCommandStack())
- .isSaveNeeded()
- || super.isDirty();
- }
-
- /**
- * This class listens for command stack changes of the pages contained in
- * this editor and decides if the editor is dirty or not.
- */
- private class MultiPageCommandStackListener implements CommandStackListener {
-
- /** the observed command stacks */
- private List commandStacks = new ArrayList(2);
-
- /** to get the editorpart from command stack */
- private HashMap mapEditorCommandStack = new HashMap();
-
- private boolean saveLocation = false;
-
- /**
- * Adds a <code>CommandStack</code> to observe.
- *
- * @param commandStack
- * @param editor
- */
- public void addCommandStack(CommandStack commandStack,
- IEditorPart editor) {
- if (commandStack == null)
- return;
-
- if (mapEditorCommandStack.get(commandStack) == editor)
- return;
-
- commandStacks.add(commandStack);
- commandStack.addCommandStackListener(this);
- mapEditorCommandStack.put(commandStack, editor);
- }
-
- /**
- * set the dirty status for the models of different editor
- *
- * @param editor -
- * editor, e.g., pageflow or databinding page.
- * @param dirty -
- * true or false
- */
- private void setEditorDirty(IEditorPart editor, boolean dirty) {
- // do nothing
- }
-
- /** the list of action ids that are to CommandStack actions */
- private List stackActionIDs = new ArrayList();
-
- /**
- * Updates the specified actions.
- *
- * @param actionIds -
- * the list of ids of actions to update
- */
- private void updateActions(List actionIds) {
- for (Iterator ids = actionIds.iterator(); ids.hasNext();) {
- IAction action = getActionRegistry().getAction(ids.next());
- if (null != action && action instanceof UpdateAction) {
- ((UpdateAction) action).update();
- }
- }
- }
-
- /*
- * (non-Javadoc)
- *
- * @see CommandStackListener#commandStackChanged(java.util.EventObject)
- */
- public void commandStackChanged(EventObject event) {
- // enable or disable the actions
- updateActions(stackActionIDs);
- if (((CommandStack) event.getSource()).isDirty()) {
- // set the editor's model dirty status
- setEditorDirty((IEditorPart) mapEditorCommandStack
- .get(event.getSource()), true);
- // at least one command stack is dirty,
- // so the multi page editor is dirty too
- setDirty(true);
- } else {
- // set the editor's model dirty status, if it is from not save
- // location.
- if (!saveLocation) {
- setEditorDirty((IEditorPart) mapEditorCommandStack
- .get(event.getSource()), true);
- setDirty(true);
- } else {
- setDirty(false);
- }
- }
- }
-
- /** the pageflow page editor's dirty state */
- private boolean isDirty = false;
-
- /**
- * Changes the dirty state.
- *
- * @param dirty -
- * dirty state
- */
- public void setDirty(boolean dirty) {
- if (isDirty != dirty) {
- isDirty = dirty;
- firePropertyChange(IEditorPart.PROP_DIRTY);
- }
- }
-
- /**
- * Disposed the listener
- */
- public void dispose() {
- for (Iterator stacks = commandStacks.iterator(); stacks.hasNext();) {
- ((CommandStack) stacks.next()).removeCommandStackListener(this);
- }
- commandStacks.clear();
- }
-
- /**
- * Marks every observed command stack beeing saved. This method should
- * be called whenever the editor/model was saved.
- */
- public void markSaveLocations() {
- saveLocation = true;
- for (Iterator stacks = commandStacks.iterator(); stacks.hasNext();) {
- CommandStack stack = (CommandStack) stacks.next();
- stack.markSaveLocation();
- }
- saveLocation = false;
- }
-
- /**
- * Flushes every observed command stack and resets the save location to
- * zero.
- */
-// public void flush() {
-// for (Iterator stacks = commandStacks.iterator(); stacks.hasNext();) {
-// CommandStack stack = (CommandStack) stacks.next();
-// stack.flush();
-// }
-// }
- }
-
- /** the <code>CommandStackListener</code> */
- private MultiPageCommandStackListener multiPageCommandStackListener = null;
-
- /**
- * Returns the global command stack listener.
- *
- * @return the <code>CommandStackListener</code>
- */
- protected MultiPageCommandStackListener getMultiPageCommandStackListener() {
- if (null == multiPageCommandStackListener)
- multiPageCommandStackListener = new MultiPageCommandStackListener();
-
- return multiPageCommandStackListener;
- }
-
- /*
- * @see org.eclipse.ui.ISaveablePart#doSave(org.eclipse.core.runtime.IProgressMonitor)
- */
- public void doSave(IProgressMonitor monitor) {
- // do the work within an operation because this is a long running
- // activity that modifies the workbench
- WorkspaceModifyOperation operation = new WorkspaceModifyOperation() {
- public void execute(IProgressMonitor monitor_) {
- try {
- if (isWebProject &&
- _modelLoader.getEdit() != null) {
- // modelResource.save(Collections.EMPTY_MAP);
- Resource deploymentDescriptorResource = _modelLoader.getEdit()
- .getDeploymentDescriptorResource();
- if (deploymentDescriptorResource != null)
- {
- deploymentDescriptorResource.save(
- Collections.EMPTY_MAP);
- }
- IFile file = ((IFileEditorInput) getEditorInput())
- .getFile();
- pageflowPage.doSave(file, monitor_);
- }
- sourcePage.doSave(monitor_);
- getMultiPageCommandStackListener().markSaveLocations();
- } catch (Exception e) {
- EditorPlugin.getDefault().getLog().log(
- new Status(IStatus.ERROR, EditorPlugin
- .getPluginId(), IStatus.OK,
- e.getMessage() == null ? "" : e //$NON-NLS-1$
- .getMessage(), e));
- }
- }
- };
- try {
- // commit all pending changes in form pages
- for (Iterator iter = pages.iterator(); iter.hasNext();) {
- Object obj = iter.next();
- if (obj instanceof FormPage) {
- ((FormPage) obj).doSave(monitor);
- }
- // else if (obj instanceof PageflowEditor) {
- // ((PageflowEditor) obj).doSave(monitor);
- // }
-
- }
- operation.run(null);// .run(true, false,
- // operation;
- // runs the operation, and shows progress
- // new ProgressMonitorDialog();
-
- // refresh the necessary state
- ((BasicCommandStack) editingDomain.getCommandStack()).saveIsDone();
-
- editorDirtyStateChanged();
- } catch (Exception e) {
- EditorPlugin.getDefault().getLog().log(
- new Status(IStatus.ERROR, EditorPlugin.getPluginId(),
- IStatus.OK, e.getMessage(), e));
- }
- }
-
- public void doSaveAs() {
- SaveAsDialog saveAsDialog = new SaveAsDialog(getSite().getShell());
- saveAsDialog.open();
- IPath path = saveAsDialog.getResult();
- if (path != null) {
- IFile file = ResourcesPlugin.getWorkspace().getRoot().getFile(path);
- if (file != null) {
- doSaveAs(URI.createPlatformResourceURI(file.getFullPath()
- .toString(), false), new FileEditorInput(file));
- }
- }
- }
-
- /**
- * @param uri
- * @param editorInput
- */
- protected void doSaveAs(URI uri, IEditorInput editorInput) {
- editingDomain.getResourceSet().getResources().get(0)
- .setURI(uri);
- setInputWithNotify(editorInput);
- setPartName(editorInput.getName());
- IProgressMonitor progressMonitor = getActionBars()
- .getStatusLineManager() != null ? getActionBars()
- .getStatusLineManager().getProgressMonitor()
- : new NullProgressMonitor();
- doSave(progressMonitor);
- }
-
- public boolean isSaveAsAllowed() {
- return true;
- }
-
- /**
- * Returns the <code>TabbedPropertySheetPage</code> for this editor.
- *
- * @return - the <code>TabbedPropertySheetPage</code>
- */
- protected IPropertySheetPage getPropertySheetPage() {
- return new TabbedPropertySheetPage(
- new ITabbedPropertySheetPageContributor() {
-
- public String getContributorId() {
- return EDITOR_ID;
- }
- });
- }
-
- /** the delegating ZoomManager */
- private DelegatingZoomManager delegatingZoomManager = null;
-
- /**
- * check whether the input is related with IFile.
- *
- * @param input
- * @return
- */
- private boolean isValidInput(IEditorInput input) {
- if (input != null) {
- IFile file = (IFile) input.getAdapter(IResource.class);
- if (file != null) {
- return true;
- }
- }
- return false;
- }
-
- /**
- * Returns the <code>DelegatingZoomManager</code> for this editor.
- *
- * @return - the <code>DelegatingZoomManager</code>
- */
- protected DelegatingZoomManager getDelegatingZoomManager() {
- if (!isValidInput(getEditorInput()) || !isWebProject || !_addPagesTask.getArePagesLoaded()) {
- return null;
- }
- if (null == delegatingZoomManager) {
- delegatingZoomManager = new DelegatingZoomManager();
- delegatingZoomManager
- .setCurrentZoomManager((ZoomManager) pageflowPage
- .getAdapter(ZoomManager.class));
- }
- return delegatingZoomManager;
- }
-
- /** the delegating CommandStack */
- private DelegatingCommandStack delegatingCommandStack = null;
-
- /**
- * Returns the <code>CommandStack</code> for this editor.
- *
- * @return - the <code>CommandStack</code>
- */
- public DelegatingCommandStack getDelegatingCommandStack() {
- if (null == delegatingCommandStack) {
- delegatingCommandStack = new DelegatingCommandStack();
- }
- return delegatingCommandStack;
- }
-
- /*
- * @see org.eclipse.core.runtime.IAdaptable#getAdapter(java.lang.Class)
- */
- public Object getAdapter(Class adapter) {
- if (adapter == IEditingDomainProvider.class) {
- return new IEditingDomainProvider() {
- public EditingDomain getEditingDomain() {
- return editingDomain;
- }
- };
- }
- if (adapter == EditingDomain.class) {
- return editingDomain;
- }
- if (adapter == AdapterFactory.class) {
- return adapterFactory;
- }
- if (adapter == IEditorPart.class) {
- return getActiveEditor();
- }
-
- if (adapter == CommandStack.class) {
- return getDelegatingCommandStack();
- }
- if (adapter == ZoomManager.class) {
- return getDelegatingZoomManager();
- }
-
- if (adapter == ActionRegistry.class) {
- return getActionRegistry();
- }
- if (adapter == IGotoMarker.class) {
- return new IGotoMarker() {
- public void gotoMarker(final IMarker marker) {
- // this may be called on an editor open (i.e. double-click the Problems view)
- // so ensure it runs safely with respect to the page load
- _addPagesTask.pageSafeExecute(new Runnable()
- {
- public void run()
- {
- FacesConfigEditor.this.gotoMarker(marker);
- }
- });
- }
- };
- }
- if (adapter == StructuredTextEditor.class) {
- return sourcePage;
- }
-
- if (adapter == IContentOutlinePage.class) {
- return getOutlinePage();
- }
-
- if (adapter == IPropertySheetPage.class) {
- return getPropertySheetPage();
- }
-
- if (adapter == IProject.class) {
- return getProject();
- }
-
- if (adapter == CTabFolder.class) {
- return getContainer();
- }
-
- if (adapter == IOpenPage.class) {
- return new IOpenPage() {
-
- public void setActiveEditorPage(String pageID) {
- FacesConfigEditor.this.setActiveEditorPage(pageID);
-
- }
- };
- }
-
- return super.getAdapter(adapter);
- }
-
- private EMFCommandStackGEFAdapter sourceCommandStack;
-
- /**
- * get or create the source page's GEF command stack based on its EMF
- * command stack.
- *
- * @return
- */
- private CommandStack getSourcePageCommandStack() {
- if (sourceCommandStack == null) {
- IDocument doc = sourcePage.getDocumentProvider().getDocument(getEditorInput());
- if (doc instanceof IStructuredDocument) {
- sourceCommandStack = new EMFCommandStackGEFAdapter(doc);
- }
- else
- {
- EditorPlugin.getDefault().getLog().log(
- new Status(IStatus.ERROR, EditorPlugin.getPluginId(), 0,
- "Error getting undo stack for Faces Config editor. Undo may be disabled", //$NON-NLS-1$
- new Throwable()));
- }
- }
- return sourceCommandStack;
- }
-
- /** the list of action ids that are to CommandStack actions */
- // private List stackActionIDs = new ArrayList();
- /** the list of action ids that are editor actions */
- private List editorActionIDs = new ArrayList();
-
- /**
- * Adds an editor action to this editor.
- * <p>
- * Editor actions are actions that depend and work on the editor.
- *
- * @param action -
- * the editor action
- */
- protected void addEditorAction(EditorPartAction action) {
- getActionRegistry().registerAction(action);
- editorActionIDs.add(action.getId());
- }
-
- /**
- * Creates different kinds of actions and registers them to the
- * ActionRegistry.
- */
- protected void createActions() {
- // register save action
- addEditorAction(new SaveAction(this));
- }
-
- /**
- * Indicates that the current page has changed.
- * <p>
- * We update the DelegatingCommandStack, OutlineViewer and other things
- * here. //
- */
- protected void currentPageChanged() {
- IEditorPart activeEditor = getActiveEditor();
- if (activeEditor == null) {
- return;
- }
-
- // update command stack
- CommandStack cmdStack = null;
-
- if (activeEditor == pageflowPage) {
- cmdStack = (CommandStack) activeEditor
- .getAdapter(CommandStack.class);
- } else if (activeEditor == sourcePage)// other page will delegate the
- // GEF command stack to source
- // page's.
- {
- cmdStack = this.getSourcePageCommandStack();
- }
-
- // Add command stacks
- getMultiPageCommandStackListener().addCommandStack(cmdStack,
- activeEditor);
- getDelegatingCommandStack().setCurrentCommandStack(cmdStack);
-
- // enable or disable the actions
- // updateActions(stackActionIDs);
-
- // update zoom actions
- ZoomManager zoomManager = null;
- zoomManager = (ZoomManager) activeEditor.getAdapter(ZoomManager.class);
-
- if (zoomManager != null) {
- getDelegatingZoomManager().setCurrentZoomManager(zoomManager);
- }
-
- IEditorActionBarContributor contributor = getEditorSite()
- .getActionBarContributor();
- if (contributor != null
- && contributor instanceof FacesConfigActionBarContributor) {
- ((FacesConfigActionBarContributor) contributor)
- .setActivePage(activeEditor);
- PaletteView paletteView = (PaletteView) PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().findView(PaletteView.ID);
- if(paletteView != null) {
- paletteView.partActivated(activeEditor);
- }
- }
- }
-
- /*
- * (non-Javadoc)
- *
- * @see MultiPageEditorPart#pageChange(int)
- */
- protected void pageChange(int newPageIndex) {
- super.pageChange(newPageIndex);
- // getActionBarContributor().setActivePage(getActiveEditor());
- // refresh content depending on current page
- currentPageChanged();
- }
-
- public void dispose()
- {
- // signal that we have been disposed
- // do this before anything else
- _isDisposed = true;
- _modelLoader.dispose();
-
- ResourcesPlugin.getWorkspace().removeResourceChangeListener(
- resourceChangeListener);
-
- adapterFactory.dispose();
-
- if (this.outlinePage != null)
- outlinePage.dispose();
-
- if (sourcePage != null)
- sourcePage.dispose();
-
- if (sourceCommandStack != null)
- sourceCommandStack.dispose();
-
- if (pageflowPage != null)
- pageflowPage.dispose();
-
- if (multiPageCommandStackListener != null)
- multiPageCommandStackListener.dispose();
-
- //do not call dispose on delegatingCommandStack. source and multiPage are already disposed
-
- super.dispose();
- }
-
- /**
- * get the project of the faces config file that the editor is working on.
- *
- * @return IProject
- */
- public IProject getProject() {
- if (currentProject == null) {
- if (_modelLoader.getEdit() != null) {
- IFile file = _modelLoader.getEdit().getFile();
- if (file != null)
- currentProject = file.getProject();
- }
- }
- return currentProject;
- }
-
- public EditingDomain getEditingDomain() {
- return editingDomain;
- }
-
- /**
- * Returns the <code>IContentOutlinePage</code> for this editor.
- *
- * @return - the <code>IContentOutlinePage</code>
- */
- protected IContentOutlinePage getOutlinePage() {
- if (null == outlinePage) {
- outlinePage = new MultiPageEditorOutlinePage();
- }
- return outlinePage;
- }
-
- public void addSelectionChangedListener(ISelectionChangedListener listener) {
- selectionChangedListeners.add(listener);
- }
-
- public ISelection getSelection() {
- return editorSelection;
- }
-
- public void removeSelectionChangedListener(
- ISelectionChangedListener listener) {
- selectionChangedListeners.remove(listener);
- }
-
- public void setSelection(ISelection selection) {
- editorSelection = selection;
- for (Iterator listeners = selectionChangedListeners.iterator(); listeners
- .hasNext();) {
- ISelectionChangedListener listener = (ISelectionChangedListener) listeners
- .next();
- listener
- .selectionChanged(new SelectionChangedEvent(this, selection));
- }
- }
-
- private void gotoMarker(IMarker marker) {
- setActivePage(sourcePageId);
- IDE.gotoMarker(this.sourcePage, marker);
- }
-
- /**
- * FIXME: this is used only for testing. Should isolate better
- * @return the action bar
- */
- public FacesConfigActionBarContributor getActionBarContributor() {
- return (FacesConfigActionBarContributor) getEditorSite()
- .getActionBarContributor();
- }
-
- private IActionBars getActionBars() {
- return getActionBarContributor().getActionBars();
- }
-
- public Object getSelectedPage() {
- IFormPage page = getActivePageInstance();
- if (page != null)
- return page;
-
- if (getActiveEditor() instanceof PageflowEditor)
- return getActiveEditor();
-
- return null;
- }
-
- /**
- * Shows a dialog that asks if conflicting changes should be discarded.
- * @return the user's response.
- */
- protected boolean handleDirtyConflict() {
- return MessageDialog
- .openQuestion(
- getSite().getShell(),
- EditorMessages.FacesConfigEditor_ErrorHandlingUndoConflicts_DialogTitle,
- EditorMessages.FacesConfigEditor_ErrorHandlingUndoConflicts_DialogMessage);
- }
-
- /**
- * Handles what to do with changed resources on activation.
- *
- * @generated
- */
- protected void handleChangedResources() {
- if (!changedResources.isEmpty()
- && (!isDirty() || handleDirtyConflict())) {
- editingDomain.getCommandStack().flush();
-
- for (Iterator i = changedResources.iterator(); i.hasNext();) {
- Resource resource = (Resource) i.next();
- if (resource.isLoaded()) {
- resource.unload();
- try {
- resource.load(Collections.EMPTY_MAP);
- } catch (IOException exception) {
- EditorPlugin.getDefault().getLog().log(
- new Status(IStatus.ERROR, EditorPlugin
- .getPluginId(), IStatus.OK, exception
- .getMessage() == null ? "" : exception //$NON-NLS-1$
- .getMessage(), exception));
- }
- }
- }
- }
- }
-
- /**
- * TODO this is used only for testing. Should be able to remove if we
- * go to true automated UI testing
- * @param pageID
- */
- public void setActiveEditorPage(String pageID) {
- if (pageID.equals(PageflowEditor.PAGE_ID)) {
- setActivePage(pageflowPageID);
- } else if (pageID.equals(ManagedBeanPage.PAGE_ID)) {
- setActivePage(managedBeanPageID);
- } else if (pageID.equals(ComponentsPage.PAGE_ID)) {
- setActivePage(componentsPageID);
- } else if (pageID.equals(OthersPage.PAGE_ID)) {
- setActivePage(othersPageID);
- } else if (pageID.equals(SOURCE_PAGE_ID)) {
- setActivePage(sourcePageId);
- }
- }
-
- private boolean matches(IEditorInput input) {
- final IResource file = (IResource) input.getAdapter(IResource.class);
- boolean hasWebFacet = false;
- boolean hasJSFFacet = false;
-
- if (file != null) {
- final IProject project = file.getProject();
-
- if (project != null) {
- try {
- final IFacetedProject facetedProject = ProjectFacetsManager
- .create(project);
-
- if (facetedProject != null) {
- final Set facets = facetedProject.getProjectFacets();
-
- for (final Iterator it = facets.iterator(); it
- .hasNext();) {
- final IProjectFacetVersion version = (IProjectFacetVersion) it
- .next();
-
- IProjectFacet facet = version.getProjectFacet();
- if (IJSFCoreConstants.JSF_CORE_FACET_ID.equals(facet.getId())) {
- hasJSFFacet = true;
- } else if ("jst.web".equals(facet.getId())) { //$NON-NLS-1$
- hasWebFacet = true;
- }
- }
- }
- } catch (CoreException ex) {
- EditorPlugin.getDefault().getLog().log(
- new Status(IStatus.ERROR, EditorPlugin
- .getPluginId(), IStatus.OK,
- ex.getMessage() == null ? "" : ex //$NON-NLS-1$
- .getMessage(), ex));
- }
- }
- }
-
- return hasWebFacet && hasJSFFacet;
- }
-
- /**
- * DANGER! This call is for testing only! Should not be used,
- * even internally, by production code.
- * @param timeoutMs the time to wait in milliseconds
- * @throws InterruptedException
- */
- public void doPageLoad(long timeoutMs) throws InterruptedException
- {
- _modelLoader.waitForLoad(timeoutMs);
- _addPagesTask.doRun(_modelLoader.getEdit());
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/IFacesConfigConstants.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/IFacesConfigConstants.java
deleted file mode 100644
index c13cff1..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/IFacesConfigConstants.java
+++ /dev/null
@@ -1,160 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui;
-
-/**
- * @author jchoi
- * @version
- */
-public interface IFacesConfigConstants {
-
- /**
- *
- */
- public static final String FACES_CONFIG = "faces-config"; //$NON-NLS-1$
-
- /**
- *
- */
- public static final String MANAGED_PROPERTY = "managed-property"; //$NON-NLS-1$
-
- /**
- *
- */
- public static final String VALUE = "value"; //$NON-NLS-1$
-
- /**
- *
- */
- public static final String NULL_VALUE = "null-value"; //$NON-NLS-1$
-
- /**
- *
- */
- public static final String MAP_ENTRIES = "map-entries"; //$NON-NLS-1$
-
- /**
- *
- */
- public static final String MAP_ENTRY = "map-entry"; //$NON-NLS-1$
-
- /**
- *
- */
- public static final String LIST_ENTRIES = "list-entries"; //$NON-NLS-1$
-
- /**
- *
- */
- public static final String NAVIGATION_RULE = "navigation-rule"; //$NON-NLS-1$
-
- /**
- *
- */
- public static final String COMPONENT_SUPER_CLASS = "javax.faces.component.UIComponent"; //$NON-NLS-1$
-
- /**
- *
- */
- public static final String RENDER_KIT_SUPER_CLASS = "javax.faces.render.RenderKit"; //$NON-NLS-1$
-
- /**
- *
- */
- public static final String CONVERTER_INTERFACE = "javax.faces.convert.Converter"; //$NON-NLS-1$
-
- /**
- *
- */
- public static final String VALIDATOR_INTERFACE = "javax.faces.validator.Validator"; //$NON-NLS-1$
-
- /**
- *
- */
- public static final String RENDERER_SUPER_CLASS = "javax.faces.render.Renderer"; //$NON-NLS-1$
-
- /**
- *
- */
- public static final String ACTION_LISTENER_INTERFACE = "javax.faces.event.ActionListener"; //$NON-NLS-1$
-
- /**
- *
- */
- public static final String NAVIGATION_HANDLE_SUPER_CLASS = "javax.faces.application.NavigationHandler"; //$NON-NLS-1$
-
- /**
- *
- */
- public static final String PROPERTY_RESOLVER_SUPER_CLASS = "javax.faces.el.PropertyResolver"; //$NON-NLS-1$
-
- /**
- *
- */
- public static final String STATE_MANAGER_SUPER_CLASS = "javax.faces.application.StateManager"; //$NON-NLS-1$
-
- /**
- *
- */
- public static final String VARIABLE_RESOLVER_SUPER_CLASS = "javax.faces.el.VariableResolver"; //$NON-NLS-1$
-
- /**
- *
- */
- public static final String VIEW_HANDLER_SUPER_CLASS = "javax.faces.application.ViewHandler"; //$NON-NLS-1$
-
- /**
- *
- */
- public static final String APPLICATION_FACTORY_SUPER_CLASS = "javax.faces.application.ApplicationFactory"; //$NON-NLS-1$
-
- /**
- *
- */
- public static final String FACES_CONTEXT_FACTORY_SUPER_CLASS = "javax.faces.context.FacesContextFactory"; //$NON-NLS-1$
-
- /**
- *
- */
- public static final String LIFECYCLE_FACTORY_SUPER_CLASS = "javax.faces.lifecycle.LifecycleFactory"; //$NON-NLS-1$
-
- /**
- *
- */
- public static final String RENDER_KIT_FACTORY_SUPER_CLASS = "javax.faces.render.RenderKitFactory"; //$NON-NLS-1$
-
- /**
- *
- */
- public static final String PHASE_LISTENER_INTERFACE = "javax.faces.event.PhaseListener"; //$NON-NLS-1$
-
- /**
- *
- */
- public static final String MANAGED_BEAN_SCOPE_APPLICATION = "application"; //$NON-NLS-1$
-
- /**
- *
- */
- public static final String MANAGED_BEAN_SCOPE_SESSION = "session"; //$NON-NLS-1$
-
- /**
- *
- */
- public static final String MANAGED_BEAN_SCOPE_REQUEST = "request"; //$NON-NLS-1$
-
- /**
- *
- */
- public static final String MANAGED_BEAN_SCOPE_NONE = "none"; //$NON-NLS-1$
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/INestedActionContributor.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/INestedActionContributor.java
deleted file mode 100644
index a36a2f4..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/INestedActionContributor.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-
-
-package org.eclipse.jst.jsf.facesconfig.ui;
-
-/**
- * The nested action contributor should be able to update its actions as
- * required.
- */
-public interface INestedActionContributor {
- /**
- * Updated nested actions
- */
- void update();
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/ModelLoader.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/ModelLoader.java
deleted file mode 100644
index 417b949..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/ModelLoader.java
+++ /dev/null
@@ -1,215 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2007 Oracle Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Oracle Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui;
-
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.TimeUnit;
-
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.Assert;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.jst.jsf.facesconfig.ui.util.WebrootUtil;
-import org.eclipse.jst.jsf.facesconfig.util.FacesConfigArtifactEdit;
-import org.eclipse.ui.PlatformUI;
-
-/**
- * Centralizes logic to load the faces config model off of the UI thread for
- * the FacesConfig Editor.
- *
- * Also encapsulates the lifecycle for the instance of the faces artifact
- * created for its editor. All creation, access and destruction of the artifact
- * should be centralized through this class
- *
- * @author cbateman
- *
- */
-class ModelLoader
-{
- private FacesConfigArtifactEdit _edit;
- private Job _loadModelJob;
- private CountDownLatch _modelLoaded = new CountDownLatch(1);
-
- /**
- * @return the artifact edit or null if not loaded. Should only be called
- * after load() is called and has executed its callback
- */
- public synchronized FacesConfigArtifactEdit getEdit() {
- return _edit;
- }
-
- private synchronized void setEdit(FacesConfigArtifactEdit edit)
- {
- _edit = edit;
- }
-
- void waitForLoad(long timeoutMs) throws InterruptedException
- {
- _modelLoaded.await(timeoutMs, TimeUnit.MILLISECONDS);
- }
-
- /**
- * Dispose of the model and any unfinished loading operations
- *
- * Must be run on the UI thread.
- */
- public synchronized void dispose()
- {
- assertOnDisplayThread();
-
- // if the load model job has not completed, cancel it
- if (_loadModelJob != null
- && _loadModelJob.getResult() == null)
- {
- _loadModelJob.cancel();
- }
-
- if (_edit != null)
- {
- _edit.dispose();
- //System.out.println("FacesConfigEditor.dispose(): isDisposed == "+_edit.isDisposed());
- }
- }
-
- /**
- * Load the model file located by path in project. Must be called from the UI thread.
- *
- * Method does not block.
- *
- * @param project
- * @param path
- * @param isWebProject
- * @param signalComplete to be asyncExec'd on the UI thread when the model is loaded
- */
- public void load(final IProject project, final IPath path, final boolean isWebProject, final ModelLoaderComplete signalComplete)
- {
- assertOnDisplayThread();
- _loadModelJob = new ModelLoaderJob(project, path, isWebProject, signalComplete);
- _loadModelJob.schedule();
- }
-
- private class ModelLoaderJob extends Job
- {
- private final IProject _project;
- private final IPath _path;
- private final ModelLoaderComplete _runnable;
- private final boolean _isWebProject;
-
- ModelLoaderJob(final IProject project, final IPath path, final boolean isWebProject, final ModelLoaderComplete signalComplete)
- {
- super(EditorMessages.ModelLoader_LoadingModelJobName);
- _project = project;
- _path = path;
- _runnable = signalComplete;
- _isWebProject = isWebProject;
- }
-
- @Override
- protected IStatus run(IProgressMonitor monitor)
- {
- FacesConfigArtifactEdit artifactEdit = loadModel(_project, _path);
-
- // synchrnoize on the ModelLoader. Ensure that any call to dispose()
- // that occurs before we set the edit is done atomically.
- synchronized(ModelLoader.this)
- {
- // only bother with this if the task hasn't been signalled for cancel
- if (!monitor.isCanceled())
- {
- setEdit(artifactEdit);
-
- _runnable.setFacesConfigArtifactEdit(artifactEdit);
-
- // finish as quickly possible; we are holding the ModelLoader
- // lock so we must ensure that we don't block.
- // NEVER USE syncExec here.
- PlatformUI.getWorkbench().getDisplay().asyncExec(_runnable);
- }
- // if we were cancelled, then dispose of the artifact edit
- else
- {
- if (artifactEdit != null)
- {
- artifactEdit.dispose();
- }
- }
- }
-
- // signal that we are done loading
- _modelLoaded.countDown();
- return Status.OK_STATUS;
- }
-
- /**
- * Loads the configuration model from the given path.
- *
- */
- private FacesConfigArtifactEdit loadModel(IProject project, IPath modelPath)
- {
- if (_isWebProject)
- {
- IFolder webContentFolder = WebrootUtil.getWebContentFolder(project);
- Assert
- .isTrue(webContentFolder != null
- && webContentFolder.exists());
-
- IPath relativePath = modelPath;
- if (webContentFolder.getFullPath().isPrefixOf(modelPath)) {
- relativePath = modelPath.removeFirstSegments(webContentFolder
- .getFullPath().segmentCount());
- }
-
-
- return FacesConfigArtifactEdit
- .getFacesConfigArtifactEditForWrite(project, relativePath
- .toString());
- }
-
- return null;
- }
- }
-
- abstract static class ModelLoaderComplete implements Runnable
- {
- private FacesConfigArtifactEdit _edit;
-
- private void setFacesConfigArtifactEdit(FacesConfigArtifactEdit edit)
- {
- _edit = edit;
- }
-
- public final void run()
- {
- assertOnDisplayThread();
- doRun(_edit);
- }
-
- /**
- * Called by the runnable. Implementer should _not_ cache the edit variable
- * edit may be null
- *
- * @param edit
- */
- protected abstract void doRun(FacesConfigArtifactEdit edit);
- }
-
- private static void assertOnDisplayThread()
- {
- if (Thread.currentThread() != PlatformUI.getWorkbench().getDisplay().getThread())
- {
- throw new IllegalStateException("ModelLoaderComplete must be called on the UI thread"); //$NON-NLS-1$
- }
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/MultiPageEditorOutlinePage.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/MultiPageEditorOutlinePage.java
deleted file mode 100644
index d9110dd..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/MultiPageEditorOutlinePage.java
+++ /dev/null
@@ -1,706 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.jsf.facesconfig.ui;
-
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Set;
-
-import org.eclipse.core.runtime.ListenerList;
-import org.eclipse.core.runtime.SafeRunner;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.util.SafeRunnable;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.ISelectionProvider;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jst.jsf.common.ui.internal.logging.Logger;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.CTabFolder;
-import org.eclipse.swt.custom.CTabItem;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.ui.IActionBars;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.SubActionBars;
-import org.eclipse.ui.part.EditorPart;
-import org.eclipse.ui.part.IPage;
-import org.eclipse.ui.part.IPageBookViewPage;
-import org.eclipse.ui.part.IPageSite;
-import org.eclipse.ui.part.MessagePage;
-import org.eclipse.ui.part.MultiPageEditorPart;
-import org.eclipse.ui.part.Page;
-import org.eclipse.ui.part.PageBook;
-import org.eclipse.ui.views.contentoutline.IContentOutlinePage;
-
-/**
- * @author Xiao-guang Zhang
- *
- * The outline page class for mulitPage Editorpart.
- */
-public class MultiPageEditorOutlinePage extends Page implements
- IContentOutlinePage, SelectionListener {
- /** log instance */
- private static final Logger log = EditorPlugin
- .getLogger(MultiPageEditorOutlinePage.class);
-
- /**
- * Selection change listeners.
- */
- private ListenerList selectionChangedListeners = new ListenerList(ListenerList.IDENTITY);
-
- /** the pagebook */
- private PageBook pageBook = null;
-
- /**
- * Selection change listener to listen for page selection changes
- */
- private ISelectionChangedListener selectionChangedListener = new ISelectionChangedListener() {
- public void selectionChanged(SelectionChangedEvent event) {
- pageSelectionChanged(event);
- }
- };
-
- /**
- * A data structure used to store the information about a single page within
- * a MultiPageEditorOutlinePage
- */
- protected static class PageRec {
-
- /**
- * The part including editorpart, or Control
- */
- public IWorkbenchPart part;
-
- /**
- * The page.
- */
- public IPage page;
-
- /**
- * The page's action bars
- */
- public SubActionBars subActionBars;
-
- /**
- * Creates a new page record initialized to the given part and page.
- *
- * @param part
- * @param page
- */
- public PageRec(IWorkbenchPart part, IPage page) {
- this.part = part;
- this.page = page;
- }
-
- /**
- * Disposes of this page record by <code>null</code>ing its fields.
- */
- public void dispose() {
- part = null;
- page = null;
- }
- }
-
- /**
- * The page record for the default page.
- */
- private PageRec defaultPageRec;
-
- /**
- * Map from parts to part records (key type: <code>IWorkbenchPart</code>;
- * value type: <code>PartRec</code>).
- */
- private Map mapPartToRec = new HashMap();
-
- /**
- * Map from pages to view sites Note that view sites were not added to page
- * recs to avoid breaking binary compatibility with previous builds
- */
- private Map mapPageToSite = new HashMap();
-
- /**
- * The page rec which provided the current page or <code>null</code>
- */
- private PageRec activeRec;
-
- /**
- * the container composite control of MutliPageEditorPart
- */
- private CTabFolder tabFolder;
-
- /**
- * Creates a new MultiPageEditorOutlinePage instance.
- *
- *
- */
- public MultiPageEditorOutlinePage() {
- super();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.ui.part.Page#createControl(org.eclipse.swt.widgets.Composite)
- */
- public void createControl(Composite parent) {
- // pagebook
- pageBook = new PageBook(parent, SWT.NONE);
-
- // Create the default page rec.
- IPage defaultPage = createDefaultPage(pageBook);
- defaultPageRec = new PageRec(null, defaultPage);
- preparePage(defaultPageRec);
-
- // Show the default page
- showPageRec(defaultPageRec);
-
- // get the tab control and add the page selection listener.
- if (getContainerForMultiPageEditorPart() != null) {
- getContainerForMultiPageEditorPart().addSelectionListener(this);
- }
-
- // show the activate part page.
- showBootstrapPart();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see Page#dispose()
- */
- public void dispose() {
- // Deref all of the pages.
- activeRec = null;
- if (defaultPageRec != null) {
- // check for null since the default page may not have
- // been created (ex. perspective never visible)
- defaultPageRec.page.dispose();
- defaultPageRec = null;
- }
- Map clone = (Map) ((HashMap) mapPartToRec).clone();
- Iterator iterator = clone.values().iterator();
- while (iterator.hasNext()) {
- PageRec rec = (PageRec) iterator.next();
- removePage(rec);
- }
-
- // important: always call super implementation of dispose
- super.dispose();
- }
-
- /**
- * Creates and returns the default page for this view.
- *
- * @param book -
- * the pagebook control
- * @return - the default page
- */
- protected IPage createDefaultPage(PageBook book) {
- // Message to show on the default page
- String defaultText = EditorMessages.MultiPageEditorOutlinePage_noOutline;
-
- MessagePage page = new MessagePage();
- initPage(page);
- page.createControl(book);
- page.setMessage(defaultText);
- return page;
- }
-
- /**
- * Prepares the page in the given page rec for use in this view.
- *
- * @param rec -
- * the page rec
- */
- private void preparePage(PageRec rec) {
- IPageSite site = null;
-
- if (!doesPageExist(rec.page)) {
- if (rec.page instanceof IPageBookViewPage) {
- site = ((IPageBookViewPage) rec.page).getSite();
- }
- if (site == null) {
- // We will create a site for our use
- site = new SubPageSite(getSite());
- }
- mapPageToSite.put(rec.page, site);
-
- rec.subActionBars = (SubActionBars) site.getActionBars();
- // rec.subActionBars.addPropertyChangeListener(actionBarPropListener);
- // for backward compability with IPage
- rec.page.setActionBars(rec.subActionBars);
-
- } else {
- site = (IPageSite) mapPageToSite.get(rec.page);
- rec.subActionBars = (SubActionBars) site.getActionBars();
- }
- }
-
- /**
- * Returns the currently visible page for this view or <code>null</code>
- * if no page is currently visible.
- *
- * @return the currently visible page
- */
- public IPage getCurrentPage() {
- if (activeRec == null)
- return null;
- return activeRec.page;
- }
-
- /**
- * Returns the view site for the given page of this view.
- *
- * @param page
- * the page
- * @return the corresponding site, or <code>null</code> if not found
- */
- protected SubPageSite getPageSite(IPage page) {
- return (SubPageSite) mapPageToSite.get(page);
- }
-
- /**
- * Shows page contained in the given page record in this view. The page
- * record must be one from this pagebook view.
- * <p>
- * The <code>PageBookView</code> implementation of this method asks the
- * pagebook control to show the given page's control, and records that the
- * given page is now current. Subclasses may extend.
- * </p>
- *
- * @param pageRec
- * the page record containing the page to show
- */
- protected void showPageRec(PageRec pageRec) {
- IPageSite pageSite = getPageSite(pageRec.page);
- ISelectionProvider provider = pageSite.getSelectionProvider();
- if (provider == null && (pageRec.page instanceof IContentOutlinePage)) {
- // This means that the page did not set a provider during its
- // initialization
- // so for backward compatibility we will set the page itself as the
- // provider.
- pageSite.setSelectionProvider((IContentOutlinePage) pageRec.page);
- }
-
- // If already showing do nothing
- if (activeRec == pageRec) {
- return;
- }
- // If the page is the same, just set activeRec to pageRec
- if (activeRec != null && pageRec != null
- && activeRec.page == pageRec.page) {
- activeRec = pageRec;
- return;
- }
-
- // Hide old page.
- if (activeRec != null) {
- activeRec.subActionBars.deactivate();
- // remove our selection listener
- provider = ((SubPageSite) mapPageToSite.get(activeRec.page))
- .getSelectionProvider();
- if (provider != null) {
- provider
- .removeSelectionChangedListener(selectionChangedListener);
- }
- }
- // Show new page.
- activeRec = pageRec;
- Control pageControl = activeRec.page.getControl();
- if (pageControl != null && !pageControl.isDisposed()) {
- // Verify that the page control is not disposed
- // If we are closing, it may have already been disposed
- pageBook.showPage(pageControl);
- activeRec.subActionBars.activate();
- refreshGlobalActionHandlers();
- // add our selection listener
- provider = ((SubPageSite) mapPageToSite.get(activeRec.page))
- .getSelectionProvider();
- if (provider != null) {
- provider.addSelectionChangedListener(selectionChangedListener);
- }
- // Update action bars.
- getSite().getActionBars().updateActionBars();
- }
- }
-
- /**
- * Refreshes the global actions for the active page.
- */
- private void refreshGlobalActionHandlers() {
- // Clear old actions.
- IActionBars bars = getSite().getActionBars();
- bars.clearGlobalActionHandlers();
-
- // Set new actions.
- Map newActionHandlers = activeRec.subActionBars
- .getGlobalActionHandlers();
- if (newActionHandlers != null) {
- Set keys = newActionHandlers.entrySet();
- Iterator iter = keys.iterator();
- while (iter.hasNext()) {
- Map.Entry entry = (Map.Entry) iter.next();
- bars.setGlobalActionHandler((String) entry.getKey(),
- (IAction) entry.getValue());
- }
- }
- }
-
- /**
- * Creates a page for a given part. Adds it to the pagebook but does not
- * show it.
- *
- * @param part
- * The part we are making a page for.
- * @return IWorkbenchPart
- */
- private PageRec createPage(IWorkbenchPart part) {
- PageRec rec = doCreatePage(part);
- if (rec != null) {
- mapPartToRec.put(part, rec);
- preparePage(rec);
- }
- return rec;
- }
-
- /*
- * (non-Javadoc) Method declared on PageBookView.
- */
- private PageRec doCreatePage(IWorkbenchPart part) {
- // Try to get an outline page.
- Object obj = part.getAdapter(IContentOutlinePage.class);
- if (obj instanceof IContentOutlinePage) {
- IContentOutlinePage page = (IContentOutlinePage) obj;
- if (page instanceof IPageBookViewPage) {
- initPage((IPageBookViewPage) page);
- }
- page.createControl(getPageBook());
- return new PageRec(part, page);
- }
- // There is no content outline
- return null;
- }
-
- /**
- * Returns the pagebook control for this view.
- *
- * @return the pagebook control, or <code>null</code> if not initialized
- */
- protected PageBook getPageBook() {
- return pageBook;
- }
-
- /**
- * Returns the page record for the given part.
- *
- * @param part
- * the part
- * @return the corresponding page record, or <code>null</code> if not
- * found
- */
- protected PageRec getPageRec(Object part) {
- return (PageRec) mapPartToRec.get(part);
- }
-
- /**
- * Initializes the given page with a page site.
- * <p>
- * Subclasses should call this method after the page is created but before
- * creating its controls.
- * </p>
- * <p>
- * Subclasses may override
- * </p>
- *
- * @param page
- * The page to initialize
- */
- protected void initPage(IPageBookViewPage page) {
- try {
- page.init(new SubPageSite(getSite()));
- } catch (PartInitException e) {
- log.error(e.getMessage());
- }
- }
-
- /**
- * Shows a page for the active workbench part.
- */
- private void showBootstrapPart() {
- IWorkbenchPart part = getBootstrapPart();
- if (part != null) {
- partActivated(part);
- }
- }
-
- /**
- * Returns the active, important workbench part for this view.
- *
- * @return the active important part, or <code>null</code> if none
- */
- private IWorkbenchPart getBootstrapPart() {
- IWorkbenchPage page = getSite().getPage();
- if (page != null
- && page.getActiveEditor() instanceof MultiPageEditorPart) {
- // get active editor of mutli-page editor.
- return (IWorkbenchPart) page.getActiveEditor().getAdapter(
- IEditorPart.class);
- }
- return null;
- }
-
- /**
- * This method shows the page when the given part is activated. Subclasses
- * may extend.
- */
- private void partActivated(IWorkbenchPart part) {
- // Is this an important part? If not just return.
- if (!isImportant(part)) {
- return;
- }
-
- // Create a page for the part.
- PageRec rec = getPageRec(part);
- if (rec == null) {
- rec = createPage(part);
- }
-
- // Show the page.
- if (rec != null) {
- showPageRec(rec);
- } else {
- showPageRec(defaultPageRec);
- }
- }
-
- /**
- * Returns true if the page has already been created.
- *
- * @param page
- * the page to test
- * @return true if this page has already been created.
- */
- private boolean doesPageExist(IPage page) {
- return mapPageToSite.containsKey(page);
- }
-
- /**
- * Returns whether the given part should be added to this view.
- *
- * @param part
- * the input part
- * @return <code>true</code> if the part is relevant, and
- * <code>false</code> otherwise
- */
- protected boolean isImportant(IWorkbenchPart part) {
- // We only care about editors
- return (part instanceof IEditorPart);
- }
-
- /**
- * get the composite control (Container) of source MultiPageEditorPart
- *
- * @return - the composite control (Container)
- */
- private CTabFolder getContainerForMultiPageEditorPart() {
- if (null == tabFolder) {
- tabFolder = ((CTabFolder) (getSite().getPage().getActiveEditor()
- .getAdapter(CTabFolder.class)));
- }
- return tabFolder;
- }
-
- /**
- * Removes a page record. If it is the last reference to the page dispose of
- * it - otherwise just decrement the reference count.
- *
- * @param rec
- */
- private void removePage(PageRec rec) {
- mapPartToRec.remove(rec.part);
- IPageSite site = (IPageSite) mapPageToSite.remove(rec.page);
-
- if (rec.subActionBars != null) {
- rec.subActionBars.dispose();
- }
-
- Control control = rec.page.getControl();
- if (control != null && !control.isDisposed()) {
- // Dispose the page's control so pages don't have to do this in
- // their
- // dispose method.
- // The page's control is a child of this view's control so if this
- // view
- // is closed, the page's control will already be disposed.
- control.dispose();
- }
-
- if (site instanceof SubPageSite) {
- ((SubPageSite) site).dispose();
- }
-
- // free the page
- doDestroyPage(rec.part, rec);
- }
-
- /**
- * Destroys a page in the pagebook for a particular part.
- *
- * @param part
- * the input part
- * @param rec
- * a page record for the part
- */
- protected void doDestroyPage(IWorkbenchPart part, PageRec rec) {
- IContentOutlinePage page = (IContentOutlinePage) rec.page;
- page.dispose();
- rec.dispose();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.ui.part.Page#getControl()
- */
- public Control getControl() {
- return pageBook;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.ui.part.Page#setFocus()
- */
- public void setFocus() {
- if (getControl() != null) {
- getControl().setFocus();
- }
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.ISelectionProvider#addSelectionChangedListener(org.eclipse.jface.viewers.ISelectionChangedListener)
- */
- public void addSelectionChangedListener(ISelectionChangedListener listener) {
- selectionChangedListeners.add(listener);
-
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.ISelectionProvider#getSelection()
- */
- public ISelection getSelection() {
- // get the selection provider from the current page
- IPage currentPage = getCurrentPage();
- // during workbench startup we may be in a state when
- // there is no current page
- if (currentPage == null) {
- return StructuredSelection.EMPTY;
- }
- IPageSite site = getPageSite(currentPage);
- if (site == null) {
- return StructuredSelection.EMPTY;
- }
- ISelectionProvider selProvider = site.getSelectionProvider();
- if (selProvider != null) {
- return selProvider.getSelection();
- }
- return StructuredSelection.EMPTY;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.ISelectionProvider#removeSelectionChangedListener(org.eclipse.jface.viewers.ISelectionChangedListener)
- */
- public void removeSelectionChangedListener(
- ISelectionChangedListener listener) {
- selectionChangedListeners.remove(listener);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.ISelectionProvider#setSelection(org.eclipse.jface.viewers.ISelection)
- */
- public void setSelection(ISelection selection) {
- // get the selection provider from the current page
- IPage currentPage = getCurrentPage();
- // during workbench startup we may be in a state when
- // there is no current page
- if (currentPage == null) {
- return;
- }
- IPageSite site = getPageSite(currentPage);
- if (site == null) {
- return;
- }
- ISelectionProvider selProvider = site.getSelectionProvider();
- // and set its selection
- if (selProvider != null) {
- selProvider.setSelection(selection);
- }
- }
-
- /**
- * The selection has changed. Process the event.
- *
- * @param event
- */
- public void pageSelectionChanged(final SelectionChangedEvent event) {
- // pass on the notification to listeners
- Object[] listeners = selectionChangedListeners.getListeners();
- for (int i = 0; i < listeners.length; ++i) {
- final ISelectionChangedListener l = (ISelectionChangedListener) listeners[i];
- SafeRunner.run(new SafeRunnable() {
- public void run() {
- l.selectionChanged(event);
- }
- });
- }
-
- }
-
- /*
- * (non-Javadoc)
- *
- * @see SelectionListener#widgetSelected(SelectionEvent)
- */
- public void widgetSelected(SelectionEvent e) {
- EditorPart part = (EditorPart) ((CTabItem) e.item).getData();
-
- if (part != null) {
- partActivated(part);
- }
- }
-
- /*
- * (non-Javadoc)
- *
- * @see SelectionListener#widgetDefaultSelected(SelectionEvent)
- */
- public void widgetDefaultSelected(SelectionEvent e) {
- // do nothing: no handling of default selected event
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/MyEditingDomainActionContributor.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/MyEditingDomainActionContributor.java
deleted file mode 100644
index 6c2559a..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/MyEditingDomainActionContributor.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-
-
-package org.eclipse.jst.jsf.facesconfig.ui;
-
-import org.eclipse.emf.edit.domain.IEditingDomainProvider;
-import org.eclipse.emf.edit.ui.action.EditingDomainActionBarContributor;
-import org.eclipse.ui.IActionBars;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.actions.ActionFactory;
-
-/**
- * The action contributor for form based page.
- *
- * @author hmeng
- *
- */
-public class MyEditingDomainActionContributor extends
- EditingDomainActionBarContributor implements INestedActionContributor {
- /**
- * Default constructor
- */
- public MyEditingDomainActionContributor() {
- super();
- }
-
- public void setActiveEditor(IEditorPart part) {
- if (getActiveEditor() != null) {
- deactivate();
- }
- super.setActiveEditor(part);
- IActionBars actionBars = getActionBars();
- actionBars.clearGlobalActionHandlers();
- if (part instanceof IEditingDomainProvider) {
- actionBars.setGlobalActionHandler(ActionFactory.DELETE.getId(),
- deleteAction);
- actionBars.setGlobalActionHandler(ActionFactory.UNDO.getId(),
- undoAction);
- actionBars.setGlobalActionHandler(ActionFactory.REDO.getId(),
- redoAction);
- // actionBars.setGlobalActionHandler(ActionFactory.CUT.getId(),
- // cutAction);
- // actionBars.setGlobalActionHandler(ActionFactory.COPY.getId(),
- // copyAction);
- // actionBars.setGlobalActionHandler(ActionFactory.PASTE.getId(),
- // pasteAction);
- activate();
- }
- }
-
- public void update() {
- if (getActiveEditor() instanceof IEditingDomainProvider) {
- super.update();
- }
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/SubPageSite.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/SubPageSite.java
deleted file mode 100644
index 9b459e8..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/SubPageSite.java
+++ /dev/null
@@ -1,167 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.jsf.facesconfig.ui;
-
-import org.eclipse.core.runtime.Assert;
-import org.eclipse.jface.action.MenuManager;
-import org.eclipse.jface.viewers.ISelectionProvider;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.IActionBars;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.SubActionBars;
-import org.eclipse.ui.part.IPageSite;
-
-/**
- *
- * This implementation of <code>IPageSite</code> provides a site for a sub
- * page within a <code>Page</code>. Most methods are forwarded to the parent
- * page's site.
- *
- * @author Xiao-guang Zhang
- */
-public class SubPageSite implements IPageSite {
-
- /**
- * The "parent" Page site
- */
- private IPageSite parentSite;
-
- /**
- * A selection provider set by the page. Value is <code>null</code> until
- * set.
- */
- private ISelectionProvider selectionProvider;
-
- /**
- * The action bars for this site
- */
- private SubActionBars subActionBars;
-
- /**
- * The list of menu extender for each registered menu.
- */
-// private ArrayList menuExtenders;
-
- /**
- * Creates a new sub page site of the given parent page site.
- *
- * @param parentSite
- * the parent view site
- */
- public SubPageSite(IPageSite parentSite) {
- Assert.isNotNull(parentSite);
- this.parentSite = parentSite;
- subActionBars = new SubActionBars(this.parentSite.getActionBars());
- }
-
- /**
- * Disposes of the menu extender contributions.
- */
- protected void dispose() {
- // if (menuExtenders != null) {
- // for (int i = 0; i < menuExtenders.size(); i++) {
- // ((PopupMenuExtender) menuExtenders.get(i)).dispose();
- // }
- // menuExtenders = null;
- // }
- subActionBars.dispose();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.ui.part.IPageSite#registerContextMenu(java.lang.String,
- * org.eclipse.jface.action.MenuManager,
- * org.eclipse.jface.viewers.ISelectionProvider)
- */
- public void registerContextMenu(String menuId, MenuManager menuManager,
- ISelectionProvider selectionProvider1) {
-
- parentSite.registerContextMenu(menuId, menuManager, selectionProvider1);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.ui.part.IPageSite#getActionBars()
- */
- public IActionBars getActionBars() {
- return subActionBars;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.ui.IWorkbenchSite#getPage()
- */
- public IWorkbenchPage getPage() {
- return parentSite.getPage();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.ui.IWorkbenchSite#getSelectionProvider()
- */
- public ISelectionProvider getSelectionProvider() {
- return selectionProvider;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.ui.IWorkbenchSite#getShell()
- */
- public Shell getShell() {
- return parentSite.getShell();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.ui.IWorkbenchSite#getWorkbenchWindow()
- */
- public IWorkbenchWindow getWorkbenchWindow() {
- return parentSite.getWorkbenchWindow();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.ui.IWorkbenchSite#setSelectionProvider(org.eclipse.jface.viewers.ISelectionProvider)
- */
- public void setSelectionProvider(ISelectionProvider provider) {
- selectionProvider = provider;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.core.runtime.IAdaptable#getAdapter(java.lang.Class)
- */
- public Object getAdapter(Class adapter) {
- return parentSite.getAdapter(adapter);
- }
-
- public Object getService(Class api) {
- // TODO Auto-generated method stub
- return null;
- }
-
- public boolean hasService(Class api) {
- // TODO Auto-generated method stub
- return false;
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/dialog/AddEditAttributeDialog.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/dialog/AddEditAttributeDialog.java
deleted file mode 100644
index 5017085..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/dialog/AddEditAttributeDialog.java
+++ /dev/null
@@ -1,269 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui.dialog;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jst.jsf.common.ui.internal.dialogfield.ClassButtonDialogField;
-import org.eclipse.jst.jsf.common.ui.internal.dialogfield.LayoutUtil;
-import org.eclipse.jst.jsf.common.ui.internal.dialogfield.StringDialogField;
-import org.eclipse.jst.jsf.facesconfig.ui.EditorMessages;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.TabFolder;
-import org.eclipse.swt.widgets.TabItem;
-
-/**
- * The dialog is for adding and editing attribute.
- *
- * @author sfshi
- *
- */
-public class AddEditAttributeDialog extends Dialog {
-
- private static final int MIN_DIALOG_WIDTH = 300;
-
- private StringDialogField attributeNameField;
-
- private ClassButtonDialogField attributeClassField;
-
- private StringDialogField defaultValueField;
-
- private StringDialogField suggestedValueField;
-
- private IProject project;
-
- private String attributeName;
-
- private String attributeClass;
-
- private String defaultValue;
-
- private String suggestedValue;
-
- private boolean isNew;
-
- /**
- * @param parentShell
- * @param isNew
- */
- public AddEditAttributeDialog(Shell parentShell, boolean isNew) {
- super(parentShell);
- this.isNew = isNew;
- }
-
- /**
- *
- * @param parentShell
- * @param attributeName
- * @param attributeClass
- * @param defaultValue
- * @param suggestedValue
- */
- public AddEditAttributeDialog(Shell parentShell, String attributeName,
- String attributeClass, String defaultValue, String suggestedValue) {
- super(parentShell);
- this.attributeName = attributeName;
- this.attributeClass = attributeClass;
- this.defaultValue = defaultValue;
- this.suggestedValue = suggestedValue;
- this.isNew = false;
- }
-
- /*
- * @see org.eclipse.jface.window.Window#configureShell(org.eclipse.swt.widgets.Shell)
- */
- protected void configureShell(Shell newShell) {
- super.configureShell(newShell);
- if (isNew)
- newShell.setText(EditorMessages.AttributeSection_Dialog_Title_Add);
- else
- newShell
- .setText(EditorMessages.AttributeSection_Dialog_Title_Edit);
- }
-
- /*
- * @see org.eclipse.jface.dialogs.Dialog#createDialogArea(org.eclipse.swt.widgets.Composite)
- */
- protected Control createDialogArea(Composite parent) {
- Composite container = new Composite(parent, SWT.FILL);
- GridLayout layout = new GridLayout();
- layout.numColumns = 2;
- layout.marginWidth = layout.marginHeight = 5;
- container.setLayout(layout);
- GridData gd = new GridData(GridData.FILL_BOTH);
- container.setLayoutData(gd);
-
- TabFolder tabFolder = new TabFolder(container, SWT.FILL);
- tabFolder.setLayoutData(gd);
- TabItem generalTabItem = new TabItem(tabFolder, SWT.NONE);
- generalTabItem
- .setText(EditorMessages.AttributeSection_Dialog_Tab_General);
- Control control = createGeneralTabControl(generalTabItem.getParent());
- generalTabItem.setControl(control);
- return container;
- }
-
- /**
- * @param parent
- * @return
- */
- private Control createGeneralTabControl(Composite parent) {
- Composite composite = new Composite(parent, SWT.NONE);
- GridLayout layout = new GridLayout();
- layout.numColumns = 5;
- composite.setLayout(layout);
- GridData gd = new GridData(GridData.FILL_BOTH);
- composite.setLayoutData(gd);
- composite.setFont(parent.getFont());
-
- attributeNameField = new StringDialogField();
-// attributeNameField.setRequired(true);
- attributeNameField
- .setLabelText(EditorMessages.AttributeSection_Dialog_AttributeName);
-
- attributeClassField = new ClassButtonDialogField(getProject());
-// attributeClassField.setRequired(true);
- attributeClassField
- .setLabelText(EditorMessages.AttributeSection_Dialog_AttributeClass);
-
- attributeClassField.setAutoOpenResource(false);
-
- defaultValueField = new StringDialogField();
- defaultValueField
- .setLabelText(EditorMessages.AttributeSection_Dialog_DefaultValue);
-
- suggestedValueField = new StringDialogField();
- suggestedValueField
- .setLabelText(EditorMessages.AttributeSection_Dialog_SuggestedValue);
-
- GridData data = new GridData(GridData.FILL_BOTH);
- composite.setLayoutData(data);
-
- int numberOfColumns = 4;
- GridLayout gl = new GridLayout(numberOfColumns, false);
- composite.setLayout(gl);
-
- attributeNameField.doFillIntoGrid(null, composite, numberOfColumns);
-
- attributeClassField.doFillIntoGrid(null, composite, numberOfColumns);
-
- defaultValueField.doFillIntoGrid(null, composite, numberOfColumns);
-
- suggestedValueField.doFillIntoGrid(null, composite, numberOfColumns);
-
- LayoutUtil.setHorizontalGrabbing(attributeClassField.getTextControl(
- null, composite));
-
- // set the initial value for these fields.
- attributeNameField.setText(attributeName);
- attributeClassField.setText(attributeClass);
- defaultValueField.setText(defaultValue);
- suggestedValueField.setText(suggestedValue);
-
- return composite;
- }
-
- /*
- * @see org.eclipse.jface.window.Window#getInitialSize()
- */
- protected Point getInitialSize() {
- Point shellSize = super.getInitialSize();
- return new Point(Math.max(
- convertHorizontalDLUsToPixels(MIN_DIALOG_WIDTH), shellSize.x),
- shellSize.y);
- }
-
- private IProject getProject() {
- return project;
- }
-
- /**
- *
- */
- protected void okPressed() {
- attributeName = attributeNameField.getText();
- attributeClass = attributeClassField.getText();
- defaultValue = defaultValueField.getText();
- suggestedValue = suggestedValueField.getText();
-
- super.okPressed();
- }
-
- /**
- * @return the attribute class
- */
- public String getAttributeClass() {
- return attributeClass;
- }
-
- /**
- * @param attributeClass
- */
- public void setAttributeClass(String attributeClass) {
- this.attributeClass = attributeClass;
- }
-
- /**
- * @return the attribute name
- */
- public String getAttributeName() {
- return attributeName;
- }
-
- /**
- * @param attributeName
- */
- public void setAttributeName(String attributeName) {
- this.attributeName = attributeName;
- }
-
- /**
- * @return the default value
- */
- public String getDefaultValue() {
- return defaultValue;
- }
-
- /**
- * @param defaultValue
- */
- public void setDefaultValue(String defaultValue) {
- this.defaultValue = defaultValue;
- }
-
- /**
- * @return the suggested value
- */
- public String getSuggestedValue() {
- return suggestedValue;
- }
-
- /**
- * @param suggestedValue
- */
- public void setSuggestedValue(String suggestedValue) {
- this.suggestedValue = suggestedValue;
- }
-
- /**
- * @param project
- */
- public void setProject(IProject project) {
- this.project = project;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/dialog/AddEditFacetDialog.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/dialog/AddEditFacetDialog.java
deleted file mode 100644
index d0df52d..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/dialog/AddEditFacetDialog.java
+++ /dev/null
@@ -1,226 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui.dialog;
-
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jst.jsf.common.ui.internal.dialogfield.LayoutUtil;
-import org.eclipse.jst.jsf.common.ui.internal.dialogfield.StringDialogField;
-import org.eclipse.jst.jsf.facesconfig.ui.EditorMessages;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.TabFolder;
-import org.eclipse.swt.widgets.TabItem;
-
-/**
- * The dialog is for adding and editing a facet.
- *
- * @author sfshi
- *
- */
-public class AddEditFacetDialog extends Dialog {
-
- private StringDialogField facetNameField;
-
- private StringDialogField displayNameField;
-
- private StringDialogField descriptionField;
-
- private boolean isNew;
-
- private static final int MIN_DIALOG_WIDTH = 300;
-
- private String facetName;
-
- private String displayName;
-
- private String description;
-
- /**
- * Constructor of this dialog, could be used for adding and editing, usually
- * it is used for adding;
- *
- * @param parentShell
- * @param isNew
- * whether this dialog is used for create a new facet or not;
- */
- public AddEditFacetDialog(Shell parentShell, boolean isNew) {
- super(parentShell);
- this.isNew = isNew;
- }
-
- /**
- * Usually this contructor is used for editing a facet, passing the original
- * values of facet here.
- *
- * @param parentShell
- * @param facetName
- * the original text value of facet-name element;
- * @param displayName
- * the original text value of display-name element;
- * @param description
- * the original text value of description element;
- */
- public AddEditFacetDialog(Shell parentShell, String facetName,
- String displayName, String description) {
- super(parentShell);
- this.facetName = facetName;
- this.displayName = displayName;
- this.description = description;
- this.isNew = false;
- }
-
- /*
- * @see org.eclipse.jface.window.Window#configureShell(org.eclipse.swt.widgets.Shell)
- */
- protected void configureShell(Shell newShell) {
- super.configureShell(newShell);
- if (isNew)
- newShell.setText(EditorMessages.FacetSection_Dialog_Title_Add);
- else
- newShell.setText(EditorMessages.FacetSection_Dialog_Title_Edit);
- }
-
- /*
- * @see org.eclipse.jface.dialogs.Dialog#createDialogArea(org.eclipse.swt.widgets.Composite)
- */
- protected Control createDialogArea(Composite parent) {
- Composite container = new Composite(parent, SWT.FILL);
- GridLayout layout = new GridLayout();
- layout.numColumns = 2;
- layout.marginWidth = layout.marginHeight = 5;
- container.setLayout(layout);
- GridData gd = new GridData(GridData.FILL_BOTH);
- container.setLayoutData(gd);
-
- TabFolder tabFolder = new TabFolder(container, SWT.FILL);
- tabFolder.setLayoutData(gd);
- TabItem generalTabItem = new TabItem(tabFolder, SWT.NONE);
- generalTabItem.setText(EditorMessages.FacetSection_Dialog_Tab_General);
- Control control = createGeneralTabControl(generalTabItem.getParent());
- generalTabItem.setControl(control);
- return container;
- }
-
- /**
- * @param parent
- * @return
- */
- private Control createGeneralTabControl(Composite parent) {
- Composite composite = new Composite(parent, SWT.NONE);
- GridLayout layout = new GridLayout();
- layout.numColumns = 5;
- composite.setLayout(layout);
- GridData gd = new GridData(GridData.FILL_BOTH);
- composite.setLayoutData(gd);
- composite.setFont(parent.getFont());
-
- facetNameField = new StringDialogField();
-// facetNameField.setRequired(true);
- facetNameField
- .setLabelText(EditorMessages.FacetSection_Dialog_FacetName);
-
- displayNameField = new StringDialogField();
- displayNameField
- .setLabelText(EditorMessages.FacetSection_Dialog_DisplayName);
-
- descriptionField = new StringDialogField();
- descriptionField
- .setLabelText(EditorMessages.FacetSection_Dialog_Description);
-
- GridData data = new GridData(GridData.FILL_BOTH);
- composite.setLayoutData(data);
-
- int numberOfColumns = 4;
- GridLayout gl = new GridLayout(numberOfColumns, false);
- composite.setLayout(gl);
-
- facetNameField.doFillIntoGrid(null, composite, numberOfColumns);
- displayNameField.doFillIntoGrid(null, composite, numberOfColumns);
-
- descriptionField.doFillIntoGrid(null, composite, numberOfColumns);
-
- LayoutUtil.setHorizontalGrabbing(facetNameField.getTextControl(null,
- composite));
-
- // set the initial value for these fields.
- facetNameField.setText(facetName);
- displayNameField.setText(displayName);
- descriptionField.setText(description);
-
- return composite;
- }
-
- /*
- * @see org.eclipse.jface.window.Window#getInitialSize()
- */
- protected Point getInitialSize() {
- Point shellSize = super.getInitialSize();
- return new Point(Math.max(
- convertHorizontalDLUsToPixels(MIN_DIALOG_WIDTH), shellSize.x),
- shellSize.y);
- }
-
- protected void okPressed() {
- facetName = facetNameField.getText();
- displayName = displayNameField.getText();
- description = descriptionField.getText();
- super.okPressed();
- }
-
- /**
- * @return the description
- */
- public String getDescription() {
- return description;
- }
-
- /**
- * @return the display name
- */
- public String getDisplayName() {
- return displayName;
- }
-
- /**
- * @return the facet name
- */
- public String getFacetName() {
- return facetName;
- }
-
- /**
- * @param description
- */
- public void setDescription(String description) {
- this.description = description;
- }
-
- /**
- * @param displayName
- */
- public void setDisplayName(String displayName) {
- this.displayName = displayName;
- }
-
- /**
- * @param facetName
- */
- public void setFacetName(String facetName) {
- this.facetName = facetName;
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/dialog/AddEditManagedPropertyDialog.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/dialog/AddEditManagedPropertyDialog.java
deleted file mode 100644
index b54adc4..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/dialog/AddEditManagedPropertyDialog.java
+++ /dev/null
@@ -1,530 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui.dialog;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.window.Window;
-import org.eclipse.jst.jsf.common.ui.internal.dialogfield.ClassButtonDialogField;
-import org.eclipse.jst.jsf.common.ui.internal.dialogfield.ComboDialogField;
-import org.eclipse.jst.jsf.common.ui.internal.dialogfield.DialogField;
-import org.eclipse.jst.jsf.common.ui.internal.dialogfield.IDialogFieldApplyListener;
-import org.eclipse.jst.jsf.common.ui.internal.dialogfield.IStringButtonAdapter;
-import org.eclipse.jst.jsf.common.ui.internal.dialogfield.LayoutUtil;
-import org.eclipse.jst.jsf.common.ui.internal.dialogfield.StringButtonDialogField;
-import org.eclipse.jst.jsf.facesconfig.emf.FacesConfigFactory;
-import org.eclipse.jst.jsf.facesconfig.emf.ListEntriesType;
-import org.eclipse.jst.jsf.facesconfig.emf.ManagedBeanType;
-import org.eclipse.jst.jsf.facesconfig.emf.ManagedPropertyType;
-import org.eclipse.jst.jsf.facesconfig.emf.MapEntriesType;
-import org.eclipse.jst.jsf.facesconfig.ui.EditorMessages;
-import org.eclipse.jst.jsf.facesconfig.ui.EditorPlugin;
-import org.eclipse.jst.jsf.facesconfig.ui.IFacesConfigConstants;
-import org.eclipse.jst.jsf.facesconfig.ui.section.AbstractFacesConfigSection;
-import org.eclipse.jst.jsf.facesconfig.ui.util.JavaBeanProperty;
-import org.eclipse.jst.jsf.facesconfig.ui.util.JavaBeanUtils;
-import org.eclipse.jst.jsf.facesconfig.ui.util.JavaClassUtils;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Shell;
-
-/**
- * The dialog is for adding and editing managed property.
- *
- * @author sfshi
- *
- */
-public class AddEditManagedPropertyDialog extends Dialog {
-
- private static final int MIN_DIALOG_WIDTH = 300;
-
- private static final int DEFAULT_CONTROL_WIDTH = 200;
-
- private ComboDialogField nameField;
-
- private ClassButtonDialogField classField;
-
- private ComboDialogField valueTypeField;
-
- private StringButtonDialogField valueField;
-
- private IProject project;
-
- private String propertyName;
-
- private String propertyClass;
-
- private String valueType;
-
- /**
- * the value could be a string, or instance of <code>NullValueType</code>,
- * <code>MapEntriesType</code> and <code>ListEntriesType</code>.
- */
- private Object valueObject;
-
- private ManagedBeanType managedBean;
-
- /**
- * the list of this bean properties.
- */
- private List beanPropertyList;
-
- /**
- * the managed-property object that is editing, but it will be read-only.
- */
- private ManagedPropertyType managedProperty;
-
- // private FormToolkit toolkit;
-
- private Composite parent;
-
- private static final String[] valueTypes = { IFacesConfigConstants.VALUE,
- IFacesConfigConstants.NULL_VALUE,
- IFacesConfigConstants.MAP_ENTRIES,
- IFacesConfigConstants.LIST_ENTRIES };
-
- private boolean isNew;
-
- private AbstractFacesConfigSection section;
-
- /**
- * constructor for adding a managed property.
- *
- * @param parentShell
- * @param managedBean
- * @param section
- */
- public AddEditManagedPropertyDialog(Shell parentShell,
- ManagedBeanType managedBean, AbstractFacesConfigSection section) {
- super(parentShell);
- this.isNew = true;
- this.managedBean = managedBean;
- this.section = section;
- }
-
- /**
- *
- * @param parentShell
- * @param managedProperty
- * @param section
- */
- public AddEditManagedPropertyDialog(Shell parentShell,
- ManagedPropertyType managedProperty, AbstractFacesConfigSection section) {
- super(parentShell);
- this.isNew = false;
- this.managedProperty = managedProperty;
- this.managedBean = (ManagedBeanType) managedProperty.eContainer();
- this.section = section;
- }
-
- /*
- * @see org.eclipse.jface.window.Window#configureShell(org.eclipse.swt.widgets.Shell)
- */
- protected void configureShell(Shell newShell) {
- super.configureShell(newShell);
- if (isNew)
- newShell.setText(EditorMessages.AddEditManagedPropertyDialog_Add);
- else
- newShell.setText(EditorMessages.AddEditManagedPropertyDialog_Edit);
- }
-
- /*
- * @see org.eclipse.jface.dialogs.Dialog#createDialogArea(org.eclipse.swt.widgets.Composite)
- */
- protected Control createDialogArea(Composite parent_) {
- Composite container = new Composite(parent_, SWT.FILL);
- this.parent = container;
- GridLayout layout = new GridLayout();
- layout.numColumns = 2;
- layout.marginWidth = layout.marginHeight = 5;
- container.setLayout(layout);
- GridData gd = new GridData(GridData.FILL_BOTH);
- container.setLayoutData(gd);
-
- nameField = new ComboDialogField(SWT.DROP_DOWN | SWT.READ_ONLY
- | SWT.BORDER);
- nameField.setLabelText(EditorMessages.ManagedBeanPropertyEditDialog_PropertyName);
-
- int propertyCount = 0;
- beanPropertyList = getBeanPropertyList(managedBean);
- if (beanPropertyList != null)
- propertyCount = beanPropertyList.size();
-
- if (propertyCount > 0) {
- String[] propertyNames = new String[propertyCount];
-
- for (int i = 0; i < propertyCount; i++) {
- JavaBeanProperty property = (JavaBeanProperty) beanPropertyList
- .get(i);
- propertyNames[i] = property.getName();
- }
- nameField.setItems(propertyNames);
- }
-
- nameField.setDialogFieldApplyListener(new IDialogFieldApplyListener() {
- public void dialogFieldApplied(DialogField field) {
- handleNameSelection(((ComboDialogField) field).getText());
- }
- });
-
- classField = new ClassButtonDialogField(null);
- classField.setProject(getProject());
- classField.setLabelText(EditorMessages.ManagedBeanPropertyEditDialog_PropertyClass);
-
- valueTypeField = new ComboDialogField(SWT.DROP_DOWN | SWT.READ_ONLY
- | SWT.BORDER);
- valueTypeField.setLabelText(EditorMessages.ManagedBeanPropertyEditDialog_ValueType);
-
- valueTypeField.setItems(valueTypes);
- valueTypeField
- .setDialogFieldApplyListener(new IDialogFieldApplyListener() {
- public void dialogFieldApplied(DialogField field) {
- updateValueStatus();
- }
- });
-
- valueField = new StringButtonDialogField(new IStringButtonAdapter() {
- public void changeControlPressed(DialogField field) {
- handleChangeValue(valueTypeField.getText(),
- ((StringButtonDialogField) field).getText());
- }
-
- });
-
- valueField.setLabelText(EditorMessages.ManagedBeanPropertyEditDialog_Value);
- valueField.setButtonLabel(EditorMessages.UI_Button_Edit_more);
-
- valueField.setDialogFieldApplyListener(new IDialogFieldApplyListener() {
-
- public void dialogFieldApplied(DialogField field) {
- valueObject = ((StringButtonDialogField) field).getText();
-
- }
- });
-
- GridData data = new GridData(GridData.FILL_BOTH);
- container.setLayoutData(data);
-
- int numberOfColumns = 5;
- GridLayout gl = new GridLayout(numberOfColumns, false);
- container.setLayout(gl);
-
- nameField.doFillIntoGrid(null, container, numberOfColumns);
- LayoutUtil.setWidthHint(nameField.getComboControl(null, container),
- DEFAULT_CONTROL_WIDTH);
-
- classField.doFillIntoGrid(null, container, numberOfColumns - 1);
- data = new GridData(SWT.FILL, SWT.CENTER, false, false);
- data.horizontalSpan = 2;
- classField.getChangeControl(null, container).setLayoutData(data);
- LayoutUtil.setWidthHint(classField.getTextControl(null, container),
- DEFAULT_CONTROL_WIDTH);
-
- valueTypeField.doFillIntoGrid(null, container, numberOfColumns);
-
- valueField.doFillIntoGrid(null, container, numberOfColumns);
-
- LayoutUtil.setHorizontalGrabbing(classField.getTextControl(null,
- container));
-
- valueTypeField.selectItem(0);
-
- if (!isNew && managedProperty != null) {
- initFields();
- }
-
- return container;
- }
-
- private void initFields() {
-
- if (managedProperty.getPropertyName() != null)
- nameField.setText(managedProperty.getPropertyName()
- .getTextContent());
-
- if (managedProperty.getPropertyClass() != null)
- classField.setText(managedProperty.getPropertyClass()
- .getTextContent());
-
- if (managedProperty.getValue() != null) {
- valueTypeField.setText(valueTypes[0]);
- valueField.setText(managedProperty.getValue().getTextContent());
- } else if (managedProperty.getNullValue() != null)
- valueTypeField.setText(valueTypes[1]);
- else if (managedProperty.getMapEntries() != null)
- valueTypeField.setText(valueTypes[2]);
- else if (managedProperty.getListEntries() != null)
- valueTypeField.setText(valueTypes[3]);
- else
- valueTypeField.setText(valueTypes[0]);
- updateValueStatus();
- }
-
- /**
- * @param text
- */
- protected void handleNameSelection(String text) {
- int propertyCount = 0;
- if (beanPropertyList != null)
- propertyCount = beanPropertyList.size();
-
- if (propertyCount > 0) {
- for (int i = 0; i < propertyCount; i++) {
- JavaBeanProperty property = (JavaBeanProperty) beanPropertyList
- .get(i);
-
- if (property.getName().equals(text.trim())) {
- classField.setText(property.getQualifiedType());
- break;
- }
- }
- }
-
- }
-
- private void updateValueStatus() {
- if (valueField == null) {
- return;
- }
- valueObject = null;
- if (valueTypeField.getText().equalsIgnoreCase(
- IFacesConfigConstants.NULL_VALUE)) {
- valueField.setEnabled(false);
- valueObject = FacesConfigFactory.eINSTANCE.createNullValueType();
- } else if (valueTypeField.getText().equalsIgnoreCase(
- IFacesConfigConstants.MAP_ENTRIES)
- || valueTypeField.getText().equalsIgnoreCase(
- IFacesConfigConstants.LIST_ENTRIES)) {
- valueField.getTextControl(null, parent).setEditable(false);
- valueField.setEnabled(true);
- } else {
-
- valueObject = valueField.getText(); //Bug 173831
- valueField.getTextControl(null, parent).setEditable(true);
- valueField.setEnabled(true);
- }
- }
-
- /**
- * @param valueType_
- * @param value
- */
- protected void handleChangeValue(String valueType_, String value) {
- if (valueType_.equalsIgnoreCase(IFacesConfigConstants.VALUE)) {
- handleChangeLongStringValue(value);
- } else if (valueType_
- .equalsIgnoreCase(IFacesConfigConstants.MAP_ENTRIES)) {
- handleChangeMapEntries();
- } else if (valueType_
- .equalsIgnoreCase(IFacesConfigConstants.LIST_ENTRIES)) {
- handleChangeListEntries();
- }
- }
-
- /**
- * @param textControl
- */
- private void handleChangeLongStringValue(String value) {
- EditValueDialog valueDialog = new EditValueDialog(EditorPlugin
- .getActiveShell(), value);
- if (valueDialog.open() == Window.OK) {
- valueField.setText((String) valueDialog.getResultData());
- valueObject = valueDialog.getResultData();
- }
- }
-
- /**
- *
- */
- private void handleChangeMapEntries() {
-
- MapEntriesType mapEntries;
-
- if (valueObject instanceof MapEntriesType)
- mapEntries = (MapEntriesType) valueObject;
- else if (isNew || managedProperty.getMapEntries() == null) {
- mapEntries = FacesConfigFactory.eINSTANCE.createMapEntriesType();
- } else {
- mapEntries = EcoreUtil.copy(managedProperty
- .getMapEntries());
- }
-
- EditMapEntriesDialog dialog = new EditMapEntriesDialog(EditorPlugin
- .getActiveShell(), mapEntries, section);
- if (dialog.open() == Dialog.OK) {
- valueObject = dialog.getMapEntries();
- } else {
- //user cancel the dialog, then restore.
- if (!isNew && managedProperty.getMapEntries() != null)
- valueObject = EcoreUtil.copy(managedProperty
- .getMapEntries());
- // else
- // valueObject = null;
- }
- }
-
- private void handleChangeListEntries() {
- ListEntriesType listEntries;
-
- if (valueObject instanceof ListEntriesType)
- listEntries = (ListEntriesType) valueObject;
- else if (isNew || managedProperty.getListEntries() == null) {
- listEntries = FacesConfigFactory.eINSTANCE.createListEntriesType();
- } else {
- listEntries = EcoreUtil.copy(managedProperty
- .getListEntries());
- }
-
- EditListEntriesDialog dialog = new EditListEntriesDialog(EditorPlugin
- .getActiveShell(), listEntries, section);
- if (dialog.open() == Dialog.OK) {
- valueObject = dialog.getListEntries();
- } else {
- //user cancel the dialog, then restore.
- if (!isNew && managedProperty.getListEntries() != null)
- valueObject = EcoreUtil.copy(managedProperty
- .getListEntries());
- // else
- // valueObject = null;
- }
- }
-
- /**
- * Get a list of JavaBeanProperty that from the managed bean class.
- *
- * @return
- */
- private List getBeanPropertyList(ManagedBeanType managedBean_) {
- if (managedBean_.getManagedBeanClass() == null)
- return null;
- String beanClassName = managedBean_.getManagedBeanClass()
- .getTextContent();
- IType classType = JavaClassUtils.getType(getProject(), beanClassName);
- if (classType == null) {
- return null;
- }
- List list = new ArrayList();
- JavaBeanProperty[] properties = JavaBeanUtils
- .getBeanProperties(classType);
- if (properties != null) {
- for (int i = 0; i < properties.length; i++) {
- list.add(properties[i]);
- }
- }
- return list;
- }
-
- /*
- * @see org.eclipse.jface.window.Window#getInitialSize()
- */
- protected Point getInitialSize() {
- Point shellSize = super.getInitialSize();
- return new Point(Math.max(
- convertHorizontalDLUsToPixels(MIN_DIALOG_WIDTH), shellSize.x),
- shellSize.y);
- }
-
- /**
- * @return the project
- */
- public IProject getProject() {
- if (project == null) {
- project = (IProject) section.getPage().getEditor().getAdapter(
- IProject.class);
- }
- return project;
- }
-
- /**
- *
- */
- protected void okPressed() {
- propertyName = nameField.getText();
- propertyClass = classField.getText();
- valueType = valueTypeField.getText();
-
- super.okPressed();
- }
-
- /**
- * @return the property class
- */
- public String getPropertyClass() {
- return propertyClass;
- }
-
- /**
- * @param attributeClass
- */
- public void setAttributeClass(String attributeClass) {
- this.propertyClass = attributeClass;
- }
-
- /**
- * @return the property name
- */
- public String getPropertyName() {
- return propertyName;
- }
-
- /**
- * @param attributeName
- */
- public void setAttributeName(String attributeName) {
- this.propertyName = attributeName;
- }
-
- /**
- * @return the value type
- */
- public String getValueType() {
- return valueType;
- }
-
- /**
- * @param defaultValue
- */
- public void setValueType(String defaultValue) {
- this.valueType = defaultValue;
- }
-
- /**
- * @param project
- */
- public void setProject(IProject project) {
- this.project = project;
- }
-
- /**
- * @return the value object
- */
- public Object getValueObject() {
- return valueObject;
- }
-
- /**
- * @param valueObject
- */
- public void setValueObject(Object valueObject) {
- this.valueObject = valueObject;
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/dialog/AddEditMapEntryDialog.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/dialog/AddEditMapEntryDialog.java
deleted file mode 100644
index fb254fb..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/dialog/AddEditMapEntryDialog.java
+++ /dev/null
@@ -1,255 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui.dialog;
-
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jst.jsf.common.ui.internal.dialogfield.LayoutUtil;
-import org.eclipse.jst.jsf.common.ui.internal.dialogfield.StringDialogField;
-import org.eclipse.jst.jsf.common.ui.internal.guiutils.SWTUtils;
-import org.eclipse.jst.jsf.facesconfig.ui.EditorMessages;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Shell;
-
-/**
- * The dialog is for adding and editing map-entry.
- *
- * @author sfshi
- *
- */
-public class AddEditMapEntryDialog extends Dialog {
-
- private static final int MIN_DIALOG_WIDTH = 300;
-
- private static final int VALUE_DEFAULT_LINENUMS = 10;
-
- private boolean isNew;
-
- private StringDialogField keyField;
-
- private Button nullValueTypeButton;
-
- private StringDialogField valueField;
-
- private String key;
-
- private String value;
-
- private boolean isNullValue;
-
- /**
- * @param parentShell
- * @param isNew
- */
- public AddEditMapEntryDialog(Shell parentShell, boolean isNew) {
- super(parentShell);
- this.isNew = isNew;
- }
-
- /**
- *
- * @param parentShell
- * @param attributeName
- * @param attributeClass
- * @param defaultValue
- * @param suggestedValue
- */
- public AddEditMapEntryDialog(Shell parentShell, String attributeName,
- String attributeClass, String defaultValue, String suggestedValue) {
- super(parentShell);
- this.isNew = false;
- }
-
- /*
- * @see org.eclipse.jface.window.Window#configureShell(org.eclipse.swt.widgets.Shell)
- */
- protected void configureShell(Shell newShell) {
- super.configureShell(newShell);
- if (isNew)
- // TODO change it to "add"
- newShell.setText(EditorMessages.MapEntryEditPage_Title);
- else
- newShell.setText(EditorMessages.MapEntryEditPage_Title);
- }
-
- /*
- * @see org.eclipse.jface.dialogs.Dialog#createDialogArea(org.eclipse.swt.widgets.Composite)
- */
- protected Control createDialogArea(Composite parent) {
- Composite container = new Composite(parent, SWT.FILL);
- GridData gd = new GridData(GridData.FILL_BOTH);
- container.setLayoutData(gd);
-
- GridLayout gl = new GridLayout();
- gl.verticalSpacing = 0;
- gl.numColumns = 1;
- container.setLayout(gl);
-
- layoutKeySection(container);
- layoutValueSection(container);
- if (!isNew) {
- initFields();
- }
- return container;
- }
-
- private void initFields() {
- keyField.setText(key);
- if (this.isNullValue) {
- nullValueTypeButton.setSelection(true);
- valueField.setText(""); //$NON-NLS-1$
- valueField.setEnabled(false);
- } else {
- nullValueTypeButton.setSelection(false);
- valueField.setEnabled(true);
- valueField.setText(value);
- }
- }
-
- /**
- * @param parent
- */
- public void layoutKeySection(Composite parent) {
- keyField = new StringDialogField();
- keyField.setLabelText(EditorMessages.MapEntryEditGroup_Key);
- Composite
-
- keySection = SWTUtils.createComposite(parent, SWT.NONE);
-
- GridData gd = new GridData(GridData.FILL_HORIZONTAL);
- keySection.setLayoutData(gd);
-
- int numberOfColumns = 3;
- GridLayout gl = new GridLayout(numberOfColumns, false);
- keySection.setLayout(gl);
-
- keyField.doFillIntoGrid(null, keySection, numberOfColumns);
-
- LayoutUtil.setGrabHorizontal(keyField.getTextControl(null, keySection),
- true);
-
- }
-
- /**
- * @param parent
- */
- public void layoutValueSection(Composite parent) {
- Composite valueSection = SWTUtils.createComposite(parent, SWT.NONE);
-
- GridData gd = new GridData(GridData.FILL_BOTH);
- valueSection.setLayoutData(gd);
-
- int numberOfColumns = 3;
- GridLayout gl = new GridLayout(numberOfColumns, false);
- gl.verticalSpacing = 10;
- gl.marginHeight = 10;
- valueSection.setLayout(gl);
-
- nullValueTypeButton = SWTUtils.createCheckBox(valueSection,
- EditorMessages.AddEditMapEntryDialog_NullValue, 2);
-
- nullValueTypeButton.addSelectionListener(new SelectionAdapter() {
-
- public void widgetSelected(SelectionEvent e) {
- valueField.setEnabled(!nullValueTypeButton.getSelection());
-
- }
-
- });
- valueField = new StringDialogField(VALUE_DEFAULT_LINENUMS);
-
- valueField.setLabelText(EditorMessages.ValueEditGroup_Value);
- valueField.doFillIntoGrid(null, valueSection, numberOfColumns);
-
- gd = (GridData) valueField.getLabelControl(null, valueSection)
- .getLayoutData();
- gd.verticalAlignment = gd.verticalAlignment | GridData.GRAB_VERTICAL;
- LayoutUtil.setHorizontalGrabbing(valueField.getTextControl(null,
- valueSection));
-
- gd = (GridData) valueField.getTextControl(null, valueSection)
- .getLayoutData();
- gd.verticalAlignment = gd.verticalAlignment | GridData.FILL_VERTICAL;
-
- }
-
- /*
- * @see org.eclipse.jface.window.Window#getInitialSize()
- */
- protected Point getInitialSize() {
- Point shellSize = super.getInitialSize();
- return new Point(Math.max(
- convertHorizontalDLUsToPixels(MIN_DIALOG_WIDTH), shellSize.x),
- shellSize.y);
- }
-
- /**
- *
- */
- protected void okPressed() {
-
- key = this.keyField.getText().trim();
- value = this.valueField.getText().trim();
- isNullValue = nullValueTypeButton.getSelection();
- super.okPressed();
- }
-
- /**
- * @return true if is null
- */
- public boolean isNullValue() {
- return isNullValue;
- }
-
- /**
- * @param isNullValue
- */
- public void setNullValue(boolean isNullValue) {
- this.isNullValue = isNullValue;
- }
-
- /**
- * @return the key
- */
- public String getKey() {
- return key;
- }
-
- /**
- * @param key
- */
- public void setKey(String key) {
- this.key = key;
- }
-
- /**
- * @return the value
- */
- public String getValue() {
- return value;
- }
-
- /**
- * @param value
- */
- public void setValue(String value) {
- this.value = value;
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/dialog/AddEditPropertyDialog.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/dialog/AddEditPropertyDialog.java
deleted file mode 100644
index 432d064..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/dialog/AddEditPropertyDialog.java
+++ /dev/null
@@ -1,270 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui.dialog;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jst.jsf.common.ui.internal.dialogfield.ClassButtonDialogField;
-import org.eclipse.jst.jsf.common.ui.internal.dialogfield.LayoutUtil;
-import org.eclipse.jst.jsf.common.ui.internal.dialogfield.StringDialogField;
-import org.eclipse.jst.jsf.facesconfig.ui.EditorMessages;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.TabFolder;
-import org.eclipse.swt.widgets.TabItem;
-
-/**
- * The dialog is for adding and editing property.
- *
- * @author sfshi
- *
- */
-public class AddEditPropertyDialog extends Dialog {
-
- private static final int MIN_DIALOG_WIDTH = 300;
-
- private StringDialogField propertyNameField;
-
- private ClassButtonDialogField propertyClassField;
-
- private StringDialogField defaultValueField;
-
- private StringDialogField suggestedValueField;
-
- private IProject project;
-
- private boolean isNew;
-
- private String propertyName;
-
- private String propertyClass;
-
- private String defaultValue;
-
- private String suggestedValue;
-
- /**
- *
- * @param parentShell
- * @param isNew
- */
- public AddEditPropertyDialog(Shell parentShell, boolean isNew) {
- super(parentShell);
- this.isNew = isNew;
- }
-
- /**
- *
- * @param parentShell
- * @param propertyName
- * @param propertyClass
- * @param defaultValue
- * @param suggestedValue
- */
- public AddEditPropertyDialog(Shell parentShell, String propertyName,
- String propertyClass, String defaultValue, String suggestedValue) {
- super(parentShell);
- this.propertyName = propertyName;
- this.propertyClass = propertyClass;
- this.defaultValue = defaultValue;
- this.suggestedValue = suggestedValue;
- this.isNew = false;
- }
-
- /*
- * @see org.eclipse.jface.window.Window#configureShell(org.eclipse.swt.widgets.Shell)
- */
- protected void configureShell(Shell newShell) {
- super.configureShell(newShell);
- if (isNew)
- newShell
- .setText(EditorMessages.PropertySection_Dialog_Title_Add);
- else
-
- newShell
- .setText(EditorMessages.PropertySection_Dialog_Title_Edit);
- }
-
- /*
- * @see org.eclipse.jface.dialogs.Dialog#createDialogArea(org.eclipse.swt.widgets.Composite)
- */
- protected Control createDialogArea(Composite parent) {
- Composite container = new Composite(parent, SWT.FILL);
- GridLayout layout = new GridLayout();
- layout.numColumns = 2;
- layout.marginWidth = layout.marginHeight = 5;
- container.setLayout(layout);
- GridData gd = new GridData(GridData.FILL_BOTH);
- container.setLayoutData(gd);
-
- TabFolder tabFolder = new TabFolder(container, SWT.FILL);
- tabFolder.setLayoutData(gd);
- TabItem generalTabItem = new TabItem(tabFolder, SWT.NONE);
- generalTabItem
- .setText(EditorMessages.PropertySection_Dialog_Tab_General);
- Control control = createGeneralTabControl(generalTabItem.getParent());
- generalTabItem.setControl(control);
- return container;
- }
-
- /**
- * @param parent
- * @return
- */
- private Control createGeneralTabControl(Composite parent) {
- Composite composite = new Composite(parent, SWT.NONE);
- GridLayout layout = new GridLayout();
- layout.numColumns = 5;
- composite.setLayout(layout);
- GridData gd = new GridData(GridData.FILL_BOTH);
- composite.setLayoutData(gd);
- composite.setFont(parent.getFont());
-
- propertyNameField = new StringDialogField();
- // propertyNameField.setRequired(true);
- propertyNameField
- .setLabelText(EditorMessages.PropertySection_Dialog_PropertyName);
-
- propertyClassField = new ClassButtonDialogField(getProject());
- // propertyClassField.setRequired(true);
- propertyClassField
- .setLabelText(EditorMessages.PropertySection_Dialog_PropertyClass);
-
- propertyClassField.setAutoOpenResource(false);
-
- defaultValueField = new StringDialogField();
- defaultValueField
- .setLabelText(EditorMessages.PropertySection_Dialog_DefaultValue);
-
- suggestedValueField = new StringDialogField();
- suggestedValueField
- .setLabelText(EditorMessages.PropertySection_Dialog_SuggestedValue);
-
- GridData data = new GridData(GridData.FILL_BOTH);
- composite.setLayoutData(data);
-
- int numberOfColumns = 4;
- GridLayout gl = new GridLayout(numberOfColumns, false);
- composite.setLayout(gl);
-
- propertyNameField.doFillIntoGrid(null, composite, numberOfColumns);
-
- propertyClassField.doFillIntoGrid(null, composite, numberOfColumns);
-
- defaultValueField.doFillIntoGrid(null, composite, numberOfColumns);
-
- suggestedValueField.doFillIntoGrid(null, composite, numberOfColumns);
-
- LayoutUtil.setHorizontalGrabbing(propertyClassField.getTextControl(
- null, composite));
-
- // set the initial value for these fields.
- propertyNameField.setText(propertyName);
- propertyClassField.setText(propertyClass);
- defaultValueField.setText(defaultValue);
- suggestedValueField.setText(suggestedValue);
-
- return composite;
- }
-
- /*
- * @see org.eclipse.jface.window.Window#getInitialSize()
- */
- protected Point getInitialSize() {
- Point shellSize = super.getInitialSize();
- return new Point(Math.max(
- convertHorizontalDLUsToPixels(MIN_DIALOG_WIDTH), shellSize.x),
- shellSize.y);
- }
-
- private IProject getProject() {
- return project;
- }
-
- protected void okPressed() {
- propertyName = propertyNameField.getText();
- propertyClass = propertyClassField.getText();
- defaultValue = defaultValueField.getText();
- suggestedValue = suggestedValueField.getText();
-
- super.okPressed();
- }
-
- /**
- * @return the default value
- */
- public String getDefaultValue() {
- return defaultValue;
- }
-
- /**
- * @param defaultValue
- */
- public void setDefaultValue(String defaultValue) {
- this.defaultValue = defaultValue;
- }
-
- /**
- * @return the property class
- */
- public String getPropertyClass() {
- return propertyClass;
- }
-
- /**
- * @param propertyClass
- */
- public void setPropertyClass(String propertyClass) {
- this.propertyClass = propertyClass;
- }
-
- /**
- * @return the property name
- */
- public String getPropertyName() {
- return propertyName;
- }
-
- /**
- * @param propertyName
- */
- public void setPropertyName(String propertyName) {
- this.propertyName = propertyName;
- }
-
- /**
- * @return the suggested value
- */
- public String getSuggestedValue() {
- return suggestedValue;
- }
-
- /**
- * @param suggestedValue
- */
- public void setSuggestedValue(String suggestedValue) {
- this.suggestedValue = suggestedValue;
- }
-
- /**
- * @param project
- */
- public void setProject(IProject project) {
- this.project = project;
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/dialog/AddEditRendererDialog.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/dialog/AddEditRendererDialog.java
deleted file mode 100644
index 8e40eef..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/dialog/AddEditRendererDialog.java
+++ /dev/null
@@ -1,297 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui.dialog;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jst.jsf.common.ui.internal.dialogfield.ClassButtonDialogField;
-import org.eclipse.jst.jsf.common.ui.internal.dialogfield.DialogField;
-import org.eclipse.jst.jsf.common.ui.internal.dialogfield.IStringButtonAdapter;
-import org.eclipse.jst.jsf.common.ui.internal.dialogfield.LayoutUtil;
-import org.eclipse.jst.jsf.common.ui.internal.dialogfield.StringButtonDialogField;
-import org.eclipse.jst.jsf.common.ui.internal.dialogfield.StringDialogField;
-import org.eclipse.jst.jsf.facesconfig.ui.EditorMessages;
-import org.eclipse.jst.jsf.facesconfig.ui.EditorPlugin;
-import org.eclipse.jst.jsf.facesconfig.ui.IFacesConfigConstants;
-import org.eclipse.jst.jsf.facesconfig.ui.page.IFacesConfigPage;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.TabFolder;
-import org.eclipse.swt.widgets.TabItem;
-
-/**
- * @author Bryan Yang
- *
- */
-public class AddEditRendererDialog extends Dialog {
-
- private static final int MIN_DIALOG_WIDTH = 300;
-
- private StringDialogField rendererNameField;
-
- private ClassButtonDialogField rendererClassField;
-
- private StringButtonDialogField componentFamilyField;
-
- private StringDialogField renderTypeField;
-
- private IProject project;
-
- private String rendererName;
-
- private String rendererClass;
-
- private String componentFamily;
-
- private String rendererType;
-
- private boolean isNew;
-
- private IFacesConfigPage page;
-
- /**
- * @param parentShell
- * @param page
- * @param isNew
- */
- public AddEditRendererDialog(Shell parentShell, IFacesConfigPage page,
- boolean isNew) {
- super(parentShell);
- this.page = page;
- this.isNew = isNew;
- }
-
- /**
- *
- * @param parentShell
- * @param rendererName
- * @param rendererClass
- * @param componentFamily
- * @param renderType
- */
- public AddEditRendererDialog(Shell parentShell, String rendererName,
- String rendererClass, String componentFamily, String renderType) {
- super(parentShell);
- this.rendererName = rendererName;
- this.rendererClass = rendererClass;
- this.componentFamily = componentFamily;
- this.rendererType = renderType;
- this.isNew = false;
- }
-
- /*
- * @see org.eclipse.jface.window.Window#configureShell(org.eclipse.swt.widgets.Shell)
- */
- protected void configureShell(Shell newShell) {
- super.configureShell(newShell);
- if (isNew)
- newShell.setText(EditorMessages.RendererSection_Dialog_Title_Add);
- else
- newShell.setText(EditorMessages.RendererSection_Dialog_Title_Edit);
- }
-
- /*
- * @see org.eclipse.jface.dialogs.Dialog#createDialogArea(org.eclipse.swt.widgets.Composite)
- */
- protected Control createDialogArea(Composite parent) {
- Composite container = new Composite(parent, SWT.FILL);
- GridLayout layout = new GridLayout();
- layout.numColumns = 2;
- layout.marginWidth = layout.marginHeight = 5;
- container.setLayout(layout);
- GridData gd = new GridData(GridData.FILL_BOTH);
- container.setLayoutData(gd);
-
- TabFolder tabFolder = new TabFolder(container, SWT.FILL);
- tabFolder.setLayoutData(gd);
- TabItem generalTabItem = new TabItem(tabFolder, SWT.NONE);
- generalTabItem
- .setText(EditorMessages.RendererSection_Dialog_Tab_General);
- Control control = createGeneralTabControl(generalTabItem.getParent());
- generalTabItem.setControl(control);
- return container;
- }
-
- /**
- * @param parent
- * @return
- */
- private Control createGeneralTabControl(Composite parent) {
- Composite composite = new Composite(parent, SWT.NONE);
- GridLayout layout = new GridLayout();
- layout.numColumns = 5;
- composite.setLayout(layout);
- GridData gd = new GridData(GridData.FILL_BOTH);
- composite.setLayoutData(gd);
- composite.setFont(parent.getFont());
-
- rendererNameField = new StringDialogField();
- rendererNameField
- .setLabelText(EditorMessages.RendererSection_Dialog_DisplayName);
-
- rendererClassField = new ClassButtonDialogField(getProject());
-// rendererClassField.setRequired(true);
- rendererClassField
- .setLabelText(EditorMessages.RendererSection_Dialog_RendererClass);
- rendererClassField.setProject(getProject());
- rendererClassField.setSuperClassName(IFacesConfigConstants.RENDERER_SUPER_CLASS);
- rendererClassField.setAutoOpenResource(false);
-
- componentFamilyField = new StringButtonDialogField(
- new IStringButtonAdapter() {
- public void changeControlPressed(DialogField field) {
- Shell shell = EditorPlugin.getActiveShell();
- ComponentListDialog dialog = new ComponentListDialog(
- shell,
- page,
- page.getInput(),
- EditorMessages.RendererSection_Dialog_ComponentFamilyCaption,
- EditorMessages.RendererSection_Dialog_ComponentFamilyLabel);
- if (dialog.open() == Dialog.OK) {
- componentFamilyField.setText(dialog.getValue());
- }
- }
- });
- componentFamilyField
- .setLabelText(EditorMessages.RendererSection_Dialog_ComponentFamilyValue);
-// componentFamilyField.setRequired(true);
-
- renderTypeField = new StringDialogField();
-// renderTypeField.setRequired(true);
- renderTypeField
- .setLabelText(EditorMessages.RendererSection_Dialog_TypeValue);
-
- GridData data = new GridData(GridData.FILL_BOTH);
- composite.setLayoutData(data);
-
- int numberOfColumns = 4;
- GridLayout gl = new GridLayout(numberOfColumns, false);
- composite.setLayout(gl);
-
- rendererNameField.doFillIntoGrid(null, composite, numberOfColumns);
-
- componentFamilyField.doFillIntoGrid(null, composite, numberOfColumns);
-
- renderTypeField.doFillIntoGrid(null, composite, numberOfColumns);
-
- rendererClassField.doFillIntoGrid(null, composite, numberOfColumns);
-
- LayoutUtil.setHorizontalGrabbing(rendererClassField.getTextControl(
- null, composite));
-
- // set the initial value for these fields.
- rendererNameField.setText(rendererName);
- rendererClassField.setText(rendererClass);
- componentFamilyField.setText(componentFamily);
- renderTypeField.setText(rendererType);
-
- return composite;
- }
-
- /*
- * @see org.eclipse.jface.window.Window#getInitialSize()
- */
- protected Point getInitialSize() {
- Point shellSize = super.getInitialSize();
- return new Point(Math.max(
- convertHorizontalDLUsToPixels(MIN_DIALOG_WIDTH), shellSize.x),
- shellSize.y);
- }
-
- /**
- * @return the associated project
- */
- public IProject getProject() {
- return project;
- }
-
- /**
- *
- */
- protected void okPressed() {
- rendererName = rendererNameField.getText();
- rendererClass = rendererClassField.getText();
- componentFamily = componentFamilyField.getText();
- rendererType = renderTypeField.getText();
-
- super.okPressed();
- }
-
- /**
- * @return the renderer clas
- */
- public String getRendererClass() {
- return rendererClass;
- }
-
- /**
- * @param rendererClass
- */
- public void setRendererClass(String rendererClass) {
- this.rendererClass = rendererClass;
- }
-
- /**
- * @return the renderer name
- */
- public String getRendererName() {
- return rendererName;
- }
-
- /**
- * @param rendererName
- */
- public void setRendererName(String rendererName) {
- this.rendererName = rendererName;
- }
-
- /**
- * @return the component family
- */
- public String getComponentFamily() {
- return componentFamily;
- }
-
- /**
- * @param componentFamily
- */
- public void setComponentFamily(String componentFamily) {
- this.componentFamily = componentFamily;
- }
-
- /**
- * @return the renderer type
- */
- public String getRendererType() {
- return rendererType;
- }
-
- /**
- * @param rendererType
- */
- public void setRendererType(String rendererType) {
- this.rendererType = rendererType;
- }
-
- /**
- * @param project
- */
- public void setProject(IProject project) {
- this.project = project;
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/dialog/CommonListDialog.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/dialog/CommonListDialog.java
deleted file mode 100644
index 5cae0b1..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/dialog/CommonListDialog.java
+++ /dev/null
@@ -1,245 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui.dialog;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.edit.domain.EditingDomain;
-import org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider;
-import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.ISelectionProvider;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.StructuredViewer;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jst.jsf.common.ui.internal.guiutils.SWTUtils;
-import org.eclipse.jst.jsf.facesconfig.ui.page.IFacesConfigPage;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Text;
-
-/**
- * @author Bryan Yang
- *
- */
-public class CommonListDialog extends Dialog implements
- ISelectionChangedListener, ISelectionProvider {
- private static final int MIN_DIALOG_WIDTH = 300;
-
- private Text inputText;
-
- private StructuredViewer structuredViewer;
-
- private String value;
-
- private IFacesConfigPage page;
-
- private Object input;
-
- private String label;
-
- private String caption;
-
- /** The mini width for the text control */
- private static final int TEXT_MINI_WIDTH = 100;
-
- /**
- * @param parentShell
- * @param page
- * @param input
- * @param caption
- * @param label
- */
- protected CommonListDialog(Shell parentShell, IFacesConfigPage page,
- Object input, String caption, String label) {
- super(parentShell);
- this.page = page;
- this.input = input;
- this.label = label;
- this.caption = caption;
- parentShell.setText(caption);
- }
-
- /*
- * @see org.eclipse.jface.window.Window#configureShell(org.eclipse.swt.widgets.Shell)
- */
- protected void configureShell(Shell newShell) {
- super.configureShell(newShell);
- newShell.setText(caption);
- }
-
-
- /*
- * @see org.eclipse.jface.window.Window#getInitialSize()
- */
- protected Point getInitialSize() {
- Point shellSize = super.getInitialSize();
- return new Point(Math.max(
- convertHorizontalDLUsToPixels(MIN_DIALOG_WIDTH), shellSize.x),
- shellSize.y);
- }
-
- /*
- * @see org.eclipse.jface.dialogs.Dialog#createDialogArea(org.eclipse.swt.widgets.Composite)
- */
- protected Control createDialogArea(Composite parent) {
- Composite composite = SWTUtils.createComposite(parent, 1);
-
- SWTUtils.createLabel(composite, label, 1);
-
- inputText = SWTUtils.createTextBox(composite, 1);
- GridData gd = new GridData(GridData.FILL_HORIZONTAL);
- gd.widthHint = TEXT_MINI_WIDTH;
- inputText.setLayoutData(gd);
-
- structuredViewer = createViewer(composite);
- structuredViewer.addSelectionChangedListener(this);
-
- return composite;
- }
-
- /**
- * Create the structured viewer, set up content & label provider for it.
- * Defaultly create a tableviewer.
- *
- * @param parent
- * @return the structured viewer
- */
- protected StructuredViewer createViewer(Composite parent) {
-
- GridData gd = new GridData(GridData.FILL_BOTH);
- gd.heightHint = 200;
- gd.widthHint = 150;
- parent.setLayoutData(gd);
- GridLayout layout = new GridLayout();
- parent.setLayout(layout);
-
- TableViewer tableViewer = new TableViewer(parent, SWT.SINGLE
- | SWT.H_SCROLL | SWT.V_SCROLL);
- gd = new GridData(GridData.FILL_BOTH);
- tableViewer.getControl().setLayoutData(gd);
-
- tableViewer.setContentProvider(new AdapterFactoryContentProvider(
- getAdapterFactory()));
- tableViewer.setLabelProvider(new AdapterFactoryLabelProvider(
- getAdapterFactory()));
- configViewer(tableViewer);
- tableViewer.setInput(input);
-
- return tableViewer;
- }
-
- /**
- * set the structuredViewer's input
- *
- * @param input
- */
- private void setViewerInput(Object input) {
- structuredViewer.setInput(input);
- this.input = input;
- }
-
- /**
- * get the input object of this section.
- * @return the input
- */
- public Object getInput() {
- return input;
- }
-
- /**
- * set input object for this section.
- * @param newInput
- */
- public void setInput(Object newInput) {
- input = newInput;
- setViewerInput(input);
- }
-
- /**
- * Config the viewer, such as set a filter and so on. Sub classes should
- * override this method to add filter.
- *
- * @param structuredViewer_
- */
- protected void configViewer(StructuredViewer structuredViewer_) {
- // do nothing; sub-classes should override
- }
-
- //TODO: why bother with this interface?
- public void selectionChanged(SelectionChangedEvent event) {
- // selectionChanged not handled
-
- }
-
- public void addSelectionChangedListener(ISelectionChangedListener listener) {
- // do nothing; not handling setSelection
- }
-
- public ISelection getSelection() {
- return structuredViewer.getSelection();
- }
-
- public void removeSelectionChangedListener(
- ISelectionChangedListener listener) {
- // do nothing; not handling setSelection
- }
-
- public void setSelection(ISelection selection) {
- // do nothing; not handling change in selection
- }
-
- /**
- * the convenient method to get the AdapterFactory instance of the editor;
- *
- * @return the AdapterFactory instance.
- */
- public AdapterFactory getAdapterFactory() {
- return (AdapterFactory) page.getEditor().getAdapter(
- AdapterFactory.class);
- }
-
- /**
- * the convenient method to get the EditingDomain instance of the editor;
- *
- * @return the EditingDomain instance.
- */
- public EditingDomain getEditingDomain() {
- return (EditingDomain) page.getEditor().getAdapter(EditingDomain.class);
- }
-
- /**
- * @return the value
- */
- public String getValue() {
- return value;
- }
- /**
- * @param value
- */
- public void setValue(String value) {
- this.value = value;
- refresh();
- }
-
- private void refresh()
- {
- inputText.setText(value) ;
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/dialog/ComponentListDialog.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/dialog/ComponentListDialog.java
deleted file mode 100644
index 8c83c04..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/dialog/ComponentListDialog.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui.dialog;
-
-import java.util.Iterator;
-
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.viewers.StructuredViewer;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerFilter;
-import org.eclipse.jst.jsf.facesconfig.emf.ComponentType;
-import org.eclipse.jst.jsf.facesconfig.emf.FacesConfigPackage;
-import org.eclipse.jst.jsf.facesconfig.ui.page.IFacesConfigPage;
-import org.eclipse.swt.widgets.Shell;
-
-/**
- * @author Bryan Yang
- *
- */
-public class ComponentListDialog extends CommonListDialog {
-
- public void selectionChanged(SelectionChangedEvent event) {
- IStructuredSelection ssel = StructuredSelection.EMPTY;
- ISelection selection = getSelection();
- if (selection instanceof IStructuredSelection) {
- ssel = (IStructuredSelection) selection;
- }
-
- if (!ssel.isEmpty()) {
- for (Iterator iter = ssel.iterator(); iter.hasNext();) {
- ComponentType element = (ComponentType) iter.next();
- if (element.getComponentType() != null)
- setValue(element.getComponentType().getTextContent());
- else
- setValue(""); //$NON-NLS-1$
- }
-
- }
- }
-
- /**
- * @param parentShell
- * @param page
- * @param input
- * @param caption
- * @param label
- */
- protected ComponentListDialog(Shell parentShell, IFacesConfigPage page,
- Object input, String caption, String label) {
- super(parentShell, page, input, caption, label);
- }
-
- protected void configViewer(StructuredViewer structuredViewer) {
- super.configViewer(structuredViewer);
- structuredViewer.addFilter(new ViewerFilter() {
- public boolean select(Viewer viewer, Object parentElement,
- Object element) {
- return FacesConfigPackage.eINSTANCE.getComponentType()
- .isInstance(element);
- }
- });
-
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/dialog/DialogUtil.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/dialog/DialogUtil.java
deleted file mode 100644
index 7ced390..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/dialog/DialogUtil.java
+++ /dev/null
@@ -1,151 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui.dialog;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jface.window.Window;
-import org.eclipse.jst.jsf.common.ui.internal.dialogfield.JavaUIHelper;
-import org.eclipse.jst.jsf.facesconfig.emf.FacesConfigType;
-import org.eclipse.jst.jsf.facesconfig.emf.RenderKitIdType;
-import org.eclipse.jst.jsf.facesconfig.emf.RenderKitType;
-import org.eclipse.jst.jsf.facesconfig.ui.EditorMessages;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.dialogs.SelectionDialog;
-
-/**
- * @author Zhi-peng Zhang
- * @version
- */
-public final class DialogUtil {
-
- /**
- * @param shell
- * @param project
- * @param superType
- * @param tyle
- * @return fully qualified class name or null
- */
- public static String openClassDialog(Shell shell, IProject project,
- String superType, int tyle) {
- SelectionDialog dialog = JavaUIHelper
- .openSelectionDialog(shell, project, superType, tyle);
-
- // dialog could be null
- if (dialog != null)
- {
- dialog.setTitle(EditorMessages.FindType);
- dialog.setMessage(EditorMessages.FindType_Filter);
- if (dialog.open() == SelectionDialog.OK) {
- Object[] result = dialog.getResult();
- IType searchedType = (IType) result[0];
- return searchedType.getFullyQualifiedName();
- }
- }
- return null;
- }
-
- /**
- * @param shell
- * @param facesConfig
- * @return the name of the renderkit or null
- */
- public static String openRenderKitDialog(Shell shell,
- FacesConfigType facesConfig) {
- if (facesConfig != null) {
- EList list = facesConfig.getRenderKit();
- ArrayList ids = new ArrayList();
- for (int i = 0, n = list.size(); i < n; i++) {
- RenderKitIdType renderKitId = ((RenderKitType) list.get(i))
- .getRenderKitId();
- if (renderKitId != null) {
- if (!"".equals(renderKitId.getTextContent())) { //$NON-NLS-1$
- ids.add(renderKitId.getTextContent());
- }
- }
- }
- String[] idArray = (String[]) ids.toArray(new String[ids.size()]);
- Arrays.sort(idArray);
- ListChoiceDialog dialog = new ListChoiceDialog(
- shell,
- idArray,
- EditorMessages.DefaultRenderKitIDSection_Wizard_Page_LabelText);
- if (dialog.open() == SelectionDialog.OK) {
- String result = dialog.getResult();
- if (!"".equals(result)) { //$NON-NLS-1$
- return result;
- }
- }
- }
- return null;
- }
-
- /**
- * @param shell
- * @param existedLocaleList
- * @return the locale or null
- */
- public static String openLocaleDialog(Shell shell, List existedLocaleList) {
- LocaleDialog dialog = new LocaleDialog(shell, existedLocaleList);
- if (dialog.open() == Window.OK) {
- String result = dialog.getResult();
- if (!"".equals(result)) { //$NON-NLS-1$
- return result;
- }
- }
- return null;
- }
-
- /**
- * @param shell
- * @param project
- * @param existedBundleList
- * @return the message bundle or null
- */
- public static String openMessageBundleDialog(Shell shell, IProject project,
- List existedBundleList) {
- IJavaProject javaProject = null;
-
- try {
- if (project != null && project.hasNature(JavaCore.NATURE_ID)) {
- javaProject = JavaCore.create(project);
- } else {
- return null;
- }
- } catch (CoreException e) {
- // Ignore
- }
- MessageBundleSelectionDialog dialog = new MessageBundleSelectionDialog(
- shell, javaProject, existedBundleList);
-
- if (dialog.open() == SelectionDialog.OK) {
- String newValue = (String) dialog.getResult()[0];
- if (!"".equalsIgnoreCase(newValue)) { //$NON-NLS-1$
- return newValue;
- }
- }
- return null;
- }
-
- private DialogUtil()
- {
- // no instantiation
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/dialog/EditListEntriesDialog.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/dialog/EditListEntriesDialog.java
deleted file mode 100644
index 89b6da9..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/dialog/EditListEntriesDialog.java
+++ /dev/null
@@ -1,414 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-
-
-package org.eclipse.jst.jsf.facesconfig.ui.dialog;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider;
-import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.viewers.ColumnWeightData;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.TableLayout;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerFilter;
-import org.eclipse.jst.jsf.common.ui.internal.dialogfield.ClassButtonDialogField;
-import org.eclipse.jst.jsf.common.ui.internal.dialogfield.DialogField;
-import org.eclipse.jst.jsf.common.ui.internal.dialogfield.DialogFieldBase;
-import org.eclipse.jst.jsf.common.ui.internal.dialogfield.LayoutUtil;
-import org.eclipse.jst.jsf.common.ui.internal.guiutils.SWTUtils;
-import org.eclipse.jst.jsf.facesconfig.emf.FacesConfigFactory;
-import org.eclipse.jst.jsf.facesconfig.emf.FacesConfigPackage;
-import org.eclipse.jst.jsf.facesconfig.emf.ListEntriesType;
-import org.eclipse.jst.jsf.facesconfig.emf.NullValueType;
-import org.eclipse.jst.jsf.facesconfig.emf.ValueClassType;
-import org.eclipse.jst.jsf.facesconfig.emf.ValueType;
-import org.eclipse.jst.jsf.facesconfig.ui.EditorMessages;
-import org.eclipse.jst.jsf.facesconfig.ui.EditorPlugin;
-import org.eclipse.jst.jsf.facesconfig.ui.section.AbstractFacesConfigSection;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.MouseAdapter;
-import org.eclipse.swt.events.MouseEvent;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.TableColumn;
-
-/**
- *
- * @author sfshi
- *
- */
-public class EditListEntriesDialog extends Dialog {
-
- private static final int MIN_DIALOG_WIDTH = 300;
-
- private static final int TABLE_DEFAULT_HEIGHT = 160;
-
- private ClassButtonDialogField valueClassField;
-
- private IProject project;
-
- private TableViewer tableViewer;
-
- private Button removeButton;
-
- private Button editButton;
-
- private ListEntriesType listEntries;
-
- private AbstractFacesConfigSection section;
-
- /**
- *
- * @param parentShell
- * @param listEntries
- * the list-entries element that working on.
- * @param section
- */
- public EditListEntriesDialog(Shell parentShell,
- ListEntriesType listEntries, AbstractFacesConfigSection section) {
- super(parentShell);
- this.listEntries = listEntries;
- this.section = section;
- }
-
- /*
- * @see org.eclipse.jface.window.Window#configureShell(org.eclipse.swt.widgets.Shell)
- */
- protected void configureShell(Shell newShell) {
- super.configureShell(newShell);
- newShell.setText(EditorMessages.EditListEntriesDialog_EditingListEntries);
- }
-
- /*
- * @see org.eclipse.jface.dialogs.Dialog#createDialogArea(org.eclipse.swt.widgets.Composite)
- */
- protected Control createDialogArea(Composite parent) {
- Composite container = new Composite(parent, SWT.FILL);
- GridData data = new GridData(GridData.FILL_BOTH);
- container.setLayoutData(data);
-
- GridLayout gl = new GridLayout();
- gl.verticalSpacing = 0;
- // gl.marginHeight = 0;
- container.setLayout(gl);
- createKeyValueSection(container);
- createTableSection(container);
-
- initFields();
- return container;
- }
-
- private void initFields() {
-
- if (listEntries.getValueClass() != null)
- valueClassField.setText(listEntries.getValueClass()
- .getTextContent());
-
- tableViewer.setInput(listEntries);
- }
-
- private void createKeyValueSection(Composite parent) {
- valueClassField = new ClassButtonDialogField(getProject());
-
- valueClassField
- .setLabelText(EditorMessages.InitializationSection_MapType_ValueClass);
- Composite typeSelectionSection = SWTUtils.createComposite(parent,
- SWT.NONE);
-
- GridData gd = new GridData(GridData.FILL_HORIZONTAL);
- typeSelectionSection.setLayoutData(gd);
-
- int numberOfColumns = 4;
- GridLayout gl = new GridLayout(numberOfColumns, false);
- typeSelectionSection.setLayout(gl);
-
- valueClassField.doFillIntoGrid(null, typeSelectionSection,
- numberOfColumns);
- LayoutUtil.setHorizontalGrabbing(valueClassField.getTextControl(null,
- parent));
- }
-
- /**
- *
- * @param parent
- */
- private void createTableSection(Composite parent) {
- Composite mapValueSection = SWTUtils.createComposite(parent, SWT.NONE);
-
- GridData gd = new GridData(GridData.FILL_BOTH);
- mapValueSection.setLayoutData(gd);
-
- int numberOfColumns = 3;
- GridLayout gl = new GridLayout(numberOfColumns, false);
- mapValueSection.setLayout(gl);
-
- DialogField valuesTitle = new DialogFieldBase();
- valuesTitle
- .setLabelText(EditorMessages.InitializationSection_MapTable_Title);
-
- valuesTitle.doFillIntoGrid(null, mapValueSection, numberOfColumns);
-
- Table mapTable = new Table(mapValueSection, SWT.FULL_SELECTION
- | SWT.H_SCROLL | SWT.V_SCROLL | SWT.BORDER);
-
- mapTable.addSelectionListener(new SelectionAdapter() {
-
- public void widgetSelected(SelectionEvent e) {
- updateButtonsStatus();
-
- }
-
- });
- mapTable.addMouseListener(new MouseAdapter() {
- public void mouseDoubleClick(MouseEvent e) {
- if (((IStructuredSelection) tableViewer.getSelection()).size() > 0)
- editButtonSelected(null);
- }
- });
- gd = new GridData(GridData.FILL_BOTH);
- gd.horizontalSpan = 1;
- gd.heightHint = TABLE_DEFAULT_HEIGHT;
- mapTable.setLayoutData(gd);
- mapTable.setHeaderVisible(true);
- mapTable.setLinesVisible(true);
- TableLayout layout = new TableLayout();
- layout.addColumnData(new ColumnWeightData(1, true));
- mapTable.setLayout(layout);
-
- TableColumn keyCol = new TableColumn(mapTable, SWT.NONE);
- keyCol
- .setText(EditorMessages.InitializationSection_MapTable_Value);
- layout.addColumnData(new ColumnWeightData(1, true));
- keyCol.setResizable(true);
-
- tableViewer = new TableViewer(mapTable);
- tableViewer.setContentProvider(new AdapterFactoryContentProvider(
- getAdapterFactory()));
- tableViewer.setLabelProvider(new AdapterFactoryLabelProvider(
- getAdapterFactory()));
-
- tableViewer.addFilter(new ViewerFilter() {
- public boolean select(Viewer viewer, Object parentElement,
- Object element) {
- return FacesConfigPackage.eINSTANCE.getValueType().isInstance(
- element)
- || FacesConfigPackage.eINSTANCE.getNullValueType()
- .isInstance(element);
- }
- });
-
- Composite operationContainer = null;
-
- operationContainer = SWTUtils
- .createComposite(mapValueSection, SWT.NONE);
-
- gd = new GridData(GridData.FILL_VERTICAL);
- operationContainer.setLayoutData(gd);
- gl = new GridLayout();
- operationContainer.setLayout(gl);
-
- Button addButton = SWTUtils.createPushButton(operationContainer,
- EditorMessages.UI_Button_Add_more);
-
- gd = new GridData(GridData.FILL_HORIZONTAL
- | GridData.VERTICAL_ALIGN_BEGINNING);
- gd.grabExcessHorizontalSpace = false;
- addButton.setLayoutData(gd);
- addButton.addSelectionListener(new SelectionAdapter() {
- public void widgetSelected(SelectionEvent e) {
- addButtonSelected(e);
- }
- });
-
- editButton = SWTUtils.createPushButton(operationContainer,
- EditorMessages.UI_Button_Edit_more);
-
- gd = new GridData(GridData.FILL_HORIZONTAL
- | GridData.VERTICAL_ALIGN_BEGINNING);
- gd.grabExcessHorizontalSpace = false;
- editButton.setLayoutData(gd);
- editButton.addSelectionListener(new SelectionAdapter() {
- public void widgetSelected(SelectionEvent e) {
- editButtonSelected(e);
- }
-
- });
- removeButton = SWTUtils.createPushButton(operationContainer,
- EditorMessages.UI_Button_Remove);
-
- gd = new GridData(GridData.FILL_HORIZONTAL
- | GridData.VERTICAL_ALIGN_BEGINNING);
- gd.grabExcessHorizontalSpace = false;
- removeButton.setLayoutData(gd);
- removeButton.addSelectionListener(new SelectionAdapter() {
-
- public void widgetSelected(SelectionEvent e) {
- removeButtonSelected();
- }
-
- });
- editButton.setEnabled(false);
- removeButton.setEnabled(false);
- }
-
- private AdapterFactory getAdapterFactory() {
- return section.getAdapterFactory();
- }
-
- private void addButtonSelected(SelectionEvent e) {
-
- EditValueDialog dialog = new EditValueDialog(EditorPlugin
- .getActiveShell(), true, false, null);
- if (dialog.open() == Dialog.OK) {
- if (dialog.isNullValue()) {
- NullValueType nullValue = FacesConfigFactory.eINSTANCE
- .createNullValueType();
- listEntries.getNullValue().add(nullValue);
- } else {
- ValueType value = FacesConfigFactory.eINSTANCE
- .createValueType();
- value.setTextContent((String) dialog.getResultData());
- listEntries.getValue().add(value);
- }
- }
-
- }
-
- private void editButtonSelected(SelectionEvent e) {
- Object select = ((IStructuredSelection) tableViewer.getSelection())
- .getFirstElement();
- boolean isNullValue;
- String valueText = null;
- if (select instanceof NullValueType)
- isNullValue = true;
- else {
- isNullValue = false;
- valueText = ((ValueType) select).getTextContent();
- }
-
- EditValueDialog dialog = new EditValueDialog(EditorPlugin
- .getActiveShell(), true, isNullValue, valueText);
- if (dialog.open() == Dialog.OK) {
- if (isNullValue && !dialog.isNullValue()) {
- listEntries.getNullValue().remove(select);
- ValueType value = FacesConfigFactory.eINSTANCE
- .createValueType();
- value.setTextContent((String) dialog.getResultData());
- listEntries.getValue().add(value);
- } else if (!isNullValue && dialog.isNullValue()) {
- listEntries.getValue().remove(select);
- NullValueType nullValue = FacesConfigFactory.eINSTANCE
- .createNullValueType();
- listEntries.getNullValue().add(nullValue);
- } else if (!isNullValue && !dialog.isNullValue()) {
- ((ValueType) select).setTextContent((String) dialog
- .getResultData());
- }
- }
- }
-
- private void removeButtonSelected() {
- Object select = ((IStructuredSelection) tableViewer.getSelection())
- .getFirstElement();
- if (select instanceof NullValueType)
- listEntries.getNullValue().remove(select);
- else
- listEntries.getValue().remove(select);
- tableViewer.refresh();
- updateButtonsStatus();
- }
-
- /**
- * update the status buttons
- */
- public void updateButtonsStatus() {
- if (((IStructuredSelection) tableViewer.getSelection()).size() > 0) {
- editButton.setEnabled(true);
- removeButton.setEnabled(true);
- } else {
- editButton.setEnabled(false);
- removeButton.setEnabled(false);
- }
- }
-
- /**
- *
- */
- protected void okPressed() {
-
- String valueClass = valueClassField.getText();
- if (listEntries.getValueClass() != null) {
- listEntries.getValueClass().setTextContent(valueClass);
- } else {
- ValueClassType valueClassType = FacesConfigFactory.eINSTANCE
- .createValueClassType();
- valueClassType.setTextContent(valueClass);
- listEntries.setValueClass(valueClassType);
- }
- super.okPressed();
- }
-
- /*
- * @see org.eclipse.jface.window.Window#getInitialSize()
- */
- protected Point getInitialSize() {
- Point shellSize = super.getInitialSize();
- return new Point(Math.max(
- convertHorizontalDLUsToPixels(MIN_DIALOG_WIDTH), shellSize.x),
- shellSize.y);
- }
-
- /**
- * @return the current project
- */
- public IProject getProject() {
- if (project == null) {
- project = (IProject) section.getPage().getEditor().getAdapter(
- IProject.class);
- }
- return project;
- }
-
- /**
- * @param project
- */
- public void setProject(IProject project) {
- this.project = project;
- }
-
- /**
- * @return the list entries
- */
- public ListEntriesType getListEntries() {
- return listEntries;
- }
-
- /**
- * @param listEntries
- */
- public void setListEntries(ListEntriesType listEntries) {
- this.listEntries = listEntries;
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/dialog/EditMapEntriesDialog.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/dialog/EditMapEntriesDialog.java
deleted file mode 100644
index ee91462..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/dialog/EditMapEntriesDialog.java
+++ /dev/null
@@ -1,449 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-
-
-package org.eclipse.jst.jsf.facesconfig.ui.dialog;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider;
-import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.viewers.ColumnWeightData;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.TableLayout;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerFilter;
-import org.eclipse.jst.jsf.common.ui.internal.dialogfield.ClassButtonDialogField;
-import org.eclipse.jst.jsf.common.ui.internal.dialogfield.DialogField;
-import org.eclipse.jst.jsf.common.ui.internal.dialogfield.DialogFieldBase;
-import org.eclipse.jst.jsf.common.ui.internal.dialogfield.LayoutUtil;
-import org.eclipse.jst.jsf.common.ui.internal.guiutils.SWTUtils;
-import org.eclipse.jst.jsf.facesconfig.emf.FacesConfigFactory;
-import org.eclipse.jst.jsf.facesconfig.emf.FacesConfigPackage;
-import org.eclipse.jst.jsf.facesconfig.emf.KeyClassType;
-import org.eclipse.jst.jsf.facesconfig.emf.KeyType;
-import org.eclipse.jst.jsf.facesconfig.emf.MapEntriesType;
-import org.eclipse.jst.jsf.facesconfig.emf.MapEntryType;
-import org.eclipse.jst.jsf.facesconfig.emf.NullValueType;
-import org.eclipse.jst.jsf.facesconfig.emf.ValueClassType;
-import org.eclipse.jst.jsf.facesconfig.emf.ValueType;
-import org.eclipse.jst.jsf.facesconfig.ui.EditorMessages;
-import org.eclipse.jst.jsf.facesconfig.ui.EditorPlugin;
-import org.eclipse.jst.jsf.facesconfig.ui.section.AbstractFacesConfigSection;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.MouseAdapter;
-import org.eclipse.swt.events.MouseEvent;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.TableColumn;
-
-/**
- *
- * @author sfshi
- *
- */
-public class EditMapEntriesDialog extends Dialog {
-
- private static final int MIN_DIALOG_WIDTH = 300;
-
- private static final int TABLE_DEFAULT_HEIGHT = 160;
-
- private ClassButtonDialogField keyClassField;
-
- private ClassButtonDialogField valueClassField;
-
- private IProject project;
-
- private TableViewer tableViewer;
-
- private Button removeButton;
-
- private Button editButton;
-
- private MapEntriesType mapEntries;
-
- private AbstractFacesConfigSection section;
-
- /**
- *
- * @param parentShell
- * @param mapEntries
- * the map-entries element that working on.
- * @param section
- */
- public EditMapEntriesDialog(Shell parentShell, MapEntriesType mapEntries,
- AbstractFacesConfigSection section) {
- super(parentShell);
- this.mapEntries = mapEntries;
- this.section = section;
- }
-
- /*
- * @see org.eclipse.jface.window.Window#configureShell(org.eclipse.swt.widgets.Shell)
- */
- protected void configureShell(Shell newShell) {
- super.configureShell(newShell);
- newShell.setText(EditorMessages.EditMapEntriesDialog_EditingMapEntries);
- }
-
- /*
- * @see org.eclipse.jface.dialogs.Dialog#createDialogArea(org.eclipse.swt.widgets.Composite)
- */
- protected Control createDialogArea(Composite parent) {
- Composite container = new Composite(parent, SWT.FILL);
- GridData data = new GridData(GridData.FILL_BOTH);
- container.setLayoutData(data);
-
- GridLayout gl = new GridLayout();
- gl.verticalSpacing = 0;
- // gl.marginHeight = 0;
- container.setLayout(gl);
- createKeyValueSection(container);
- createTableSection(container);
-
- initFields();
- return container;
- }
-
- private void initFields() {
-
- if (mapEntries.getKeyClass() != null)
- keyClassField.setText(mapEntries.getKeyClass().getTextContent());
-
- if (mapEntries.getValueClass() != null)
- valueClassField
- .setText(mapEntries.getValueClass().getTextContent());
-
- tableViewer.setInput(mapEntries);
- }
-
- private void createKeyValueSection(Composite parent) {
- keyClassField = new ClassButtonDialogField(getProject());
- keyClassField
- .setLabelText(EditorMessages.InitializationSection_MapType_KeyClass);
-
- valueClassField = new ClassButtonDialogField(getProject());
-
- valueClassField
- .setLabelText(EditorMessages.InitializationSection_MapType_ValueClass);
-
- Composite typeSelectionSection = SWTUtils.createComposite(parent,
- SWT.NONE);
-
- GridData gd = new GridData(GridData.FILL_HORIZONTAL);
- typeSelectionSection.setLayoutData(gd);
-
- int numberOfColumns = 4;
- GridLayout gl = new GridLayout(numberOfColumns, false);
- typeSelectionSection.setLayout(gl);
-
- keyClassField.doFillIntoGrid(null, typeSelectionSection,
- numberOfColumns);
- LayoutUtil.setHorizontalGrabbing(keyClassField.getTextControl(null,
- parent));
-
- valueClassField.doFillIntoGrid(null, typeSelectionSection,
- numberOfColumns);
- }
-
- /**
- *
- * @param parent
- */
- private void createTableSection(Composite parent) {
- Composite mapValueSection = SWTUtils.createComposite(parent, SWT.NONE);
-
- GridData gd = new GridData(GridData.FILL_BOTH);
- mapValueSection.setLayoutData(gd);
-
- int numberOfColumns = 3;
- GridLayout gl = new GridLayout(numberOfColumns, false);
- mapValueSection.setLayout(gl);
-
- DialogField valuesTitle = new DialogFieldBase();
- valuesTitle
- .setLabelText(EditorMessages.InitializationSection_MapTable_Title);
-
- valuesTitle.doFillIntoGrid(null, mapValueSection, numberOfColumns);
-
- Table mapTable = new Table(mapValueSection, SWT.FULL_SELECTION
- | SWT.H_SCROLL | SWT.V_SCROLL | SWT.BORDER);
-
- mapTable.addSelectionListener(new SelectionAdapter() {
-
- public void widgetSelected(SelectionEvent e) {
- updateButtonsStatus();
-
- }
-
- });
- mapTable.addMouseListener(new MouseAdapter() {
- public void mouseDoubleClick(MouseEvent e) {
- if (((IStructuredSelection) tableViewer.getSelection()).size() > 0)
- editButtonSelected(null);
- }
- });
- gd = new GridData(GridData.FILL_BOTH);
- gd.horizontalSpan = 1;
- gd.heightHint = TABLE_DEFAULT_HEIGHT;
- mapTable.setLayoutData(gd);
- mapTable.setHeaderVisible(true);
- mapTable.setLinesVisible(true);
- TableLayout layout = new TableLayout();
- mapTable.setLayout(layout);
-
- TableColumn keyCol = new TableColumn(mapTable, SWT.NONE);
- keyCol
- .setText(EditorMessages.InitializationSection_MapTable_Key);
- layout.addColumnData(new ColumnWeightData(1, true));
- keyCol.setResizable(true);
-
- TableColumn valueCol = new TableColumn(mapTable, SWT.NONE);
- layout.addColumnData(new ColumnWeightData(1, true));
-
- valueCol
- .setText(EditorMessages.InitializationSection_MapTable_Value);
- valueCol.setResizable(true);
-
- tableViewer = new TableViewer(mapTable);
- tableViewer.setContentProvider(new AdapterFactoryContentProvider(
- getAdapterFactory()));
- tableViewer.setLabelProvider(new AdapterFactoryLabelProvider(
- getAdapterFactory()));
-
- tableViewer.addFilter(new ViewerFilter() {
- public boolean select(Viewer viewer, Object parentElement,
- Object element) {
- return FacesConfigPackage.eINSTANCE.getMapEntryType()
- .isInstance(element);
- }
- });
-
- // map's operation buttons
- Composite operationContainer = null;
-
- operationContainer = SWTUtils
- .createComposite(mapValueSection, SWT.NONE);
-
- gd = new GridData(GridData.FILL_VERTICAL);
- operationContainer.setLayoutData(gd);
- gl = new GridLayout();
- operationContainer.setLayout(gl);
-
- Button addButton = SWTUtils.createPushButton(operationContainer,
- EditorMessages.UI_Button_Add_more);
-
- gd = new GridData(GridData.FILL_HORIZONTAL
- | GridData.VERTICAL_ALIGN_BEGINNING);
- gd.grabExcessHorizontalSpace = false;
- addButton.setLayoutData(gd);
- addButton.addSelectionListener(new SelectionAdapter() {
- public void widgetSelected(SelectionEvent e) {
- addButtonSelected(e);
- }
- });
-
- editButton = SWTUtils.createPushButton(operationContainer,
- EditorMessages.UI_Button_Edit_more);
-
- gd = new GridData(GridData.FILL_HORIZONTAL
- | GridData.VERTICAL_ALIGN_BEGINNING);
- gd.grabExcessHorizontalSpace = false;
- editButton.setLayoutData(gd);
- editButton.addSelectionListener(new SelectionAdapter() {
- public void widgetSelected(SelectionEvent e) {
- editButtonSelected(e);
- }
-
- });
- removeButton = SWTUtils.createPushButton(operationContainer,
- EditorMessages.UI_Button_Remove);
-
- gd = new GridData(GridData.FILL_HORIZONTAL
- | GridData.VERTICAL_ALIGN_BEGINNING);
- gd.grabExcessHorizontalSpace = false;
- removeButton.setLayoutData(gd);
- removeButton.addSelectionListener(new SelectionAdapter() {
-
- public void widgetSelected(SelectionEvent e) {
- removeButtonSelected();
- }
-
- });
- editButton.setEnabled(false);
- removeButton.setEnabled(false);
- }
-
- /**
- * @return the current project
- */
- public IProject getProject() {
- if (project == null) {
- project = (IProject) section.getPage().getEditor().getAdapter(
- IProject.class);
- }
- return project;
- }
- private AdapterFactory getAdapterFactory() {
- return section.getAdapterFactory();
- }
-
- private void addButtonSelected(SelectionEvent e) {
- AddEditMapEntryDialog dialog = new AddEditMapEntryDialog(EditorPlugin
- .getActiveShell(), true);
- if (dialog.open() == Dialog.OK) {
- MapEntryType mapEntry = FacesConfigFactory.eINSTANCE
- .createMapEntryType();
- if (dialog.getKey() != null) {
- KeyType key = FacesConfigFactory.eINSTANCE.createKeyType();
- key.setTextContent(dialog.getKey());
- mapEntry.setKey(key);
- }
- if (dialog.isNullValue()) {
- NullValueType nullValue = FacesConfigFactory.eINSTANCE
- .createNullValueType();
- mapEntry.setNullValue(nullValue);
- } else {
- ValueType value = FacesConfigFactory.eINSTANCE
- .createValueType();
- value.setTextContent(dialog.getValue());
- mapEntry.setValue(value);
- }
-
- mapEntries.getMapEntry().add(mapEntry);
- }
-
- }
-
- private void editButtonSelected(SelectionEvent e) {
- MapEntryType mapEntry = (MapEntryType) ((IStructuredSelection) tableViewer
- .getSelection()).getFirstElement();
- AddEditMapEntryDialog dialog = new AddEditMapEntryDialog(EditorPlugin
- .getActiveShell(), false);
- if (mapEntry.getKey() != null)
- dialog.setKey(mapEntry.getKey().getTextContent());
- if (mapEntry.getNullValue() != null)
- dialog.setNullValue(true);
- else if (mapEntry.getValue() != null)
- dialog.setValue(mapEntry.getValue().getTextContent());
-
- if (dialog.open() == Dialog.OK) {
- if (mapEntry.getKey() != null)
- mapEntry.getKey().setTextContent(dialog.getKey());
- else {
- KeyType keyType = FacesConfigFactory.eINSTANCE.createKeyType();
- keyType.setTextContent(dialog.getKey());
- mapEntry.setKey(keyType);
- }
- if (dialog.isNullValue()) {
- if (mapEntry.getValue() != null)
- EcoreUtil.remove(mapEntry.getValue());
- // mapEntry.eUnset(FacesConfigPackage.eINSTANCE.getMapEntryType_Value());
- mapEntry.setNullValue(FacesConfigFactory.eINSTANCE
- .createNullValueType());
-
- } else {
- if (mapEntry.getNullValue() != null)
- EcoreUtil.remove(mapEntry.getNullValue());
- if (mapEntry.getValue() != null)
- mapEntry.getValue().setTextContent(dialog.getValue());
- else {
- ValueType value = FacesConfigFactory.eINSTANCE
- .createValueType();
- value.setTextContent(dialog.getValue());
- mapEntry.setValue(value);
- }
-
- }
- tableViewer.refresh(mapEntry);
- }
-
- }
-
- private void removeButtonSelected() {
- MapEntryType mapEntry = (MapEntryType) ((IStructuredSelection) tableViewer
- .getSelection()).getFirstElement();
- mapEntries.getMapEntry().remove(mapEntry);
- tableViewer.refresh();
- updateButtonsStatus();
- }
-
- /**
- * update the button status
- */
- public void updateButtonsStatus() {
- if (((IStructuredSelection) tableViewer.getSelection()).size() > 0) {
- editButton.setEnabled(true);
- removeButton.setEnabled(true);
- } else {
- editButton.setEnabled(false);
- removeButton.setEnabled(false);
- }
- }
-
- /**
- *
- */
- protected void okPressed() {
- KeyClassType keyClass = FacesConfigFactory.eINSTANCE
- .createKeyClassType();
- keyClass.setTextContent(this.keyClassField.getText().trim());
- mapEntries.setKeyClass(keyClass);
- ValueClassType valueClass = FacesConfigFactory.eINSTANCE
- .createValueClassType();
- valueClass.setTextContent(this.valueClassField.getText().trim());
- mapEntries.setValueClass(valueClass);
- super.okPressed();
- }
-
- /*
- * @see org.eclipse.jface.window.Window#getInitialSize()
- */
- protected Point getInitialSize() {
- Point shellSize = super.getInitialSize();
- return new Point(Math.max(
- convertHorizontalDLUsToPixels(MIN_DIALOG_WIDTH), shellSize.x),
- shellSize.y);
- }
-
- /**
- * @param project
- */
- public void setProject(IProject project) {
- this.project = project;
- }
-
- /**
- * @return the map entries
- */
- public MapEntriesType getMapEntries() {
- return mapEntries;
- }
-
- /**
- * @param mapEntries
- */
- public void setMapEntries(MapEntriesType mapEntries) {
- this.mapEntries = mapEntries;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/dialog/EditValueDialog.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/dialog/EditValueDialog.java
deleted file mode 100644
index d69d66d..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/dialog/EditValueDialog.java
+++ /dev/null
@@ -1,226 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.jsf.facesconfig.ui.dialog;
-
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.jst.jsf.common.ui.internal.dialogfield.DialogField;
-import org.eclipse.jst.jsf.common.ui.internal.dialogfield.DialogFieldBase;
-import org.eclipse.jst.jsf.common.ui.internal.guiutils.SWTUtils;
-import org.eclipse.jst.jsf.facesconfig.ui.EditorMessages;
-import org.eclipse.jst.jsf.facesconfig.ui.IFacesConfigConstants;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Text;
-
-/**
- * This dialog is used to edit managed bean's property. if the
- * bDefinitionEditable is true, the property's name, class type, and initial
- * value can be edit and changed. otherwise, only initial value can be changed.
- *
- * @author Xiao-guang Zhang, sfshi
- */
-public class EditValueDialog extends Dialog {
-
- /** default dialog width and height */
- private static final int VALUE_WIDTH = 380;
-
- private static final int VALUE_HEIGHT = 220;
-
- private String value;
-
- /** property's initla value text control */
- private Text valueText;
-
- private Button nullValueTypeButton;
-
- private boolean isNullButtonShown;
-
- private boolean isNullValue;
-
- /**
- * Equivilent to EditValueDialog(parentShell, false, false, value)
- *
- * @param parentShell
- * @param value
- */
- public EditValueDialog(Shell parentShell, String value) {
- this(parentShell, false, false, value);
- this.value = value;
- this.isNullButtonShown = false;
- }
-
- /**
- * @param parentShell
- * @param isNullButtonShown
- * @param isNullValue
- * @param value
- */
- public EditValueDialog(Shell parentShell, boolean isNullButtonShown,
- boolean isNullValue, String value) {
- super(parentShell);
- this.isNullValue = isNullValue;
- this.value = value;
- this.isNullButtonShown = isNullButtonShown;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see Dialog#createDialogArea(Composite)
- */
- protected Control createDialogArea(Composite parent) {
- GridLayout gridLayout;
- Composite container = (Composite) super.createDialogArea(parent);
- gridLayout = new GridLayout();
- gridLayout.numColumns = 1;
- gridLayout.marginHeight = 10;
- gridLayout.marginWidth = 10;
- container.setLayout(gridLayout);
- GridData gd = new GridData(GridData.FILL_BOTH);
- container.setLayoutData(gd);
-
- if (this.isNullButtonShown) {
- nullValueTypeButton = SWTUtils.createCheckBox(container,
- IFacesConfigConstants.NULL_VALUE, 2);
- nullValueTypeButton.addSelectionListener(new SelectionAdapter() {
-
- public void widgetSelected(SelectionEvent e) {
- valueText.setEnabled(!nullValueTypeButton.getSelection());
- isNullValue = nullValueTypeButton.getSelection();
- }
-
- });
- }
-
- DialogField valueTitle = new DialogFieldBase();
- // ManagedBeansPage.ManagedBeanInitializationSection.MapTable.Title =
- // Values:
- valueTitle
- .setLabelText(EditorMessages.ManagedBeanPropertyEditDialog_Value);
- valueTitle.doFillIntoGrid(null, container, 1);
-
- gd = new GridData(GridData.FILL_BOTH);
- gd.widthHint = VALUE_WIDTH;
- gd.heightHint = VALUE_HEIGHT;
- valueText = new Text(container, SWT.MULTI | SWT.BORDER);
- valueText.setLayoutData(gd);
-
- initFields();
- return container;
- }
-
- private void initFields() {
-
- if (isNullButtonShown && isNullValue) {
- nullValueTypeButton.setSelection(true);
- valueText.setEnabled(false);
- } else if (value != null) {
- valueText.setText(value);
- }
- }
-
- /**
- * create a inital value group
- *
- * @param container -
- * parent composite control
- */
- protected void createValueSection(Composite container) {
- Composite valueSection = new Composite(container, SWT.NONE);
- GridLayout gl = new GridLayout();
- // gl.marginHeight = 20;
- gl.numColumns = 2;
- valueSection.setLayout(gl);
- GridData gd = new GridData(GridData.FILL_HORIZONTAL);
- valueSection.setLayoutData(gd);
-
- Label lblValue = new Label(valueSection, SWT.LEFT);
- gd = new GridData(GridData.HORIZONTAL_ALIGN_FILL);
- gd.widthHint = 100;
- lblValue.setLayoutData(gd);
-
- // ManagedBeanPropertyEditDialog.Value = Value:
- lblValue
- .setText(EditorMessages.ManagedBeanPropertyEditDialog_Value);
-
- gd = new GridData(GridData.HORIZONTAL_ALIGN_FILL
- | GridData.FILL_HORIZONTAL);
- gd.widthHint = 200;
- valueText = new Text(valueSection, SWT.BORDER);
- valueText.setLayoutData(gd);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see Dialog#createButtonsForButtonBar(Composite)
- */
- protected void createButtonsForButtonBar(Composite parent) {
- createButton(parent, IDialogConstants.OK_ID, IDialogConstants.OK_LABEL,
- true);
- createButton(parent, IDialogConstants.CANCEL_ID,
- IDialogConstants.CANCEL_LABEL, false);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see Dialog#configureShell(Shell)
- */
- protected void configureShell(Shell newShell) {
- super.configureShell(newShell);
- newShell.setText(EditorMessages.ValueEditDialog_Title);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see Dialog#buttonPressed(int)
- */
- protected void buttonPressed(int buttonId) {
- if (buttonId == IDialogConstants.CANCEL_ID) {
- setReturnCode(CANCEL);
- close();
- return;
- } else if (buttonId == IDialogConstants.OK_ID) {
- value = valueText.getText();
- setReturnCode(OK);
- close();
- return;
- }
- super.buttonPressed(buttonId);
- }
-
- /**
- * @return the result data
- */
- public Object getResultData() {
- return value;
- }
-
- /**
- * @return tru if isNullButtonShown and isNullValue are both true
- */
- public boolean isNullValue() {
- return this.isNullButtonShown && isNullValue;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/dialog/ListChoiceDialog.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/dialog/ListChoiceDialog.java
deleted file mode 100644
index 9538b11..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/dialog/ListChoiceDialog.java
+++ /dev/null
@@ -1,121 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui.dialog;
-
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jst.jsf.common.ui.internal.guiutils.SWTUtils;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Text;
-
-/**
- * @author Zhi-peng Zhang
- * @version
- */
-public class ListChoiceDialog extends Dialog {
- /** The mini width for the text control */
- private static final int TEXT_MINI_WIDTH = 350;
-
- /** The mini width for the table viewer control */
- private static final int TABLEVIEWER_MINI_WIDTH = 200;
-
- private Text inputText;
-
- private TableViewer tableViewer;
-
- private String[] items;
-
- private String result;
-
- private String labelString;
-
- /**
- * @param parentShell
- * @param items
- * @param labelString
- */
- public ListChoiceDialog(Shell parentShell, String[] items, String labelString) {
- super(parentShell);
- // if passed null for items, make it an empty array of strings
- this.items = items == null ? new String[0] : items;
- this.labelString = labelString;
-
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.dialogs.Dialog#createDialogArea(org.eclipse.swt.widgets.Composite)
- */
- protected Control createDialogArea(Composite parent) {
- Composite composite = SWTUtils.createComposite(parent, 1);
-
- SWTUtils.createLabel(composite, labelString, 1);
-
- inputText = SWTUtils.createTextBox(composite, 1);
- GridData gd = new GridData(GridData.FILL_HORIZONTAL);
- gd.widthHint = TEXT_MINI_WIDTH;
- inputText.setLayoutData(gd);
-
- inputText.addModifyListener(new ModifyListener() {
- public void modifyText(ModifyEvent e) {
- result = inputText.getText();
- }
- });
-
- createTableViewer(composite);
- return composite;
- }
-
- /**
- * @param composite
- */
- private void createTableViewer(Composite composite) {
- tableViewer = new TableViewer(composite, SWT.BORDER | SWT.H_SCROLL
- | SWT.V_SCROLL);
- GridData gd = new GridData(GridData.FILL_BOTH);
- gd.heightHint = TABLEVIEWER_MINI_WIDTH;
- tableViewer.getControl().setLayoutData(gd);
- tableViewer.add(items);
- tableViewer
- .addSelectionChangedListener(new ISelectionChangedListener() {
- public void selectionChanged(SelectionChangedEvent event) {
- IStructuredSelection selection = (IStructuredSelection) event
- .getSelection();
- if (selection != null) {
- String text = (String) selection.getFirstElement();
- if (text != null && text.length() > 0) {
- result = text;
- inputText.setText(text);
- }
- }
- }
- });
- }
-
- /**
- * @return the result
- */
- public String getResult()
- {
- return result;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/dialog/LocaleDialog.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/dialog/LocaleDialog.java
deleted file mode 100644
index 21e5169..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/dialog/LocaleDialog.java
+++ /dev/null
@@ -1,184 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui.dialog;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Locale;
-
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerFilter;
-import org.eclipse.jst.jsf.common.ui.internal.guiutils.SWTUtils;
-import org.eclipse.jst.jsf.facesconfig.ui.EditorMessages;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.KeyAdapter;
-import org.eclipse.swt.events.KeyEvent;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Text;
-
-/**
- * @author Zhi-peng Zhang
- * @version
- */
-public class LocaleDialog extends StatusDialog {
- private Text inputText;
-
- private TableViewer tableViewer;
-
- private String newLocale;
-
- private List existedLocaleList;
-
- private List itemsList;
-
- /** The mini width for the text control */
- private static final int TEXT_MINI_WIDTH = 350;
-
- /** The mini width for the table viewer control */
- private static final int TABLEVIEWER_MINI_WIDTH = 200;
-
- class LocaleViewerFilter extends ViewerFilter {
- private String locale;
-
- LocaleViewerFilter(String locale) {
- super();
- this.locale = locale;
- }
-
- public boolean select(Viewer v, Object parent, Object object) {
- if (object instanceof String) {
- if (null == locale || locale.length() == 0) {
- return true;
- }
- String aLocale = (String) object;
- return aLocale.startsWith(this.locale);
- }
- return false;
- }
- }
-
- /**
- *
- * @param parentShell
- * @param existedLocaleList
- */
- public LocaleDialog(Shell parentShell, List existedLocaleList) {
- super(parentShell);
- this.existedLocaleList = existedLocaleList;
- Locale[] locales = Locale.getAvailableLocales();
- itemsList = new ArrayList(locales.length);
-
- for (int i = 0, n = locales.length; i < n; i++) {
- itemsList.add(locales[i].toString());
- }
-
- setStatusMessage(EditorMessages.LocaleConfigSection_Wizard_Page_AlreadyExistsError);
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.jface.window.Window#configureShell(org.eclipse.swt.widgets.Shell)
- */
- protected void configureShell(Shell newShell) {
- super.configureShell(newShell);
- newShell.setText(EditorMessages.LocaleConfigSection_Wizard_WindowTitle);
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.jst.jsf.facesconfig.ui.dialog.StatusDialog#createDialogContents(org.eclipse.swt.widgets.Composite)
- */
- protected Control createDialogContents(Composite parent) {
- GridLayout layout = new GridLayout();
- layout.marginWidth = 0;
- layout.marginHeight = 0;
- parent.setLayout(layout);
-
- SWTUtils
- .createLabel(
- parent,
- EditorMessages.LocaleConfigSection_Wizard_Page_LabelText,
- 1);
-
- inputText = SWTUtils.createTextBox(parent, 1);
- GridData gd = new GridData(GridData.FILL_HORIZONTAL);
- gd.widthHint = TEXT_MINI_WIDTH;
- inputText.setLayoutData(gd);
-
- inputText.addKeyListener(new KeyAdapter() {
- public void keyReleased(KeyEvent e) {
- newLocale = inputText.getText();
- tableViewer.resetFilters();
- tableViewer.addFilter(new LocaleViewerFilter(newLocale));
- tableViewer.add(itemsList.toArray());
- updateStatus();
- }
- });
-
- createTableViewer(parent);
- return parent;
- }
-
- /**
- * @param composite
- */
- private void createTableViewer(Composite composite) {
- tableViewer = new TableViewer(composite, SWT.BORDER | SWT.H_SCROLL
- | SWT.V_SCROLL);
- GridData gd = new GridData(GridData.FILL_BOTH);
- gd.heightHint = TABLEVIEWER_MINI_WIDTH;
- tableViewer.getControl().setLayoutData(gd);
- tableViewer.add(itemsList.toArray());
-
- tableViewer
- .addSelectionChangedListener(new ISelectionChangedListener() {
- public void selectionChanged(SelectionChangedEvent event) {
-
- IStructuredSelection selection = (IStructuredSelection) event
- .getSelection();
- if (selection != null) {
- String text = (String) selection.getFirstElement();
- if (text != null && text.length() > 0) {
- newLocale = text;
- inputText.setText(text);
- updateStatus();
- }
- }
- }
- });
-
- }
-
- protected boolean isValid()
- {
- if (existedLocaleList != null && existedLocaleList.contains(newLocale)) {
- return false;
- }
- return true;
- }
-
- /**
- * @return the result
- */
- public String getResult()
- {
- return newLocale;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/dialog/MessageBundleSelectionDialog.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/dialog/MessageBundleSelectionDialog.java
deleted file mode 100644
index d4e34d8..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/dialog/MessageBundleSelectionDialog.java
+++ /dev/null
@@ -1,108 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui.dialog;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jst.jsf.common.ui.IFileFolderConstants;
-import org.eclipse.jst.jsf.common.ui.internal.dialogs.ResourceOnClasspathDialog;
-import org.eclipse.jst.jsf.facesconfig.emf.MessageBundleType;
-import org.eclipse.jst.jsf.facesconfig.ui.EditorMessages;
-import org.eclipse.swt.widgets.Shell;
-
-/**
- * @author sfshi
- * @version
- */
-public class MessageBundleSelectionDialog extends ResourceOnClasspathDialog {
- /** A list contains the resoursebundles existing in faces config */
- private List resourceBundles;
-
- private String selectPropertyFileMessage = EditorMessages.MessageBundleSection_Dialog_Message_SelectPropertyFile;
-
- private String alreadyExistStatusMessage = EditorMessages.MessageBundleSection_Dialog_Message_AlreadyExists;
-
- private static final String[] PROPERTIES_FILES_SUFFIXS = new String[] { IFileFolderConstants.EXT_PROPERTIES };
-
- /**
- * @param parentShell
- * @param project
- * @param resourceBundles
- */
- public MessageBundleSelectionDialog(Shell parentShell,
- IJavaProject project, List resourceBundles) {
- super(parentShell, project);
- this.resourceBundles = resourceBundles;
- setSuffixs(PROPERTIES_FILES_SUFFIXS);
-
- setTitle(EditorMessages.MessageBundleSection_Dialog_Title);
- setViewerSorter(new MessageBundleViewerSorter());
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.jsf.facesconfig.ui.common.dialogs.TreeViewerSelectionDialog#isValidSelection(java.lang.Object)
- */
- protected boolean isValidSelection(Object selection) {
- if (!(super.isValidSelection(selection))) {
- setStatusMessage(selectPropertyFileMessage);
- return false;
- }
-
- List selectionList = new ArrayList();
- selectionList.add(selection);
- this.setResult(selectionList);
- Object result = super.getResult()[0];
- if (null == result) {
- setStatusMessage(selectPropertyFileMessage);
- return false;
- }
-
- String newResourceBundle = (String) result;
-
- if (isAlreadyExist(newResourceBundle)) {
- this.setStatusMessage(alreadyExistStatusMessage);
- return false;
- }
-
- return true;
- }
-
- /**
- * Determine whether this resource bundle file has already been defined in
- * faces config.
- *
- * @return boolean
- */
- private boolean isAlreadyExist(String resourceBundleString) {
- if (null == resourceBundleString || resourceBundleString.length() == 0) {
- return true;
- }
-
- if (null == resourceBundles) {
- return false;
- }
-
- for (int i = 0; i < resourceBundles.size(); i++) {
- MessageBundleType node = (MessageBundleType) resourceBundles.get(i);
- String rbName = node.getTextContent();
- if (rbName != null && rbName.equalsIgnoreCase(resourceBundleString)) {
- return true;
- }
- }
-
- return false;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/dialog/MessageBundleViewerSorter.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/dialog/MessageBundleViewerSorter.java
deleted file mode 100644
index 18a8129..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/dialog/MessageBundleViewerSorter.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui.dialog;
-
-import java.text.Collator;
-
-import org.eclipse.jdt.core.IPackageFragmentRoot;
-import org.eclipse.jface.viewers.ViewerSorter;
-import org.eclipse.jst.jsf.common.ui.IFileFolderConstants;
-
-/**
- * @author sfshi
- * @version
- */
-public class MessageBundleViewerSorter extends ViewerSorter {
-
- /**
- *
- */
- public MessageBundleViewerSorter() {
- super();
- }
-
- /**
- * @param collator
- */
- public MessageBundleViewerSorter(Collator collator) {
- super(collator);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.ViewerSorter#category(java.lang.Object)
- */
- public int category(Object element) {
- if (element instanceof IPackageFragmentRoot
- && !((IPackageFragmentRoot)element).isArchive()) {
- IPackageFragmentRoot root = (IPackageFragmentRoot) element;
- if (IFileFolderConstants.FOLDER_SOURCE
- .equals(root.getElementName())) {
- return 0;
- }
- return 1;
- }
-
- return 2;
- }
-}
\ No newline at end of file
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/dialog/StatusDialog.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/dialog/StatusDialog.java
deleted file mode 100644
index 22485d9..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/dialog/StatusDialog.java
+++ /dev/null
@@ -1,126 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui.dialog;
-
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.jface.resource.JFaceResources;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Shell;
-
-/**
- * @author Zhi-peng Zhang
- * @version
- */
-
-/**
- * A common Dialog with validation information.
- */
-public abstract class StatusDialog extends Dialog {
- /** The validation image */
- private Label statusImage;
-
- /** The validation message */
- private Label statusLabel;
-
- /** The validation message content */
- private String statusMessage;
-
- /**
- *
- * @param parentShell
- */
- protected StatusDialog(Shell parentShell) {
- super(parentShell);
- }
-
- /**
- * Creates and returns the contents of the upper part of this dialog (above
- * the validation widgets). User should create Layout for the parent parameter.
- *
- * @param parent
- * the parent composite to contain the dialog area
- * @return the dialog area control
- */
- protected abstract Control createDialogContents(Composite parent);
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.jface.dialogs.Dialog#createDialogArea(org.eclipse.swt.widgets.Composite)
- */
- protected Control createDialogArea(Composite parent) {
- Composite area = (Composite) super.createDialogArea(parent);
- area.setLayout(new GridLayout(2,false));
-
- Composite contents = new Composite(area, SWT.NONE);
- GridData gd = new GridData(GridData.FILL_BOTH);
- gd.horizontalSpan = 2;
- contents.setLayoutData(gd);
- createDialogContents(contents);
-
- statusImage = createLabel(area);
- statusImage.setImage(JFaceResources
- .getImage(Dialog.DLG_IMG_MESSAGE_ERROR));
- statusLabel = createLabel(area);
- statusImage.setVisible(false);
- return area;
- }
-
- private Label createLabel(Composite parent) {
- Label label = new Label(parent, SWT.LEFT);
- GridData data = new GridData();
- data.horizontalSpan = 1;
- data.horizontalAlignment = GridData.FILL;
- label.setLayoutData(data);
- return label;
- }
-
- /**
- * @return true if is status is valid
- */
- protected abstract boolean isValid();
-
- /**
- * update the status information
- */
- protected void updateStatus() {
- if (isValid()) {
- statusImage.setVisible(false);
- statusLabel.setText(""); //$NON-NLS-1$
- getButton(IDialogConstants.OK_ID).setEnabled(true);
- } else {
- statusImage.setVisible(true);
- statusLabel.setText(statusMessage == null ? "" : statusMessage);//$NON-NLS-1$
- getButton(IDialogConstants.OK_ID).setEnabled(false);
- }
- }
-
- /**
- * @return the current status message
- */
- public String getStatusMessage() {
- return statusMessage;
- }
-
- /**
- * @param statusMessage
- */
- public void setStatusMessage(String statusMessage) {
- this.statusMessage = statusMessage;
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/page/ComponentsPage.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/page/ComponentsPage.java
deleted file mode 100644
index 7fb266e..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/page/ComponentsPage.java
+++ /dev/null
@@ -1,286 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui.page;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider;
-import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.ISelectionProvider;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.viewers.TreeViewer;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerFilter;
-import org.eclipse.jface.viewers.ViewerSorter;
-import org.eclipse.jst.jsf.facesconfig.emf.AttributeType;
-import org.eclipse.jst.jsf.facesconfig.emf.FacesConfigPackage;
-import org.eclipse.jst.jsf.facesconfig.emf.FacetType;
-import org.eclipse.jst.jsf.facesconfig.emf.PropertyType;
-import org.eclipse.jst.jsf.facesconfig.emf.RendererType;
-import org.eclipse.jst.jsf.facesconfig.ui.FacesConfigEditor;
-import org.eclipse.jst.jsf.facesconfig.ui.EditorMessages;
-import org.eclipse.jst.jsf.facesconfig.ui.page.detail.ComponentDetailsPage;
-import org.eclipse.jst.jsf.facesconfig.ui.page.detail.ConverterDetailsPage;
-import org.eclipse.jst.jsf.facesconfig.ui.page.detail.RenderkitDetailsPage;
-import org.eclipse.jst.jsf.facesconfig.ui.page.detail.ValidatorDetailsPage;
-import org.eclipse.jst.jsf.facesconfig.ui.section.ComponentMasterSection;
-import org.eclipse.jst.jsf.facesconfig.ui.section.ConverterMasterSection;
-import org.eclipse.jst.jsf.facesconfig.ui.section.FacesConfigMasterSection;
-import org.eclipse.jst.jsf.facesconfig.ui.section.RenderkitMasterSection;
-import org.eclipse.jst.jsf.facesconfig.ui.section.ValidatorMasterSection;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.forms.IDetailsPage;
-import org.eclipse.ui.forms.IManagedForm;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-import org.eclipse.ui.views.contentoutline.ContentOutlinePage;
-import org.eclipse.ui.views.contentoutline.IContentOutlinePage;
-
-/**
- * The "Components" page of faces config editor.
- *
- * @author sfshi
- *
- */
-public class ComponentsPage extends FacesConfigMasterDetailPage {
-
- /**
- * The id of this page in the faces-config editor.
- */
- public static final String PAGE_ID = "org.eclipse.jst.jsf.facesconfig.ui.page.ComponentsPage"; //$NON-NLS-1$
-
- private IContentOutlinePage contentOutlinePage;
-
- /**
- * Constructor of ComponentsPage;
- *
- * @param editor
- * the facesconfig editor;
- */
- public ComponentsPage(FacesConfigEditor editor) {
- super(editor, "ComponentsPage", //$NON-NLS-1$
- EditorMessages.FacesConfigEditor_Components_TabName);
- }
-
- /**
- * Create the master sections;
- *
- * @see org.eclipse.jst.jsf.facesconfig.ui.page.FacesConfigMasterDetailPage#createMasterSections(Composite,
- * IManagedForm, FormToolkit, FacesConfigMasterDetailPage)
- */
- protected FacesConfigMasterSection[] createMasterSections(
- Composite composite, IManagedForm managedForm, FormToolkit toolkit,
- FacesConfigMasterDetailPage page) {
- FacesConfigMasterSection componentMaster = new ComponentMasterSection(
- composite, managedForm, toolkit, page);
- componentMaster.getSection().setExpanded(true);
- GridData gd = new GridData(GridData.FILL_BOTH);
- componentMaster.getSection().setLayoutData(gd);
-
- FacesConfigMasterSection converterMaster = new ConverterMasterSection(
- composite, managedForm, toolkit, page);
- converterMaster.getSection().setExpanded(false);
- GridData convertergd = new GridData(GridData.FILL_HORIZONTAL);
- converterMaster.getSection().setLayoutData(convertergd);
-
- FacesConfigMasterSection renderkitMaster = new RenderkitMasterSection(
- composite, managedForm, toolkit, page);
- renderkitMaster.getSection().setExpanded(false);
- GridData renderkitgd = new GridData(GridData.FILL_HORIZONTAL);
- renderkitMaster.getSection().setLayoutData(renderkitgd);
-
- FacesConfigMasterSection validatorMaster = new ValidatorMasterSection(
- composite, managedForm, toolkit, page);
- validatorMaster.getSection().setExpanded(false);
- GridData valicatorgd = new GridData(GridData.FILL_HORIZONTAL);
- validatorMaster.getSection().setLayoutData(valicatorgd);
-
- return new FacesConfigMasterSection[] { componentMaster,
- converterMaster, renderkitMaster, validatorMaster };
- }
-
- /**
- * get the details page;
- *
- * @see org.eclipse.jst.jsf.facesconfig.ui.page.FacesConfigMasterDetailPage#getPageKey(Object
- * object)
- * @param key
- * the eClass object of a component.
- */
- public IDetailsPage getPage(Object key) {
- IDetailsPage detailsPage = null;
- if (key instanceof EClass) {
- EClass eClass = (EClass) key;
- if (eClass.getClassifierID() == FacesConfigPackage.COMPONENT_TYPE) {
- detailsPage = new ComponentDetailsPage(this);
- } else if (eClass.getClassifierID() == FacesConfigPackage.RENDER_KIT_TYPE) {
- detailsPage = new RenderkitDetailsPage(this);
- } else if (eClass.getClassifierID() == FacesConfigPackage.CONVERTER_TYPE) {
- detailsPage = new ConverterDetailsPage(this);
- } else if (eClass.getClassifierID() == FacesConfigPackage.VALIDATOR_TYPE) {
- detailsPage = new ValidatorDetailsPage(this);
- }
-
- if (detailsPage instanceof ISelectionProvider) {
- ((ISelectionProvider) detailsPage)
- .addSelectionChangedListener(this);
- }
- }
- return detailsPage;
- }
-
- public Object getAdapter(Class adapter) {
-
- if (adapter == IContentOutlinePage.class) {
- return getOutlinePage();
- }
-
- return super.getAdapter(adapter);
- }
-
- private IContentOutlinePage getOutlinePage() {
-
- if (contentOutlinePage == null) {
- // The content outline is just a tree.
- //
- class ComponentsContentOutlinePage extends ContentOutlinePage {
- public void createControl(Composite parent) {
- super.createControl(parent);
- TreeViewer contentOutlineViewer = getTreeViewer();
- contentOutlineViewer.addSelectionChangedListener(this);
-
- AdapterFactory adapterFactory = (AdapterFactory) getEditor()
- .getAdapter(AdapterFactory.class);
- // Set up the tree viewer.
- contentOutlineViewer
- .setContentProvider(new AdapterFactoryContentProvider(
- adapterFactory));
- contentOutlineViewer
- .setLabelProvider(new AdapterFactoryLabelProvider(
- adapterFactory));
- contentOutlineViewer.addFilter(new ViewerFilter() {
-
- public boolean select(Viewer viewer,
- Object parentElement, Object element) {
- return FacesConfigPackage.eINSTANCE
- .getComponentType().isInstance(element)
- || FacesConfigPackage.eINSTANCE
- .getConverterType().isInstance(
- element)
- || FacesConfigPackage.eINSTANCE
- .getRenderKitType().isInstance(
- element)
- || FacesConfigPackage.eINSTANCE
- .getValidatorType().isInstance(
- element)
- || FacesConfigPackage.eINSTANCE
- .getAttributeType().isInstance(
- element)
- || FacesConfigPackage.eINSTANCE
- .getPropertyType().isInstance(
- element)
- || FacesConfigPackage.eINSTANCE
- .getFacetType().isInstance(element)
- || FacesConfigPackage.eINSTANCE
- .getRendererType().isInstance(
- element);
- }
- });
-
- contentOutlineViewer.setSorter(new ViewerSorter());
- contentOutlineViewer.setInput(getInput());
- }
-
- }
-
- contentOutlinePage = new ComponentsContentOutlinePage();
-
- // Listen to selection so that we can handle it is a special
- // way.
- //
- contentOutlinePage
- .addSelectionChangedListener(new ISelectionChangedListener() {
- // This ensures that we handle selections correctly.
- public void selectionChanged(SelectionChangedEvent event) {
- setSelection(event.getSelection());
- }
- });
-
- addSelectionChangedListener((ContentOutlinePage) contentOutlinePage);
- }
-
- return contentOutlinePage;
-
- }
-
- /**
- * handle the selection changed event from outline page.
- *
- * @param selection
- */
- public void setSelection(ISelection selection) {
-
- if (selection instanceof IStructuredSelection) {
- IStructuredSelection ss = (IStructuredSelection) selection;
- IStructuredSelection currentSelection = (IStructuredSelection) this
- .getSelection();
- if ((!ss.isEmpty())
- && (!currentSelection.isEmpty())
- && (ss.getFirstElement() == currentSelection
- .getFirstElement())) {
- return;
- }
- EObject component = null;
- if (ss.getFirstElement() instanceof AttributeType
- || ss.getFirstElement() instanceof PropertyType
- || ss.getFirstElement() instanceof FacetType
- || ss.getFirstElement() instanceof RendererType) {
- component = ((EObject) ss.getFirstElement()).eContainer();
- } else if (ss.getFirstElement() instanceof EObject) {
- component = (EObject) ss.getFirstElement();
- }
-
- if (component != null) {
- FacesConfigMasterSection section = null;
- if (FacesConfigPackage.eINSTANCE.getComponentType().isInstance(
- component)) {
- section = getFacesConfigMasterSections()[0];
- } else if (FacesConfigPackage.eINSTANCE.getConverterType()
- .isInstance(component)) {
- section = getFacesConfigMasterSections()[1];
- } else if (FacesConfigPackage.eINSTANCE.getRenderKitType()
- .isInstance(component)) {
- section = getFacesConfigMasterSections()[2];
- } else if (FacesConfigPackage.eINSTANCE.getValidatorType()
- .isInstance(component)) {
- section = getFacesConfigMasterSections()[3];
- }
-
- if (!section.getSection().isExpanded()) {
- this.closeOtherSections(section);
- GridData gd = new GridData(GridData.FILL_BOTH);
- section.getSection().setLayoutData(gd);
- section.getSection().setExpanded(true);
- }
- IStructuredSelection newselection = new StructuredSelection(
- component);
- section.getStructuredViewer().setSelection(newselection);
- }
- }
-
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/page/FacesConfigMasterDetailPage.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/page/FacesConfigMasterDetailPage.java
deleted file mode 100644
index c9ff0ee..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/page/FacesConfigMasterDetailPage.java
+++ /dev/null
@@ -1,396 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui.page;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain;
-import org.eclipse.emf.edit.domain.EditingDomain;
-import org.eclipse.emf.edit.domain.IEditingDomainProvider;
-import org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider;
-import org.eclipse.emf.edit.ui.view.ExtendedPropertySheetPage;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.ISelectionProvider;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jst.jsf.facesconfig.ui.EditorPlugin;
-import org.eclipse.jst.jsf.facesconfig.ui.FacesConfigEditor;
-import org.eclipse.jst.jsf.facesconfig.ui.page.detail.FacesConfigDetailsPage;
-import org.eclipse.jst.jsf.facesconfig.ui.section.FacesConfigMasterSection;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.SashForm;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.IActionBars;
-import org.eclipse.ui.forms.DetailsPart;
-import org.eclipse.ui.forms.IDetailsPage;
-import org.eclipse.ui.forms.IDetailsPageProvider;
-import org.eclipse.ui.forms.IManagedForm;
-import org.eclipse.ui.forms.editor.FormPage;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-import org.eclipse.ui.forms.widgets.ScrolledForm;
-import org.eclipse.ui.views.properties.IPropertySheetPage;
-
-/**
- * In some cases the page is a master-detail style, the content of the right
- * side will change according user's selection on the left side. This is an
- * abstract implementation of IFacesConfigPage, with a FacesConfigMasterSection
- * array and a DetailsPart.
- *
- * @author sfshi
- *
- */
-public abstract class FacesConfigMasterDetailPage extends FormPage implements
- IFacesConfigPage, IDetailsPageProvider, ISelectionChangedListener,
- ISelectionProvider, IEditingDomainProvider {
-
- private static final String BANNER_IMAGE_FILE = "form_banner.gif"; //$NON-NLS-1$
-
- private final static Image BANNER_IMAGE = EditorPlugin.getDefault()
- .getImage(BANNER_IMAGE_FILE);
-
- private FacesConfigMasterSection[] facesConfigMasterSections;
-
- private DetailsPart detailsPart;
-
- private Object input;
-
- private List selectionChangedListeners = new ArrayList();
-
- private IPropertySheetPage propertySheetPage;
-
- private ISelection currentSelection = null;
-
- /**
- *
- * @param editor
- * the editor part that this page belongs to;
- * @param id
- * page id;
- * @param title
- * page title;
- */
- public FacesConfigMasterDetailPage(FacesConfigEditor editor, String id,
- String title) {
- super(editor, id, title);
- }
-
- public void dispose() {
- for(int i=0; i < facesConfigMasterSections.length;i++) {
- FacesConfigMasterSection master = facesConfigMasterSections[i];
- if (master != null)
- master.dispose();
- }
-
- selectionChangedListeners.clear();
-
- super.dispose();
- }
- public EditingDomain getEditingDomain() {
- return ((FacesConfigEditor) getEditor()).getEditingDomain();
- }
-
- /**
- *
- * @see org.eclipse.ui.forms.editor.FormPage#createFormContent(org.eclipse.ui.forms.IManagedForm)
- */
- protected void createFormContent(IManagedForm managedForm) {
-
- ScrolledForm form = managedForm.getForm();
- form.setText(this.getTitle());
- form.setBackgroundImage(BANNER_IMAGE);
- fillBody(managedForm, managedForm.getToolkit());
- managedForm.refresh();
- }
-
- /**
- * set input for this page when the it got activated at the first time; if
- * it's not the first time, then refresh the page.
- *
- * @see org.eclipse.ui.forms.editor.FormPage#setActive(boolean)
- */
- public void setActive(boolean active) {
- super.setActive(active);
- if (active) {
- if (getInput() != ((FacesConfigEditor) getEditor())
- .getFacesConfig()) {
- setInput(((FacesConfigEditor) getEditor()).getFacesConfig());
- } else {
- this.refresh();
- }
- }
- }
-
- public boolean isEditor() {
- return true;
- }
-
- /**
- *
- * @param managedForm
- * @param toolkit
- */
- private void fillBody(IManagedForm managedForm, FormToolkit toolkit) {
- Composite body = managedForm.getForm().getBody();
-
- GridLayout gridLayout = new GridLayout();
- gridLayout.horizontalSpacing = 0;
- gridLayout.verticalSpacing = 0;
- gridLayout.numColumns = 2;
- gridLayout.marginHeight = 0;
- gridLayout.marginWidth = 0;
- body.setLayout(gridLayout);
-
- SashForm sashForm = new SashForm(body, SWT.NULL);
- managedForm.getToolkit().adapt(sashForm, false, false);
- sashForm.setMenu(body.getMenu());
- sashForm.setLayoutData(new GridData(GridData.FILL_BOTH));
-
- Composite leftContainer = toolkit.createComposite(sashForm);
- GridLayout gl = new GridLayout();
- gl.marginHeight = 0;
- leftContainer.setLayout(gl);
-
- // create master sections here
- facesConfigMasterSections = createMasterSections(leftContainer,
- managedForm, toolkit, this);
-
- if (facesConfigMasterSections != null) {
- for (int i = 0, n = facesConfigMasterSections.length; i < n; i++) {
- FacesConfigMasterSection aSection = facesConfigMasterSections[i];
- aSection.initialize();
- aSection.addSelectionChangedListener(this);
-
- }
- }
-
- detailsPart = new DetailsPart(managedForm, sashForm, SWT.NULL);
- managedForm.addPart(detailsPart);
-
- detailsPart.setPageLimit(4);
- detailsPart.setPageProvider(this);
-
- detailsPart.initialize(managedForm);
-
- sashForm.setWeights(new int[] { 40, 60 });
-
- getSite().setSelectionProvider(this);
- }
-
- /**
- * Create the detail sections, and set layout data and initial expand state
- * for them.
- *
- * @param composite
- * @param managedForm
- * @param toolkit
- * @param page
- * @return the detail sections
- */
- abstract protected FacesConfigMasterSection[] createMasterSections(
- Composite composite, IManagedForm managedForm, FormToolkit toolkit,
- FacesConfigMasterDetailPage page);
-
- /**
- * set input object; also set into all the master sections.
- */
- public void setInput(Object input) {
- if (facesConfigMasterSections != null) {
- for (int i = 0, n = facesConfigMasterSections.length; i < n; i++) {
- facesConfigMasterSections[i].setInput(input);
- }
- }
- this.input = input;
- }
-
- /**
- * get the input object.
- */
- public Object getInput() {
- return input;
- }
-
- /**
- * Defaultly use the EClass object of the selected object as page key. Sub
- * classes can override this method if there has other ways.
- *
- * @param object
- */
- public Object getPageKey(Object object) {
- if (object instanceof EObject) {
- EObject eObject = (EObject) object;
- return eObject.eClass();
- }
- return null;
- }
-
- /**
- * Subclasses should create and return an IDetailsPage instance according
- * what the key is. Defaultly the EClass object of the selected object in
- * the structured viewer will be taken as the page key.
- *
- * @see #getPageKey
- *
- */
- abstract public IDetailsPage getPage(Object key);
-
- /**
- * transfer the selection changed event to detail part.
- */
- public void selectionChanged(SelectionChangedEvent event) {
-
- currentSelection = event.getSelection();
- if (event.getSource() instanceof FacesConfigMasterSection) {
- FacesConfigMasterSection source = (FacesConfigMasterSection) event
- .getSource();
-
- detailsPart.selectionChanged(source, event.getSelection());
-
- if (source.getSection().isExpanded()) {
- for (int i = 0, n = selectionChangedListeners.size(); i < n; i++) {
- ((ISelectionChangedListener) selectionChangedListeners
- .get(i)).selectionChanged(event);
- }
- }
- } else if (event.getSource() instanceof FacesConfigDetailsPage) {
- for (int i = 0, n = selectionChangedListeners.size(); i < n; i++) {
- ((ISelectionChangedListener) selectionChangedListeners.get(i))
- .selectionChanged(event);
- }
- }
- }
-
- /**
- * set other sections' expand state to false, except this section;
- *
- * @param section
- * the section that be expanded.
- */
- public void closeOtherSections(FacesConfigMasterSection section) {
-
- for (int i = 0, n = facesConfigMasterSections.length; i < n; i++) {
- FacesConfigMasterSection aSection = facesConfigMasterSections[i];
- if (aSection != section && aSection.getSection().isExpanded()) {
- aSection.getSection().setExpanded(false);
- GridData gd = new GridData(GridData.FILL_HORIZONTAL);
- aSection.getSection().setLayoutData(gd);
- }
- }
- }
-
- /**
- * refresh this page, the expanded section and the detail page will got
- * refreshed.
- */
- public void refresh() {
-
- // only refresh the expanded section;
- for (int i = 0, n = facesConfigMasterSections.length; i < n; i++) {
- if (facesConfigMasterSections[i].getSection().isExpanded()) {
- facesConfigMasterSections[i].refresh();
- }
- }
-
- // refresh the detail page, it will call detail sections
- // to got refreshed.
- if (detailsPart.getCurrentPage() != null) {
- detailsPart.getCurrentPage().refresh();
- }
- }
-
- /**
- * get the section that is expanded.
- *
- * @return the master section
- */
- protected FacesConfigMasterSection getActiveSection() {
- for (int i = 0, n = facesConfigMasterSections.length; i < n; i++) {
-
- if (facesConfigMasterSections[i].getSection().isExpanded()) {
- return facesConfigMasterSections[i];
- }
- }
- return null;
-
- }
-
- public void addSelectionChangedListener(ISelectionChangedListener listener) {
- selectionChangedListeners.add(listener);
- }
-
- public ISelection getSelection() {
- if(currentSelection != null)
- return currentSelection;
- return StructuredSelection.EMPTY;
-
- }
-
- public void removeSelectionChangedListener(
- ISelectionChangedListener listener) {
- selectionChangedListeners.remove(listener);
- }
-
- public void setSelection(ISelection selection) {
- // no selection setting
- }
-
- public Object getAdapter(Class adapter) {
-
- if (adapter == IPropertySheetPage.class) {
- return getPropertySheetPage();
- }
- return super.getAdapter(adapter);
- }
-
- private IPropertySheetPage getPropertySheetPage() {
-
- AdapterFactoryEditingDomain editingDomain = (AdapterFactoryEditingDomain) getEditor()
- .getAdapter(EditingDomain.class);
- AdapterFactory adapterFactory = (AdapterFactory) getEditor()
- .getAdapter(AdapterFactory.class);
- if (propertySheetPage == null) {
- propertySheetPage = new ExtendedPropertySheetPage(editingDomain) {
- public void setSelectionToViewer(List selection) {
- // FacesConfigEditor.this.setSelectionToViewer(selection);
- // FacesConfigEditor.this.setFocus();
- }
-
- public void setActionBars(IActionBars actionBars) {
- super.setActionBars(actionBars);
- // getActionBarContributor().shareGlobalActions(this,
- // actionBars);
- }
- };
- ((ExtendedPropertySheetPage) propertySheetPage)
- .setPropertySourceProvider(new AdapterFactoryContentProvider(
- adapterFactory));
- // this.addSelectionChangedListener((ExtendedPropertySheetPage)
- // propertySheetPage);
- }
-
- return propertySheetPage;
-
- }
-
- /**
- * @return the facesConfigMasterSections
- */
- public FacesConfigMasterSection[] getFacesConfigMasterSections() {
- return facesConfigMasterSections;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/page/IFacesConfigPage.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/page/IFacesConfigPage.java
deleted file mode 100644
index 42afa4f..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/page/IFacesConfigPage.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui.page;
-
-import org.eclipse.ui.forms.editor.IFormPage;
-
-/**
- * Implemented by IFormPage's that want to support EditorInput-like
- * model set/get/refresh
- *
- * @author sfshi
- *
- */
-public interface IFacesConfigPage extends IFormPage {
-
- /**
- * Set the input. Implementer may choose to ignore
- *
- * @param input
- */
- void setInput(Object input);
-
- /**
- * @return the input or null if none set
- */
- Object getInput();
-
- /**
- * signal to a form page that the data in its input has changed
- * and it should refresh its view.
- */
- void refresh();
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/page/IntroductionPage.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/page/IntroductionPage.java
deleted file mode 100644
index f3e1354..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/page/IntroductionPage.java
+++ /dev/null
@@ -1,176 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui.page;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.jface.util.IPropertyChangeListener;
-import org.eclipse.jface.util.PropertyChangeEvent;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.ISelectionProvider;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jst.jsf.common.ui.internal.guiutils.IntroductionSection;
-import org.eclipse.jst.jsf.facesconfig.ui.EditorMessages;
-import org.eclipse.jst.jsf.facesconfig.ui.EditorPlugin;
-import org.eclipse.jst.jsf.facesconfig.ui.FacesConfigEditor;
-import org.eclipse.jst.jsf.facesconfig.ui.preference.GEMPreferences;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.ui.forms.IManagedForm;
-import org.eclipse.ui.forms.editor.FormPage;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-import org.eclipse.ui.forms.widgets.ScrolledForm;
-import org.eclipse.ui.forms.widgets.TableWrapData;
-import org.eclipse.ui.forms.widgets.TableWrapLayout;
-
-/**
- * Handle the Introduction page for the pageflow editor.
- *
- * @author jchoi
- */
-public class IntroductionPage extends FormPage implements IFacesConfigPage, ISelectionProvider, IPropertyChangeListener{
-
- private static final String FORM_BANNER_IMAGE_FILE = "form_banner.gif"; //$NON-NLS-1$
-
- private Button noIntroPageButton = null;
-
- /**
- * @param facesConfigEditor
- */
- public IntroductionPage(FacesConfigEditor facesConfigEditor) {
- super(facesConfigEditor, IntroductionPage.class.getName(),
- EditorMessages.editor_pageflow_page_intro_name);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.ui.forms.editor.FormPage#createFormContent(org.eclipse.ui.forms.IManagedForm)
- */
- protected void createFormContent(IManagedForm managedForm) {
- // get the form
- ScrolledForm form = managedForm.getForm();
- FormToolkit toolkit = getEditor().getToolkit();
- form.setText(EditorMessages.editor_pageflow_page_intro_title);
-
- form.setBackgroundImage(EditorPlugin.getDefault().getImage(FORM_BANNER_IMAGE_FILE));
-
- // create a layout
- TableWrapLayout layout = new TableWrapLayout();
- layout.numColumns = 1;
- layout.makeColumnsEqualWidth = true;
- layout.verticalSpacing = 20;
- form.getBody().setLayout(layout);
-
- IntroductionSection introPart = new IntroductionSection(
- FacesConfigEditor.EDITOR_ID, managedForm, toolkit,
- EditorMessages.editor_pageflow_page_intro_help_HelpContextID,
- EditorMessages.editor_pageflow_page_intro_help_HelpToolTip);
-
- noIntroPageButton = toolkit.createButton(form.getBody(), EditorMessages.editor_pageflow_page_intro_NoIntroPage, SWT.CHECK);
- noIntroPageButton.addSelectionListener(new SelectionAdapter() {
- public void widgetSelected(SelectionEvent e) {
- boolean selection = ((Button) e.widget).getSelection();
- EditorPlugin.getDefault().getPreferenceStore().setValue(GEMPreferences.SHOW_INTRO_EDITOR, !selection);
- }
- });
- TableWrapData td = new TableWrapData(TableWrapData.FILL_GRAB);
- td.colspan = 1;
- introPart.setLayoutData(td);
-
- getSite().setSelectionProvider(this);
-
- IPreferenceStore preferenceStore = EditorPlugin.getDefault().getPreferenceStore();
- preferenceStore.addPropertyChangeListener(this);
- updatePrefenceControls(preferenceStore);
- }
-
- public void addSelectionChangedListener(ISelectionChangedListener listener) {
- // TODO Auto-generated method stub
-
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.ui.forms.editor.IFormPage#isEditor()
- */
- public boolean isEditor() {
- return true;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.ISelectionProvider#getSelection()
- */
- public ISelection getSelection() {
- return StructuredSelection.EMPTY;
- }
-
- public void removeSelectionChangedListener(ISelectionChangedListener listener) {
- // TODO Auto-generated method stub
-
- }
-
- public void setSelection(ISelection selection) {
- // TODO Auto-generated method stub
-
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.jsf.facesconfig.ui.page.IFacesConfigPage#getInput()
- */
- public Object getInput() {
- // TODO Auto-generated method stub
- return null;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.jsf.facesconfig.ui.page.IFacesConfigPage#refresh()
- */
- public void refresh() {
- // TODO Auto-generated method stub
-
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.jsf.facesconfig.ui.page.IFacesConfigPage#setInput(java.lang.Object)
- */
- public void setInput(Object input) {
- // TODO Auto-generated method stub
-
- }
-
- public void propertyChange(PropertyChangeEvent event) {
- if (event != null) {
- String property = event.getProperty();
- if (property == null || property.equals(GEMPreferences.SHOW_INTRO_EDITOR)) {
- //assume that we are in an ui thread, as other listeners assume this too:
- updatePrefenceControls(EditorPlugin.getDefault().getPreferenceStore());
- }
- }
- }
-
- private void updatePrefenceControls(IPreferenceStore preferenceStore) {
- boolean noIntroPage = !GEMPreferences.getShowIntroEditor();
- noIntroPageButton.setSelection(noIntroPage);
- }
-
- public void dispose() {
- EditorPlugin.getDefault().getPreferenceStore().removePropertyChangeListener(this);
- super.dispose();
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/page/ManagedBeanPage.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/page/ManagedBeanPage.java
deleted file mode 100644
index ad6ef9a..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/page/ManagedBeanPage.java
+++ /dev/null
@@ -1,205 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui.page;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider;
-import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.ISelectionProvider;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.viewers.TreeViewer;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerFilter;
-import org.eclipse.jface.viewers.ViewerSorter;
-import org.eclipse.jst.jsf.facesconfig.emf.FacesConfigPackage;
-import org.eclipse.jst.jsf.facesconfig.emf.ManagedBeanType;
-import org.eclipse.jst.jsf.facesconfig.emf.ManagedPropertyType;
-import org.eclipse.jst.jsf.facesconfig.ui.FacesConfigEditor;
-import org.eclipse.jst.jsf.facesconfig.ui.EditorMessages;
-import org.eclipse.jst.jsf.facesconfig.ui.page.detail.ManagedBeanDetailsPage;
-import org.eclipse.jst.jsf.facesconfig.ui.section.FacesConfigMasterSection;
-import org.eclipse.jst.jsf.facesconfig.ui.section.ManagedBeanMasterSection;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.forms.IDetailsPage;
-import org.eclipse.ui.forms.IManagedForm;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-import org.eclipse.ui.views.contentoutline.ContentOutlinePage;
-import org.eclipse.ui.views.contentoutline.IContentOutlinePage;
-
-/**
- *
- * @author sfshi
- *
- */
-public class ManagedBeanPage extends FacesConfigMasterDetailPage {
-
- /**
- * The id of this page in the faces-config editor.
- */
- public static final String PAGE_ID = "org.eclipse.jst.jsf.facesconfig.ui.page.ManagedBeanPage"; //$NON-NLS-1$
-
- private IContentOutlinePage contentOutlinePage;
-
- /**
- * @param editor
- */
- public ManagedBeanPage(FacesConfigEditor editor) {
- super(editor, "ManagedBeanPage", //$NON-NLS-1$
- EditorMessages.FacesConfigEditor_ManagedBeans_TabName);
- }
-
- public void dispose() {
- if (contentOutlinePage != null) {
- contentOutlinePage.dispose();
- contentOutlinePage = null;
- }
- super.dispose();
- }
- protected FacesConfigMasterSection[] createMasterSections(
- Composite composite, IManagedForm managedForm, FormToolkit toolkit,
- FacesConfigMasterDetailPage page) {
- FacesConfigMasterSection managedBeanMaster = new ManagedBeanMasterSection(
- composite, managedForm, toolkit, page);
- managedBeanMaster.getSection().setExpanded(true);
- GridData gd = new GridData(GridData.FILL_BOTH);
- managedBeanMaster.getSection().setLayoutData(gd);
- return new FacesConfigMasterSection[] { managedBeanMaster };
- }
-
- public IDetailsPage getPage(Object key) {
- IDetailsPage detailsPage = null;
- if (key instanceof EClass) {
- EClass eClass = (EClass) key;
- if (eClass.getClassifierID() == FacesConfigPackage.MANAGED_BEAN_TYPE) {
- detailsPage = new ManagedBeanDetailsPage(this);
- }
-
- if (detailsPage instanceof ISelectionProvider) {
- ((ISelectionProvider) detailsPage)
- .addSelectionChangedListener(this);
- }
- }
- return detailsPage;
- }
-
- public Object getAdapter(Class adapter) {
-
- if (adapter == IContentOutlinePage.class) {
- return getOutlinePage();
- }
-
- return super.getAdapter(adapter);
- }
-
- private IContentOutlinePage getOutlinePage() {
-
- if (contentOutlinePage == null) {
- // The content outline is just a tree.
- //
- class ManagedBeanContentOutlinePage extends ContentOutlinePage {
- public void createControl(Composite parent) {
- super.createControl(parent);
- TreeViewer contentOutlineViewer = getTreeViewer();
- contentOutlineViewer.addSelectionChangedListener(this);
-
- AdapterFactory adapterFactory = (AdapterFactory) getEditor()
- .getAdapter(AdapterFactory.class);
- // Set up the tree viewer.
- contentOutlineViewer
- .setContentProvider(new AdapterFactoryContentProvider(
- adapterFactory));
- contentOutlineViewer
- .setLabelProvider(new AdapterFactoryLabelProvider(
- adapterFactory));
- contentOutlineViewer.addFilter(new ViewerFilter() {
-
- public boolean select(Viewer viewer,
- Object parentElement, Object element) {
- return FacesConfigPackage.eINSTANCE
- .getManagedBeanType().isInstance(element)
- || FacesConfigPackage.eINSTANCE
- .getManagedPropertyType()
- .isInstance(element);
- }
- });
-
- contentOutlineViewer.setSorter(new ViewerSorter());
- contentOutlineViewer.setInput(getInput());
- }
-
- }
-
- contentOutlinePage = new ManagedBeanContentOutlinePage();
-
- // Listen to selection so that we can handle it is a special
- // way.
- //
- contentOutlinePage
- .addSelectionChangedListener(new ISelectionChangedListener() {
- // This ensures that we handle selections correctly.
- public void selectionChanged(SelectionChangedEvent event) {
- setSelection(event.getSelection());
- }
- });
-
- // this.addSelectionChangedListener((ContentOutlinePage)
- // contentOutlinePage);
- }
-
- return contentOutlinePage;
-
- }
-
- /**
- * handle the selection changed event from outline page.
- *
- * @param selection
- */
- public void setSelection(ISelection selection) {
-
- if (selection instanceof IStructuredSelection) {
- IStructuredSelection ss = (IStructuredSelection) selection;
- ManagedBeanType bean = null;
- if (ss.getFirstElement() instanceof ManagedBeanType) {
- bean = (ManagedBeanType) ss.getFirstElement();
- } else if (ss.getFirstElement() instanceof ManagedPropertyType) {
- bean = (ManagedBeanType) ((ManagedPropertyType) ss
- .getFirstElement()).eContainer();
- }
-
- if (bean != null) {
- if (!getManagedBeanMasterSection().getSection().isExpanded()) {
- GridData gd = new GridData(GridData.FILL_BOTH);
- getManagedBeanMasterSection().getSection()
- .setLayoutData(gd);
- getManagedBeanMasterSection().getSection()
- .setExpanded(true);
- }
- IStructuredSelection newselection = new StructuredSelection(
- bean);
- getManagedBeanMasterSection().getStructuredViewer()
- .setSelection(newselection);
- }
- }
-
- }
-
- private ManagedBeanMasterSection getManagedBeanMasterSection() {
- return (ManagedBeanMasterSection) getFacesConfigMasterSections()[0];
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/page/OthersPage.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/page/OthersPage.java
deleted file mode 100644
index 021e7b6..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/page/OthersPage.java
+++ /dev/null
@@ -1,836 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui.page;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.impl.AdapterImpl;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain;
-import org.eclipse.emf.edit.domain.EditingDomain;
-import org.eclipse.emf.edit.domain.IEditingDomainProvider;
-import org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider;
-import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider;
-import org.eclipse.emf.edit.ui.view.ExtendedPropertySheetPage;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.ISelectionProvider;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.viewers.TreeViewer;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerFilter;
-import org.eclipse.jface.viewers.ViewerSorter;
-import org.eclipse.jst.jsf.facesconfig.emf.ApplicationType;
-import org.eclipse.jst.jsf.facesconfig.emf.FacesConfigPackage;
-import org.eclipse.jst.jsf.facesconfig.emf.FacesConfigType;
-import org.eclipse.jst.jsf.facesconfig.emf.FactoryType;
-import org.eclipse.jst.jsf.facesconfig.emf.LifecycleType;
-import org.eclipse.jst.jsf.facesconfig.ui.EditorMessages;
-import org.eclipse.jst.jsf.facesconfig.ui.EditorPlugin;
-import org.eclipse.jst.jsf.facesconfig.ui.FacesConfigEditor;
-import org.eclipse.jst.jsf.facesconfig.ui.section.AbstractFacesConfigSection;
-import org.eclipse.jst.jsf.facesconfig.ui.section.ApplicationSection;
-import org.eclipse.jst.jsf.facesconfig.ui.section.FactorySection;
-import org.eclipse.jst.jsf.facesconfig.ui.section.LifecycleSection;
-import org.eclipse.jst.jsf.facesconfig.ui.section.LocaleConfigSection;
-import org.eclipse.jst.jsf.facesconfig.ui.section.OthersPageBaseSection;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.SashForm;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.IActionBars;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.forms.IManagedForm;
-import org.eclipse.ui.forms.editor.FormPage;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-import org.eclipse.ui.forms.widgets.ScrolledForm;
-import org.eclipse.ui.views.contentoutline.ContentOutlinePage;
-import org.eclipse.ui.views.contentoutline.IContentOutlinePage;
-import org.eclipse.ui.views.properties.IPropertySheetPage;
-
-/**
- * @author Zhi-peng Zhang, sfshi
- * @version
- */
-
-/**
- * This class is the "Others" page.
- */
-public class OthersPage extends FormPage implements IFacesConfigPage,
- ISelectionProvider, ISelectionChangedListener, IEditingDomainProvider {
-
- private static final String BANNER_IMAGE_FILE = "form_banner.gif"; //$NON-NLS-1$
-
- /**
- * The id of this page in the faces-config editor.
- */
- public static final String PAGE_ID = "org.eclipse.jst.jsf.facesconfig.ui.page.OthersPage"; //$NON-NLS-1$
-
- private final static Image BANNER_IMAGE = EditorPlugin.getDefault()
- .getImage(BANNER_IMAGE_FILE);
-
- private List leftSections;
-
- private List rightSections;
-
- private Object input;
-
- private List selectionChangedListeners = new ArrayList();
-
- private IPropertySheetPage propertySheetPage;
-
- private IContentOutlinePage contentOutlinePage;
-
- private ISelection currentSelection;
-
- private FacesConfigOthersAdapter _facesConfigOthersAdapter;
-
- /**
- * Constructor of OthersPage;
- *
- * @param editor
- * the facesconfig editor;
- */
- public OthersPage(FacesConfigEditor editor) {
- super(editor, "OthersPage", //$NON-NLS-1$
- EditorMessages.FacesConfigEditor_Others_TabName);
- }
-
- protected void createFormContent(IManagedForm managedForm) {
- super.createFormContent(managedForm);
- ScrolledForm form = managedForm.getForm();
- form.setText(EditorMessages.OthersPage_Title);
- form.setBackgroundImage(BANNER_IMAGE);
- fillBody(managedForm, managedForm.getToolkit());
- managedForm.refresh();
- }
-
- private void initSection(OthersPageBaseSection section, String name,
- String description, ArrayList list) {
- section.getSection().setText(name);
- section.getSection().setDescription(description);
- section.initialize();
- section.addSelectionChangedListener(this);
- section.getSection().setExpanded(false);
- section.getSection().setLayoutData(
- new GridData(GridData.FILL_HORIZONTAL));
- list.add(section);
- }
-
- public void dispose() {
- disposeFormSections(rightSections);
- disposeFormSections(leftSections);
- removeAdapterFromInput(getInput());
- getSite().setSelectionProvider(null);
- super.dispose();
- }
-
- private void disposeFormSections(List sections) {
- for (int i=0; i < sections.size();i++) {
- OthersPageBaseSection section = (OthersPageBaseSection) sections.get(i);
- section.removeSelectionChangedListener(this);
- section.dispose();
- }
- }
-
- private void fillBody(IManagedForm managedForm, FormToolkit toolkit) {
- Composite body = managedForm.getForm().getBody();
-
- body.setLayout(new GridLayout());
-
- SashForm sashForm = new SashForm(body, SWT.NONE);
- managedForm.getToolkit().adapt(sashForm, false, false);
- sashForm.setMenu(body.getMenu());
- sashForm.setLayoutData(new GridData(GridData.FILL_BOTH));
-
- Composite leftContainer = toolkit.createComposite(sashForm);
- leftContainer.setLayout(new GridLayout());
-
- ArrayList sectionList = new ArrayList();
-
- OthersPageBaseSection section = new ApplicationSection(
- FacesConfigPackage.eINSTANCE.getActionListenerType(),
- leftContainer, managedForm, this, toolkit);
- initSection(section, EditorMessages.ActionListenerSection_Name,
- EditorMessages.ActionListenerSection_Description,
- sectionList);
- section.getSection().setLayoutData(new GridData(GridData.FILL_BOTH));
- section.getSection().setExpanded(true);
-
- section = new ApplicationSection(FacesConfigPackage.eINSTANCE
- .getDefaultRenderKitIdType(), leftContainer, managedForm, this,
- toolkit);
- initSection(section,
- EditorMessages.DefaultRenderKitIDSection_Name,
- EditorMessages.DefaultRenderKitIDSection_Description,
- sectionList);
-
- section = new LocaleConfigSection(FacesConfigPackage.eINSTANCE
- .getSupportedLocaleType(), leftContainer, managedForm, this,
- toolkit);
- initSection(section, EditorMessages.LocaleConfigSection_Name,
- EditorMessages.LocaleConfigSection_Description,
- sectionList);
-
- section = new ApplicationSection(FacesConfigPackage.eINSTANCE
- .getMessageBundleType(), leftContainer, managedForm, this,
- toolkit);
- initSection(section, EditorMessages.MessageBundleSection_Name,
- EditorMessages.MessageBundleSection_Description,
- sectionList);
-
- section = new ApplicationSection(FacesConfigPackage.eINSTANCE
- .getNavigationHandlerType(), leftContainer, managedForm, this,
- toolkit);
- initSection(section,
- EditorMessages.NavigationHandlerSection_Name,
- EditorMessages.NavigationHandlerSection_Description,
- sectionList);
-
- section = new ApplicationSection(FacesConfigPackage.eINSTANCE
- .getPropertyResolverType(), leftContainer, managedForm, this,
- toolkit);
- initSection(section,
- EditorMessages.PropertyResolverSection_Name,
- EditorMessages.PropertyResolverSection_Description,
- sectionList);
-
- section = new ApplicationSection(FacesConfigPackage.eINSTANCE
- .getStateManagerType(), leftContainer, managedForm, this,
- toolkit);
- initSection(section, EditorMessages.StateManagerSection_Name,
- EditorMessages.StateManagerSection_Description,
- sectionList);
-
- section = new ApplicationSection(FacesConfigPackage.eINSTANCE
- .getVariableResolverType(), leftContainer, managedForm, this,
- toolkit);
- initSection(section,
- EditorMessages.VariableResolverSection_Name,
- EditorMessages.VariableResolverSection_Description,
- sectionList);
-
- section = new ApplicationSection(FacesConfigPackage.eINSTANCE
- .getViewHandlerType(), leftContainer, managedForm, this,
- toolkit);
- initSection(section, EditorMessages.ViewHandlerSection_Name,
- EditorMessages.ViewHandlerSection_Description,
- sectionList);
-
- leftSections = sectionList;
-
- sectionList = new ArrayList();
-
- Composite rightContainer = toolkit.createComposite(sashForm);
- rightContainer.setLayout(new GridLayout());
- rightContainer.setLayoutData(new GridData(GridData.FILL_BOTH));
-
- section = new FactorySection(FacesConfigPackage.eINSTANCE
- .getApplicationFactoryType(), rightContainer, managedForm,
- this, toolkit);
- initSection(section,
- EditorMessages.ApplicationFactorySection_Name,
- EditorMessages.ApplicationFactorySection_Description,
- sectionList);
- section.getSection().setLayoutData(new GridData(GridData.FILL_BOTH));
- section.getSection().setExpanded(true);
-
- section = new FactorySection(FacesConfigPackage.eINSTANCE
- .getFacesContextFactoryType(), rightContainer, managedForm,
- this, toolkit);
- initSection(section,
- EditorMessages.FacesContextFactorySection_Name,
- EditorMessages.FacesContextFactorySection_Description,
- sectionList);
-
- section = new FactorySection(FacesConfigPackage.eINSTANCE
- .getLifecycleFactoryType(), rightContainer, managedForm, this,
- toolkit);
- initSection(section,
- EditorMessages.LifecycleFactorySection_Name,
- EditorMessages.LifecycleFactorySection_Description,
- sectionList);
-
- section = new FactorySection(FacesConfigPackage.eINSTANCE
- .getRenderKitFactoryType(), rightContainer, managedForm, this,
- toolkit);
- initSection(section,
- EditorMessages.RenderKitFactorySection_Name,
- EditorMessages.RenderKitFactorySection_Description,
- sectionList);
-
- section = new LifecycleSection(FacesConfigPackage.eINSTANCE
- .getPhaseListenerType(), rightContainer, managedForm, this,
- toolkit);
- initSection(section, EditorMessages.PhaseListenerSection_Name,
- EditorMessages.PhaseListenerSection_Description,
- sectionList);
-
- rightSections = sectionList;
-
- getSite().setSelectionProvider(this);
- }
-
- /**
- * set input for this page when the it got activated at the first time; if
- * it's not the first time, then refresh the page.
- *
- * @see org.eclipse.ui.forms.editor.FormPage#setActive(boolean)
- */
- public void setActive(boolean active) {
- super.setActive(active);
- if (active) {
- if (getInput() != ((FacesConfigEditor) getEditor())
- .getFacesConfig()) {
- setInput(((FacesConfigEditor) getEditor()).getFacesConfig());
- } else {
- this.refresh();
- }
- }
- }
-
- /**
- *
- */
- public void setInput(Object input) {
- if (input instanceof FacesConfigType) {
- this.input = input;
- FacesConfigType facesConfig = (FacesConfigType) input;
- facesConfig.eAdapters().add(getFacesConfigAdapter());
- setInputForApplicationSections(facesConfig);
- setInputForFactorySections(facesConfig);
- setInputForLifecycleSections(facesConfig);
- }
- }
-
- private void removeAdapterFromInput(Object input_) {
- if (_facesConfigOthersAdapter != null && input_ != null && input_ instanceof FacesConfigType) {
- ((FacesConfigType)input_).eAdapters().remove(_facesConfigOthersAdapter);
- }
- }
-
- private Adapter getFacesConfigAdapter() {
- if (_facesConfigOthersAdapter == null) {
- _facesConfigOthersAdapter = new FacesConfigOthersAdapter();
- }
- return _facesConfigOthersAdapter;
- }
-
- public boolean isEditor() {
- return true;
- }
-
- /**
- * Reset the editor input for the application section
- */
- public void resetApplicationInput() {
- if (getInput() instanceof FacesConfigType) {
- setInputForApplicationSections((FacesConfigType) getInput());
- }
- }
-
- /**
- * Reset the editor input for the factory sections
- */
- public void resetFactoryInput() {
- if (getInput() instanceof FacesConfigType) {
- setInputForFactorySections((FacesConfigType) getInput());
- }
- }
-
- /**
- * Reset the editor input for the lifecycle section
- */
- public void resetLifecycleInput() {
- if (getInput() instanceof FacesConfigType) {
- setInputForLifecycleSections((FacesConfigType) getInput());
- }
- }
-
- /**
- * Sets the model for all Application sub-model elements to facesConfig
- * @param facesConfig
- */
- protected void setInputForApplicationSections(FacesConfigType facesConfig) {
- ApplicationType application;
- if (facesConfig.getApplication().size() > 0) {
- application = (ApplicationType) facesConfig.getApplication().get(0);
- } else {
- application = null;
- }
- for (Iterator it = leftSections.iterator(); it.hasNext();) {
- ApplicationSection section = (ApplicationSection) it.next();
- section.setInput(application);
- }
- }
-
- /**
- * Sets the model for all Factory sub-model elements to facesConfig
- * @param facesConfig
- */
- protected void setInputForFactorySections(FacesConfigType facesConfig) {
- FactoryType factory;
- if (facesConfig.getFactory().size() > 0) {
- factory = (FactoryType) facesConfig.getFactory().get(0);
- } else {
- factory = null;
- }
-
- for (Iterator it = rightSections.iterator(); it.hasNext();) {
- Object section = it.next();
- if (section instanceof FactorySection)
- ((FactorySection) section).setInput(factory);
- }
- }
-
- /**
- * Sets the model for all Lifecycle sub-model elements to facesConfig
- * @param facesConfig
- */
- protected void setInputForLifecycleSections(FacesConfigType facesConfig) {
- LifecycleType lifecycle;
- if (facesConfig.getLifecycle().size() > 0) {
- lifecycle = (LifecycleType) facesConfig.getLifecycle().get(0);
-
- } else {
- lifecycle = null;
- }
- for (Iterator it = rightSections.iterator(); it.hasNext();) {
- Object section = it.next();
- if (section instanceof LifecycleSection)
- ((LifecycleSection) section).setInput(lifecycle);
- }
- }
-
- public Object getInput() {
- return input;
- }
-
- public void refresh() {
-
- // only refresh the expanded section;
- for (int i = 0, n = leftSections.size(); i < n; i++) {
- OthersPageBaseSection section = (OthersPageBaseSection) leftSections
- .get(i);
- if (section.getSection().isExpanded()) {
- section.refresh();
- }
- }
-
- for (int i = 0, n = rightSections.size(); i < n; i++) {
- OthersPageBaseSection section = (OthersPageBaseSection) leftSections
- .get(i);
- if (section.getSection().isExpanded()) {
- section.refresh();
- }
- }
-
- }
-
- /**
- * set other sections' expand state to false, except this section;
- *
- * @param section
- * the section that be expanded.
- */
- public void closeOtherSections(AbstractFacesConfigSection section) {
- OthersPageBaseSection[] sections;
- if (leftSections.contains(section)) {
- sections = (OthersPageBaseSection[]) leftSections
- .toArray(new OthersPageBaseSection[leftSections.size()]);
- } else {
- sections = (OthersPageBaseSection[]) rightSections
- .toArray(new OthersPageBaseSection[rightSections.size()]);
- }
- for (int i = 0, n = sections.length; i < n; i++) {
- AbstractFacesConfigSection aSection = sections[i];
- if (aSection != section && aSection.getSection().isExpanded()) {
- aSection.getSection().setExpanded(false);
- GridData gd = new GridData(GridData.FILL_HORIZONTAL);
- aSection.getSection().setLayoutData(gd);
- }
- }
- }
-
- /**
- * An adapter on faces config.
- *
- * @author sfshi
- *
- */
- class FacesConfigOthersAdapter extends AdapterImpl {
- public void notifyChanged(Notification msg) {
- if (msg.getEventType() == Notification.REMOVE
- || msg.getEventType() == Notification.ADD) {
- if (msg.getFeature() == FacesConfigPackage.eINSTANCE
- .getFacesConfigType_Application()) {
- if (Thread.currentThread() == PlatformUI.getWorkbench().getDisplay().getThread()) {
- resetApplicationInput();
- } else {
- PlatformUI.getWorkbench().getDisplay().asyncExec(new Runnable() {
- public void run() {
- resetApplicationInput();
- }
- });
- }
- } else if (msg.getFeature() == FacesConfigPackage.eINSTANCE
- .getFacesConfigType_Factory()) {
- if (Thread.currentThread() == PlatformUI.getWorkbench().getDisplay().getThread()) {
- resetFactoryInput();
- } else {
- PlatformUI.getWorkbench().getDisplay().asyncExec(new Runnable() {
- public void run() {
- resetFactoryInput();
- }
- });
- }
- } else if (msg.getFeature() == FacesConfigPackage.eINSTANCE
- .getFacesConfigType_Lifecycle()) {
- if (Thread.currentThread() == PlatformUI.getWorkbench().getDisplay().getThread()) {
- resetLifecycleInput();
- } else {
- PlatformUI.getWorkbench().getDisplay().asyncExec(new Runnable() {
- public void run() {
- resetLifecycleInput();
- }
- });
- }
- }
- }
- }
- }
-
- public void addSelectionChangedListener(ISelectionChangedListener listener) {
- // TODO Auto-generated method stub
-
- selectionChangedListeners.add(listener);
- }
-
- public ISelection getSelection() {
- if (currentSelection != null)
- return currentSelection;
-
- return StructuredSelection.EMPTY;
- }
-
- public void removeSelectionChangedListener(
- ISelectionChangedListener listener) {
- // TODO Auto-generated method stub
-
- selectionChangedListeners.remove(listener);
- }
-
- public void selectionChanged(SelectionChangedEvent event) {
- currentSelection = event.getSelection();
- if (event.getSource() instanceof OthersPageBaseSection) {
- OthersPageBaseSection source = (OthersPageBaseSection) event
- .getSource();
-
- if (source.getSection().isExpanded()) {
- for (int i = 0, n = selectionChangedListeners.size(); i < n; i++) {
- ((ISelectionChangedListener) selectionChangedListeners
- .get(i)).selectionChanged(event);
- }
- }
- }
- }
-
- /**
- * get the section that is expanded.
- *
- * @return the page section
- */
- protected OthersPageBaseSection getActiveSection() {
- for (int i = 0, n = leftSections.size(); i < n; i++) {
-
- OthersPageBaseSection section = (OthersPageBaseSection) leftSections
- .get(i);
- if (section.getSection().isExpanded()) {
- return section;
- }
- }
-
- for (int i = 0, n = rightSections.size(); i < n; i++) {
-
- OthersPageBaseSection section = (OthersPageBaseSection) leftSections
- .get(i);
- if (section.getSection().isExpanded()) {
- return section;
- }
- }
- return null;
-
- }
-
- public Object getAdapter(Class adapter) {
-
- if (adapter == IPropertySheetPage.class) {
- return getPropertySheetPage();
- }
-
- if (adapter == IContentOutlinePage.class) {
- return getOutlinePage();
- }
-
- return super.getAdapter(adapter);
- }
-
- private IPropertySheetPage getPropertySheetPage() {
-
- AdapterFactoryEditingDomain editingDomain = (AdapterFactoryEditingDomain) getEditor()
- .getAdapter(EditingDomain.class);
- AdapterFactory adapterFactory = (AdapterFactory) getEditor()
- .getAdapter(AdapterFactory.class);
- if (propertySheetPage == null) {
- propertySheetPage = new ExtendedPropertySheetPage(editingDomain) {
- public void setSelectionToViewer(List selection) {
- // FacesConfigEditor.this.setSelectionToViewer(selection);
- // FacesConfigEditor.this.setFocus();
- }
-
- public void setActionBars(IActionBars actionBars) {
- super.setActionBars(actionBars);
- // getActionBarContributor().shareGlobalActions(this,
- // actionBars);
- }
- };
- ((ExtendedPropertySheetPage) propertySheetPage)
- .setPropertySourceProvider(new AdapterFactoryContentProvider(
- adapterFactory));
- // this.addSelectionChangedListener((ExtendedPropertySheetPage)
- // propertySheetPage);
- }
-
- return propertySheetPage;
-
- }
-
- private IContentOutlinePage getOutlinePage() {
-
- if (contentOutlinePage == null) {
- // The content outline is just a tree.
- //
- class OthersContentOutlinePage extends ContentOutlinePage {
- public void createControl(Composite parent) {
- super.createControl(parent);
- TreeViewer contentOutlineViewer = getTreeViewer();
- contentOutlineViewer.addSelectionChangedListener(this);
-
- AdapterFactory adapterFactory = (AdapterFactory) getEditor()
- .getAdapter(AdapterFactory.class);
- // Set up the tree viewer.
- contentOutlineViewer
- .setContentProvider(new AdapterFactoryContentProvider(
- adapterFactory));
- contentOutlineViewer
- .setLabelProvider(new AdapterFactoryLabelProvider(
- adapterFactory));
- contentOutlineViewer.addFilter(new ViewerFilter() {
-
- public boolean select(Viewer viewer,
- Object parentElement, Object element) {
- return FacesConfigPackage.eINSTANCE
- .getApplicationType().isInstance(element)
- || FacesConfigPackage.eINSTANCE
- .getFactoryType().isInstance(
- element)
- || FacesConfigPackage.eINSTANCE
- .getLifecycleType().isInstance(
- element)
- || FacesConfigPackage.eINSTANCE
- .getActionListenerType()
- .isInstance(element)
- || FacesConfigPackage.eINSTANCE
- .getDefaultRenderKitIdType()
- .isInstance(element)
- || FacesConfigPackage.eINSTANCE
- .getLocaleConfigType().isInstance(
- element)
- || FacesConfigPackage.eINSTANCE
- .getDefaultLocaleType().isInstance(
- element)
- || FacesConfigPackage.eINSTANCE
- .getSupportedLocaleType()
- .isInstance(element)
- || FacesConfigPackage.eINSTANCE
- .getMessageBundleType().isInstance(
- element)
- || FacesConfigPackage.eINSTANCE
- .getNavigationHandlerType()
- .isInstance(element)
- || FacesConfigPackage.eINSTANCE
- .getPropertyResolverType()
- .isInstance(element)
- || FacesConfigPackage.eINSTANCE
- .getStateManagerType().isInstance(
- element)
- || FacesConfigPackage.eINSTANCE
- .getVariableResolverType()
- .isInstance(element)
- || FacesConfigPackage.eINSTANCE
- .getViewHandlerType().isInstance(
- element)
- || FacesConfigPackage.eINSTANCE
- .getApplicationFactoryType()
- .isInstance(element)
- || FacesConfigPackage.eINSTANCE
- .getFacesContextFactoryType()
- .isInstance(element)
- || FacesConfigPackage.eINSTANCE
- .getLifecycleFactoryType()
- .isInstance(element)
- || FacesConfigPackage.eINSTANCE
- .getRenderKitFactoryType()
- .isInstance(element)
- || FacesConfigPackage.eINSTANCE
- .getPhaseListenerType().isInstance(
- element)
-
- ;
- }
- });
-
- contentOutlineViewer.setSorter(new ViewerSorter());
- contentOutlineViewer.setInput(getInput());
- }
-
- }
-
- contentOutlinePage = new OthersContentOutlinePage();
-
- // Listen to selection so that we can handle it is a special
- // way.
- //
- contentOutlinePage
- .addSelectionChangedListener(new ISelectionChangedListener() {
- // This ensures that we handle selections correctly.
- public void selectionChanged(SelectionChangedEvent event) {
- setSelection(event.getSelection());
- }
- });
-
- }
-
- return contentOutlinePage;
-
- }
-
- /**
- * handle the selection changed event from outline page.
- *
- * @param selection
- */
- public void setSelection(ISelection selection) {
-
- if (selection instanceof IStructuredSelection) {
- IStructuredSelection ss = (IStructuredSelection) selection;
- if (ss.isEmpty())
- return;
-
- final EObject object = (EObject) ss.getFirstElement();
- OthersPageBaseSection section = null;
-
- if (FacesConfigPackage.eINSTANCE.getActionListenerType()
- .isInstance(object)) {
- section = (OthersPageBaseSection) leftSections.get(0);
- } else if (FacesConfigPackage.eINSTANCE.getDefaultRenderKitIdType()
- .isInstance(object)) {
- section = (OthersPageBaseSection) leftSections.get(1);
- } else if (FacesConfigPackage.eINSTANCE.getLocaleConfigType()
- .isInstance(object)) {
- section = (OthersPageBaseSection) leftSections.get(2);
- } else if (FacesConfigPackage.eINSTANCE.getDefaultLocaleType()
- .isInstance(object)) {
- section = (OthersPageBaseSection) leftSections.get(2);
- } else if (FacesConfigPackage.eINSTANCE.getSupportedLocaleType()
- .isInstance(object)) {
- section = (OthersPageBaseSection) leftSections.get(2);
- } else if (FacesConfigPackage.eINSTANCE.getMessageBundleType()
- .isInstance(object)) {
- section = (OthersPageBaseSection) leftSections.get(3);
- } else if (FacesConfigPackage.eINSTANCE.getNavigationHandlerType()
- .isInstance(object)) {
- section = (OthersPageBaseSection) leftSections.get(4);
- } else if (FacesConfigPackage.eINSTANCE.getPropertyResolverType()
- .isInstance(object)) {
- section = (OthersPageBaseSection) leftSections.get(5);
- } else if (FacesConfigPackage.eINSTANCE.getStateManagerType()
- .isInstance(object)) {
- section = (OthersPageBaseSection) leftSections.get(6);
- } else if (FacesConfigPackage.eINSTANCE.getVariableResolverType()
- .isInstance(object)) {
- section = (OthersPageBaseSection) leftSections.get(7);
- } else if (FacesConfigPackage.eINSTANCE.getViewHandlerType()
- .isInstance(object)) {
- section = (OthersPageBaseSection) leftSections.get(8);
- } else if (FacesConfigPackage.eINSTANCE.getApplicationFactoryType()
- .isInstance(object)) {
- section = (OthersPageBaseSection) rightSections.get(0);
- } else if (FacesConfigPackage.eINSTANCE
- .getFacesContextFactoryType().isInstance(object)) {
- section = (OthersPageBaseSection) rightSections.get(1);
- } else if (FacesConfigPackage.eINSTANCE.getLifecycleFactoryType()
- .isInstance(object)) {
- section = (OthersPageBaseSection) rightSections.get(2);
- } else if (FacesConfigPackage.eINSTANCE.getRenderKitFactoryType()
- .isInstance(object)) {
- section = (OthersPageBaseSection) rightSections.get(3);
- } else if (FacesConfigPackage.eINSTANCE.getPhaseListenerType()
- .isInstance(object)) {
- section = (OthersPageBaseSection) rightSections.get(4);
- }
- if (section != null) {
- if ((Thread.currentThread() == PlatformUI.getWorkbench().getDisplay().getThread())) {
- setSelectionInSection(section, object);
- }
- else {
- final OthersPageBaseSection baseSection = section;
- PlatformUI.getWorkbench().getDisplay().syncExec(new Runnable() {
- public void run() {
- setSelectionInSection(baseSection, object);
- }
- });
- }
- }
- }
- }
-
- private void setSelectionInSection(final OthersPageBaseSection section, final Object object) {
- if (!section.getSection().isExpanded()) {
- this.closeOtherSections(section);
- GridData gd = new GridData(GridData.FILL_BOTH);
- section.getSection().setLayoutData(gd);
- section.getSection().setExpanded(true);
- }
- IStructuredSelection newselection = new StructuredSelection(
- object);
- section.getTableViewer().setSelection(newselection);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.emf.edit.domain.IEditingDomainProvider#getEditingDomain()
- */
- public EditingDomain getEditingDomain() {
- return ((FacesConfigEditor) getEditor()).getEditingDomain();
- }
-}
\ No newline at end of file
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/page/OverviewPage.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/page/OverviewPage.java
deleted file mode 100644
index 808a89f..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/page/OverviewPage.java
+++ /dev/null
@@ -1,248 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui.page;
-
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.ISelectionProvider;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jst.jsf.facesconfig.emf.FacesConfigType;
-import org.eclipse.jst.jsf.facesconfig.ui.EditorPlugin;
-import org.eclipse.jst.jsf.facesconfig.ui.FacesConfigEditor;
-import org.eclipse.jst.jsf.facesconfig.ui.EditorMessages;
-import org.eclipse.jst.jsf.facesconfig.ui.section.OverviewComponentsSection;
-import org.eclipse.jst.jsf.facesconfig.ui.section.OverviewGeneralSection;
-import org.eclipse.jst.jsf.facesconfig.ui.section.OverviewManagedBeanSection;
-import org.eclipse.jst.jsf.facesconfig.ui.section.OverviewNavigationSection;
-import org.eclipse.jst.jsf.facesconfig.ui.section.OverviewOthersSection;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.forms.IManagedForm;
-import org.eclipse.ui.forms.editor.FormEditor;
-import org.eclipse.ui.forms.editor.FormPage;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-import org.eclipse.ui.forms.widgets.ScrolledForm;
-
-/**
- * @author jchoi, Xiao-guang Zhang
- * @version
- */
-public class OverviewPage extends FormPage implements ISelectionProvider,
- IFacesConfigPage {
-
-
- /**
- * The id of this page in the faces-config editor.
- */
- public static final String PAGE_ID = "org.eclipse.jst.jsf.facesconfig.ui.page.OverviewPage"; //$NON-NLS-1$
-
- private static final int LAYOUT_MARGIN_HEIGHT = 2;
-
- private static final int LAYOUT_MARGIN_WIDTH = 2;
-
- private Object input;
-
- private OverviewGeneralSection generalSection;
-
- private OverviewManagedBeanSection beanSection;
-
- private OverviewComponentsSection componentsSection;
-
- //
- private OverviewNavigationSection navigationSection;
-
- //
- private OverviewOthersSection otherSection;
-
- /**
- *
- * @param editor
- */
- public OverviewPage(FormEditor editor) {
- super(editor, "OverviewPage", EditorMessages.OverviewPage_page_name); //$NON-NLS-1$
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.ui.forms.editor.FormPage#createFormContent(org.eclipse.ui.forms.IManagedForm)
- */
- protected void createFormContent(IManagedForm managedForm) {
-
- ScrolledForm form = managedForm.getForm();
- form.setText(EditorMessages.OverviewPage_PageflowOverview_summary);
- form.setBackgroundImage(EditorPlugin.getDefault().getImage(
- "form_banner.gif")); //$NON-NLS-1$
- Composite body = form.getBody();
- GridLayout gridLayout = new GridLayout();
- gridLayout.marginWidth = LAYOUT_MARGIN_WIDTH;
- gridLayout.marginHeight = LAYOUT_MARGIN_HEIGHT;
- body.setLayout(gridLayout);
- gridLayout = new GridLayout(2, true);
- form.getBody().setLayout(gridLayout);
- FormEditor editor = getEditor();
- FormToolkit toolkit = editor.getToolkit();
-
- // add overview general information
- generalSection = new OverviewGeneralSection(managedForm.getForm()
- .getBody(), managedForm, this, toolkit);
- generalSection.initialize();
- GridData gd = new GridData(GridData.FILL_HORIZONTAL);
- gd.horizontalSpan = 2;
- generalSection.getSection().setLayoutData(gd);
-
- // Navigation section
- navigationSection = new OverviewNavigationSection(managedForm.getForm()
- .getBody(), managedForm, this, toolkit);
- navigationSection.initialize();
- gd = new GridData(GridData.FILL_BOTH);
- navigationSection.getSection().setLayoutData(gd);
- navigationSection.getSection().setExpanded(true);
-
- // ManagedBeans section
- beanSection = new OverviewManagedBeanSection(managedForm.getForm()
- .getBody(), managedForm, this, toolkit);
- beanSection.initialize();
- gd = new GridData(GridData.FILL_BOTH);
- beanSection.getSection().setLayoutData(gd);
- beanSection.getSection().setExpanded(true);
-
- /* components section */
- componentsSection = new OverviewComponentsSection(managedForm.getForm()
- .getBody(), managedForm, this, toolkit);
- componentsSection.initialize();
- gd = new GridData(GridData.FILL_BOTH);
- componentsSection.getSection().setLayoutData(gd);
- componentsSection.getSection().setExpanded(true);
-
- /* other sections */
- otherSection = new OverviewOthersSection(managedForm.getForm()
- .getBody(), managedForm, this, toolkit);
- otherSection.initialize();
- gd = new GridData(GridData.FILL_BOTH);
- otherSection.getSection().setLayoutData(gd);
- otherSection.getSection().setExpanded(true);
-
- this.getSite().setSelectionProvider(this);
-
- }
-
- /**
- * set input for this page when the it got activated at the first time; if
- * it's not the first time, then refresh the page.
- *
- * @see org.eclipse.ui.forms.editor.FormPage#setActive(boolean)
- */
- public void setActive(boolean active) {
- super.setActive(active);
- if (active) {
- if (getInput() != ((FacesConfigEditor) getEditor())
- .getFacesConfig()) {
- setInput(((FacesConfigEditor) getEditor()).getFacesConfig());
- } else {
- this.refresh();
- }
- }
- }
-
- /**
- *
- */
- public void setInput(Object input) {
- if (input instanceof FacesConfigType) {
- this.input = input;
- navigationSection.setInput(input);
- beanSection.setInput(input);
- componentsSection.setInput(input);
- otherSection.setInput(input);
- }
- }
-
- /**
- * Call refreshAll on all sections on this page
- */
- public void refreshAll() {
- generalSection.refreshAll();
- navigationSection.refreshAll();
- beanSection.refreshAll();
- componentsSection.refreshAll();
- otherSection.refreshAll();
- }
-
- public Object getInput() {
- return input;
- }
-
- public void refresh() {
- generalSection.refresh();
- navigationSection.refresh();
- beanSection.refresh();
- componentsSection.refresh();
- otherSection.refresh();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.ui.forms.editor.IFormPage#isEditor()
- */
- public boolean isEditor() {
- return true;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.ISelectionProvider#addSelectionChangedListener(org.eclipse.jface.viewers.ISelectionChangedListener)
- */
- public void addSelectionChangedListener(ISelectionChangedListener listener) {
- // do not support change in selection
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.ISelectionProvider#getSelection()
- */
- public ISelection getSelection() {
- return StructuredSelection.EMPTY;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.ISelectionProvider#removeSelectionChangedListener(org.eclipse.jface.viewers.ISelectionChangedListener)
- */
- public void removeSelectionChangedListener(
- ISelectionChangedListener listener) {
- // do not support change in selection
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.ISelectionProvider#setSelection(org.eclipse.jface.viewers.ISelection)
- */
- public void setSelection(ISelection selection) {
- // do not support change in selection
- }
-
- public void dispose() {
- beanSection.dispose();
- componentsSection.dispose();
- generalSection.dispose();
- navigationSection.dispose();
- otherSection.dispose();
- super.dispose();
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/page/WaitForLoadPage.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/page/WaitForLoadPage.java
deleted file mode 100644
index 1b20160..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/page/WaitForLoadPage.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2007 Oracle Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Oracle Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui.page;
-
-import org.eclipse.jst.jsf.facesconfig.ui.EditorMessages;
-import org.eclipse.ui.forms.IManagedForm;
-import org.eclipse.ui.forms.editor.FormEditor;
-import org.eclipse.ui.forms.editor.FormPage;
-import org.eclipse.ui.forms.widgets.ScrolledForm;
-
-/**
- * A page the exists only be used before the editor's model is fully loaded
- * as a status placeholder while the user waits.
- *
- * @author cbateman
- *
- */
-public class WaitForLoadPage extends FormPage
-{
-
- /**
- * @param editor the parent
- * @param id the id of the editor within its parent
- * @param title the title displayed to the user on the editor's tab
- */
- public WaitForLoadPage(FormEditor editor, String id, String title) {
- super(editor, id, title);
- }
-
- @Override
- protected void createFormContent(IManagedForm managedForm) {
- // get the form
- ScrolledForm form = managedForm.getForm();
- //FormToolkit toolkit = getEditor().getToolkit();
- form.setText(EditorMessages.FacesConfigEditor_WaitForLoadPage_Title);
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/page/detail/ComponentDetailsPage.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/page/detail/ComponentDetailsPage.java
deleted file mode 100644
index 9a882d5..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/page/detail/ComponentDetailsPage.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui.page.detail;
-
-import org.eclipse.jst.jsf.facesconfig.ui.page.FacesConfigMasterDetailPage;
-import org.eclipse.jst.jsf.facesconfig.ui.section.AttributeSection;
-import org.eclipse.jst.jsf.facesconfig.ui.section.ComponentGeneralSection;
-import org.eclipse.jst.jsf.facesconfig.ui.section.FacetSection;
-import org.eclipse.jst.jsf.facesconfig.ui.section.IFacesConfigSection;
-import org.eclipse.jst.jsf.facesconfig.ui.section.PropertySection;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.forms.IManagedForm;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-
-/**
- *
- * @author sfshi
- *
- */
-public class ComponentDetailsPage extends FacesConfigDetailsPage {
-
- /**
- *
- * @param page
- */
- public ComponentDetailsPage(FacesConfigMasterDetailPage page) {
- super(page);
- }
-
- /**
- * create the detail sections and set layout for them.
- */
- protected IFacesConfigSection[] createDetailSections(Composite composite,
- IManagedForm managedForm, FormToolkit toolkit, FacesConfigMasterDetailPage page) {
- ComponentGeneralSection generalSection = new ComponentGeneralSection(
- composite, managedForm, getPage(), toolkit);
- GridData gd = new GridData(GridData.FILL_HORIZONTAL);
- generalSection.getSection().setLayoutData(gd);
-
- AttributeSection attributeSection = new AttributeSection(composite,
- managedForm, getPage(), toolkit);
- gd = new GridData(GridData.FILL_HORIZONTAL);
- attributeSection.getSection().setLayoutData(gd);
-
- FacetSection facetSection = new FacetSection(composite, managedForm,
- getPage(), toolkit);
- gd = new GridData(GridData.FILL_HORIZONTAL);
- facetSection.getSection().setLayoutData(gd);
-
- PropertySection propertySection = new PropertySection(composite,
- managedForm, getPage(), toolkit);
- gd = new GridData(GridData.FILL_BOTH);
- propertySection.getSection().setLayoutData(gd);
- return new IFacesConfigSection[] { generalSection, attributeSection, facetSection,
- propertySection };
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/page/detail/ConverterDetailsPage.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/page/detail/ConverterDetailsPage.java
deleted file mode 100644
index 0e720f4..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/page/detail/ConverterDetailsPage.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui.page.detail;
-
-import org.eclipse.jst.jsf.facesconfig.ui.page.FacesConfigMasterDetailPage;
-import org.eclipse.jst.jsf.facesconfig.ui.section.AttributeSection;
-import org.eclipse.jst.jsf.facesconfig.ui.section.ConverterGeneralSection;
-import org.eclipse.jst.jsf.facesconfig.ui.section.IFacesConfigSection;
-import org.eclipse.jst.jsf.facesconfig.ui.section.PropertySection;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.forms.IManagedForm;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-
-/**
- * @author Bryan Yang
- *
- */
-public class ConverterDetailsPage extends FacesConfigDetailsPage {
-
- /**
- *
- * @param page
- */
- public ConverterDetailsPage(FacesConfigMasterDetailPage page) {
- super(page);
- }
-
- /**
- * create the detail sections and set layout for them.
- */
- protected IFacesConfigSection[] createDetailSections(Composite composite,
- IManagedForm managedForm, FormToolkit toolkit, FacesConfigMasterDetailPage page) {
- ConverterGeneralSection generalSection = new ConverterGeneralSection(
- composite, managedForm, getPage(), toolkit);
- GridData gd = new GridData(GridData.FILL_HORIZONTAL);
- generalSection.getSection().setLayoutData(gd);
-
- AttributeSection attributeSection = new AttributeSection(composite,
- managedForm, getPage(), toolkit);
- gd = new GridData(GridData.FILL_HORIZONTAL);
- attributeSection.getSection().setLayoutData(gd);
-
-
- PropertySection propertySection = new PropertySection(composite,
- managedForm, getPage(), toolkit);
- gd = new GridData(GridData.FILL_BOTH);
- propertySection.getSection().setLayoutData(gd);
- return new IFacesConfigSection[] { generalSection, attributeSection,
- propertySection };
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/page/detail/FacesConfigDetailsPage.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/page/detail/FacesConfigDetailsPage.java
deleted file mode 100644
index eec368a..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/page/detail/FacesConfigDetailsPage.java
+++ /dev/null
@@ -1,185 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui.page.detail;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.ISelectionProvider;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jst.jsf.facesconfig.ui.page.FacesConfigMasterDetailPage;
-import org.eclipse.jst.jsf.facesconfig.ui.section.IFacesConfigSection;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.forms.AbstractFormPart;
-import org.eclipse.ui.forms.IDetailsPage;
-import org.eclipse.ui.forms.IFormPart;
-import org.eclipse.ui.forms.IManagedForm;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-
-/**
- * The detail part of a page. It contains several IFacesConfigSection instances.
- *
- * @author sfshi
- *
- */
-public abstract class FacesConfigDetailsPage extends AbstractFormPart implements
- IDetailsPage, ISelectionProvider, ISelectionChangedListener {
-
- private FacesConfigMasterDetailPage page;
-
- private IFacesConfigSection[] detailSections;
-
- private List selectionChangedListeners = new ArrayList();
-
- /**
- * @param page
- */
- public FacesConfigDetailsPage(FacesConfigMasterDetailPage page) {
- super();
- this.page = page;
- }
-
- public void createContents(Composite parent) {
- GridLayout layout = new GridLayout();
- layout.marginWidth = 0;
- layout.marginHeight = 0;
- parent.setLayout(layout);
-
- parent.setLayoutData(new GridData(GridData.FILL_BOTH));
-
- FormToolkit toolkit = getManagedForm().getToolkit();
- Composite detailsContainer = toolkit.createComposite(parent);
- toolkit.paintBordersFor(detailsContainer);
- detailsContainer.setLayoutData(new GridData(GridData.FILL_BOTH));
-
- GridLayout gl = new GridLayout();
- gl.verticalSpacing = 0;
- gl.marginHeight = 0;
- detailsContainer.setLayout(gl);
-
- detailSections = createDetailSections(detailsContainer,
- getManagedForm(), toolkit, page);
- if (detailSections != null) {
- for (int i = 0, n = detailSections.length; i < n; i++) {
- detailSections[i].initialize();
- if (detailSections[i] instanceof ISelectionProvider) {
- ((ISelectionProvider) detailSections[i])
- .addSelectionChangedListener(this);
- }
- }
- }
- }
-
- /**
- * create the sub detail sections and set layout data for them.
- *
- * @param composite
- * @param managedForm
- * @param toolkit
- * @param page_
- * @return the detail sections
- */
- abstract protected IFacesConfigSection[] createDetailSections(
- Composite composite, IManagedForm managedForm, FormToolkit toolkit,
- FacesConfigMasterDetailPage page_);
-
- /**
- *
- */
- public void selectionChanged(IFormPart part, ISelection selection) {
- Object selectedItem = ((StructuredSelection) selection)
- .getFirstElement();
- if (detailSections != null) {
- for (int i = 0, n = detailSections.length; i < n; i++) {
- IFacesConfigSection aSection = detailSections[i];
- aSection.setInput(selectedItem);
- }
- }
-
- }
-
- /**
- * @return the master/detail page for this page
- */
- public FacesConfigMasterDetailPage getPage() {
- return page;
- }
-
- public void refresh() {
- super.refresh();
- if (detailSections != null) {
- for (int i = 0, n = detailSections.length; i < n; i++) {
- detailSections[i].refresh();
- }
- }
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.ISelectionChangedListener#selectionChanged(org.eclipse.jface.viewers.SelectionChangedEvent)
- */
- public void selectionChanged(SelectionChangedEvent event) {
- for (Iterator listeners = selectionChangedListeners.iterator(); listeners
- .hasNext();) {
- ISelectionChangedListener listener = (ISelectionChangedListener) listeners
- .next();
- listener.selectionChanged(new SelectionChangedEvent(this, event
- .getSelection()));
- }
-
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.ISelectionProvider#addSelectionChangedListener(org.eclipse.jface.viewers.ISelectionChangedListener)
- */
- public void addSelectionChangedListener(ISelectionChangedListener listener) {
- selectionChangedListeners.add(listener);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.ISelectionProvider#getSelection()
- */
- public ISelection getSelection() {
- return StructuredSelection.EMPTY;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.ISelectionProvider#removeSelectionChangedListener(org.eclipse.jface.viewers.ISelectionChangedListener)
- */
- public void removeSelectionChangedListener(
- ISelectionChangedListener listener) {
- selectionChangedListeners.remove(listener);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.ISelectionProvider#setSelection(org.eclipse.jface.viewers.ISelection)
- */
- public void setSelection(ISelection selection) {
- // no selection allowed
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/page/detail/ManagedBeanDetailsPage.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/page/detail/ManagedBeanDetailsPage.java
deleted file mode 100644
index 9ee1641..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/page/detail/ManagedBeanDetailsPage.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui.page.detail;
-
-import org.eclipse.jst.jsf.facesconfig.ui.page.FacesConfigMasterDetailPage;
-import org.eclipse.jst.jsf.facesconfig.ui.section.IFacesConfigSection;
-import org.eclipse.jst.jsf.facesconfig.ui.section.InitializationSection;
-import org.eclipse.jst.jsf.facesconfig.ui.section.ManagedBeanGeneralSection;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.forms.IManagedForm;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-
-/**
- *
- * @author sfshi
- *
- */
-public class ManagedBeanDetailsPage extends FacesConfigDetailsPage {
-
- /**
- *
- * @param page
- */
- public ManagedBeanDetailsPage(FacesConfigMasterDetailPage page) {
- super(page);
- }
-
- /**
- * create the detail sections and set layout for them.
- */
- protected IFacesConfigSection[] createDetailSections(Composite composite,
- IManagedForm managedForm, FormToolkit toolkit, FacesConfigMasterDetailPage page) {
- ManagedBeanGeneralSection generalSection = new ManagedBeanGeneralSection(
- composite, managedForm, getPage(), toolkit);
- GridData gd = new GridData(GridData.FILL_HORIZONTAL);
- generalSection.getSection().setLayoutData(gd);
-
- InitializationSection initializationSection = new InitializationSection(
- composite, managedForm, getPage(), toolkit);
- gd = new GridData(GridData.FILL_BOTH | GridData.VERTICAL_ALIGN_FILL);
- initializationSection.getSection().setLayoutData(gd);
-
- return new IFacesConfigSection[] { generalSection, initializationSection};
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/page/detail/RenderkitDetailsPage.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/page/detail/RenderkitDetailsPage.java
deleted file mode 100644
index efb8dd7..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/page/detail/RenderkitDetailsPage.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui.page.detail;
-
-import org.eclipse.jst.jsf.facesconfig.ui.page.FacesConfigMasterDetailPage;
-import org.eclipse.jst.jsf.facesconfig.ui.section.IFacesConfigSection;
-import org.eclipse.jst.jsf.facesconfig.ui.section.RendererSection;
-import org.eclipse.jst.jsf.facesconfig.ui.section.RenderkitGeneralSection;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.forms.IManagedForm;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-
-/**
- * @author Bryan Yang
- *
- */
-public class RenderkitDetailsPage extends FacesConfigDetailsPage {
-
- /**
- *
- * @param page
- */
- public RenderkitDetailsPage(FacesConfigMasterDetailPage page) {
- super(page);
- }
-
- /**
- * create the detail sections and set layout for them.
- */
- protected IFacesConfigSection[] createDetailSections(Composite composite,
- IManagedForm managedForm, FormToolkit toolkit, FacesConfigMasterDetailPage page) {
- RenderkitGeneralSection generalSection = new RenderkitGeneralSection(
- composite, managedForm, getPage(), toolkit);
- GridData gd = new GridData(GridData.FILL_HORIZONTAL);
- generalSection.getSection().setLayoutData(gd);
-
- RendererSection rendererSection = new RendererSection(composite,
- managedForm, getPage(), toolkit);
- gd = new GridData(GridData.FILL_BOTH | GridData.VERTICAL_ALIGN_FILL);
- rendererSection.getSection().setLayoutData(gd);
-
- return new IFacesConfigSection[] { generalSection,rendererSection };
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/page/detail/ValidatorDetailsPage.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/page/detail/ValidatorDetailsPage.java
deleted file mode 100644
index a238578..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/page/detail/ValidatorDetailsPage.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui.page.detail;
-
-import org.eclipse.jst.jsf.facesconfig.ui.page.FacesConfigMasterDetailPage;
-import org.eclipse.jst.jsf.facesconfig.ui.section.AttributeSection;
-import org.eclipse.jst.jsf.facesconfig.ui.section.IFacesConfigSection;
-import org.eclipse.jst.jsf.facesconfig.ui.section.PropertySection;
-import org.eclipse.jst.jsf.facesconfig.ui.section.ValidatorGeneralSection;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.forms.IManagedForm;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-
-/**
- * @author Bryan Yang
- *
- */
-public class ValidatorDetailsPage extends FacesConfigDetailsPage {
-
- /**
- *
- * @param page
- */
- public ValidatorDetailsPage(FacesConfigMasterDetailPage page) {
- super(page);
- }
-
- /**
- * create the detail sections and set layout for them.
- */
- protected IFacesConfigSection[] createDetailSections(Composite composite,
- IManagedForm managedForm, FormToolkit toolkit, FacesConfigMasterDetailPage page) {
- ValidatorGeneralSection generalSection = new ValidatorGeneralSection(
- composite, managedForm, getPage(), toolkit);
- GridData gd = new GridData(GridData.FILL_HORIZONTAL);
- generalSection.getSection().setLayoutData(gd);
-
- AttributeSection attributeSection = new AttributeSection(composite,
- managedForm, getPage(), toolkit);
- gd = new GridData(GridData.FILL_HORIZONTAL);
- attributeSection.getSection().setLayoutData(gd);
-
- PropertySection propertySection = new PropertySection(composite,
- managedForm, getPage(), toolkit);
- gd = new GridData(GridData.FILL_BOTH);
- propertySection.getSection().setLayoutData(gd);
- return new IFacesConfigSection[] { generalSection, attributeSection,
- propertySection };
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/DelegatingZoomManager.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/DelegatingZoomManager.java
deleted file mode 100644
index 0a8f335..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/DelegatingZoomManager.java
+++ /dev/null
@@ -1,374 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow;
-
-// import org.eclipse.core.runtime.ListenerList;
-import org.eclipse.core.runtime.ListenerList;
-import org.eclipse.draw2d.ScalableFigure;
-import org.eclipse.draw2d.Viewport;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.gef.editparts.ZoomListener;
-import org.eclipse.gef.editparts.ZoomManager;
-
-/**
- * A delegating ZoomManager.
- *
- */
-public class DelegatingZoomManager extends ZoomManager implements ZoomListener {
- /** Default string or double value of zoom level */
- private static final String DEFAULT_ZOOM_LEVEL_STRING = "100%"; //$NON-NLS-1$
-
- private static final double DEFAULT_ZOOM_LEVEL = 1;
-
- /** the current ZoomManager all work is delegated to */
- private ZoomManager currentZoomManager = null;
-
- /** listeners of zoom */
- private ListenerList zoomListeners = new ListenerList(
- ListenerList.IDENTITY);
-
- /**
- * Creates a new DelegatingZoomManager instance.
- */
- public DelegatingZoomManager() {
- super((ScalableFigure) null, (Viewport) null);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see ZoomListener#zoomChanged(double)
- */
- public void zoomChanged(double zoom) {
- Object[] listeners = zoomListeners.getListeners();
- for (int i = 0; i < listeners.length; ++i) {
- ((ZoomListener) listeners[i]).zoomChanged(zoom);
- }
- }
-
- /*
- * (non-Javadoc)
- *
- * @see ZoomManager#addZoomListener(ZoomListener)
- */
- public void addZoomListener(ZoomListener listener) {
- zoomListeners.add(listener);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see ZoomManager#removeZoomListener(oZoomListener)
- */
- public void removeZoomListener(ZoomListener listener) {
- zoomListeners.remove(listener);
- }
-
- /**
- * Sets the ZoomManager all work should be delegated to.
- *
- * @param zoomManager
- */
- public void setCurrentZoomManager(ZoomManager zoomManager) {
- if (null != currentZoomManager) {
- currentZoomManager.removeZoomListener(this);
- }
-
- currentZoomManager = zoomManager;
- if (null != currentZoomManager) {
- currentZoomManager.addZoomListener(this);
- zoomChanged(currentZoomManager.getZoom());
- }
- }
-
- /*
- * (non-Javadoc)
- *
- * @see ZoomManager#canZoomIn()
- */
- public boolean canZoomIn() {
- if (null == currentZoomManager) {
- return false;
- }
-
- return currentZoomManager.canZoomIn();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see ZoomManager#canZoomOut()
- */
- public boolean canZoomOut() {
- if (null == currentZoomManager) {
- return false;
- }
-
- return currentZoomManager.canZoomOut();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see ZoomManager#getMaxZoom()
- */
- public double getMaxZoom() {
- if (null == currentZoomManager) {
- return DEFAULT_ZOOM_LEVEL;
- }
-
- return currentZoomManager.getMaxZoom();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see ZoomManager#getMinZoom()
- */
- public double getMinZoom() {
- if (null == currentZoomManager) {
- return DEFAULT_ZOOM_LEVEL;
- }
-
- return currentZoomManager.getMinZoom();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see ZoomManager#getNextZoomLevel()
- */
- public double getNextZoomLevel() {
- if (null == currentZoomManager) {
- return DEFAULT_ZOOM_LEVEL;
- }
-
- return currentZoomManager.getNextZoomLevel();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see ZoomManager#getPreviousZoomLevel()
- */
- public double getPreviousZoomLevel() {
- if (null == currentZoomManager) {
- return DEFAULT_ZOOM_LEVEL;
- }
-
- return currentZoomManager.getPreviousZoomLevel();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see ZoomManager#getScalableFigure()
- */
- public ScalableFigure getScalableFigure() {
- if (null == currentZoomManager) {
- return null;
- }
-
- return currentZoomManager.getScalableFigure();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see ZoomManager#getUIMultiplier()
- */
- public double getUIMultiplier() {
- if (null == currentZoomManager) {
- return DEFAULT_ZOOM_LEVEL;
- }
-
- return currentZoomManager.getUIMultiplier();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see ZoomManager#getViewport()
- */
- public Viewport getViewport() {
- if (null == currentZoomManager) {
- return null;
- }
-
- return currentZoomManager.getViewport();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see ZoomManager#getZoom()
- */
- public double getZoom() {
- if (null == currentZoomManager) {
- return DEFAULT_ZOOM_LEVEL;
- }
-
- return currentZoomManager.getZoom();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see ZoomManager#getZoomAsText()
- */
- public String getZoomAsText() {
- if (null == currentZoomManager) {
- return DEFAULT_ZOOM_LEVEL_STRING;
- }
-
- return currentZoomManager.getZoomAsText();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see ZoomManager#getZoomLevels()
- */
- public double[] getZoomLevels() {
- if (null == currentZoomManager) {
- return new double[] { DEFAULT_ZOOM_LEVEL };
- }
-
- return currentZoomManager.getZoomLevels();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see ZoomManager#getZoomLevelsAsText()
- */
- public String[] getZoomLevelsAsText() {
- if (null == currentZoomManager) {
- return new String[] { DEFAULT_ZOOM_LEVEL_STRING };
- }
-
- return currentZoomManager.getZoomLevelsAsText();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see ZoomManager#setUIMultiplier(double)
- */
- public void setUIMultiplier(double multiplier) {
- if (null == currentZoomManager) {
- return;
- }
-
- currentZoomManager.setUIMultiplier(multiplier);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see ZoomManager#setViewLocation(Point)
- */
- public void setViewLocation(Point p) {
- if (null == currentZoomManager) {
- return;
- }
-
- currentZoomManager.setViewLocation(p);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see ZoomManager#setZoom(double)
- */
- public void setZoom(double zoom) {
- if (null == currentZoomManager) {
- return;
- }
- currentZoomManager.setZoom(zoom);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see ZoomManager#setZoomAnimationStyle(int)
- */
- public void setZoomAnimationStyle(int style) {
- if (null == currentZoomManager) {
- return;
- }
- currentZoomManager.setZoomAnimationStyle(style);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see ZoomManager#setZoomAsText(String)
- */
- public void setZoomAsText(String zoomString) {
- if (null == currentZoomManager) {
- return;
- }
- currentZoomManager.setZoomAsText(zoomString);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see ZoomManager#setZoomLevels(double[])
- */
- public void setZoomLevels(double[] zoomLevels) {
- if (null == currentZoomManager) {
- return;
- }
- currentZoomManager.setZoomLevels(zoomLevels);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see ZoomManager#zoomIn()
- */
- public void zoomIn() {
- if (null == currentZoomManager) {
- return;
- }
- currentZoomManager.zoomIn();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see ZoomManager#zoomOut()
- */
- public void zoomOut() {
- if (null == currentZoomManager) {
- return;
- }
- currentZoomManager.zoomOut();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see ZoomManager#zoomTo(Rectangle)
- */
- public void zoomTo(Rectangle rect) {
- if (null == currentZoomManager) {
- return;
- }
- currentZoomManager.zoomTo(rect);
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/PageflowActionBarContributor.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/PageflowActionBarContributor.java
deleted file mode 100644
index 349b69d..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/PageflowActionBarContributor.java
+++ /dev/null
@@ -1,129 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow;
-
-import org.eclipse.draw2d.PositionConstants;
-import org.eclipse.gef.editparts.ZoomManager;
-import org.eclipse.gef.ui.actions.ActionBarContributor;
-import org.eclipse.gef.ui.actions.AlignmentRetargetAction;
-import org.eclipse.gef.ui.actions.DeleteRetargetAction;
-import org.eclipse.gef.ui.actions.GEFActionConstants;
-import org.eclipse.gef.ui.actions.RedoRetargetAction;
-import org.eclipse.gef.ui.actions.UndoRetargetAction;
-import org.eclipse.gef.ui.actions.ZoomComboContributionItem;
-import org.eclipse.gef.ui.actions.ZoomInRetargetAction;
-import org.eclipse.gef.ui.actions.ZoomOutRetargetAction;
-import org.eclipse.jface.action.IMenuManager;
-import org.eclipse.jface.action.IToolBarManager;
-import org.eclipse.jface.action.MenuManager;
-import org.eclipse.jface.action.Separator;
-import org.eclipse.jst.jsf.facesconfig.ui.INestedActionContributor;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IWorkbenchActionConstants;
-import org.eclipse.ui.actions.ActionFactory;
-
-/**
- * The action bar contributor for the page flow editor
- *
- */
-public class PageflowActionBarContributor extends ActionBarContributor
- implements INestedActionContributor {
-
- IEditorPart activeEditor;
-
- /*
- * (non-Javadoc)
- *
- * @see ActionBarContributor#buildActions()
- */
- protected void buildActions() {
- addRetargetAction(new UndoRetargetAction());
- addRetargetAction(new RedoRetargetAction());
- addRetargetAction(new DeleteRetargetAction());
- addRetargetAction(new ZoomInRetargetAction());
- addRetargetAction(new ZoomOutRetargetAction());
-
- addRetargetAction(new AlignmentRetargetAction(PositionConstants.LEFT));
- addRetargetAction(new AlignmentRetargetAction(PositionConstants.CENTER));
- addRetargetAction(new AlignmentRetargetAction(PositionConstants.RIGHT));
- addRetargetAction(new AlignmentRetargetAction(PositionConstants.TOP));
- addRetargetAction(new AlignmentRetargetAction(PositionConstants.MIDDLE));
- addRetargetAction(new AlignmentRetargetAction(PositionConstants.BOTTOM));
- }
-
- /*
- * (non-Javadoc)
- *
- * @see ActionBarContributor#declareGlobalActionKeys()
- */
- public void declareGlobalActionKeys() {
- // do nothing
- }
-
- /**
- * Update the action keys
- */
- public void updateActionKeys() {
- declareGlobalActionKeys();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see EditorActionBarContributor#contributeToToolBar(IToolBarManager)
- */
- public void contributeToToolBar(IToolBarManager tbm) {
- tbm.add(getAction(ActionFactory.UNDO.getId()));
- tbm.add(getAction(ActionFactory.REDO.getId()));
- tbm.add(new Separator());
- tbm.add(getAction(GEFActionConstants.ALIGN_LEFT));
- tbm.add(getAction(GEFActionConstants.ALIGN_CENTER));
- tbm.add(getAction(GEFActionConstants.ALIGN_RIGHT));
- tbm.add(new Separator());
- tbm.add(getAction(GEFActionConstants.ALIGN_TOP));
- tbm.add(getAction(GEFActionConstants.ALIGN_MIDDLE));
- tbm.add(getAction(GEFActionConstants.ALIGN_BOTTOM));
-
- tbm.add(new Separator());
- String[] zoomStrings = new String[] { ZoomManager.FIT_ALL,
- ZoomManager.FIT_HEIGHT, ZoomManager.FIT_WIDTH };
- tbm.add(new ZoomComboContributionItem(getPage(), zoomStrings));
- }
-
- /*
- * (non-Javadoc)
- *
- * @see EditorActionBarContributor#contributeToMenu(IMenuManager)
- */
- public void contributeToMenu(IMenuManager menubar) {
- super.contributeToMenu(menubar);
- MenuManager viewMenu = new MenuManager("View"); //$NON-NLS-1$
- viewMenu.add(getAction(GEFActionConstants.ZOOM_IN));
- viewMenu.add(getAction(GEFActionConstants.ZOOM_OUT));
- menubar.insertAfter(IWorkbenchActionConstants.M_EDIT, viewMenu);
- }
-
- public void setActiveEditor(IEditorPart editor) {
- if (editor instanceof PageflowEditor) {
- activeEditor = editor;
- // updateActionKeys();
- super.setActiveEditor(editor);
- }
- }
-
- public void update() {
- if (activeEditor != null) {
- ((PageflowEditor) activeEditor).updateActions();
- }
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/PageflowEditor.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/PageflowEditor.java
deleted file mode 100644
index f65230a..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/PageflowEditor.java
+++ /dev/null
@@ -1,1225 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow;
-
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IResourceChangeEvent;
-import org.eclipse.core.resources.IResourceChangeListener;
-import org.eclipse.core.resources.IResourceDelta;
-import org.eclipse.core.resources.IResourceDeltaVisitor;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.SubProgressMonitor;
-import org.eclipse.draw2d.PositionConstants;
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.gef.ContextMenuProvider;
-import org.eclipse.gef.DefaultEditDomain;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPartViewer;
-import org.eclipse.gef.GraphicalEditPart;
-import org.eclipse.gef.GraphicalViewer;
-import org.eclipse.gef.KeyHandler;
-import org.eclipse.gef.KeyStroke;
-import org.eclipse.gef.RootEditPart;
-import org.eclipse.gef.commands.CommandStack;
-import org.eclipse.gef.commands.CommandStackEvent;
-import org.eclipse.gef.commands.CommandStackEventListener;
-import org.eclipse.gef.editparts.ScalableFreeformRootEditPart;
-import org.eclipse.gef.editparts.ScalableRootEditPart;
-import org.eclipse.gef.editparts.ZoomManager;
-import org.eclipse.gef.palette.PaletteRoot;
-import org.eclipse.gef.requests.CreationFactory;
-import org.eclipse.gef.ui.actions.ActionRegistry;
-import org.eclipse.gef.ui.actions.DeleteAction;
-import org.eclipse.gef.ui.actions.GEFActionConstants;
-import org.eclipse.gef.ui.actions.RedoAction;
-import org.eclipse.gef.ui.actions.SelectionAction;
-import org.eclipse.gef.ui.actions.StackAction;
-import org.eclipse.gef.ui.actions.UndoAction;
-import org.eclipse.gef.ui.actions.UpdateAction;
-import org.eclipse.gef.ui.actions.ZoomInAction;
-import org.eclipse.gef.ui.actions.ZoomOutAction;
-import org.eclipse.gef.ui.parts.GraphicalEditorWithFlyoutPalette;
-import org.eclipse.gef.ui.parts.GraphicalViewerKeyHandler;
-import org.eclipse.gef.ui.parts.ScrollingGraphicalViewer;
-import org.eclipse.gef.ui.parts.SelectionSynchronizer;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.jface.preference.PreferenceConverter;
-import org.eclipse.jface.resource.FontRegistry;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.resource.JFaceResources;
-import org.eclipse.jface.util.IPropertyChangeListener;
-import org.eclipse.jface.util.PropertyChangeEvent;
-import org.eclipse.jface.util.TransferDropTargetListener;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jst.jsf.common.ui.internal.logging.Logger;
-import org.eclipse.jst.jsf.facesconfig.ui.EditorPlugin;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.action.AlignmentAction;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.action.OpenEditorAction;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.action.ShowPropertyViewAction;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.command.PreExecuteCommandStack;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.editpart.ConfigurableRootEditPart;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.editpart.IConnectionPreference;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.editpart.IFigurePreference;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.editpart.ILayerPanePreference;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.editpart.INodePreference;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.editpart.PageflowEditPartsFactory;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.editpart.PageflowNodeEditPart;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.Pageflow;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowPage;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.synchronization.FC2PFTransformer;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.util.EditPartMarkerUtil;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.util.PageflowAnnotationUtil;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.util.PageflowModelManager;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.util.PageflowResourceFactory;
-import org.eclipse.jst.jsf.facesconfig.ui.preference.GEMPreferences;
-import org.eclipse.jst.jsf.facesconfig.ui.util.WebrootUtil;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.Font;
-import org.eclipse.swt.graphics.FontData;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IEditorSite;
-import org.eclipse.ui.ISelectionListener;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.actions.ActionFactory;
-import org.eclipse.ui.ide.IGotoMarker;
-import org.eclipse.ui.part.FileEditorInput;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.eclipse.ui.views.contentoutline.IContentOutlinePage;
-import org.eclipse.ui.views.properties.IPropertySheetPage;
-import org.eclipse.ui.views.properties.PropertySheetPage;
-
-/**
- * This the the main editor page for modifying a complete pageflow.
- */
-public class PageflowEditor extends GraphicalEditorWithFlyoutPalette implements
- IAdaptable, IPropertyChangeListener, IGotoMarker {
- /** log instance */
- private static final Logger log = EditorPlugin
- .getLogger(PageflowEditor.class);
-
- /** pageflow context menu registration ID */
- private static final String PAGEFLOW_CONTEXTMENU_REG_ID = ".pageflow.editor.contextmenu"; //$NON-NLS-1$
-
- /** the edit domain */
- private final DefaultEditDomain domain;
-
- /** the palette root */
- private PaletteRoot paletteRoot = null;
-
- /** the parent multi-page editor */
- private IEditorPart parentEditor = null;
-
- /** the graphical viewer */
- private GraphicalViewer viewer = null;
-
- /** the undoable <code>IPropertySheetPage</code> */
- private PropertySheetPage undoablePropertySheetPage = null;
-
- /** the editor's action registry */
- private ActionRegistry actionRegistry = null;
-
- /**
- * The id of the editor page
- */
- public static final String PAGE_ID = "org.eclipse.jst.jsf.facesconfig.ui.pageflow.PageflowEditor"; //$NON-NLS-1$
-
- /** the list of action ids that are to EditPart actions */
- private List editPartActionIDs = new ArrayList();
-
- /** the selection listener */
- private ISelectionListener selectionListener = new ISelectionListener() {
- public void selectionChanged(IWorkbenchPart part, ISelection selection) {
- updateActions();
- }
- };
-
- /** the selection synchronizer for the edit part viewer */
- private SelectionSynchronizer synchronizer = null;
-
- /** the shared key handler */
- private KeyHandler sharedKeyHandler = null;
-
- /** pageflow model manager */
- private PageflowModelManager pageflowManager;
-
- /** the dirty status of this page */
- private boolean isDirty = false;
-
- /** the command stack of this page */
- private CommandStack commandStack;
-
- private FC2PFTransformer modelsTransform;
-
- List stackActions = new ArrayList();
-
- /**
- * @return the faces-config to pageflow model
- */
- public FC2PFTransformer getModelsTransform() {
- if (modelsTransform == null) {
- modelsTransform = new FC2PFTransformer();
- }
- return modelsTransform;
- }
-
- /**
- * update the editor actions
- */
- public void updateActions() {
- updateActions(stackActions);
- updateActions(editPartActionIDs);
- }
-
- /**
- * This class listens for command stack changes of the page and decides if
- * the editor is dirty or not.
- *
- */
- private class PageCommandStackListener implements CommandStackEventListener {
- public void stackChanged(CommandStackEvent event) {
- if (((CommandStack) event.getSource()).isDirty()) {
- // at least one command stack is dirty,
- // so the multi page editor is dirty too
- setDirty(true);
- }
- updateActions();
- }
- }
-
- /**
- * This class listens to changes to the file system in the workspace, and
- * validate the current pageflow based on web files' status.
- */
- private class ResourceTracker implements IResourceChangeListener,
- IResourceDeltaVisitor {
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.core.resources.IResourceChangeListener#resourceChanged(org.eclipse.core.resources.IResourceChangeEvent)
- */
- public void resourceChanged(IResourceChangeEvent event) {
- IResourceDelta delta = event.getDelta();
- try {
- if (delta != null) {
- delta.accept(this);
- }
- } catch (CoreException exception) {
- // Pageflow.PageflowEditor.Error.ResourceChange = Failed in the
- // resource change.
- log.error("Pageflow.PageflowEditor.Error.ResourceChange", //$NON-NLS-1$
- exception);
- }
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.core.resources.IResourceDeltaVisitor#visit(org.eclipse.core.resources.IResourceDelta)
- */
- public boolean visit(IResourceDelta delta) {
- // if the delta is not a file instance, just return true
- if (!(delta.getResource() instanceof IFile)) {
- return true;
- }
-
- // web file is changed.
- if (WebrootUtil.isValidWebFile(((IFile) delta.getResource())
- .getFullPath())) {
- webPageChanged(((IFile) delta.getResource()).getFullPath());
- return false;
- }
- return false;
- }
- }
-
- /** the resource tracker instance */
- private ResourceTracker resourceTracker = null;
-
- /**
- * Returns the resource tracker instance
- *
- * @return - Returns the resource tracker instance
- */
- private ResourceTracker getResourceTracker() {
- if (null == resourceTracker) {
- resourceTracker = new ResourceTracker();
- }
- return resourceTracker;
- }
-
- /**
- * Changes the dirty state.
- *
- * @param dirty -
- * dirty state
- */
- protected void setDirty(boolean dirty) {
- if (isDirty != dirty) {
- isDirty = dirty;
- }
- }
-
- /**
- * Updates the specified actions.
- *
- * @param actionIds -
- * the list of ids of actions to update
- */
- protected void updateActions(List actionIds) {
- for (Iterator ids = actionIds.iterator(); ids.hasNext();) {
- IAction action = getActionRegistry().getAction(ids.next());
- if (null != action && action instanceof UpdateAction) {
- ((UpdateAction) action).update();
- }
- }
- }
-
- /**
- * Creates a new PageflowPage instance.
- * <p>
- * By design this page uses its own <code>EditDomain</code>. The main
- * goal of this approach is that this page has its own undo/redo command
- * stack.
- *
- * @param parent -
- * the parent multi page editor
- */
- public PageflowEditor(IEditorPart parent) {
- domain = new DefaultEditDomain(parent);
- domain.setCommandStack(getCommandStack());
- this.setEditDomain(domain);
- parentEditor = parent;
- }
-
- /**
- * Adds an <code>CommandStack</code> action to this editor.
- * <p>
- * <code>CommandStack</code> actions are actions that depend and work on
- * the <code>CommandStack</code>.
- *
- * @param action -
- * the <code>CommandStack</code> action
- */
- protected void addStackAction(StackAction action) {
- getActionRegistry().registerAction(action);
- stackActions.add(action.getId());
- }
-
- /**
- * Creates different kinds of actions and registers them to the
- * ActionRegistry.
- */
- protected void createActions() {
- // register delete action
- addEditPartAction(new DeleteAction((IWorkbenchPart) this));
- // register undo/redo action
- addStackAction(new UndoAction(this));
- addStackAction(new RedoAction(this));
-
- // Allows opening of JSP files from the pageflow
- addEditPartAction(new OpenEditorAction(this));
-
- // Allows showing property view for the pageflow
- SelectionAction action = new ShowPropertyViewAction(this);
- action
- .setImageDescriptor(getImageDescriptorForView("org.eclipse.ui.views.PropertySheet")); //$NON-NLS-1$
- addEditPartAction(action);
- // Allows showing property view for the pageflow
- // addEditPartAction(new ShowPaletteViewAction((IWorkbenchPart) this));
-
- // register alignment actions
- addEditPartAction(new AlignmentAction((IWorkbenchPart) this,
- PositionConstants.LEFT));
- addEditPartAction(new AlignmentAction((IWorkbenchPart) this,
- PositionConstants.RIGHT));
- addEditPartAction(new AlignmentAction((IWorkbenchPart) this,
- PositionConstants.TOP));
- addEditPartAction(new AlignmentAction((IWorkbenchPart) this,
- PositionConstants.BOTTOM));
- addEditPartAction(new AlignmentAction((IWorkbenchPart) this,
- PositionConstants.CENTER));
- addEditPartAction(new AlignmentAction((IWorkbenchPart) this,
- PositionConstants.MIDDLE));
-
- // register zoom in/out action
- IAction zoomIn = new ZoomInAction(getZoomManager(getGraphicalViewer()));
- IAction zoomOut = new ZoomOutAction(
- getZoomManager(getGraphicalViewer()));
- addAction(zoomIn);
- addAction(zoomOut);
-
-// getSite().getKeyBindingService().registerAction(zoomIn);
-// getSite().getKeyBindingService().registerAction(zoomOut);
- }
-
- /**
- * Returns the zoom manager of the specified viewer.
- *
- * @param viewer_ -
- * the viewer to get the zoom manager from
- * @return - the zoom manager
- */
- private ZoomManager getZoomManager(GraphicalViewer viewer_) {
- // get zoom manager from root edit part
- RootEditPart rootEditPart = viewer_.getRootEditPart();
- ZoomManager zoomManager = null;
- if (rootEditPart instanceof ScalableFreeformRootEditPart) {
- zoomManager = ((ScalableFreeformRootEditPart) rootEditPart)
- .getZoomManager();
- } else if (rootEditPart instanceof ScalableRootEditPart) {
- zoomManager = ((ScalableRootEditPart) rootEditPart)
- .getZoomManager();
- }
- return zoomManager;
- }
-
- /**
- * Adds an action to this editor's <code>ActionRegistry</code>.
- *
- * @param action -
- * the action to add.
- */
- protected void addAction(IAction action) {
- getActionRegistry().registerAction(action);
- }
-
- /**
- * Adds an <code>EditPart</code> action to this editor.
- * <p>
- * <code>EditPart</code> actions are actions that depend and work on the
- * selected <code>EditPart</code>s.
- *
- * @param action -
- * the <code>EditPart</code> action
- */
- protected void addEditPartAction(SelectionAction action) {
- getActionRegistry().registerAction(action);
- editPartActionIDs.add(action.getId());
- }
-
- /**
- * Returns the action registry of this editor.
- *
- * @return - the action registry
- */
- public ActionRegistry getActionRegistry() {
- if (null == actionRegistry) {
- actionRegistry = new ActionRegistry();
- }
-
- return actionRegistry;
- }
-
- /**
- * Creates the GraphicalViewer on the specified <code>Composite</code>.
- *
- * @param parent -
- * the parent composite
- */
- public void createGraphicalViewer(Composite parent) {
- viewer = new ScrollingGraphicalViewer();
- viewer.createControl(parent);
-
- // configure the viewer
- viewer.getControl().setBackground(parent.getBackground());
-
- viewer.setRootEditPart(new ConfigurableRootEditPart());
- // _viewer.setRootEditPart(new ScalableFreeformRootEditPart());
- viewer.setKeyHandler(new GraphicalViewerKeyHandler(viewer));
-
- // hook the viewer into the editor
- registerEditPartViewer(viewer);
-
- // configure the viewer with context menu and template drag and drop
- configureEditPartViewer(viewer);
-
- // initialize the viewer with input
- viewer.setEditPartFactory(new PageflowEditPartsFactory());
- // viewer.setContents(getPageflow());
-
- // support the resource drag&drop
- viewer
- .addDropTargetListener((TransferDropTargetListener) new ResourceTransferDropTargetListener(
- viewer, getParentEditor()) {
- protected CreationFactory getFactory(Object obj) {
- return getResourceFactory((IResource) obj);
- }
- });
-
- // apply Editor's preferences
- // propertyChange(null);
- // add listener to Editor's preferences changing
- EditorPlugin.getDefault().getPreferenceStore()
- .addPropertyChangeListener(this);
- }
-
- private CreationFactory getResourceFactory(IResource resource) {
- return new PageflowResourceFactory(resource);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see ISaveablePart#doSave(org.eclipse.core.runtime.IProgressMonitor)
- */
- public final void doSave(IProgressMonitor monitor) {
- // our policy: delegate saving to the parent
- getParentEditor().doSave(monitor);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see ISaveablePart#doSaveAs()
- */
- public final void doSaveAs() {
- // our policy: delegate saving to the parent
- getParentEditor().doSaveAs();
- }
-
- /**
- * Saves the pageflow under the specified path.
- * @param file
- *
- * @param progressMonitor
- * @throws CoreException
- */
- public void doSave(IFile file, IProgressMonitor progressMonitor)
- throws CoreException {
- if (((FileEditorInput) getEditorInput()).getFile() != file) {
- // TODO: save to other page.
- }
- if (null == progressMonitor) {
- progressMonitor = new NullProgressMonitor();
- }
- // Pageflow.Label.Saving = Saving
- progressMonitor.beginTask(PageflowMessages.Pageflow_Label_Saving + " " //$NON-NLS-1$
- + file.getFullPath(), 2);
-
- if (null == getPageflowManager()) {
- // Pageflow.PageflowEditor.Alert.nullModelManager = No model manager
- // found for saving the file.
- EditorPlugin.getAlerts().throwCoreException(
- "Pageflow.PageflowEditor.Alert.nullModelManager"); //$NON-NLS-1$
- }
-
- // save pageflow to file
- try {
- getPageflowManager().save(getPageflowFilePath(file));
-
- progressMonitor.worked(1);
- file.refreshLocal(IResource.DEPTH_ZERO, new SubProgressMonitor(
- progressMonitor, 1));
- progressMonitor.done();
- setDirty(false);
- } catch (FileNotFoundException e) {
- // Pageflow.PageflowEditor.Alert.errorSaveFileInfo = The current
- // pageflow model could not be saved.
- EditorPlugin.getAlerts().throwCoreException(e);
- } catch (IOException e) {
- // Pageflow.PageflowEditor.Alert.errorSaveFileInfo = The current
- // pageflow model could not be saved.
- EditorPlugin.getAlerts().throwCoreException(e);
- }
- }
-
- /*
- * (non-Javadoc)
- *
- * @see IEditorPart#init(org.eclipse.ui.IEditorSite,
- * org.eclipse.ui.IEditorInput)
- */
- public void init(IEditorSite site, IEditorInput input)
- throws PartInitException {
- setSite(site);
- setInput(input);
- IFile fileFacesConfig = null;
- try {
- fileFacesConfig = ((FileEditorInput) input).getFile();
-
- // load and validate pageflow
- if (null == createPageflow(getPageflowFilePath(fileFacesConfig))) {
- // Pageflow.PageflowEditor.Error.invalidPageflowFile = The
- // specified input is not a valid pageflow.
- log.error("Pageflow.PageflowEditor.Error.invalidPageflowFile"); //$NON-NLS-1$
- throw new PartInitException(
- EditorPlugin
- .getResourceString("Pageflow.PageflowEditor.Error.invalidPageflowFile")); //$NON-NLS-1$
- }
-
- } catch (CoreException e) {
- // Pageflow.PageflowEditor.Error.invalidPageflowFile = The specified
- // input is not a valid pageflow.
- log.error("Pageflow.PageflowEditor.Error.invalidPageflowFile", e); //$NON-NLS-1$
- throw new PartInitException(e.getStatus());
- } catch (IOException e) {
- // Pageflow.PageflowEditor.Alert.errorSaveFileInfo = The current
- // pageflow model could not be saved.
- log.error("Pageflow.PageflowEditor.Alert.errorSaveFileInfo", e); //$NON-NLS-1$
- }
-
- // add selection change listener
- getSite().getWorkbenchWindow().getSelectionService()
- .addSelectionListener(getSelectionListener());
-
- // Add resource change listener
- fileFacesConfig.getWorkspace().addResourceChangeListener(
- getResourceTracker());
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.ui.IWorkbenchPart#dispose()
- */
- public void dispose() {
- // remove selection change listener
- getModelsTransform().dispose();
- getSite().getWorkbenchWindow().getSelectionService()
- .removeSelectionListener(getSelectionListener());
-
- // remove listener to Editor's preferences changing
- EditorPlugin.getDefault().getPreferenceStore()
- .removePropertyChangeListener(this);
-
- if (getEditorInput() != null) {
- IFile file = (IFile) getEditorInput().getAdapter(IResource.class);
- if (file != null) {
- file.getWorkspace().removeResourceChangeListener(
- getResourceTracker());
- }
- }
- super.dispose();
- }
-
- /**
- * get the pageflow file path based on faces-config.xml file path
- *
- * @return
- */
- private IPath getPageflowFilePath(IFile file) {
- IPath pageflowFilePath;
- pageflowFilePath = PageflowModelManager.makePageflowPath(file
- .getFullPath());
- return pageflowFilePath;
- }
-
- /**
- * Returns the pageflow object from the specified file.
- *
- * @param file -
- * the file resource
- * @return -the pageflow object from the specified file
- * @throws IOException
- */
- private Pageflow createPageflow(IPath pathPageflow) throws CoreException,
- IOException {
- Pageflow pageflow = null;
-
- try {
- getPageflowManager().load(pathPageflow);
- } catch (Exception e) {
- // Pageflow.PageflowEditor.Error.invalidPageflowFile = The specified
- // input is not a valid pageflow.
- // _log.error("Pageflow.PageflowEditor.Error.invalidPageflowFile",
- // e);
- getPageflowManager().createPageflow(pathPageflow);
- }
- IFile fileFacesConfig = ((FileEditorInput) getEditorInput()).getFile();
- // it should update related config file
- if (!fileFacesConfig.getFullPath().toString().trim().equalsIgnoreCase(
- getPageflowManager().getModel().getConfigfile())) {
- getPageflowManager().getModel().setConfigfile(
- fileFacesConfig.getFullPath().toString());
- getPageflowManager().save(pathPageflow);
- }
- pageflow = getPageflowManager().getModel();
- if (null == pageflow) {
- // Pageflow.PageflowEditor.Error.invalidPageflowModel = The model in
- // the pageflow file is not a valid pageflow model.
- log.error("Pageflow.PageflowEditor.Error.invalidPageflowModel"); //$NON-NLS-1$
- EditorPlugin.getAlerts().throwCoreException(
- "Pageflow.PageflowEditor.Error.invalidPageflowModel"); //$NON-NLS-1$
- }
- return pageflow;
- }
-
- /** get the pageflow manager for this page
- * @return the model manager
- */
- public PageflowModelManager getPageflowManager() {
- if (pageflowManager == null) {
- pageflowManager = new PageflowModelManager();
- }
- return pageflowManager;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see ISaveablePart#isDirty()
- */
- public final boolean isDirty() {
- return isDirty;
- }
-
- /**
- * Returns the <code>CommandStack</code> of this editor page.
- *
- * @return - the <code>CommandStack</code> of this editor page
- */
- public final CommandStack getCommandStack() {
- if (commandStack == null) {
- commandStack = new PreExecuteCommandStack();
- commandStack
- .addCommandStackEventListener(new PageCommandStackListener());
- }
- return commandStack;
- }
-
- /**
- * Returns the default <code>PaletteRoot</code> for this editor and all
- * its pages.
- *
- * @return - the default <code>PaletteRoot</code>
- */
- protected PaletteRoot getPaletteRoot() {
- if (null == paletteRoot) {
- // create root
- paletteRoot = new PageflowPaletteRoot();
- }
- return paletteRoot;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see ISaveablePart#isSaveAsAllowed()
- */
- public final boolean isSaveAsAllowed() {
- // our policy: delegate saving to the parent
- return getParentEditor().isSaveAsAllowed();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see IWorkbenchPart#setFocus()
- */
- public void setFocus() {
- getGraphicalViewer().getControl().setFocus();
- }
-
- /**
- * Returns the multi page pageflow editor this editor page is contained in.
- *
- * @return - the parent multi page editor
- */
- protected final IEditorPart getParentEditor() {
- return parentEditor;
- }
-
- /**
- * Returns the edit domain this editor page uses.
- *
- * @return - the edit domain this editor page uses
- */
- public final DefaultEditDomain getEditDomain() {
- return domain;
- }
-
- /**
- * Hooks a <code>EditPartViewer</code> to the rest of the Editor.
- * <p>
- * By default, the viewer is added to the SelectionSynchronizer, which can
- * be used to keep 2 or more EditPartViewers in sync. The viewer is also
- * registered as the ISelectionProvider for the Editor's PartSite.
- *
- * @param viewer_ -
- * the viewer to hook into the editor
- */
- protected void registerEditPartViewer(EditPartViewer viewer_) {
- // register viewer to edit domain
- getEditDomain().addViewer(viewer_);
-
- // the multi page pageflow editor keeps track of synchronizing
- getSelectionSynchronizer().addViewer(viewer_);
-
- // add viewer as selection provider
- getSite().setSelectionProvider(viewer_);
- }
-
- /**
- * Configures the specified <code>EditPartViewer</code> including context
- * menu, key handler, etc.
- *
- * @param viewer_ -
- * the pageflow graphical viewer.
- */
- protected void configureEditPartViewer(EditPartViewer viewer_) {
- // configure the shared key handler
- if (null != viewer_.getKeyHandler()) {
- viewer_.getKeyHandler().setParent(getSharedKeyHandler());
- }
- // create the ActionRegistry
- createActions();
-
- // append the parent editor's action registry.
- ActionRegistry actionRegistry_ = (ActionRegistry) getParentEditor()
- .getAdapter(ActionRegistry.class);
- if (actionRegistry_ != null) {
- for (Iterator iter = actionRegistry_.getActions(); iter.hasNext();) {
- getActionRegistry().registerAction((IAction) iter.next());
- }
- }
- // configure and register the context menu
- ContextMenuProvider provider = new PageflowEditorContextMenuProvider(
- viewer_, getActionRegistry());
- viewer_.setContextMenu(provider);
- getSite().registerContextMenu(
- EditorPlugin.getPluginId() + PAGEFLOW_CONTEXTMENU_REG_ID,
- provider, getSite().getSelectionProvider());
-
- // enable viewer as drop target for template transfers
- viewer_
- .addDropTargetListener((TransferDropTargetListener) new PageflowTemplateTransferDropTargetListener(
- viewer_));
-
- }
-
- /**
- * Returns the pageflow that is edited.
- *
- * @return - the pageflow that is edited
- */
- public Pageflow getPageflow() {
- return getPageflowManager().getModel();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see AbstractEditorPage#getGraphicalViewerForZoomSupport()
- */
- public GraphicalViewer getGraphicalViewer() {
- return viewer;
- }
-
- /**
- * @param contents
- */
- public void setGraphicalViewerContents(Object contents) {
- viewer.setContents(contents);
- propertyChange(null);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see IAdaptable#getAdapter(Class)
- */
- public Object getAdapter(Class type) {
- if (type == IContentOutlinePage.class) {
- return getOutlinePage();
- } else if (type == CommandStack.class) {
- return getCommandStack();
- } else if (type == ActionRegistry.class) {
- return getActionRegistry();
- } else if (type == IPropertySheetPage.class) {
- return getPropertySheetPage();
- } else if (type == ZoomManager.class) {
- return getZoomManager(getGraphicalViewer());
- }
- return super.getAdapter(type);
- }
-
- /**
- * Returns the outline page for the outline view with lazy creation
- *
- * @return - the outline page
- */
- protected PageflowEditorOutlinePage getOutlinePage() {
- PageflowEditorOutlinePage outlinePage = new PageflowEditorOutlinePage(
- this);
- outlinePage.initialize(this);
- return outlinePage;
- }
-
- /**
- * Returns the undoable <code>PropertySheetPage</code> for this editor.
- *
- * @return - the undoable <code>PropertySheetPage</code>
- */
- protected IPropertySheetPage getPropertySheetPage() {
- if (null == undoablePropertySheetPage) {
- undoablePropertySheetPage = new PropertySheetPage();
-
- /** set the property source for property sheet page */
- undoablePropertySheetPage
- .setRootEntry(new org.eclipse.gef.ui.properties.UndoablePropertySheetEntry(
- (CommandStack) getAdapter(CommandStack.class)));
-
- }
-
- return undoablePropertySheetPage;
- }
-
- /**
- * Returns the selection syncronizer object. The synchronizer can be used to
- * sync the selection of 2 or more EditPartViewers.
- *
- * @return - the syncrhonizer
- */
- protected SelectionSynchronizer getSelectionSynchronizer() {
- if (null == synchronizer) {
- synchronizer = new SelectionSynchronizer();
- }
- return synchronizer;
- }
-
- /**
- * Returns the shared KeyHandler that should be used for all viewers.
- *
- * @return - the shared KeyHandler
- */
- protected KeyHandler getSharedKeyHandler() {
- if (null == sharedKeyHandler) {
- sharedKeyHandler = new KeyHandler();
-
- // configure common keys for all viewers
- sharedKeyHandler
- .put(KeyStroke.getPressed(SWT.DEL, 127, 0),
- getActionRegistry().getAction(
- ActionFactory.DELETE.getId()));
- sharedKeyHandler.put(KeyStroke.getPressed(SWT.F2, 0),
- getActionRegistry().getAction(
- GEFActionConstants.DIRECT_EDIT));
- }
- return sharedKeyHandler;
- }
-
- /**
- * Returns the selection listener.
- *
- * @return - the <code>ISelectionListener</code>
- */
- protected ISelectionListener getSelectionListener() {
- return selectionListener;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.util.IPropertyChangeListener#propertyChange(org.eclipse.jface.util.PropertyChangeEvent)
- */
- public void propertyChange(PropertyChangeEvent event) {
- String property = (event == null) ? null : event.getProperty();
-
- propagateProperty(property, viewer.getRootEditPart());
- }
-
- /**
- * propagate property change to children edit part
- *
- * @param property -
- * property's string name
- * @param part -
- * parent edit part.
- */
- private void propagateProperty(String property, EditPart part) {
- processPropertyChange(property, part);
-
- if (part instanceof GraphicalEditPart) {
- // get the connections edit part
- Iterator iterConns = ((GraphicalEditPart) part)
- .getSourceConnections().iterator();
- while (iterConns.hasNext()) {
- EditPart child = (EditPart) iterConns.next();
- propagateProperty(property, child);
- }
- }
- Iterator iter = part.getChildren().iterator();
- while (iter.hasNext()) {
- EditPart child = (EditPart) iter.next();
- propagateProperty(property, child);
- }
- }
-
- /**
- * process the property change FIXME: The property change should be category
- * to improve the performance.
- *
- * @param property -
- * property's string name
- * @param part
- */
- private void processPropertyChange(String property, EditPart part) {
- IPreferenceStore store = EditorPlugin.getDefault().getPreferenceStore();
-
- if (property != null
- && property.equals(GEMPreferences.USE_SYSTEM_COLORS)) {
- // reload all properties - it's easiest
- property = null;
- }
-
- if (property == null || GEMPreferences.SNAP_TO_GRID.equals(property)) {
- boolean bSnapToGrid = store.getBoolean(GEMPreferences.SNAP_TO_GRID);
- if (part instanceof ILayerPanePreference) {
- ((ILayerPanePreference) part).setGridVisible(bSnapToGrid);
- }
- }
-
- if (property == null || GEMPreferences.GRID_WIDTH.equals(property)
- || GEMPreferences.GRID_HEIGHT.equals(property)) {
- Dimension gridSpacing = new Dimension(store
- .getInt(GEMPreferences.GRID_WIDTH), store
- .getInt(GEMPreferences.GRID_HEIGHT));
- if (part instanceof ILayerPanePreference) {
- ((ILayerPanePreference) part).setGridSpacing(gridSpacing);
- }
- }
-
- if (property == null || GEMPreferences.GRID_COLOR.equals(property)) {
- Color gridFgColor = GEMPreferences.getColor(store,
- GEMPreferences.GRID_COLOR);
- if (part instanceof ILayerPanePreference) {
- ((ILayerPanePreference) part)
- .setGridForegroundColor(gridFgColor);
- }
- }
-
- if (property == null || GEMPreferences.CANVAS_COLOR.equals(property)) {
- Color containerBgColor = GEMPreferences.getColor(store,
- GEMPreferences.CANVAS_COLOR);
- if (part instanceof IFigurePreference) {
- ((IFigurePreference) part).setBackgroundColor(containerBgColor);
- }
- }
-
- if (property == null || GEMPreferences.LINE_WIDTH.equals(property)) {
- int linkLineWidth = store.getInt(GEMPreferences.LINE_WIDTH);
-
- if (part instanceof IConnectionPreference) {
- ((IConnectionPreference) part).setLineWidth(linkLineWidth);
- }
- }
-
- if (property == null || GEMPreferences.LINE_COLOR.equals(property)) {
- Color linkLineColor = GEMPreferences.getColor(store,
- GEMPreferences.LINE_COLOR);
- if (part instanceof IConnectionPreference) {
- ((IConnectionPreference) part)
- .setForegroundColor(linkLineColor);
- }
- }
-
- if (property == null
- || GEMPreferences.SHOW_LINE_LABELS.equals(property)) {
- boolean bLinkLabelVisible = store
- .getBoolean(GEMPreferences.SHOW_LINE_LABELS);
- if (part instanceof IConnectionPreference) {
- ((IConnectionPreference) part)
- .setLabelVisible(bLinkLabelVisible);
- }
- }
-
- if (property == null || GEMPreferences.LINE_LABEL_FONT.equals(property)
- || GEMPreferences.LINE_LABEL_FONT_COLOR.equals(property)) {
- Font linkLabelFont = getLinkLabelFont();
- Color linkLabelFgColor = GEMPreferences.getColor(store,
- GEMPreferences.LINE_LABEL_FONT_COLOR);
- if (part instanceof IConnectionPreference) {
- ((IConnectionPreference) part).setFont(linkLabelFont);
- ((IConnectionPreference) part)
- .setLabelForegroundColor(linkLabelFgColor);
- }
- }
-
- if (property == null
- || GEMPreferences.LINE_LABEL_COLOR.equals(property)) {
- Color linkLabelBgColor = GEMPreferences.getColor(store,
- GEMPreferences.LINE_LABEL_COLOR);
- if (part instanceof IConnectionPreference) {
- ((IConnectionPreference) part)
- .setLabelBackgroundColor(linkLabelBgColor);
- }
- }
-
- if (property == null || GEMPreferences.LINE_ROUTING.equals(property)) {
- String connectionStyle = store
- .getString(GEMPreferences.LINE_ROUTING);
- int style;
- if (GEMPreferences.LINE_ROUTING_MANHATTAN.equals(connectionStyle)) {
- style = ILayerPanePreference.LINE_ROUTING_MANHATTAN;
- } else {
- style = ILayerPanePreference.LINE_ROUTING_MANUAL;
- }
-
- if (part instanceof ILayerPanePreference) {
- ((ILayerPanePreference) part).setConnectionRouterStyle(style);
- } else if (part instanceof IConnectionPreference) {
- ((IConnectionPreference) part).setConnectionRouterStyle(style);
- }
- }
-
- if (property == null
- || GEMPreferences.FIGURE_LABEL_FONT.equals(property)
- || GEMPreferences.FIGURE_LABEL_FONT_COLOR.equals(property)) {
- Font nodeLabelFont = getNodeLabelFont();
- Color nodeLabelFgColor = GEMPreferences.getColor(store,
- GEMPreferences.FIGURE_LABEL_FONT_COLOR);
-
- if (part instanceof INodePreference) {
- ((INodePreference) part).setFont(nodeLabelFont);
- ((INodePreference) part).setForegroundColor(nodeLabelFgColor);
- }
- }
-
- if (property == null || GEMPreferences.LABEL_PLACEMENT.equals(property)) {
- int placement = PositionConstants.SOUTH;
- String nodeLabelPlacement = store
- .getString(GEMPreferences.LABEL_PLACEMENT);
- if (GEMPreferences.LABEL_PLACEMENT_TOP.equals(nodeLabelPlacement))
- placement = PositionConstants.NORTH;
- else if (GEMPreferences.LABEL_PLACEMENT_BOTTOM
- .equals(nodeLabelPlacement))
- placement = PositionConstants.SOUTH;
- else if (GEMPreferences.LABEL_PLACEMENT_LEFT
- .equals(nodeLabelPlacement))
- placement = PositionConstants.WEST;
- else if (GEMPreferences.LABEL_PLACEMENT_RIGHT
- .equals(nodeLabelPlacement))
- placement = PositionConstants.EAST;
- if (part instanceof INodePreference)
- ((INodePreference) part).setTextPlacement(placement);
- }
- }
-
- private Font getLinkLabelFont() {
- FontRegistry registry = JFaceResources.getFontRegistry();
- IPreferenceStore store = EditorPlugin.getDefault().getPreferenceStore();
- FontData fontData = PreferenceConverter.getFontData(store,
- GEMPreferences.LINE_LABEL_FONT);
- if (!registry.get(fontData.toString()).equals(registry.defaultFont()))
- return registry.get(fontData.toString());
-
- registry.put(fontData.toString(), new FontData[] {fontData});
- return registry.get(fontData.toString());
- }
-
- private Font getNodeLabelFont() {
- FontRegistry registry = JFaceResources.getFontRegistry();
- IPreferenceStore store = EditorPlugin.getDefault().getPreferenceStore();
- FontData fontData = PreferenceConverter.getFontData(store,
- GEMPreferences.FIGURE_LABEL_FONT);
- if (!registry.get(fontData.toString()).equals(registry.defaultFont()))
- return registry.get(fontData.toString());
-
- registry.put(fontData.toString(), new FontData[] {fontData});
- return registry.get(fontData.toString());
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.ui.ide.IGotoMarker#gotoMarker(org.eclipse.core.resources.IMarker)
- */
- public void gotoMarker(IMarker marker) {
- // The LOCATION attribute in the marker should be the ID string
- Object id = null;
- try {
- id = marker.getAttribute(IMarker.LOCATION);
- } catch (CoreException e) {
- // Pageflow.PageflowEditor.Error.invalidMarkerAttribute = Unable to
- // get marker's attribute
- log
- .error(
- "Pageflow.PageflowEditor.Error.invalidMarkerAttribute", //$NON-NLS-1$
- e);
- }
- if (id instanceof String) {
- GraphicalEditPart part = EditPartMarkerUtil.findEditPart(
- (GraphicalEditPart) getGraphicalViewer().getRootEditPart(),
- (String) id);
- if (part != null) {
- getGraphicalViewer().reveal(part);
- getGraphicalViewer().select(part);
- return;
- }
- }
-
- }
-
- /**
- * the related web page is changed in outside editor, the pageflow should be
- * revalidated to update the validation icons
- *
- * @param fullPath
- */
- public void webPageChanged(IPath fullPath) {
- PageflowPage page = getPageflowManager().foundPage(
- WebrootUtil.getWebPath(fullPath));
-
- if (page != null && getGraphicalViewer() != null
- && getGraphicalViewer().getRootEditPart() != null) {
- GraphicalEditPart pagePart = EditPartMarkerUtil.findEditPart(
- (GraphicalEditPart) getGraphicalViewer().getRootEditPart(),
- page.getId());
- PageflowAnnotationUtil
- .validatePage((PageflowNodeEditPart) pagePart);
- }
- }
-
- /**
- * Get the image desriptor from the view's id.
- *
- * @param viewid
- * @return
- */
- private ImageDescriptor getImageDescriptorForView(String viewid) {
- IConfigurationElement[] elements = Platform.getExtensionRegistry()
- .getConfigurationElementsFor("org.eclipse.ui.views"); //$NON-NLS-1$
- for (int i = 0; i < elements.length; i++) {
- String name = elements[i].getName();
- String id = elements[i].getAttribute("id"); //$NON-NLS-1$
- if ("view".equals(name) && viewid.equals(id)) { //$NON-NLS-1$
- String iconPath = elements[i].getAttribute("icon"); //$NON-NLS-1$
- if (iconPath != null) {
- return AbstractUIPlugin.imageDescriptorFromPlugin(
- elements[i].getDeclaringExtension().getContributor().getName(),
- iconPath);
- }
- }
- }
- return null;
- }
-}
\ No newline at end of file
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/PageflowEditorContextMenuProvider.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/PageflowEditorContextMenuProvider.java
deleted file mode 100644
index 3e23919..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/PageflowEditorContextMenuProvider.java
+++ /dev/null
@@ -1,242 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow;
-
-import org.eclipse.gef.ContextMenuProvider;
-import org.eclipse.gef.EditPartViewer;
-import org.eclipse.gef.ui.actions.ActionRegistry;
-import org.eclipse.gef.ui.actions.GEFActionConstants;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.action.IMenuManager;
-import org.eclipse.jface.action.MenuManager;
-import org.eclipse.jst.jsf.facesconfig.ui.FacesConfigEditor;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.action.ShowPropertyViewAction;
-import org.eclipse.ui.actions.ActionFactory;
-
-/**
- * This is the context menu provider for pageflow editor.
- *
- */
-public class PageflowEditorContextMenuProvider extends ContextMenuProvider {
- /** the action registry */
- private final ActionRegistry actionRegistry;
-
- /**
- * Creates a new PageflowEditorContextMenuProvider instance.
- *
- * @param viewer -
- * the editor viewer
- * @param actionRegistry -
- * action registry of the editor
- */
- public PageflowEditorContextMenuProvider(EditPartViewer viewer,
- ActionRegistry actionRegistry) {
- super(viewer);
-
- this.actionRegistry = actionRegistry;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see ContextMenuProvider#buildContextMenu(IMenuManager)
- */
- public void buildContextMenu(IMenuManager menuManager) {
- // add GEF menu groups, such as undo, edit, save, etc.
- GEFActionConstants.addStandardActionGroups(menuManager);
-
- // add typical undo/redo commands
- appendActionToUndoGroup(menuManager, ActionFactory.UNDO.getId());
- appendActionToUndoGroup(menuManager, ActionFactory.REDO.getId());
- // add edit commands, including copy, paste, delete
- appendActionToEditGroup(menuManager, ActionFactory.COPY.getId());
- appendActionToEditGroup(menuManager, ActionFactory.PASTE.getId());
- appendActionToEditGroup(menuManager, ActionFactory.DELETE.getId());
- // Add Open Editor Action
- appendActionToEditGroup(menuManager, FacesConfigEditor.EDITOR_ID);
-
- // append the save submenu
- appendActionToSaveGroup(menuManager, ActionFactory.SAVE.getId());
-
- // append the alignment submenu, including top, bottom, middle, left,
- // right and center.
- appendAlignmentSubmenu(menuManager);
-
- appendShowViewSubmenu(menuManager);
-
- }
-
- /**
- * Appends the alignment subment.
- *
- * @param menuManager
- * manager of workbench
- */
- private void appendShowViewSubmenu(IMenuManager menuManager) {
- // Show View Actions
- MenuManager submenu = new MenuManager(
- PageflowMessages.Pageflow_Contextmenu_ShowView_Label);
-
- IAction action = getActionRegistry().getAction(
- ShowPropertyViewAction.SHOW_PROPERTY_VIEW);
- if (null != action && action.isEnabled()) {
- submenu.add(action);
- }
-
- // action = getActionRegistry().getAction(
- // ShowPaletteViewAction.SHOW_PALETTE_VIEW);
- // if (null != action && action.isEnabled()) {
- // submenu.add(action);
- // }
-
- if (!submenu.isEmpty()) {
- menuManager.appendToGroup(GEFActionConstants.GROUP_REST, submenu);
- }
- }
-
- /**
- * Appends the alignment subment.
- *
- * @param menuManager
- * manager of workbench
- */
- private void appendAlignmentSubmenu(IMenuManager menuManager) {
- // Alignment Actions
- MenuManager submenu = new MenuManager(
- PageflowMessages.Pageflow_Contextmenu_Align_Label);
-
- IAction action = getActionRegistry().getAction(
- GEFActionConstants.ALIGN_LEFT);
- if (null != action && action.isEnabled()) {
- submenu.add(action);
- }
-
- action = getActionRegistry().getAction(GEFActionConstants.ALIGN_CENTER);
- if (null != action && action.isEnabled()) {
- submenu.add(action);
- }
-
- action = getActionRegistry().getAction(GEFActionConstants.ALIGN_RIGHT);
- if (null != action && action.isEnabled()) {
- submenu.add(action);
- }
-
- action = getActionRegistry().getAction(GEFActionConstants.ALIGN_TOP);
- if (null != action && action.isEnabled()) {
- submenu.add(action);
- }
-
- action = getActionRegistry().getAction(GEFActionConstants.ALIGN_MIDDLE);
- if (null != action && action.isEnabled()) {
- submenu.add(action);
- }
-
- action = getActionRegistry().getAction(GEFActionConstants.ALIGN_BOTTOM);
- if (null != action && action.isEnabled()) {
- submenu.add(action);
- }
-
- if (!submenu.isEmpty()) {
- menuManager.appendToGroup(GEFActionConstants.GROUP_EDIT, submenu);
- }
- }
-
- /**
- * Returns the action registry.
- *
- * @return - the action registry
- */
- protected ActionRegistry getActionRegistry() {
- return actionRegistry;
- }
-
- /**
- * Appends the specified action to the specified menu group
- *
- * @param menu -
- * menu manager
- * @param actionId -
- * action's ID
- * @param menuGroup -
- * menu group name
- */
- // TODO: dead code
-// private void appendActionToMenu(IMenuManager menu, String actionId,
-// String menuGroup) {
-// IAction action = getActionRegistry().getAction(actionId);
-// if (null != action && action.isEnabled()) {
-// menu.appendToGroup(menuGroup, action);
-// }
-// }
-
- /**
- * Appends the specified action to the 'Undo' menu group
- *
- * @param menu -
- * menu manager
- * @param actionId -
- * action's ID
- */
- private void appendActionToUndoGroup(IMenuManager menu, String actionId) {
- IAction action = getActionRegistry().getAction(actionId);
- if (null != action && action.isEnabled()) {
- menu.appendToGroup(GEFActionConstants.GROUP_UNDO, action);
- }
- }
-
- /**
- * Appends the specified action to the 'edit' menu group
- *
- * @param menu -
- * menu manager
- * @param actionId -
- * action's ID
- */
- private void appendActionToEditGroup(IMenuManager menu, String actionId) {
- IAction action = getActionRegistry().getAction(actionId);
- if (null != action && action.isEnabled()) {
- menu.appendToGroup(GEFActionConstants.GROUP_EDIT, action);
- }
- }
-
- /**
- * Appends the specified action to the 'add' menu group
- *
- * @param menu -
- * menu manager
- * @param actionId -
- * action's ID
- */
- // TODO: dead code
-// private void appendActionToAddGroup(IMenuManager menu, String actionId) {
-// IAction action = getActionRegistry().getAction(actionId);
-// if (null != action && action.isEnabled()) {
-// menu.appendToGroup(GEFActionConstants.GROUP_ADD, action);
-// }
-// }
-
- /**
- * Appends the specified action to the 'save' menu group
- *
- * @param menu -
- * menu manager
- * @param actionId -
- * action's ID
- */
- private void appendActionToSaveGroup(IMenuManager menu, String actionId) {
- IAction action = getActionRegistry().getAction(actionId);
- if (null != action && action.isEnabled()) {
- menu.appendToGroup(GEFActionConstants.GROUP_SAVE, action);
- }
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/PageflowEditorOutlinePage.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/PageflowEditorOutlinePage.java
deleted file mode 100644
index 82ca489..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/PageflowEditorOutlinePage.java
+++ /dev/null
@@ -1,545 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.LightweightSystem;
-import org.eclipse.draw2d.MarginBorder;
-import org.eclipse.draw2d.Viewport;
-import org.eclipse.draw2d.parts.ScrollableThumbnail;
-import org.eclipse.gef.ContextMenuProvider;
-import org.eclipse.gef.EditDomain;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPartListener;
-import org.eclipse.gef.EditPartViewer;
-import org.eclipse.gef.LayerConstants;
-import org.eclipse.gef.RootEditPart;
-import org.eclipse.gef.editparts.ScalableFreeformRootEditPart;
-import org.eclipse.gef.editparts.ScalableRootEditPart;
-import org.eclipse.gef.ui.parts.TreeViewer;
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.action.IToolBarManager;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jst.jsf.facesconfig.ui.EditorPlugin;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.editpart.PageflowTreePartFactory;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowElement;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.Canvas;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.ui.part.EditorPart;
-import org.eclipse.ui.part.Page;
-import org.eclipse.ui.part.PageBook;
-import org.eclipse.ui.views.contentoutline.IContentOutlinePage;
-
-/**
- * This is an implementation of an outline page showing an overview figure and
- * an tree outline of the main graphical viewer provided by the current active
- * page of an multi page editor.
- *
- */
-public class PageflowEditorOutlinePage extends Page implements
- IContentOutlinePage {
- /** the pageflow editor */
- private final PageflowEditor editor;
-
- /** the outlineContent for the tree viewer */
- private PageflowElement outlineContent = null;
-
- /** the control of the overview */
- private Canvas overview = null;
-
- /** the root edit part (outlineContent for the thumbnail) */
- private RootEditPart overviewContent = null;
-
- /** the thumbnail */
- private ScrollableThumbnail thumbnail = null;
-
- /** the tree viewer */
- private TreeViewer treeViewer = null;
-
- /** the control of the tree view */
- private Control outline = null;
-
- /** the pagebook */
- private PageBook pageBook = null;
-
- /** action for showing the tree page */
- private IAction showOutlineAction = null;
-
- /** action for showing the overview page */
- private IAction showOverviewAction = null;
-
- /** the LightweightSystem */
- private LightweightSystem lws = null;
-
- /** the edit domain */
- private EditDomain editDomain = null;
-
- /**
- * Creates a new PageflowEditorOutlinePage instance.
- *
- * @param editor -
- * Pageflow Editor
- */
- public PageflowEditorOutlinePage(EditorPart editor) {
- super();
- this.editor = (PageflowEditor) editor;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see ISelectionProvider#addSelectionChangedListener(ISelectionChangedListener)
- */
- public void addSelectionChangedListener(ISelectionChangedListener listener) {
- getTreeViewer().addSelectionChangedListener(listener);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see IPage#createControl(Composite)
- */
- public void createControl(Composite parent) {
- // pagebook
- pageBook = new PageBook(parent, SWT.NONE);
-
- // tree viewer control
- outline = getTreeViewer().createControl(pageBook);
- configureEditPartViewer(getTreeViewer());
-
- // overview canvas
- overview = new Canvas(pageBook, SWT.NONE);
- lws = new LightweightSystem(overview);
-
- // create actions
- IToolBarManager tbm = getSite().getActionBars().getToolBarManager();
- showOutlineAction = new Action() {
- public void run() {
- showPage(outline);
- }
- };
- showOutlineAction.setImageDescriptor(EditorPlugin.getDefault()
- .getImageDescriptor("facesconfig/Pageflow_Outline.gif")); //$NON-NLS-1$
- tbm.add(showOutlineAction);
- showOverviewAction = new Action() {
- public void run() {
- showPage(overview);
- }
- };
- showOverviewAction.setImageDescriptor(EditorPlugin.getDefault()
- .getImageDescriptor("facesconfig/Pageflow_Outline_Overview.gif")); //$NON-NLS-1$
- tbm.add(showOverviewAction);
-
- // initialize outline page
- initializeOutlineViewer();
-
- // initialize overview
- initializeOverview();
-
- // initialize pagebook
- showPage(outline);
- }
-
- /**
- * Configures the outline viewer
- */
- private void initializeOutlineViewer() {
- if (null != getEditDomain()) {
- getEditDomain().addViewer(getTreeViewer());
- }
- // getTreeViewer().setEditPartFactory(new PageflowTreePartFactory());
-
- // synchronize selections
- editor.getSelectionSynchronizer().addViewer(getTreeViewer());
-
- // add content
- getTreeViewer().setContents(getOutlineContent());
- }
-
- /**
- * Shows the spcified page.
- *
- * @param id -
- * control id of pagebook in outline page. it is can be _outline
- * or _overview
- */
- protected void showPage(Control id) {
- if (id == outline) {
- showOutlineAction.setChecked(true);
- showOverviewAction.setChecked(false);
- pageBook.showPage(outline);
- if (thumbnail != null) {
- thumbnail.setVisible(false);
- }
- } else if (id == overview) {
- showOutlineAction.setChecked(false);
- showOverviewAction.setChecked(true);
- pageBook.showPage(overview);
- if (thumbnail != null) {
- thumbnail.setVisible(true);
- }
- }
- }
-
- /**
- * Returns the current edit domain.
- *
- * @return - the edit domain
- */
- public EditDomain getEditDomain() {
- return editDomain;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see IPage#dispose()
- */
- public void dispose() {
- editor.getSelectionSynchronizer().removeViewer(getTreeViewer());
-
- if (null != thumbnail) {
- thumbnail.deactivate();
- }
-
- super.dispose();
- }
-
- /**
- * initialize Overview.
- *
- */
- private void initializeOverview() {
- // check if control was created
- if (null == lws) {
- return;
- }
-
- // deactivate old thumbnail
- if (null != thumbnail) {
- thumbnail.deactivate();
- }
-
- // create empty thumbnail
- thumbnail = new ScrollableThumbnail();
- thumbnail.setBorder(new MarginBorder(3));
- lws.setContents(thumbnail);
-
- // initialize thumbnail
- if (null != getOverviewContent()) {
- Viewport viewport = null;
- IFigure source = null;
- if (getOverviewContent() instanceof ScalableFreeformRootEditPart) {
- viewport = (Viewport) ((ScalableFreeformRootEditPart) getOverviewContent())
- .getFigure();
- source = ((ScalableFreeformRootEditPart) getOverviewContent())
- .getLayer(LayerConstants.PRINTABLE_LAYERS);
- }
- if (getOverviewContent() instanceof ScalableRootEditPart) {
- viewport = (Viewport) ((ScalableRootEditPart) getOverviewContent())
- .getFigure();
- source = ((ScalableRootEditPart) getOverviewContent())
- .getLayer(LayerConstants.PRINTABLE_LAYERS);
- }
-
- if (null != viewport && null != source) {
- thumbnail.setViewport(viewport);
- thumbnail.setSource(source);
- }
- }
- }
-
- /**
- * Returns the outlineContent.
- *
- * @return - the outlineContent
- */
- public PageflowElement getOutlineContent() {
- return outlineContent;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see IPage#getControl()
- */
- public Control getControl() {
- return pageBook;
- }
-
- /**
- * Returns the root edit part
- *
- * @return - the root edit part
- */
- public RootEditPart getOverviewContent() {
- return overviewContent;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see ISelectionProvider#getSelection()
- */
- public ISelection getSelection() {
- return getTreeViewer().getSelection();
- }
-
- /**
- * Returns the tree viewer.
- *
- * @return - the tree viewer
- */
- public TreeViewer getTreeViewer() {
- if (null == treeViewer) {
- treeViewer = new TreeViewer();
- treeViewer.setEditPartFactory(new PageflowTreePartFactory());
- }
-
- return treeViewer;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see ISelectionProvider#removeSelectionChangedListener(ISelectionChangedListener)
- */
- public void removeSelectionChangedListener(
- ISelectionChangedListener listener) {
- getTreeViewer().removeSelectionChangedListener(listener);
- }
-
- /**
- * Sets the outlineContent.
- *
- * @param element -
- * Pageflow Element
- */
- public void setOutlineContent(PageflowElement element) {
- if (outlineContent != element) {
- outlineContent = element;
-
- // refresh viewer
- if (null != getTreeViewer().getControl()) {
- getTreeViewer().setContents(element);
-
- // bugfix: something is overwriting visibility
- if (null != pageBook) {
- if (showOverviewAction.isChecked()) {
- showPage(outline);
- showPage(overview);
- } else {
- showPage(outline);
- }
- }
- }
- }
- }
-
- /*
- * (non-Javadoc)
- *
- * @see IPage#setFocus()
- */
- public void setFocus() {
- if (getControl() != null) {
- getControl().setFocus();
- }
- }
-
- /**
- * Sets the root edit part.
- *
- * @param part -
- * root edit part for pageflow model
- */
- public void setOverviewContent(RootEditPart part) {
- if (overviewContent != part) {
- overviewContent = part;
- // reinitialize thumbnail
- // if (null != thumbnail && thumbnail.isVisible())
- initializeOverview();
- }
- }
-
- /*
- * (non-Javadoc)
- *
- * @see ISelectionProvider#setSelection(ISelection)
- */
- public void setSelection(ISelection selection) {
- getTreeViewer().setSelection(selection);
- }
-
- /**
- * Initializes this outline page from a given editor page.
- *
- * @param newPage -
- * Pageflow EditorPage
- */
- public void initialize(PageflowEditor newPage) {
- if (null != newPage.getGraphicalViewer()) {
- setOverviewContent(newPage.getGraphicalViewer().getRootEditPart());
- EditPart currentContent = newPage.getGraphicalViewer()
- .getContents();
- setOutlineContent(null != currentContent ? (PageflowElement) currentContent
- .getModel()
- : null);
- setEditDomain(newPage.getEditDomain());
- getViewerContentListener().setViewer(newPage.getGraphicalViewer());
- } else {
- setOverviewContent(null);
- setOutlineContent(null);
- setEditDomain(null);
- }
- }
-
- /**
- * Sets the edit domain.
- *
- * @param domain -
- * editor's edit domain
- */
- public void setEditDomain(EditDomain domain) {
- if (editDomain != domain) {
- // refresh viewer
- if (null != getTreeViewer()) {
- if (null != editDomain) {
- editDomain.removeViewer(getTreeViewer());
- }
- if (null != domain) {
- domain.addViewer(getTreeViewer());
- }
- }
- editDomain = domain;
- }
- }
-
- /**
- * the current viewer content listener
- */
- private final ViewerContentListener viewerContentListener = new ViewerContentListener();
-
- /**
- * This class listens for changes of the content of an EditPartViewer. If
- * the content changed, it will update the outline viewer.
- * <p>
- * Important: this class has to be disposed with
- * <code>setViewer(null)</code>.
- *
- * @author Gunnar Wagenknecht
- */
- private class ViewerContentListener implements EditPartListener {
- /* the viewer */
- private EditPartViewer _viewer;
-
- /**
- * Sets a new viewer. <code>null</code> is allowed to dispose.
- *
- * @param viewer
- */
- public void setViewer(EditPartViewer viewer) {
- if (null != this._viewer)
- this._viewer.getRootEditPart().removeEditPartListener(this);
-
- this._viewer = viewer;
-
- if (null != this._viewer)
- this._viewer.getRootEditPart().addEditPartListener(this);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.gef.EditPartListener#childAdded(org.eclipse.gef.EditPart,
- * int)
- */
- public void childAdded(EditPart child, int index) {
- // this is out event, update the viewers
- if (child.getModel() instanceof PageflowElement)
- setOutlineContent((PageflowElement) child.getModel());
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.gef.EditPartListener#partActivated(org.eclipse.gef.EditPart)
- */
- public void partActivated(EditPart editpart) {
- // do nothing
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.gef.EditPartListener#partDeactivated(org.eclipse.gef.EditPart)
- */
- public void partDeactivated(EditPart editpart) {
- // do nothing
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.gef.EditPartListener#removingChild(org.eclipse.gef.EditPart,
- * int)
- */
- public void removingChild(EditPart child, int index) {
- // do nothing
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.gef.EditPartListener#selectedStateChanged(org.eclipse.gef.EditPart)
- */
- public void selectedStateChanged(EditPart editpart) {
- // do nothing
- }
- }
-
- /**
- * Returns the viewer content listener.
- *
- * @return the viewer content listener
- */
- private ViewerContentListener getViewerContentListener() {
- return viewerContentListener;
- }
-
- /**
- * Configures the specified <code>EditPartViewer</code>.
- *
- * @param viewer
- */
- protected void configureEditPartViewer(EditPartViewer viewer) {
- // configure the shared key handler
- if (viewer.getKeyHandler() != null) {
- viewer.getKeyHandler().setParent(editor.getSharedKeyHandler());
- }
-
- // configure the context menu
- ContextMenuProvider provider = new PageflowEditorContextMenuProvider(
- viewer, editor.getActionRegistry());
- viewer.setContextMenu(provider);
- getSite().registerContextMenu(
- EditorPlugin.getPluginId()
- + ".pageflow.editor.outlineview.contextmenu", provider, //$NON-NLS-1$
- getSite().getSelectionProvider());
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/PageflowMessages.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/PageflowMessages.java
deleted file mode 100644
index a64b442..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/PageflowMessages.java
+++ /dev/null
@@ -1,483 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow;
-
-import org.eclipse.osgi.util.NLS;
-
-/**
- * Pageflow message bundle
- *
- */
-public final class PageflowMessages extends NLS {
-
- private static final String BUNDLE_NAME = "org.eclipse.jst.jsf.facesconfig.ui.pageflow.PageflowMessages"; //$NON-NLS-1$
-
- private PageflowMessages() {
- // Do not instantiate
- }
-
- static {
- NLS.initializeMessages(BUNDLE_NAME, PageflowMessages.class);
- }
-
- /**
- * see PageFlowMessages.properties
- */
- public static String Pageflow_Label_True;
-
- /**
- * see PageFlowMessages.properties
- */
- public static String Pageflow_Label_False;
-
- /**
- * see PageFlowMessages.properties
- */
- public static String Pageflow_Label_Saving;
-
- /**
- * see PageFlowMessages.properties
- */
- public static String Pageflow_Dialog_Label_CreateFileTitle;
-
- /**
- * see PageFlowMessages.properties
- */
- public static String Pageflow_Dialog_Label_FileNotExistedPart1;
-
- /**
- * see PageFlowMessages.properties
- */
- public static String Pageflow_Dialog_Label_FileNotExistedPart2;
-
- /**
- * see PageFlowMessages.properties
- */
- public static String Pageflow_Action_OpenEditor_Label;
-
- /**
- * see PageFlowMessages.properties
- */
- public static String Pageflow_Action_OpenEditor_ToolTip;
-
- /**
- * see PageFlowMessages.properties
- */
- public static String Pageflow_Action_ShowPropertyView_Label;
-
- /**
- * see PageFlowMessages.properties
- */
- public static String Pageflow_Action_ShowPropertyView_ToolTip;
-
- /**
- * see PageFlowMessages.properties
- */
- public static String Pageflow_Action_ShowPaletteView_Label;
-
- /**
- * see PageFlowMessages.properties
- */
- public static String Pageflow_Action_ShowPaletteView_ToolTip;
-
- /**
- * see PageFlowMessages.properties
- */
- public static String Pageflow_Action_SyncWithFacesConfig_Label;
-
- /**
- * see PageFlowMessages.properties
- */
- public static String Pageflow_Action_SyncWithFacesConfig_ToolTip;
-
- /**
- * see PageFlowMessages.properties
- */
- public static String Pageflow_Action_UpdateFacesConfig_Label;
-
- /**
- * see PageFlowMessages.properties
- */
- public static String Pageflow_Action_UpdateFacesConfig_ToolTip;
-
- /**
- * see PageFlowMessages.properties
- */
- public static String Pageflow_PaletteTool_Group_Controls;
-
- /**
- * see PageFlowMessages.properties
- */
- public static String Pageflow_PaletteTool_Select_Label;
-
- /**
- * see PageFlowMessages.properties
- */
- public static String Pageflow_PaletteTool_Select_Description;
-
- /**
- * see PageFlowMessages.properties
- */
- public static String Pageflow_PaletteTool_Marquee_Label;
-
- /**
- * see PageFlowMessages.properties
- */
- public static String Pageflow_PaletteTool_Marquee_Description;
-
- /**
- * see PageFlowMessages.properties
- */
- public static String Pageflow_PaletteTool_Link_Label;
-
- /**
- * see PageFlowMessages.properties
- */
- public static String Pageflow_PaletteTool_Link_Description;
-
- /**
- * see PageFlowMessages.properties
- */
- public static String Pageflow_PaletteTool_Group_Nodes;
-
- /**
- * see PageFlowMessages.properties
- */
- public static String Pageflow_PaletteTool_Begin_Label;
-
- /**
- * see PageFlowMessages.properties
- */
- public static String Pageflow_PaletteTool_Begin_Description;
-
- /**
- * see PageFlowMessages.properties
- */
- public static String Pageflow_PaletteTool_End_Label;
-
- /**
- * see PageFlowMessages.properties
- */
- public static String Pageflow_PaletteTool_End_Description;
-
- /**
- * see PageFlowMessages.properties
- */
- public static String Pageflow_PaletteTool_Action_Label;
-
- /**
- * see PageFlowMessages.properties
- */
- public static String Pageflow_PaletteTool_Action_Description;
-
- /**
- * see PageFlowMessages.properties
- */
- public static String Pageflow_PaletteTool_Page_Label;
-
- /**
- * see PageFlowMessages.properties
- */
- public static String Pageflow_PaletteTool_Page_Description;
-
- /**
- * see PageFlowMessages.properties
- */
- public static String Pageflow_Contextmenu_Align_Label;
-
- /**
- * see PageFlowMessages.properties
- */
- public static String Pageflow_Contextmenu_ShowView_Label;
-
- /**
- * see PageFlowMessages.properties
- */
- public static String Pageflow_Commands_AddNodeCommand_Label;
-
- /**
- * see PageFlowMessages.properties
- */
- public static String Pageflow_Commands_CreateNodeCommand_Label;
-
- /**
- * see PageFlowMessages.properties
- */
- public static String Pageflow_Commands_DeleteNodeCommand_Label;
-
- /**
- * see PageFlowMessages.properties
- */
- public static String Pageflow_Commands_ConnectionCommand_Label;
-
- /**
- * see PageFlowMessages.properties
- */
- public static String Pageflow_Commands_CreateBendpointCommand_Label;
-
- /**
- * see PageFlowMessages.properties
- */
- public static String Pageflow_Commands_MoveBendpointCommand_Label;
-
- /**
- * see PageFlowMessages.properties
- */
- public static String Pageflow_Commands_DeleteBendpointCommand_Label;
-
- /**
- * see PageFlowMessages.properties
- */
- public static String Pageflow_Commands_OpenEditorCommand_Label;
-
- /**
- * see PageFlowMessages.properties
- */
- public static String Pageflow_Commands_OrphanChildCommand_Label;
-
- /**
- * see PageFlowMessages.properties
- */
- public static String Pageflow_Commands_UpdatePageflowCommand_Label;
-
- /**
- * see PageFlowMessages.properties
- */
- public static String Pageflow_Commands_CreateNodeCommand_SelectJSPDialog_Title;
-
- /**
- * see PageFlowMessages.properties
- */
- public static String Pageflow_Commands_CreateNodeCommand_SelectJSPDialog_Description;
-
- /**
- * see PageFlowMessages.properties
- */
- public static String Pageflow_Model_Attributes_comment;
-
- /**
- * see PageFlowMessages.properties
- */
- public static String Pageflow_Model_Attributes_name;
-
- /**
- * see PageFlowMessages.properties
- */
- public static String Pageflow_Model_Attributes_largeicon;
-
- /**
- * see PageFlowMessages.properties
- */
- public static String Pageflow_Model_Attributes_smallicon;
-
- /**
- * see PageFlowMessages.properties
- */
- public static String Pageflow_Model_Attributes_action;
-
- /**
- * see PageFlowMessages.properties
- */
- public static String Pageflow_Model_Attributes_path;
-
- /**
- * see PageFlowMessages.properties
- */
- public static String Pageflow_Model_Attributes_begin;
-
- /**
- * see PageFlowMessages.properties
- */
- public static String Pageflow_Model_Attributes_end;
-
- /**
- * see PageFlowMessages.properties
- */
- public static String Pageflow_Model_Attributes_configfile;
-
- /**
- * see PageFlowMessages.properties
- */
- public static String Pageflow_Model_Attributes_source;
-
- /**
- * see PageFlowMessages.properties
- */
- public static String Pageflow_Model_Attributes_target;
-
- /**
- * see PageFlowMessages.properties
- */
- public static String Pageflow_Model_Attributes_outcome;
-
- /**
- * see PageFlowMessages.properties
- */
- public static String Pageflow_Model_Attributes_redirect;
-
- /**
- * see PageFlowMessages.properties
- */
- public static String Pageflow_Model_Attributes_fromaction;
-
- /**
- * see PageFlowMessages.properties
- */
- public static String Pageflow_Model_Attributes_referenceLink;
-
- /**
- * see PageFlowMessages.properties
- */
- public static String Pageflow_Model_Items_Pageflow;
-
- /**
- * see PageFlowMessages.properties
- */
- public static String Pageflow_Model_Items_PFPage;
-
- /**
- * see PageFlowMessages.properties
- */
- public static String Pageflow_Model_Items_PFLink;
-
- /**
- * see PageFlowMessages.properties
- */
- public static String Pageflow_Property_Action_OutcomeSelectionDialog_Choice;
-
- /**
- * see PageFlowMessages.properties
- */
- public static String Pageflow_Property_Action_OutcomeSelectionDialog_Title;
-
- /**
- * see PageFlowMessages.properties
- */
- public static String Pageflow_Property_Action_OutcomeSelectionDialog_JSPName;
-
- /**
- * see PageFlowMessages.properties
- */
- public static String Pageflow_Property_Action_OutcomeSelectionDialog_ActionListTable_Title;
-
- /**
- * see PageFlowMessages.properties
- */
- public static String Pageflow_Property_Action_OutcomeSelectionDialog_ActionListTableWithJSP_Title;
- /**
- * see PageFlowMessages.properties
- */
- public static String Pageflow_Property_Action_OutcomeSelectionDialog_ActionListTable_Component;
-
- /**
- * see PageFlowMessages.properties
- */
- public static String PageflowLinkPropertySource_Title;
- /**
- * see PageFlowMessages.properties
- */
- public static String ProjectWebPageSelectionDialog_Description;
- /**
- * see PageFlowMessages.properties
- */
- public static String PageflowLinkPropertySource_Text;
- /**
- * see PageFlowMessages.properties
- */
- public static String Pageflow_Property_Action_OutcomeSelectionDialog_ActionListTable_Action;
-
- /**
- * see PageFlowMessages.properties
- */
- public static String Pageflow_Property_Action_OutcomeSelectionDialog_Outcome;
-
- /**
- * see PageFlowMessages.properties
- */
- public static String Pageflow_Validation_UndefinedOutcome;
-
- /**
- * see PageFlowMessages.properties
- */
- public static String Pageflow_Validation_NotExistedSourcePage;
-
- /**
- * see PageFlowMessages.properties
- */
- public static String Pageflow_Validation_MissingSourcePage;
-
- /**
- * see PageFlowMessages.properties
- */
- public static String Pageflow_Validation_InvalidWebPage;
-
- /**
- * see PageFlowMessages.properties
- */
- public static String Pageflow_Validation_NotExitedWebPage;
-
- /**
- * see PageFlowMessages.properties
- */
- public static String Pageflow_Validation_MissingWebPage;
-
- /**
- * see PageFlowMessages.properties
- */
- public static String Pageflow_Validation_MissingManagedBean;
-
- /**
- * see PageFlowMessages.properties
- */
- public static String Pageflow_Validation_MissingAction;
-
- /**
- * see PageFlowMessages.properties
- */
- public static String ExistingPagePathDialogCellEdito_LabelText;
-
- /**
- * see PageFlowMessages.properties
- */
- public static String PageflowLinkEditPart_FromAction;
-
- /**
- * see PageFlowMessages.properties
- */
- public static String PageflowLinkEditPart_FromOutcome;
-
- /**
- * see PageFlowMessages.properties
- */
- public static String PageflowContainerEditPolicy_OrphanLabel;
-
- /**
- * see PageFlowMessages.properties
- */
- public static String PageflowNode_NoRecursiveContainment;
-
- /**
- * see PageFlowMessages.properties
- */
- public static String PageflowXYLayoutEditPolicy_Add;
-
- /**
- * see PageFlowMessages.properties
- */
- public static String SetConstraintCommand_Resize;
-
- /**
- * see PageFlowMessages.properties
- */
- public static String SetConstraintCommand_Location;
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/PageflowMessages.properties b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/PageflowMessages.properties
deleted file mode 100644
index 67a09e5..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/PageflowMessages.properties
+++ /dev/null
@@ -1,158 +0,0 @@
-###############################################################################
-# Copyright (c) 2001, 2007 Oracle Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# Oracle Corporation - initial API and implementation
-###############################################################################
-####################################################
-# Generic Strings for UI
-####################################################
-Pageflow_Label_True=true
-Pageflow_Label_False=false
-
-Pageflow_Label_Saving=Saving
-
-Pageflow_Dialog_Label_CreateFileTitle=Create File
-Pageflow_Dialog_Label_FileNotExistedPart1=The file
-Pageflow_Dialog_Label_FileNotExistedPart2=doesn't exist. Click OK to create it.
-
-####################################################
-# Generic Strings for Action and PaletteTool
-####################################################
-Pageflow_Action_OpenEditor_Label=Open
-Pageflow_Action_OpenEditor_ToolTip=Open Page or Action component
-
-Pageflow_Action_ShowPropertyView_Label=Properties
-Pageflow_Action_ShowPropertyView_ToolTip=Show Properties View
-
-Pageflow_Action_ShowPaletteView_Label=Palette
-Pageflow_Action_ShowPaletteView_ToolTip=Show Palette View
-
-Pageflow_Action_SyncWithFacesConfig_Label=Synchronize with Faces-config
-Pageflow_Action_SyncWithFacesConfig_ToolTip=Synchronizing PageFlow Model with Faces-config
-
-Pageflow_Action_UpdateFacesConfig_Label=Update Faces-config
-Pageflow_Action_UpdateFacesConfig_ToolTip=Update Faces-config File from The Current PageFlow
-
-Pageflow_PaletteTool_Group_Controls=Controls
-
-Pageflow_PaletteTool_Select_Label=Select
-Pageflow_PaletteTool_Select_Description=Select One or More Items
-
-Pageflow_PaletteTool_Marquee_Label=Marquee
-Pageflow_PaletteTool_Marquee_Description=Marquee One or More Items
-
-Pageflow_PaletteTool_Link_Label=Link
-Pageflow_PaletteTool_Link_Description=Creates a Link
-
-Pageflow_PaletteTool_Group_Nodes=Nodes
-
-Pageflow_PaletteTool_Begin_Label=Begin
-Pageflow_PaletteTool_Begin_Description=Creates a PageFlow Begin
-
-Pageflow_PaletteTool_End_Label=End
-Pageflow_PaletteTool_End_Description=Creates a PageFlow End
-
-Pageflow_PaletteTool_Action_Label=Action
-Pageflow_PaletteTool_Action_Description=Creates a PageFlow Action
-
-Pageflow_PaletteTool_Page_Label=Page
-Pageflow_PaletteTool_Page_Description=Creates a PageFlow Page
-
-Pageflow_Contextmenu_Align_Label=Align
-
-Pageflow_Contextmenu_ShowView_Label=Show View
-
-
-
-####################################################
-# Generic Strings for Commands
-####################################################
-Pageflow_Commands_AddNodeCommand_Label=Add
-Pageflow_Commands_CreateNodeCommand_Label=Create
-Pageflow_Commands_DeleteNodeCommand_Label=Delete
-
-Pageflow_Commands_ConnectionCommand_Label=Connection
-Pageflow_Commands_CreateBendpointCommand_Label=Create Bendpoint
-Pageflow_Commands_MoveBendpointCommand_Label=Move Bendpoint
-Pageflow_Commands_DeleteBendpointCommand_Label=Delete Bendpoint
-
-Pageflow_Commands_OpenEditorCommand_Label=Open
-Pageflow_Commands_OrphanChildCommand_Label=Orphan Child
-Pageflow_Commands_UpdatePageflowCommand_Label=Update Pageflow
-
-Pageflow_Commands_CreateNodeCommand_SelectJSPDialog_Title=Select JSP File
-Pageflow_Commands_CreateNodeCommand_SelectJSPDialog_Description=Please select a jsp file.
-
-####################################################
-# Generic Strings for property attribute name
-####################################################
-Pageflow_Model_Attributes_comment=description
-Pageflow_Model_Attributes_name=display-name
-Pageflow_Model_Attributes_largeicon=large-icon
-Pageflow_Model_Attributes_smallicon=small-icon
-
-Pageflow_Model_Attributes_action=from-action
-Pageflow_Model_Attributes_path=path
-Pageflow_Model_Attributes_begin=begin
-Pageflow_Model_Attributes_end=end
-Pageflow_Model_Attributes_configfile=config file
-
-Pageflow_Model_Attributes_source = from-view-id
-Pageflow_Model_Attributes_target = to-view-id
-
-Pageflow_Model_Attributes_outcome=from-outcome
-Pageflow_Model_Attributes_redirect=redirect
-
-Pageflow_Model_Attributes_fromaction=from-action
-Pageflow_Model_Attributes_referenceLink=reference
-
-Pageflow_Model_Items_Pageflow=File
-Pageflow_Model_Items_PFPage=Page
-Pageflow_Model_Items_PFLink=Link
-
-
-Pageflow_Property_Action_OutcomeSelectionDialog_Choice=Enter the outcome or select one from action list below:
-
-Pageflow_Property_Action_OutcomeSelectionDialog_Title=Outcome Selection
-Pageflow_Property_Action_OutcomeSelectionDialog_JSPName=JSP File Name:
-Pageflow_Property_Action_OutcomeSelectionDialog_ActionListTable_Title=Actions
-Pageflow_Property_Action_OutcomeSelectionDialog_ActionListTableWithJSP_Title=Actions in {0}
-Pageflow_Property_Action_OutcomeSelectionDialog_ActionListTable_Component=Component ID
-Pageflow_Property_Action_OutcomeSelectionDialog_ActionListTable_Action=Action
-
-Pageflow_Property_Action_OutcomeSelectionDialog_Outcome=Outcome:
-
-####################################################
-#Pageflow validation
-####################################################
-Pageflow_Validation_UndefinedOutcome=The outcome \''{0}\'' is not defined in previous page \''{1}\''.
-Pageflow_Validation_NotExistedSourcePage=The source page \''{0}\'' is not existed.
-Pageflow_Validation_MissingSourcePage=The source page should be specified.
-
-Pageflow_Validation_InvalidWebPage=The file \''{0}\'' is not valid web file.
-Pageflow_Validation_NotExitedWebPage=The web page \''{0}\'' is not existed.
-Pageflow_Validation_MissingWebPage=The web page's path should be specified.
-
-Pageflow_Validation_MissingManagedBean=The managed bean \''{0}\'' is not defined.
-Pageflow_Validation_MissingAction=The action should be specified.
-
-ExistingPagePathDialogCellEdito_LabelText = Please enter or select a web page path:
-
-PageflowLinkEditPart_FromAction=fromAction:
-PageflowLinkEditPart_FromOutcome=fromOutcome:
-
-PageflowLinkPropertySource_Title=Note
-PageflowLinkPropertySource_Text=Please select an existing page
-
-#######################################################
-PageflowContainerEditPolicy_OrphanLabel=label here
-PageflowNode_NoRecursiveContainment=Recursive containment not allowed for
-PageflowXYLayoutEditPolicy_Add=Add
-SetConstraintCommand_Location=Change Page Location
-SetConstraintCommand_Resize=Resize Page
-ProjectWebPageSelectionDialog_Description=Please select a Web Page
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/PageflowPaletteRoot.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/PageflowPaletteRoot.java
deleted file mode 100644
index eefad92..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/PageflowPaletteRoot.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow;
-
-import org.eclipse.gef.palette.CombinedTemplateCreationEntry;
-import org.eclipse.gef.palette.ConnectionCreationToolEntry;
-import org.eclipse.gef.palette.MarqueeToolEntry;
-import org.eclipse.gef.palette.PaletteDrawer;
-import org.eclipse.gef.palette.PaletteGroup;
-import org.eclipse.gef.palette.PaletteRoot;
-import org.eclipse.gef.palette.PaletteSeparator;
-import org.eclipse.gef.palette.SelectionToolEntry;
-import org.eclipse.gef.palette.ToolEntry;
-import org.eclipse.jst.jsf.facesconfig.ui.EditorPlugin;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowLink;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowPage;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.util.ModelCreationFactory;
-
-/**
- * This is the root of the palette used by pageflow editors.
- */
-public class PageflowPaletteRoot extends PaletteRoot {
-
- /**
- * Creates a new PageflowPaletteRoot instance.
- */
- public PageflowPaletteRoot() {
- // create root
- super();
-
- // a group of default control tools
- // Pageflow.PaletteTool.Group.Controls = Controls
- PaletteGroup controls = new PaletteGroup(
- PageflowMessages.Pageflow_PaletteTool_Group_Controls);
- add(controls);
-
- // the selection tool
- // Pageflow.PaletteTool.Select.Label = Select
- // Pageflow.PaletteTool.Select.Description = Select one or more items
- ToolEntry tool = new SelectionToolEntry(
- PageflowMessages.Pageflow_PaletteTool_Select_Label,
- PageflowMessages.Pageflow_PaletteTool_Select_Description);
-
- controls.add(tool);
-
- // use selection tool as default entry
- setDefaultEntry(tool);
-
- // the marquee selection tool
- // Pageflow.PaletteTool.Marquee.Label = Marquee
- // Pageflow.PaletteTool.Marquee.Description = Marquee one or more items
- controls.add(new MarqueeToolEntry(
- PageflowMessages.Pageflow_PaletteTool_Marquee_Label,
- PageflowMessages.Pageflow_PaletteTool_Marquee_Description));
-
- controls.add(new PaletteSeparator());
-
- // conection creation
- // Pageflow.PaletteTool.Link.Label = Link
- // Pageflow.PaletteTool.Link.Description = Creates an link
- ConnectionCreationToolEntry linkEntry = new ConnectionCreationToolEntry(
- PageflowMessages.Pageflow_PaletteTool_Link_Label,
- PageflowMessages.Pageflow_PaletteTool_Link_Description,
- new ModelCreationFactory(PageflowLink.class), EditorPlugin
- .getDefault().getImageDescriptor(
- "facesconfig/Pageflow_Link.gif"), //$NON-NLS-1$
- EditorPlugin.getDefault().getImageDescriptor(
- "facesconfig/Pageflow_Link24.gif")); //$NON-NLS-1$
- linkEntry.setUserModificationPermission(PERMISSION_FULL_MODIFICATION);
- controls.add(linkEntry);
-
- controls.add(new PaletteSeparator());
-
- // Pageflow.PaletteTool.Group.Nodes = Nodes
- PaletteDrawer nodes = new PaletteDrawer(
- PageflowMessages.Pageflow_PaletteTool_Group_Nodes);
- add(nodes);
-
- // use CombinedTemplateCreationEntry which can be also dragged
- CombinedTemplateCreationEntry entry;
-
- // Pageflow.PaletteTool.Page.Label = Page
- // Pageflow.PaletteTool.Page.Description = Creates a pageflow page
- entry = new CombinedTemplateCreationEntry(
- PageflowMessages.Pageflow_PaletteTool_Page_Label,
- PageflowMessages.Pageflow_PaletteTool_Page_Description,
- PageflowPage.class,
- new ModelCreationFactory(PageflowPage.class), EditorPlugin
- .getDefault().getImageDescriptor(
- "facesconfig/Pageflow_Page16.gif"), //$NON-NLS-1$
- EditorPlugin.getDefault().getImageDescriptor(
- "facesconfig/Pageflow_Page24.gif")); //$NON-NLS-1$
- nodes.add(entry);
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/PageflowTemplateTransferDropTargetListener.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/PageflowTemplateTransferDropTargetListener.java
deleted file mode 100644
index 4c4a8a4..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/PageflowTemplateTransferDropTargetListener.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow;
-
-import org.eclipse.gef.EditPartViewer;
-import org.eclipse.gef.dnd.TemplateTransferDropTargetListener;
-import org.eclipse.gef.requests.CreationFactory;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.util.ModelCreationFactory;
-
-/**
- * This is the drop listener for template transfers from the palette. Only need
- * to implement the <code>getFactory</code> method.
- */
-public class PageflowTemplateTransferDropTargetListener extends
- TemplateTransferDropTargetListener {
- /**
- * Creates a new PageflowTemplateTransferDropTargetListener instance.
- *
- * @param viewer -
- * target pageflow editor view.
- */
- public PageflowTemplateTransferDropTargetListener(EditPartViewer viewer) {
- super(viewer);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see TemplateTransferDropTargetListener#getFactory(Object)
- */
- protected CreationFactory getFactory(Object template) {
- if (template instanceof Class) {
- return new ModelCreationFactory((Class) template);
- }
- return null;
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/ResourceTransferDropTargetListener.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/ResourceTransferDropTargetListener.java
deleted file mode 100644
index 634d5bb..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/ResourceTransferDropTargetListener.java
+++ /dev/null
@@ -1,213 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow;
-
-import org.eclipse.core.resources.IResource;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPartViewer;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.dnd.AbstractTransferDropTargetListener;
-import org.eclipse.gef.requests.CreateRequest;
-import org.eclipse.gef.requests.CreationFactory;
-import org.eclipse.jface.util.LocalSelectionTransfer;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jst.jsf.facesconfig.ui.util.WebrootUtil;
-import org.eclipse.swt.dnd.DND;
-import org.eclipse.swt.dnd.DropTargetEvent;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.part.FileEditorInput;
-import org.eclipse.ui.part.ResourceTransfer;
-
-
-/**
- * This is the listener for resource drag and drop operations
- *
- */
-public abstract class ResourceTransferDropTargetListener extends
- AbstractTransferDropTargetListener {
- /** the pageflow editor */
- private IEditorPart editor = null;
-
- /**
- * Creates a new ResourceTransferDropTargetListener instance.
- *
- * @param viewer -
- * target pageflow editor view.
- * @param editor
- */
- public ResourceTransferDropTargetListener(EditPartViewer viewer,
- IEditorPart editor) {
- super(viewer, ResourceTransfer.getInstance());
-
- this.editor = editor;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see AbstractTransferDropTargetListener#createTargetRequest()
- */
- protected Request createTargetRequest() {
- CreateRequest request = new CreateRequest();
- if (getCurrentEvent().data == null) {
- request.setFactory(getFactory(null));
- } else {
- IResource[] resources = (IResource[]) getCurrentEvent().data;
- request.setFactory(getFactory(resources[0]));
- }
- return request;
- }
-
- /**
- * get the request for creating a new resource object
- *
- * @return - creation request
- */
- protected final CreateRequest getCreateRequest() {
- return (CreateRequest) getTargetRequest();
- }
-
- /**
- * get creation factory for resource object, which should be implemented.
- *
- * @param obj -
- * resource object
- * @return - creation factory for resource object
- */
- abstract protected CreationFactory getFactory(Object obj);
-
- /*
- * (non-Javadoc)
- *
- * @see AbstractTransferDropTargetListener#handleDragOperationChanged()
- */
- protected void handleDragOperationChanged() {
- getCurrentEvent().detail = DND.DROP_COPY;
- super.handleDragOperationChanged();
- }
-
- /**
- * get the current transfered local selection object.
- *
- * @return
- */
- private Object getCurrentLocalObject() {
- ISelection sel = LocalSelectionTransfer.getTransfer().getSelection();
- if (sel instanceof IStructuredSelection) {
- return ((IStructuredSelection) sel).getFirstElement();
- }
- return null;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see AbstractTransferDropTargetListener#handleDragOver()
- */
- protected void handleDragOver() {
- if (!isValidJSFFile(getCurrentLocalObject())) {
- getCurrentEvent().detail = DND.ERROR_INVALID_DATA;
- } else {
- getCurrentEvent().detail = DND.DROP_COPY;
- }
- getCurrentEvent().feedback = DND.FEEDBACK_SCROLL | DND.FEEDBACK_EXPAND;
- super.handleDragOver();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see AbstractTransferDropTargetListener#handleDrop()
- */
- protected void handleDrop() {
- getCurrentEvent().detail = DND.DROP_COPY;
- super.handleDrop();
- // because the handle drop can change this event to DND.DROP_NONE
- if (getCurrentEvent().detail == DND.DROP_COPY) {
- selectAddedObject();
- }
- }
-
- /**
- * select the new drag and drop object in the pageflow view.
- */
- private void selectAddedObject() {
- Object model = getCreateRequest().getNewObject();
- if (null == model) {
- return;
- }
- EditPartViewer viewer = getViewer();
- Object editpart = viewer.getEditPartRegistry().get(model);
- if (editpart instanceof EditPart) {
- viewer.flush();
- viewer.select((EditPart) editpart);
- // Activate the editor window
- PlatformUI.getWorkbench().getActiveWorkbenchWindow()
- .getActivePage().activate(editor);
- }
- }
-
- /*
- * (non-Javadoc)
- *
- * @see AbstractTransferDropTargetListener#updateTargetRequest()
- */
- protected void updateTargetRequest() {
- CreateRequest request = getCreateRequest();
- request.setLocation(getDropLocation());
- }
-
- /**
- * Allow drop if any of these types in the drop data, which can be jsp file
- * or a sub folder of the webroot folder.
- *
- */
- private boolean isValidJSFFile(Object resource) {
- if (resource == null || !(resource instanceof IResource)) {
- return false;
- }
-
- if (((IResource) resource).getProject() == ((FileEditorInput) editor
- .getEditorInput()).getFile().getProject()) {
- if (WebrootUtil.getWebPath(((IResource) resource).getFullPath())
- .length() > 0) {
- return true;
- }
- }
- return false;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see AbstractTransferDropTargetListener#isEnabled()
- */
- public boolean isEnabled(DropTargetEvent dropTargetEvent) {
- if (super.isEnabled(dropTargetEvent)) {
- if (dropTargetEvent.data != null) {
- IResource[] resources = (IResource[]) dropTargetEvent.data;
- // The resource should be under the same project of the current
- // faces-config file
- if (isValidJSFFile(resources[0])) {
- return true;
- }
- return false;
- }
- // If no data, can't verify, so allow the drop
- return true;
- }
- return false;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/action/AlignmentAction.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/action/AlignmentAction.java
deleted file mode 100644
index e108d8e..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/action/AlignmentAction.java
+++ /dev/null
@@ -1,329 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow.action;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.draw2d.PositionConstants;
-import org.eclipse.draw2d.geometry.PrecisionRectangle;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.GraphicalEditPart;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.RequestConstants;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.commands.CompoundCommand;
-import org.eclipse.gef.requests.AlignmentRequest;
-import org.eclipse.gef.tools.ToolUtilities;
-import org.eclipse.gef.ui.actions.GEFActionConstants;
-import org.eclipse.gef.ui.actions.SelectionAction;
-import org.eclipse.jst.jsf.facesconfig.ui.EditorMessages;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IWorkbenchPart;
-
-/**
- * An improved alignment action to align the selected parts in different action.
- *
- * @author xgzhang
- * @version original version is from GEF
- */
-public final class AlignmentAction extends SelectionAction {
-
- /**
- * Indicates that the bottom edges should be aligned.
- */
- public static final String ID_ALIGN_BOTTOM = GEFActionConstants.ALIGN_BOTTOM;
-
- /**
- * Indicates that the horizontal centers should be aligned.
- */
- public static final String ID_ALIGN_CENTER = GEFActionConstants.ALIGN_CENTER;
-
- /**
- * Indicates that the left edges should be aligned.
- */
- public static final String ID_ALIGN_LEFT = GEFActionConstants.ALIGN_LEFT;
-
- /**
- * Indicates that the vertical midpoints should be aligned.
- */
- public static final String ID_ALIGN_MIDDLE = GEFActionConstants.ALIGN_MIDDLE;
-
- /**
- * Indicates that the right edges should be aligned.
- */
- public static final String ID_ALIGN_RIGHT = GEFActionConstants.ALIGN_RIGHT;
-
- /**
- * Indicates that the top edges should be aligned.
- */
- public static final String ID_ALIGN_TOP = GEFActionConstants.ALIGN_TOP;
-
- private int alignment;
-
- private List operationSet;
-
- /**
- * @deprecated use AlignmentAction(IWorkbenchPart, int align)
- * @param editor
- * the editor
- * @param align
- * the alignment ID
- */
- public AlignmentAction(IEditorPart editor, int align) {
- this((IWorkbenchPart) editor, align);
- }
-
- /**
- * Constructs an AlignmentAction with the given part and alignment ID. The
- * alignment ID must by one of:
- * <UL>
- * <LI>GEFActionConstants.ALIGN_LEFT
- * <LI>GEFActionConstants.ALIGN_RIGHT
- * <LI>GEFActionConstants.ALIGN_CENTER
- * <LI>GEFActionConstants.ALIGN_TOP
- * <LI>GEFActionConstants.ALIGN_BOTTOM
- * <LI>GEFActionConstants.ALIGN_MIDDLE
- * </UL>
- *
- * @param part
- * the workbench part used to obtain context
- * @param align
- * the aligment ID.
- */
- public AlignmentAction(IWorkbenchPart part, int align) {
- super(part);
- alignment = align;
- initUI();
- }
-
- /**
- * Returns the alignment rectangle to which all selected parts should be
- * aligned.
- *
- * @param request
- * the alignment Request
- * @return the alignment rectangle
- */
- protected Rectangle calculateAlignmentRectangle(Request request) {
- List editparts = getOperationSet(request);
- if (editparts == null || editparts.isEmpty()) {
- return null;
- }
- GraphicalEditPart part = null;
- if (alignment == PositionConstants.MIDDLE
- || alignment == PositionConstants.CENTER) {
- part = (GraphicalEditPart) editparts.get(editparts.size() - 1);
- } else {
- part = getFitnessPart(editparts);
- }
- Rectangle rect = new PrecisionRectangle(part.getFigure().getBounds());
- part.getFigure().translateToAbsolute(rect);
- return rect;
- }
-
- /**
- * get the Fitness part in the four kinds of alignment directions
- *
- * @param editparts
- */
- private GraphicalEditPart getFitnessPart(List editparts) {
- if (alignment == PositionConstants.MIDDLE
- || alignment == PositionConstants.CENTER) {
- return null;
- }
-
- int positionComparor = Integer.MAX_VALUE;
-
- if (alignment == PositionConstants.LEFT
- || alignment == PositionConstants.TOP) {
- positionComparor = Integer.MAX_VALUE;
- } else if (alignment == PositionConstants.RIGHT
- || alignment == PositionConstants.BOTTOM) {
- positionComparor = Integer.MIN_VALUE;
- }
-
- GraphicalEditPart fitnessPart = null;
-
- for (Iterator iter = editparts.iterator(); iter.hasNext();) {
- GraphicalEditPart part = (GraphicalEditPart) iter.next();
- Rectangle rectPart = part.getFigure().getBounds();
- switch (alignment) {
- case PositionConstants.LEFT:
- if (rectPart.getLeft().x < positionComparor) {
- fitnessPart = part;
- positionComparor = rectPart.getLeft().x;
- }
- break;
-
- case PositionConstants.RIGHT:
- if (rectPart.getRight().x > positionComparor) {
- fitnessPart = part;
- positionComparor = rectPart.getRight().x;
- }
- break;
- case PositionConstants.TOP:
- if (rectPart.getTop().y < positionComparor) {
- fitnessPart = part;
- positionComparor = rectPart.getTop().y;
- }
- break;
- case PositionConstants.BOTTOM:
- if (rectPart.getBottom().y > positionComparor) {
- fitnessPart = part;
- positionComparor = rectPart.getBottom().y;
- }
- break;
- }
- }
-
- return fitnessPart;
- }
-
- /**
- * @see org.eclipse.gef.ui.actions.WorkbenchPartAction#calculateEnabled()
- */
- protected boolean calculateEnabled() {
- operationSet = null;
- Command cmd = createAlignmentCommand();
- if (cmd == null) {
- return false;
- }
- return cmd.canExecute();
- }
-
- private Command createAlignmentCommand() {
- AlignmentRequest request = new AlignmentRequest(
- RequestConstants.REQ_ALIGN);
- request.setAlignmentRectangle(calculateAlignmentRectangle(request));
- request.setAlignment(alignment);
- List editparts = getOperationSet(request);
- if (editparts.size() < 2) {
- return null;
- }
-
- CompoundCommand command = new CompoundCommand();
- command.setDebugLabel(getText());
- for (int i = 0; i < editparts.size(); i++) {
- EditPart editpart = (EditPart) editparts.get(i);
- command.add(editpart.getCommand(request));
- }
- return command;
- }
-
- /**
- * @see org.eclipse.gef.Disposable#dispose()
- */
- public void dispose() {
- operationSet = Collections.EMPTY_LIST;
- super.dispose();
- }
-
- /**
- * Returns the list of editparts which will participate in alignment.
- *
- * @param request
- * the alignment request
- * @return the list of parts which will be aligned
- */
- protected List getOperationSet(Request request) {
- if (operationSet != null) {
- return operationSet;
- }
- List editparts = new ArrayList(getSelectedObjects());
- if (editparts.isEmpty()
- || !(editparts.get(0) instanceof GraphicalEditPart)) {
- return Collections.EMPTY_LIST;
- }
- Object primary = editparts.get(editparts.size() - 1);
- editparts = ToolUtilities.getSelectionWithoutDependants(editparts);
- ToolUtilities.filterEditPartsUnderstanding(editparts, request);
- if (editparts.size() < 2 || !editparts.contains(primary)) {
- return Collections.EMPTY_LIST;
- }
- EditPart parent = ((EditPart) editparts.get(0)).getParent();
- for (int i = 1; i < editparts.size(); i++) {
- EditPart part = (EditPart) editparts.get(i);
- if (part.getParent() != parent) {
- return Collections.EMPTY_LIST;
- }
- }
- return editparts;
- }
-
- /**
- * Initializes the actions UI presentation.
- */
- protected void initUI() {
- switch (alignment) {
- case PositionConstants.LEFT:
- setId(GEFActionConstants.ALIGN_LEFT);
- setText(EditorMessages.AlignmentAction_AlignLeftAction_Label);
- setToolTipText(EditorMessages.AlignmentAction_AlignLeftAction_Tooltip);
- setImageDescriptor(InternalImages.DESC_HORZ_ALIGN_LEFT);
- setDisabledImageDescriptor(InternalImages.DESC_HORZ_ALIGN_LEFT_DIS);
- break;
-
- case PositionConstants.RIGHT:
- setId(GEFActionConstants.ALIGN_RIGHT);
- setText(EditorMessages.AlignmentAction_AlignRightAction_Label);
- setToolTipText(EditorMessages.AlignmentAction_AlignRightAction_Tooltip);
- setImageDescriptor(InternalImages.DESC_HORZ_ALIGN_RIGHT);
- setDisabledImageDescriptor(InternalImages.DESC_HORZ_ALIGN_RIGHT_DIS);
- break;
-
- case PositionConstants.TOP:
- setId(GEFActionConstants.ALIGN_TOP);
- setText(EditorMessages.AlignmentAction_AlignTopAction_Label);
- setToolTipText(EditorMessages.AlignmentAction_AlignTopAction_Tooltip);
- setImageDescriptor(InternalImages.DESC_VERT_ALIGN_TOP);
- setDisabledImageDescriptor(InternalImages.DESC_VERT_ALIGN_TOP_DIS);
- break;
-
- case PositionConstants.BOTTOM:
- setId(GEFActionConstants.ALIGN_BOTTOM);
- setText(EditorMessages.AlignmentAction_AlignBottomAction_Label);
- setToolTipText(EditorMessages.AlignmentAction_AlignBottomAction_Tooltip);
- setImageDescriptor(InternalImages.DESC_VERT_ALIGN_BOTTOM);
- setDisabledImageDescriptor(InternalImages.DESC_VERT_ALIGN_BOTTOM_DIS);
- break;
-
- case PositionConstants.CENTER:
- setId(GEFActionConstants.ALIGN_CENTER);
- setText(EditorMessages.AlignmentAction_AlignCenterAction_Label);
- setToolTipText(EditorMessages.AlignmentAction_AlignCenterAction_Tooltip);
- setImageDescriptor(InternalImages.DESC_HORZ_ALIGN_CENTER);
- setDisabledImageDescriptor(InternalImages.DESC_HORZ_ALIGN_CENTER_DIS);
- break;
-
- case PositionConstants.MIDDLE:
- setId(GEFActionConstants.ALIGN_MIDDLE);
- setText(EditorMessages.AlignmentAction_AlignMiddleAction_Label);
- setToolTipText(EditorMessages.AlignmentAction_AlignMiddleAction_Tooltip);
- setImageDescriptor(InternalImages.DESC_VERT_ALIGN_MIDDLE);
- setDisabledImageDescriptor(InternalImages.DESC_VERT_ALIGN_MIDDLE_DIS);
- break;
- }
- }
-
- /**
- * @see org.eclipse.jface.action.IAction#run()
- */
- public void run() {
- operationSet = null;
- execute(createAlignmentCommand());
- }
-
-}
\ No newline at end of file
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/action/InternalImages.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/action/InternalImages.java
deleted file mode 100644
index 8daa9ba..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/action/InternalImages.java
+++ /dev/null
@@ -1,101 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 Oracle 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:
- * Ian Trimble - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow.action;
-
-import org.eclipse.jface.resource.ImageDescriptor;
-
-/**
- * Supplies image descriptors, intended for internal use only.
- *
- * @author Ian Trimble - Oracle
- */
-public class InternalImages {
-
- /**
- * ImageDescriptor instance for center alignment image.
- */
- public static final ImageDescriptor DESC_HORZ_ALIGN_CENTER;
-
- /**
- * ImageDescriptor instance for left alignment image.
- */
- public static final ImageDescriptor DESC_HORZ_ALIGN_LEFT;
-
- /**
- * ImageDescriptor instance for right alignment image.
- */
- public static final ImageDescriptor DESC_HORZ_ALIGN_RIGHT;
-
- /**
- * ImageDescriptor instance for middle alignment image.
- */
- public static final ImageDescriptor DESC_VERT_ALIGN_MIDDLE;
-
- /**
- * ImageDescriptor instance for top alignment image.
- */
- public static final ImageDescriptor DESC_VERT_ALIGN_TOP;
-
- /**
- * ImageDescriptor instance for bottom alignment image.
- */
- public static final ImageDescriptor DESC_VERT_ALIGN_BOTTOM;
-
- /**
- * ImageDescriptor instance for center alignment image (disabled).
- */
- public static final ImageDescriptor DESC_HORZ_ALIGN_CENTER_DIS;
-
- /**
- * ImageDescriptor instance for left alignment image (disabled).
- */
- public static final ImageDescriptor DESC_HORZ_ALIGN_LEFT_DIS;
-
- /**
- * ImageDescriptor instance for right alignment image (disabled).
- */
- public static final ImageDescriptor DESC_HORZ_ALIGN_RIGHT_DIS;
-
- /**
- * ImageDescriptor instance for middle alignment image (disabled).
- */
- public static final ImageDescriptor DESC_VERT_ALIGN_MIDDLE_DIS;
-
- /**
- * ImageDescriptor instance for top alignment image (disabled).
- */
- public static final ImageDescriptor DESC_VERT_ALIGN_TOP_DIS;
-
- /**
- * ImageDescriptor instance for bottom alignment image (disabled).
- */
- public static final ImageDescriptor DESC_VERT_ALIGN_BOTTOM_DIS;
-
- static {
- DESC_VERT_ALIGN_BOTTOM = createDescriptor("icons/alignbottom.gif"); //$NON-NLS-1$
- DESC_HORZ_ALIGN_CENTER = createDescriptor("icons/aligncenter.gif"); //$NON-NLS-1$
- DESC_HORZ_ALIGN_LEFT = createDescriptor("icons/alignleft.gif"); //$NON-NLS-1$
- DESC_VERT_ALIGN_MIDDLE = createDescriptor("icons/alignmid.gif"); //$NON-NLS-1$
- DESC_HORZ_ALIGN_RIGHT = createDescriptor("icons/alignright.gif"); //$NON-NLS-1$
- DESC_VERT_ALIGN_TOP = createDescriptor("icons/aligntop.gif"); //$NON-NLS-1$
- DESC_VERT_ALIGN_BOTTOM_DIS = createDescriptor("icons/alignbottom_d.gif"); //$NON-NLS-1$
- DESC_HORZ_ALIGN_CENTER_DIS = createDescriptor("icons/aligncenter_d.gif"); //$NON-NLS-1$
- DESC_HORZ_ALIGN_LEFT_DIS = createDescriptor("icons/alignleft_d.gif"); //$NON-NLS-1$
- DESC_VERT_ALIGN_MIDDLE_DIS = createDescriptor("icons/alignmid_d.gif"); //$NON-NLS-1$
- DESC_HORZ_ALIGN_RIGHT_DIS = createDescriptor("icons/alignright_d.gif"); //$NON-NLS-1$
- DESC_VERT_ALIGN_TOP_DIS = createDescriptor("icons/aligntop_d.gif"); //$NON-NLS-1$
- }
-
- private static ImageDescriptor createDescriptor(String filename) {
- return ImageDescriptor.createFromFile(InternalImages.class, filename);
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/action/OpenEditorAction.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/action/OpenEditorAction.java
deleted file mode 100644
index 7c27eab..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/action/OpenEditorAction.java
+++ /dev/null
@@ -1,122 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow.action;
-
-import java.util.List;
-
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.commands.CompoundCommand;
-import org.eclipse.gef.ui.actions.SelectionAction;
-import org.eclipse.jst.jsf.facesconfig.ui.FacesConfigEditor;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.PageflowMessages;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowPage;
-import org.eclipse.ui.IWorkbenchPart;
-
-/**
- *
- * This is the Action for opening a JSP page in the default JSP Editor from a
- * Pageflow Diagram
- *
- */
-public class OpenEditorAction extends SelectionAction {
- /** The name of the request */
- public static final String OPEN_EDITOR_REQUEST = PageflowMessages.Pageflow_Commands_OpenEditorCommand_Label;
-
- /** The request */
- Request request;
-
- /**
- * The constructor
- *
- * @param part -
- * the IWorkbenchPart
- */
- public OpenEditorAction(IWorkbenchPart part) {
- super(part);
- request = new Request(OPEN_EDITOR_REQUEST);
- // Pageflow.Action.OpenEditor.Label = Edit Page
- setText(PageflowMessages.Pageflow_Action_OpenEditor_Label);
- setId(FacesConfigEditor.EDITOR_ID);
- // Pageflow.Action.OpenEditor.ToolTip = Edit this page
- setToolTipText(PageflowMessages.Pageflow_Action_OpenEditor_ToolTip);
- }
-
- /**
- * Determines if the action can be enabled
- *
- * @return boolean - the enabled state
- */
- protected boolean calculateEnabled() {
- return canPerformAction();
- }
-
- /**
- * Determines if the action can be performed
- *
- * @return boolean - the perform state
- */
- private boolean canPerformAction() {
- if (getSelectedObjects().isEmpty()) {
- return false;
- }
- List parts = getSelectedObjects();
- for (int i = 0; i < parts.size(); i++) {
- Object o = parts.get(i);
- if (!(o instanceof EditPart)) {
- return false;
- }
- EditPart part = (EditPart) o;
- if (!(part.getModel() instanceof PageflowPage)) {
- return false;
- }
- }
- return true;
- }
-
- /**
- * Returns the command for the action
- *
- * @return Command - the action command
- */
- private Command getCommand() {
- List editparts = getSelectedObjects();
- CompoundCommand cc = new CompoundCommand();
- cc.setDebugLabel(OPEN_EDITOR_REQUEST);
- for (int i = 0; i < editparts.size(); i++) {
- EditPart part = (EditPart) editparts.get(i);
- cc.add(part.getCommand(request));
- }
- return cc;
- }
-
- /**
- * Runs the command
- */
- public void run() {
- execute(getCommand());
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.gef.ui.actions.WorkbenchPartAction#execute(org.eclipse.gef.commands.Command)
- */
- protected void execute(Command command) {
- if (command == null || !command.canExecute()) {
- return;
- }
- command.execute();
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/action/ShowPropertyViewAction.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/action/ShowPropertyViewAction.java
deleted file mode 100644
index 24fe9da..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/action/ShowPropertyViewAction.java
+++ /dev/null
@@ -1,120 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow.action;
-
-import java.util.List;
-
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.ui.actions.SelectionAction;
-import org.eclipse.jst.jsf.common.ui.internal.logging.Logger;
-import org.eclipse.jst.jsf.facesconfig.ui.EditorPlugin;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.PageflowMessages;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowElement;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.PlatformUI;
-
-/**
- *
- * This is the Action for opening a JSP page in the default JSP Editor from a
- * Pageflow Diagram
- *
- * @author Xiao-guang Zhang
- */
-public class ShowPropertyViewAction extends SelectionAction {
- /** log instance */
- private static final Logger log = EditorPlugin
- .getLogger(ShowPropertyViewAction.class);
-
- /** The ID of the action */
- public static final String SHOW_PROPERTY_VIEW = "org.eclipse.jst.jsf.facesconfig.ui.pageflow.action.ShowPropertyViewAction"; //$NON-NLS-1$
-
- /**
- * The constructor
- *
- * @param part -
- * the IWorkbenchPart
- */
- public ShowPropertyViewAction(IWorkbenchPart part) {
- super(part);
- // Pageflow.Action.ShowPropertyView.Label = Properties
- setText(PageflowMessages.Pageflow_Action_ShowPropertyView_Label);
- setId(SHOW_PROPERTY_VIEW);
- // Pageflow.Action.ShowPropertyView.ToolTip = Show properties
- setToolTipText(PageflowMessages.Pageflow_Action_ShowPropertyView_ToolTip);
- }
-
- /**
- * Determines if the action can be enabled
- *
- * @return boolean - the enabled state
- */
- protected boolean calculateEnabled() {
- return canPerformAction();
- }
-
- /**
- * Determines if the action can be performed
- *
- * @return boolean - the perform state
- */
- private boolean canPerformAction() {
- if (getSelectedObjects().isEmpty()) {
- return false;
- }
- List parts = getSelectedObjects();
- for (int i = 0; i < parts.size(); i++) {
- Object o = parts.get(i);
- if (!(o instanceof EditPart)) {
- return false;
- }
- EditPart part = (EditPart) o;
- if (!((part.getModel() instanceof PageflowElement))) {
- return false;
- }
- }
- return true;
- }
-
- /**
- * Runs the command
- */
- public void run() {
- List editparts = getSelectedObjects();
- if (editparts.size() > 0) {
- EditPart part = (EditPart) editparts.get(0);
- // execute(getCommand());
- if (part.getModel() instanceof PageflowElement) {
- // ensure the visibility of the palette view and property veiw.
- IWorkbenchWindow dw = PlatformUI.getWorkbench()
- .getActiveWorkbenchWindow();
- IWorkbenchPage page = dw.getActivePage();
- if (page != null) {
- try {
- page.showView("org.eclipse.ui.views.PropertySheet"); //$NON-NLS-1$
- } catch (PartInitException e) {
- // Pageflow.PageflowEditor.Error.canNotShowPropertyView
- // = Failed to show property sheet view.
- log
- .error(
- "Pageflow.PageflowEditor.Error.canNotShowPropertyView", //$NON-NLS-1$
- e);
- }
-
- }
- }
- }
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/action/icons/alignbottom.gif b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/action/icons/alignbottom.gif
deleted file mode 100644
index 9eea558..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/action/icons/alignbottom.gif
+++ /dev/null
Binary files differ
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/action/icons/alignbottom_d.gif b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/action/icons/alignbottom_d.gif
deleted file mode 100644
index 1c62797..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/action/icons/alignbottom_d.gif
+++ /dev/null
Binary files differ
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/action/icons/aligncenter.gif b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/action/icons/aligncenter.gif
deleted file mode 100644
index 4e8c94a..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/action/icons/aligncenter.gif
+++ /dev/null
Binary files differ
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/action/icons/aligncenter_d.gif b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/action/icons/aligncenter_d.gif
deleted file mode 100644
index ceeafb7..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/action/icons/aligncenter_d.gif
+++ /dev/null
Binary files differ
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/action/icons/alignleft.gif b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/action/icons/alignleft.gif
deleted file mode 100644
index 55cecc2..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/action/icons/alignleft.gif
+++ /dev/null
Binary files differ
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/action/icons/alignleft_d.gif b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/action/icons/alignleft_d.gif
deleted file mode 100644
index 60fcc8f..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/action/icons/alignleft_d.gif
+++ /dev/null
Binary files differ
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/action/icons/alignmid.gif b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/action/icons/alignmid.gif
deleted file mode 100644
index 5f13c93..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/action/icons/alignmid.gif
+++ /dev/null
Binary files differ
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/action/icons/alignmid_d.gif b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/action/icons/alignmid_d.gif
deleted file mode 100644
index 2f7534e..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/action/icons/alignmid_d.gif
+++ /dev/null
Binary files differ
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/action/icons/alignright.gif b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/action/icons/alignright.gif
deleted file mode 100644
index f6ead15..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/action/icons/alignright.gif
+++ /dev/null
Binary files differ
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/action/icons/alignright_d.gif b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/action/icons/alignright_d.gif
deleted file mode 100644
index 0495ed5..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/action/icons/alignright_d.gif
+++ /dev/null
Binary files differ
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/action/icons/aligntop.gif b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/action/icons/aligntop.gif
deleted file mode 100644
index 2f9ceeb..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/action/icons/aligntop.gif
+++ /dev/null
Binary files differ
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/action/icons/aligntop_d.gif b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/action/icons/aligntop_d.gif
deleted file mode 100644
index 9f1b49b..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/action/icons/aligntop_d.gif
+++ /dev/null
Binary files differ
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/command/AbstractBatchEditCommand.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/command/AbstractBatchEditCommand.java
deleted file mode 100644
index eded9f1..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/command/AbstractBatchEditCommand.java
+++ /dev/null
@@ -1,114 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow.command;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.Pageflow;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowPackage;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.synchronization.FC2PFTransformer;
-
-/**
- * A batched edit command will enable adapters to interven before and after a
- * set of operations was done by sending notification to the adapters.
- *
- * @author hmeng
- */
-
-/*package*/ abstract class AbstractBatchEditCommand extends Command {
- Pageflow pageflow;
-
- /**
- * @param pageflow
- */
- public AbstractBatchEditCommand(Pageflow pageflow) {
- this(pageflow, null);
- }
-
- /**
- * @param pageflow
- * @param label
- */
- public AbstractBatchEditCommand(Pageflow pageflow, String label) {
- super(label);
- this.pageflow = pageflow;
- }
-
- /**
- * @return the pageflow
- */
- public Pageflow getPageflow() {
- return pageflow;
- }
-
- /**
- * The subclass should extend methods doXXX only.
- */
- final public void execute() {
- preExecute();
- doExecute();
- postExecute();
- }
-
- final public void redo() {
- doRedo();
- }
-
- final public void undo() {
- preExecute();
- doUndo();
- postExecute();
- }
-
- /**
- *
- */
- abstract public void doExecute();
-
- /**
- * Do the customized redo
- */
- public void doRedo() {
- execute();
- }
-
- abstract void doUndo();
-
- final void preExecute() {
- getPageflow().eNotify(
- new ENotificationImpl((InternalEObject) getPageflow(),
- FC2PFTransformer.MY_NOTIFICATION_TYPE,
- PageflowPackage.PAGEFLOW, null, null));
- }
-
- /**
- * execute the post-execution handling
- */
- final protected void postExecute() {
- getPageflow().eNotify(
- new ENotificationImpl((InternalEObject) getPageflow(),
- FC2PFTransformer.MY_NOTIFICATION_TYPE1,
- PageflowPackage.PAGEFLOW, null, null));
- notifyPageflow(getPageflow());
- }
-
- /**
- * @param pageflow_
- */
- protected void notifyPageflow(Pageflow pageflow_) {
- pageflow_.notifyModelChanged(new ENotificationImpl(
- (InternalEObject) pageflow_, Notification.ADD,
- PageflowPackage.PAGEFLOW, null, null));
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/command/AddConnectionCommand.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/command/AddConnectionCommand.java
deleted file mode 100644
index 149da0b..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/command/AddConnectionCommand.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-
-
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow.command;
-
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.layout.PageflowLayoutManager;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.Pageflow;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.util.PageflowValidation;
-
-/**
- * Add a new connection
- *
- * @author hmeng
- *
- */
-public class AddConnectionCommand extends ConnectionCommand {
-
- public boolean canExecute() {
- // if user don't set PFLink object before, this command can't be
- // executed.
- if (link == null) {
- return false;
- }
-
- // It is a connection create command
- if (oldSource == null && oldTarget == null) {
- // It is a connection create command
- // Source and target must be pointing to some
- // real connection point
- if (source == null || target == null) {
- return false;
- }
-
- if (!PageflowValidation.getInstance().isValidLinkForCreation(
- source, target)) {
- return false;
- }
- }
- return true;
- }
-
- public void doExecute() {
- // It is a connection create command
- if (canExecute() && oldSource == null && oldTarget == null) {
- Pageflow pageflow = null;
- // Get a reference to the pageflow
- if (source != null) {
- pageflow = source.getPageflow();
- } else if (target != null) {
- pageflow = target.getPageflow();
- }
- pageflow.connect(source, target, link);
-
- // self loop link
- if (source == target) {
- PageflowLayoutManager.updateSelfLoopLink(link);
- }
- }
- }
-
- public void redo() {
- // TODO Auto-generated method stub
- super.redo();
- }
-
- public void undo() {
- if (canExecute()) {
- // It was a connection create command
- if (oldSource == null && oldTarget == null) {
-
- Pageflow pageflow = null;
- // Get a reference to the pageflow
- if (source != null) {
- pageflow = source.getPageflow();
- } else if (target != null) {
- pageflow = target.getPageflow();
- }
-
- // Ensure that link knows nothing about nodes anymore.
- link.setSource(null);
- link.setTarget(null);
- // Remove link from pageflow
- pageflow.getLinks().remove(link);
- }
- }
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/command/AddNodeCommand.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/command/AddNodeCommand.java
deleted file mode 100644
index be41ab2..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/command/AddNodeCommand.java
+++ /dev/null
@@ -1,115 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow.command;
-
-import org.eclipse.gef.commands.Command;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.PageflowMessages;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.Pageflow;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowNode;
-
-/**
- * This is the add command for pageflow editpart
- *
- */
-public class AddNodeCommand extends Command {
- /** Pageflow node including Page, action, begin, end. */
- private PageflowNode child;
-
- /** parent Pageflow */
- private Pageflow parent;
-
- /** index of pageflow nodes */
- private int index = -1;
-
- /**
- * Default constructor
- */
- public AddNodeCommand() {
- // Pageflow.Commands.AddNodeCommand.Label = add
- super(PageflowMessages.Pageflow_Commands_AddNodeCommand_Label);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see Command#execute()
- */
- public void execute() {
- if (index < 0) {
- parent.getNodes().add(child);
- } else {
- parent.getNodes().add(index, child);
- }
- }
-
- /*
- * (non-Javadoc)
- *
- * @see Command#redo()
- */
- public void redo() {
- if (index < 0) {
- parent.getNodes().add(child);
- } else {
- parent.getNodes().add(index, child);
- }
- }
-
- /*
- * (non-Javadoc)
- *
- * @see Command#undo()
- */
- public void undo() {
- parent.getNodes().remove(child);
- }
-
- /**
- * get parent pageflow of the node.
- * @return the parent
- *
- */
- public Pageflow getParent() {
- return parent;
- }
-
- /**
- * Set the child pageflow node
- *
- * @param subpart -
- * child pageflow node
- */
- public void setChild(PageflowNode subpart) {
- child = subpart;
- }
-
- /**
- * Creates a new AbstractEditorPage instance.
- *
- * @param i -
- * index of pageflow node
- */
- public void setIndex(int i) {
- index = i;
- }
-
- /**
- * Set the new parent pageflow
- *
- * @param newParent -
- * parent pageflow
- */
- public void setParent(Pageflow newParent) {
- parent = newParent;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/command/BendpointCommand.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/command/BendpointCommand.java
deleted file mode 100644
index e4690d0..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/command/BendpointCommand.java
+++ /dev/null
@@ -1,143 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow.command;
-
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowLink;
-
-/**
- * base class for bend point commands.
- *
- */
-/*package*/ abstract class BendpointCommand extends Command {
- /** the index of the bend point */
- protected int index;
-
- /** the location of the bendpoint */
- protected Point location;
-
- /** the parent link */
- protected PageflowLink link;
-
- /** relative dimension between the bendpoint with start point of the pflink */
- private Dimension dimStart;
-
- /** relative dimension between the bendpoint with end point of the pflink */
- private Dimension dimEnd;
-
- /**
- * @param label
- */
- public BendpointCommand(String label) {
- super(label);
- }
-
- /**
- * get the dimension between the bendpoint and start point
- *
- * @return - the start dimension
- */
- protected Dimension getFirstRelativeDimension() {
- return dimStart;
- }
-
- /**
- * get the dimension between the bendpoint and end point
- *
- * @return - the end dimension
- */
- protected Dimension getSecondRelativeDimension() {
- return dimEnd;
- }
-
- /**
- * get the index of the bend point
- *
- * @return - the index
- */
- protected int getIndex() {
- return index;
- }
-
- /**
- * get the location of the bend point
- *
- * @return - the index
- */
- protected Point getLocation() {
- return location;
- }
-
- /**
- * get the parent link
- *
- * @return - parent link
- */
- protected PageflowLink getPFLink() {
- return link;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see Command#redo()
- */
- public void redo() {
- execute();
- }
-
- /**
- * set the relative dimensions of the bendpoint
- *
- * @param dim1 -
- * the dimension between the bendpoint and start point
- * @param dim2 -
- * the dimension between the bendpoint and end point
- */
- public void setRelativeDimensions(Dimension dim1, Dimension dim2) {
- dimStart = dim1;
- dimEnd = dim2;
- }
-
- /**
- * set the index of the bendpoint in the bendpoint list
- *
- * @param i -
- * index
- */
- public void setIndex(int i) {
- index = i;
- }
-
- /**
- * set the location of the bendpoing
- *
- * @param p -
- * new location
- */
- public void setLocation(Point p) {
- location = p;
- }
-
- /**
- * set the parent link
- *
- * @param newLink -
- * new parent pflink
- */
- public void setPFLink(PageflowLink newLink) {
- link = newLink;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/command/ConnectionCommand.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/command/ConnectionCommand.java
deleted file mode 100644
index dafa9f6..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/command/ConnectionCommand.java
+++ /dev/null
@@ -1,154 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow.command;
-
-import org.eclipse.gef.commands.Command;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.PageflowMessages;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowLink;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowNode;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.synchronization.TransformUtil;
-
-/**
- * This is the connection command for pageflow editpart
- *
- * @author Xiao-guang Zhang, hmeng
- */
-public abstract class ConnectionCommand extends Command {
- /** Old source pageflow node */
- protected PageflowNode oldSource;
-
- /** Old target pageflow node */
- protected PageflowNode oldTarget;
-
- /** New source pageflow node */
- protected PageflowNode source;
-
- /** New target pageflow node */
- protected PageflowNode target;
-
- /** pageflow link */
- protected PageflowLink link;
-
- /**
- * Default constructor
- */
- public ConnectionCommand() {
- super(PageflowMessages.Pageflow_Commands_ConnectionCommand_Label);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see Command#canExecute()
- */
- public boolean canExecute() {
- return TransformUtil.isValidPageflowElement(link);
- }
-
- /**
- * perform the main command execution. Sub-classes should override.
- */
- protected void doExecute() {
- // do nothing; sub-class can over-ride
- }
-
- /*
- * (non-Javadoc)
- *
- * @see Command#execute()
- */
- public final void execute() {
- if (canExecute()) {
- doExecute();
- } else {
- link = null;
- }
- }
-
- /*
- * (non-Javadoc)
- *
- * @see Command#redo()
- */
- public void redo() {
- execute();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see ommand#undo()
- */
- public void undo() {
- // do nothing
- }
-
- /**
- * Get the source pageflow node
- *
- * @return - the source pageflow node
- */
- public PageflowNode getSource() {
- return source;
- }
-
- /**
- * Get the target pageflow node
- *
- * @return - the target pageflow node.
- */
- public PageflowNode getTarget() {
- return target;
- }
-
- /**
- * Get the pageflow link
- *
- * @return - the pageflow link.
- */
- public PageflowLink getPFLink() {
- return link;
- }
-
- /**
- * Set the source pageflow node
- *
- * @param newSource -
- * new source pageflow node
- */
- public void setSource(PageflowNode newSource) {
- source = newSource;
- }
-
- /**
- * Set the target pageflow node
- *
- * @param newTarget -
- * new target pageflow node
- */
- public void setTarget(PageflowNode newTarget) {
- target = newTarget;
- }
-
- /**
- * Set the pageflow link
- *
- * @param link -
- * new pageflow link
- */
- public void setPFLink(PageflowLink link) {
- this.link = link;
- oldSource = link.getSource();
- oldTarget = link.getTarget();
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/command/ConnectionCommandFactory.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/command/ConnectionCommandFactory.java
deleted file mode 100644
index 8c7397c..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/command/ConnectionCommandFactory.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-
-
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow.command;
-
-import org.eclipse.gef.Request;
-import org.eclipse.gef.RequestConstants;
-
-/**
- * The factory helps to create connection commands.
- *
- * @author hmeng
- *
- */
-public class ConnectionCommandFactory {
- /**
- * @param request
- * @return the connection command for the request
- */
- public static ConnectionCommand createCommand(Request request) {
- ConnectionCommand command = null;
- if (request.getType() == RequestConstants.REQ_CONNECTION_START
- || request.getType() == RequestConstants.REQ_CONNECTION_END) {
- command = new AddConnectionCommand();
- } else if (request.getType() == RequestConstants.REQ_RECONNECT_SOURCE
- || request.getType() == RequestConstants.REQ_RECONNECT_TARGET) {
- command = new ReconnectConnectionCommand();
- } else if (request.getType() == RequestConstants.REQ_DELETE) {
- command = new DeleteConnectionCommand();
- }
- return command;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/command/CreateBendpointCommand.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/command/CreateBendpointCommand.java
deleted file mode 100644
index 60df11d..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/command/CreateBendpointCommand.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow.command;
-
-import java.util.Map;
-
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.PageflowMessages;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowFactory;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowLinkBendpoint;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowPackage;
-
-/**
- * Create a new bend point command
- *
- */
-public class CreateBendpointCommand extends BendpointCommand {
- /**
- * Default constructor
- */
- public CreateBendpointCommand() {
- // Pageflow.Commands.CreateBendpointCommand.Label = Create Bendpoint
- super(PageflowMessages.Pageflow_Commands_CreateBendpointCommand_Label);
-
- }
-
- /*
- * (non-Javadoc)
- *
- * @see Command#execute()
- */
- public void execute() {
- Map registry = EPackage.Registry.INSTANCE;
- String pageflowURI = PageflowPackage.eNS_URI;
- PageflowPackage pageflowPackage = (PageflowPackage) registry
- .get(pageflowURI);
- PageflowFactory factory = pageflowPackage.getPageflowFactory();
- PageflowLinkBendpoint _newBendpoint = factory.createPFLinkBendpoint();
-
- _newBendpoint.setRelativeDimensions(getFirstRelativeDimension(),
- getSecondRelativeDimension());
- getPFLink().insertBendpoint(getIndex(), _newBendpoint);
- super.execute();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see Command#undo()
- */
- public void undo() {
- super.undo();
- getPFLink().removeBendpoint(getIndex());
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/command/CreateNodeCommand.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/command/CreateNodeCommand.java
deleted file mode 100644
index 0cb7b28..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/command/CreateNodeCommand.java
+++ /dev/null
@@ -1,253 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow.command;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.jface.window.Window;
-import org.eclipse.jst.jsf.common.ui.internal.dialogs.CommonResourceDialog;
-import org.eclipse.jst.jsf.facesconfig.ui.EditorPlugin;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.PageflowMessages;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.Pageflow;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowNode;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowPage;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.util.PageflowValidation;
-import org.eclipse.jst.jsf.facesconfig.ui.util.WebrootUtil;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.IWorkbenchWindow;
-
-/**
- * This is the creation command for pageflow editpart
- *
- * @author Xiao-guang Zhang
- */
-public class CreateNodeCommand extends Command implements IPreExecuteCommand {
- private static final String UNNAMED_NODE = "unnamed"; //$NON-NLS-1$
-
- /** new pageflow node */
- private PageflowNode child;
-
- /** size of pageflow node figure */
- private Rectangle rect;
-
- /** parent pageflow */
- private Pageflow parent;
-
- /** index of pageflow nodes */
- // private int _index = -1;
- public CreateNodeCommand() {
- // Pageflow.Commands.CreateNodeCommand.Label = Create new node
- super(PageflowMessages.Pageflow_Commands_CreateNodeCommand_Label);
-
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.gef.commands.Command#canExecute()
- */
- public boolean canExecute() {
- return child != null && parent != null;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see Command#execute()
- */
- public void execute() {
- if (rect != null) {
- child.setX(rect.x);
- child.setY(rect.y);
- if (!rect.isEmpty()) {
- child.setHeight(rect.getSize().height);
- child.setWidth(rect.getSize().width);
- }
- }
-
- if (child.getName() == UNNAMED_NODE) {
- child.setName(parent.getDefaultNodeName(child.getClass()));
- }
-
- parent.getNodes().add(child);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see Command#redo()
- */
- public void redo() {
- if (rect != null) {
- child.setX(rect.x);
- child.setY(rect.y);
- if (!rect.isEmpty()) {
- child.setHeight(rect.getSize().height);
- child.setWidth(rect.getSize().width);
- }
- }
-
- parent.getNodes().add(child);
-
- }
-
- /*
- * (non-Javadoc)
- *
- * @see Command#undo()
- */
- public void undo() {
- parent.getNodes().remove(child);
- }
-
- /**
- * select a jsp page in current project.
- *
- * @return
- */
- private boolean selectJSPPage() {
-
- Shell shell = null;
- IWorkbenchWindow workbenchWindow = EditorPlugin
- .getActiveWorkbenchWindow();
- if (workbenchWindow.getShell() != null) {
- shell = workbenchWindow.getShell();
- } else {
- shell = new Shell();
- }
- IProject project = WebrootUtil.getProject(getParent());
-
- CommonResourceDialog dialog = new CommonResourceDialog(shell, project,
- SWT.NONE);
-
- dialog
- .setTitle(PageflowMessages.Pageflow_Commands_CreateNodeCommand_SelectJSPDialog_Title);
- // no suffix filter
- dialog.setSuffixs(null);
- dialog
- .setResourceDescription(PageflowMessages.Pageflow_Commands_CreateNodeCommand_SelectJSPDialog_Description);
-
- if (dialog.open() == Window.OK) {
- Object[] result = dialog.getResult();
- if (result != null) {
- IFile jspFile = (IFile) result[0];
- if (jspFile != null) {
- // get the project path for the new created file, i.e.,
- // /project/webroot/*.jsp
- String jsfSelection = WebrootUtil.getWebPath(jspFile
- .getFullPath());
- if (jsfSelection != null && jsfSelection.length() > 0) {
- if (PageflowValidation.getInstance().isExistedPage(
- this.parent, jsfSelection)) {
- // Pageflow.PageflowEditor.Alert.DNDResourceTitle =
- // Pageflow Creation Error
- // Pageflow.PageflowEditor.Alert.ExistingPage = The
- // web page {0} is already existed in current
- // PageFlow.
- EditorPlugin
- .getAlerts()
- .error(
- "Pageflow.PageflowEditor.Alert.DNDResourceTitle", //$NON-NLS-1$
- "Pageflow.PageflowEditor.Alert.ExistingPage", //$NON-NLS-1$
- jsfSelection);
- return false;
- }
-
- ((PageflowPage) (child)).setPath(jsfSelection);
- ((PageflowPage) (child)).setName(WebrootUtil
- .getPageNameFromWebPath(jsfSelection));
- }
-
- return true;
- }
- }
- }
- return false;
- }
-
- /**
- * call the JSF wizard to create a new jsf page.
- * @return the parent
- *
- */
- public Pageflow getParent() {
- return parent;
- }
-
- /**
- * set the child node
- *
- * @param subpart -
- * new child pageflow node
- */
- public void setChild(PageflowNode subpart) {
- child = subpart;
- }
-
- /**
- * set the location of the new pageflow node
- *
- * @param r -
- * location of the new pageflow node
- */
- public void setLocation(Rectangle r) {
- rect = r;
- }
-
- /**
- * set the parent pageflow
- *
- * @param newParent -
- * the new parent pageflow
- */
- public void setParent(Pageflow newParent) {
- parent = newParent;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see com.sybase.stf.jmt.editors.pageflow.commands.IPreExecuteCommand#preExecute()
- */
- public boolean preExecute() {
- // note that the model adds the ports to the node in this call
- // pop up the new the wizard to create the new jsf file
- if (child instanceof PageflowPage) {
- // if the new page's file path is not empty, i.e., drag a file from
- // resource navigator view
- if (null != ((PageflowPage) child).getPath()) {
- if (PageflowValidation.getInstance().isExistedPage(parent,
- (PageflowPage) child)) {
- // Pageflow.PageflowEditor.Alert.DNDResourceTitle = Pageflow
- // Creation Error
- // Pageflow.PageflowEditor.Alert.ExistingPage = The web page
- // {0} is already existed in current PageFlow.
- EditorPlugin.getAlerts().error(
- "Pageflow.PageflowEditor.Alert.DNDResourceTitle", //$NON-NLS-1$
- "Pageflow.PageflowEditor.Alert.ExistingPage", //$NON-NLS-1$
- ((PageflowPage) child).getPath());
- return false;
- }
- } else
- // create a new jsf page from scratch
- {
- // return createNewJSFPage();
- return selectJSPPage();
- }
- }
- return true;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/command/DelegatingCommandStack.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/command/DelegatingCommandStack.java
deleted file mode 100644
index 1586f6f..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/command/DelegatingCommandStack.java
+++ /dev/null
@@ -1,262 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow.command;
-
-import java.util.EventObject;
-
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.commands.CommandStack;
-import org.eclipse.gef.commands.CommandStackListener;
-import org.eclipse.gef.commands.UnexecutableCommand;
-
-/**
- * This is a delegating command stack, which delegates everything to another
- * CommandStack except event listners.
- * <p>
- * Event listeners registered to a <code>DelegatingCommandStack</code> will be
- * informed whenever the underlying <code>CommandStack</code> changes. They
- * will not be registered to the underlying <code>CommandStack</code> directly
- * but they will be informed about change events of them.
- *
- */
-public class DelegatingCommandStack extends CommandStack implements
- CommandStackListener {
- /** the empty object array */
- private static final Object[] EMPTY_OBJECT_ARRAY = new Object[] {};
-
- /** the current command stack */
- private CommandStack currentCommandStack = null;
-
- /**
- * Returns the current <code>CommandStack</code>.
- *
- * @return - the current <code>CommandStack</code>
- */
- public CommandStack getCurrentCommandStack() {
- return currentCommandStack;
- }
-
- /**
- * Sets the current <code>CommandStack</code>.
- *
- * @param stack -
- * the <code>CommandStack</code> to set
- */
- public void setCurrentCommandStack(CommandStack stack) {
- if (currentCommandStack == stack) {
- return;
- }
-
- // remove from old command stack
- if (null != currentCommandStack) {
- currentCommandStack.removeCommandStackListener(this);
- }
-
- // set new command stack
- currentCommandStack = stack;
-
- if (currentCommandStack != null) {
- // watch new command stack
- currentCommandStack.addCommandStackListener(this);
-
- // the command stack changed
- notifyListeners();
- }
- }
-
- /*
- * (non-Javadoc)
- *
- * @see CommandStack#canRedo()
- */
- public boolean canRedo() {
- if (null == currentCommandStack) {
- return false;
- }
-
- return currentCommandStack.canRedo();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see CommandStack#canUndo()
- */
- public boolean canUndo() {
- if (null == currentCommandStack) {
- return false;
- }
-
- return currentCommandStack.canUndo();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see CommandStack#dispose()
- */
- public void dispose() {
- if (null != currentCommandStack) {
- currentCommandStack.dispose();
- }
- }
-
- /*
- * (non-Javadoc)
- *
- * @see CommandStack#execute(org.eclipse.gef.commands.Command)
- */
- public void execute(Command command) {
- if (null != currentCommandStack) {
- currentCommandStack.execute(command);
- }
- }
-
- /*
- * (non-Javadoc)
- *
- * @see CommandStack#flush()
- */
- public void flush() {
- if (null != currentCommandStack) {
- currentCommandStack.flush();
- }
- }
-
- /*
- * (non-Javadoc)
- *
- * @see CommandStack#getCommands()
- */
- public Object[] getCommands() {
- if (null == currentCommandStack) {
- return EMPTY_OBJECT_ARRAY;
- }
-
- return currentCommandStack.getCommands();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see CommandStack#getRedoCommand()
- */
- public Command getRedoCommand() {
- if (null == currentCommandStack) {
- return UnexecutableCommand.INSTANCE;
- }
-
- return currentCommandStack.getRedoCommand();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see CommandStack#getUndoCommand()
- */
- public Command getUndoCommand() {
- if (null == currentCommandStack) {
- return UnexecutableCommand.INSTANCE;
- }
-
- return currentCommandStack.getUndoCommand();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see CommandStack#getUndoLimit()
- */
- public int getUndoLimit() {
- if (null == currentCommandStack) {
- return -1;
- }
-
- return currentCommandStack.getUndoLimit();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see CommandStack#isDirty()
- */
- public boolean isDirty() {
- if (null == currentCommandStack) {
- return false;
- }
-
- return currentCommandStack.isDirty();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see CommandStack#markSaveLocation()
- */
- public void markSaveLocation() {
- if (null != currentCommandStack) {
- currentCommandStack.markSaveLocation();
- }
- }
-
- /*
- * (non-Javadoc)
- *
- * @see CommandStack#redo()
- */
- public void redo() {
- if (null != currentCommandStack) {
- currentCommandStack.redo();
- }
- }
-
- /*
- * (non-Javadoc)
- *
- * @see CommandStack#setUndoLimit(int)
- */
- public void setUndoLimit(int undoLimit) {
- if (null != currentCommandStack) {
- currentCommandStack.setUndoLimit(undoLimit);
- }
- }
-
- /*
- * (non-Javadoc)
- *
- * @see CommandStack#undo()
- */
- public void undo() {
- if (null != currentCommandStack) {
- currentCommandStack.undo();
- }
- }
-
- /*
- * (non-Javadoc)
- *
- * @see Object#toString()
- */
- public String toString() {
- return "DelegatingCommandStack(" + currentCommandStack + ")"; //$NON-NLS-1$ //$NON-NLS-2$
- }
-
- /*
- * (non-Javadoc)
- *
- * @see CommandStackListener#commandStackChanged(java.util.EventObject)
- */
- public void commandStackChanged(EventObject event) {
- notifyListeners();
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/command/DeleteBendpointCommand.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/command/DeleteBendpointCommand.java
deleted file mode 100644
index 25e0049..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/command/DeleteBendpointCommand.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow.command;
-
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.PageflowMessages;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowLinkBendpoint;
-
-/**
- *
- */
-public class DeleteBendpointCommand extends BendpointCommand {
-
- /** the deleting bendpoint */
- private PageflowLinkBendpoint bendpoint;
-
- /**
- * Default constructor
- */
- public DeleteBendpointCommand() {
-
- // Pageflow.Commands.DeleteBendpointCommand.Label = Delete Bendpoint
- super(PageflowMessages.Pageflow_Commands_DeleteBendpointCommand_Label);
-
- }
-
- /*
- * (non-Javadoc)
- *
- * @see Command#execute()
- */
- public void execute() {
- super.execute();
- bendpoint = (PageflowLinkBendpoint) getPFLink().getBendPoints().get(
- getIndex());
- getPFLink().removeBendpoint(getIndex());
- }
-
- /*
- * (non-Javadoc)
- *
- * @see Command#undo()
- */
- public void undo() {
- super.undo();
- getPFLink().insertBendpoint(getIndex(), bendpoint);
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/command/DeleteConnectionCommand.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/command/DeleteConnectionCommand.java
deleted file mode 100644
index dd22437..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/command/DeleteConnectionCommand.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-
-
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow.command;
-
-/**
- * Delete a connection.
- *
- * @author hmeng
- *
- */
-public class DeleteConnectionCommand extends ConnectionCommand {
-
- public boolean canExecute() {
- return link != null;
- }
-
- protected void doExecute() {
- // It is a delete connection command
- if (link != null) {
- link.setSource(null);
- link.setTarget(null);
- oldSource.getPageflow().getLinks().remove(link);
- link.eAdapters().clear();
- }
- }
-
- public void undo() {
- // It is a delete connection command
- if (canExecute()) {
- link.setSource(oldSource);
- link.setTarget(oldTarget);
- oldSource.getPageflow().getLinks().add(link);
- }
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/command/DeleteNodeCommand.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/command/DeleteNodeCommand.java
deleted file mode 100644
index 4660942..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/command/DeleteNodeCommand.java
+++ /dev/null
@@ -1,189 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow.command;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.PageflowMessages;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.Pageflow;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowLink;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowNode;
-
-/**
- * This is the delete command for pageflow editpart
- *
- */
-public class DeleteNodeCommand extends AbstractBatchEditCommand {
- /** the deleting pageflow node */
- private PageflowNode child;
-
- /** parent pageflow */
- private Pageflow parent;
-
- /** index of pageflow nodes */
- private int index = -1;
-
- /** source connections with the deleting node */
- private List sourceConnections = new ArrayList();
-
- private List sourceConnectionSources = new ArrayList();
-
- private List sourceConnectionTargets = new ArrayList();
-
- /** target connections with the deleting node */
- private List targetConnections = new ArrayList();
-
- private List targetConnectionSources = new ArrayList();
-
- private List targetConnectionTargets = new ArrayList();
-
- /**
- * @param pageflow
- */
- public DeleteNodeCommand(Pageflow pageflow) {
- // Pageflow.Commands.DeleteNodeCommand.Label = Delete
- super(pageflow, PageflowMessages.Pageflow_Commands_DeleteNodeCommand_Label);
-
- }
-
- /*
- * (non-Javadoc)
- *
- * @see Command#execute()
- */
- public void doExecute() {
- primExecute();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see Command#redo()
- */
- public void doRedo() {
- primExecute();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see Command#undo()
- */
- public void doUndo() {
- parent.getNodes().add(index, child);
- restoreConnections(child);
- }
-
- /**
- * delete the connections related with the pageflow node.
- *
- * @param node -
- * the deleting pageflow node
- */
- private void deleteConnections(PageflowNode node) {
- while (node.getOutlinks().size() > 0) {
- // Note:should save the source and target of the link, otherwise
- // source and target will be lost,
- // when the source and target node remove the link.
- PageflowLink link = (PageflowLink) node.getOutlinks().get(0);
- sourceConnections.add(link);
- sourceConnectionSources.add(link.getSource());
- sourceConnectionTargets.add(link.getTarget());
-
- link.getTarget().getInlinks().remove(link);
- node.getOutlinks().remove(link);
- parent.getLinks().remove(link);
- }
-
- while (node.getInlinks().size() > 0) {
- // Note: should save the source and target of the link, otherwise
- // source and target will be lost,
- // when the source and target node remove the link.
- PageflowLink link = (PageflowLink) node.getInlinks().get(0);
- targetConnections.add(link);
- targetConnectionSources.add(link.getSource());
- targetConnectionTargets.add(link.getTarget());
-
- link.getSource().getOutlinks().remove(link);
- node.getInlinks().remove(link);
- parent.getLinks().remove(link);
- }
- }
-
- /**
- * execute the delete command
- *
- *
- */
- protected void primExecute() {
- deleteConnections(child);
- index = parent.getNodes().indexOf(child);
- parent.getNodes().remove(child);
- }
-
- /**
- * restore the connections of the deleted pageflow node
- *
- * @param node -
- * the deleted pageflow node
- */
- private void restoreConnections(PageflowNode node) {
- for (int i = 0; i < sourceConnections.size(); i++) {
- // restore the link with the source and target
- PageflowLink link = (PageflowLink) sourceConnections.get(i);
- PageflowNode source = (PageflowNode) sourceConnectionSources.get(i);
- PageflowNode target = (PageflowNode) sourceConnectionTargets.get(i);
- link.setSource(source);
- link.setTarget(target);
-
- parent.getLinks().add(link);
- node.getOutlinks().add(link);
- link.getTarget().getInlinks().add(link);
- }
- sourceConnections.clear();
- for (int i = 0; i < targetConnections.size(); i++) {
- // restore the link with the source and target
- PageflowLink link = (PageflowLink) targetConnections.get(i);
- PageflowNode source = (PageflowNode) targetConnectionSources.get(i);
- PageflowNode target = (PageflowNode) targetConnectionTargets.get(i);
- link.setSource(source);
- link.setTarget(target);
-
- parent.getLinks().add(link);
- node.getInlinks().add(link);
- link.getSource().getOutlinks().add(link);
- }
- targetConnections.clear();
- }
-
- /**
- * set the child pageflow node
- *
- * @param c -
- * the child pageflow node
- */
- public void setChild(PageflowNode c) {
- child = c;
- }
-
- /**
- * set the parent pageflow
- *
- * @param p -
- * the parent pageflow
- */
- public void setParent(Pageflow p) {
- parent = p;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/command/EMFCommandGEFAdapter.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/command/EMFCommandGEFAdapter.java
deleted file mode 100644
index 456c1b8..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/command/EMFCommandGEFAdapter.java
+++ /dev/null
@@ -1,124 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow.command;
-
-import org.eclipse.gef.commands.Command;
-
-/**
- * This class is used to adapter EMF Command to GEF Command.
- *
- * @author xgzhang
- * @version
- */
-/*package*/ class EMFCommandGEFAdapter extends Command {
- private org.eclipse.emf.common.command.Command emfCommand;
-
- /**
- * @param emfCommand
- */
- public EMFCommandGEFAdapter(
- org.eclipse.emf.common.command.Command emfCommand) {
- super();
- this.emfCommand = emfCommand;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.gef.commands.Command#canExecute()
- */
- public boolean canExecute() {
- if (emfCommand == null) {
- return false;
- }
- return emfCommand.canExecute();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.gef.commands.Command#canUndo()
- */
- public boolean canUndo() {
- if (emfCommand == null) {
- return false;
- }
- return emfCommand.canUndo();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.gef.commands.Command#dispose()
- */
- public void dispose() {
- if (emfCommand == null) {
- return;
- }
- emfCommand.dispose();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.gef.commands.Command#execute()
- */
- public void execute() {
- if (emfCommand == null) {
- return;
- }
- emfCommand.execute();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.gef.commands.Command#getLabel()
- */
- public String getLabel() {
- if (emfCommand == null) {
- return null;
- }
- return emfCommand.getLabel();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.gef.commands.Command#redo()
- */
- public void redo() {
- if (emfCommand == null) {
- return;
- }
- emfCommand.redo();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.gef.commands.Command#undo()
- */
- public void undo() {
- if (emfCommand == null) {
- return;
- }
- emfCommand.undo();
- }
-
- /**
- *
- */
- org.eclipse.emf.common.command.Command getEMFCommand() {
- return emfCommand;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/command/EMFCommandStackGEFAdapter.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/command/EMFCommandStackGEFAdapter.java
deleted file mode 100644
index a253dff..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/command/EMFCommandStackGEFAdapter.java
+++ /dev/null
@@ -1,199 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow.command;
-
-import java.util.EventObject;
-
-import org.eclipse.emf.common.command.BasicCommandStack;
-import org.eclipse.emf.common.command.CommandStackListener;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.commands.CommandStack;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-
-/**
- * This adapter is used to let editor be able to monitor EMF CommandStack, e.g.,
- * in StructuredTextEditor, using GEF CommandStack.
- *
- * @author xgzhang
- * @version
- */
-public class EMFCommandStackGEFAdapter extends CommandStack implements
- CommandStackListener {
- private org.eclipse.emf.common.command.BasicCommandStack emfCommandStack;
- private IStructuredModel model;
-
- /**
- * @param doc
- */
- public EMFCommandStackGEFAdapter (IDocument doc) {
-
- super();
-
- model = StructuredModelManager.getModelManager().getExistingModelForEdit(doc);
-
- if (model == null) {
- model = StructuredModelManager.getModelManager().getModelForEdit((IStructuredDocument) doc);
- }
-
- emfCommandStack = ((BasicCommandStack) this.model.getUndoManager().getCommandStack());
- emfCommandStack.addCommandStackListener(this);
- }
-
-
- @Override
- public void dispose() {
- model.releaseFromEdit();
- super.dispose();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.gef.commands.CommandStack#canRedo()
- */
- public boolean canRedo() {
- if (emfCommandStack == null) {
- return false;
- }
- return emfCommandStack.canRedo();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.gef.commands.CommandStack#canUndo()
- */
- public boolean canUndo() {
- if (emfCommandStack == null) {
- return false;
- }
- return emfCommandStack.canUndo();
-
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.gef.commands.CommandStack#execute(org.eclipse.gef.commands.Command)
- */
- public void execute(Command command) {
- if (!(command instanceof EMFCommandGEFAdapter)) {
- return;
- }
-
- org.eclipse.emf.common.command.Command emfCommand = ((EMFCommandGEFAdapter) command)
- .getEMFCommand();
- if (emfCommand != null) {
- emfCommandStack.execute(emfCommand);
- }
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.gef.commands.CommandStack#flush()
- */
- public void flush() {
- if (emfCommandStack == null) {
- return;
- }
- emfCommandStack.flush();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.gef.commands.CommandStack#getRedoCommand()
- */
- public Command getRedoCommand() {
- if (emfCommandStack == null || emfCommandStack.getRedoCommand() == null) {
- return null;
- }
-
- return new EMFCommandGEFAdapter(emfCommandStack.getRedoCommand());
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.gef.commands.CommandStack#getUndoCommand()
- */
- public Command getUndoCommand() {
- if (emfCommandStack == null || emfCommandStack.getUndoCommand() == null) {
- return null;
- }
-
- return new EMFCommandGEFAdapter(emfCommandStack.getUndoCommand());
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.gef.commands.CommandStack#isDirty()
- */
- public boolean isDirty() {
- if (emfCommandStack == null) {
- return false;
- }
- return emfCommandStack.isSaveNeeded();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.gef.commands.CommandStack#markSaveLocation()
- */
- public void markSaveLocation() {
- if (emfCommandStack == null) {
- return;
- }
- emfCommandStack.saveIsDone();
- super.markSaveLocation();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.gef.commands.CommandStack#redo()
- */
- public void redo() {
- if (emfCommandStack == null) {
- return;
- }
- emfCommandStack.redo();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.gef.commands.CommandStack#undo()
- */
- public void undo() {
- if (emfCommandStack == null) {
- return;
- }
- emfCommandStack.undo();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.emf.common.command.CommandStackListener#commandStackChanged(java.util.EventObject)
- */
- public void commandStackChanged(EventObject event) {
- this.notifyListeners();
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/command/IPreExecuteCommand.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/command/IPreExecuteCommand.java
deleted file mode 100644
index 4bed8f6..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/command/IPreExecuteCommand.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow.command;
-
-/**
- * Command with pre execute checking.
- *
- * @author Xiao-guang Zhang
- *
- *
- */
-/*package*/ interface IPreExecuteCommand {
- /**
- * Do something pre-execution of the actual command execution.
- *
- * @return - successful to do the pre-execution
- */
- boolean preExecute();
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/command/MoveBendpointCommand.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/command/MoveBendpointCommand.java
deleted file mode 100644
index dc1e0fa..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/command/MoveBendpointCommand.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow.command;
-
-import java.util.Map;
-
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.PageflowMessages;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowFactory;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowLinkBendpoint;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowPackage;
-
-/**
- * Move bend point command
- */
-public class MoveBendpointCommand extends BendpointCommand {
- /**
- * old bend point of the link
- */
- private PageflowLinkBendpoint oldBendpoint;
-
- /**
- * Default constructor
- */
- public MoveBendpointCommand() {
- // Pageflow.Commands.MoveBendpointCommand.Label = Move Bendpoint
- super(PageflowMessages.Pageflow_Commands_MoveBendpointCommand_Label);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see Command#execute()
- */
- public void execute() {
- Map registry = EPackage.Registry.INSTANCE;
- String pageflowURI = PageflowPackage.eNS_URI;
- PageflowPackage pageflowPackage = (PageflowPackage) registry
- .get(pageflowURI);
- PageflowFactory factory = pageflowPackage.getPageflowFactory();
- PageflowLinkBendpoint _newBendpoint = factory.createPFLinkBendpoint();
-
- _newBendpoint.setRelativeDimensions(getFirstRelativeDimension(),
- getSecondRelativeDimension());
- setOldBendpoint((PageflowLinkBendpoint) getPFLink().getBendPoints().get(
- getIndex()));
-
- getPFLink().setBendpoint(getIndex(), _newBendpoint);
- super.execute();
- }
-
- /**
- * get the old bend point
- *
- * @return - old bend point
- */
- protected PageflowLinkBendpoint getOldBendpoint() {
- return oldBendpoint;
- }
-
- /**
- * set the old bend point
- *
- * @param bp -
- * old bend point
- */
- public void setOldBendpoint(PageflowLinkBendpoint bp) {
- oldBendpoint = bp;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see Command#undo()
- */
- public void undo() {
- super.undo();
- getPFLink().setBendpoint(getIndex(), getOldBendpoint());
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/command/OpenEditorCommand.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/command/OpenEditorCommand.java
deleted file mode 100644
index e293eb8..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/command/OpenEditorCommand.java
+++ /dev/null
@@ -1,173 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow.command;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.jst.jsf.common.ui.internal.logging.Logger;
-import org.eclipse.jst.jsf.facesconfig.ui.EditorPlugin;
-import org.eclipse.jst.jsf.facesconfig.ui.FacesConfigEditor;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.PageflowMessages;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowPage;
-import org.eclipse.jst.jsf.facesconfig.ui.util.WebrootUtil;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.IEditorDescriptor;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.ide.IDE;
-import org.eclipse.ui.part.FileEditorInput;
-
-/**
- *
- * This is the Command for opening a file in its default editor
- *
- * @author Xiao-guang Zhang
- */
-public class OpenEditorCommand extends Command {
-
- /** The edit part */
- private EditPart part;
-
- /** log instance */
- private static final Logger log = EditorPlugin
- .getLogger(FacesConfigEditor.class);
-
- /*
- * (non-Javadoc)
- *
- * @see Command#canExecute()
- */
- public boolean canExecute() {
- return true;
- }
-
- /**
- * The constructor
- *
- * @param part -
- * the EditPart
- */
- public OpenEditorCommand(EditPart part) {
- // Pageflow.Commands.OpenEditorCommand.Label = Open Editor
- super(PageflowMessages.Pageflow_Commands_OpenEditorCommand_Label);
- this.part = part;
- }
-
- /**
- * open existed JSF file or call the wizard to create a new one.
- *
- */
- private void executeOpenPFPage() {
- IWorkspaceRoot workspaceRoot = ResourcesPlugin.getWorkspace().getRoot();
- String pagePath = ((PageflowPage) (part.getModel())).getPath();
-
- // Check the fileName is empty or not
- if (pagePath != null && pagePath.length() > 0) {
- String resourceName = WebrootUtil.getProjectPath((EObject) part
- .getModel(), pagePath);
- Path resourcePath = new Path(resourceName);
- if (resourcePath.getFileExtension() != null) {
- final IFile file = (IFile) workspaceRoot
- .findMember(resourcePath);
- openExistingJSFFile(file);
- } else {
- // Pageflow.PageflowEditor.Alert.errorOpenEditor4JSFTitle =
- // Open JSF File Error
- // Pageflow.PageflowEditor.Alert.errorOpenEditor4JSFFolderInfo =
- // Cannot open the page in the page editor.
- EditorPlugin
- .getAlerts()
- .error(
- "Pageflow.PageflowEditor.Alert.errorOpenEditor4JSFTitle", //$NON-NLS-1$
- "Pageflow.PageflowEditor.Alert.errorOpenEditor4JSFFolderInfo"); //$NON-NLS-1$
- }
- } else
- // if the fileName is empty, a new jsf file should be created!
- {
- // Pageflow.PageflowEditor.Alert.errorOpenEditor4JSFTitle = Open JSF
- // File Error
- // Pageflow.PageflowEditor.Alert.confirmCreateNewJSFFile = No jsp
- // file is related with this page.
- EditorPlugin.getAlerts().error(
- "Pageflow.PageflowEditor.Alert.errorOpenEditor4JSFTitle", //$NON-NLS-1$
- "Pageflow.PageflowEditor.Alert.confirmCreateNewJSFFile");// ) //$NON-NLS-1$
- }
- }
-
- /**
- * open existing jsf file in a new editor.
- *
- * @param file
- */
- private void openExistingJSFFile(final IFile file) {
- // if the file is existed, open it.
- if (null != file && file.exists()) {
- Display display = PlatformUI.getWorkbench()
- .getActiveWorkbenchWindow().getShell().getDisplay();
- display.asyncExec(new Runnable() {
- public void run() {
- IDE.setDefaultEditor(file, null);
- try {
- IWorkbenchPage page = PlatformUI.getWorkbench()
- .getActiveWorkbenchWindow().getActivePage();
- IEditorDescriptor desc = IDE.getEditorDescriptor(file);
- page.openEditor(new FileEditorInput(file),
- desc.getId(), true, IWorkbenchPage.MATCH_INPUT
- | IWorkbenchPage.MATCH_ID);
- } catch (PartInitException e) {
- // Pageflow.PageflowEditor.Error.CanNotOpenEditor4JSF =
- // The jsf file can not be opened in the editor.
- log
- .error(
- "Pageflow.PageflowEditor.Error.canNotOpenEditor4JSF", //$NON-NLS-1$
- e);
- // Pageflow.PageflowEditor.Alert.errorOpenEditor4JSFTitle
- // = Open JSF File Error
- EditorPlugin
- .getAlerts()
- .error(
- "Pageflow.PageflowEditor.Alert.errorOpenEditor4JSFTitle", //$NON-NLS-1$
- "Pageflow.PageflowEditor.Error.CanNotOpenEditor4JSF"); //$NON-NLS-1$
- }
- }
- });
- } else
- // otherwise, pop-up a error message box
- {
- String pagePath = ((PageflowPage) (part.getModel())).getPath();
- // Pageflow.PageflowEditor.Alert.errorOpenEditor4JSFTitle = Open JSF
- // File Error
- // Pageflow.PageflowEditor.Alert.errorOpenEditor4JSFInfo = The JSF
- // file is not existed.
- EditorPlugin.getAlerts().error(
- "Pageflow.PageflowEditor.Alert.errorOpenEditor4JSFTitle", //$NON-NLS-1$
- "Pageflow.PageflowEditor.Alert.errorOpenEditor4JSFInfo", //$NON-NLS-1$
- pagePath);
- }
- }
-
- /**
- * Executes the OpenEditorCommand and opens the editor
- */
- public void execute() {
- if (part.getModel() instanceof PageflowPage) {
- executeOpenPFPage();
- }
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/command/OrphanChildCommand.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/command/OrphanChildCommand.java
deleted file mode 100644
index a695c32..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/command/OrphanChildCommand.java
+++ /dev/null
@@ -1,101 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow.command;
-
-import java.util.List;
-
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.PageflowMessages;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.Pageflow;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowNode;
-
-/**
- * This is the orphan child command for pageflow container
- *
- */
-public class OrphanChildCommand extends Command {
-
- /** old location of pageflow node */
- private Point oldLocation;
-
- /** the parent pageflow */
- private Pageflow pageflow;
-
- /** the child pageflow node */
- private PageflowNode child;
-
- /** the index of pageflow nodes */
- private int index;
-
- /**
- * Default constructor
- */
- public OrphanChildCommand() {
- // Pageflow.Commands.OrphanChildCommand.Label = Orphan Child
- super(PageflowMessages.Pageflow_Commands_OrphanChildCommand_Label);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see Command#execute()
- */
- public void execute() {
- List children = pageflow.getNodes();
- index = children.indexOf(child);
- oldLocation = new Point(child.getX(), child.getY());
- pageflow.getNodes().remove(child);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see Command#redo()
- */
- public void redo() {
- pageflow.getNodes().remove(child);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see Command#undo()
- */
- public void undo() {
- child.setX(oldLocation.x);
- child.setY(oldLocation.y);
- pageflow.getNodes().add(index, child);
- }
-
- /**
- * set the child pageflow node
- *
- * @param child -
- * child pageflow node
- */
- public void setChild(PageflowNode child) {
- this.child = child;
- }
-
- /**
- * set the parent pageflow
- *
- * @param parent -
- * parent pageflow
- */
- public void setParent(Pageflow parent) {
- pageflow = parent;
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/command/PreExecuteCommandStack.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/command/PreExecuteCommandStack.java
deleted file mode 100644
index 2741862..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/command/PreExecuteCommandStack.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow.command;
-
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.commands.CommandStack;
-
-/**
- * Before the command stack called execute to do the actual model modification,
- * it will call the command's IPreExecuteCommand inteface to check the command
- * can be execute or not.
- *
- *
- * @author Xiao-guang Zhang
- */
-public class PreExecuteCommandStack extends CommandStack {
- /**
- *
- */
- public PreExecuteCommandStack() {
- super();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.gef.commands.CommandStack#execute(org.eclipse.gef.commands.Command)
- */
- public void execute(Command command) {
- if (command == null || !command.canExecute()) {
- return;
- }
- if (command instanceof IPreExecuteCommand) {
- if (!((IPreExecuteCommand) command).preExecute()) {
- return;
- }
- }
- super.execute(command);
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/command/ReconnectConnectionCommand.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/command/ReconnectConnectionCommand.java
deleted file mode 100644
index 63519ca..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/command/ReconnectConnectionCommand.java
+++ /dev/null
@@ -1,114 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-
-
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow.command;
-
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.util.PageflowValidation;
-
-/**
- * Change the end of a link.
- *
- * @author hmeng
- *
- */
-public class ReconnectConnectionCommand extends ConnectionCommand {
-
- /**
- * Default constructor
- */
- public ReconnectConnectionCommand() {
- super();
- }
-
- public boolean canExecute() {
- // if user didn't set PFLink object beforehand, this command can't be
- // executed.
- if (link == null || link.eContainer() == null) {
- return false;
- }
-
- // Reconnect both source and target
- if (oldSource != null && source != null && oldTarget != null
- && target != null) {
- if (!PageflowValidation.getInstance().isValidLinkForCreation(
- source, target)) {
- return false;
- }
- }
-
- // Reconnect source
- if (oldSource != null && source != null) {
- if (!PageflowValidation.getInstance().isValidLinkForCreation(
- source, oldTarget)) {
- return false;
- }
- }
- // Reconnect target
- if (oldTarget != null && target != null) {
- if (!PageflowValidation.getInstance().isValidLinkForCreation(
- oldSource, target)) {
- return false;
- }
- }
-
- return true;
-
- }
-
- public void doExecute() {
- String outcome = null, action = null, largeIcon = null, smallIcon = null;
- boolean isRedirect = false;
- outcome = link.getOutcome();
- action = link.getFromaction();
- isRedirect = link.isRedirect();
- largeIcon = link.getLargeicon();
- smallIcon = link.getSmallicon();
- // It is a reconnect source command
- if (oldSource != null && source != null) {
- link.setSource(source);
- }
- // It is a reconnect target command
- if (oldTarget != null && target != null) {
- link.setTarget(target);
- }
- link.setOutcome(outcome);
- link.setFromaction(action);
- link.setLargeicon(largeIcon);
- link.setSmallicon(smallIcon);
- link.setRedirect(isRedirect);
- }
-
- public void undo() {
- if (canExecute()) {
- // It was a reconnect source command
- if (oldSource != null && source != null) {
- // The link source must be replaced by the oldSource
- if (link.getSource() != null) {
- link.getSource().getOutlinks().remove(link);
- }
- source.getOutlinks().remove(link);
- link.setSource(oldSource);
- }
- // It was a reconnect target command
- if (oldTarget != null && target != null) {
- // The link target must be replaced by the oldTarget
- if (link.getTarget() != null) {
- link.getTarget().getInlinks().remove(link);
- }
- target.getInlinks().remove(link);
- link.setTarget(oldTarget);
- }
- }
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/command/RenameNodeCommand.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/command/RenameNodeCommand.java
deleted file mode 100644
index e3e5269..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/command/RenameNodeCommand.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow.command;
-
-import org.eclipse.gef.commands.Command;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowNode;
-
-/**
- * Command to rename Node.
- *
- * @author xgzhang
- */
-public class RenameNodeCommand extends Command {
-
- /** new pageflow node */
- private PageflowNode node;
-
- /** new node name */
- private String name;
-
- /** old node name */
- private String oldName;
-
- /**
- * @see org.eclipse.gef.commands.Command#execute()
- */
- public void execute() {
- node.setName(name);
- }
-
- /**
- * Sets the new Activity name
- *
- * @param string
- * the new name
- */
- public void setName(String string) {
- name = string;
- }
-
- /**
- * Sets the old Activity name
- *
- * @param string
- * the old name
- */
- public void setOldName(String string) {
- oldName = string;
- }
-
- /**
- * Sets the source Activity
- * @param node
- * the source Activity
- */
- public void setSource(PageflowNode node) {
- this.node = node;
- }
-
- /**
- * @see org.eclipse.gef.commands.Command#undo()
- */
- public void undo() {
- node.setName(oldName);
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/command/SetConstraintCommand.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/command/SetConstraintCommand.java
deleted file mode 100644
index c36b929..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/command/SetConstraintCommand.java
+++ /dev/null
@@ -1,137 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow.command;
-
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.PageflowMessages;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowElement;
-
-/**
- * This is the SetConstraint command for XY layout edit policy
- *
- */
-public class SetConstraintCommand extends Command {
- /** location command label */
- private static final String COMMAND_LABEL_LOCATION = PageflowMessages.SetConstraintCommand_Location;
-
- /** resize command label */
- private static final String COMMAND_LABEL_RESIZE = PageflowMessages.SetConstraintCommand_Resize;
-
- /** new position */
- private Point newPos;
-
- /** new size */
- private Dimension newSize;
-
- /** olde position */
- private Point oldPos;
-
- /** old size */
- private Dimension oldSize;
-
- /** pageflow element */
- private PageflowElement part;
-
- /*
- * (non-Javadoc)
- *
- * @see Command#execute()
- */
- public void execute() {
- oldSize = new Dimension(part.getWidth(), part.getHeight());
- oldPos = new Point(part.getX(), part.getY());
- part.setX(newPos.x);
- part.setY(newPos.y);
- part.setHeight(newSize.height);
- part.setWidth(newSize.width);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see Command#redo()
- */
- public void redo() {
- part.setX(newPos.x);
- part.setY(newPos.y);
- part.setHeight(newSize.height);
- part.setWidth(newSize.width);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see Command#undo()
- */
- public void undo() {
- part.setX(oldPos.x);
- part.setY(oldPos.y);
- part.setHeight(oldSize.height);
- part.setWidth(oldSize.width);
- }
-
- /**
- * return the label of the constraints
- */
- public String getLabel() {
- if (oldSize.equals(newSize)) {
- return COMMAND_LABEL_LOCATION;
- }
- return COMMAND_LABEL_RESIZE;
- }
-
- /**
- * set the new location using rectangle
- *
- * @param r -
- * new location
- */
- public void setLocation(Rectangle r) {
- setLocation(r.getLocation());
- setSize(r.getSize());
- }
-
- /**
- * set the new location using point
- *
- * @param p -
- * new location point
- */
- public void setLocation(Point p) {
- newPos = p;
- }
-
- /**
- * set the pageflow element
- *
- * @param part -
- * pageflow element
- */
- public void setPart(PageflowElement part) {
- this.part = part;
- }
-
- /**
- * set the new size
- *
- * @param p -
- * new size
- */
- public void setSize(Dimension p) {
- newSize = p;
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/editpart/ConfigurableRootEditPart.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/editpart/ConfigurableRootEditPart.java
deleted file mode 100644
index 083c65e..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/editpart/ConfigurableRootEditPart.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow.editpart;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.SimpleLoweredBorder;
-import org.eclipse.gef.editparts.ScalableFreeformRootEditPart;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.Font;
-
-/**
- * This RootEditPart can set its own's background, fourground color, and font.
- * All this properties can be changed.
- *
- * @author Xiao-guang Zhang
- *
- */
-public class ConfigurableRootEditPart extends ScalableFreeformRootEditPart
- implements IFigurePreference {
- /**
- *
- */
- public ConfigurableRootEditPart() {
- super();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.gef.editparts.AbstractGraphicalEditPart#createFigure()
- */
- protected IFigure createFigure() {
- IFigure fig = super.createFigure();
- fig.setOpaque(true);
- fig.setBorder(new SimpleLoweredBorder());
- return fig;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see com.sybase.stf.jmt.editors.pageflow.editparts.IFigurePreference#setForegroundColor(org.eclipse.swt.graphics.Color)
- */
- public void setForegroundColor(Color c) {
- getFigure().setForegroundColor(c);
-
- }
-
- /*
- * (non-Javadoc)
- *
- * @see com.sybase.stf.jmt.editors.pageflow.editparts.IFigurePreference#setBackgroundColor(org.eclipse.swt.graphics.Color)
- */
- public void setBackgroundColor(Color c) {
- getFigure().setBackgroundColor(c);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see com.sybase.stf.jmt.editors.pageflow.editparts.IFigurePreference#setFont(org.eclipse.swt.graphics.Font)
- */
- public void setFont(Font f) {
- getFigure().setFont(f);
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/editpart/DirectEditCellEditorLocator.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/editpart/DirectEditCellEditorLocator.java
deleted file mode 100644
index 4c71c04..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/editpart/DirectEditCellEditorLocator.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow.editpart;
-
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.gef.tools.CellEditorLocator;
-import org.eclipse.jface.viewers.CellEditor;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.widgets.Text;
-
-/**
- * CellEditorLocator for Pageflow Node.
- *
- * @author - Xiaoguang Zhang
- */
-/*package*/ class DirectEditCellEditorLocator implements CellEditorLocator {
- /** the source label */
- private Label label;
-
- /**
- * Creates a new DirectEditCellEditorLocator for the given Label
- *
- * @param label
- * the Label
- */
- public DirectEditCellEditorLocator(Label label) {
- setLabel(label);
- }
-
- /*
- * (non-javadoc)
- *
- * @see CellEditorLocator#relocate(CellEditor)
- */
- public void relocate(CellEditor celleditor) {
- Text text = (Text) celleditor.getControl();
- Point pref = text.computeSize(-1, -1);
- // get the label's boundary
- Rectangle rect = label.getTextBounds().getCopy();
- label.translateToAbsolute(rect);
-
- // because the label can be empty and the size is too small
- // here get the prefered text size according to label's size and default
- // size.
- int width, height;
- if (pref.x > rect.width) {
- width = pref.x;
- } else {
- width = rect.width;
- }
-
- if (pref.y > rect.height) {
- height = pref.y;
- } else {
- height = rect.height;
- }
-
- // set the boundary of the text control
- text.setBounds(rect.x - 1, rect.y - 1, width + 1, height + 1);
- }
-
- /**
- * Returns the Label figure.
- *
- * @return the Label
- */
- protected Label getLabel() {
- return label;
- }
-
- /**
- * Sets the label.
- *
- * @param label
- * The label to set
- */
- protected void setLabel(Label label) {
- this.label = label;
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/editpart/IAnnotationEditPart.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/editpart/IAnnotationEditPart.java
deleted file mode 100644
index 2c29393..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/editpart/IAnnotationEditPart.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow.editpart;
-
-import org.eclipse.core.resources.IResource;
-import org.eclipse.jface.text.source.Annotation;
-
-/**
- * Edit part's Annotation interface
- *
- * @author Xiao-guang Zhang
- *
- */
-public interface IAnnotationEditPart {
- /**
- * decorate current Edit Part.
- * @param annotation
- */
- void addAnnotation(Annotation annotation);
-
- /**
- * un-decorate current EditPart
- *
- */
- void removeAnnotation();
-
- /**
- * get the maker's resource instance.
- *
- * @return marker resource
- */
- IResource getMarkerResource();
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/editpart/IConnectionPreference.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/editpart/IConnectionPreference.java
deleted file mode 100644
index 8ff1b9a..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/editpart/IConnectionPreference.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow.editpart;
-
-import org.eclipse.swt.graphics.Color;
-
-/**
- * This interface can be used to set Connection's preference
- *
- * @author Xiaoguang Zhang
- *
- */
-public interface IConnectionPreference extends IFigurePreference {
-
- /**
- * set the connection line width
- *
- * @param w
- */
- void setLineWidth(int w);
-
- /**
- * set the label visible or not
- *
- * @param b
- */
- void setLabelVisible(boolean b);
-
- /**
- * set the label's foreground color
- *
- * @param c
- */
- void setLabelForegroundColor(Color c);
-
- /**
- * set the label's background color
- *
- * @param c
- */
- void setLabelBackgroundColor(Color c);
-
- /**
- * set the connection router's style, it can be LINE_ROUTING_MANUAL,
- * LINE_ROUTING_MANHATTAN
- *
- * @param style -
- * The new connection router's style
- */
- void setConnectionRouterStyle(int style);
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/editpart/IFigurePreference.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/editpart/IFigurePreference.java
deleted file mode 100644
index 3dc924b..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/editpart/IFigurePreference.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow.editpart;
-
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.Font;
-
-/**
- * This interface can be implemented to set the figure's preferences
- *
- * @author Xiao-guang Zhang
- *
- */
-public interface IFigurePreference {
- /**
- * Sets the foreground color.
- *
- * @param c
- * The new foreground color
- */
- void setForegroundColor(Color c);
-
- /**
- * Sets the background color.
- *
- * @param c
- * The new background color
- */
- void setBackgroundColor(Color c);
-
- /**
- * sets the new font
- *
- * @param f
- */
- void setFont(Font f);
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/editpart/ILayerPanePreference.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/editpart/ILayerPanePreference.java
deleted file mode 100644
index 91d2af6..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/editpart/ILayerPanePreference.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow.editpart;
-
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.swt.graphics.Color;
-
-/**
- * LayerPane has muliple layers, this interface will be used to set different
- * layer's style.
- *
- * @author Xiao-guang Zhang
- *
- */
-public interface ILayerPanePreference extends IFigurePreference {
- /**
- * Use manual line router
- */
- public static int LINE_ROUTING_MANUAL = 0;
-
- /**
- * Use manhattan line router
- */
- public static int LINE_ROUTING_MANHATTAN = 1;
-
- /**
- * sets the grid to be shown or not
- *
- * @param bVisible
- */
- void setGridVisible(boolean bVisible);
-
- /**
- * sets the grid's dimension
- *
- * @param d
- * The new grid spacing
- */
- void setGridSpacing(Dimension d);
-
- /**
- * set the grid's foregoundColor
- *
- * @param c -
- * The new foreground color
- */
- void setGridForegroundColor(Color c);
-
- /**
- * set the connection router's style, it can be LINE_ROUTING_MANUAL,
- * LINE_ROUTING_MANHATTAN
- *
- * @param style -
- * The new connection router's style
- */
- void setConnectionRouterStyle(int style);
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/editpart/INodePreference.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/editpart/INodePreference.java
deleted file mode 100644
index 3a2a3f9..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/editpart/INodePreference.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow.editpart;
-
-
-/**
- * This interface can be used to set NodeEditPart's preference
- *
- * @author Xiaoguang Zhang
- *
- */
-
-public interface INodePreference extends IFigurePreference {
-
- /**
- * Sets the text placement of the label relative to its icon. The default is
- * {@link org.eclipse.draw2d.PositionConstants#EAST}. Other possible values are
- * {@link org.eclipse.draw2d.PositionConstants#NORTH}, {@link org.eclipse.draw2d.PositionConstants#SOUTH} and
- * {@link org.eclipse.draw2d.PositionConstants#WEST}.
- *
- * @param where
- * the text placement
- */
- void setTextPlacement(int where);
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/editpart/PFValidator.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/editpart/PFValidator.java
deleted file mode 100644
index 413a5a1..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/editpart/PFValidator.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow.editpart;
-
-/**
- * @author hmeng
- */
-
-public interface PFValidator {
- /**
- * Validate the current page flow
- */
- void validate();
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/editpart/PageflowContainerEditPart.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/editpart/PageflowContainerEditPart.java
deleted file mode 100644
index 83590a1..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/editpart/PageflowContainerEditPart.java
+++ /dev/null
@@ -1,108 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow.editpart;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.editpolicy.PageflowContainerEditPolicy;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.editpolicy.PageflowXYLayoutEditPolicy;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowElement;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.synchronization.PFBatchAdapter;
-import org.eclipse.ui.PlatformUI;
-
-/**
- * abstract class for pageflow container.
- */
-abstract class PageflowContainerEditPart extends PageflowElementEditPart {
-
- /**
- * @param element -
- * pageflow model.
- */
- public PageflowContainerEditPart(PageflowElement element) {
- super(element);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see AbstractGraphicalEditPart#createFigure()
- */
- protected IFigure createFigure() {
- return null;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see AbstractEditPart#createEditPolicies()
- */
- protected void createEditPolicies() {
- installEditPolicy(EditPolicy.CONTAINER_ROLE,
- new PageflowContainerEditPolicy());
- installEditPolicy(EditPolicy.LAYOUT_ROLE,
- new PageflowXYLayoutEditPolicy());
- }
-
- public Adapter createEMFAdapter() {
- return new PFBatchAdapter() {
- /*
- * (non-Javadoc)
- *
- * @see PageflowElementEditPart#notifyChanged(Notification)
- */
- public void doNotifyChanged(Notification notification) {
- int type = notification.getEventType();
-
- switch (type) {
- case Notification.ADD:
- case Notification.ADD_MANY:
- case Notification.REMOVE:
- case Notification.REMOVE_MANY:
- refreshChildrenOnUIThread();
- break;
- case Notification.SET:
- refreshVisualsOnUIThread();
- break;
- }
- super.notifyChanged(notification);
- }
- };
- }
-
- private void refreshChildrenOnUIThread() {
- if (Thread.currentThread() == PlatformUI.getWorkbench().getDisplay().getThread()) {
- refreshChildren();
- } else {
- PlatformUI.getWorkbench().getDisplay().asyncExec(new Runnable(){
- public void run() {
- refreshChildren();
- }
- });
- }
- }
-
- private void refreshVisualsOnUIThread() {
- if (Thread.currentThread() == PlatformUI.getWorkbench().getDisplay().getThread()) {
- refreshVisuals();
- } else {
- PlatformUI.getWorkbench().getDisplay().asyncExec(new Runnable(){
- public void run() {
- refreshVisuals();
- }
- });
- }
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/editpart/PageflowDirectEditManager.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/editpart/PageflowDirectEditManager.java
deleted file mode 100644
index 5fa56d1..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/editpart/PageflowDirectEditManager.java
+++ /dev/null
@@ -1,138 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow.editpart;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.gef.GraphicalEditPart;
-import org.eclipse.gef.tools.CellEditorLocator;
-import org.eclipse.gef.tools.DirectEditManager;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.VerifyEvent;
-import org.eclipse.swt.events.VerifyListener;
-import org.eclipse.swt.graphics.Font;
-import org.eclipse.swt.graphics.FontData;
-import org.eclipse.swt.graphics.GC;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.widgets.Text;
-
-/**
- * DirectEditManager for Pageflow node
- *
- * @author - Xiaoguang Zhang
- */
-/*package*/ final class PageflowDirectEditManager extends DirectEditManager {
- /** text font */
- private Font scaledFont;
-
- /** verify listener for the text control */
- private VerifyListener verifyListener;
-
- /** the direct editor's parent label. */
- private final Label label;
-
- /**
- * Creates a new PageflowDirectEditManager with the given attributes.
- *
- * @param source
- * the source EditPart
- * @param editorType
- * type of editor
- * @param locator
- * the CellEditorLocator
- * @param label
- */
- public PageflowDirectEditManager(GraphicalEditPart source,
- Class editorType, CellEditorLocator locator, Label label) {
- super(source, editorType, locator);
- this.label = label;
- }
-
- /*
- * (non-javadoc)
- *
- * @see org.eclipse.gef.tools.DirectEditManager#bringDown()
- */
- protected void bringDown() {
- // This method might be re-entered when super.bringDown() is called.
- Font disposeFont = scaledFont;
- scaledFont = null;
- super.bringDown();
- if (disposeFont != null && !disposeFont.isDisposed()) {
- disposeFont.dispose();
- }
- }
-
- /*
- * (non-javadoc)
- *
- * @see org.eclipse.gef.tools.DirectEditManager#initCellEditor()
- */
- protected void initCellEditor() {
- Text text = (Text) getCellEditor().getControl();
- verifyListener = new VerifyListener() {
- public void verifyText(VerifyEvent event) {
- Text text_ = (Text) getCellEditor().getControl();
- String oldText = text_.getText();
- // get the left string of the new input character
- String leftText = oldText.substring(0, event.start);
- // get the right string of the new input charactor
- String rightText = oldText.substring(event.end, oldText
- .length());
-
- GC gc = new GC(text_);
- Point size = gc.textExtent(leftText + event.text + rightText);
- gc.dispose();
- if (size.x != 0) {
- size = text_.computeSize(size.x, SWT.DEFAULT);
- }
- getCellEditor().getControl().setSize(size.x, size.y);
- }
- };
- text.addVerifyListener(verifyListener);
-
- // set the initial text, font, to the direct editor
- String initialLabelText = label.getText();
- getCellEditor().setValue(initialLabelText);
- IFigure figure = getEditPart().getFigure();
- final Font figureFont = figure.getFont();
- // take a copy of the font data for the label we are cell editing
- FontData data = figureFont.getFontData()[0];
- Dimension fontSize = new Dimension(0, data.getHeight());
- label.translateToAbsolute(fontSize);
- data.setHeight(fontSize.height);
-
- if (scaledFont != null && !scaledFont.isDisposed())
- {
- scaledFont.dispose();
- }
- scaledFont = new Font(figureFont.getDevice(), data);
-
- text.setFont(scaledFont);
- text.selectAll();
- }
-
- /*
- * (non-javadoc)
- *
- * @see org.eclipse.gef.tools.DirectEditManager#unhookListeners()
- */
- protected void unhookListeners() {
- super.unhookListeners();
- Text text = (Text) getCellEditor().getControl();
- text.removeVerifyListener(verifyListener);
- verifyListener = null;
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/editpart/PageflowEditPart.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/editpart/PageflowEditPart.java
deleted file mode 100644
index 3f3a80f..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/editpart/PageflowEditPart.java
+++ /dev/null
@@ -1,424 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow.editpart;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-
-import org.eclipse.draw2d.BendpointConnectionRouter;
-import org.eclipse.draw2d.ConnectionLayer;
-import org.eclipse.draw2d.FanRouter;
-import org.eclipse.draw2d.FreeformLayer;
-import org.eclipse.draw2d.FreeformLayout;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.ManhattanConnectionRouter;
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.TreeIterator;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gef.CompoundSnapToHelper;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.LayerConstants;
-import org.eclipse.gef.SnapToGeometry;
-import org.eclipse.gef.SnapToGrid;
-import org.eclipse.gef.SnapToGuides;
-import org.eclipse.gef.SnapToHelper;
-import org.eclipse.gef.editparts.AbstractEditPart;
-import org.eclipse.gef.editparts.GridLayer;
-import org.eclipse.gef.editpolicies.RootComponentEditPolicy;
-import org.eclipse.gef.editpolicies.SnapFeedbackPolicy;
-import org.eclipse.gef.rulers.RulerProvider;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.jface.text.source.Annotation;
-import org.eclipse.jst.jsf.facesconfig.ui.EditorPlugin;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.Pageflow;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.synchronization.FC2PFTransformer;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.synchronization.PFBatchAdapter;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.util.PageflowAnnotationUtil;
-import org.eclipse.jst.jsf.facesconfig.ui.preference.GEMPreferences;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.Font;
-import org.eclipse.ui.PlatformUI;
-
-/**
- * The container editr part for the whole pageflow, which uses the
- * WindowFigure(GEM) as the container figure.
- *
- */
-public class PageflowEditPart extends PageflowContainerEditPart implements
- LayerConstants, ILayerPanePreference {
- /** The seperation for the two possible coincided connections */
- private static final int CONNECTION_SEPERATION = 20;
-
- private int connectionStyle = -1;
-
- /**
- * Creates a new PageflowEditPart instance.
- *
- * @param pageflow -
- * pageflow model
- */
- protected PageflowEditPart(Pageflow pageflow) {
- super(pageflow);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see AbstractGraphicalEditPart#createFigure()
- */
- protected IFigure createFigure() {
- FreeformLayer layer = new FreeformLayer();
- // layer.setOpaque(true);
- layer.setLayoutManager(new FreeformLayout());
- return layer;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see AbstractEditPart#createEditPolicies()
- */
- protected void createEditPolicies() {
- super.createEditPolicies();
-
- installEditPolicy(EditPolicy.NODE_ROLE, null);
- installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, null);
- // installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, null);
- installEditPolicy(EditPolicy.COMPONENT_ROLE,
- new RootComponentEditPolicy());
- installEditPolicy("Snap Feedback", new SnapFeedbackPolicy()); //$NON-NLS-1$
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.core.runtime.IAdaptable#getAdapter(java.lang.Class)
- */
- public Object getAdapter(Class key) {
- if (key == SnapToHelper.class) {
- IPreferenceStore store = EditorPlugin.getDefault()
- .getPreferenceStore();
-
- List snapStrategies = new ArrayList();
- Boolean bRulerVisible = (Boolean) getViewer().getProperty(
- RulerProvider.PROPERTY_RULER_VISIBILITY);
- if (bRulerVisible != null && bRulerVisible.booleanValue()) {
- snapStrategies.add(new SnapToGuides(this));
- }
-
- boolean bSnapToGeometry = store
- .getBoolean(GEMPreferences.SNAP_TO_GEOMETRY);
- if (bSnapToGeometry) {
- snapStrategies.add(new SnapToGeometry(this));
- }
- boolean bSnapToGrid = store.getBoolean(GEMPreferences.SNAP_TO_GRID);
- if (bSnapToGrid) {
- snapStrategies.add(new SnapToGrid(this));
- }
-
- if (snapStrategies.size() == 0) {
- return null;
- }
- if (snapStrategies.size() == 1) {
- return snapStrategies.get(0);
- }
-
- SnapToHelper ss[] = new SnapToHelper[snapStrategies.size()];
- for (int i = 0; i < snapStrategies.size(); i++) {
- ss[i] = (SnapToHelper) snapStrategies.get(i);
- }
- return new CompoundSnapToHelper(ss);
- }
- return super.getAdapter(key);
- }
-
- /**
- * Returns the Pageflow.
- *
- * @return the pageflow
- */
- public Pageflow getPageflow() {
- return (Pageflow) getPageflowElement();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see AbstractEditPart#getModelChildren()
- */
- protected List getModelChildren() {
- List allChildren = new LinkedList();
- Iterator it;
-
- it = getPageflow().getNodes().iterator();
- while (it.hasNext()) {
- allChildren.add(it.next());
- }
-
- return allChildren;
- }
-
- public Adapter createEMFAdapter() {
- return new PFBatchAdapter() {
- /*
- * (non-Javadoc)
- *
- * @see Adapter#notifyChanged(Notification)
- */
- public void doNotifyChanged(Notification notification) {
- int type = notification.getEventType();
-
- // int featureId = notification.getFeatureID(
- // PageflowPackage.class );
- switch (type) {
- case Notification.ADD:
- case Notification.ADD_MANY:
- case Notification.REMOVE:
- case Notification.REMOVE_MANY:
- if (Thread.currentThread() == PlatformUI.getWorkbench().getDisplay().getThread()) {
- refreshChildren();
- }
- else {
- PlatformUI.getWorkbench().getDisplay().asyncExec(new Runnable() {
-
- public void run() {
- refreshChildren();
- }
-
- });
- }
- break;
-
- case Notification.SET:
- if (Thread.currentThread() == PlatformUI.getWorkbench().getDisplay().getThread()) {
- refreshChildren();
- refreshVisuals();
- }
- else {
- PlatformUI.getWorkbench().getDisplay().asyncExec(new Runnable() {
-
- public void run() {
- refreshChildren();
- refreshVisuals();
- }
-
- });
- }
- break;
- case FC2PFTransformer.MY_NOTIFICATION_TYPE1:
- restore((Pageflow) getModel());
- if (Thread.currentThread() == PlatformUI.getWorkbench().getDisplay().getThread()) {
- refreshChildren();
- refreshVisuals();
- }
- else {
- PlatformUI.getWorkbench().getDisplay().asyncExec(new Runnable() {
-
- public void run() {
- refreshChildren();
- refreshVisuals();
- }
-
- });
- }
- break;
- // restore all children
- case FC2PFTransformer.MY_NOTIFICATION_TYPE:
- // stop all children
- postPone((Pageflow) getModel());
- break;
- }
- }
-
- protected void restore(Pageflow pageflow) {
- TreeIterator nodes;
- // restore
- nodes = pageflow.eAllContents();
- while (nodes.hasNext()) {
- setPostpone((EObject) nodes.next(), false);
- }
- setPostpone(pageflow, false);
- }
-
- void setPostpone(EObject node, boolean enable) {
- List adapters = node.eAdapters();
- for (int i = 0; i < adapters.size(); i++) {
- if (adapters.get(i) instanceof PFBatchAdapter) {
- ((PFBatchAdapter) adapters.get(i))
- .setNeedPostpone(enable);
- }
- }
- }
-
- protected void postPone(Pageflow pageflow) {
- TreeIterator nodes;
- // postpone
- nodes = pageflow.eAllContents();
- while (nodes.hasNext()) {
- setPostpone((EObject) nodes.next(), true);
- }
- setPostpone(pageflow, true);
- }
-
- };
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.gef.editparts.AbstractEditPart#refreshVisuals()
- */
- protected void refreshVisuals() {
- super.refreshVisuals();
- for (int i = 0; i < this.getChildren().size(); i++) {
- ((AbstractEditPart) getChildren().get(i)).refresh();
- }
- ConnectionLayer cLayer = (ConnectionLayer) getLayer(CONNECTION_LAYER);
-
- if (cLayer.getConnectionRouter() == null) {
- setConnectionRouterStyle(getConnectionRouterStyle());
- }
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.gef.editparts.AbstractEditPart#refreshChildren()
- */
- protected void refreshChildren() {
- super.refreshChildren();
- PageflowAnnotationUtil.validatePageflow(this);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see com.sybase.stf.jmt.editors.pageflow.editparts.IFigurePreference#setFont(org.eclipse.swt.graphics.Font)
- */
- public void setFont(Font f) {
- getFigure().setFont(f);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see com.sybase.stf.jmt.editors.pageflow.editparts.ILayerPanePreference#setConnectionRouterStyle(int)
- */
- public void setConnectionRouterStyle(int style) {
- //TODO does this need to be execed on UI thread only???
- connectionStyle = style;
- ConnectionLayer cLayer = (ConnectionLayer) getLayer(CONNECTION_LAYER);
- if (style == ILayerPanePreference.LINE_ROUTING_MANHATTAN) {
- FanRouter router = new FanRouter();
- router.setSeparation(CONNECTION_SEPERATION);
- router.setNextRouter(new ManhattanConnectionRouter());
- cLayer.setConnectionRouter(router);
- } else if (style == ILayerPanePreference.LINE_ROUTING_MANUAL) {
- FanRouter router = new FanRouter();
- router.setSeparation(CONNECTION_SEPERATION);
- router.setNextRouter(new BendpointConnectionRouter());
- cLayer.setConnectionRouter(router);
- }
- }
-
- /**
- * get the foreground color from preference
- * @return the router style value
- *
- */
- public int getConnectionRouterStyle() {
- if (this.connectionStyle == -1) {
- IPreferenceStore store = EditorPlugin.getDefault()
- .getPreferenceStore();
- String connectionStyle_ = store
- .getString(GEMPreferences.LINE_ROUTING);
-
- if (GEMPreferences.LINE_ROUTING_MANHATTAN.equals(connectionStyle_)) {
- this.connectionStyle = ILayerPanePreference.LINE_ROUTING_MANHATTAN;
- } else {
- this.connectionStyle = ILayerPanePreference.LINE_ROUTING_MANUAL;
- }
- }
- return this.connectionStyle;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see com.sybase.stf.jmt.editors.pageflow.editparts.IFigurePreference#setForegroundColor(org.eclipse.swt.graphics.Color)
- */
- public void setForegroundColor(Color c) {
- getFigure().setForegroundColor(c);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see com.sybase.stf.jmt.editors.pageflow.editparts.IFigurePreference#setBackgroundColor(org.eclipse.swt.graphics.Color)
- */
- public void setBackgroundColor(Color c) {
- // getLayer(PRIMARY_LAYER).setOpaque(true);
- getLayer(PRIMARY_LAYER).setBackgroundColor(c);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see com.sybase.stf.jmt.editors.pageflow.editparts.IFigurePreference#setGridVisible(boolean)
- */
- public void setGridVisible(boolean bVisible) {
- GridLayer gl = (GridLayer) getLayer(GRID_LAYER);
- gl.setVisible(bVisible);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see com.sybase.stf.jmt.editors.pageflow.editparts.IFigurePreference#setGridSpacing(org.eclipse.draw2d.geometry.Dimension)
- */
- public void setGridSpacing(Dimension d) {
- GridLayer gl = (GridLayer) getLayer(GRID_LAYER);
- gl.setSpacing(d);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see com.sybase.stf.jmt.editors.pageflow.editparts.ILayerPanePreference#setGridForegroundColor(org.eclipse.swt.graphics.Color)
- */
- public void setGridForegroundColor(Color c) {
- GridLayer gl = (GridLayer) getLayer(GRID_LAYER);
- gl.setForegroundColor(c);
- }
-
- protected void performDirectEdit() {
- // do nothing
- }
-
- protected void performOpen() {
- // do nothing
- }
-
- public void addAnnotation(Annotation annotation) {
- // do nothing
-
- }
-
- public void removeAnnotation() {
- // do nothing
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/editpart/PageflowEditPartsFactory.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/editpart/PageflowEditPartsFactory.java
deleted file mode 100644
index fe57235..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/editpart/PageflowEditPartsFactory.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow.editpart;
-
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPartFactory;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowLink;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.Pageflow;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowNode;
-
-/**
- *
- * Edit part factory to create different pageflow elements.
- *
- *
- */
-public class PageflowEditPartsFactory implements EditPartFactory {
- /*
- * (non-Javadoc)
- *
- * @see EditPartFactory#createEditPart(EditPart, Object)
- */
- public EditPart createEditPart(EditPart context, Object obj) {
- if (obj instanceof Pageflow) {
- return new PageflowEditPart((Pageflow) obj);
- } else if (obj instanceof PageflowNode) {
- return new PageflowNodeEditPart((PageflowNode) obj);
- } else if (obj instanceof PageflowLink) {
- return new PageflowLinkEditPart((PageflowLink) obj);
- }
- return null;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/editpart/PageflowElementEditPart.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/editpart/PageflowElementEditPart.java
deleted file mode 100644
index b897c5e..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/editpart/PageflowElementEditPart.java
+++ /dev/null
@@ -1,362 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow.editpart;
-
-import org.eclipse.core.resources.IResource;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gef.GraphicalEditPart;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.RequestConstants;
-import org.eclipse.gef.editparts.AbstractGraphicalEditPart;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.text.source.Annotation;
-import org.eclipse.jst.jsf.facesconfig.ui.EditorPlugin;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.figure.PageflowNodeFigure;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.Pageflow;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowElement;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowPackage;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowPage;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.properties.PageflowElementPropertySource;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.synchronization.PFBatchAdapter;
-import org.eclipse.jst.jsf.facesconfig.ui.util.WebrootUtil;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.views.properties.IPropertySource;
-
-/**
- *
- *
- * <code>PageflowElementEditPart</code> is the base class for all the
- * EditParts in the application, whose model is a subclass of PageflowElement.
- * This class maintains the figure's size and location inresponse to changes in
- * the model, and registers as a listener on its model using the
- * <code>org.eclipse.emf.common.notify.Adapter</code> interface
- */
-public abstract class PageflowElementEditPart extends AbstractGraphicalEditPart
- implements IAnnotationEditPart {
- /** image description for different edit part */
- public static final ImageDescriptor IMG_ACTION = EditorPlugin.getDefault()
- .getImageDescriptor("facesconfig/Pageflow_Action16.gif"); //$NON-NLS-1$
-
- private Adapter adapter;
-
- /**
- * @return the emf adapter
- */
- public Adapter createEMFAdapter() {
- return new PFBatchAdapter() {
- /*
- * (non-Javadoc)
- *
- * @see AbstractGraphicalEditPart#notifyChanged()
- */
- public void doNotifyChanged(Notification notification) {
- int type = notification.getEventType();
- int featureId = notification
- .getFeatureID(PageflowPackage.class);
- if (type == Notification.SET) {
- switch (featureId) {
- case PageflowPackage.PAGEFLOW_ELEMENT__X:
- case PageflowPackage.PAGEFLOW_ELEMENT__Y:
- case PageflowPackage.PAGEFLOW_ELEMENT__WIDTH:
- case PageflowPackage.PAGEFLOW_ELEMENT__HEIGHT:
- refreshVisuals();
- break;
- }
- }
- }
- };
- }
-
- private static final ImageDescriptor IMG_PAGE = EditorPlugin.getDefault()
- .getImageDescriptor("facesconfig/Pageflow_Page.gif"); //$NON-NLS-1$
-
- private static final ImageDescriptor IMG_NODE = EditorPlugin.getDefault()
- .getImageDescriptor("facesconfig/FacesConfig_Pageflow16.gif"); //$NON-NLS-1$
-
- /** property source of the pageflow element */
- private IPropertySource propertySource = null;
-
- private Image image = null;
-
- /**
- * @param element
- */
- protected PageflowElementEditPart(PageflowElement element) {
- setModel(element);
- }
-
- /**
- * Returns the image for the pageflow element.
- *
- * @param element -
- * pageflow element
- * @return - the image for the pageflow element.
- */
- public Image getImage(PageflowElement element) {
- if (image == null) {
- ImageDescriptor imageDescriptor = null;
-
- if (element instanceof PageflowPage) {
- imageDescriptor = IMG_PAGE;
- } else {
- imageDescriptor = IMG_NODE;
- }
-
- image = EditorPlugin.getDefault().getImageRegistry().get(
- imageDescriptor.toString());
- if (null == image) {
- EditorPlugin.getDefault().getImageRegistry().put(
- imageDescriptor.toString(), imageDescriptor);
- image = EditorPlugin.getDefault().getImageRegistry().get(
- imageDescriptor.toString());
- }
- }
-
- return image;
- }
-
- /**
- * get the type name of the pageflow element
- *
- * @param element -
- * pageflow element
- * @return - the type name of the pageflow element
- */
- public static String getTypeName(PageflowElement element) {
- if (element instanceof Pageflow) {
- return "Pageflow"; //$NON-NLS-1$
- } else if (element instanceof PageflowPage) {
- return "Page"; //$NON-NLS-1$
- }
-
- return "[unknown]"; //$NON-NLS-1$
- }
-
- /*
- * (non-Javadoc)
- *
- * @see AbstractGraphicalEditPart#activate()
- */
- public void activate() {
- if (isActive()) {
- return;
- }
-
- // start listening for changes in the model
- hookIntoPageflowElement(getPageflowElement());
-
- super.activate();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see AbstractGraphicalEditPart#deactivate()
- */
- public void deactivate() {
- if (!isActive()) {
- return;
- }
-
- // stop listening for changes in the model
- unhookFromPageflowElement(getPageflowElement());
-
- super.deactivate();
- }
-
- /**
- * Returns the model as pageflow element.
- *
- * @return - pageflow element
- */
- public PageflowElement getPageflowElement() {
- return (PageflowElement) getModel();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see AbstractEditPart#refreshVisuals()
- */
- protected void refreshVisuals() {
- if (getParent() != null) {
- final AbstractGraphicalEditPart part = this;
- //ensure that this is executed on the UI thread
- if (Thread.currentThread() == PlatformUI.getWorkbench().getDisplay().getThread()) {
- refreshVisuals(part);
- } else {
- PlatformUI.getWorkbench().getDisplay().asyncExec(new Runnable(){
-
- public void run() {
- refreshVisuals(part);
- }
- });
- }
- }
- }
-
- private void refreshVisuals(AbstractGraphicalEditPart part) {
- Point loc = new Point(getPageflowElement().getX(),
- getPageflowElement().getY());
- Dimension size = new Dimension(getPageflowElement().getWidth(),
- getPageflowElement().getHeight());
- Rectangle r = new Rectangle(loc, size);
-
- ((GraphicalEditPart) getParent()).setLayoutConstraint(part,
- getFigure(), r);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see IAdaptable#getAdapter(Class)
- */
- public Object getAdapter(Class key) {
- /*
- * override the default behavior defined in AbstractEditPart which would
- * expect the model to be a property sourced. instead the editpart can
- * provide a property source
- */
- if (key == IPropertySource.class) {
- return getPropertySource();
- }
- if (key == Adapter.class) {
- if (adapter == null) {
- adapter = createEMFAdapter();
- }
- return adapter;
- }
- return super.getAdapter(key);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see PageflowElementEditPart#getPropertySource()
- */
- private IPropertySource getPropertySource() {
- if (propertySource == null) {
- propertySource = new PageflowElementPropertySource(
- getPageflowElement());
- }
- return propertySource;
- }
-
- /**
- * Registers this edit part as a listener for change notifications to the
- * specified pageflow element.
- *
- * @param element
- * the pagelfow element that should be observed for change
- * notifications
- */
- protected void hookIntoPageflowElement(PageflowElement element) {
- if (null != element) {
- if (!element.eAdapters().contains(getAdapter(Adapter.class))) {
- element.eAdapters().add((Adapter) getAdapter(Adapter.class));
- }
- }
- }
-
- /**
- * Removes this edit part from the specified pageflow element. Thus, it will
- * no longe receive change notifications.
- *
- * @param element
- * the pagelfow element that should not be observed any more
- */
- protected void unhookFromPageflowElement(PageflowElement element) {
- if (null != element) {
- element.eAdapters().remove(getAdapter(Adapter.class));
- }
- }
-
- /*
- * (non-Javadoc)
- *
- * @see AbstractGraphicalEditPart#createFigure()
- */
- protected IFigure createFigure() {
- IFigure figure_ = null;
- figure_ = new PageflowNodeFigure();
- PageflowElement elm = getPageflowElement();
- if (elm.getName() != null) {
- ((PageflowNodeFigure) figure_).setImageText(getImage(elm), elm
- .getName());
- } else {
- ((PageflowNodeFigure) figure_).setImageText(getImage(elm),
- getTypeName(elm));
- }
- ((PageflowNodeFigure) figure_).update();
- return figure_;
- }
-
- /**
- * perform corresponding request related with double click or direct edit
- * click.
- *
- * @param request :
- * request composed by mouse click.
- */
- public void performRequest(Request request) {
- // the request is triggered by double clicked on a edit part
- if (request.getType() == RequestConstants.REQ_OPEN) {
- performOpen();
- } else if (request.getType() == RequestConstants.REQ_DIRECT_EDIT) {
- performDirectEdit();
- }
- }
-
- /**
- * perfrom direct edit request
- *
- */
- protected abstract void performDirectEdit();
-
- /**
- * perform double click request
- *
- */
- protected abstract void performOpen();
-
- /*
- * (non-Javadoc)
- *
- * @see com.sybase.stf.jmt.editors.pageflow.editparts.IEditPartDecorator#decorateEditPart()
- */
- public abstract void addAnnotation(Annotation annotation);
-
- /*
- * (non-Javadoc)
- *
- * @see com.sybase.stf.jmt.editors.pageflow.editparts.IEditPartDecorator#undecorateEditPart()
- */
- public abstract void removeAnnotation();
-
- /*
- * (non-Javadoc)
- *
- * @see com.sybase.stf.jmt.editors.pageflow.marker.IEditPartMarker#getMarkerResource()
- */
- public IResource getMarkerResource() {
- IResource resource = WebrootUtil.getResource((EObject) getModel());
- return resource;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/editpart/PageflowElementTreeEditPart.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/editpart/PageflowElementTreeEditPart.java
deleted file mode 100644
index 9336e11..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/editpart/PageflowElementTreeEditPart.java
+++ /dev/null
@@ -1,257 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow.editpart;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.gef.editparts.AbstractTreeEditPart;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jst.jsf.facesconfig.ui.EditorPlugin;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowElement;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowPage;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.properties.PageflowElementPropertySource;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.views.properties.IPropertySource;
-
-/**
- * This is the abstract base <code>TreeEditPart</code> for pageflow elements.
- */
-public class PageflowElementTreeEditPart extends AbstractTreeEditPart implements
- Adapter {
- /** Image descriptor of tree item for the different edit parts */
- private static final ImageDescriptor IMG_PAGE = EditorPlugin.getDefault()
- .getImageDescriptor("facesconfig/Pageflow_Page16.gif"); //$NON-NLS-1$
-
- private static final ImageDescriptor IMG_NODE = EditorPlugin.getDefault()
- .getImageDescriptor("facesconfig/FacesConfig_Pageflow16.gif"); //$NON-NLS-1$
-
- /** Property resource for shared property view */
- private IPropertySource propertySource = null;
-
- /** notifer to pageflow element */
- private Notifier target = null;
-
- /**
- * Returns the image for the pageflow element.
- *
- * @param element -
- * pageflow element, such as Begin, End, Page, and Action.
- * @return - the image for the pageflow element
- */
- public static Image getImage(PageflowElement element) {
- ImageDescriptor imageDescriptor = null;
-
- if (element instanceof PageflowPage) {
- imageDescriptor = IMG_PAGE;
- } else {
- imageDescriptor = IMG_NODE;
- }
-
- if (null == imageDescriptor) {
- return null;
- }
-
- Image image = EditorPlugin.getDefault().getImageRegistry().get(
- imageDescriptor.toString());
- if (null == image) {
- EditorPlugin.getDefault().getImageRegistry().put(
- imageDescriptor.toString(), imageDescriptor);
- image = EditorPlugin.getDefault().getImageRegistry().get(
- imageDescriptor.toString());
- }
-
- return image;
- }
-
- /**
- * Creates a new PageflowElementTreeEditPart instance.
- *
- * @param pageflowElement -
- * create a new edit part according to the pageflow model
- */
- public PageflowElementTreeEditPart(PageflowElement pageflowElement) {
- super(pageflowElement);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see IAdaptable#getAdapter(Class)
- */
- public Object getAdapter(Class key) {
- /*
- * override the default behavior defined in AbstractEditPart which would
- * expect the model to be a property sourced. instead the editpart can
- * provide a property source
- */
- if (key == IPropertySource.class) {
- return getPropertySource();
- }
- return super.getAdapter(key);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see AbstractTreeEditPart#getImage()
- */
- protected Image getImage() {
- return getImage(getPageflowElement());
- }
-
- /*
- * (non-Javadoc)
- *
- * @see PageflowElementEditPart#getPropertySource()
- */
- private IPropertySource getPropertySource() {
- if (propertySource == null) {
- propertySource = new PageflowElementPropertySource(
- getPageflowElement());
- }
- return propertySource;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see Adapter#getTarget()
- */
- public Notifier getTarget() {
- return target;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see AbstractTreeEditPart#getText()
- */
- protected String getText() {
- return (null != getPageflowElement().getName() ? getPageflowElement()
- .getName() : "[unnamed]"); //$NON-NLS-1$
- }
-
- /**
- * Returns the model as <code>PageflowElement</code>.
- *
- * @return - the model as <code>PageflowElement</code>
- */
- public PageflowElement getPageflowElement() {
- return (PageflowElement) getModel();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see Adapter#isAdapterForType(Object)
- */
- public boolean isAdapterForType(Object type) {
- return type.equals(getModel().getClass());
- }
-
- /*
- * (non-Javadoc)
- *
- * @see Adapter#notifyChanged(Notification)
- */
- public void notifyChanged(Notification notification) {
- int type = notification.getEventType();
-
- switch (type) {
- case Notification.ADD:
- case Notification.ADD_MANY:
- case Notification.REMOVE:
- case Notification.REMOVE_MANY:
- case Notification.SET:
- if (Thread.currentThread() == PlatformUI.getWorkbench().getDisplay().getThread()) {
- refreshVisuals();
- } else {
- PlatformUI.getWorkbench().getDisplay().asyncExec(new Runnable(){
- public void run() {
- refreshVisuals();
- }
- });
- }
- break;
- }
- }
-
- /*
- * (non-Javadoc)
- *
- * @see Adapter#setTarget(Notifier)
- */
- public void setTarget(Notifier newTarget) {
- target = newTarget;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see AbstractGraphicalEditPart#activate()
- */
- public void activate() {
- if (isActive())
- return;
-
- // start listening for changes in the model
- hookIntoPageflowElement(getPageflowElement());
-
- super.activate();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see AbstractGraphicalEditPart#deactivate()
- */
- public void deactivate() {
- if (!isActive())
- return;
-
- // stop listening for changes in the model
- unhookFromPageflowElement(getPageflowElement());
-
- super.deactivate();
- }
-
- /**
- * Registers this edit part as a listener for change notifications to the
- * specified pageflow element.
- *
- * @param element -
- * the pagelfow element that should be observed for change
- * notifications
- */
- protected void hookIntoPageflowElement(PageflowElement element) {
- if (null != element) {
- element.eAdapters().add(this);
- }
- }
-
- /**
- * Removes this edit part from the specified pageflow element. Thus, it will
- * no longe receive change notifications.
- *
- * @param element
- * -the pagelfow element that should not be observed
- */
- protected void unhookFromPageflowElement(PageflowElement element) {
- if (null != element) {
- element.eAdapters().remove(this);
- }
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/editpart/PageflowLinkEditPart.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/editpart/PageflowLinkEditPart.java
deleted file mode 100644
index f1bc513..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/editpart/PageflowLinkEditPart.java
+++ /dev/null
@@ -1,491 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow.editpart;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.resources.IResource;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.RelativeBendpoint;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.editparts.AbstractConnectionEditPart;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.text.source.Annotation;
-import org.eclipse.jst.jsf.facesconfig.ui.EditorPlugin;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.PageflowMessages;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.editpolicy.PFLinkBendpointEditPolicy;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.editpolicy.PFLinkEditPolicy;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.editpolicy.PFLinkEndpointEditPolicy;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.figure.PFLinkFigure;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowLink;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowLinkBendpoint;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowPackage;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.properties.PageflowLinkPropertySource;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.synchronization.PFBatchAdapter;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.util.PageflowAnnotationUtil;
-import org.eclipse.jst.jsf.facesconfig.ui.preference.GEMPreferences;
-import org.eclipse.jst.jsf.facesconfig.ui.util.WebrootUtil;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.Font;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.views.properties.IPropertySource;
-
-/**
- * <code>PFLinkEditPart</code> is the EditPart for PFLink model elements. The
- * figure for this EditPart is simply a PolylineConnection. Because both
- * AbstractConnectionEditPart and the Adapter interface have a getTarget method,
- * we use an inner class to implement the Adapter interface in order to work
- * around the name collision.
- *
- *
- */
-public class PageflowLinkEditPart extends AbstractConnectionEditPart implements
- IConnectionPreference, IAnnotationEditPart, PFValidator {
- private static final String PAGEFLOW_ERROR_IMAGE_FILE = "facesconfig/Pageflow_Quickfix_Error.gif"; //$NON-NLS-1$
-
- /** adapter for notification */
- private PFLinkAdapter adapter = new PFLinkAdapter();
-
- /** property source of the pflink */
- private IPropertySource propertySource = null;
-
- /** image description for different edit part */
- public static final ImageDescriptor IMG_WARNING = EditorPlugin.getDefault()
- .getImageDescriptor(PAGEFLOW_ERROR_IMAGE_FILE);
-
- private int connectionStyle = -1;
-
- private PFLinkBendpointEditPolicy bendpointEditPolicy;
-
- /**
- * @param element
- */
- public PageflowLinkEditPart(PageflowLink element) {
- super();
- // element.getPageflow()
- setModel(element);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see AbstractGraphicalEditPart#createFigure()
- */
- protected IFigure createFigure() {
- IFigure figure_ = new PFLinkFigure();
- return figure_;
-
- }
-
- /*
- * (non-Javadoc)
- *
- * @see AbstractEditPart#createEditPolicies()
- */
- protected void createEditPolicies() {
- installEditPolicy(EditPolicy.CONNECTION_ENDPOINTS_ROLE,
- new PFLinkEndpointEditPolicy());
-
- if (getConnectionRouterStyle() == ILayerPanePreference.LINE_ROUTING_MANUAL) {
- installEditPolicy(EditPolicy.CONNECTION_BENDPOINTS_ROLE,
- getBendpointEditPolicy());
- }
- //PFLinkEditPolicy policy = new PFLinkEditPolicy();
- // policy.setSseModel(model);
- installEditPolicy(EditPolicy.CONNECTION_ROLE, new PFLinkEditPolicy());
-
- }
-
- private PFLinkBendpointEditPolicy getBendpointEditPolicy() {
- if (bendpointEditPolicy == null) {
- bendpointEditPolicy = new PFLinkBendpointEditPolicy();
- }
- return bendpointEditPolicy;
- }
-
- private PageflowLink getPFLink() {
- return (PageflowLink) getModel();
- }
-
- private class PFLinkAdapter extends PFBatchAdapter {
- private Notifier _newTarget = null;
-
- // private IPropertySource _propertySource = null;
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.emf.common.notify.Adapter#getTarget()
- */
- public Notifier getTarget() {
- return _newTarget;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.emf.common.notify.Adapter#isAdapterForType(java.lang.Object)
- */
- public boolean isAdapterForType(Object type) {
- return getModel().getClass() == type;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.emf.common.notify.Adapter#notifyChanged(org.eclipse.emf.common.notify.Notification)
- */
- public void doNotifyChanged(Notification notification) {
- int type = notification.getEventType();
- int featureId = notification.getFeatureID(PageflowPackage.class);
- // FC2PFTransformer.getInstance().NotifyChanged(notification,
- // getPFLink());
- switch (type) {
- case Notification.ADD:
- case Notification.ADD_MANY:
- case Notification.REMOVE:
- case Notification.SET:
- if (featureId == PageflowPackage.PF_LINK__OUTCOME
- || featureId == PageflowPackage.PF_LINK__SOURCE
- || featureId == PageflowPackage.PF_LINK__TARGET) {
- PageflowAnnotationUtil
- .validateLink(PageflowLinkEditPart.this);
- }
-
- refreshVisualsOnUIThread();
- break;
- }
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.emf.common.notify.Adapter#setTarget(org.eclipse.emf.common.notify.Notifier)
- */
- public void setTarget(Notifier newTarget) {
- this._newTarget = newTarget;
- }
-
- }
-
- /*
- * (non-Javadoc)
- *
- * @see EditPart#activate()
- */
- public void activate() {
- getPFLink().eAdapters().add(adapter);
- //PageflowLink element = (PageflowLink) getModel();
- super.activate();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see EditPart#deactivate()
- */
- public void deactivate() {
- // getPFLink().eAdapters().remove(adapter);
- // PageflowLink element = (PageflowLink) getModel();
- // NavigationCaseType navCase = ((NavigationCaseType) element
- // .getFCElements().getData().get(0));
- // navCase.eAdapters().remove(fcAdapter);
- // TreeIterator iterator = navCase.eAllContents();
- // while (iterator.hasNext()) {
- // ((EObject) iterator.next()).eAdapters().remove(fcAdapter);
- // }
-
- super.deactivate();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see IAdaptable#getAdapter(java.lang.Class)
- */
- public Object getAdapter(Class key) {
- /*
- * override the default behavior defined in AbstractEditPart which would
- * expect the model to be a property sourced. instead the editpart can
- * provide a property source
- */
- if (key == IPropertySource.class) {
- return getPropertySource();
- }
- return super.getAdapter(key);
- }
-
- private IPropertySource getPropertySource() {
- if (propertySource == null) {
- propertySource = new PageflowLinkPropertySource(getPFLink());
- }
- return propertySource;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see AbstractEditPart#refreshVisuals()
- */
- protected void refreshVisuals() {
- super.refreshVisuals();
- resetLabel();
- if (getConnectionRouterStyle() == ILayerPanePreference.LINE_ROUTING_MANUAL) {
- refreshBendpoints();
- }
- }
-
- private void refreshVisualsOnUIThread() {
- if (Thread.currentThread() == PlatformUI.getWorkbench().getDisplay().getThread()) {
- refreshVisuals();
- } else {
- PlatformUI.getWorkbench().getDisplay().asyncExec(new Runnable(){
- public void run() {
- refreshVisuals();
- }
- });
- }
- }
-
- /**
- * set the bendpoint constraints of the pflink connection
- *
- */
- protected void refreshBendpoints() {
- // bendpoints stored in pflink
- List modelConstraint = getPFLink().getBendPoints();
- // bendpoint constraint list
- List figureConstraint = new ArrayList();
- for (int i = 0; i < modelConstraint.size(); i++) {
- PageflowLinkBendpoint wbp = (PageflowLinkBendpoint) modelConstraint
- .get(i);
- RelativeBendpoint rbp = new RelativeBendpoint(getConnectionFigure());
- rbp.setRelativeDimensions(wbp.getFirstRelativeDimension(), wbp
- .getSecondRelativeDimension());
- rbp.setWeight((i + 1) / ((float) modelConstraint.size() + 1));
- figureConstraint.add(rbp);
- }
- // set the router constaints.
- getConnectionFigure().setRoutingConstraint(figureConstraint);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see com.sybase.stf.jmt.editors.pageflow.editparts.IConnectionPreference#setLineWidth(int)
- */
- public void setLineWidth(int w) {
- ((PFLinkFigure) getFigure()).setLineWidth(w);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see com.sybase.stf.jmt.editors.pageflow.editparts.IConnectionPreference#setLabelVisible(boolean)
- */
- public void setLabelVisible(boolean b) {
- ((PFLinkFigure) getFigure()).setLabelVisible(b);
-
- }
-
- /*
- * (non-Javadoc)
- *
- * @see com.sybase.stf.jmt.editors.pageflow.editparts.IFigurePreference#setForegroundColor(org.eclipse.swt.graphics.Color)
- */
- public void setForegroundColor(Color c) {
- ((PFLinkFigure) getFigure()).setForegroundColor(c);
-
- }
-
- /*
- * (non-Javadoc)
- *
- * @see com.sybase.stf.jmt.editors.pageflow.editparts.IFigurePreference#setBackgroundColor(org.eclipse.swt.graphics.Color)
- */
- public void setBackgroundColor(Color c) {
- ((PFLinkFigure) getFigure()).setBackgroundColor(c);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see com.sybase.stf.jmt.editors.pageflow.editparts.IFigurePreference#setFont(org.eclipse.swt.graphics.Font)
- */
- public void setFont(Font f) {
- ((PFLinkFigure) getFigure()).setFont(f);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see com.sybase.stf.jmt.editors.pageflow.editparts.IConnectionPreference#setLabelForeground(org.eclipse.swt.graphics.Color)
- */
- public void setLabelForegroundColor(Color c) {
- ((PFLinkFigure) getFigure()).setLabelForegroundColor(c);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see com.sybase.stf.jmt.editors.pageflow.editparts.IConnectionPreference#setLabelBackground(org.eclipse.swt.graphics.Color)
- */
- public void setLabelBackgroundColor(Color c) {
- ((PFLinkFigure) getFigure()).setLabelBackgroundColor(c);
- }
-
- private boolean needDrawingLabel() {
- return (((PageflowLink) getModel()).getOutcome() != null && ((PageflowLink) getModel())
- .getOutcome().trim().length() > 0);
- }
-
- private boolean needDrawingAction() {
- return (((PageflowLink) getModel()).getFromaction() != null && ((PageflowLink) getModel())
- .getFromaction().trim().length() > 0);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see com.sybase.stf.jmt.editors.pageflow.editparts.IEditPartDecorator#decorateEditPart()
- */
- public void addAnnotation(final Annotation annotation) {
- getViewer().getControl().getDisplay().asyncExec(new Runnable() {
- public void run() {
- ((PFLinkFigure) getFigure()).setImage(getImage(IMG_WARNING));
- ((PFLinkFigure) getFigure()).setToolTipText(annotation
- .getText());
- }
- });
- }
-
- /*
- * (non-Javadoc)
- *
- * @see com.sybase.stf.jmt.editors.pageflow.editparts.IEditPartDecorator#undecorateEditPart()
- */
- public void removeAnnotation() {
- if (Thread.currentThread() == getViewer().getControl().getDisplay().getThread()) {
- ((PFLinkFigure) getFigure()).clearIcon();
- resetLabel();
- } else {
- getViewer().getControl().getDisplay().asyncExec(new Runnable() {
- public void run() {
- ((PFLinkFigure) getFigure()).clearIcon();
- resetLabel();
- }
- });
- }
- }
-
- private void resetLabel() {
- StringBuffer tip = new StringBuffer();
- if (needDrawingAction()) {
- ((PFLinkFigure) getFigure()).setActionImage();
- tip.append(PageflowMessages.PageflowLinkEditPart_FromAction).append(
- ((PageflowLink) getModel()).getFromaction());
- } else if (((PFLinkFigure) getFigure()).getImage() != getImage(IMG_WARNING)) {
- ((PFLinkFigure) getFigure()).clearIcon();
- }
- if (needDrawingLabel()) {
- ((PFLinkFigure) getFigure()).setLabel(((PageflowLink) getModel())
- .getOutcome());
- if (tip.length() > 0)
- tip.append("\n"); //$NON-NLS-1$
- tip.append(PageflowMessages.PageflowLinkEditPart_FromOutcome).append(
- ((PageflowLink) getModel()).getOutcome());
- } else {
- ((PFLinkFigure) getFigure()).clearOutcome();
- }
- ((PFLinkFigure) getFigure()).setToolTipText(tip.toString());
- }
-
- /*
- * (non-Javadoc)
- *
- * @see com.sybase.stf.jmt.editors.pageflow.marker.IEditPartMarker#getMarkerResource()
- *
- */
- public IResource getMarkerResource() {
- // IResource resource = null;
- // if (getModel() instanceof PFLink)
- // {
- // resource =
- // FacesConfigUtil.getFacesConfigResource(((PFLink)getModel()).getPageflow());
- // }
- // FIXME: it should be changed to link to faces-config file.
- IResource resource = WebrootUtil.getResource((EObject) getModel());
- return resource;
- }
-
- private static Image getImage(ImageDescriptor imageDescriptor) {
- Image image = EditorPlugin.getDefault().getImageRegistry().get(
- imageDescriptor.toString());
- if (null == image) {
- EditorPlugin.getDefault().getImageRegistry().put(
- imageDescriptor.toString(), imageDescriptor);
- image = EditorPlugin.getDefault().getImageRegistry().get(
- imageDescriptor.toString());
- }
-
- return image;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see com.sybase.stf.jmt.editors.pageflow.editparts.IConnectionPreference#setConnectionRouterStyle(int)
- */
- public void setConnectionRouterStyle(int style) {
- connectionStyle = style;
- if (getConnectionRouterStyle() == ILayerPanePreference.LINE_ROUTING_MANUAL) {
- installEditPolicy(EditPolicy.CONNECTION_BENDPOINTS_ROLE,
- getBendpointEditPolicy());
- refreshVisuals();
- } else {
- removeEditPolicy(EditPolicy.CONNECTION_BENDPOINTS_ROLE);
- refreshVisuals();
- }
-
- }
-
- /**
- * get the foreground color from preference
- *
- */
- private int getConnectionRouterStyle() {
- if (this.connectionStyle == -1) {
- IPreferenceStore store = EditorPlugin.getDefault()
- .getPreferenceStore();
- String connectionStyle_ = store
- .getString(GEMPreferences.LINE_ROUTING);
-
- if (GEMPreferences.LINE_ROUTING_MANHATTAN.equals(connectionStyle_)) {
- this.connectionStyle = ILayerPanePreference.LINE_ROUTING_MANHATTAN;
- } else {
- this.connectionStyle = ILayerPanePreference.LINE_ROUTING_MANUAL;
- }
- }
- return this.connectionStyle;
- }
-
- public void validate() {
- PageflowAnnotationUtil.validateLink(this);
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/editpart/PageflowNodeEditPart.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/editpart/PageflowNodeEditPart.java
deleted file mode 100644
index 8eac668..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/editpart/PageflowNodeEditPart.java
+++ /dev/null
@@ -1,502 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow.editpart;
-
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.draw2d.ConnectionAnchor;
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.gef.ConnectionEditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.NodeEditPart;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.requests.DropRequest;
-import org.eclipse.gef.tools.DirectEditManager;
-import org.eclipse.jdt.ui.JavaElementImageDescriptor;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.text.source.Annotation;
-import org.eclipse.jface.viewers.TextCellEditor;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.command.OpenEditorCommand;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.editpolicy.PageflowElementEditPolicy;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.editpolicy.PageflowNodeDirectEditPolicy;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.editpolicy.PageflowNodeEditPolicy;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.figure.ILabelDecorator;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.figure.PageflowNodeFigure;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowElement;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowLink;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowNode;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowPackage;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowPage;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.synchronization.PFBatchAdapter;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.util.PageflowAnnotationUtil;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.Font;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.ui.PlatformUI;
-
-
-/**
- * The base class for the applications EditParts that represent
- * PageflowNode-derived objects in the model. This class implements the
- * NodeEditPart interface which supports:
- * <ul>
- * <li>feedback for Connections when they are being
- * <li>
- * <li>initially connected and when they are disonnected/reconnected</li>
- * </ul>
- *
- *
- */
-public class PageflowNodeEditPart extends PageflowElementEditPart implements
- NodeEditPart, INodePreference, PFValidator {
-
- /** property source of pageflow node */
- // private IPropertySource propertySource = null;
- protected DirectEditManager editManager;
-
- private class ImageDecorator implements ILabelDecorator {
- private Image decrateImage = null;
-
- /*
- * (non-Javadoc)
- *
- * @see com.sybase.stf.jmt.editors.pageflow.figures.ILabelDecorator#decorateImage(org.eclipse.swt.graphics.Image,
- * java.lang.Object)
- */
- public Image decorateImage(Image image, Object element) {
- dispose();
- int adornmentFlags = computeAdornmentFlags(element);
- if (adornmentFlags != 0) {
- ImageDescriptor baseImage = ImageDescriptor.createFromImage(image);
- org.eclipse.swt.graphics.Rectangle bounds = image.getBounds();
- decrateImage = (new JavaElementImageDescriptor(baseImage,
- adornmentFlags, new org.eclipse.swt.graphics.Point(
- bounds.width, bounds.height))).createImage();
- return decrateImage;
- }
- return image;
- }
-
- /**
- * Computes adornment flags for specified object.
- *
- * Note: This method is for internal use only. Clients should not call
- * this method.
- *
- * @param obj Object to complute flags for.
- * @return Adornment flags.
- */
- protected int computeAdornmentFlags(Object obj) {
- return JavaElementImageDescriptor.WARNING;
- }
-
- /**
- * Disposes this instance.
- */
- public void dispose() {
- if (decrateImage != null) {
- decrateImage.dispose();
- }
- }
-
- /*
- * (non-Javadoc)
- *
- * @see com.sybase.stf.jmt.editors.pageflow.figures.ILabelDecorator#decorateText(java.lang.String,
- * java.lang.Object)
- */
- public String decorateText(String text, Object element) {
- // TODO Auto-generated method stub
- return null;
- }
-
- }
-
- /**
- * Disposes this instance.
- */
- public void dispose() {
- if (imageDecorator != null) {
- imageDecorator.dispose();
- }
- }
-
- private ImageDecorator imageDecorator = null;
-
- /**
- * Creates a new PageflowNodeEditPart instance.
- *
- * @param element -
- * pageflow node
- */
- public PageflowNodeEditPart(PageflowNode element) {
- super(element);
- }
-
- /**
- * get the pageflow node
- *
- * @return - pageflow node
- */
- public PageflowNode getPageflowNode() {
- return (PageflowNode) getModel();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see AbstractGraphicalEditPart#getModelSourceConnections()
- */
- protected List getModelSourceConnections() {
- return getPageflowNode().getOutlinks();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see AbstractGraphicalEditPart#getModelTargetConnections()
- */
- protected List getModelTargetConnections() {
- return getPageflowNode().getInlinks();
- }
-
- /**
- * Returns the Figure of this, as a node type figure.
- *
- * @return - Figure as a NodeFigure.
- */
- protected PageflowNodeFigure getPageflowNodeFigure() {
- return (PageflowNodeFigure) getFigure();
- }
-
- public Adapter createEMFAdapter() {
- return new PFBatchAdapter() {
- /**
- * when ports are added to a PageflowNode, add this EditPart as a
- * listener on the port so that it gets notified of PFLinks being
- * added or removed. When links are added or removed from a port
- * owned by the PageflowNode of this EditPart, refresh the
- * connections.
- */
- public void doNotifyChanged(Notification notification) {
- int type = notification.getEventType();
- // FC2PFTransformer.getInstance().NotifyChanged(notification,
- // (PageflowElement) getModel());
- switch (type) {
- case Notification.ADD:
- case Notification.ADD_MANY:
- case Notification.REMOVE:
- case Notification.REMOVE_MANY:
- if (notification.getNewValue() instanceof PageflowLink) {
- if (Thread.currentThread() == PlatformUI.getWorkbench().getDisplay().getThread()) {
- refreshTargetConnections();
- refreshSourceConnections();
- validate();
- } else {
- PlatformUI.getWorkbench().getDisplay().asyncExec(new Runnable(){
- public void run() {
- refreshTargetConnections();
- refreshSourceConnections();
- validate();
- }
- });
- }
- }
- break;
-
- case Notification.SET:
- int featureId = notification
- .getFeatureID(PageflowPackage.class);
- if (needValidation(featureId)) {
- validate();
- }
- if (Thread.currentThread() == PlatformUI.getWorkbench().getDisplay().getThread()) {
- refreshVisuals();
- } else {
- PlatformUI.getWorkbench().getDisplay().asyncExec(new Runnable(){
- public void run() {
- refreshVisuals();
- }
- });
- }
- break;
- }
- }
- };
- }
-
- private boolean needValidation(int featureId) {
- if (getModel() instanceof PageflowPage) {
- if (featureId == PageflowPackage.PF_PAGE__PATH) {
- return true;
- }
- }
- return false;
- }
-
- public void validate() {
- if (getModel() instanceof PageflowPage) {
- PageflowAnnotationUtil.validatePage(this);
- }
- }
-
- /*
- * (non-Javadoc)
- *
- * @see AbstractEditPart#createEditPolicies()
- */
- protected void createEditPolicies() {
- // install the edit policy to handle connection creation
- installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE,
- new PageflowNodeEditPolicy());
-
- installEditPolicy(EditPolicy.COMPONENT_ROLE,
- new PageflowElementEditPolicy());
-
- // install the direct policy
- installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE,
- new PageflowNodeDirectEditPolicy());
- }
-
- /*
- * (non-Javadoc)
- *
- * @see NodeEditPart#getSourceConnectionAnchor(ConnectionEditPart)
- */
- public ConnectionAnchor getSourceConnectionAnchor(
- ConnectionEditPart connection) {
- PageflowLink link = (PageflowLink) connection.getModel();
- return getPageflowNodeFigure().getSourceConnectionAnchorAt(
- new Point(link.getSource().getX(), link.getSource().getY()));
- }
-
- /*
- * (non-Javadoc)
- *
- * @see NodeEditPart#getSourceConnectionAnchor(Request)
- */
- public ConnectionAnchor getSourceConnectionAnchor(Request request) {
- Point pt = new Point(((DropRequest) request).getLocation());
- return getPageflowNodeFigure().getSourceConnectionAnchorAt(pt);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see NodeEditPart#getTargetConnectionAnchor(ConnectionEditPart)
- */
- public ConnectionAnchor getTargetConnectionAnchor(
- ConnectionEditPart connection) {
- PageflowLink link = (PageflowLink) connection.getModel();
- return getPageflowNodeFigure().getTargetConnectionAnchorAt(
- new Point(link.getTarget().getX(), link.getTarget().getY()));
- }
-
- /*
- * (non-Javadoc)
- *
- * @see NodeEditPart#getTargetConnectionAnchor(Request)
- */
- public ConnectionAnchor getTargetConnectionAnchor(Request request) {
- Point pt = new Point(((DropRequest) request).getLocation());
- return getPageflowNodeFigure().getTargetConnectionAnchorAt(pt);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see AbstractEditPart#refreshVisuals()
- */
- protected void refreshVisuals() {
- super.refreshVisuals();
-
- getPageflowNodeFigure().setText(getPageflowNode().getName());
- }
-
- /**
- * make this a listener on its ports
- */
- public void activate() {
- super.activate();
-
- Iterator it;
-
- it = getPageflowNode().getInlinks().iterator();
- while (it.hasNext()) {
- PageflowLink link = (PageflowLink) it.next();
-
- hookIntoPageflowElement(link);
- }
-
- it = getPageflowNode().getOutlinks().iterator();
- while (it.hasNext()) {
- PageflowLink link = (PageflowLink) it.next();
-
- hookIntoPageflowElement(link);
- }
- }
-
- /**
- * remove this as a listener on its ports
- */
- public void deactivate() {
- super.deactivate();
- dispose();
- Iterator it;
-
- it = getPageflowNode().getInlinks().iterator();
- while (it.hasNext()) {
- PageflowLink link = (PageflowLink) it.next();
-
- unhookFromPageflowElement(link);
- }
-
- it = getPageflowNode().getOutlinks().iterator();
- while (it.hasNext()) {
- PageflowLink link = (PageflowLink) it.next();
-
- unhookFromPageflowElement(link);
- }
- }
-
- /**
- * perfrom direct edit request
- *
- */
- protected void performDirectEdit() {
- if (editManager == null) {
- Label l = ((PageflowNodeFigure) getFigure()).getLabel();
- editManager = new PageflowDirectEditManager(this,
- TextCellEditor.class, new DirectEditCellEditorLocator(l), l);
- }
- editManager.show();
- }
-
- /**
- * perform double click request
- *
- */
- protected void performOpen() {
- // only Page and Action support the double-click commands
- if (getModel() instanceof PageflowPage) {
- // CommandStack stack =
- // getViewer().getEditDomain().getCommandStack();
- Command command = new OpenEditorCommand(this);
- if (command != null && command.canExecute()) {
- // stack.execute(command);
- command.execute();
- }
- }
- }
-
- /*
- * (non-Javadoc)
- *
- * @see com.sybase.stf.jmt.editors.pageflow.editparts.IFigurePreference#setForegroundColor(org.eclipse.swt.graphics.Color)
- */
- public void setForegroundColor(Color c) {
- getPageflowNodeFigure().setForegroundColor(c);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see com.sybase.stf.jmt.editors.pageflow.editparts.IFigurePreference#setBackgroundColor(org.eclipse.swt.graphics.Color)
- */
- public void setBackgroundColor(Color c) {
- getPageflowNodeFigure().setBackgroundColor(c);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see com.sybase.stf.jmt.editors.pageflow.editparts.IFigurePreference#setFont(org.eclipse.swt.graphics.Font)
- */
- public void setFont(Font f) {
- getPageflowNodeFigure().setFont(f);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see com.sybase.stf.jmt.editors.pageflow.editparts.INodePreference#setTextPlacement(int)
- */
- public void setTextPlacement(int where) {
- getPageflowNodeFigure().setTextPlacement(where);
-
- }
-
- /*
- * (non-Javadoc)
- *
- * @see com.sybase.stf.jmt.editors.pageflow.editparts.IEditPartDecorator#decorateEditPart()
- */
- public void addAnnotation(final Annotation annotation) {
- getViewer().getControl().getDisplay().asyncExec(new Runnable() {
- /* (non-Javadoc)
- * @see java.lang.Runnable#run()
- */
- public void run() {
- getPageflowNodeFigure().setImage(
- getDecoratedImage((PageflowElement) getModel()));
- getPageflowNodeFigure().setToolTipText(annotation.getText());
- }
-
- });
- }
-
- /*
- * (non-Javadoc)
- *
- * @see com.sybase.stf.jmt.editors.pageflow.editparts.IEditPartDecorator#undecorateEditPart()
- */
- public void removeAnnotation() {
- getViewer().getControl().getDisplay().asyncExec(new Runnable() {
- public void run() {
- getPageflowNodeFigure().setImage(
- getImage((PageflowElement) getModel()));
- getPageflowNodeFigure().setToolTipText(null);
- }
-
- });
- }
-
- /**
- * Returns the image for the pageflow element.
- *
- * @param element -
- * pageflow element
- * @return - the image for the pageflow element.
- */
- private Image getDecoratedImage(PageflowElement element) {
- Image decoratedImage = getImage(element);
-
- decoratedImage = getImageDecorator().decorateImage(getImage(element),
- null);
-
- return decoratedImage;
- }
-
- private ImageDecorator getImageDecorator() {
- if (imageDecorator == null) {
- imageDecorator = new ImageDecorator();
- }
- return imageDecorator;
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/editpart/PageflowTreeEditPart.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/editpart/PageflowTreeEditPart.java
deleted file mode 100644
index 34976d3..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/editpart/PageflowTreeEditPart.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow.editpart;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.Pageflow;
-
-/**
- * The <code>TreeEditPart</code> implementation for a pageflow.
- *
- *
- */
-/*package*/ class PageflowTreeEditPart extends PageflowElementTreeEditPart {
-
- /**
- * Creates a new PageflowTreeEditPart instance.
- *
- * @param pageflow
- */
- public PageflowTreeEditPart(Pageflow pageflow) {
- super(pageflow);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see AbstractEditPart#getModelChildren()
- */
- protected List getModelChildren() {
- List children_ = getPageflow().getNodes();
-
- return new ArrayList(children_);
- }
-
- /**
- * Returns the model as <code>Pageflow</code>.
- *
- * @return the model as <code>Pageflow</code>
- */
- public Pageflow getPageflow() {
- return (Pageflow) getModel();
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/editpart/PageflowTreePartFactory.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/editpart/PageflowTreePartFactory.java
deleted file mode 100644
index 940113a..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/editpart/PageflowTreePartFactory.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow.editpart;
-
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPartFactory;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.Pageflow;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowElement;
-
-/**
- * Edit Part Factory for creation pageflow tree parts
- *
- */
-public class PageflowTreePartFactory implements EditPartFactory {
- /*
- * (non-Javadoc)
- *
- * @see EditPartFactory#createEditPart()
- */
- public EditPart createEditPart(EditPart context, Object model) {
-
- if (model instanceof Pageflow) {
- return new PageflowTreeEditPart((Pageflow) model);
-
- } else if (model instanceof PageflowElement) {
- return new PageflowElementTreeEditPart((PageflowElement) model);
- }
-
- return null;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/editpolicy/PFLinkBendpointEditPolicy.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/editpolicy/PFLinkBendpointEditPolicy.java
deleted file mode 100644
index 4dabafb..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/editpolicy/PFLinkBendpointEditPolicy.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow.editpolicy;
-
-import org.eclipse.draw2d.Connection;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.editpolicies.BendpointEditPolicy;
-import org.eclipse.gef.requests.BendpointRequest;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.command.CreateBendpointCommand;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.command.DeleteBendpointCommand;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.command.MoveBendpointCommand;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowLink;
-
-/**
- * Customize the bendpoint edit policy fro pageflow link connections
- *
- */
-public class PFLinkBendpointEditPolicy extends BendpointEditPolicy {
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.gef.editpolicies.BendpointEditPolicy#getCreateBendpointCommand(org.eclipse.gef.requests.BendpointRequest)
- */
- protected Command getCreateBendpointCommand(BendpointRequest request) {
- CreateBendpointCommand createCmd = new CreateBendpointCommand();
- Point p = request.getLocation();
- Connection conn = getConnection();
-
- conn.translateToRelative(p);
-
- createCmd.setLocation(p);
- Point ref1 = getConnection().getSourceAnchor().getReferencePoint();
- Point ref2 = getConnection().getTargetAnchor().getReferencePoint();
-
- conn.translateToRelative(ref1);
- conn.translateToRelative(ref2);
-
- createCmd.setRelativeDimensions(p.getDifference(ref1), p
- .getDifference(ref2));
- createCmd.setPFLink((PageflowLink) request.getSource().getModel());
- createCmd.setIndex(request.getIndex());
- return createCmd;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.gef.editpolicies.BendpointEditPolicy#getDeleteBendpointCommand(org.eclipse.gef.requests.BendpointRequest)
- */
- protected Command getDeleteBendpointCommand(BendpointRequest request) {
- DeleteBendpointCommand deleteCom = new DeleteBendpointCommand();
- Point p = request.getLocation();
- deleteCom.setLocation(p);
- deleteCom.setPFLink((PageflowLink) request.getSource().getModel());
- deleteCom.setIndex(request.getIndex());
- return deleteCom;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.gef.editpolicies.BendpointEditPolicy#getMoveBendpointCommand(org.eclipse.gef.requests.BendpointRequest)
- */
- protected Command getMoveBendpointCommand(BendpointRequest request) {
- MoveBendpointCommand moveCmd = new MoveBendpointCommand();
- Point p = request.getLocation();
- Connection conn = getConnection();
-
- conn.translateToRelative(p);
-
- moveCmd.setLocation(p);
-
- Point ref1 = getConnection().getSourceAnchor().getReferencePoint();
- Point ref2 = getConnection().getTargetAnchor().getReferencePoint();
-
- conn.translateToRelative(ref1);
- conn.translateToRelative(ref2);
-
- moveCmd.setRelativeDimensions(p.getDifference(ref1), p
- .getDifference(ref2));
- moveCmd.setPFLink((PageflowLink) request.getSource().getModel());
- moveCmd.setIndex(request.getIndex());
- return moveCmd;
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/editpolicy/PFLinkEditPolicy.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/editpolicy/PFLinkEditPolicy.java
deleted file mode 100644
index d25b227..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/editpolicy/PFLinkEditPolicy.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow.editpolicy;
-
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.editpolicies.ConnectionEditPolicy;
-import org.eclipse.gef.requests.GroupRequest;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.command.ConnectionCommand;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.command.DeleteConnectionCommand;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowLink;
-
-/**
- * Customize the connection edit policy for pageflow links
- *
- */
-public class PFLinkEditPolicy extends ConnectionEditPolicy {
-
- /**
- * Default constructor
- */
- public PFLinkEditPolicy() {
- super();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see ConnectionEditPolicy#getDeleteCommand
- */
- protected Command getDeleteCommand(GroupRequest request) {
- ConnectionCommand c = new DeleteConnectionCommand();
- c.setPFLink((PageflowLink) getHost().getModel());
- return c;
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/editpolicy/PFLinkEndpointEditPolicy.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/editpolicy/PFLinkEndpointEditPolicy.java
deleted file mode 100644
index 59875db..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/editpolicy/PFLinkEndpointEditPolicy.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow.editpolicy;
-
-import org.eclipse.draw2d.PolylineConnection;
-import org.eclipse.gef.GraphicalEditPart;
-import org.eclipse.gef.editpolicies.ConnectionEndpointEditPolicy;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.jst.jsf.facesconfig.ui.EditorPlugin;
-import org.eclipse.jst.jsf.facesconfig.ui.preference.GEMPreferences;
-
-/**
- * Customize the endpoint edit policy for pageflow links
- *
- */
-public class PFLinkEndpointEditPolicy extends ConnectionEndpointEditPolicy {
- /**
- *
- */
- public PFLinkEndpointEditPolicy() {
- super();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see ConnectionEndpointEditPolicy#addSelectionHandles
- */
- protected void addSelectionHandles() {
- super.addSelectionHandles();
- IPreferenceStore store = EditorPlugin.getDefault().getPreferenceStore();
- int connectionWidth = store.getInt(GEMPreferences.LINE_WIDTH);
- getConnectionFigure().setLineWidth(connectionWidth + 1);
- }
-
- private PolylineConnection getConnectionFigure() {
- return (PolylineConnection) ((GraphicalEditPart) getHost()).getFigure();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see ConnectionEndpointEditPolicy#removeSelectionHandles
- */
- protected void removeSelectionHandles() {
- super.removeSelectionHandles();
- IPreferenceStore store = EditorPlugin.getDefault().getPreferenceStore();
- int connectionWidth = store.getInt(GEMPreferences.LINE_WIDTH);
- getConnectionFigure().setLineWidth(connectionWidth);
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/editpolicy/PageflowContainerEditPolicy.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/editpolicy/PageflowContainerEditPolicy.java
deleted file mode 100644
index f392f25..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/editpolicy/PageflowContainerEditPolicy.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow.editpolicy;
-
-import java.util.List;
-
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.commands.CompoundCommand;
-import org.eclipse.gef.editpolicies.ContainerEditPolicy;
-import org.eclipse.gef.requests.CreateRequest;
-import org.eclipse.gef.requests.GroupRequest;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.PageflowMessages;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.command.OrphanChildCommand;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.Pageflow;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowNode;
-
-/**
- * Customize the container policy for page flow containers
- *
- */
-public class PageflowContainerEditPolicy extends ContainerEditPolicy {
- /*
- * (non-Javadoc)
- *
- * @see ContainerEditPolicy#getCreateCommand()
- */
- protected Command getCreateCommand(CreateRequest request) {
- return null;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see ContainerEditPolicy#getOrphanChildrenCommand()
- */
- public Command getOrphanChildrenCommand(GroupRequest request) {
- List parts = request.getEditParts();
- CompoundCommand result = new CompoundCommand("orphanchildcommand"); //$NON-NLS-1$
- for (int i = 0; i < parts.size(); i++) {
- OrphanChildCommand orphan = new OrphanChildCommand();
- orphan
- .setChild((PageflowNode) ((EditPart) parts.get(i))
- .getModel());
- orphan.setParent((Pageflow) getHost().getModel());
- orphan.setLabel(PageflowMessages.PageflowContainerEditPolicy_OrphanLabel);
- result.add(orphan);
- }
- return result.unwrap();
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/editpolicy/PageflowElementEditPolicy.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/editpolicy/PageflowElementEditPolicy.java
deleted file mode 100644
index 04e86db..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/editpolicy/PageflowElementEditPolicy.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow.editpolicy;
-
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.requests.GroupRequest;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.command.DeleteNodeCommand;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.Pageflow;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowNode;
-
-/**
- * Customize component edit policies for page flows
- *
- */
-public class PageflowElementEditPolicy extends
- org.eclipse.gef.editpolicies.ComponentEditPolicy {
- /*
- * (non-Javadoc)
- *
- * @see ComponentEditPolicy#createDeleteCommand()
- */
- protected Command createDeleteCommand(GroupRequest request) {
- Object parent = getHost().getParent().getModel();
- DeleteNodeCommand deleteCmd = new DeleteNodeCommand((Pageflow) parent);
- deleteCmd.setParent((Pageflow) parent);
- deleteCmd.setChild((PageflowNode) getHost().getModel());
- return deleteCmd;
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/editpolicy/PageflowNodeDirectEditPolicy.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/editpolicy/PageflowNodeDirectEditPolicy.java
deleted file mode 100644
index c89d648..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/editpolicy/PageflowNodeDirectEditPolicy.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow.editpolicy;
-
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.editpolicies.DirectEditPolicy;
-import org.eclipse.gef.requests.DirectEditRequest;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.command.RenameNodeCommand;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowNode;
-
-/**
- * EditPolicy for the direct editing of pageflow node's name.
- *
- * @author Xiaoguang Zhang
- */
-public class PageflowNodeDirectEditPolicy extends DirectEditPolicy {
-
- /*
- * (non-javadoc)
- *
- * @see DirectEditPolicy#getDirectEditCommand(DirectEditRequest)
- */
- protected Command getDirectEditCommand(DirectEditRequest request) {
- RenameNodeCommand cmd = new RenameNodeCommand();
- cmd.setSource((PageflowNode) getHost().getModel());
- cmd.setOldName(((PageflowNode) getHost().getModel()).getName());
- cmd.setName((String) request.getCellEditor().getValue());
- return cmd;
- }
-
- /*
- * (non-javadoc)
- *
- * @see DirectEditPolicy#showCurrentEditValue(DirectEditRequest)
- */
- protected void showCurrentEditValue(DirectEditRequest request) {
- // String value = (String)request.getCellEditor().getValue();
- // ((PageflowNodeFigure)getHostFigure()).setText(value);
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/editpolicy/PageflowNodeEditPolicy.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/editpolicy/PageflowNodeEditPolicy.java
deleted file mode 100644
index 192d818..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/editpolicy/PageflowNodeEditPolicy.java
+++ /dev/null
@@ -1,162 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow.editpolicy;
-
-import org.eclipse.draw2d.ColorConstants;
-import org.eclipse.draw2d.Connection;
-import org.eclipse.draw2d.PolylineConnection;
-import org.eclipse.gef.GraphicalEditPart;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.editpolicies.GraphicalNodeEditPolicy;
-import org.eclipse.gef.requests.CreateConnectionRequest;
-import org.eclipse.gef.requests.ReconnectRequest;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.jst.jsf.facesconfig.ui.EditorPlugin;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.action.OpenEditorAction;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.command.ConnectionCommand;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.command.ConnectionCommandFactory;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.command.OpenEditorCommand;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.editpart.PageflowNodeEditPart;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.figure.PageflowNodeFigure;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowLink;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowNode;
-import org.eclipse.jst.jsf.facesconfig.ui.preference.GEMPreferences;
-
-/**
- * Customizes conntection policies
- *
- */
-public class PageflowNodeEditPolicy extends GraphicalNodeEditPolicy {
- /*
- * (non-Javadoc)
- *
- * @see GraphicalNodeEditPolicy#createDummyConnection()
- */
- protected Connection createDummyConnection(Request req) {
- PolylineConnection conn = new PolylineConnection();
- conn.setLineWidth(getLineWidth());
- conn.setForegroundColor(ColorConstants.black);
-
- return conn;
- }
-
- /**
- * get the connection line width from preference.
- */
- private int getLineWidth() {
- IPreferenceStore store = EditorPlugin.getDefault().getPreferenceStore();
- int lineWidth = store.getInt(GEMPreferences.LINE_WIDTH);
- return lineWidth;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see GraphicalNodeEditPolicy#getConnectionCompleteCommand()
- */
- protected Command getConnectionCompleteCommand(
- CreateConnectionRequest request) {
- ConnectionCommand command = (ConnectionCommand) request
- .getStartCommand();
- // ConnectionAnchor anchor =
- // getPageflowNodeEditPart().getTargetConnectionAnchor(request);
-
- command.setTarget(getPageflowNode());
-
- return command;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see GraphicalNodeEditPolicy#getConnectionCreateCommand()
- */
- protected Command getConnectionCreateCommand(CreateConnectionRequest request) {
- ConnectionCommand command = ConnectionCommandFactory
- .createCommand(request);
- command.setPFLink((PageflowLink) request.getNewObject());
- PageflowNode flowObject = getPageflowNode();
- command.setSource(flowObject);
- request.setStartCommand(command);
- return command;
- }
-
- /**
- * get the edit part of pageflow node
- *
- * @return - the edit part of pageflow node
- */
- protected PageflowNodeEditPart getPageflowNodeEditPart() {
- return (PageflowNodeEditPart) getHost();
- }
-
- /**
- * get the pageflow node
- *
- * @return - the pageflow node
- */
- protected PageflowNode getPageflowNode() {
- return (PageflowNode) getHost().getModel();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see GraphicalNodeEditPolicy#getReconnectTargetCommand()
- */
- protected Command getReconnectTargetCommand(ReconnectRequest request) {
- ConnectionCommand cmd = ConnectionCommandFactory.createCommand(request);
- cmd
- .setPFLink((PageflowLink) request.getConnectionEditPart()
- .getModel());
- cmd.setTarget(getPageflowNode());
- return cmd;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see GraphicalNodeEditPolicy#getReconnectSourceCommand()
- */
- protected Command getReconnectSourceCommand(ReconnectRequest request) {
- ConnectionCommand cmd = ConnectionCommandFactory.createCommand(request);
- cmd
- .setPFLink((PageflowLink) request.getConnectionEditPart()
- .getModel());
- cmd.setSource(getPageflowNode());
- return cmd;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see GraphicalNodeEditPolicy#getCommand()
- */
- public Command getCommand(Request request) {
- if (OpenEditorAction.OPEN_EDITOR_REQUEST.equals(request.getType())) {
- return new OpenEditorCommand(getHost());
- }
-
- return super.getCommand(request);
- }
-
- /**
- * return the pageflow node figure
- *
- * @return - the pageflow node's figure
- */
- protected PageflowNodeFigure getPageflowNodeFigure() {
- return (PageflowNodeFigure) ((GraphicalEditPart) getHost()).getFigure();
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/editpolicy/PageflowNodeSelectionEditPolicy.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/editpolicy/PageflowNodeSelectionEditPolicy.java
deleted file mode 100644
index fb0465d..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/editpolicy/PageflowNodeSelectionEditPolicy.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow.editpolicy;
-
-import org.eclipse.gef.editpolicies.NonResizableEditPolicy;
-
-/**
- * Handles selection of Node. Primary selection is denoted by highlight and a
- * focus rectangle. Normal selection is denoted by highlight only.
- *
- * @author xgzhang
- */
-public class PageflowNodeSelectionEditPolicy extends NonResizableEditPolicy {
-
-// private PageflowNodeFigure getFigure() {
-// PageflowNodeEditPart part = (PageflowNodeEditPart) getHost();
-// return ((PageflowNodeFigure) part.getFigure());
-// }
-
- /**
- * @see org.eclipse.gef.editpolicies.SelectionHandlesEditPolicy#hideSelection()
- */
- protected void hideSelection() {
- super.hideSelection();
- // getFigure().setSelected(false);
- }
-
- /**
- * @see org.eclipse.gef.editpolicies.SelectionHandlesEditPolicy#showSelection()
- */
- protected void showPrimarySelection() {
- super.showPrimarySelection();
- // getFigure().setSelected(true);
- }
-
- /**
- * @see org.eclipse.gef.editpolicies.SelectionHandlesEditPolicy#showSelection()
- */
- protected void showSelection() {
- super.showSelection();
- // getFigure().setSelected(true);
-
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/editpolicy/PageflowXYLayoutEditPolicy.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/editpolicy/PageflowXYLayoutEditPolicy.java
deleted file mode 100644
index dccbfa6..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/editpolicy/PageflowXYLayoutEditPolicy.java
+++ /dev/null
@@ -1,118 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow.editpolicy;
-
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.editpolicies.ResizableEditPolicy;
-import org.eclipse.gef.editpolicies.XYLayoutEditPolicy;
-import org.eclipse.gef.requests.CreateRequest;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.PageflowMessages;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.command.AddNodeCommand;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.command.CreateNodeCommand;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.command.SetConstraintCommand;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.editpart.PageflowNodeEditPart;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.Pageflow;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowNode;
-
-/**
- * Customize the layout policy for page flows
- *
- */
-public class PageflowXYLayoutEditPolicy extends XYLayoutEditPolicy {
- /*
- * (non-Javadoc)
- *
- * @see XYLayoutEditPolicy#createAddCommand()
- */
- protected Command createAddCommand(EditPart childEditPart, Object constraint) {
- PageflowNode part = (PageflowNode) childEditPart.getModel();
- Rectangle rect = (Rectangle) constraint;
-
- AddNodeCommand add = new AddNodeCommand();
- add.setParent((Pageflow) getHost().getModel());
- add.setChild(part);
- add.setLabel(PageflowMessages.PageflowXYLayoutEditPolicy_Add);
- add.setDebugLabel("PageFlowXYEP add subpart"); //$NON-NLS-1$
-
- SetConstraintCommand setConstraint = new SetConstraintCommand();
-
- setConstraint.setLocation(rect);
- setConstraint.setPart(part);
- setConstraint.setLabel(PageflowMessages.PageflowXYLayoutEditPolicy_Add);
- setConstraint.setDebugLabel("PageFlowXYEP setConstraint"); //$NON-NLS-1$
- return add.chain(setConstraint);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see XYLayoutEditPolicy#createChangeConstraintCommand()
- */
- protected Command createChangeConstraintCommand(EditPart child,
- Object constraint) {
- SetConstraintCommand locationCommand = new SetConstraintCommand();
- locationCommand.setPart((PageflowNode) child.getModel());
- locationCommand.setLocation((Rectangle) constraint);
- return locationCommand;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see XYLayoutEditPolicy#createChildEditPolicy()
- */
- protected EditPolicy createChildEditPolicy(EditPart child) {
- if (child instanceof PageflowNodeEditPart) {
- return new PageflowNodeSelectionEditPolicy();
- }
-
- return new ResizableEditPolicy();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see XYLayoutEditPolicy#getCreateCommand()
- */
- protected Command getCreateCommand(CreateRequest request) {
- CreateNodeCommand create = new CreateNodeCommand();
- create.setParent((Pageflow) getHost().getModel());
- create.setChild((PageflowNode) request.getNewObject());
- Rectangle constraint = (Rectangle) getConstraintFor(request);
- create.setLocation(constraint);
- create.setLabel(PageflowMessages.PageflowXYLayoutEditPolicy_Add);
- return create;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see XYLayoutEditPolicy#getDeleteDependantCommand()
- */
- protected Command getDeleteDependantCommand(Request request) {
- return null;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see XYLayoutEditPolicy#getOrphanChildrenCommand()
- */
- protected Command getOrphanChildrenCommand(Request request) {
- return null;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/figure/ConnectionLabel.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/figure/ConnectionLabel.java
deleted file mode 100644
index 702e58e..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/figure/ConnectionLabel.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow.figure;
-
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.LineBorder;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.Image;
-
-/**
- * This label is used in connection figure, which has a border.
- *
- * @author Xiao-guang Zhang
- *
- */
-public class ConnectionLabel extends Label {
- /**
- *
- */
- public ConnectionLabel() {
- this(null, null);
- }
-
- /**
- * @param s
- */
- public ConnectionLabel(String s) {
- this(s, null);
- }
-
- /**
- * @param i
- */
- public ConnectionLabel(Image i) {
- this(null, i);
- }
-
- /**
- * @param s
- * @param i
- */
- public ConnectionLabel(String s, Image i) {
- super(s, i);
-
- // setBorder(new LineBorder());
- setOpaque(true);
- }
-
- /**
- * set the label's border's width
- *
- * @param w
- */
- public void setBorderWidth(int w) {
- if (getBorder() != null) {
- ((LineBorder) getBorder()).setWidth(w);
- }
- }
-
- /**
- * set the label's border's color
- *
- * @param c
- */
- public void setBorderColor(Color c) {
- if (getBorder() != null) {
- ((LineBorder) getBorder()).setColor(c);
- }
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/figure/ILabelDecorator.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/figure/ILabelDecorator.java
deleted file mode 100644
index d1d0137..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/figure/ILabelDecorator.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow.figure;
-
-import org.eclipse.swt.graphics.Image;
-
-/**
- * A label decorator decorates the label text and image for some element. The
- * original label text and image are obtained by some other means,
- *
- *
- * @author Xiao-guang Zhang
- */
-public interface ILabelDecorator {
- /**
- * Returns an image that is based on the given image, but decorated with
- * additional information relating to the state of the provided element.
- *
- * @param image
- * the input image to decorate, or <code>null</code> if the
- * element has no image
- * @param element
- * the element whose image is being decorated
- * @return the decorated image, or <code>null</code> if no decoration is
- * to be applied
- *
- * @see org.eclipse.jface.resource.CompositeImageDescriptor
- */
- public Image decorateImage(Image image, Object element);
-
- /**
- * Returns a text label that is based on the given text label, but decorated
- * with additional information relating to the state of the provided
- * element.
- *
- *
- * @param text
- * the input text label to decorate
- * @param element
- * the element whose image is being decorated
- * @return the decorated text label, or <code>null</code> if no decoration
- * is to be applied
- */
- public String decorateText(String text, Object element);
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/figure/NodeLabel.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/figure/NodeLabel.java
deleted file mode 100644
index fa5764d..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/figure/NodeLabel.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow.figure;
-
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.MarginBorder;
-import org.eclipse.swt.graphics.Image;
-
-/**
- * This derived label has simple tooltip support
- *
- * @author Xiao-guang Zhang
- *
- */
-public class NodeLabel extends Label {
- /**
- *
- */
- public NodeLabel() {
- super();
- }
-
- /**
- * @param s
- */
- public NodeLabel(String s) {
- super(s);
- }
-
- /**
- * @param i
- */
- public NodeLabel(Image i) {
- super(i);
- }
-
- /**
- * @param s
- * @param i
- */
- public NodeLabel(String s, Image i) {
- super(s, i);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.draw2d.Label#setTextPlacement(int)
- */
- public void setTextPlacement(int where) {
- super.setTextPlacement(where);
- layout();
- invalidate();
- }
-
- /**
- * set tooltip text
- *
- * @param text
- */
- public void setToolTipText(String text) {
- Label toolTipLabel = null;
-
- if (text != null && text.length() > 0) {
- toolTipLabel = new Label(text);
- toolTipLabel.setBorder(new MarginBorder(3));
- }
-
- super.setToolTip(toolTipLabel);
- }
-
- /**
- * get tooltip's text
- *
- * @return the tool tip text string
- */
- public String getToolTipText() {
- if (getToolTip() != null)
- return ((Label) getToolTip()).getText();
- return null;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/figure/PFLinkFigure.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/figure/PFLinkFigure.java
deleted file mode 100644
index f9ecd41..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/figure/PFLinkFigure.java
+++ /dev/null
@@ -1,318 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow.figure;
-
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.MarginBorder;
-import org.eclipse.draw2d.MidpointLocator;
-import org.eclipse.draw2d.PolygonDecoration;
-import org.eclipse.draw2d.PolylineConnection;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.jface.preference.PreferenceConverter;
-import org.eclipse.jface.resource.FontRegistry;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.resource.JFaceResources;
-import org.eclipse.jst.jsf.facesconfig.ui.EditorPlugin;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.editpart.PageflowElementEditPart;
-import org.eclipse.jst.jsf.facesconfig.ui.preference.GEMPreferences;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.Font;
-import org.eclipse.swt.graphics.FontData;
-import org.eclipse.swt.graphics.Image;
-
-/**
- *
- * The figure for pflink, used by pflink edit part, which is a polyline with a
- * label control on it, and with tooltip support.
- *
- * @author Xiao-guang Zhang
- */
-public class PFLinkFigure extends PolylineConnection {
- /** the label attached to the connection */
- private ConnectionLabel textLabel = null;
-
- //private ConnectionLabel iconLabel = null;
-
- /** The label's background color */
- private Color labelBgColor;
-
- /** The label's foreground color */
- private Color labelFgColor;
-
- /** The label's visiblity */
- private boolean bLabelVisible = false;
-
- /** The connection's line width */
- private int lineWidth = 0;
-
- /** the polygon decoration for connection line */
- private PolygonDecoration arrow;
-
- /**
- *
- */
- public PFLinkFigure() {
- arrow = new PolygonDecoration();
- arrow.setTemplate(PolygonDecoration.TRIANGLE_TIP);
- arrow.setScale(10, getLineWidth() * 2);
- setTargetDecoration(arrow);
- setForegroundColor(getForegroundColor());
- }
-
- /**
- * set the connection's label string
- *
- * @param strLabel
- */
- public void setLabel(String strLabel) {
- if (null != strLabel) {
- if (textLabel == null) {
- textLabel = new ConnectionLabel();
- textLabel.setFont(getLabelFont());
- textLabel.setBackgroundColor(getLabelBackgroundColor());
- textLabel.setForegroundColor(getLabelForegroundColor());
- setLineWidth(getLineWidth());
- setLabelVisible(getLabelVisible());
- setForegroundColor(getForegroundColor());
- add(textLabel, new MidpointLocator(this, 1));
- }
- // textLabel.setVisible(true);
- textLabel.setText(strLabel);
- }
- }
-
- /**
- * Set the icon image to null
- */
- public void clearIcon() {
- setImage(null);
- }
-
- /**
- * Set the label to empty string
- */
- public void clearOutcome() {
- setLabel(""); //$NON-NLS-1$
- }
-
- /**
- * set the connection's label string
- *
- * @param image
- */
- public void setImage(Image image) {
- if (textLabel == null) {
- textLabel = new ConnectionLabel();
- textLabel.setFont(getLabelFont());
- textLabel.setBackgroundColor(getLabelBackgroundColor());
- textLabel.setForegroundColor(getLabelForegroundColor());
- setLineWidth(getLineWidth());
- setLabelVisible(getLabelVisible());
- setForegroundColor(getForegroundColor());
- add(textLabel, new MidpointLocator(this, 0));
- }
- textLabel.setIcon(image);
- }
-
- /**
- * Set the action image
- */
- public void setActionImage() {
- ImageDescriptor imageDescriptor = PageflowElementEditPart.IMG_ACTION;
- Image image = EditorPlugin.getDefault().getImageRegistry().get(
- imageDescriptor.toString());
- if (null == image) {
- EditorPlugin.getDefault().getImageRegistry().put(
- imageDescriptor.toString(), imageDescriptor);
- image = EditorPlugin.getDefault().getImageRegistry().get(
- imageDescriptor.toString());
- }
- setImage(image);
- }
-
- /**
- * @return the icon image
- */
- public Image getImage() {
- if (textLabel != null)
- {
- return textLabel.getIcon();
- }
- return null;
- }
-
-
- /**
- * @param text
- */
- public void setToolTipText(String text) {
- Label toolTipLabel = null;
-
- if (text != null && text.length() > 0) {
- toolTipLabel = new Label(text);
- toolTipLabel.setBorder(new MarginBorder(3));
- }
-
- super.setToolTip(toolTipLabel);
- }
-
- /**
- * @return the tool tip text or null if none
- */
- public String getToolTipText() {
- if (getToolTip() != null)
- {
- return ((Label) getToolTip()).getText();
- }
- return null;
- }
-
- /**
- * set the font including label's
- *
- */
- public void setFont(Font f) {
- if (textLabel != null)
- textLabel.setFont(f);
- super.setFont(f);
- }
-
- /**
- * get the label's font from preference
- *
- */
- private Font getLabelFont() {
- FontRegistry registry = JFaceResources.getFontRegistry();
- IPreferenceStore store = EditorPlugin.getDefault().getPreferenceStore();
- FontData fontData = PreferenceConverter.getFontData(store,
- GEMPreferences.LINE_LABEL_FONT);
- if (!registry.get(fontData.toString()).equals(registry.defaultFont()))
- return registry.get(fontData.toString());
-
- registry.put(fontData.toString(), new FontData[] {fontData});
- return registry.get(fontData.toString());
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.draw2d.Shape#setLineWidth(int)
- */
- public void setLineWidth(int w) {
- if (textLabel != null)
- textLabel.setBorderWidth(w);
- arrow.setScale(10, getLineWidth() * 2);
- super.setLineWidth(w);
- }
-
- /**
- * get the connection line width from preference.
- */
- public int getLineWidth() {
- IPreferenceStore store = EditorPlugin.getDefault().getPreferenceStore();
- lineWidth = store.getInt(GEMPreferences.LINE_WIDTH);
- return lineWidth;
- }
-
- /**
- * set label's visibility
- *
- * @param flag -
- * visible or not.
- */
- public void setLabelVisible(boolean flag) {
- if (textLabel != null)
- textLabel.setVisible(flag);
- }
-
- /**
- * get the label's visiblity from preference
- *
- */
- private boolean getLabelVisible() {
- IPreferenceStore store = EditorPlugin.getDefault().getPreferenceStore();
- bLabelVisible = store.getBoolean(GEMPreferences.SHOW_LINE_LABELS);
- return bLabelVisible;
- }
-
- /**
- * set the label's foreground color
- *
- * @param c
- */
- public void setLabelForegroundColor(Color c) {
- labelFgColor = c;
- if (textLabel != null)
- textLabel.setForegroundColor(c);
- }
-
- /**
- * get the label's foreground color from preference
- *
- */
- private Color getLabelForegroundColor() {
- if (labelFgColor == null) {
- IPreferenceStore store = EditorPlugin.getDefault()
- .getPreferenceStore();
- labelFgColor = GEMPreferences.getColor(store,
- GEMPreferences.LINE_LABEL_FONT_COLOR);
- }
- return labelFgColor;
- }
-
- /**
- * set the label's background color
- *
- * @param c
- */
- public void setLabelBackgroundColor(Color c) {
- labelBgColor = c;
- if (textLabel != null)
- textLabel.setBackgroundColor(c);
- }
-
- /**
- * get the label's background color from preference
- *
- */
- private Color getLabelBackgroundColor() {
- if (labelBgColor == null) {
- IPreferenceStore store = EditorPlugin.getDefault()
- .getPreferenceStore();
- labelBgColor = GEMPreferences.getColor(store,
- GEMPreferences.LINE_LABEL_COLOR);
- }
- return labelBgColor;
- }
-
- /**
- * get the foreground color from preference
- *
- */
- public Color getForegroundColor() {
- IPreferenceStore store = EditorPlugin.getDefault().getPreferenceStore();
- final Color newFgColor = GEMPreferences.getColor(store, GEMPreferences.LINE_COLOR);
- setForegroundColor(newFgColor);
- return newFgColor;
- }
-
- /**
- * set the figure's foreground, which will also update the label's border's
- * color.
- */
- public void setForegroundColor(Color c) {
- if (textLabel != null)
- textLabel.setBorderColor(c);
- super.setForegroundColor(c);
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/figure/PageflowNodeFigure.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/figure/PageflowNodeFigure.java
deleted file mode 100644
index 9a08273..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/figure/PageflowNodeFigure.java
+++ /dev/null
@@ -1,376 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow.figure;
-
-import java.util.Vector;
-
-import org.eclipse.draw2d.ChopboxAnchor;
-import org.eclipse.draw2d.ConnectionAnchor;
-import org.eclipse.draw2d.Figure;
-import org.eclipse.draw2d.FlowLayout;
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.LabelAnchor;
-import org.eclipse.draw2d.MarginBorder;
-import org.eclipse.draw2d.PositionConstants;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.jface.preference.PreferenceConverter;
-import org.eclipse.jface.resource.FontRegistry;
-import org.eclipse.jface.resource.JFaceResources;
-import org.eclipse.jst.jsf.facesconfig.ui.EditorPlugin;
-import org.eclipse.jst.jsf.facesconfig.ui.preference.GEMPreferences;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.Font;
-import org.eclipse.swt.graphics.FontData;
-import org.eclipse.swt.graphics.Image;
-
-/**
- * The figure for pageflow node, used by pageflow node edit part.
- *
- */
-public class PageflowNodeFigure extends Figure {
- /** Same connection anchors for source and target */
- protected Vector connectionAnchors = new Vector(1);
-
- /** label of the pageflow node figure */
- private NodeLabel label;
-
- /** the foreground color of Label */
- private Color labelFgColor;
-
- /** the background color of Label */
-// private Color labelBgColor; // TODO: variable is never read because getter is private
-
- /** the text placement for the label */
- private int textPlacement = PositionConstants.SOUTH;
-
- /**
- * Default constructor
- */
- public PageflowNodeFigure() {
- setLayoutManager(new FlowLayout());
-
- // initializeConnectionAnchors();
- }
-
- /**
- * get the source(output) anchor according to the input point.
- *
- * @param p -
- * the input point
- * @return - Source ConnectionAnchor
- */
- public ConnectionAnchor getSourceConnectionAnchorAt(Point p) {
- if (getSourceConnectionAnchors().size() == 0)
- return null;
- return (ConnectionAnchor) getSourceConnectionAnchors().get(0);
- }
-
- /**
- * get the default source anchor
- *
- * @return - Source ConnectionAnchor
- */
- public ConnectionAnchor getSourceConnectionAnchor() {
- if (getSourceConnectionAnchors().size() == 0)
- return null;
- return (ConnectionAnchor) getSourceConnectionAnchors().get(0);
- }
-
- /**
- * Get the source connection anchors vector
- *
- * @return - the vector
- */
- private Vector getSourceConnectionAnchors() {
- return connectionAnchors;
- }
-
- /**
- * get the target (input) connection Anchor according the input point
- *
- * @param p -
- * the input Point
- * @return - ConnectionAnchor
- */
- public ConnectionAnchor getTargetConnectionAnchorAt(Point p) {
- if (getTargetConnectionAnchors().size() == 0)
- return null;
- return (ConnectionAnchor) getTargetConnectionAnchors().get(0);
- }
-
- /**
- * get the default target (input) connection Anchor
- *
- * @return - ConnectionAnchor
- */
- public ConnectionAnchor getTargetConnectionAnchor() {
- if (getTargetConnectionAnchors().size() == 0)
- return null;
- return (ConnectionAnchor) getTargetConnectionAnchors().get(0);
- }
-
- /**
- * Get the target connection anchors vector
- *
- * @return - the vector
- */
- private Vector getTargetConnectionAnchors() {
- return connectionAnchors;
- }
-
- /**
- * update the anchors
- *
- */
- public void update() {
- initializeConnectionAnchors();
- }
-
- /**
- * Initialize the connection anchors
- *
- */
- private void initializeConnectionAnchors() {
- connectionAnchors.removeAllElements();
- ChopboxAnchor inputConnectionAnchor = new LabelAnchor(label);
- connectionAnchors.addElement(inputConnectionAnchor);
- }
-
- /**
- * get the text placement from preference.
- *
- */
- private int getTextPlacement() {
- IPreferenceStore store = EditorPlugin.getDefault().getPreferenceStore();
- String s = store.getString(GEMPreferences.LABEL_PLACEMENT);
- if (GEMPreferences.LABEL_PLACEMENT_TOP.equals(s))
- textPlacement = PositionConstants.NORTH;
- else if (GEMPreferences.LABEL_PLACEMENT_BOTTOM.equals(s))
- textPlacement = PositionConstants.SOUTH;
- else if (GEMPreferences.LABEL_PLACEMENT_LEFT.equals(s))
- textPlacement = PositionConstants.WEST;
- else if (GEMPreferences.LABEL_PLACEMENT_RIGHT.equals(s))
- textPlacement = PositionConstants.EAST;
- return textPlacement;
- }
-
- /**
- * get the label's background color from preference.
- *
- * @return
- */
- // TODO: dead code
-// private Color getLabelBackgroundColor() {
-// return labelBgColor;
-// }
-
- /**
- * get the label's foreground color from preference.
- *
- * @return
- */
- private Color getLabelForegroundColor() {
- if (labelFgColor == null) {
- IPreferenceStore store = EditorPlugin.getDefault()
- .getPreferenceStore();
- labelFgColor = GEMPreferences.getColor(store,
- GEMPreferences.FIGURE_LABEL_FONT_COLOR);
- }
- return labelFgColor;
- }
-
- /**
- * get the labe's font from preference.
- *
- * @return
- */
- private Font getLabelFont() {
- FontRegistry registry = JFaceResources.getFontRegistry();
- IPreferenceStore store = EditorPlugin.getDefault().getPreferenceStore();
- FontData fontData = PreferenceConverter.getFontData(store,
- GEMPreferences.FIGURE_LABEL_FONT);
- if (!registry.get(fontData.toString()).equals(registry.defaultFont()))
- return registry.get(fontData.toString());
-
- registry.put(fontData.toString(), new FontData[] {fontData});
- return registry.get(fontData.toString());
- }
-
- /**
- * set the image and text of the figure
- *
- * @param image -
- * the image
- * @param str -
- * the label
- */
- public void setImageText(Image image, String str) {
- if (image == null)
- setText(str);
- else if (str == null)
- setImage(image);
- else {
- if (label == null) {
- label = new NodeLabel(str, image);
- label.setTextPlacement(getTextPlacement());
- label.setForegroundColor(getLabelForegroundColor());
- label.setFont(getLabelFont());
- add(label);
- initializeConnectionAnchors();
- } else {
- label.setIcon(image);
- label.setText(str);
- }
- }
- }
-
- /**
- * set the image of the figure
- *
- * @param image -
- * the image
- */
- public void setImage(Image image) {
- if (image == null)
- return;
- if (label == null) {
- label = new NodeLabel(image);
- label.setTextPlacement(getTextPlacement());
- label.setForegroundColor(getLabelForegroundColor());
- label.setFont(getLabelFont());
- add(label);
- initializeConnectionAnchors();
- } else
- label.setIcon(image);
- }
-
- /**
- * set the text of the figure
- *
- * @param str -
- * the text
- */
- public void setText(String str) {
- if (str == null)
- return;
- if (label == null) {
- label = new NodeLabel(str);
- label.setTextPlacement(getTextPlacement());
- label.setForegroundColor(getLabelForegroundColor());
- label.setFont(getLabelFont());
- add(label);
- initializeConnectionAnchors();
- } else
- label.setText(str);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.draw2d.Figure#useLocalCoordinates()
- */
- protected boolean useLocalCoordinates() {
- return true;
- }
-
- /**
- * Returns the imageBounds.
- *
- * @return - Rectangle of image
- */
- public Rectangle getImageBounds() {
- return label.getIconBounds();
- }
-
- /**
- * Returns the textBounds.
- *
- * @return - Rectangle of text field
- */
- public Rectangle getTextBounds() {
- return label.getTextBounds();
- }
-
- /**
- * Returns the label.
- *
- * @return - Label
- */
- public Label getLabel() {
- return label;
- }
-
- /**
- * set the label's backaground
- */
- public void setBackgroundColor(Color bg) {
-// TODO: var is never read: labelBgColor = bg;
- if (label != null)
- label.setBackgroundColor(bg);
- }
-
- /**
- * set the label's foreground
- */
- public void setForegroundColor(Color fg) {
- labelFgColor = fg;
-
- if (label != null)
- label.setForegroundColor(fg);
- }
-
- /**
- * Set the label's font
- */
- public void setFont(Font f) {
- if (label != null)
- label.setFont(f);
- super.setFont(f);
- }
-
- /**
- * Set the text placement for the label
- *
- * @param where
- */
- public void setTextPlacement(int where) {
- textPlacement = where;
- if (label != null)
- label.setTextPlacement(where);
- }
-
-
- /**
- * @param text
- */
- public void setToolTipText(String text) {
- Label toolTipLabel = null;
-
- if (text != null && text.length() > 0) {
- toolTipLabel = new Label(text);
- toolTipLabel.setBorder(new MarginBorder(3));
- }
-
- super.setToolTip(toolTipLabel);
- }
- /**
- * @return the figure's tool tip text or null if none
- */
- public String getToolTipText() {
- if (getToolTip() != null)
- return ((Label) getToolTip()).getText();
- return null;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/layout/PageflowLayoutManager.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/layout/PageflowLayoutManager.java
deleted file mode 100644
index 74c3470..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/layout/PageflowLayoutManager.java
+++ /dev/null
@@ -1,550 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow.layout;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.draw2d.geometry.Insets;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.draw2d.graph.DirectedGraph;
-import org.eclipse.draw2d.graph.DirectedGraphLayout;
-import org.eclipse.draw2d.graph.Edge;
-import org.eclipse.draw2d.graph.EdgeList;
-import org.eclipse.draw2d.graph.Node;
-import org.eclipse.draw2d.graph.NodeList;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.Pageflow;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowFactory;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowLink;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowLinkBendpoint;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowNode;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowPage;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.util.PageflowModelManager;
-
-/**
- * This class is a singleton adpater to create the directed graph for the
- * specified pageflow model or update the location information of pageflow model
- * according to directed graph layout algorithms.
- *
- * @author Xiao-guang Zhang
- */
-public class PageflowLayoutManager {
- /** node's default size */
- private static final int NODE_DEFAULT_WIDTH = 50;
-
- private static final int NODE_DEFAULT_HEIGHT = 50;
-
- /**
- * the margin of the top and left , and margin between each connnected
- * directed graph.
- */
- private static final int X_SPACE = 50;
-
- private static final int Y_SPACE = 50;
-
- /** node's default padding */
- private static final int DEFAULT_PADDING = 30;
-
- private static PageflowLayoutManager manager;
-
- private Map copiedLinks = null;
-
- /**
- * constructor of PageflowDirectedGraphAdapter
- *
- */
- private PageflowLayoutManager() {
- // no external instantiation
- }
-
- /**
- * return the singleton instance of PageflowDirectedGraphAdapter
- *
- * @return - the singleton instance of PageflowDirectedGraphAdapter
- */
- static public PageflowLayoutManager getInstance() {
- if (manager == null) {
- manager = new PageflowLayoutManager();
- }
- return manager;
- }
-
- /**
- * layout pageflow using directed graph layout algorithms
- *
- * @param pageflow -
- * pageflow model
- */
- public void layoutPageflow(Pageflow pageflow) {
- List selfLoopLinks = removeSelfLoopLinks(pageflow);
-
- List lstGraph = createGraphs(pageflow);
- for (Iterator iter = lstGraph.iterator(); iter.hasNext();) {
- DirectedGraph graph = (DirectedGraph) iter.next();
- new DirectedGraphLayout().visit(graph);// .visit(graph);
- }
- updatePageflow(lstGraph);
-
- if (selfLoopLinks != null) {
- addSelfLoopLinks(pageflow, selfLoopLinks);
- }
- }
-
- /**
- * remove the self loop links from pageflow, because the layout algorithm
- * does not allow it.
- *
- * @param pageflow
- * @return
- */
- private List removeSelfLoopLinks(Pageflow pageflow) {
- List selfLoopLinks = new ArrayList();
-
- if (pageflow.getLinks() != null) {
- for (Iterator iter = pageflow.getLinks().iterator(); iter.hasNext();) {
- PageflowLink link = (PageflowLink) iter.next();
-
- if (link.getSource() == link.getTarget()) {
- iter.remove();
- link.getBendPoints().clear();
- selfLoopLinks.add(link);
- }
- }
- }
- return selfLoopLinks;
- }
-
- /**
- * add back the self loop links with updated bendpoints.
- *
- * @param pageflow
- * @param selfLoopLinks
- */
- private void addSelfLoopLinks(Pageflow pageflow, List selfLoopLinks) {
- if (pageflow.getLinks() != null && selfLoopLinks != null
- && selfLoopLinks.size() > 0) {
- EList links = pageflow.getLinks();
- for (Iterator iter = selfLoopLinks.iterator(); iter.hasNext();) {
- PageflowLink link = (PageflowLink) iter.next();
- updateSelfLoopLink(link);
- links.add(link);
- }
- }
- }
-
- /**
- * Update the bendpoints of the self loop link Follow the following style:
- *
- * LeftTop-Top | | Left----Node
- *
- * @param selfLoopLink
- */
- public static void updateSelfLoopLink(PageflowLink selfLoopLink) {
- PageflowNode sourceNode = selfLoopLink.getSource();
- Rectangle rectNode = getPageflowNodeBounds(sourceNode);
-
- EList outLinks = sourceNode.getOutlinks();
- if (outLinks != null && outLinks.size() > 0) {
- for (Iterator iter = outLinks.iterator(); iter.hasNext();) {
- PageflowLink anotherSelfLoopLink = (PageflowLink) iter.next();
- if (anotherSelfLoopLink != selfLoopLink
- && anotherSelfLoopLink.getTarget() == sourceNode) {
- rectNode = getFitnessRectangle(rectNode,
- anotherSelfLoopLink);
- }
- }
- }
-
- PageflowFactory factory = PageflowModelManager.getFactory();
- PageflowLinkBendpoint bpTop = factory.createPFLinkBendpoint();
- PageflowLinkBendpoint bpLeftTop = factory.createPFLinkBendpoint();
- PageflowLinkBendpoint bpLeft = factory.createPFLinkBendpoint();
-
- bpTop.setD1Height(-rectNode.height);
- bpTop.setD2Height(-rectNode.height);
-
- bpLeftTop.setD1Width(-rectNode.width);
- bpLeftTop.setD1Height(-rectNode.height);
- bpLeftTop.setD2Width(-rectNode.width);
- bpLeftTop.setD2Height(-rectNode.height);
-
- bpLeft.setD1Width(-rectNode.width);
- bpLeft.setD2Width(-rectNode.width);
-
- selfLoopLink.getBendPoints().add(bpTop);
- selfLoopLink.getBendPoints().add(bpLeftTop);
- selfLoopLink.getBendPoints().add(bpLeft);
- }
-
- /**
- * Calculate the fitness rectangle without conflict with the existing self
- * loop's rectangle.
- *
- * @param rectDefault
- * @param anotherSelfLoopLink
- */
- private static Rectangle getFitnessRectangle(Rectangle rectDefault,
- PageflowLink anotherSelfLoopLink) {
- EList bendPoints = anotherSelfLoopLink.getBendPoints();
- if (bendPoints != null && bendPoints.size() > 0) {
- for (Iterator iterBendPoint = bendPoints.iterator(); iterBendPoint
- .hasNext();) {
- PageflowLinkBendpoint bendPoint = (PageflowLinkBendpoint) iterBendPoint
- .next();
- if (bendPoint.getD1Width() == -rectDefault.width
- && bendPoint.getD1Height() == -rectDefault.height) {
- rectDefault = new Rectangle(0, 0, rectDefault.width
- + DEFAULT_PADDING, rectDefault.height
- + DEFAULT_PADDING);
- break;
- }
- }
- }
- return rectDefault;
- }
-
- /**
- * get the pageflow node's bounds, the orginal point is (0,0)
- *
- * @param pfNode
- * @return
- */
- private static Rectangle getPageflowNodeBounds(PageflowNode pfNode) {
- return new Rectangle(0, 0, 64, 36);
- }
-
- /**
- * get the pageflow node's border rectangle
- *
- * @param pfNode
- * @return
- */
- private static Rectangle getPageflowNodeRectangle(PageflowNode pfNode) {
- Rectangle rectNode = null;
-
- Rectangle bounds = getPageflowNodeBounds(pfNode);
-
- rectNode = new Rectangle(pfNode.getX(), pfNode.getY(), bounds.width,
- bounds.height);
-
- return rectNode;
- }
-
- /**
- * create the connected subgraphs for the pageflow model, because there
- * maybe more than one connected graph in one pageflow definition.
- *
- * @param pageflow -
- * Pageflow model
- * @return - the connected subgraphs
- */
- private List createGraphs(Pageflow pageflow) {
- /** the connected subgraphs */
- List lstGraph = null;
-
- if (pageflow != null) {
- // Graph is not connected totally.
- DirectedGraph graph = null;
- HashMap nodesMap = new HashMap();
-
- NodeList nodes = new NodeList();
- EdgeList edges = new EdgeList();
-
- // get all nodes in the pageflow
- List pfNodes = pageflow.getNodes();
- if (pfNodes != null) {
- for (Iterator iter = pfNodes.iterator(); iter.hasNext();) {
- PageflowNode pfNode = (PageflowNode) iter.next();
- Node node = new Node(pfNode);
- Rectangle rectNode = null;
- rectNode = getPageflowNodeBounds(pfNode);
- if (rectNode != null) {
- node.width = rectNode.width * 2;
- node.height = rectNode.height * 2;
- node.setPadding(new Insets(node.height, node.width,
- node.height, node.width));
- } else {
- node.width = NODE_DEFAULT_WIDTH;
- node.height = NODE_DEFAULT_HEIGHT;
- node.setPadding(new Insets(DEFAULT_PADDING));
- }
- nodesMap.put(pfNode, node);
- nodes.add(node);
- }
- }
- // get all edges in the pageflow
- List pfLinks = pageflow.getLinks();
- for (Iterator iter = pfLinks.iterator(); iter.hasNext();) {
- PageflowLink link = (PageflowLink) iter.next();
- PageflowNode source = link.getSource();
- PageflowNode target = link.getTarget();
- Node sourceNode = (Node) nodesMap.get(source);
- Node targetNode = (Node) nodesMap.get(target);
-
- if (sourceNode != null && targetNode != null) {
- Edge edge = new Edge(sourceNode, targetNode);
- edges.add(edge);
- }
- }
-
- graph = new DirectedGraph();
-
- graph.nodes = nodes;
- graph.edges = edges;
-
- // get the connected subgraphs.
- lstGraph = new ArrayList();
- lstGraph.add(graph);// ..getConnectedSubGraphs();
- }
- return lstGraph;
- }
-
- /**
- * update the pageflow according to layout results which are stored in the
- * connected subgraphs
- *
- * @param lstGraph -
- * connected subgraphs
- *
- */
- private void updatePageflow(List lstGraph) {
- // y coordiantion of the subgraph's start point
- int topSubGraph = 0;
-
- for (Iterator iter = lstGraph.iterator(); iter.hasNext();) {
- // sub graph's bottom
- int bottomSubGraph = 0;
- DirectedGraph graph = (DirectedGraph) iter.next();
- for (int i = 0; i < graph.nodes.size(); i++) {
- Node node = graph.nodes.getNode(i);
- if (!(node.data instanceof PageflowNode)) {
- continue;
- }
- PageflowNode pfNode = (PageflowNode) node.data;
- pfNode.setX(X_SPACE + node.y);
-
- pfNode.setY(Y_SPACE + node.x + topSubGraph);
-
- if ((Y_SPACE + node.x + topSubGraph) > bottomSubGraph) {
- bottomSubGraph = Y_SPACE + node.x + topSubGraph;
- }
- }
- topSubGraph = bottomSubGraph + Y_SPACE;
- }
- }
-
- /**
- * update new pageflow's layout using the existing one.
- * @param newPageflow
- * @param oldPageflow
- */
- public void updatePageflowLayout(Pageflow newPageflow, Pageflow oldPageflow) {
- List notUpdatedNodes = new ArrayList();
-
- copiedLinks = new HashMap();
-
- if (oldPageflow.getNodes().size() > 0) {
- for (Iterator iter = newPageflow.getNodes().iterator(); iter
- .hasNext();) {
- PageflowNode newNode = (PageflowNode) iter.next();
-
- if (!updatePageflowNode(newNode, oldPageflow)) {
- notUpdatedNodes.add(newNode);
- }
- }
- } else {
- notUpdatedNodes.addAll(newPageflow.getNodes());
- }
-
- if (oldPageflow.getLinks().size() > 0) {
- for (Iterator iter = newPageflow.getLinks().iterator(); iter
- .hasNext();) {
- PageflowLink newLink = (PageflowLink) iter.next();
-
- updatePFLink(newLink, oldPageflow);
- }
- }
-
- // if there are still some nodes which are not updated,
- // they should be check whether there are some layout conflict.
- if (notUpdatedNodes.size() > 0) {
- resolveConflict(newPageflow, notUpdatedNodes);
- }
-
- }
-
- /**
- * Update pageflow node using the same node
- *
- * @param object
- * @return - the old pageflow node.
- */
- private boolean updatePageflowNode(PageflowNode newNode,
- Pageflow oldPageflow) {
- for (Iterator iter = oldPageflow.getNodes().iterator(); iter.hasNext();) {
- PageflowNode oldNode = (PageflowNode) iter.next();
-
- if (oldNode instanceof PageflowPage
- && newNode instanceof PageflowPage) {
- if (((PageflowPage) oldNode).getPath().trim().equals(
- ((PageflowPage) newNode).getPath().trim())) {
- updatePageflowNode(newNode, oldNode);
- return true;
- }
- }
- }
- return false;
- }
-
- /**
- * Update pageflow node using the same node
- *
- * @param object
- */
- private void updatePageflowNode(PageflowNode newNode, PageflowNode node) {
- newNode.setX(node.getX());
- newNode.setY(node.getY());
- }
-
- /**
- * If there are conflict for the nodes, it will resolve it.
- *
- * @param newPageflow
- * @param notUpdatedNodes
- */
- private void resolveConflict(Pageflow newPageflow, List notUpdatedNodes) {
- for (Iterator iter = notUpdatedNodes.iterator(); iter.hasNext();) {
- resolveConflict(newPageflow, (PageflowNode) iter.next());
- }
- }
-
- /**
- * Resolve the layout conflict
- *
- * @param newPageflow
- * @param node
- */
- private void resolveConflict(Pageflow newPageflow, PageflowNode node) {
- Rectangle nodeRect = getPageflowNodeRectangle(node);
- boolean bModified = false;
- for (int i = 0, size = newPageflow.getNodes().size(); i < size; i++) {
- PageflowNode fixedNode = (PageflowNode) newPageflow.getNodes().get(
- i);
- if (node == fixedNode) {
- continue;
- }
- Rectangle fixedNodeRect = getPageflowNodeRectangle(fixedNode);
- if (fixedNodeRect.intersects(nodeRect)) {
- nodeRect.x += fixedNodeRect.width + X_SPACE;
- nodeRect.y += fixedNodeRect.height + Y_SPACE;
- bModified = true;
- }
- }
- if (bModified) {
- node.setX(nodeRect.x);
- node.setY(nodeRect.y);
- }
- }
-
- /**
- * Update the link using the same link in the old pageflow
- *
- * @param newLink
- * @param oldPageflow
- */
- private void updatePFLink(PageflowLink newLink, Pageflow oldPageflow) {
- for (Iterator iter = oldPageflow.getLinks().iterator(); iter.hasNext();) {
- PageflowLink oldLink = (PageflowLink) iter.next();
-
- if (copiedLinks.get(oldLink) != null) {
- continue;
- }
-
- if (isSameLink(newLink, oldLink)) {
- updatePFLink(newLink, oldLink);
- break;
- }
- }
- }
-
- /**
- * Check whether this two links in differnet pageflow are same or not.
- *
- * @param newLink
- * @param oldLink
- * @return
- */
- private boolean isSameLink(PageflowLink newLink, PageflowLink oldLink) {
- PageflowNode newSource = newLink.getSource();
- PageflowNode newTarget = newLink.getTarget();
-
- PageflowNode oldSource = oldLink.getSource();
- PageflowNode oldTarget = oldLink.getTarget();
-
- // Page-Page
- if (newSource instanceof PageflowPage
- && oldSource instanceof PageflowPage
- && newTarget instanceof PageflowPage
- && oldTarget instanceof PageflowPage) {
- if (((PageflowPage) newSource).getPath().trim().equalsIgnoreCase(
- ((PageflowPage) oldSource).getPath().trim())
- && ((PageflowPage) newTarget)
- .getPath()
- .trim()
- .equalsIgnoreCase(
- ((PageflowPage) oldTarget).getPath().trim())) {
- if ((newLink.getOutcome() == null && oldLink.getOutcome() == null)
- || (newLink.getOutcome() != null
- && oldLink.getOutcome() != null && newLink
- .getOutcome().trim().equals(
- oldLink.getOutcome().trim()))) {
- return true;
- }
- }
- }
-
- return false;
- }
-
- /**
- * Update the link using the same link
- *
- * @param nodesMap
- * @param object
- * @return
- */
- private PageflowLink updatePFLink(PageflowLink newLink, PageflowLink link) {
- PageflowFactory factory = PageflowModelManager.getFactory();
-
- newLink.getBendPoints().clear();
-
- for (Iterator iter = link.getBendPoints().iterator(); iter.hasNext();) {
- PageflowLinkBendpoint bendPoint = (PageflowLinkBendpoint) iter
- .next();
- PageflowLinkBendpoint newBendPoint = factory
- .createPFLinkBendpoint();
- newBendPoint.setD1Height(bendPoint.getD1Height());
- newBendPoint.setD1Width(bendPoint.getD1Width());
- newBendPoint.setD2Height(bendPoint.getD2Height());
- newBendPoint.setD2Width(bendPoint.getD2Width());
- newLink.getBendPoints().add(newBendPoint);
- }
-
- copiedLinks.put(link, link);
- return newLink;
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/model/Pageflow.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/model/Pageflow.java
deleted file mode 100644
index b76fdaf..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/model/Pageflow.java
+++ /dev/null
@@ -1,121 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow.model;
-
-import org.eclipse.emf.common.util.EList;
-
-/**
- * <!-- begin-user-doc --> A representation of the model object '<em><b>Pageflow</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- * <li>{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.Pageflow#getNodes <em>Nodes</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.Pageflow#getLinks <em>Links</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.Pageflow#getConfigfile <em>Configfile</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowPackage#getPageflow()
- * @model
- * @generated
- */
-public interface Pageflow extends PageflowElement {
- /**
- * Returns the value of the '<em><b>Nodes</b></em>' containment
- * reference list. The list contents are of type
- * {@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowNode}.
- * It is bidirectional and its opposite is '{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowNode#getPageflow <em>Pageflow</em>}'.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Nodes</em>' containment reference list
- * isn't clear, there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- *
- * @return the value of the '<em>Nodes</em>' containment reference list.
- * @see org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowPackage#getPageflow_Nodes()
- * @see org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowNode#getPageflow
- * @model type="org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowNode"
- * opposite="pageflow" containment="true"
- * @generated
- */
- EList getNodes();
-
- /**
- * Returns the value of the '<em><b>Links</b></em>' containment
- * reference list. The list contents are of type
- * {@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowLink}. It
- * is bidirectional and its opposite is '{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowLink#getPageflow <em>Pageflow</em>}'.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Links</em>' containment reference list
- * isn't clear, there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- *
- * @return the value of the '<em>Links</em>' containment reference list.
- * @see org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowPackage#getPageflow_Links()
- * @see org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowLink#getPageflow
- * @model type="org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PFLink"
- * opposite="pageflow" containment="true"
- * @generated
- */
- EList getLinks();
-
- /**
- * Returns the value of the '<em><b>Configfile</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Configfile</em>' attribute isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- *
- * @return the value of the '<em>Configfile</em>' attribute.
- * @see #setConfigfile(String)
- * @see org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowPackage#getPageflow_Configfile()
- * @model
- * @generated
- */
- String getConfigfile();
-
- /**
- * Sets the value of the '{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.Pageflow#getConfigfile <em>Configfile</em>}'
- * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @param value
- * the new value of the '<em>Configfile</em>' attribute.
- * @see #getConfigfile()
- * @generated
- */
- void setConfigfile(String value);
-
- /**
- *
- * @param source
- * @param target
- * @param link
- * @generated NOT
- */
- public void connect(PageflowNode source, PageflowNode target, PageflowLink link);
-
- /**
- *
- * @param nodeType
- * @return the default node name
- * @generated NOT
- */
- public String getDefaultNodeName(Class nodeType);
-}
-// Pageflow
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/model/PageflowElement.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/model/PageflowElement.java
deleted file mode 100644
index ba2ee9b..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/model/PageflowElement.java
+++ /dev/null
@@ -1,292 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow.model;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.impl.ReferenceElement;
-
-/**
- * <!-- begin-user-doc --> A representation of the model object '<em><b>Element</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- * <li>{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowElement#getName <em>Name</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowElement#getComment <em>Comment</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowElement#getX <em>X</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowElement#getY <em>Y</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowElement#getWidth <em>Width</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowElement#getHeight <em>Height</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowElement#getId <em>Id</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowPackage#getPageflowElement()
- * @model abstract="true"
- * @generated
- */
-public interface PageflowElement extends EObject {
- /**
- * The pageflow model is based on faces-config model, its elements will
- * reference faces-config elements with ReferenceElement.
- * @return the ref element
- *
- * @generated NOT
- */
- public ReferenceElement getFCElements();
-
- /**
- * Returns the value of the '<em><b>Name</b></em>' attribute. The
- * default value is <code>"unnamed"</code>. <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Name</em>' attribute isn't clear, there
- * really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- *
- * @return the value of the '<em>Name</em>' attribute.
- * @see #setName(String)
- * @see org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowPackage#getPageflowElement_Name()
- * @model default="unnamed"
- * @generated
- */
- String getName();
-
- /**
- * Sets the value of the '{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowElement#getName <em>Name</em>}'
- * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @param value
- * the new value of the '<em>Name</em>' attribute.
- * @see #getName()
- * @generated
- */
- void setName(String value);
-
- /**
- * Returns the value of the '<em><b>Comment</b></em>' attribute. <!--
- * begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Comment</em>' attribute isn't clear, there
- * really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- *
- * @return the value of the '<em>Comment</em>' attribute.
- * @see #setComment(String)
- * @see org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowPackage#getPageflowElement_Comment()
- * @model
- * @generated
- */
- String getComment();
-
- /**
- * Sets the value of the '{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowElement#getComment <em>Comment</em>}'
- * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @param value
- * the new value of the '<em>Comment</em>' attribute.
- * @see #getComment()
- * @generated
- */
- void setComment(String value);
-
- /**
- * Returns the value of the '<em><b>X</b></em>' attribute. The default
- * value is <code>"0"</code>. <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>X</em>' attribute isn't clear, there
- * really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- *
- * @return the value of the '<em>X</em>' attribute.
- * @see #setX(int)
- * @see org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowPackage#getPageflowElement_X()
- * @model default="0"
- * @generated
- */
- int getX();
-
- /**
- * Sets the value of the '{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowElement#getX <em>X</em>}'
- * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @param value
- * the new value of the '<em>X</em>' attribute.
- * @see #getX()
- * @generated
- */
- void setX(int value);
-
- /**
- * Returns the value of the '<em><b>Y</b></em>' attribute. The default
- * value is <code>"0"</code>. <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Y</em>' attribute isn't clear, there
- * really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- *
- * @return the value of the '<em>Y</em>' attribute.
- * @see #setY(int)
- * @see org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowPackage#getPageflowElement_Y()
- * @model default="0"
- * @generated
- */
- int getY();
-
- /**
- * Sets the value of the '{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowElement#getY <em>Y</em>}'
- * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @param value
- * the new value of the '<em>Y</em>' attribute.
- * @see #getY()
- * @generated
- */
- void setY(int value);
-
- /**
- * Returns the value of the '<em><b>Width</b></em>' attribute. The
- * default value is <code>"-1"</code>. <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Width</em>' attribute isn't clear, there
- * really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- *
- * @return the value of the '<em>Width</em>' attribute.
- * @see #setWidth(int)
- * @see org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowPackage#getPageflowElement_Width()
- * @model default="-1"
- * @generated
- */
- int getWidth();
-
- /**
- * Sets the value of the '{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowElement#getWidth <em>Width</em>}'
- * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @param value
- * the new value of the '<em>Width</em>' attribute.
- * @see #getWidth()
- * @generated
- */
- void setWidth(int value);
-
- /**
- * Returns the value of the '<em><b>Height</b></em>' attribute. The
- * default value is <code>"-1"</code>. <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Height</em>' attribute isn't clear, there
- * really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- *
- * @return the value of the '<em>Height</em>' attribute.
- * @see #setHeight(int)
- * @see org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowPackage#getPageflowElement_Height()
- * @model default="-1"
- * @generated
- */
- int getHeight();
-
- /**
- * Sets the value of the '{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowElement#getHeight <em>Height</em>}'
- * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @param value
- * the new value of the '<em>Height</em>' attribute.
- * @see #getHeight()
- * @generated
- */
- void setHeight(int value);
-
- /**
- * Returns the value of the '<em><b>Id</b></em>' attribute. <!--
- * begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Id</em>' attribute isn't clear, there
- * really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- *
- * @return the value of the '<em>Id</em>' attribute.
- * @see #setId(String)
- * @see org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowPackage#getPageflowElement_Id()
- * @model id="true" required="true" volatile="true"
- * @generated
- */
- String getId();
-
- /**
- * Sets the value of the '{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowElement#getId <em>Id</em>}'
- * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @param value
- * the new value of the '<em>Id</em>' attribute.
- * @see #getId()
- * @generated
- */
- void setId(String value);
-
- /**
- * Returns the value of the '<em><b>Reference Link</b></em>' attribute.
- * The default value is <code>""</code>. <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Reference Link</em>' attribute isn't
- * clear, there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- *
- * @return the value of the '<em>Reference Link</em>' attribute.
- * @see #setReferenceLink(String)
- * @model default="" dataType="org.eclipse.emf.ecore.xml.type.String"
- * extendedMetaData="kind='attribute' name='referenceLink'"
- * @generated
- */
- String getReferenceLink();
-
- /**
- * Sets the value of the '{@link PageflowElement#getReferenceLink() <em>Reference Link</em>}'
- * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @param value
- * the new value of the '<em>Reference Link</em>' attribute.
- * @see #getReferenceLink()
- * @generated
- */
- void setReferenceLink(String value);
-
- /**
- * @param nofitification
- * @generated NOT
- */
- void notifyModelChanged(Notification nofitification);
-
- /**
- * When the model is modified, the adapters or reference elements should be
- * updated.
- *
- * @generated NOT
- */
- void update();
-
- /**
- * @generated NOT
- */
- void dispose();
-}
-// PageflowElement
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/model/PageflowFactory.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/model/PageflowFactory.java
deleted file mode 100644
index 3d52525..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/model/PageflowFactory.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow.model;
-
-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.jst.jsf.facesconfig.ui.pageflow.model.PageflowPackage
- * @generated
- */
-public interface PageflowFactory extends EFactory {
- /**
- * The singleton instance of the factory. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- PageflowFactory eINSTANCE = new org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.impl.PageflowFactoryImpl();
-
- /**
- * Returns a new object of class '<em>Pageflow</em>'. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @return a new object of class '<em>Pageflow</em>'.
- * @generated
- */
- Pageflow createPageflow();
-
- /**
- * Returns a new object of class '<em>PF Link</em>'. <!-- begin-user-doc
- * --> <!-- end-user-doc -->
- *
- * @return a new object of class '<em>PF Link</em>'.
- * @generated
- */
- PageflowLink createPFLink();
-
- /**
- * Returns a new object of class '<em>PF Page</em>'. <!-- begin-user-doc
- * --> <!-- end-user-doc -->
- *
- * @return a new object of class '<em>PF Page</em>'.
- * @generated
- */
- PageflowPage createPFPage();
-
- /**
- * Returns a new object of class '<em>PF Link Bendpoint</em>'. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @return a new object of class '<em>PF Link Bendpoint</em>'.
- * @generated
- */
- PageflowLinkBendpoint createPFLinkBendpoint();
-
- /**
- * Returns the package supported by this factory. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @return the package supported by this factory.
- * @generated
- */
- PageflowPackage getPageflowPackage();
-
-}
-// PageflowFactory
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/model/PageflowLink.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/model/PageflowLink.java
deleted file mode 100644
index ac22bcd..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/model/PageflowLink.java
+++ /dev/null
@@ -1,326 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow.model;
-
-import java.util.Vector;
-
-import org.eclipse.emf.common.util.EList;
-
-/**
- * <!-- begin-user-doc --> A representation of the model object '<em><b>PF Link</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- * <li>{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowLink#getPageflow <em>Pageflow</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowLink#getTarget <em>Target</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowLink#getSource <em>Source</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowLink#getSmallicon <em>Smallicon</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowLink#getLargeicon <em>Largeicon</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowLink#getFromaction <em>Fromaction</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowLink#getOutcome <em>Outcome</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowLink#isRedirect <em>Redirect</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowLink#getBendPoints <em>Bend Points</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowPackage#getPFLink()
- * @model
- * @generated
- */
-public interface PageflowLink extends PageflowElement {
- /**
- * Returns the value of the '<em><b>Pageflow</b></em>' container reference.
- * It is bidirectional and its opposite is '{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.Pageflow#getLinks <em>Links</em>}'.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Pageflow</em>' container reference isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @return the value of the '<em>Pageflow</em>' container reference.
- * @see #setPageflow(Pageflow)
- * @see org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowPackage#getPFLink_Pageflow()
- * @see org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.Pageflow#getLinks
- * @model opposite="links" required="true"
- * @generated
- */
- Pageflow getPageflow();
-
- /**
- * Sets the value of the '{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowLink#getPageflow <em>Pageflow</em>}' container reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Pageflow</em>' container reference.
- * @see #getPageflow()
- * @generated
- */
- void setPageflow(Pageflow value);
-
- /**
- * Returns the value of the '<em><b>Target</b></em>' reference.
- * It is bidirectional and its opposite is '{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowNode#getInlinks <em>Inlinks</em>}'.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Target</em>' reference isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @return the value of the '<em>Target</em>' reference.
- * @see #setTarget(PageflowNode)
- * @see org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowPackage#getPFLink_Target()
- * @see org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowNode#getInlinks
- * @model opposite="inlinks" required="true"
- * @generated
- */
- PageflowNode getTarget();
-
- /**
- * @param path
- */
- void setTargetPath(String path);
-
- /**
- * @param path
- */
- void setSourcePath(String path);
-
- /**
- * Sets the value of the '{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowLink#getTarget <em>Target</em>}' reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Target</em>' reference.
- * @see #getTarget()
- * @generated
- */
- void setTarget(PageflowNode value);
-
- /**
- * Returns the value of the '<em><b>Source</b></em>' reference.
- * It is bidirectional and its opposite is '{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowNode#getOutlinks <em>Outlinks</em>}'.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Source</em>' reference isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @return the value of the '<em>Source</em>' reference.
- * @see #setSource(PageflowNode)
- * @see org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowPackage#getPFLink_Source()
- * @see org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowNode#getOutlinks
- * @model opposite="outlinks" required="true"
- * @generated
- */
- PageflowNode getSource();
-
- /**
- * Sets the value of the '{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowLink#getSource <em>Source</em>}' reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Source</em>' reference.
- * @see #getSource()
- * @generated
- */
- void setSource(PageflowNode value);
-
- /**
- * Returns the value of the '<em><b>Smallicon</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Smallicon</em>' attribute isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @return the value of the '<em>Smallicon</em>' attribute.
- * @see #setSmallicon(String)
- * @model
- * @generated
- */
- String getSmallicon();
-
- /**
- * Sets the value of the '{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowLink#getSmallicon <em>Smallicon</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Smallicon</em>' attribute.
- * @see #getSmallicon()
- * @generated
- */
- void setSmallicon(String value);
-
- /**
- * Returns the value of the '<em><b>Largeicon</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Largeicon</em>' attribute isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @return the value of the '<em>Largeicon</em>' attribute.
- * @see #setLargeicon(String)
- * @model
- * @generated
- */
- String getLargeicon();
-
- /**
- * Sets the value of the '{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowLink#getLargeicon <em>Largeicon</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Largeicon</em>' attribute.
- * @see #getLargeicon()
- * @generated
- */
- void setLargeicon(String value);
-
- /**
- * Returns the value of the '<em><b>Fromaction</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Fromaction</em>' attribute isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @return the value of the '<em>Fromaction</em>' attribute.
- * @see #setFromaction(String)
- * @see org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowPackage#getPFLink_Fromaction()
- * @model
- * @generated
- */
- String getFromaction();
-
- /**
- * Sets the value of the '{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowLink#getFromaction <em>Fromaction</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Fromaction</em>' attribute.
- * @see #getFromaction()
- * @generated
- */
- void setFromaction(String value);
-
- /**
- * Returns the value of the '<em><b>Outcome</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Outcome</em>' attribute isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @return the value of the '<em>Outcome</em>' attribute.
- * @see #setOutcome(String)
- * @see org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowPackage#getPFLink_Outcome()
- * @model
- * @generated
- */
- String getOutcome();
-
- /**
- * Sets the value of the '{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowLink#getOutcome <em>Outcome</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Outcome</em>' attribute.
- * @see #getOutcome()
- * @generated
- */
- void setOutcome(String value);
-
- /**
- * Returns the value of the '<em><b>Redirect</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Redirect</em>' attribute isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @return the value of the '<em>Redirect</em>' attribute.
- * @see #setRedirect(boolean)
- * @see org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowPackage#getPFLink_Redirect()
- * @model
- * @generated
- */
- boolean isRedirect();
-
- /**
- * Sets the value of the '{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowLink#isRedirect <em>Redirect</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Redirect</em>' attribute.
- * @see #isRedirect()
- * @generated
- */
- void setRedirect(boolean value);
-
- /**
- * Returns the value of the '<em><b>Bend Points</b></em>' containment reference list.
- * The list contents are of type {@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowLinkBendpoint}.
- * It is bidirectional and its opposite is '{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowLinkBendpoint#getLink <em>Link</em>}'.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Bend Points</em>' containment reference list isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @return the value of the '<em>Bend Points</em>' containment reference list.
- * @see org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowPackage#getPFLink_BendPoints()
- * @see org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowLinkBendpoint#getLink
- * @model type="org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PFLinkBendpoint" opposite="link" containment="true"
- * @generated
- */
- EList getBendPoints();
-
- /**
- * <!-- begin-user-doc -->
- * insert a new bendpoint to the link
- * @param index
- * @param point
- * <!--end-user-doc -->
- *
- * @generated NOT
- */
- public void insertBendpoint(int index, PageflowLinkBendpoint point);
-
- /**
- * <!-- begin-user-doc -->
- * remove the current bendpoint
- * @param index
- * <!-- end-user-doc -->
- *
- * @generated NOT
- */
- public void removeBendpoint(int index);
-
- /**
- * <!-- begin-user-doc -->
- * Set the current bendpoint
- *
- * @param index
- * @param point
- * <!-- end-user-doc -->
- *
- * @generated NOT
- */
- public void setBendpoint(int index, PageflowLinkBendpoint point);
-
- /**
- * <!-- begin-user-doc -->
- * Set a group of bendpoints to reconstruct the link
- * @param points
- * <!-- end-user-doc -->
- *
- * @generated NOT
- */
- public void setBendpoints(Vector points);
-
-}
-// PFLink
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/model/PageflowLinkBendpoint.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/model/PageflowLinkBendpoint.java
deleted file mode 100644
index 4e40709..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/model/PageflowLinkBendpoint.java
+++ /dev/null
@@ -1,237 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow.model;
-
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc --> A representation of the model object '<em><b>PF Link Bendpoint</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- * <li>{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowLinkBendpoint#getD1Width <em>D1 Width</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowLinkBendpoint#getD1Height <em>D1 Height</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowLinkBendpoint#getD2Width <em>D2 Width</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowLinkBendpoint#getD2Height <em>D2 Height</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowLinkBendpoint#getWeight <em>Weight</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowLinkBendpoint#getLink <em>Link</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowPackage#getPFLinkBendpoint()
- * @model
- * @generated
- */
-public interface PageflowLinkBendpoint extends EObject {
- /**
- * Returns the value of the '<em><b>D1 Width</b></em>' attribute. <!--
- * begin-user-doc -->
- * <p>
- * If the meaning of the '<em>D1 Width</em>' attribute isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- *
- * @return the value of the '<em>D1 Width</em>' attribute.
- * @see #setD1Width(int)
- * @see org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowPackage#getPFLinkBendpoint_D1Width()
- * @model
- * @generated
- */
- int getD1Width();
-
- /**
- * Sets the value of the '{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowLinkBendpoint#getD1Width <em>D1 Width</em>}'
- * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @param value
- * the new value of the '<em>D1 Width</em>' attribute.
- * @see #getD1Width()
- * @generated
- */
- void setD1Width(int value);
-
- /**
- * Returns the value of the '<em><b>D1 Height</b></em>' attribute. <!--
- * begin-user-doc -->
- * <p>
- * If the meaning of the '<em>D1 Height</em>' attribute isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- *
- * @return the value of the '<em>D1 Height</em>' attribute.
- * @see #setD1Height(int)
- * @see org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowPackage#getPFLinkBendpoint_D1Height()
- * @model
- * @generated
- */
- int getD1Height();
-
- /**
- * Sets the value of the '{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowLinkBendpoint#getD1Height <em>D1 Height</em>}'
- * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @param value
- * the new value of the '<em>D1 Height</em>' attribute.
- * @see #getD1Height()
- * @generated
- */
- void setD1Height(int value);
-
- /**
- * Returns the value of the '<em><b>D2 Width</b></em>' attribute. <!--
- * begin-user-doc -->
- * <p>
- * If the meaning of the '<em>D2 Width</em>' attribute isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- *
- * @return the value of the '<em>D2 Width</em>' attribute.
- * @see #setD2Width(int)
- * @see org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowPackage#getPFLinkBendpoint_D2Width()
- * @model
- * @generated
- */
- int getD2Width();
-
- /**
- * Sets the value of the '{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowLinkBendpoint#getD2Width <em>D2 Width</em>}'
- * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @param value
- * the new value of the '<em>D2 Width</em>' attribute.
- * @see #getD2Width()
- * @generated
- */
- void setD2Width(int value);
-
- /**
- * Returns the value of the '<em><b>D2 Height</b></em>' attribute. <!--
- * begin-user-doc -->
- * <p>
- * If the meaning of the '<em>D2 Height</em>' attribute isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- *
- * @return the value of the '<em>D2 Height</em>' attribute.
- * @see #setD2Height(int)
- * @see org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowPackage#getPFLinkBendpoint_D2Height()
- * @model
- * @generated
- */
- int getD2Height();
-
- /**
- * Sets the value of the '{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowLinkBendpoint#getD2Height <em>D2 Height</em>}'
- * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @param value
- * the new value of the '<em>D2 Height</em>' attribute.
- * @see #getD2Height()
- * @generated
- */
- void setD2Height(int value);
-
- /**
- * Returns the value of the '<em><b>Weight</b></em>' attribute. The
- * default value is <code>"0.5"</code>. <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Weight</em>' attribute isn't clear, there
- * really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- *
- * @return the value of the '<em>Weight</em>' attribute.
- * @see #setWeight(float)
- * @see org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowPackage#getPFLinkBendpoint_Weight()
- * @model default="0.5"
- * @generated
- */
- float getWeight();
-
- /**
- * Sets the value of the '{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowLinkBendpoint#getWeight <em>Weight</em>}'
- * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @param value
- * the new value of the '<em>Weight</em>' attribute.
- * @see #getWeight()
- * @generated
- */
- void setWeight(float value);
-
- /**
- * Returns the value of the '<em><b>Link</b></em>' container reference.
- * It is bidirectional and its opposite is '{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowLink#getBendPoints <em>Bend Points</em>}'.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Link</em>' container reference isn't
- * clear, there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- *
- * @return the value of the '<em>Link</em>' container reference.
- * @see #setLink(PageflowLink)
- * @see org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowPackage#getPFLinkBendpoint_Link()
- * @see org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowLink#getBendPoints
- * @model opposite="bendPoints" required="true"
- * @generated
- */
- PageflowLink getLink();
-
- /**
- * Sets the value of the '{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowLinkBendpoint#getLink <em>Link</em>}'
- * container reference. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @param value
- * the new value of the '<em>Link</em>' container reference.
- * @see #getLink()
- * @generated
- */
- void setLink(PageflowLink value);
-
- /**
- * <!-- begin-user-doc -->
- * @return the first relative dim
- * <!-- end-user-doc -->
- *
- * @generated NOT
- */
- public Dimension getFirstRelativeDimension();
-
- /**
- * <!-- begin-user-doc -->
- * @return the second relative dim
- * <!-- end-user-doc -->
- *
- * @generated NOT
- */
- public Dimension getSecondRelativeDimension();
-
- /**
- * <!-- begin-user-doc -->
- * @param dim1
- * @param dim2
- * <!-- end-user-doc -->
- *
- * @generated NOT
- */
- public void setRelativeDimensions(Dimension dim1, Dimension dim2);
-
-}
-// PFLinkBendpoint
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/model/PageflowNode.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/model/PageflowNode.java
deleted file mode 100644
index 0559bad..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/model/PageflowNode.java
+++ /dev/null
@@ -1,115 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow.model;
-
-import org.eclipse.emf.common.util.EList;
-
-/**
- * <!-- begin-user-doc --> A representation of the model object '<em><b>Node</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- * <li>{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowNode#getPageflow <em>Pageflow</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowNode#getOutlinks <em>Outlinks</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowNode#getInlinks <em>Inlinks</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowPackage#getPageflowNode()
- * @model abstract="true"
- * @generated
- */
-public interface PageflowNode extends PageflowElement {
- /**
- * Returns the value of the '<em><b>Pageflow</b></em>' container
- * reference. It is bidirectional and its opposite is '{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.Pageflow#getNodes <em>Nodes</em>}'.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Pageflow</em>' container reference isn't
- * clear, there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- *
- * @return the value of the '<em>Pageflow</em>' container reference.
- * @see #setPageflow(Pageflow)
- * @see org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowPackage#getPageflowNode_Pageflow()
- * @see org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.Pageflow#getNodes
- * @model opposite="nodes" required="true"
- * @generated
- */
- Pageflow getPageflow();
-
- /**
- * Sets the value of the '{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowNode#getPageflow <em>Pageflow</em>}'
- * container reference. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @param value
- * the new value of the '<em>Pageflow</em>' container
- * reference.
- * @see #getPageflow()
- * @generated
- */
- void setPageflow(Pageflow value);
-
- /**
- * Returns the value of the '<em><b>Outlinks</b></em>' reference list.
- * The list contents are of type
- * {@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowLink}. It
- * is bidirectional and its opposite is '{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowLink#getSource <em>Source</em>}'.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Outlinks</em>' reference list isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- *
- * @return the value of the '<em>Outlinks</em>' reference list.
- * @see org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowPackage#getPageflowNode_Outlinks()
- * @see org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowLink#getSource
- * @model type="org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PFLink"
- * opposite="source"
- * @generated
- */
- EList getOutlinks();
-
- /**
- * Returns the value of the '<em><b>Inlinks</b></em>' reference list.
- * The list contents are of type
- * {@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowLink}. It
- * is bidirectional and its opposite is '{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowLink#getTarget <em>Target</em>}'.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Inlinks</em>' reference list isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- *
- * @return the value of the '<em>Inlinks</em>' reference list.
- * @see org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowPackage#getPageflowNode_Inlinks()
- * @see org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowLink#getTarget
- * @model type="org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PFLink"
- * opposite="target"
- * @generated
- */
- EList getInlinks();
-
- /**
- * @param target
- * @return the page flow node
- * @generated NOT
- */
- PageflowLink findLinkTo(PageflowNode target);
-
-}
-// PageflowNode
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/model/PageflowPackage.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/model/PageflowPackage.java
deleted file mode 100644
index e507142..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/model/PageflowPackage.java
+++ /dev/null
@@ -1,1161 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow.model;
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EReference;
-
-/**
- * <!-- begin-user-doc --> The <b>Package</b> for the model. It contains
- * accessors for the meta objects to represent
- * <ul>
- * <li>each class,</li>
- * <li>each feature of each class,</li>
- * <li>each enum,</li>
- * <li>and each data type</li>
- * </ul>
- * <!-- end-user-doc -->
- *
- * @see org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowFactory
- * @generated
- */
-public interface PageflowPackage extends EPackage {
- /**
- * The package name. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- String eNAME = "pageflow"; //$NON-NLS-1$
-
- /**
- * The package namespace URI. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- String eNS_URI = "http://www.sybase.com/suade/pageflow"; //$NON-NLS-1$
-
- /**
- * The package namespace name. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- String eNS_PREFIX = "pageflow"; //$NON-NLS-1$
-
- /**
- * The singleton instance of the package. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- PageflowPackage eINSTANCE = org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.impl.PageflowPackageImpl
- .init();
-
- /**
- * The meta object id for the '{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.impl.PageflowElementImpl <em>Element</em>}'
- * class. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @see org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.impl.PageflowElementImpl
- * @see org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.impl.PageflowPackageImpl#getPageflowElement()
- * @generated
- */
- int PAGEFLOW_ELEMENT = 3;
-
- /**
- * The feature id for the '<em><b>Name</b></em>' attribute. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int PAGEFLOW_ELEMENT__NAME = 0;
-
- /**
- * The feature id for the '<em><b>Comment</b></em>' attribute. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int PAGEFLOW_ELEMENT__COMMENT = 1;
-
- /**
- * The feature id for the '<em><b>X</b></em>' attribute. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int PAGEFLOW_ELEMENT__X = 2;
-
- /**
- * The feature id for the '<em><b>Y</b></em>' attribute. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int PAGEFLOW_ELEMENT__Y = 3;
-
- /**
- * The feature id for the '<em><b>Width</b></em>' attribute. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int PAGEFLOW_ELEMENT__WIDTH = 4;
-
- /**
- * The feature id for the '<em><b>Height</b></em>' attribute. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int PAGEFLOW_ELEMENT__HEIGHT = 5;
-
- /**
- * The feature id for the '<em><b>Id</b></em>' attribute. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int PAGEFLOW_ELEMENT__ID = 6;
-
- /**
- * The feature id for the '<em><b>Reference Link</b></em>' attribute.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int PAGEFLOW_ELEMENT__REFERENCE_LINK = 7;
-
- /**
- * The number of structural features of the the '<em>Element</em>'
- * class. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int PAGEFLOW_ELEMENT_FEATURE_COUNT = 8;
-
- /**
- * The meta object id for the '{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.impl.PageflowImpl <em>Pageflow</em>}'
- * class. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @see org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.impl.PageflowImpl
- * @see org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.impl.PageflowPackageImpl#getPageflow()
- * @generated
- */
- int PAGEFLOW = 0;
-
- /**
- * The feature id for the '<em><b>Name</b></em>' attribute. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int PAGEFLOW__NAME = PAGEFLOW_ELEMENT__NAME;
-
- /**
- * The feature id for the '<em><b>Comment</b></em>' attribute. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int PAGEFLOW__COMMENT = PAGEFLOW_ELEMENT__COMMENT;
-
- /**
- * The feature id for the '<em><b>X</b></em>' attribute. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int PAGEFLOW__X = PAGEFLOW_ELEMENT__X;
-
- /**
- * The feature id for the '<em><b>Y</b></em>' attribute. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int PAGEFLOW__Y = PAGEFLOW_ELEMENT__Y;
-
- /**
- * The feature id for the '<em><b>Width</b></em>' attribute. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int PAGEFLOW__WIDTH = PAGEFLOW_ELEMENT__WIDTH;
-
- /**
- * The feature id for the '<em><b>Height</b></em>' attribute. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int PAGEFLOW__HEIGHT = PAGEFLOW_ELEMENT__HEIGHT;
-
- /**
- * The feature id for the '<em><b>Id</b></em>' attribute. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int PAGEFLOW__ID = PAGEFLOW_ELEMENT__ID;
-
- /**
- * The feature id for the '<em><b>Reference Link</b></em>' attribute.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int PAGEFLOW__REFERENCE_LINK = PAGEFLOW_ELEMENT__REFERENCE_LINK;
-
- /**
- * The feature id for the '<em><b>Nodes</b></em>' containment reference
- * list. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int PAGEFLOW__NODES = PAGEFLOW_ELEMENT_FEATURE_COUNT + 0;
-
- /**
- * The feature id for the '<em><b>Links</b></em>' containment reference
- * list. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int PAGEFLOW__LINKS = PAGEFLOW_ELEMENT_FEATURE_COUNT + 1;
-
- /**
- * The feature id for the '<em><b>Configfile</b></em>' attribute. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int PAGEFLOW__CONFIGFILE = PAGEFLOW_ELEMENT_FEATURE_COUNT + 2;
-
- /**
- * The number of structural features of the the '<em>Pageflow</em>'
- * class. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int PAGEFLOW_FEATURE_COUNT = PAGEFLOW_ELEMENT_FEATURE_COUNT + 3;
-
- /**
- * The meta object id for the '{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.impl.PageflowNodeImpl <em>Node</em>}'
- * class. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @see org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.impl.PageflowNodeImpl
- * @see org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.impl.PageflowPackageImpl#getPageflowNode()
- * @generated
- */
- int PAGEFLOW_NODE = 1;
-
- /**
- * The feature id for the '<em><b>Name</b></em>' attribute. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int PAGEFLOW_NODE__NAME = PAGEFLOW_ELEMENT__NAME;
-
- /**
- * The feature id for the '<em><b>Comment</b></em>' attribute. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int PAGEFLOW_NODE__COMMENT = PAGEFLOW_ELEMENT__COMMENT;
-
- /**
- * The feature id for the '<em><b>X</b></em>' attribute. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int PAGEFLOW_NODE__X = PAGEFLOW_ELEMENT__X;
-
- /**
- * The feature id for the '<em><b>Y</b></em>' attribute. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int PAGEFLOW_NODE__Y = PAGEFLOW_ELEMENT__Y;
-
- /**
- * The feature id for the '<em><b>Width</b></em>' attribute. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int PAGEFLOW_NODE__WIDTH = PAGEFLOW_ELEMENT__WIDTH;
-
- /**
- * The feature id for the '<em><b>Height</b></em>' attribute. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int PAGEFLOW_NODE__HEIGHT = PAGEFLOW_ELEMENT__HEIGHT;
-
- /**
- * The feature id for the '<em><b>Id</b></em>' attribute. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int PAGEFLOW_NODE__ID = PAGEFLOW_ELEMENT__ID;
-
- /**
- * The feature id for the '<em><b>Reference Link</b></em>' attribute.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int PAGEFLOW_NODE__REFERENCE_LINK = PAGEFLOW_ELEMENT__REFERENCE_LINK;
-
- /**
- * The feature id for the '<em><b>Pageflow</b></em>' container
- * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int PAGEFLOW_NODE__PAGEFLOW = PAGEFLOW_ELEMENT_FEATURE_COUNT + 0;
-
- /**
- * The feature id for the '<em><b>Outlinks</b></em>' reference list.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int PAGEFLOW_NODE__OUTLINKS = PAGEFLOW_ELEMENT_FEATURE_COUNT + 1;
-
- /**
- * The feature id for the '<em><b>Inlinks</b></em>' reference list.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int PAGEFLOW_NODE__INLINKS = PAGEFLOW_ELEMENT_FEATURE_COUNT + 2;
-
- /**
- * The number of structural features of the the '<em>Node</em>' class.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int PAGEFLOW_NODE_FEATURE_COUNT = PAGEFLOW_ELEMENT_FEATURE_COUNT + 3;
-
- /**
- * The meta object id for the '{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.impl.PageflowLinkImpl <em>PF Link</em>}'
- * class. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @see org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.impl.PageflowLinkImpl
- * @see org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.impl.PageflowPackageImpl#getPFLink()
- * @generated
- */
- int PF_LINK = 2;
-
- /**
- * The feature id for the '<em><b>Name</b></em>' attribute. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int PF_LINK__NAME = PAGEFLOW_ELEMENT__NAME;
-
- /**
- * The feature id for the '<em><b>Comment</b></em>' attribute. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int PF_LINK__COMMENT = PAGEFLOW_ELEMENT__COMMENT;
-
- /**
- * The feature id for the '<em><b>X</b></em>' attribute. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int PF_LINK__X = PAGEFLOW_ELEMENT__X;
-
- /**
- * The feature id for the '<em><b>Y</b></em>' attribute. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int PF_LINK__Y = PAGEFLOW_ELEMENT__Y;
-
- /**
- * The feature id for the '<em><b>Width</b></em>' attribute. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int PF_LINK__WIDTH = PAGEFLOW_ELEMENT__WIDTH;
-
- /**
- * The feature id for the '<em><b>Height</b></em>' attribute. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int PF_LINK__HEIGHT = PAGEFLOW_ELEMENT__HEIGHT;
-
- /**
- * The feature id for the '<em><b>Id</b></em>' attribute. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int PF_LINK__ID = PAGEFLOW_ELEMENT__ID;
-
- /**
- * The feature id for the '<em><b>Reference Link</b></em>' attribute.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int PF_LINK__REFERENCE_LINK = PAGEFLOW_ELEMENT__REFERENCE_LINK;
-
- /**
- * The feature id for the '<em><b>Pageflow</b></em>' container
- * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int PF_LINK__PAGEFLOW = PAGEFLOW_ELEMENT_FEATURE_COUNT + 0;
-
- /**
- * The feature id for the '<em><b>Target</b></em>' reference. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int PF_LINK__TARGET = PAGEFLOW_ELEMENT_FEATURE_COUNT + 1;
-
- /**
- * The feature id for the '<em><b>Source</b></em>' reference. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int PF_LINK__SOURCE = PAGEFLOW_ELEMENT_FEATURE_COUNT + 2;
-
- /**
- * The feature id for the '<em><b>Outcome</b></em>' attribute. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int PF_LINK__OUTCOME = PAGEFLOW_ELEMENT_FEATURE_COUNT + 3;
-
- /**
- * The feature id for the '<em><b>Redirect</b></em>' attribute. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int PF_LINK__REDIRECT = PAGEFLOW_ELEMENT_FEATURE_COUNT + 4;
-
- /**
- * The feature id for the '<em><b>Bend Points</b></em>' containment
- * reference list. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int PF_LINK__BEND_POINTS = PAGEFLOW_ELEMENT_FEATURE_COUNT + 5;
-
- /**
- * The feature id for the '<em><b>Smallicon</b></em>' attribute. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int PF_LINK__SMALLICON = PAGEFLOW_ELEMENT_FEATURE_COUNT + 6;
-
- /**
- * The feature id for the '<em><b>Largeicon</b></em>' attribute. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int PF_LINK__LARGEICON = PAGEFLOW_ELEMENT_FEATURE_COUNT + 7;
-
- /**
- * The feature id for the '<em><b>Fromaction</b></em>' attribute. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int PF_LINK__FROMACTION = PAGEFLOW_ELEMENT_FEATURE_COUNT + 8;
-
- /**
- * The number of structural features of the the '<em>PF Link</em>'
- * class. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int PF_LINK_FEATURE_COUNT = PAGEFLOW_ELEMENT_FEATURE_COUNT + 9;
-
- /**
- * The meta object id for the '{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.impl.PageflowPageImpl <em>PF Page</em>}'
- * class. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @see org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.impl.PageflowPageImpl
- * @see org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.impl.PageflowPackageImpl#getPFPage()
- * @generated
- */
- int PF_PAGE = 5;
-
- /**
- * The feature id for the '<em><b>Name</b></em>' attribute. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int PF_PAGE__NAME = PAGEFLOW_NODE__NAME;
-
- /**
- * The feature id for the '<em><b>Comment</b></em>' attribute. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int PF_PAGE__COMMENT = PAGEFLOW_NODE__COMMENT;
-
- /**
- * The feature id for the '<em><b>X</b></em>' attribute. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int PF_PAGE__X = PAGEFLOW_NODE__X;
-
- /**
- * The feature id for the '<em><b>Y</b></em>' attribute. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int PF_PAGE__Y = PAGEFLOW_NODE__Y;
-
- /**
- * The feature id for the '<em><b>Width</b></em>' attribute. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int PF_PAGE__WIDTH = PAGEFLOW_NODE__WIDTH;
-
- /**
- * The feature id for the '<em><b>Height</b></em>' attribute. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int PF_PAGE__HEIGHT = PAGEFLOW_NODE__HEIGHT;
-
- /**
- * The feature id for the '<em><b>Id</b></em>' attribute. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int PF_PAGE__ID = PAGEFLOW_NODE__ID;
-
- /**
- * The feature id for the '<em><b>Pageflow</b></em>' container
- * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int PF_PAGE__PAGEFLOW = PAGEFLOW_NODE__PAGEFLOW;
-
- /**
- * The feature id for the '<em><b>Outlinks</b></em>' reference list.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int PF_PAGE__OUTLINKS = PAGEFLOW_NODE__OUTLINKS;
-
- /**
- * The feature id for the '<em><b>Inlinks</b></em>' reference list.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int PF_PAGE__INLINKS = PAGEFLOW_NODE__INLINKS;
-
- /**
- * The feature id for the '<em><b>Path</b></em>' attribute. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int PF_PAGE__PATH = PAGEFLOW_NODE_FEATURE_COUNT + 0;
-
- /**
- * The feature id for the '<em><b>Smallicon</b></em>' attribute. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int PF_PAGE__SMALLICON = PAGEFLOW_NODE_FEATURE_COUNT + 1;
-
- /**
- * The feature id for the '<em><b>Largeicon</b></em>' attribute. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int PF_PAGE__LARGEICON = PAGEFLOW_NODE_FEATURE_COUNT + 2;
-
- /**
- * The number of structural features of the the '<em>PF Page</em>'
- * class. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int PF_PAGE_FEATURE_COUNT = PAGEFLOW_NODE_FEATURE_COUNT + 3;
-
- /**
- * The meta object id for the '{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.impl.PageflowLinkBendpointImpl <em>PF Link Bendpoint</em>}'
- * class. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @see org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.impl.PageflowLinkBendpointImpl
- * @see org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.impl.PageflowPackageImpl#getPFLinkBendpoint()
- * @generated
- */
- int PF_LINK_BENDPOINT = 8;
-
- /**
- * The feature id for the '<em><b>D1 Width</b></em>' attribute. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int PF_LINK_BENDPOINT__D1_WIDTH = 0;
-
- /**
- * The feature id for the '<em><b>D1 Height</b></em>' attribute. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int PF_LINK_BENDPOINT__D1_HEIGHT = 1;
-
- /**
- * The feature id for the '<em><b>D2 Width</b></em>' attribute. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int PF_LINK_BENDPOINT__D2_WIDTH = 2;
-
- /**
- * The feature id for the '<em><b>D2 Height</b></em>' attribute. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int PF_LINK_BENDPOINT__D2_HEIGHT = 3;
-
- /**
- * The feature id for the '<em><b>Weight</b></em>' attribute. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int PF_LINK_BENDPOINT__WEIGHT = 4;
-
- /**
- * The feature id for the '<em><b>Link</b></em>' container reference.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int PF_LINK_BENDPOINT__LINK = 5;
-
- /**
- * The number of structural features of the the '<em>PF Link Bendpoint</em>'
- * class. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int PF_LINK_BENDPOINT_FEATURE_COUNT = 6;
-
- /**
- * Returns the meta object for class '{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.Pageflow <em>Pageflow</em>}'.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @return the meta object for class '<em>Pageflow</em>'.
- * @see org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.Pageflow
- * @generated
- */
- EClass getPageflow();
-
- /**
- * Returns the meta object for the containment reference list '{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.Pageflow#getNodes <em>Nodes</em>}'.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @return the meta object for the containment reference list '<em>Nodes</em>'.
- * @see org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.Pageflow#getNodes()
- * @see #getPageflow()
- * @generated
- */
- EReference getPageflow_Nodes();
-
- /**
- * Returns the meta object for the containment reference list '{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.Pageflow#getLinks <em>Links</em>}'.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @return the meta object for the containment reference list '<em>Links</em>'.
- * @see org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.Pageflow#getLinks()
- * @see #getPageflow()
- * @generated
- */
- EReference getPageflow_Links();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.Pageflow#getConfigfile <em>Configfile</em>}'.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @return the meta object for the attribute '<em>Configfile</em>'.
- * @see org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.Pageflow#getConfigfile()
- * @see #getPageflow()
- * @generated
- */
- EAttribute getPageflow_Configfile();
-
- /**
- * Returns the meta object for class '{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowNode <em>Node</em>}'.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @return the meta object for class '<em>Node</em>'.
- * @see org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowNode
- * @generated
- */
- EClass getPageflowNode();
-
- /**
- * Returns the meta object for the container reference '{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowNode#getPageflow <em>Pageflow</em>}'.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @return the meta object for the container reference '<em>Pageflow</em>'.
- * @see org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowNode#getPageflow()
- * @see #getPageflowNode()
- * @generated
- */
- EReference getPageflowNode_Pageflow();
-
- /**
- * Returns the meta object for the reference list '{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowNode#getOutlinks <em>Outlinks</em>}'.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @return the meta object for the reference list '<em>Outlinks</em>'.
- * @see org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowNode#getOutlinks()
- * @see #getPageflowNode()
- * @generated
- */
- EReference getPageflowNode_Outlinks();
-
- /**
- * Returns the meta object for the reference list '{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowNode#getInlinks <em>Inlinks</em>}'.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @return the meta object for the reference list '<em>Inlinks</em>'.
- * @see org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowNode#getInlinks()
- * @see #getPageflowNode()
- * @generated
- */
- EReference getPageflowNode_Inlinks();
-
- /**
- * Returns the meta object for class '{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowLink <em>PF Link</em>}'.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @return the meta object for class '<em>PF Link</em>'.
- * @see org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowLink
- * @generated
- */
- EClass getPFLink();
-
- /**
- * Returns the meta object for the container reference '{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowLink#getPageflow <em>Pageflow</em>}'.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @return the meta object for the container reference '<em>Pageflow</em>'.
- * @see org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowLink#getPageflow()
- * @see #getPFLink()
- * @generated
- */
- EReference getPFLink_Pageflow();
-
- /**
- * Returns the meta object for the reference '{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowLink#getTarget <em>Target</em>}'.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @return the meta object for the reference '<em>Target</em>'.
- * @see org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowLink#getTarget()
- * @see #getPFLink()
- * @generated
- */
- EReference getPFLink_Target();
-
- /**
- * Returns the meta object for the reference '{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowLink#getSource <em>Source</em>}'.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @return the meta object for the reference '<em>Source</em>'.
- * @see org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowLink#getSource()
- * @see #getPFLink()
- * @generated
- */
- EReference getPFLink_Source();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowLink#getOutcome <em>Outcome</em>}'.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @return the meta object for the attribute '<em>Outcome</em>'.
- * @see org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowLink#getOutcome()
- * @see #getPFLink()
- * @generated
- */
- EAttribute getPFLink_Outcome();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowLink#getOutcome <em>Outcome</em>}'.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @return the meta object for the attribute '<em>Outcome</em>'.
- * @see org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowLink#getOutcome()
- * @see #getPFLink()
- * @generated
- */
- EAttribute getPFLink_Fromaction();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowLink#isRedirect <em>Redirect</em>}'.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @return the meta object for the attribute '<em>Redirect</em>'.
- * @see org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowLink#isRedirect()
- * @see #getPFLink()
- * @generated
- */
- EAttribute getPFLink_Redirect();
-
- /**
- * Returns the meta object for the containment reference list '{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowLink#getBendPoints <em>Bend Points</em>}'.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @return the meta object for the containment reference list '<em>Bend Points</em>'.
- * @see org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowLink#getBendPoints()
- * @see #getPFLink()
- * @generated
- */
- EReference getPFLink_BendPoints();
-
- /**
- * Returns the meta object for class '{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowElement <em>Element</em>}'.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @return the meta object for class '<em>Element</em>'.
- * @see org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowElement
- * @generated
- */
- EClass getPageflowElement();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowElement#getName <em>Name</em>}'.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @return the meta object for the attribute '<em>Name</em>'.
- * @see org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowElement#getName()
- * @see #getPageflowElement()
- * @generated
- */
- EAttribute getPageflowElement_Name();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowElement#getComment <em>Comment</em>}'.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @return the meta object for the attribute '<em>Comment</em>'.
- * @see org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowElement#getComment()
- * @see #getPageflowElement()
- * @generated
- */
- EAttribute getPageflowElement_Comment();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowElement#getX <em>X</em>}'.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @return the meta object for the attribute '<em>X</em>'.
- * @see org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowElement#getX()
- * @see #getPageflowElement()
- * @generated
- */
- EAttribute getPageflowElement_X();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowElement#getY <em>Y</em>}'.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @return the meta object for the attribute '<em>Y</em>'.
- * @see org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowElement#getY()
- * @see #getPageflowElement()
- * @generated
- */
- EAttribute getPageflowElement_Y();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowElement#getWidth <em>Width</em>}'.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @return the meta object for the attribute '<em>Width</em>'.
- * @see org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowElement#getWidth()
- * @see #getPageflowElement()
- * @generated
- */
- EAttribute getPageflowElement_Width();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowElement#getHeight <em>Height</em>}'.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @return the meta object for the attribute '<em>Height</em>'.
- * @see org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowElement#getHeight()
- * @see #getPageflowElement()
- * @generated
- */
- EAttribute getPageflowElement_Height();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowElement#getId <em>Id</em>}'.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @return the meta object for the attribute '<em>Id</em>'.
- * @see org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowElement#getId()
- * @see #getPageflowElement()
- * @generated
- */
- EAttribute getPageflowElement_Id();
-
- /**
- * Returns the meta object for class '{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowPage <em>PF Page</em>}'.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @return the meta object for class '<em>PF Page</em>'.
- * @see org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowPage
- * @generated
- */
- EClass getPFPage();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowPage#getPath <em>Path</em>}'.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @return the meta object for the attribute '<em>Path</em>'.
- * @see org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowPage#getPath()
- * @see #getPFPage()
- * @generated
- */
- EAttribute getPFPage_Path();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowPage#getSmallicon <em>Smallicon</em>}'.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @return the meta object for the attribute '<em>Smallicon</em>'.
- * @see org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowPage#getSmallicon()
- * @see #getPFPage()
- * @generated
- */
- EAttribute getPFPage_Smallicon();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowPage#getLargeicon <em>Largeicon</em>}'.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @return the meta object for the attribute '<em>Largeicon</em>'.
- * @see org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowPage#getLargeicon()
- * @see #getPFPage()
- * @generated
- */
- EAttribute getPFPage_Largeicon();
-
- /**
- * Returns the meta object for class '{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowLinkBendpoint <em>PF Link Bendpoint</em>}'.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @return the meta object for class '<em>PF Link Bendpoint</em>'.
- * @see org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowLinkBendpoint
- * @generated
- */
- EClass getPFLinkBendpoint();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowLinkBendpoint#getD1Width <em>D1 Width</em>}'.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @return the meta object for the attribute '<em>D1 Width</em>'.
- * @see org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowLinkBendpoint#getD1Width()
- * @see #getPFLinkBendpoint()
- * @generated
- */
- EAttribute getPFLinkBendpoint_D1Width();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowLinkBendpoint#getD1Height <em>D1 Height</em>}'.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @return the meta object for the attribute '<em>D1 Height</em>'.
- * @see org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowLinkBendpoint#getD1Height()
- * @see #getPFLinkBendpoint()
- * @generated
- */
- EAttribute getPFLinkBendpoint_D1Height();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowLinkBendpoint#getD2Width <em>D2 Width</em>}'.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @return the meta object for the attribute '<em>D2 Width</em>'.
- * @see org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowLinkBendpoint#getD2Width()
- * @see #getPFLinkBendpoint()
- * @generated
- */
- EAttribute getPFLinkBendpoint_D2Width();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowLinkBendpoint#getD2Height <em>D2 Height</em>}'.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @return the meta object for the attribute '<em>D2 Height</em>'.
- * @see org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowLinkBendpoint#getD2Height()
- * @see #getPFLinkBendpoint()
- * @generated
- */
- EAttribute getPFLinkBendpoint_D2Height();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowLinkBendpoint#getWeight <em>Weight</em>}'.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @return the meta object for the attribute '<em>Weight</em>'.
- * @see org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowLinkBendpoint#getWeight()
- * @see #getPFLinkBendpoint()
- * @generated
- */
- EAttribute getPFLinkBendpoint_Weight();
-
- /**
- * Returns the meta object for the container reference '{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowLinkBendpoint#getLink <em>Link</em>}'.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @return the meta object for the container reference '<em>Link</em>'.
- * @see org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowLinkBendpoint#getLink()
- * @see #getPFLinkBendpoint()
- * @generated
- */
- EReference getPFLinkBendpoint_Link();
-
- /**
- * 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
- */
- PageflowFactory getPageflowFactory();
-
-}
-// PageflowPackage
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/model/PageflowPage.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/model/PageflowPage.java
deleted file mode 100644
index b6cecb5..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/model/PageflowPage.java
+++ /dev/null
@@ -1,117 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow.model;
-
-/**
- * <!-- begin-user-doc --> A representation of the model object '<em><b>PF Page</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- * <li>{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowPage#getPath <em>Path</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowPage#getSmallicon <em>Smallicon</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowPage#getLargeicon <em>Largeicon</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowPackage#getPFPage()
- * @model
- * @generated
- */
-public interface PageflowPage extends PageflowNode {
- /**
- * Returns the value of the '<em><b>Path</b></em>' attribute. <!--
- * begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Path</em>' attribute isn't clear, there
- * really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- *
- * @return the value of the '<em>Path</em>' attribute.
- * @see #setPath(String)
- * @see org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowPackage#getPFPage_Path()
- * @model
- * @generated
- */
- String getPath();
-
- /**
- * Sets the value of the '{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowPage#getPath <em>Path</em>}'
- * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @param value
- * the new value of the '<em>Path</em>' attribute.
- * @see #getPath()
- * @generated
- */
- void setPath(String value);
-
- /**
- * Returns the value of the '<em><b>Smallicon</b></em>' attribute. <!--
- * begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Smallicon</em>' attribute isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- *
- * @return the value of the '<em>Smallicon</em>' attribute.
- * @see #setSmallicon(String)
- * @see org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowPackage#getPFPage_Smallicon()
- * @model
- * @generated
- */
- String getSmallicon();
-
- /**
- * Sets the value of the '{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowPage#getSmallicon <em>Smallicon</em>}'
- * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @param value
- * the new value of the '<em>Smallicon</em>' attribute.
- * @see #getSmallicon()
- * @generated
- */
- void setSmallicon(String value);
-
- /**
- * Returns the value of the '<em><b>Largeicon</b></em>' attribute. <!--
- * begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Largeicon</em>' attribute isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- *
- * @return the value of the '<em>Largeicon</em>' attribute.
- * @see #setLargeicon(String)
- * @see org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowPackage#getPFPage_Largeicon()
- * @model
- * @generated
- */
- String getLargeicon();
-
- /**
- * Sets the value of the '{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowPage#getLargeicon <em>Largeicon</em>}'
- * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @param value
- * the new value of the '<em>Largeicon</em>' attribute.
- * @see #getLargeicon()
- * @generated
- */
- void setLargeicon(String value);
-
-}
-// PFPage
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/model/impl/LinkReferenceElement.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/model/impl/LinkReferenceElement.java
deleted file mode 100644
index 0ed483c..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/model/impl/LinkReferenceElement.java
+++ /dev/null
@@ -1,274 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.impl;
-
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.runtime.Assert;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.jst.jsf.facesconfig.emf.FacesConfigFactory;
-import org.eclipse.jst.jsf.facesconfig.emf.FromActionType;
-import org.eclipse.jst.jsf.facesconfig.emf.FromOutcomeType;
-import org.eclipse.jst.jsf.facesconfig.emf.IconType;
-import org.eclipse.jst.jsf.facesconfig.emf.LargeIconType;
-import org.eclipse.jst.jsf.facesconfig.emf.NavigationCaseType;
-import org.eclipse.jst.jsf.facesconfig.emf.RedirectType;
-import org.eclipse.jst.jsf.facesconfig.emf.SmallIconType;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowElement;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowPackage;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.synchronization.TransformUtil;
-
-/**
- * The reference element represents a mapping from pageflow link to a navigation
- * case.
- *
- * @author hmeng
- */
-
-public class LinkReferenceElement extends ReferenceElement {
-
- public void add(EObject object) {
- Assert.isTrue(object instanceof NavigationCaseType);
- clear();
- super.add(object);
- }
-
- /**
- * @param pageflowElement
- */
- public LinkReferenceElement(PageflowElement pageflowElement) {
- super(pageflowElement);
- }
-
- /**
- * @param pageflowElement
- * @param facesConfigObject
- */
- public LinkReferenceElement(PageflowElement pageflowElement,
- EObject facesConfigObject) {
- super(pageflowElement, facesConfigObject);
- }
-
- public void update() {
- for (Iterator nodes = getData().iterator(); nodes.hasNext();) {
- Object next = nodes.next();
- if (!TransformUtil.isValidFacesConfigElement((EObject) next)) {
- nodes.remove();
- }
- }
- }
-
- public Object get(int eFeature) {
- Object result = null;
- switch (eFeature) {
- case PageflowPackage.PF_LINK__COMMENT:
- break;
- case PageflowPackage.PF_LINK__OUTCOME:
- if (!isEmpty()) {
- FromOutcomeType outcome = ((NavigationCaseType) getData()
- .get(0)).getFromOutcome();
- if (outcome != null) {
- result = outcome.getTextContent();
- }
- }
- break;
- case PageflowPackage.PF_LINK__NAME:
- break;
- case PageflowPackage.PF_LINK__REDIRECT:
- result = new Boolean(false);
- if (!isEmpty()) {
- RedirectType outcome = ((NavigationCaseType) getData().get(0))
- .getRedirect();
- if (outcome != null) {
- result = new Boolean(true);
- }
- }
- break;
-
- case PageflowPackage.PF_LINK__FROMACTION:
- if (!isEmpty()) {
- FromActionType fromActionType = ((NavigationCaseType) getData()
- .get(0)).getFromAction();
- if (fromActionType != null) {
- result = fromActionType.getTextContent();
- }
- }
- break;
- case PageflowPackage.PF_LINK__SMALLICON:
- if (!isEmpty()) {
- List icons = ((NavigationCaseType) getData().get(0)).getIcon();
- if (icons.size() > 0) {
- result = ((IconType) icons.get(0)).getSmallIcon() != null ? ((IconType) icons
- .get(0)).getSmallIcon().getTextContent()
- : null;
- }
- }
- break;
- case PageflowPackage.PF_LINK__LARGEICON:
- if (!isEmpty()) {
- List icons = ((NavigationCaseType) getData().get(0)).getIcon();
- if (icons.size() > 0) {
- result = ((IconType) icons.get(0)).getLargeIcon() != null ? ((IconType) icons
- .get(0)).getLargeIcon().getTextContent()
- : null;
- }
- }
- break;
- }
- return result;
- }
-
- public void set(EStructuralFeature eFeature, Object newVal) {
- switch (eFeature.getFeatureID()) {
- case PageflowPackage.PF_LINK__COMMENT:
- break;
- case PageflowPackage.PF_LINK__OUTCOME: {
- FromOutcomeType oldOutcome = null;
- FromOutcomeType newOutcome = null;
- String newValue = (String) newVal;
- if (!isEmpty()) {
- oldOutcome = ((NavigationCaseType) getData().get(0))
- .getFromOutcome();
- if (newValue == null || newValue.length() == 0) {
- ((NavigationCaseType) getData().get(0))
- .setFromOutcome(null);
- } else {
- if (oldOutcome == null) {
- newOutcome = FacesConfigFactory.eINSTANCE
- .createFromOutcomeType();
- newOutcome.setTextContent(newValue);
- ((NavigationCaseType) getData().get(0))
- .setFromOutcome(newOutcome);
- } else {
- oldOutcome.setTextContent(newValue);
- }
- }
- }
- break;
- }
- case PageflowPackage.PF_LINK__NAME:
- break;
- case PageflowPackage.PF_LINK__REDIRECT:
- RedirectType redirect = null;
- RedirectType oldRedirect = null;
- boolean newRedirect = ((Boolean) newVal).booleanValue();
- if (!isEmpty()) {
- oldRedirect = ((NavigationCaseType) getData().get(0))
- .getRedirect();
- if (!newRedirect) {
- redirect = null;
- } else {
- if (oldRedirect == null) {
- redirect = FacesConfigFactory.eINSTANCE
- .createRedirectType();
- }
- }
- ((NavigationCaseType) getData().get(0)).setRedirect(redirect);
- }
- break;
- case PageflowPackage.PF_LINK__FROMACTION:
- FromActionType oldFromActionType,
- newFromActionType;
- String newFromaction = (String) newVal;
- if (!isEmpty()) {
- oldFromActionType = ((NavigationCaseType) getData().get(0))
- .getFromAction();
- if (newFromaction == null || newFromaction.length() == 0) {
- ((NavigationCaseType) getData().get(0)).setFromAction(null);
- } else {
- if (oldFromActionType == null) {
- newFromActionType = FacesConfigFactory.eINSTANCE
- .createFromActionType();
- newFromActionType.setTextContent(newFromaction);
- ((NavigationCaseType) getData().get(0))
- .setFromAction(newFromActionType);
- } else {
- oldFromActionType.setTextContent(newFromaction);
- }
- }
- }
- break;
- case PageflowPackage.PF_LINK__SMALLICON: {
- SmallIconType oldSmallicon = null;
- SmallIconType newSmallIconType = null;
- IconType icon = null;
- String newValue = (String) newVal;
- if (!isEmpty()) {
- List icons = ((NavigationCaseType) getData().get(0)).getIcon();
- if (newValue == null || newValue.length() == 0) {
- if (icons.size() > 0) {
- if (((IconType) icons.get(0)).getSmallIcon() != null) {
- ((IconType) icons.get(0)).setSmallIcon(null);
- }
- }
- } else {
- if (icons.size() == 0) {
- icon = FacesConfigFactory.eINSTANCE.createIconType();
- newSmallIconType = FacesConfigFactory.eINSTANCE
- .createSmallIconType();
- newSmallIconType.setTextContent(newValue);
- icon.setSmallIcon(newSmallIconType);
- icons.add(icon);
- } else if (((IconType) icons.get(0)).getSmallIcon() == null) {
- newSmallIconType = FacesConfigFactory.eINSTANCE
- .createSmallIconType();
- newSmallIconType.setTextContent(newValue);
- icon = ((IconType) icons.get(0));
- icon.setSmallIcon(newSmallIconType);
- } else {
- oldSmallicon = ((IconType) icons.get(0)).getSmallIcon();
- oldSmallicon.setTextContent(newValue);
- }
- }
- }
- break;
- }
- case PageflowPackage.PF_LINK__LARGEICON: {
- String newValue = (String) newVal;
- LargeIconType oldLargeIcon = null;
- LargeIconType newLargeIconType = null;
- IconType icon = null;
- if (!isEmpty()) {
- List icons = ((NavigationCaseType) getData().get(0)).getIcon();
- if (newValue == null || newValue.length() == 0) {
- if (icons.size() > 0) {
- if (((IconType) icons.get(0)).getLargeIcon() != null) {
- ((IconType) icons.get(0)).setLargeIcon(null);
- }
- }
- } else {
- if (icons.size() == 0) {
- icon = FacesConfigFactory.eINSTANCE.createIconType();
- newLargeIconType = FacesConfigFactory.eINSTANCE
- .createLargeIconType();
- newLargeIconType.setTextContent(newValue);
- icon.setLargeIcon(newLargeIconType);
- icons.add(icon);
- } else if (((IconType) icons.get(0)).getLargeIcon() == null) {
- newLargeIconType = FacesConfigFactory.eINSTANCE
- .createLargeIconType();
- newLargeIconType.setTextContent(newValue);
- icon = ((IconType) icons.get(0));
- icon.setLargeIcon(newLargeIconType);
- } else {
- oldLargeIcon = ((IconType) icons.get(0)).getLargeIcon();
- oldLargeIcon.setTextContent(newValue);
- }
- }
- }
- break;
- }
- }
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/model/impl/PageReferenceElement.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/model/impl/PageReferenceElement.java
deleted file mode 100644
index 0a81af6..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/model/impl/PageReferenceElement.java
+++ /dev/null
@@ -1,400 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.impl;
-
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.runtime.Assert;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.jst.jsf.facesconfig.emf.DescriptionType;
-import org.eclipse.jst.jsf.facesconfig.emf.DisplayNameType;
-import org.eclipse.jst.jsf.facesconfig.emf.FacesConfigFactory;
-import org.eclipse.jst.jsf.facesconfig.emf.FromViewIdType;
-import org.eclipse.jst.jsf.facesconfig.emf.IconType;
-import org.eclipse.jst.jsf.facesconfig.emf.LargeIconType;
-import org.eclipse.jst.jsf.facesconfig.emf.NavigationCaseType;
-import org.eclipse.jst.jsf.facesconfig.emf.NavigationRuleType;
-import org.eclipse.jst.jsf.facesconfig.emf.SmallIconType;
-import org.eclipse.jst.jsf.facesconfig.emf.ToViewIdType;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowElement;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowLink;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowPackage;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowPage;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.synchronization.FC2PFTransformer;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.synchronization.TransformUtil;
-
-/**
- * The reference element represents a mapping from pageflow page to one or more
- * navigation rules/cases's view IDs (fromViewID or toViewID).
- *
- * @author hmeng
- */
-
-public class PageReferenceElement extends ReferenceElement {
-
- /**
- * @param pageflowElement
- */
- public PageReferenceElement(PageflowElement pageflowElement) {
- super(pageflowElement);
- }
-
- /**
- * @param pageflowElement
- * @param facesConfigObject
- */
- public PageReferenceElement(PageflowElement pageflowElement,
- EObject facesConfigObject) {
- super(pageflowElement, facesConfigObject);
- }
-
- public void add(EObject object) {
- Assert.isTrue(object instanceof FromViewIdType
- || object instanceof ToViewIdType);
- super.add(object);
- }
-
- public void update() {
- outer: for (Iterator nodes = getData().iterator(); nodes.hasNext();) {
- Object next = nodes.next();
- if (next instanceof FromViewIdType) {
- if (!TransformUtil.isValidFacesConfigElement((EObject) next)) {
- nodes.remove();
- continue;
- }
- List links = ((PageflowPage) pageflowElement).getOutlinks();
- for (int i = 0; i < links.size(); i++) {
- PageflowLink link = (PageflowLink) links.get(i);
- if (!link.getFCElements().isEmpty()
- && TransformUtil
- .isValidFacesConfigElement((NavigationCaseType) ((PageflowLink) links
- .get(i)).getFCElements().getData()
- .get(0))) {
- NavigationRuleType rule = (NavigationRuleType) ((NavigationCaseType) ((PageflowLink) links
- .get(i)).getFCElements().getData().get(0))
- .eContainer();
- if (rule == null || rule.getFromViewId() == next) {
- // There navigation case
- // matching this end.
- continue outer;
- }
- }
- }
- // No case contains this end.
- nodes.remove();
- } else if (next instanceof ToViewIdType) {
- if (!TransformUtil.isValidFacesConfigElement((EObject) next)) {
- nodes.remove();
- continue;
- }
- // Verify this is case end.
- List links = ((PageflowPage) pageflowElement).getInlinks();
- for (int i = 0; i < links.size(); i++) {
- PageflowLink link = (PageflowLink) links.get(i);
- if (!link.getFCElements().isEmpty()
- && TransformUtil
- .isValidFacesConfigElement((NavigationCaseType) link
- .getFCElements().getData().get(0))) {
- if (((NavigationCaseType) ((PageflowLink) links.get(i))
- .getFCElements().getData().get(0))
- .getToViewId() == next) {
- // There navigation case
- // matching this end.
- continue outer;
- }
- }
- }
- // No case contains this end.
- nodes.remove();
- }
- }
- }
-
- public Object get(int eFeature) {
- Object result = null;
- switch (eFeature) {
- case PageflowPackage.PF_PAGE__COMMENT:
- if (!isEmpty()) {
- for (int i = 0, n = getData().size(); i < n; i++) {
- NavigationRuleType rule = null;
- if ((rule = resolveRuleFromFCElement(getData().get(i))) != null) {
- List descriptions = rule.getDescription();
- if (descriptions.size() > 0) {
- result = ((DescriptionType) descriptions.get(0))
- .getTextContent();
- break;
- }
- }
- }
- }
- break;
- case PageflowPackage.PF_PAGE__LARGEICON:
- if (!isEmpty()) {
- for (int i = 0, n = getData().size(); i < n; i++) {
- NavigationRuleType rule = null;
- if ((rule = resolveRuleFromFCElement(getData().get(i))) != null) {
- List icons = rule.getIcon();
- if (icons.size() > 0) {
- result = ((IconType) icons.get(0)).getLargeIcon() != null ? ((IconType) icons
- .get(0)).getLargeIcon().getTextContent()
- : null;
- break;
- }
- }
- }
- }
- break;
- case PageflowPackage.PF_PAGE__NAME:
- // To see if it is in navigation rule.
- if (!isEmpty() && !isEndOnly()) {
- for (int i = 0, n = getData().size(); i < n; i++) {
- NavigationRuleType rule = null;
- if ((rule = resolveRuleFromFCElement(getData().get(i))) != null) {
- List displaynames = rule.getDisplayName();
- if (displaynames.size() > 0) {
- result = ((DisplayNameType) displaynames.get(0))
- .getTextContent();
- break;
- }
- }
- }
- }
- break;
- case PageflowPackage.PF_PAGE__PATH:
- if (!isEmpty()) {
- for (int i = 0, n = getData().size(); i < n; i++) {
- if (getData().get(i) instanceof FromViewIdType) {
- result = ((FromViewIdType) getData().get(i))
- .getTextContent();
- break;
- }
- }
- if (result == null && getData().get(0) instanceof ToViewIdType) {
- result = ((ToViewIdType) getData().get(0)).getTextContent();
- }
- }
- break;
- case PageflowPackage.PF_PAGE__SMALLICON:
- if (!isEmpty()) {
- for (int i = 0, n = getData().size(); i < n; i++) {
- NavigationRuleType rule = null;
- if ((rule = resolveRuleFromFCElement(getData().get(i))) != null) {
- List icons = rule.getIcon();
- if (icons.size() > 0) {
- result = ((IconType) icons.get(0)).getSmallIcon() != null ? ((IconType) icons
- .get(0)).getSmallIcon().getTextContent()
- : null;
- break;
- }
- }
- }
- }
- break;
- }
- return result;
- }
-
- private NavigationRuleType resolveRuleFromFCElement(Object object) {
- if (object instanceof FromViewIdType) {
- return (NavigationRuleType) ((FromViewIdType) object).eContainer();
- }
- return null;
- }
-
- private NavigationRuleType resolveRuleFromPFElement(Object object) {
- if (object instanceof PageflowLink) {
- NavigationCaseType caseType = (NavigationCaseType) ((PageflowLink) object)
- .getFCElements().getData().get(0);
- return (NavigationRuleType) caseType.eContainer();
- }
- return null;
- }
-
- public void set(EStructuralFeature eFeature, Object newVal) {
- switch (eFeature.getFeatureID()) {
- case PageflowPackage.PF_PAGE__COMMENT: {
- DescriptionType description = null;
- String newValue = (String) newVal;
- if (!isEmpty()) {
- for (int i = 0, n = getData().size(); i < n; i++) {
- NavigationRuleType rule = null;
- if ((rule = resolveRuleFromFCElement(getData().get(i))) != null) {
- rule.getDescription().clear();
- description = FacesConfigFactory.eINSTANCE
- .createDescriptionType();
- description.setTextContent(newValue);
- rule.getDescription().add(description);
- }
- }
- }
- break;
- }
- case PageflowPackage.PF_PAGE__LARGEICON: {
- LargeIconType oldLargeIcon = null;
- LargeIconType newLargeIconType = null;
- IconType icon = null;
- String newValue = (String) newVal;
- if (!isEmpty()) {
- for (int i = 0, n = getData().size(); i < n; i++) {
- NavigationRuleType rule = null;
- if ((rule = resolveRuleFromFCElement(getData().get(i))) != null) {
- List icons = rule.getIcon();
- if (newValue == null || newValue.length() == 0) {
- if (icons.size() > 0) {
- if (((IconType) icons.get(0)).getLargeIcon() != null) {
- ((IconType) icons.get(0))
- .setLargeIcon(null);
- }
- }
- } else {
- if (icons.size() == 0) {
- icon = FacesConfigFactory.eINSTANCE
- .createIconType();
- newLargeIconType = FacesConfigFactory.eINSTANCE
- .createLargeIconType();
- newLargeIconType.setTextContent(newValue);
- icon.setLargeIcon(newLargeIconType);
- icons.add(icon);
- } else if (((IconType) icons.get(0)).getLargeIcon() == null) {
- newLargeIconType = FacesConfigFactory.eINSTANCE
- .createLargeIconType();
- newLargeIconType.setTextContent(newValue);
- icon = ((IconType) icons.get(0));
- icon.setLargeIcon(newLargeIconType);
- } else {
- oldLargeIcon = ((IconType) icons.get(0))
- .getLargeIcon();
- oldLargeIcon.setTextContent(newValue);
- }
- }
- }
- }
- }
- break;
- }
- case PageflowPackage.PF_PAGE__NAME:
- DisplayNameType newDisplayNameType = null;
- String newName = (String) newVal;
- if (!isEmpty()) {
- for (int i = 0, n = getData().size(); i < n; i++) {
- NavigationRuleType rule = null;
- if ((rule = resolveRuleFromFCElement(getData().get(i))) != null) {
- rule.getDisplayName().clear();
- if (newName != null && newName.length() > 0) {
- newDisplayNameType = FacesConfigFactory.eINSTANCE
- .createDisplayNameType();
- newDisplayNameType.setTextContent(newName);
- rule.getDisplayName().add(newDisplayNameType);
- }
- }
- }
- }
- break;
- case PageflowPackage.PF_PAGE__PATH: {
- Object oldPath = null;
- Object newPath = null;
- String newValue = (String) newVal;
- if (!isEmpty()) {
- for (int i = 0, n = getData().size(); i < n; i++) {
- if (getData().get(i) instanceof FromViewIdType) {
- oldPath = getData().get(i);
- ((FromViewIdType) oldPath).setTextContent(newValue);
- } else if (getData().get(i) instanceof ToViewIdType) {
- oldPath = getData().get(i);
- ((ToViewIdType) oldPath).setTextContent(newValue);
- }
- }
- }
- // Create new fromViewID or toViewID node as needed.
- else if (newValue != null && !"*".equals(newValue)) { //$NON-NLS-1$
- if (((PageflowPage) pageflowElement).getOutlinks().size() > 0) {
- List links = ((PageflowPage) pageflowElement).getOutlinks();
- for (int i = 0, n = links.size(); i < n; i++) {
- PageflowLink link = (PageflowLink) links.get(i);
- NavigationRuleType rule = resolveRuleFromPFElement(link);
- newPath = FC2PFTransformer.createRLFromViewID(newValue);
- rule.setFromViewId((FromViewIdType) newPath);
- add((EObject) newPath);
- }
- links = ((PageflowPage) pageflowElement).getInlinks();
- for (int i = 0, n = links.size(); i < n; i++) {
- PageflowLink link = (PageflowLink) links.get(i);
- NavigationCaseType caseType = (NavigationCaseType) link
- .getFCElements().getData().get(0);
- newPath = FC2PFTransformer.createFCToViewID(newValue);
- caseType.setToViewId((ToViewIdType) newPath);
- add((EObject) newPath);
- }
- }
- }
- break;
- }
- case PageflowPackage.PF_PAGE__SMALLICON: {
- SmallIconType oldSmallicon = null;
- SmallIconType newSmallIconType = null;
- IconType icon = null;
- String newValue = (String) newVal;
- if (!isEmpty()) {
- for (int i = 0, n = getData().size(); i < n; i++) {
- NavigationRuleType rule = null;
- if ((rule = resolveRuleFromFCElement(getData().get(i))) != null) {
- List icons = rule.getIcon();
- if (newValue == null || newValue.length() == 0) {
- if (icons.size() > 0) {
- if (((IconType) icons.get(0)).getSmallIcon() != null) {
- ((IconType) icons.get(0))
- .setSmallIcon(null);
- }
- }
- } else {
- if (icons.size() == 0) {
- icon = FacesConfigFactory.eINSTANCE
- .createIconType();
- newSmallIconType = FacesConfigFactory.eINSTANCE
- .createSmallIconType();
- newSmallIconType.setTextContent(newValue);
- icon.setSmallIcon(newSmallIconType);
- icons.add(icon);
- } else if (((IconType) icons.get(0)).getSmallIcon() == null) {
- newSmallIconType = FacesConfigFactory.eINSTANCE
- .createSmallIconType();
- newSmallIconType.setTextContent(newValue);
- icon = ((IconType) icons.get(0));
- icon.setSmallIcon(newSmallIconType);
- } else {
- oldSmallicon = ((IconType) icons.get(0))
- .getSmallIcon();
- oldSmallicon.setTextContent(newValue);
- }
- }
- }
- }
- }
- break;
- }
- }
- }
-
- /**
- * @return true if none of the data are from view id's
- */
- public boolean isEndOnly() {
- for (int i = 0, n = getData().size(); i < n; i++) {
- if (getData().get(i) instanceof FromViewIdType) {
- return false;
- }
- }
- return true;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/model/impl/PageflowElementImpl.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/model/impl/PageflowElementImpl.java
deleted file mode 100644
index 6948fd7..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/model/impl/PageflowElementImpl.java
+++ /dev/null
@@ -1,616 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowElement;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowPackage;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.synchronization.TransformUtil;
-
-/**
- * <!-- begin-user-doc --> An implementation of the model object '<em><b>Element</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- * <li>{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.impl.PageflowElementImpl#getName <em>Name</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.impl.PageflowElementImpl#getComment <em>Comment</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.impl.PageflowElementImpl#getX <em>X</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.impl.PageflowElementImpl#getY <em>Y</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.impl.PageflowElementImpl#getWidth <em>Width</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.impl.PageflowElementImpl#getHeight <em>Height</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.impl.PageflowElementImpl#getId <em>Id</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public abstract class PageflowElementImpl extends EObjectImpl implements
- PageflowElement {
- private static final String idPrefix = "pf"; //$NON-NLS-1$
-
- /**
- * @generated NOT
- */
- private String id;
-
- /**
- * @generated NOT
- */
- private static int counter = 0;
-
- /**
- * the reference element
- */
- protected ReferenceElement refElement;
-
- /**
- * The default value of the '{@link #getName() <em>Name</em>}' attribute.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @see #getName()
- * @generated
- * @ordered
- */
- protected static final String NAME_EDEFAULT = "unnamed"; //$NON-NLS-1$
-
- /**
- * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @see #getName()
- * @generated
- * @ordered
- */
- protected String name = NAME_EDEFAULT;
-
- /**
- * The default value of the '{@link #getComment() <em>Comment</em>}'
- * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @see #getComment()
- * @generated
- * @ordered
- */
- protected static final String COMMENT_EDEFAULT = null;
-
- /**
- * The cached value of the '{@link #getComment() <em>Comment</em>}'
- * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @see #getComment()
- * @generated
- * @ordered
- */
- protected String comment = COMMENT_EDEFAULT;
-
- /**
- * The default value of the '{@link #getX() <em>X</em>}' attribute. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @see #getX()
- * @generated
- * @ordered
- */
- protected static final int X_EDEFAULT = 0;
-
- /**
- * The cached value of the '{@link #getX() <em>X</em>}' attribute. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @see #getX()
- * @generated
- * @ordered
- */
- protected int x = X_EDEFAULT;
-
- /**
- * The default value of the '{@link #getY() <em>Y</em>}' attribute. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @see #getY()
- * @generated
- * @ordered
- */
- protected static final int Y_EDEFAULT = 0;
-
- /**
- * The cached value of the '{@link #getY() <em>Y</em>}' attribute. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @see #getY()
- * @generated
- * @ordered
- */
- protected int y = Y_EDEFAULT;
-
- /**
- * The default value of the '{@link #getWidth() <em>Width</em>}'
- * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @see #getWidth()
- * @generated
- * @ordered
- */
- protected static final int WIDTH_EDEFAULT = -1;
-
- /**
- * The cached value of the '{@link #getWidth() <em>Width</em>}' attribute.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @see #getWidth()
- * @generated
- * @ordered
- */
- protected int width = WIDTH_EDEFAULT;
-
- /**
- * The default value of the '{@link #getHeight() <em>Height</em>}'
- * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @see #getHeight()
- * @generated
- * @ordered
- */
- protected static final int HEIGHT_EDEFAULT = -1;
-
- /**
- * The default value of the '{@link #getReferenceLink() <em>Reference Link</em>}'
- * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @see #getReferenceLink()
- * @generated
- * @ordered
- */
- protected static final String REFERENCE_LINK_EDEFAULT = ""; //$NON-NLS-1$
-
- /**
- * The cached value of the '{@link #getReferenceLink() <em>Reference Link</em>}'
- * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @see #getReferenceLink()
- * @generated
- * @ordered
- */
- protected String referenceLink = REFERENCE_LINK_EDEFAULT;
-
- /**
- * The cached value of the '{@link #getHeight() <em>Height</em>}'
- * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @see #getHeight()
- * @generated
- * @ordered
- */
- protected int height = HEIGHT_EDEFAULT;
-
- /**
- * The default value of the '{@link #getId() <em>Id</em>}' attribute. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @see #getId()
- * @generated
- * @ordered
- */
- protected static final String ID_EDEFAULT = null;
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- protected PageflowElementImpl() {
- super();
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- protected EClass eStaticClass() {
- return PageflowPackage.eINSTANCE.getPageflowElement();
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public String getName() {
- return name == null || name.length() == 0 ? NAME_EDEFAULT : name;
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public void setName(String newName) {
- String oldName = name;
- name = newName;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET,
- PageflowPackage.PAGEFLOW_ELEMENT__NAME, oldName, name));
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public String getComment() {
- return comment;
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public void setComment(String newComment) {
- String oldComment = comment;
- comment = newComment;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET,
- PageflowPackage.PAGEFLOW_ELEMENT__COMMENT, oldComment,
- comment));
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public int getX() {
- return x;
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public void setX(int newX) {
- int oldX = x;
- x = newX;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET,
- PageflowPackage.PAGEFLOW_ELEMENT__X, oldX, x));
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public int getY() {
- return y;
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public void setY(int newY) {
- int oldY = y;
- y = newY;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET,
- PageflowPackage.PAGEFLOW_ELEMENT__Y, oldY, y));
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public int getWidth() {
- return width;
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public void setWidth(int newWidth) {
- int oldWidth = width;
- width = newWidth;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET,
- PageflowPackage.PAGEFLOW_ELEMENT__WIDTH, oldWidth, width));
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public int getHeight() {
- return height;
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public void setHeight(int newHeight) {
- int oldHeight = height;
- height = newHeight;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET,
- PageflowPackage.PAGEFLOW_ELEMENT__HEIGHT, oldHeight, height));
- }
-
- /**
- * Generate (and cache) an id as needed
- *
- * @generated NOT
- */
- public String getId() {
- if (id == null) {
- id = generateId();
- }
- return id;
- }
-
- /**
- * Generate a random id based on the current time
- *
- * @return the generated id
- *
- * @generated NOT
- */
- public synchronized String generateId() {
- long current = System.currentTimeMillis();
- return idPrefix + current + counter++;
- }
-
- /**
- * Set or generate an Id This method should not be called except when
- * populating from the serialization
- *
- * @generated NOT
- */
- public void setId(String newId) {
- if (newId == null && id == null) {
- id = generateId();
- } else {
- id = newId;
- }
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public String getReferenceLink() {
- return referenceLink;
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public void setReferenceLink(String newReferenceLink) {
- String oldReferenceLink = referenceLink;
- referenceLink = newReferenceLink;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET,
- PageflowPackage.PAGEFLOW_ELEMENT__REFERENCE_LINK,
- oldReferenceLink, referenceLink));
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public Object eGet(EStructuralFeature eFeature, boolean resolve) {
- switch (eDerivedStructuralFeatureID(eFeature)) {
- case PageflowPackage.PAGEFLOW_ELEMENT__NAME:
- return getName();
- case PageflowPackage.PAGEFLOW_ELEMENT__COMMENT:
- return getComment();
- case PageflowPackage.PAGEFLOW_ELEMENT__X:
- return new Integer(getX());
- case PageflowPackage.PAGEFLOW_ELEMENT__Y:
- return new Integer(getY());
- case PageflowPackage.PAGEFLOW_ELEMENT__WIDTH:
- return new Integer(getWidth());
- case PageflowPackage.PAGEFLOW_ELEMENT__HEIGHT:
- return new Integer(getHeight());
- case PageflowPackage.PAGEFLOW_ELEMENT__ID:
- return getId();
- case PageflowPackage.PAGEFLOW_ELEMENT__REFERENCE_LINK:
- return getReferenceLink();
- }
- return eDynamicGet(eFeature, resolve);
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public void eSet(EStructuralFeature eFeature, Object newValue) {
- switch (eDerivedStructuralFeatureID(eFeature)) {
- case PageflowPackage.PAGEFLOW_ELEMENT__NAME:
- setName((String) newValue);
- return;
- case PageflowPackage.PAGEFLOW_ELEMENT__COMMENT:
- setComment((String) newValue);
- return;
- case PageflowPackage.PAGEFLOW_ELEMENT__X:
- setX(((Integer) newValue).intValue());
- return;
- case PageflowPackage.PAGEFLOW_ELEMENT__Y:
- setY(((Integer) newValue).intValue());
- return;
- case PageflowPackage.PAGEFLOW_ELEMENT__WIDTH:
- setWidth(((Integer) newValue).intValue());
- return;
- case PageflowPackage.PAGEFLOW_ELEMENT__HEIGHT:
- setHeight(((Integer) newValue).intValue());
- return;
- case PageflowPackage.PAGEFLOW_ELEMENT__ID:
- setId((String) newValue);
- return;
- case PageflowPackage.PAGEFLOW_ELEMENT__REFERENCE_LINK:
- setReferenceLink((String) newValue);
- return;
- }
- eDynamicSet(eFeature, newValue);
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public void eUnset(EStructuralFeature eFeature) {
- switch (eDerivedStructuralFeatureID(eFeature)) {
- case PageflowPackage.PAGEFLOW_ELEMENT__NAME:
- setName(NAME_EDEFAULT);
- return;
- case PageflowPackage.PAGEFLOW_ELEMENT__COMMENT:
- setComment(COMMENT_EDEFAULT);
- return;
- case PageflowPackage.PAGEFLOW_ELEMENT__X:
- setX(X_EDEFAULT);
- return;
- case PageflowPackage.PAGEFLOW_ELEMENT__Y:
- setY(Y_EDEFAULT);
- return;
- case PageflowPackage.PAGEFLOW_ELEMENT__WIDTH:
- setWidth(WIDTH_EDEFAULT);
- return;
- case PageflowPackage.PAGEFLOW_ELEMENT__HEIGHT:
- setHeight(HEIGHT_EDEFAULT);
- return;
- case PageflowPackage.PAGEFLOW_ELEMENT__ID:
- setId(ID_EDEFAULT);
- return;
- case PageflowPackage.PAGEFLOW_ELEMENT__REFERENCE_LINK:
- setReferenceLink(REFERENCE_LINK_EDEFAULT);
- return;
- }
- eDynamicUnset(eFeature);
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public boolean eIsSet(EStructuralFeature eFeature) {
- switch (eDerivedStructuralFeatureID(eFeature)) {
- case PageflowPackage.PAGEFLOW_ELEMENT__NAME:
- return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT
- .equals(name);
- case PageflowPackage.PAGEFLOW_ELEMENT__COMMENT:
- return COMMENT_EDEFAULT == null ? comment != null
- : !COMMENT_EDEFAULT.equals(comment);
- case PageflowPackage.PAGEFLOW_ELEMENT__X:
- return x != X_EDEFAULT;
- case PageflowPackage.PAGEFLOW_ELEMENT__Y:
- return y != Y_EDEFAULT;
- case PageflowPackage.PAGEFLOW_ELEMENT__WIDTH:
- return width != WIDTH_EDEFAULT;
- case PageflowPackage.PAGEFLOW_ELEMENT__HEIGHT:
- return height != HEIGHT_EDEFAULT;
- case PageflowPackage.PAGEFLOW_ELEMENT__ID:
- return ID_EDEFAULT == null ? getId() != null : !ID_EDEFAULT
- .equals(getId());
- case PageflowPackage.PAGEFLOW_ELEMENT__REFERENCE_LINK:
- return REFERENCE_LINK_EDEFAULT == null ? referenceLink != null
- : !REFERENCE_LINK_EDEFAULT.equals(referenceLink);
- }
- return eDynamicIsSet(eFeature);
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public String toString() {
- if (eIsProxy())
- return super.toString();
-
- StringBuffer result = new StringBuffer(super.toString());
- result.append(" (name: "); //$NON-NLS-1$
- result.append(name);
- result.append(", comment: "); //$NON-NLS-1$
- result.append(comment);
- result.append(", x: "); //$NON-NLS-1$
- result.append(x);
- result.append(", y: "); //$NON-NLS-1$
- result.append(y);
- result.append(", width: "); //$NON-NLS-1$
- result.append(width);
- result.append(", height: "); //$NON-NLS-1$
- result.append(height);
- result.append(", referenceLink: "); //$NON-NLS-1$
- result.append(referenceLink);
- result.append(')');
- return result.toString();
- }
-
- /**
- * The synchronizer will use this to notify adapters for the faces-config's
- * modification.
- *
- * @generated NOT
- */
- public void notifyModelChanged(Notification notification) {
- if (eNotificationRequired())
- eNotify(notification);
- }
-
- /**
- * @generated NOT
- */
-
- public ReferenceElement getFCElements() {
- return null;
- }
-
- /**
- * @generated NOT
- */
- public void update() {
- getFCElements().update();
- if (!TransformUtil.isValidPageflowElement(this)) {
- eAdapters().clear();
- }
- }
-
- /**
- * @generated NOT
- */
- public void dispose() {
- getFCElements().dispose();
- eAdapters.clear();
- }
-
-}
-// PageflowElementImpl
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/model/impl/PageflowFactoryImpl.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/model/impl/PageflowFactoryImpl.java
deleted file mode 100644
index aabbe3e..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/model/impl/PageflowFactoryImpl.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.impl;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.impl.EFactoryImpl;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.Pageflow;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowFactory;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowLink;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowLinkBendpoint;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowPackage;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowPage;
-
-/**
- * <!-- begin-user-doc --> An implementation of the model <b>Factory</b>. <!--
- * end-user-doc -->
- *
- * @generated
- */
-public class PageflowFactoryImpl extends EFactoryImpl implements
- PageflowFactory {
- /**
- * Creates and instance of the factory. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public PageflowFactoryImpl() {
- super();
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public EObject create(EClass eClass) {
- switch (eClass.getClassifierID()) {
- case PageflowPackage.PAGEFLOW:
- return createPageflow();
- case PageflowPackage.PF_LINK:
- return createPFLink();
- case PageflowPackage.PF_PAGE:
- return createPFPage();
- case PageflowPackage.PF_LINK_BENDPOINT:
- return createPFLinkBendpoint();
- default:
- throw new IllegalArgumentException("The class '" + eClass.getName() //$NON-NLS-1$
- + "' is not a valid classifier"); //$NON-NLS-1$
- }
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public Pageflow createPageflow() {
- PageflowImpl pageflow = new PageflowImpl();
- return pageflow;
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public PageflowLink createPFLink() {
- PageflowLinkImpl pfLink = new PageflowLinkImpl();
- return pfLink;
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public PageflowPage createPFPage() {
- PageflowPageImpl pfPage = new PageflowPageImpl();
- return pfPage;
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public PageflowLinkBendpoint createPFLinkBendpoint() {
- PageflowLinkBendpointImpl pfLinkBendpoint = new PageflowLinkBendpointImpl();
- return pfLinkBendpoint;
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public PageflowPackage getPageflowPackage() {
- return (PageflowPackage) getEPackage();
- }
-}
-// PageflowFactoryImpl
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/model/impl/PageflowImpl.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/model/impl/PageflowImpl.java
deleted file mode 100644
index f637ac2..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/model/impl/PageflowImpl.java
+++ /dev/null
@@ -1,472 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.impl;
-
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Iterator;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.common.util.TreeIterator;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.EObjectContainmentWithInverseEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.Pageflow;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowElement;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowLink;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowNode;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowPackage;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.util.PageflowValidation;
-
-/**
- * <!-- begin-user-doc --> An implementation of the model object '<em><b>Pageflow</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- * <li>{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.impl.PageflowImpl#getNodes <em>Nodes</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.impl.PageflowImpl#getLinks <em>Links</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.impl.PageflowImpl#getConfigfile <em>Configfile</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class PageflowImpl extends PageflowElementImpl implements Pageflow {
-
- /**
- * The cached value of the '{@link #getNodes() <em>Nodes</em>}'
- * containment reference list. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @see #getNodes()
- * @generated
- * @ordered
- */
- protected EList nodes = null;
-
- /**
- * The cached value of the '{@link #getLinks() <em>Links</em>}'
- * containment reference list. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @see #getLinks()
- * @generated
- * @ordered
- */
- protected EList links = null;
-
- /**
- * The default value of the '{@link #getConfigfile() <em>Configfile</em>}'
- * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @see #getConfigfile()
- * @generated
- * @ordered
- */
- protected static final String CONFIGFILE_EDEFAULT = null;
-
- /**
- * The cached value of the '{@link #getConfigfile() <em>Configfile</em>}'
- * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @see #getConfigfile()
- * @generated
- * @ordered
- */
- protected String configfile = CONFIGFILE_EDEFAULT;
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- protected PageflowImpl() {
- super();
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- protected EClass eStaticClass() {
- return PageflowPackage.eINSTANCE.getPageflow();
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public EList getNodes() {
- if (nodes == null) {
- nodes = new EObjectContainmentWithInverseEList(PageflowNode.class,
- this, PageflowPackage.PAGEFLOW__NODES,
- PageflowPackage.PAGEFLOW_NODE__PAGEFLOW);
- }
- return nodes;
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public EList getLinks() {
- if (links == null) {
- links = new EObjectContainmentWithInverseEList(PageflowLink.class,
- this, PageflowPackage.PAGEFLOW__LINKS,
- PageflowPackage.PF_LINK__PAGEFLOW);
- }
- return links;
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public String getConfigfile() {
- return configfile;
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public void setConfigfile(String newConfigfile) {
- String oldConfigfile = configfile;
- configfile = newConfigfile;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET,
- PageflowPackage.PAGEFLOW__CONFIGFILE, oldConfigfile,
- configfile));
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public NotificationChain eInverseAdd(InternalEObject otherEnd,
- int featureID, Class baseClass, NotificationChain msgs) {
- if (featureID >= 0) {
- switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
- case PageflowPackage.PAGEFLOW__NODES:
- return ((InternalEList) getNodes()).basicAdd(otherEnd, msgs);
- case PageflowPackage.PAGEFLOW__LINKS:
- return ((InternalEList) getLinks()).basicAdd(otherEnd, msgs);
- default:
- return eDynamicInverseAdd(otherEnd, featureID, baseClass, msgs);
- }
- }
- if (eContainer != null)
- msgs = eBasicRemoveFromContainer(msgs);
- return eBasicSetContainer(otherEnd, featureID, msgs);
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public NotificationChain eInverseRemove(InternalEObject otherEnd,
- int featureID, Class baseClass, NotificationChain msgs) {
- if (featureID >= 0) {
- switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
- case PageflowPackage.PAGEFLOW__NODES:
- return ((InternalEList) getNodes()).basicRemove(otherEnd, msgs);
- case PageflowPackage.PAGEFLOW__LINKS:
- return ((InternalEList) getLinks()).basicRemove(otherEnd, msgs);
- default:
- return eDynamicInverseRemove(otherEnd, featureID, baseClass,
- msgs);
- }
- }
- return eBasicSetContainer(null, featureID, msgs);
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public Object eGet(EStructuralFeature eFeature, boolean resolve) {
- switch (eDerivedStructuralFeatureID(eFeature)) {
- case PageflowPackage.PAGEFLOW__NAME:
- return getName();
- case PageflowPackage.PAGEFLOW__COMMENT:
- return getComment();
- case PageflowPackage.PAGEFLOW__X:
- return new Integer(getX());
- case PageflowPackage.PAGEFLOW__Y:
- return new Integer(getY());
- case PageflowPackage.PAGEFLOW__WIDTH:
- return new Integer(getWidth());
- case PageflowPackage.PAGEFLOW__HEIGHT:
- return new Integer(getHeight());
- case PageflowPackage.PAGEFLOW__ID:
- return getId();
- case PageflowPackage.PAGEFLOW__NODES:
- return getNodes();
- case PageflowPackage.PAGEFLOW__LINKS:
- return getLinks();
- case PageflowPackage.PAGEFLOW__CONFIGFILE:
- return getConfigfile();
- }
- return super.eGet(eFeature, resolve);
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public void eSet(EStructuralFeature eFeature, Object newValue) {
- switch (eDerivedStructuralFeatureID(eFeature)) {
- case PageflowPackage.PAGEFLOW__NAME:
- setName((String) newValue);
- return;
- case PageflowPackage.PAGEFLOW__COMMENT:
- setComment((String) newValue);
- return;
- case PageflowPackage.PAGEFLOW__X:
- setX(((Integer) newValue).intValue());
- return;
- case PageflowPackage.PAGEFLOW__Y:
- setY(((Integer) newValue).intValue());
- return;
- case PageflowPackage.PAGEFLOW__WIDTH:
- setWidth(((Integer) newValue).intValue());
- return;
- case PageflowPackage.PAGEFLOW__HEIGHT:
- setHeight(((Integer) newValue).intValue());
- return;
- case PageflowPackage.PAGEFLOW__ID:
- setId((String) newValue);
- return;
- case PageflowPackage.PAGEFLOW__NODES:
- getNodes().clear();
- getNodes().addAll((Collection) newValue);
- return;
- case PageflowPackage.PAGEFLOW__LINKS:
- getLinks().clear();
- getLinks().addAll((Collection) newValue);
- return;
- case PageflowPackage.PAGEFLOW__CONFIGFILE:
- setConfigfile((String) newValue);
- return;
- }
- super.eSet(eFeature, newValue);
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public void eUnset(EStructuralFeature eFeature) {
- switch (eDerivedStructuralFeatureID(eFeature)) {
- case PageflowPackage.PAGEFLOW__NAME:
- setName(NAME_EDEFAULT);
- return;
- case PageflowPackage.PAGEFLOW__COMMENT:
- setComment(COMMENT_EDEFAULT);
- return;
- case PageflowPackage.PAGEFLOW__X:
- setX(X_EDEFAULT);
- return;
- case PageflowPackage.PAGEFLOW__Y:
- setY(Y_EDEFAULT);
- return;
- case PageflowPackage.PAGEFLOW__WIDTH:
- setWidth(WIDTH_EDEFAULT);
- return;
- case PageflowPackage.PAGEFLOW__HEIGHT:
- setHeight(HEIGHT_EDEFAULT);
- return;
- case PageflowPackage.PAGEFLOW__ID:
- setId(ID_EDEFAULT);
- return;
- case PageflowPackage.PAGEFLOW__NODES:
- getNodes().clear();
- return;
- case PageflowPackage.PAGEFLOW__LINKS:
- getLinks().clear();
- return;
- case PageflowPackage.PAGEFLOW__CONFIGFILE:
- setConfigfile(CONFIGFILE_EDEFAULT);
- return;
- }
- super.eUnset(eFeature);
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public boolean eIsSet(EStructuralFeature eFeature) {
- switch (eDerivedStructuralFeatureID(eFeature)) {
- case PageflowPackage.PAGEFLOW__NAME:
- return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT
- .equals(name);
- case PageflowPackage.PAGEFLOW__COMMENT:
- return COMMENT_EDEFAULT == null ? comment != null
- : !COMMENT_EDEFAULT.equals(comment);
- case PageflowPackage.PAGEFLOW__X:
- return x != X_EDEFAULT;
- case PageflowPackage.PAGEFLOW__Y:
- return y != Y_EDEFAULT;
- case PageflowPackage.PAGEFLOW__WIDTH:
- return width != WIDTH_EDEFAULT;
- case PageflowPackage.PAGEFLOW__HEIGHT:
- return height != HEIGHT_EDEFAULT;
- case PageflowPackage.PAGEFLOW__ID:
- return ID_EDEFAULT == null ? getId() != null : !ID_EDEFAULT
- .equals(getId());
- case PageflowPackage.PAGEFLOW__NODES:
- return nodes != null && !nodes.isEmpty();
- case PageflowPackage.PAGEFLOW__LINKS:
- return links != null && !links.isEmpty();
- case PageflowPackage.PAGEFLOW__CONFIGFILE:
- return CONFIGFILE_EDEFAULT == null ? configfile != null
- : !CONFIGFILE_EDEFAULT.equals(configfile);
- }
- return super.eIsSet(eFeature);
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public String toString() {
- if (eIsProxy())
- return super.toString();
-
- StringBuffer result = new StringBuffer(super.toString());
- result.append(" (configfile: "); //$NON-NLS-1$
- result.append(configfile);
- result.append(')');
- return result.toString();
- }
-
- /**
- * set the valid link's source and target node.
- *
- * @generated NOT
- */
- public void connect(PageflowNode source, PageflowNode target,
- PageflowLink link) {
- if (link != null) {
- if (PageflowValidation.getInstance().isValidLinkForCreation(source,
- target)) {
- this.getLinks().add(link);
- link.setSource(source);
- link.setTarget(target);
- }
- }
- }
-
- /** node prefixs map */
- private HashMap mapNodePrefix = null;
-
- /**
- * get the prefix's map, and if the map is not existed, create it.
- *
- * @return - map for prefix
- *
- * @generated NOT
- */
- private HashMap getNodePrefixMap() {
- if (mapNodePrefix == null) {
- mapNodePrefix = new HashMap();
- mapNodePrefix.put(PageflowPageImpl.class, new String("Page")); //$NON-NLS-1$
- }
- return mapNodePrefix;
- }
-
- /**
- * get the default node name according current nodetype
- *
- * @param nodeType -
- * node type, such as PFBeginImpl, PFPageImpl, etc.
- * @return - the default node name.
- *
- * @generated NOT
- */
- public String getDefaultNodeName(Class nodeType) {
- HashMap mapNodePrefix_ = getNodePrefixMap();
-
- String strNodePrefix = (String) mapNodePrefix_.get(nodeType);
-
- String strNodeName = null;
- boolean bFound = true;
- int numNode = 1;
- while (bFound) {
- strNodeName = strNodePrefix + numNode;
- boolean bExisted = false;
- for (Iterator iter = getNodes().iterator(); iter.hasNext();) {
- PageflowNode node = (PageflowNode) iter.next();
- if (strNodeName.equalsIgnoreCase(node.getName())) {
- bExisted = true;
- break;
- }
- }
- if (!bExisted) {
- bFound = false;
- }
- numNode++;
- }
-
- return strNodeName;
-
- }
-
- /**
- * When faces-config has been changed, the pageflow model will be notified
- * to enable refresher do some update in pageflow.
- *
- * @generated NOT
- */
- public void notifyModelChanged(Notification notification) {
- TreeIterator children = eAllContents();
- while (children.hasNext()) {
- Object next = children.next();
- if (next instanceof PageflowElement) {
- ((PageflowElement) next).update();
- }
- }
- super.notifyModelChanged(notification);
- }
-
- /**
- * @generated NOT
- */
- public void dispose() {
- TreeIterator children = eAllContents();
- while (children.hasNext()) {
- Object next = children.next();
- if (next instanceof PageflowElement) {
- ((PageflowElement) next).dispose();
- }
- }
- eAdapters.clear();
- }
-}
-// PageflowImpl
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/model/impl/PageflowLinkBendpointImpl.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/model/impl/PageflowLinkBendpointImpl.java
deleted file mode 100644
index bdb66fc..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/model/impl/PageflowLinkBendpointImpl.java
+++ /dev/null
@@ -1,552 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.impl;
-
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.PageflowMessages;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowLink;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowLinkBendpoint;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowPackage;
-import org.eclipse.osgi.util.NLS;
-
-/**
- * <!-- begin-user-doc --> An implementation of the model object '<em><b>PF Link Bendpoint</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- * <li>{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.impl.PageflowLinkBendpointImpl#getD1Width <em>D1 Width</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.impl.PageflowLinkBendpointImpl#getD1Height <em>D1 Height</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.impl.PageflowLinkBendpointImpl#getD2Width <em>D2 Width</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.impl.PageflowLinkBendpointImpl#getD2Height <em>D2 Height</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.impl.PageflowLinkBendpointImpl#getWeight <em>Weight</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.impl.PageflowLinkBendpointImpl#getLink <em>Link</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class PageflowLinkBendpointImpl extends EObjectImpl implements PageflowLinkBendpoint {
- /**
- * The default value of the '{@link #getD1Width() <em>D1 Width</em>}'
- * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @see #getD1Width()
- * @generated
- * @ordered
- */
- protected static final int D1_WIDTH_EDEFAULT = 0;
-
- /**
- * The cached value of the '{@link #getD1Width() <em>D1 Width</em>}'
- * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @see #getD1Width()
- * @generated
- * @ordered
- */
- protected int d1Width = D1_WIDTH_EDEFAULT;
-
- /**
- * The default value of the '{@link #getD1Height() <em>D1 Height</em>}'
- * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @see #getD1Height()
- * @generated
- * @ordered
- */
- protected static final int D1_HEIGHT_EDEFAULT = 0;
-
- /**
- * The cached value of the '{@link #getD1Height() <em>D1 Height</em>}'
- * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @see #getD1Height()
- * @generated
- * @ordered
- */
- protected int d1Height = D1_HEIGHT_EDEFAULT;
-
- /**
- * The default value of the '{@link #getD2Width() <em>D2 Width</em>}'
- * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @see #getD2Width()
- * @generated
- * @ordered
- */
- protected static final int D2_WIDTH_EDEFAULT = 0;
-
- /**
- * The cached value of the '{@link #getD2Width() <em>D2 Width</em>}'
- * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @see #getD2Width()
- * @generated
- * @ordered
- */
- protected int d2Width = D2_WIDTH_EDEFAULT;
-
- /**
- * The default value of the '{@link #getD2Height() <em>D2 Height</em>}'
- * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @see #getD2Height()
- * @generated
- * @ordered
- */
- protected static final int D2_HEIGHT_EDEFAULT = 0;
-
- /**
- * The cached value of the '{@link #getD2Height() <em>D2 Height</em>}'
- * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @see #getD2Height()
- * @generated
- * @ordered
- */
- protected int d2Height = D2_HEIGHT_EDEFAULT;
-
- /**
- * The default value of the '{@link #getWeight() <em>Weight</em>}'
- * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @see #getWeight()
- * @generated
- * @ordered
- */
- protected static final float WEIGHT_EDEFAULT = 0.5F;
-
- /**
- * The cached value of the '{@link #getWeight() <em>Weight</em>}'
- * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @see #getWeight()
- * @generated
- * @ordered
- */
- protected float weight = WEIGHT_EDEFAULT;
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated NOT
- */
- private Dimension dimStart, dimEnd;
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- protected PageflowLinkBendpointImpl() {
- super();
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- protected EClass eStaticClass() {
- return PageflowPackage.eINSTANCE.getPFLinkBendpoint();
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public int getD1Width() {
- return d1Width;
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public void setD1Width(int newD1Width) {
- int oldD1Width = d1Width;
- d1Width = newD1Width;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET,
- PageflowPackage.PF_LINK_BENDPOINT__D1_WIDTH, oldD1Width,
- d1Width));
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public int getD1Height() {
- return d1Height;
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public void setD1Height(int newD1Height) {
- int oldD1Height = d1Height;
- d1Height = newD1Height;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET,
- PageflowPackage.PF_LINK_BENDPOINT__D1_HEIGHT, oldD1Height,
- d1Height));
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public int getD2Width() {
- return d2Width;
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public void setD2Width(int newD2Width) {
- int oldD2Width = d2Width;
- d2Width = newD2Width;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET,
- PageflowPackage.PF_LINK_BENDPOINT__D2_WIDTH, oldD2Width,
- d2Width));
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public int getD2Height() {
- return d2Height;
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public void setD2Height(int newD2Height) {
- int oldD2Height = d2Height;
- d2Height = newD2Height;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET,
- PageflowPackage.PF_LINK_BENDPOINT__D2_HEIGHT, oldD2Height,
- d2Height));
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public float getWeight() {
- return weight;
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public void setWeight(float newWeight) {
- float oldWeight = weight;
- weight = newWeight;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET,
- PageflowPackage.PF_LINK_BENDPOINT__WEIGHT, oldWeight,
- weight));
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public PageflowLink getLink() {
- if (eContainerFeatureID != PageflowPackage.PF_LINK_BENDPOINT__LINK)
- return null;
- return (PageflowLink) eContainer;
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public void setLink(PageflowLink newLink) {
- if (newLink != eContainer
- || (eContainerFeatureID != PageflowPackage.PF_LINK_BENDPOINT__LINK && newLink != null)) {
- if (EcoreUtil.isAncestor(this, newLink))
- throw new IllegalArgumentException(
- NLS.bind(PageflowMessages.PageflowNode_NoRecursiveContainment,toString()));
- NotificationChain msgs = null;
- if (eContainer != null)
- msgs = eBasicRemoveFromContainer(msgs);
- if (newLink != null)
- msgs = ((InternalEObject) newLink).eInverseAdd(this,
- PageflowPackage.PF_LINK__BEND_POINTS, PageflowLink.class,
- msgs);
- msgs = eBasicSetContainer((InternalEObject) newLink,
- PageflowPackage.PF_LINK_BENDPOINT__LINK, msgs);
- if (msgs != null)
- msgs.dispatch();
- } else if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET,
- PageflowPackage.PF_LINK_BENDPOINT__LINK, newLink, newLink));
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public NotificationChain eInverseAdd(InternalEObject otherEnd,
- int featureID, Class baseClass, NotificationChain msgs) {
- if (featureID >= 0) {
- switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
- case PageflowPackage.PF_LINK_BENDPOINT__LINK:
- if (eContainer != null)
- msgs = eBasicRemoveFromContainer(msgs);
- return eBasicSetContainer(otherEnd,
- PageflowPackage.PF_LINK_BENDPOINT__LINK, msgs);
- default:
- return eDynamicInverseAdd(otherEnd, featureID, baseClass, msgs);
- }
- }
- if (eContainer != null)
- msgs = eBasicRemoveFromContainer(msgs);
- return eBasicSetContainer(otherEnd, featureID, msgs);
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public NotificationChain eInverseRemove(InternalEObject otherEnd,
- int featureID, Class baseClass, NotificationChain msgs) {
- if (featureID >= 0) {
- switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
- case PageflowPackage.PF_LINK_BENDPOINT__LINK:
- return eBasicSetContainer(null,
- PageflowPackage.PF_LINK_BENDPOINT__LINK, msgs);
- default:
- return eDynamicInverseRemove(otherEnd, featureID, baseClass,
- msgs);
- }
- }
- return eBasicSetContainer(null, featureID, msgs);
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public NotificationChain eBasicRemoveFromContainer(NotificationChain msgs) {
- if (eContainerFeatureID >= 0) {
- switch (eContainerFeatureID) {
- case PageflowPackage.PF_LINK_BENDPOINT__LINK:
- return eContainer.eInverseRemove(this,
- PageflowPackage.PF_LINK__BEND_POINTS, PageflowLink.class,
- msgs);
- default:
- return eDynamicBasicRemoveFromContainer(msgs);
- }
- }
- return eContainer.eInverseRemove(this,
- EOPPOSITE_FEATURE_BASE - eContainerFeatureID, null, msgs);
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public Object eGet(EStructuralFeature eFeature, boolean resolve) {
- switch (eDerivedStructuralFeatureID(eFeature)) {
- case PageflowPackage.PF_LINK_BENDPOINT__D1_WIDTH:
- return new Integer(getD1Width());
- case PageflowPackage.PF_LINK_BENDPOINT__D1_HEIGHT:
- return new Integer(getD1Height());
- case PageflowPackage.PF_LINK_BENDPOINT__D2_WIDTH:
- return new Integer(getD2Width());
- case PageflowPackage.PF_LINK_BENDPOINT__D2_HEIGHT:
- return new Integer(getD2Height());
- case PageflowPackage.PF_LINK_BENDPOINT__WEIGHT:
- return new Float(getWeight());
- case PageflowPackage.PF_LINK_BENDPOINT__LINK:
- return getLink();
- }
- return eDynamicGet(eFeature, resolve);
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public void eSet(EStructuralFeature eFeature, Object newValue) {
- switch (eDerivedStructuralFeatureID(eFeature)) {
- case PageflowPackage.PF_LINK_BENDPOINT__D1_WIDTH:
- setD1Width(((Integer) newValue).intValue());
- return;
- case PageflowPackage.PF_LINK_BENDPOINT__D1_HEIGHT:
- setD1Height(((Integer) newValue).intValue());
- return;
- case PageflowPackage.PF_LINK_BENDPOINT__D2_WIDTH:
- setD2Width(((Integer) newValue).intValue());
- return;
- case PageflowPackage.PF_LINK_BENDPOINT__D2_HEIGHT:
- setD2Height(((Integer) newValue).intValue());
- return;
- case PageflowPackage.PF_LINK_BENDPOINT__WEIGHT:
- setWeight(((Float) newValue).floatValue());
- return;
- case PageflowPackage.PF_LINK_BENDPOINT__LINK:
- setLink((PageflowLink) newValue);
- return;
- }
- eDynamicSet(eFeature, newValue);
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public void eUnset(EStructuralFeature eFeature) {
- switch (eDerivedStructuralFeatureID(eFeature)) {
- case PageflowPackage.PF_LINK_BENDPOINT__D1_WIDTH:
- setD1Width(D1_WIDTH_EDEFAULT);
- return;
- case PageflowPackage.PF_LINK_BENDPOINT__D1_HEIGHT:
- setD1Height(D1_HEIGHT_EDEFAULT);
- return;
- case PageflowPackage.PF_LINK_BENDPOINT__D2_WIDTH:
- setD2Width(D2_WIDTH_EDEFAULT);
- return;
- case PageflowPackage.PF_LINK_BENDPOINT__D2_HEIGHT:
- setD2Height(D2_HEIGHT_EDEFAULT);
- return;
- case PageflowPackage.PF_LINK_BENDPOINT__WEIGHT:
- setWeight(WEIGHT_EDEFAULT);
- return;
- case PageflowPackage.PF_LINK_BENDPOINT__LINK:
- setLink((PageflowLink) null);
- return;
- }
- eDynamicUnset(eFeature);
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public boolean eIsSet(EStructuralFeature eFeature) {
- switch (eDerivedStructuralFeatureID(eFeature)) {
- case PageflowPackage.PF_LINK_BENDPOINT__D1_WIDTH:
- return d1Width != D1_WIDTH_EDEFAULT;
- case PageflowPackage.PF_LINK_BENDPOINT__D1_HEIGHT:
- return d1Height != D1_HEIGHT_EDEFAULT;
- case PageflowPackage.PF_LINK_BENDPOINT__D2_WIDTH:
- return d2Width != D2_WIDTH_EDEFAULT;
- case PageflowPackage.PF_LINK_BENDPOINT__D2_HEIGHT:
- return d2Height != D2_HEIGHT_EDEFAULT;
- case PageflowPackage.PF_LINK_BENDPOINT__WEIGHT:
- return weight != WEIGHT_EDEFAULT;
- case PageflowPackage.PF_LINK_BENDPOINT__LINK:
- return getLink() != null;
- }
- return eDynamicIsSet(eFeature);
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public String toString() {
- if (eIsProxy())
- return super.toString();
-
- StringBuffer result = new StringBuffer(super.toString());
- result.append(" (d1Width: "); //$NON-NLS-1$
- result.append(d1Width);
- result.append(", d1Height: "); //$NON-NLS-1$
- result.append(d1Height);
- result.append(", d2Width: "); //$NON-NLS-1$
- result.append(d2Width);
- result.append(", d2Height: "); //$NON-NLS-1$
- result.append(d2Height);
- result.append(", weight: "); //$NON-NLS-1$
- result.append(weight);
- result.append(')');
- return result.toString();
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated NOT
- */
- public Dimension getFirstRelativeDimension() {
- dimStart = new Dimension(getD1Width(), getD1Height());
- return dimStart;
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated NOT
- */
- public Dimension getSecondRelativeDimension() {
- dimEnd = new Dimension(getD2Width(), getD2Height());
- return dimEnd;
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated NOT
- */
- public void setRelativeDimensions(Dimension dim1, Dimension dim2) {
- dimStart = dim1;
- dimEnd = dim2;
- setD1Width(dimStart.width);
- setD1Height(dimStart.height);
-
- setD2Width(dimEnd.width);
- setD2Height(dimEnd.height);
- }
-
-}
-// PFLinkBendpointImpl
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/model/impl/PageflowLinkImpl.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/model/impl/PageflowLinkImpl.java
deleted file mode 100644
index 61d45f8..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/model/impl/PageflowLinkImpl.java
+++ /dev/null
@@ -1,893 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.impl;
-
-import java.util.Collection;
-import java.util.Vector;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.EObjectContainmentWithInverseEList;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.PageflowMessages;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.Pageflow;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowLink;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowLinkBendpoint;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowNode;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowPackage;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowPage;
-import org.eclipse.osgi.util.NLS;
-
-/**
- * <!-- begin-user-doc --> An implementation of the model object '<em><b>PF Link</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- * <li>{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.impl.PageflowLinkImpl#getPageflow <em>Pageflow</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.impl.PageflowLinkImpl#getTarget <em>Target</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.impl.PageflowLinkImpl#getSource <em>Source</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.impl.PageflowLinkImpl#getOutcome <em>Outcome</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.impl.PageflowLinkImpl#isRedirect <em>Redirect</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.impl.PageflowLinkImpl#getBendPoints <em>Bend Points</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.impl.PageflowLinkImpl#getSmallicon <em>Smallicon</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.impl.PageflowLinkImpl#getLargeicon <em>Largeicon</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- *
- */
-public class PageflowLinkImpl extends PageflowElementImpl implements
- PageflowLink {
- /**
- * The cached value of the '{@link #getTarget() <em>Target</em>}'
- * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @see #getTarget()
- * @generated
- * @ordered
- */
- protected PageflowNode target = null;
-
- /**
- * The cached value of the '{@link #getSource() <em>Source</em>}'
- * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @see #getSource()
- * @generated
- * @ordered
- */
- protected PageflowNode source = null;
-
- /**
- * The default value of the '{@link #getOutcome() <em>Outcome</em>}'
- * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @see #getOutcome()
- * @generated
- * @ordered
- */
- protected static final String OUTCOME_EDEFAULT = null;
-
- /**
- * The default value of the '{@link #isRedirect() <em>Redirect</em>}'
- * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @see #isRedirect()
- * @generated
- * @ordered
- */
- protected static final boolean REDIRECT_EDEFAULT = false;
-
- /**
- * The cached value of the '{@link #getBendPoints() <em>Bend Points</em>}'
- * containment reference list. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @see #getBendPoints()
- * @generated
- * @ordered
- */
- protected EList bendPoints = null;
-
- /**
- * The default value of the '{@link #getSmallicon() <em>Smallicon</em>}'
- * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @see #getSmallicon()
- * @generated
- * @ordered
- */
- protected static final String SMALLICON_EDEFAULT = null;
-
- /**
- * The default value of the '{@link #getLargeicon() <em>Largeicon</em>}'
- * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @see #getLargeicon()
- * @generated
- * @ordered
- */
- protected static final String LARGEICON_EDEFAULT = null;
-
- /**
- * The default value of the '{@link #getFromaction() <em>Fromaction</em>}'
- * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @see #getFromaction()
- * @generated
- * @ordered
- */
- protected static final String FROMACTION_EDEFAULT = null;
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- protected PageflowLinkImpl() {
- super();
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- protected EClass eStaticClass() {
- return PageflowPackage.eINSTANCE.getPFLink();
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public Pageflow getPageflow() {
- if (eContainerFeatureID != PageflowPackage.PF_LINK__PAGEFLOW)
- return null;
- return (Pageflow) eContainer;
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public void setPageflow(Pageflow newPageflow) {
- if (newPageflow != eContainer
- || (eContainerFeatureID != PageflowPackage.PF_LINK__PAGEFLOW && newPageflow != null)) {
- if (EcoreUtil.isAncestor(this, newPageflow))
- throw new IllegalArgumentException(
- NLS.bind(PageflowMessages.PageflowNode_NoRecursiveContainment,toString()));
- NotificationChain msgs = null;
- if (eContainer != null)
- msgs = eBasicRemoveFromContainer(msgs);
- if (newPageflow != null)
- msgs = ((InternalEObject) newPageflow).eInverseAdd(this,
- PageflowPackage.PAGEFLOW__LINKS, Pageflow.class, msgs);
- msgs = eBasicSetContainer((InternalEObject) newPageflow,
- PageflowPackage.PF_LINK__PAGEFLOW, msgs);
- if (msgs != null)
- msgs.dispatch();
- } else if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET,
- PageflowPackage.PF_LINK__PAGEFLOW, newPageflow, newPageflow));
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public PageflowNode getTarget() {
- if (target != null && target.eIsProxy()) {
- PageflowNode oldTarget = target;
- target = (PageflowNode) eResolveProxy((InternalEObject) target);
- if (target != oldTarget) {
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.RESOLVE,
- PageflowPackage.PF_LINK__TARGET, oldTarget, target));
- }
- }
- return target;
- }
-
- public void setSourcePath(String path) {
- if (getSource() != null
- && path.equals(((PageflowPage) getSource()).getPath())) {
- return;
- }
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET,
- PageflowPackage.PF_LINK__SOURCE, getSource(), path));
- }
-
- public void setTargetPath(String path) {
- if (getTarget() != null
- && path.equals(((PageflowPage) getTarget()).getPath())) {
- return;
- }
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET,
- PageflowPackage.PF_LINK__TARGET, getTarget(), path));
- }
-
- /**
- * <!-- begin-user-doc -->
- * @return the target
- * <!-- end-user-doc -->
- *
- *
- * @generated
- */
- public PageflowNode basicGetTarget() {
- return target;
- }
-
- /**
- * <!-- begin-user-doc -->
- * @param newTarget
- * @param msgs
- * @return the notification chain
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public NotificationChain basicSetTarget(PageflowNode newTarget,
- NotificationChain msgs) {
- PageflowNode oldTarget = target;
- target = newTarget;
- if (eNotificationRequired()) {
- ENotificationImpl notification = new ENotificationImpl(this,
- Notification.SET, PageflowPackage.PF_LINK__TARGET,
- oldTarget, newTarget);
- if (msgs == null)
- msgs = notification;
- else
- msgs.add(notification);
- }
- return msgs;
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public void setTarget(PageflowNode newTarget) {
- if (newTarget != target) {
- NotificationChain msgs = null;
- if (target != null)
- msgs = ((InternalEObject) target).eInverseRemove(this,
- PageflowPackage.PAGEFLOW_NODE__INLINKS,
- PageflowNode.class, msgs);
- if (newTarget != null)
- msgs = ((InternalEObject) newTarget).eInverseAdd(this,
- PageflowPackage.PAGEFLOW_NODE__INLINKS,
- PageflowNode.class, msgs);
- msgs = basicSetTarget(newTarget, msgs);
- if (msgs != null)
- msgs.dispatch();
- } else if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET,
- PageflowPackage.PF_LINK__TARGET, newTarget, newTarget));
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public PageflowNode getSource() {
- if (source != null && source.eIsProxy()) {
- PageflowNode oldSource = source;
- source = (PageflowNode) eResolveProxy((InternalEObject) source);
- if (source != oldSource) {
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.RESOLVE,
- PageflowPackage.PF_LINK__SOURCE, oldSource, source));
- }
- }
- return source;
- }
-
- /**
- * <!-- begin-user-doc -->
- * @return the pageflow node
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public PageflowNode basicGetSource() {
- return source;
- }
-
- /**
- * <!-- begin-user-doc -->
- * @param newSource
- * @param msgs
- * @return the notification chain
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public NotificationChain basicSetSource(PageflowNode newSource,
- NotificationChain msgs) {
- // Assert.isTrue(newSource != null);
- PageflowNode oldSource = source;
- source = newSource;
- if (eNotificationRequired()) {
- ENotificationImpl notification = new ENotificationImpl(this,
- Notification.SET, PageflowPackage.PF_LINK__SOURCE,
- oldSource, newSource);
- if (msgs == null)
- msgs = notification;
- else
- msgs.add(notification);
- }
- return msgs;
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public void setSource(PageflowNode newSource) {
- // Assert.isTrue(newSource != null);
- if (newSource != source) {
- NotificationChain msgs = null;
- if (source != null)
- msgs = ((InternalEObject) source).eInverseRemove(this,
- PageflowPackage.PAGEFLOW_NODE__OUTLINKS,
- PageflowNode.class, msgs);
- if (newSource != null)
- msgs = ((InternalEObject) newSource).eInverseAdd(this,
- PageflowPackage.PAGEFLOW_NODE__OUTLINKS,
- PageflowNode.class, msgs);
- msgs = basicSetSource(newSource, msgs);
- if (msgs != null)
- msgs.dispatch();
- } else if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET,
- PageflowPackage.PF_LINK__SOURCE, newSource, newSource));
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public EList getBendPoints() {
- if (bendPoints == null) {
- bendPoints = new EObjectContainmentWithInverseEList(
- PageflowLinkBendpoint.class, this,
- PageflowPackage.PF_LINK__BEND_POINTS,
- PageflowPackage.PF_LINK_BENDPOINT__LINK);
- }
- return bendPoints;
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public NotificationChain eInverseAdd(InternalEObject otherEnd,
- int featureID, Class baseClass, NotificationChain msgs) {
- if (featureID >= 0) {
- switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
- case PageflowPackage.PF_LINK__PAGEFLOW:
- if (eContainer != null)
- msgs = eBasicRemoveFromContainer(msgs);
- return eBasicSetContainer(otherEnd,
- PageflowPackage.PF_LINK__PAGEFLOW, msgs);
- case PageflowPackage.PF_LINK__TARGET:
- if (target != null)
- msgs = ((InternalEObject) target).eInverseRemove(this,
- PageflowPackage.PAGEFLOW_NODE__INLINKS,
- PageflowNode.class, msgs);
- return basicSetTarget((PageflowNode) otherEnd, msgs);
- case PageflowPackage.PF_LINK__SOURCE:
- if (source != null)
- msgs = ((InternalEObject) source).eInverseRemove(this,
- PageflowPackage.PAGEFLOW_NODE__OUTLINKS,
- PageflowNode.class, msgs);
- return basicSetSource((PageflowNode) otherEnd, msgs);
- case PageflowPackage.PF_LINK__BEND_POINTS:
- return ((InternalEList) getBendPoints()).basicAdd(otherEnd,
- msgs);
- default:
- return eDynamicInverseAdd(otherEnd, featureID, baseClass, msgs);
- }
- }
- if (eContainer != null)
- msgs = eBasicRemoveFromContainer(msgs);
- return eBasicSetContainer(otherEnd, featureID, msgs);
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public NotificationChain eInverseRemove(InternalEObject otherEnd,
- int featureID, Class baseClass, NotificationChain msgs) {
- if (featureID >= 0) {
- switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
- case PageflowPackage.PF_LINK__PAGEFLOW:
- return eBasicSetContainer(null,
- PageflowPackage.PF_LINK__PAGEFLOW, msgs);
- case PageflowPackage.PF_LINK__TARGET:
- return basicSetTarget(null, msgs);
- case PageflowPackage.PF_LINK__SOURCE:
- return basicSetSource(null, msgs);
- case PageflowPackage.PF_LINK__BEND_POINTS:
- return ((InternalEList) getBendPoints()).basicRemove(otherEnd,
- msgs);
- default:
- return eDynamicInverseRemove(otherEnd, featureID, baseClass,
- msgs);
- }
- }
- return eBasicSetContainer(null, featureID, msgs);
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public NotificationChain eBasicRemoveFromContainer(NotificationChain msgs) {
- if (eContainerFeatureID >= 0) {
- switch (eContainerFeatureID) {
- case PageflowPackage.PF_LINK__PAGEFLOW:
- return eContainer.eInverseRemove(this,
- PageflowPackage.PAGEFLOW__LINKS, Pageflow.class, msgs);
- default:
- return eDynamicBasicRemoveFromContainer(msgs);
- }
- }
- return eContainer.eInverseRemove(this,
- EOPPOSITE_FEATURE_BASE - eContainerFeatureID, null, msgs);
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public Object eGet(EStructuralFeature eFeature, boolean resolve) {
- switch (eDerivedStructuralFeatureID(eFeature)) {
- case PageflowPackage.PF_LINK__NAME:
- return getName();
- case PageflowPackage.PF_LINK__COMMENT:
- return getComment();
- case PageflowPackage.PF_LINK__X:
- return new Integer(getX());
- case PageflowPackage.PF_LINK__Y:
- return new Integer(getY());
- case PageflowPackage.PF_LINK__WIDTH:
- return new Integer(getWidth());
- case PageflowPackage.PF_LINK__HEIGHT:
- return new Integer(getHeight());
- case PageflowPackage.PF_LINK__ID:
- return getId();
- case PageflowPackage.PF_LINK__PAGEFLOW:
- return getPageflow();
- case PageflowPackage.PF_LINK__TARGET:
- if (resolve)
- return getTarget();
- return basicGetTarget();
- case PageflowPackage.PF_LINK__SOURCE:
- if (resolve)
- return getSource();
- return basicGetSource();
- case PageflowPackage.PF_LINK__OUTCOME:
- return getOutcome();
- case PageflowPackage.PF_LINK__REDIRECT:
- return isRedirect() ? Boolean.TRUE : Boolean.FALSE;
- case PageflowPackage.PF_LINK__BEND_POINTS:
- return getBendPoints();
- case PageflowPackage.PF_LINK__SMALLICON:
- return getSmallicon();
- case PageflowPackage.PF_LINK__LARGEICON:
- return getLargeicon();
- case PageflowPackage.PF_LINK__FROMACTION:
- return getFromaction();
- }
- return super.eGet(eFeature, resolve);
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public void eSet(EStructuralFeature eFeature, Object newValue) {
- switch (eDerivedStructuralFeatureID(eFeature)) {
- case PageflowPackage.PF_LINK__NAME:
- setName((String) newValue);
- return;
- case PageflowPackage.PF_LINK__COMMENT:
- setComment((String) newValue);
- return;
- case PageflowPackage.PF_LINK__X:
- setX(((Integer) newValue).intValue());
- return;
- case PageflowPackage.PF_LINK__Y:
- setY(((Integer) newValue).intValue());
- return;
- case PageflowPackage.PF_LINK__WIDTH:
- setWidth(((Integer) newValue).intValue());
- return;
- case PageflowPackage.PF_LINK__HEIGHT:
- setHeight(((Integer) newValue).intValue());
- return;
- case PageflowPackage.PF_LINK__ID:
- setId((String) newValue);
- return;
- case PageflowPackage.PF_LINK__PAGEFLOW:
- setPageflow((Pageflow) newValue);
- return;
- case PageflowPackage.PF_LINK__TARGET:
- setTarget((PageflowNode) newValue);
- return;
- case PageflowPackage.PF_LINK__SOURCE:
- setSource((PageflowNode) newValue);
- return;
- case PageflowPackage.PF_LINK__OUTCOME:
- setOutcome((String) newValue);
- return;
- case PageflowPackage.PF_LINK__REDIRECT:
- setRedirect(((Boolean) newValue).booleanValue());
- return;
- case PageflowPackage.PF_LINK__BEND_POINTS:
- getBendPoints().clear();
- getBendPoints().addAll((Collection) newValue);
- return;
- case PageflowPackage.PF_LINK__SMALLICON:
- setSmallicon((String) newValue);
- return;
- case PageflowPackage.PF_LINK__LARGEICON:
- setLargeicon((String) newValue);
- return;
- case PageflowPackage.PF_LINK__FROMACTION:
- setFromaction((String) newValue);
- return;
- }
- super.eSet(eFeature, newValue);
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public void eUnset(EStructuralFeature eFeature) {
- switch (eDerivedStructuralFeatureID(eFeature)) {
- case PageflowPackage.PF_LINK__NAME:
- setName(NAME_EDEFAULT);
- return;
- case PageflowPackage.PF_LINK__COMMENT:
- setComment(COMMENT_EDEFAULT);
- return;
- case PageflowPackage.PF_LINK__X:
- setX(X_EDEFAULT);
- return;
- case PageflowPackage.PF_LINK__Y:
- setY(Y_EDEFAULT);
- return;
- case PageflowPackage.PF_LINK__WIDTH:
- setWidth(WIDTH_EDEFAULT);
- return;
- case PageflowPackage.PF_LINK__HEIGHT:
- setHeight(HEIGHT_EDEFAULT);
- return;
- case PageflowPackage.PF_LINK__ID:
- setId(ID_EDEFAULT);
- return;
- case PageflowPackage.PF_LINK__PAGEFLOW:
- setPageflow((Pageflow) null);
- return;
- case PageflowPackage.PF_LINK__TARGET:
- setTarget((PageflowNode) null);
- return;
- case PageflowPackage.PF_LINK__SOURCE:
- setSource((PageflowNode) null);
- return;
- case PageflowPackage.PF_LINK__OUTCOME:
- setOutcome(OUTCOME_EDEFAULT);
- return;
- case PageflowPackage.PF_LINK__REDIRECT:
- setRedirect(REDIRECT_EDEFAULT);
- return;
- case PageflowPackage.PF_LINK__BEND_POINTS:
- getBendPoints().clear();
- return;
- case PageflowPackage.PF_LINK__SMALLICON:
- setSmallicon(SMALLICON_EDEFAULT);
- return;
- case PageflowPackage.PF_LINK__LARGEICON:
- setLargeicon(LARGEICON_EDEFAULT);
- return;
- case PageflowPackage.PF_LINK__FROMACTION:
- setFromaction(FROMACTION_EDEFAULT);
- return;
- }
- super.eUnset(eFeature);
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public boolean eIsSet(EStructuralFeature eFeature) {
- switch (eDerivedStructuralFeatureID(eFeature)) {
- case PageflowPackage.PF_LINK__NAME:
- return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT
- .equals(name);
- case PageflowPackage.PF_LINK__COMMENT:
- return COMMENT_EDEFAULT == null ? comment != null
- : !COMMENT_EDEFAULT.equals(comment);
- case PageflowPackage.PF_LINK__X:
- return x != X_EDEFAULT;
- case PageflowPackage.PF_LINK__Y:
- return y != Y_EDEFAULT;
- case PageflowPackage.PF_LINK__WIDTH:
- return width != WIDTH_EDEFAULT;
- case PageflowPackage.PF_LINK__HEIGHT:
- return height != HEIGHT_EDEFAULT;
- case PageflowPackage.PF_LINK__ID:
- return ID_EDEFAULT == null ? getId() != null : !ID_EDEFAULT
- .equals(getId());
- case PageflowPackage.PF_LINK__PAGEFLOW:
- return getPageflow() != null;
- case PageflowPackage.PF_LINK__TARGET:
- return target != null;
- case PageflowPackage.PF_LINK__SOURCE:
- return source != null;
- case PageflowPackage.PF_LINK__OUTCOME:
- return OUTCOME_EDEFAULT == null ? getOutcome() != null
- : !OUTCOME_EDEFAULT.equals(getOutcome());
- case PageflowPackage.PF_LINK__REDIRECT:
- return isRedirect() != REDIRECT_EDEFAULT;
- case PageflowPackage.PF_LINK__BEND_POINTS:
- return bendPoints != null && !bendPoints.isEmpty();
- case PageflowPackage.PF_LINK__SMALLICON:
- return SMALLICON_EDEFAULT == null ? getSmallicon() != null
- : !SMALLICON_EDEFAULT.equals(getSmallicon());
- case PageflowPackage.PF_LINK__LARGEICON:
- return LARGEICON_EDEFAULT == null ? getLargeicon() != null
- : !LARGEICON_EDEFAULT.equals(getLargeicon());
- case PageflowPackage.PF_LINK__FROMACTION:
- return FROMACTION_EDEFAULT == null ? getFromaction() != null
- : !FROMACTION_EDEFAULT.equals(getFromaction());
- }
- return super.eIsSet(eFeature);
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public String toString() {
- if (eIsProxy())
- return super.toString();
-
- StringBuffer result = new StringBuffer(super.toString());
- result.append(" (smallicon: "); //$NON-NLS-1$
- result.append(getSmallicon());
- result.append(", largeicon: "); //$NON-NLS-1$
- result.append(getLargeicon());
- result.append(", fromaction: "); //$NON-NLS-1$
- result.append(getFromaction());
- result.append(", outcome: "); //$NON-NLS-1$
- result.append(getOutcome());
- result.append(", redirect: "); //$NON-NLS-1$
- result.append(isRedirect());
- result.append(')');
- return result.toString();
- }
-
- /**
- * <!-- begin-user-doc --> insert a new bendpoint to the link <!--
- * end-user-doc -->
- *
- * @generated NOT
- */
- public void insertBendpoint(int index, PageflowLinkBendpoint point) {
- getBendPoints().add(index, point);
-
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.ADD,
- PageflowPackage.PF_LINK__BEND_POINTS, null, point));
- }
-
- /**
- * <!-- begin-user-doc --> remove the current bendpoint <!-- end-user-doc
- * -->
- *
- * @generated NOT
- */
- public void removeBendpoint(int index) {
- getBendPoints().remove(index);
- }
-
- /**
- * <!-- begin-user-doc --> Set the current bendpoint <!-- end-user-doc -->
- *
- * @generated NOT
- */
- public void setBendpoint(int index, PageflowLinkBendpoint point) {
- getBendPoints().set(index, point);
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET,
- PageflowPackage.PF_LINK__BEND_POINTS, null, point));
-
- }
-
- /**
- * <!-- begin-user-doc --> Set a group of bendpoints to reconstruct the link
- * <!-- end-user-doc -->
- *
- * @generated NOT
- */
- public void setBendpoints(Vector points) {
- bendPoints = (EList) points;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.ADD_MANY,
- PageflowPackage.PF_LINK__BEND_POINTS, null, points));
-
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated NOT
- */
- public boolean isRedirect() {
- Boolean result = (Boolean) getFCElements().get(
- PageflowPackage.PF_LINK__REDIRECT);
- return result.booleanValue();
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated NOT
- */
- public void setRedirect(boolean newRedirect) {
- Boolean oldRedirect = new Boolean(isRedirect());
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET,
- PageflowPackage.PF_LINK__REDIRECT, oldRedirect,
- new Boolean(newRedirect)));
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated NOT
- */
- public String getOutcome() {
- String result = (String) getFCElements().get(
- PageflowPackage.PF_LINK__OUTCOME);
-
- return result;
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated NOT
- */
- public void setOutcome(String newValue) {
- String oldOutcome = getOutcome();
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET,
- PageflowPackage.PF_LINK__OUTCOME, oldOutcome, newValue));
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated NOT
- */
- public String getSmallicon() {
- String result = (String) getFCElements().get(
- PageflowPackage.PF_LINK__SMALLICON);
- return result;
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated NOT
- */
- public void setSmallicon(String newValue) {
- String oldSmallicon = getSmallicon();
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET,
- PageflowPackage.PF_LINK__SMALLICON, oldSmallicon, newValue));
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated NOT
- */
- public String getLargeicon() {
- String result = (String) getFCElements().get(
- PageflowPackage.PF_LINK__LARGEICON);
-
- return result;
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated NOT
- */
- public void setLargeicon(String newValue) {
- String oldLargeIcon = getLargeicon();
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET,
- PageflowPackage.PF_LINK__LARGEICON, oldLargeIcon, newValue));
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated NOT
- */
- public String getFromaction() {
- String result = (String) getFCElements().get(
- PageflowPackage.PF_LINK__FROMACTION);
- return result;
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated NOT
- */
- public void setFromaction(String newFromaction) {
- String oldFromActionType = getFromaction();
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET,
- PageflowPackage.PF_LINK__FROMACTION, oldFromActionType,
- newFromaction));
- }
-
- /**
- * @generated NOT
- */
- public ReferenceElement getFCElements() {
-
- if (refElement == null) {
- refElement = new LinkReferenceElement(this);
- }
- return refElement;
- }
-
-}
-// PFLinkImpl
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/model/impl/PageflowNodeImpl.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/model/impl/PageflowNodeImpl.java
deleted file mode 100644
index 6e64d61..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/model/impl/PageflowNodeImpl.java
+++ /dev/null
@@ -1,390 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.impl;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.EObjectWithInverseResolvingEList;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.PageflowMessages;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.Pageflow;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowLink;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowNode;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowPackage;
-import org.eclipse.osgi.util.NLS;
-
-/**
- * <!-- begin-user-doc --> An implementation of the model object '<em><b>Node</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- * <li>{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.impl.PageflowNodeImpl#getPageflow <em>Pageflow</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.impl.PageflowNodeImpl#getOutlinks <em>Outlinks</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.impl.PageflowNodeImpl#getInlinks <em>Inlinks</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public abstract class PageflowNodeImpl extends PageflowElementImpl implements
- PageflowNode {
- /**
- * The cached value of the '{@link #getOutlinks() <em>Outlinks</em>}'
- * reference list. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @see #getOutlinks()
- * @generated
- * @ordered
- */
- protected EList outlinks = null;
-
- /**
- * The cached value of the '{@link #getInlinks() <em>Inlinks</em>}'
- * reference list. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @see #getInlinks()
- * @generated
- * @ordered
- */
- protected EList inlinks = null;
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- protected PageflowNodeImpl() {
- super();
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- protected EClass eStaticClass() {
- return PageflowPackage.eINSTANCE.getPageflowNode();
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public Pageflow getPageflow() {
- if (eContainerFeatureID != PageflowPackage.PAGEFLOW_NODE__PAGEFLOW)
- return null;
- return (Pageflow) eContainer;
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public void setPageflow(Pageflow newPageflow) {
- if (newPageflow != eContainer
- || (eContainerFeatureID != PageflowPackage.PAGEFLOW_NODE__PAGEFLOW && newPageflow != null)) {
- if (EcoreUtil.isAncestor(this, newPageflow))
- throw new IllegalArgumentException(
- NLS.bind(PageflowMessages.PageflowNode_NoRecursiveContainment,toString()));
- NotificationChain msgs = null;
- if (eContainer != null)
- msgs = eBasicRemoveFromContainer(msgs);
- if (newPageflow != null)
- msgs = ((InternalEObject) newPageflow).eInverseAdd(this,
- PageflowPackage.PAGEFLOW__NODES, Pageflow.class, msgs);
- msgs = eBasicSetContainer((InternalEObject) newPageflow,
- PageflowPackage.PAGEFLOW_NODE__PAGEFLOW, msgs);
- if (msgs != null)
- msgs.dispatch();
- } else if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET,
- PageflowPackage.PAGEFLOW_NODE__PAGEFLOW, newPageflow,
- newPageflow));
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public EList getOutlinks() {
- if (outlinks == null) {
- outlinks = new EObjectWithInverseResolvingEList(PageflowLink.class, this,
- PageflowPackage.PAGEFLOW_NODE__OUTLINKS,
- PageflowPackage.PF_LINK__SOURCE);
- }
- return outlinks;
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public EList getInlinks() {
- if (inlinks == null) {
- inlinks = new EObjectWithInverseResolvingEList(PageflowLink.class, this,
- PageflowPackage.PAGEFLOW_NODE__INLINKS,
- PageflowPackage.PF_LINK__TARGET);
- }
- return inlinks;
- }
-
- /**
- * @generated NOT
- */
- public PageflowLink findLinkTo(PageflowNode target) {
- //
- java.util.Iterator i = this.getOutlinks().iterator();
- while (i.hasNext()) {
- PageflowLink link = (PageflowLink) i.next();
- if (link.getTarget() == target)
- return link;
- }
- return null;
-
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public NotificationChain eInverseAdd(InternalEObject otherEnd,
- int featureID, Class baseClass, NotificationChain msgs) {
- if (featureID >= 0) {
- switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
- case PageflowPackage.PAGEFLOW_NODE__PAGEFLOW:
- if (eContainer != null)
- msgs = eBasicRemoveFromContainer(msgs);
- return eBasicSetContainer(otherEnd,
- PageflowPackage.PAGEFLOW_NODE__PAGEFLOW, msgs);
- case PageflowPackage.PAGEFLOW_NODE__OUTLINKS:
- return ((InternalEList) getOutlinks()).basicAdd(otherEnd, msgs);
- case PageflowPackage.PAGEFLOW_NODE__INLINKS:
- return ((InternalEList) getInlinks()).basicAdd(otherEnd, msgs);
- default:
- return eDynamicInverseAdd(otherEnd, featureID, baseClass, msgs);
- }
- }
- if (eContainer != null)
- msgs = eBasicRemoveFromContainer(msgs);
- return eBasicSetContainer(otherEnd, featureID, msgs);
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public NotificationChain eInverseRemove(InternalEObject otherEnd,
- int featureID, Class baseClass, NotificationChain msgs) {
- if (featureID >= 0) {
- switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
- case PageflowPackage.PAGEFLOW_NODE__PAGEFLOW:
- return eBasicSetContainer(null,
- PageflowPackage.PAGEFLOW_NODE__PAGEFLOW, msgs);
- case PageflowPackage.PAGEFLOW_NODE__OUTLINKS:
- return ((InternalEList) getOutlinks()).basicRemove(otherEnd,
- msgs);
- case PageflowPackage.PAGEFLOW_NODE__INLINKS:
- return ((InternalEList) getInlinks()).basicRemove(otherEnd,
- msgs);
- default:
- return eDynamicInverseRemove(otherEnd, featureID, baseClass,
- msgs);
- }
- }
- return eBasicSetContainer(null, featureID, msgs);
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public NotificationChain eBasicRemoveFromContainer(NotificationChain msgs) {
- if (eContainerFeatureID >= 0) {
- switch (eContainerFeatureID) {
- case PageflowPackage.PAGEFLOW_NODE__PAGEFLOW:
- return eContainer.eInverseRemove(this,
- PageflowPackage.PAGEFLOW__NODES, Pageflow.class, msgs);
- default:
- return eDynamicBasicRemoveFromContainer(msgs);
- }
- }
- return eContainer.eInverseRemove(this,
- EOPPOSITE_FEATURE_BASE - eContainerFeatureID, null, msgs);
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public Object eGet(EStructuralFeature eFeature, boolean resolve) {
- switch (eDerivedStructuralFeatureID(eFeature)) {
- case PageflowPackage.PAGEFLOW_NODE__NAME:
- return getName();
- case PageflowPackage.PAGEFLOW_NODE__COMMENT:
- return getComment();
- case PageflowPackage.PAGEFLOW_NODE__X:
- return new Integer(getX());
- case PageflowPackage.PAGEFLOW_NODE__Y:
- return new Integer(getY());
- case PageflowPackage.PAGEFLOW_NODE__WIDTH:
- return new Integer(getWidth());
- case PageflowPackage.PAGEFLOW_NODE__HEIGHT:
- return new Integer(getHeight());
- case PageflowPackage.PAGEFLOW_NODE__ID:
- return getId();
- case PageflowPackage.PAGEFLOW_NODE__PAGEFLOW:
- return getPageflow();
- case PageflowPackage.PAGEFLOW_NODE__OUTLINKS:
- return getOutlinks();
- case PageflowPackage.PAGEFLOW_NODE__INLINKS:
- return getInlinks();
- }
- return super.eGet(eFeature, resolve);
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public void eSet(EStructuralFeature eFeature, Object newValue) {
- switch (eDerivedStructuralFeatureID(eFeature)) {
- case PageflowPackage.PAGEFLOW_NODE__NAME:
- setName((String) newValue);
- return;
- case PageflowPackage.PAGEFLOW_NODE__COMMENT:
- setComment((String) newValue);
- return;
- case PageflowPackage.PAGEFLOW_NODE__X:
- setX(((Integer) newValue).intValue());
- return;
- case PageflowPackage.PAGEFLOW_NODE__Y:
- setY(((Integer) newValue).intValue());
- return;
- case PageflowPackage.PAGEFLOW_NODE__WIDTH:
- setWidth(((Integer) newValue).intValue());
- return;
- case PageflowPackage.PAGEFLOW_NODE__HEIGHT:
- setHeight(((Integer) newValue).intValue());
- return;
- case PageflowPackage.PAGEFLOW_NODE__ID:
- setId((String) newValue);
- return;
- case PageflowPackage.PAGEFLOW_NODE__PAGEFLOW:
- setPageflow((Pageflow) newValue);
- return;
- case PageflowPackage.PAGEFLOW_NODE__OUTLINKS:
- getOutlinks().clear();
- getOutlinks().addAll((Collection) newValue);
- return;
- case PageflowPackage.PAGEFLOW_NODE__INLINKS:
- getInlinks().clear();
- getInlinks().addAll((Collection) newValue);
- return;
- }
- super.eSet(eFeature, newValue);
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public void eUnset(EStructuralFeature eFeature) {
- switch (eDerivedStructuralFeatureID(eFeature)) {
- case PageflowPackage.PAGEFLOW_NODE__NAME:
- setName(NAME_EDEFAULT);
- return;
- case PageflowPackage.PAGEFLOW_NODE__COMMENT:
- setComment(COMMENT_EDEFAULT);
- return;
- case PageflowPackage.PAGEFLOW_NODE__X:
- setX(X_EDEFAULT);
- return;
- case PageflowPackage.PAGEFLOW_NODE__Y:
- setY(Y_EDEFAULT);
- return;
- case PageflowPackage.PAGEFLOW_NODE__WIDTH:
- setWidth(WIDTH_EDEFAULT);
- return;
- case PageflowPackage.PAGEFLOW_NODE__HEIGHT:
- setHeight(HEIGHT_EDEFAULT);
- return;
- case PageflowPackage.PAGEFLOW_NODE__ID:
- setId(ID_EDEFAULT);
- return;
- case PageflowPackage.PAGEFLOW_NODE__PAGEFLOW:
- setPageflow((Pageflow) null);
- return;
- case PageflowPackage.PAGEFLOW_NODE__OUTLINKS:
- getOutlinks().clear();
- return;
- case PageflowPackage.PAGEFLOW_NODE__INLINKS:
- getInlinks().clear();
- return;
- }
- super.eUnset(eFeature);
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public boolean eIsSet(EStructuralFeature eFeature) {
- switch (eDerivedStructuralFeatureID(eFeature)) {
- case PageflowPackage.PAGEFLOW_NODE__NAME:
- return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT
- .equals(name);
- case PageflowPackage.PAGEFLOW_NODE__COMMENT:
- return COMMENT_EDEFAULT == null ? comment != null
- : !COMMENT_EDEFAULT.equals(comment);
- case PageflowPackage.PAGEFLOW_NODE__X:
- return x != X_EDEFAULT;
- case PageflowPackage.PAGEFLOW_NODE__Y:
- return y != Y_EDEFAULT;
- case PageflowPackage.PAGEFLOW_NODE__WIDTH:
- return width != WIDTH_EDEFAULT;
- case PageflowPackage.PAGEFLOW_NODE__HEIGHT:
- return height != HEIGHT_EDEFAULT;
- case PageflowPackage.PAGEFLOW_NODE__ID:
- return ID_EDEFAULT == null ? getId() != null : !ID_EDEFAULT
- .equals(getId());
- case PageflowPackage.PAGEFLOW_NODE__PAGEFLOW:
- return getPageflow() != null;
- case PageflowPackage.PAGEFLOW_NODE__OUTLINKS:
- return outlinks != null && !outlinks.isEmpty();
- case PageflowPackage.PAGEFLOW_NODE__INLINKS:
- return inlinks != null && !inlinks.isEmpty();
- }
- return super.eIsSet(eFeature);
- }
-
-}
-// PageflowNodeImpl
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/model/impl/PageflowPackageImpl.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/model/impl/PageflowPackageImpl.java
deleted file mode 100644
index f24f95b..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/model/impl/PageflowPackageImpl.java
+++ /dev/null
@@ -1,782 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.impl;
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.ecore.impl.EPackageImpl;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.Pageflow;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowElement;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowFactory;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowLink;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowLinkBendpoint;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowNode;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowPackage;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowPage;
-
-/**
- * <!-- begin-user-doc --> An implementation of the model <b>Package</b>. <!--
- * end-user-doc -->
- *
- * @generated
- */
-public class PageflowPackageImpl extends EPackageImpl implements
- PageflowPackage {
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- private EClass pageflowEClass = null;
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- private EClass pageflowNodeEClass = null;
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- private EClass pfLinkEClass = null;
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- private EClass pageflowElementEClass = null;
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- private EClass pfPageEClass = null;
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- private EClass pfLinkBendpointEClass = 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.jst.jsf.facesconfig.ui.pageflow.model.PageflowPackage#eNS_URI
- * @see #init()
- * @generated
- */
- private PageflowPackageImpl() {
- super(eNS_URI, PageflowFactory.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 -->
- * @return the package
- * <!-- end-user-doc -->
- *
- * @see #eNS_URI
- * @see #createPackageContents()
- * @see #initializePackageContents()
- * @generated
- */
- public static PageflowPackage init() {
- if (isInited)
- return (PageflowPackage) EPackage.Registry.INSTANCE
- .get(PageflowPackage.eNS_URI);
-
- // Obtain or create and register package
- PageflowPackageImpl thePageflowPackage = (PageflowPackageImpl) (EPackage.Registry.INSTANCE
- .get(eNS_URI) instanceof PageflowPackageImpl ? EPackage.Registry.INSTANCE
- .get(eNS_URI)
- : new PageflowPackageImpl());
-
- isInited = true;
-
- // Create package meta-data objects
- thePageflowPackage.createPackageContents();
-
- // Initialize created meta-data
- thePageflowPackage.initializePackageContents();
-
- return thePageflowPackage;
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public EClass getPageflow() {
- return pageflowEClass;
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public EReference getPageflow_Nodes() {
- return (EReference) pageflowEClass.getEStructuralFeatures().get(0);
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public EReference getPageflow_Links() {
- return (EReference) pageflowEClass.getEStructuralFeatures().get(1);
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public EAttribute getPageflow_Configfile() {
- return (EAttribute) pageflowEClass.getEStructuralFeatures().get(2);
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public EClass getPageflowNode() {
- return pageflowNodeEClass;
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public EReference getPageflowNode_Pageflow() {
- return (EReference) pageflowNodeEClass.getEStructuralFeatures().get(0);
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public EReference getPageflowNode_Outlinks() {
- return (EReference) pageflowNodeEClass.getEStructuralFeatures().get(1);
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public EReference getPageflowNode_Inlinks() {
- return (EReference) pageflowNodeEClass.getEStructuralFeatures().get(2);
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public EClass getPFLink() {
- return pfLinkEClass;
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public EReference getPFLink_Pageflow() {
- return (EReference) pfLinkEClass.getEStructuralFeatures().get(0);
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public EReference getPFLink_Target() {
- return (EReference) pfLinkEClass.getEStructuralFeatures().get(1);
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public EReference getPFLink_Source() {
- return (EReference) pfLinkEClass.getEStructuralFeatures().get(2);
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public EAttribute getPFLink_Outcome() {
- return (EAttribute) pfLinkEClass.getEStructuralFeatures().get(3);
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public EAttribute getPFLink_Redirect() {
- return (EAttribute) pfLinkEClass.getEStructuralFeatures().get(4);
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public EReference getPFLink_BendPoints() {
- return (EReference) pfLinkEClass.getEStructuralFeatures().get(5);
- }
-
- /**
- * <!-- begin-user-doc -->
- * @return the small icon eattribute
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public EAttribute getPFLink_Smallicon() {
- return (EAttribute) pfLinkEClass.getEStructuralFeatures().get(6);
- }
-
- /**
- * <!-- begin-user-doc -->
- * @return the large icon attribute
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getPFLink_Largeicon() {
- return (EAttribute) pfLinkEClass.getEStructuralFeatures().get(7);
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public EAttribute getPFLink_Fromaction() {
- return (EAttribute) pfLinkEClass.getEStructuralFeatures().get(8);
- }
-
- /**
- * <!-- begin-user-doc -->
- * @return the reference link eattribute
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public EAttribute getPageflowElement_ReferenceLink() {
- return (EAttribute) pageflowElementEClass.getEStructuralFeatures().get(
- 7);
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public EClass getPageflowElement() {
- return pageflowElementEClass;
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public EAttribute getPageflowElement_Name() {
- return (EAttribute) pageflowElementEClass.getEStructuralFeatures().get(
- 0);
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public EAttribute getPageflowElement_Comment() {
- return (EAttribute) pageflowElementEClass.getEStructuralFeatures().get(
- 1);
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public EAttribute getPageflowElement_X() {
- return (EAttribute) pageflowElementEClass.getEStructuralFeatures().get(
- 2);
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public EAttribute getPageflowElement_Y() {
- return (EAttribute) pageflowElementEClass.getEStructuralFeatures().get(
- 3);
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public EAttribute getPageflowElement_Width() {
- return (EAttribute) pageflowElementEClass.getEStructuralFeatures().get(
- 4);
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public EAttribute getPageflowElement_Height() {
- return (EAttribute) pageflowElementEClass.getEStructuralFeatures().get(
- 5);
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public EAttribute getPageflowElement_Id() {
- return (EAttribute) pageflowElementEClass.getEStructuralFeatures().get(
- 6);
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public EClass getPFPage() {
- return pfPageEClass;
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public EAttribute getPFPage_Path() {
- return (EAttribute) pfPageEClass.getEStructuralFeatures().get(0);
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public EAttribute getPFPage_Smallicon() {
- return (EAttribute) pfPageEClass.getEStructuralFeatures().get(1);
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public EAttribute getPFPage_Largeicon() {
- return (EAttribute) pfPageEClass.getEStructuralFeatures().get(2);
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public EClass getPFLinkBendpoint() {
- return pfLinkBendpointEClass;
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public EAttribute getPFLinkBendpoint_D1Width() {
- return (EAttribute) pfLinkBendpointEClass.getEStructuralFeatures().get(
- 0);
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public EAttribute getPFLinkBendpoint_D1Height() {
- return (EAttribute) pfLinkBendpointEClass.getEStructuralFeatures().get(
- 1);
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public EAttribute getPFLinkBendpoint_D2Width() {
- return (EAttribute) pfLinkBendpointEClass.getEStructuralFeatures().get(
- 2);
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public EAttribute getPFLinkBendpoint_D2Height() {
- return (EAttribute) pfLinkBendpointEClass.getEStructuralFeatures().get(
- 3);
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public EAttribute getPFLinkBendpoint_Weight() {
- return (EAttribute) pfLinkBendpointEClass.getEStructuralFeatures().get(
- 4);
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public EReference getPFLinkBendpoint_Link() {
- return (EReference) pfLinkBendpointEClass.getEStructuralFeatures().get(
- 5);
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public PageflowFactory getPageflowFactory() {
- return (PageflowFactory) 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
- pageflowEClass = createEClass(PAGEFLOW);
- createEReference(pageflowEClass, PAGEFLOW__NODES);
- createEReference(pageflowEClass, PAGEFLOW__LINKS);
- createEAttribute(pageflowEClass, PAGEFLOW__CONFIGFILE);
-
- pageflowNodeEClass = createEClass(PAGEFLOW_NODE);
- createEReference(pageflowNodeEClass, PAGEFLOW_NODE__PAGEFLOW);
- createEReference(pageflowNodeEClass, PAGEFLOW_NODE__OUTLINKS);
- createEReference(pageflowNodeEClass, PAGEFLOW_NODE__INLINKS);
-
- pfLinkEClass = createEClass(PF_LINK);
- createEReference(pfLinkEClass, PF_LINK__PAGEFLOW);
- createEReference(pfLinkEClass, PF_LINK__TARGET);
- createEReference(pfLinkEClass, PF_LINK__SOURCE);
- createEAttribute(pfLinkEClass, PF_LINK__OUTCOME);
- createEAttribute(pfLinkEClass, PF_LINK__REDIRECT);
- createEReference(pfLinkEClass, PF_LINK__BEND_POINTS);
- createEAttribute(pfLinkEClass, PF_LINK__SMALLICON);
- createEAttribute(pfLinkEClass, PF_LINK__LARGEICON);
- createEAttribute(pfLinkEClass, PF_LINK__FROMACTION);
-
- pageflowElementEClass = createEClass(PAGEFLOW_ELEMENT);
- createEAttribute(pageflowElementEClass, PAGEFLOW_ELEMENT__NAME);
- createEAttribute(pageflowElementEClass, PAGEFLOW_ELEMENT__COMMENT);
- createEAttribute(pageflowElementEClass, PAGEFLOW_ELEMENT__X);
- createEAttribute(pageflowElementEClass, PAGEFLOW_ELEMENT__Y);
- createEAttribute(pageflowElementEClass, PAGEFLOW_ELEMENT__WIDTH);
- createEAttribute(pageflowElementEClass, PAGEFLOW_ELEMENT__HEIGHT);
- createEAttribute(pageflowElementEClass, PAGEFLOW_ELEMENT__ID);
- createEAttribute(pageflowElementEClass,
- PAGEFLOW_ELEMENT__REFERENCE_LINK);
-
- pfPageEClass = createEClass(PF_PAGE);
- createEAttribute(pfPageEClass, PF_PAGE__PATH);
- createEAttribute(pfPageEClass, PF_PAGE__SMALLICON);
- createEAttribute(pfPageEClass, PF_PAGE__LARGEICON);
-
- pfLinkBendpointEClass = createEClass(PF_LINK_BENDPOINT);
- createEAttribute(pfLinkBendpointEClass, PF_LINK_BENDPOINT__D1_WIDTH);
- createEAttribute(pfLinkBendpointEClass, PF_LINK_BENDPOINT__D1_HEIGHT);
- createEAttribute(pfLinkBendpointEClass, PF_LINK_BENDPOINT__D2_WIDTH);
- createEAttribute(pfLinkBendpointEClass, PF_LINK_BENDPOINT__D2_HEIGHT);
- createEAttribute(pfLinkBendpointEClass, PF_LINK_BENDPOINT__WEIGHT);
- createEReference(pfLinkBendpointEClass, PF_LINK_BENDPOINT__LINK);
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- private boolean isInitialized = false;
-
- /**
- * Complete the initialization of the package and its meta-model. This
- * method is guarded to have no affect on any invocation but its first. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public void initializePackageContents() {
- if (isInitialized)
- return;
- isInitialized = true;
-
- // Initialize package
- setName(eNAME);
- setNsPrefix(eNS_PREFIX);
- setNsURI(eNS_URI);
-
- // Add supertypes to classes
- pageflowEClass.getESuperTypes().add(this.getPageflowElement());
- pageflowNodeEClass.getESuperTypes().add(this.getPageflowElement());
- pfLinkEClass.getESuperTypes().add(this.getPageflowElement());
- pfPageEClass.getESuperTypes().add(this.getPageflowNode());
-
- // Initialize classes and features; add operations and parameters
- initEClass(pageflowEClass, Pageflow.class, "Pageflow", !IS_ABSTRACT, //$NON-NLS-1$
- !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEReference(getPageflow_Nodes(), this.getPageflowNode(), this
- .getPageflowNode_Pageflow(), "nodes", null, 0, -1, //$NON-NLS-1$
- Pageflow.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
- IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
- !IS_DERIVED, IS_ORDERED);
- initEReference(getPageflow_Links(), this.getPFLink(), this
- .getPFLink_Pageflow(), "links", null, 0, -1, Pageflow.class, //$NON-NLS-1$
- !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE,
- !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
- IS_ORDERED);
- initEAttribute(getPageflow_Configfile(), ecorePackage.getEString(),
- "configfile", null, 0, 1, Pageflow.class, !IS_TRANSIENT, //$NON-NLS-1$
- !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
- !IS_DERIVED, IS_ORDERED);
-
- initEClass(pageflowNodeEClass, PageflowNode.class, "PageflowNode", //$NON-NLS-1$
- IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEReference(getPageflowNode_Pageflow(), this.getPageflow(), this
- .getPageflow_Nodes(), "pageflow", null, 1, 1, //$NON-NLS-1$
- PageflowNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
- !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
- !IS_DERIVED, IS_ORDERED);
- initEReference(getPageflowNode_Outlinks(), this.getPFLink(), this
- .getPFLink_Source(), "outlinks", null, 0, -1, //$NON-NLS-1$
- PageflowNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
- !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
- !IS_DERIVED, IS_ORDERED);
- initEReference(getPageflowNode_Inlinks(), this.getPFLink(), this
- .getPFLink_Target(), "inlinks", null, 0, -1, //$NON-NLS-1$
- PageflowNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
- !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
- !IS_DERIVED, IS_ORDERED);
-
- initEClass(pfLinkEClass, PageflowLink.class, "PFLink", !IS_ABSTRACT, //$NON-NLS-1$
- !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEReference(getPFLink_Pageflow(), this.getPageflow(), this
- .getPageflow_Links(), "pageflow", null, 1, 1, //$NON-NLS-1$
- PageflowLink.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
- !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
- !IS_DERIVED, IS_ORDERED);
- initEReference(getPFLink_Target(), this.getPageflowNode(), this
- .getPageflowNode_Inlinks(), "target", null, 1, 1, //$NON-NLS-1$
- PageflowLink.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
- !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
- !IS_DERIVED, IS_ORDERED);
- initEReference(getPFLink_Source(), this.getPageflowNode(), this
- .getPageflowNode_Outlinks(), "source", null, 1, 1, //$NON-NLS-1$
- PageflowLink.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
- !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
- !IS_DERIVED, IS_ORDERED);
- initEAttribute(getPFLink_Outcome(), ecorePackage.getEString(),
- "outcome", null, 0, 1, PageflowLink.class, !IS_TRANSIENT, //$NON-NLS-1$
- !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
- !IS_DERIVED, IS_ORDERED);
- initEAttribute(getPFLink_Redirect(), ecorePackage.getEBoolean(),
- "redirect", null, 0, 1, PageflowLink.class, !IS_TRANSIENT, //$NON-NLS-1$
- !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
- !IS_DERIVED, IS_ORDERED);
- initEReference(getPFLink_BendPoints(), this.getPFLinkBendpoint(), this
- .getPFLinkBendpoint_Link(), "bendPoints", null, 0, -1, //$NON-NLS-1$
- PageflowLink.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
- IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
- !IS_DERIVED, IS_ORDERED);
- initEAttribute(getPFLink_Smallicon(), ecorePackage.getEString(),
- "smallicon", null, 0, 1, PageflowLink.class, !IS_TRANSIENT, //$NON-NLS-1$
- !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
- !IS_DERIVED, IS_ORDERED);
- initEAttribute(getPFLink_Largeicon(), ecorePackage.getEString(),
- "largeicon", null, 0, 1, PageflowLink.class, !IS_TRANSIENT, //$NON-NLS-1$
- !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
- !IS_DERIVED, IS_ORDERED);
- initEAttribute(getPFLink_Fromaction(), ecorePackage.getEString(),
- "fromaction", null, 0, 1, PageflowLink.class, !IS_TRANSIENT, //$NON-NLS-1$
- !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
- !IS_DERIVED, IS_ORDERED);
-
- initEClass(pageflowElementEClass, PageflowElement.class,
- "PageflowElement", IS_ABSTRACT, !IS_INTERFACE, //$NON-NLS-1$
- IS_GENERATED_INSTANCE_CLASS);
- initEAttribute(getPageflowElement_Name(), ecorePackage.getEString(),
- "name", "unnamed", 0, 1, PageflowElement.class, !IS_TRANSIENT, //$NON-NLS-1$ //$NON-NLS-2$
- !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
- !IS_DERIVED, IS_ORDERED);
- initEAttribute(getPageflowElement_Comment(), ecorePackage.getEString(),
- "comment", null, 0, 1, PageflowElement.class, !IS_TRANSIENT, //$NON-NLS-1$
- !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
- !IS_DERIVED, IS_ORDERED);
- initEAttribute(getPageflowElement_X(), ecorePackage.getEInt(), "x", //$NON-NLS-1$
- "0", 0, 1, PageflowElement.class, !IS_TRANSIENT, !IS_VOLATILE, //$NON-NLS-1$
- IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED,
- IS_ORDERED);
- initEAttribute(getPageflowElement_Y(), ecorePackage.getEInt(), "y", //$NON-NLS-1$
- "0", 0, 1, PageflowElement.class, !IS_TRANSIENT, !IS_VOLATILE, //$NON-NLS-1$
- IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED,
- IS_ORDERED);
- initEAttribute(getPageflowElement_Width(), ecorePackage.getEInt(),
- "width", "-1", 0, 1, PageflowElement.class, !IS_TRANSIENT, //$NON-NLS-1$ //$NON-NLS-2$
- !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
- !IS_DERIVED, IS_ORDERED);
- initEAttribute(getPageflowElement_Height(), ecorePackage.getEInt(),
- "height", "-1", 0, 1, PageflowElement.class, !IS_TRANSIENT, //$NON-NLS-1$ //$NON-NLS-2$
- !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
- !IS_DERIVED, IS_ORDERED);
- initEAttribute(getPageflowElement_Id(), ecorePackage.getEString(),
- "id", null, 1, 1, PageflowElement.class, !IS_TRANSIENT, //$NON-NLS-1$
- IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE,
- !IS_DERIVED, IS_ORDERED);
- initEAttribute(getPageflowElement_ReferenceLink(), ecorePackage
- .getEString(), "referenceLink", "", 0, 1, //$NON-NLS-1$ //$NON-NLS-2$
- PageflowElement.class, !IS_TRANSIENT, !IS_VOLATILE,
- IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED,
- IS_ORDERED);
-
- initEClass(pfPageEClass, PageflowPage.class, "PFPage", !IS_ABSTRACT, //$NON-NLS-1$
- !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEAttribute(getPFPage_Path(), ecorePackage.getEString(), "path", //$NON-NLS-1$
- null, 0, 1, PageflowPage.class, !IS_TRANSIENT, !IS_VOLATILE,
- IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED,
- IS_ORDERED);
- initEAttribute(getPFPage_Smallicon(), ecorePackage.getEString(),
- "smallicon", null, 0, 1, PageflowPage.class, !IS_TRANSIENT, //$NON-NLS-1$
- !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
- !IS_DERIVED, IS_ORDERED);
- initEAttribute(getPFPage_Largeicon(), ecorePackage.getEString(),
- "largeicon", null, 0, 1, PageflowPage.class, !IS_TRANSIENT, //$NON-NLS-1$
- !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
- !IS_DERIVED, IS_ORDERED);
-
- initEClass(pfLinkBendpointEClass, PageflowLinkBendpoint.class,
- "PFLinkBendpoint", !IS_ABSTRACT, !IS_INTERFACE, //$NON-NLS-1$
- IS_GENERATED_INSTANCE_CLASS);
- initEAttribute(getPFLinkBendpoint_D1Width(), ecorePackage.getEInt(),
- "d1Width", null, 0, 1, PageflowLinkBendpoint.class, //$NON-NLS-1$
- !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE,
- !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getPFLinkBendpoint_D1Height(), ecorePackage.getEInt(),
- "d1Height", null, 0, 1, PageflowLinkBendpoint.class, //$NON-NLS-1$
- !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE,
- !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getPFLinkBendpoint_D2Width(), ecorePackage.getEInt(),
- "d2Width", null, 0, 1, PageflowLinkBendpoint.class, //$NON-NLS-1$
- !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE,
- !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getPFLinkBendpoint_D2Height(), ecorePackage.getEInt(),
- "d2Height", null, 0, 1, PageflowLinkBendpoint.class, //$NON-NLS-1$
- !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE,
- !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getPFLinkBendpoint_Weight(), ecorePackage.getEFloat(),
- "weight", "0.5", 0, 1, PageflowLinkBendpoint.class, //$NON-NLS-1$ //$NON-NLS-2$
- !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE,
- !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEReference(getPFLinkBendpoint_Link(), this.getPFLink(), this
- .getPFLink_BendPoints(), "link", null, 1, 1, //$NON-NLS-1$
- PageflowLinkBendpoint.class, !IS_TRANSIENT, !IS_VOLATILE,
- IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES,
- !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
- // Create resource
- createResource(eNS_URI);
- }
-
-}
-// PageflowPackageImpl
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/model/impl/PageflowPageImpl.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/model/impl/PageflowPageImpl.java
deleted file mode 100644
index eca7a66..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/model/impl/PageflowPageImpl.java
+++ /dev/null
@@ -1,531 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.impl;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.Pageflow;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowPackage;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowPage;
-
-/**
- * <!-- begin-user-doc --> An implementation of the model object '<em><b>PF Page</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- * <li>{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.impl.PageflowPageImpl#getPath <em>Path</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.impl.PageflowPageImpl#getSmallicon <em>Smallicon</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.impl.PageflowPageImpl#getLargeicon <em>Largeicon</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class PageflowPageImpl extends PageflowNodeImpl implements PageflowPage {
- private String path;
-
- private String smallIcon;
-
- private String largeIcon;
-
- /**
- * The default value of the '{@link #getPath() <em>Path</em>}' attribute.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @see #getPath()
- * @generated
- * @ordered
- */
- protected static final String PATH_EDEFAULT = null;
-
- /**
- * The default value of the '{@link #getSmallicon() <em>Smallicon</em>}'
- * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @see #getSmallicon()
- * @generated
- * @ordered
- */
- protected static final String SMALLICON_EDEFAULT = null;
-
- /**
- * The default value of the '{@link #getLargeicon() <em>Largeicon</em>}'
- * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @see #getLargeicon()
- * @generated
- * @ordered
- */
- protected static final String LARGEICON_EDEFAULT = null;
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- protected PageflowPageImpl() {
- super();
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- protected EClass eStaticClass() {
- return PageflowPackage.eINSTANCE.getPFPage();
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public String getPath() {
- String result = (String) getFCElements().get(
- PageflowPackage.PF_PAGE__PATH);
- // Try to return reasonable result.
- return result == null && getFCElements().isEmpty() ? path
- : (result != null ? result : PATH_EDEFAULT);
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated NOT
- */
- public void setPath(String newValue) {
- String oldPath = getPath();
- path = newValue;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET,
- PageflowPackage.PF_PAGE__PATH, oldPath, newValue));
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated NOT
- */
-
- public void setComment(String newValue) {
- super.setComment(newValue);
- String oldComment = getComment();
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET,
- PageflowPackage.PAGEFLOW_ELEMENT__COMMENT, oldComment,
- newValue));
-
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated NOT
- */
-
- public String getComment() {
- String result = (String) getFCElements().get(
- PageflowPackage.PF_PAGE__COMMENT);
- return result == null
- && (getFCElements().isEmpty() || ((PageReferenceElement) getFCElements())
- .isEndOnly()) ? super.getComment()
- : (result != null ? result
- : PageflowElementImpl.COMMENT_EDEFAULT);
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated NOT
- */
-
- public String getName() {
- String result;
- // To see if it is in navigation rule.
- result = (String) getFCElements().get(PageflowPackage.PF_PAGE__NAME);
- if (result == null) {
- if (super.getName() == null || super.getName().trim().length() == 0) {
- result = getPath();
- } else {
- result = super.getName();
- }
- }
- return result == null
- && (getFCElements().isEmpty() || ((PageReferenceElement) getFCElements())
- .isEndOnly()) ? PageflowElementImpl.NAME_EDEFAULT
- : (result == null ? null : result);
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated NOT
- */
-
- public void setName(String newName) {
- super.setName(newName);
- String oldName = getName();
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET,
- PageflowPackage.PF_PAGE__NAME, oldName, newName));
-
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated NOT
- */
- public String getSmallicon() {
- String result = (String) getFCElements().get(
- PageflowPackage.PF_PAGE__SMALLICON);
-
- return result == null
- && (getFCElements().isEmpty() || ((PageReferenceElement) getFCElements())
- .isEndOnly()) ? smallIcon : (result != null ? result
- : SMALLICON_EDEFAULT);
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated NOT
- */
- public void setSmallicon(String newValue) {
- String oldSmallicon = getSmallicon();
- smallIcon = newValue;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET,
- PageflowPackage.PF_PAGE__SMALLICON, oldSmallicon, newValue));
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated NOT
- */
- public String getLargeicon() {
- String result = (String) getFCElements().get(
- PageflowPackage.PF_PAGE__LARGEICON);
-
- return result == null
- && (getFCElements().isEmpty() || ((PageReferenceElement) getFCElements())
- .isEndOnly()) ? largeIcon : (result != null ? result
- : LARGEICON_EDEFAULT);
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated NOT
- */
- public void setLargeicon(String newValue) {
- String oldLargeIcon = getLargeicon();
- largeIcon = newValue;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET,
- PageflowPackage.PF_PAGE__LARGEICON, oldLargeIcon, newValue));
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public NotificationChain eInverseAdd(InternalEObject otherEnd,
- int featureID, Class baseClass, NotificationChain msgs) {
- if (featureID >= 0) {
- switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
- case PageflowPackage.PF_PAGE__PAGEFLOW:
- if (eContainer != null)
- msgs = eBasicRemoveFromContainer(msgs);
- return eBasicSetContainer(otherEnd,
- PageflowPackage.PF_PAGE__PAGEFLOW, msgs);
- case PageflowPackage.PF_PAGE__OUTLINKS:
- return ((InternalEList) getOutlinks()).basicAdd(otherEnd, msgs);
- case PageflowPackage.PF_PAGE__INLINKS:
- return ((InternalEList) getInlinks()).basicAdd(otherEnd, msgs);
- default:
- return eDynamicInverseAdd(otherEnd, featureID, baseClass, msgs);
- }
- }
- if (eContainer != null)
- msgs = eBasicRemoveFromContainer(msgs);
- return eBasicSetContainer(otherEnd, featureID, msgs);
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public NotificationChain eInverseRemove(InternalEObject otherEnd,
- int featureID, Class baseClass, NotificationChain msgs) {
- if (featureID >= 0) {
- switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
- case PageflowPackage.PF_PAGE__PAGEFLOW:
- return eBasicSetContainer(null,
- PageflowPackage.PF_PAGE__PAGEFLOW, msgs);
- case PageflowPackage.PF_PAGE__OUTLINKS:
- return ((InternalEList) getOutlinks()).basicRemove(otherEnd,
- msgs);
- case PageflowPackage.PF_PAGE__INLINKS:
- return ((InternalEList) getInlinks()).basicRemove(otherEnd,
- msgs);
- default:
- return eDynamicInverseRemove(otherEnd, featureID, baseClass,
- msgs);
- }
- }
- return eBasicSetContainer(null, featureID, msgs);
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public NotificationChain eBasicRemoveFromContainer(NotificationChain msgs) {
- if (eContainerFeatureID >= 0) {
- switch (eContainerFeatureID) {
- case PageflowPackage.PF_PAGE__PAGEFLOW:
- return eContainer.eInverseRemove(this,
- PageflowPackage.PAGEFLOW__NODES, Pageflow.class, msgs);
- default:
- return eDynamicBasicRemoveFromContainer(msgs);
- }
- }
- return eContainer.eInverseRemove(this,
- EOPPOSITE_FEATURE_BASE - eContainerFeatureID, null, msgs);
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public Object eGet(EStructuralFeature eFeature, boolean resolve) {
- switch (eDerivedStructuralFeatureID(eFeature)) {
- case PageflowPackage.PF_PAGE__NAME:
- return getName();
- case PageflowPackage.PF_PAGE__COMMENT:
- return getComment();
- case PageflowPackage.PF_PAGE__X:
- return new Integer(getX());
- case PageflowPackage.PF_PAGE__Y:
- return new Integer(getY());
- case PageflowPackage.PF_PAGE__WIDTH:
- return new Integer(getWidth());
- case PageflowPackage.PF_PAGE__HEIGHT:
- return new Integer(getHeight());
- case PageflowPackage.PF_PAGE__ID:
- return getId();
- case PageflowPackage.PF_PAGE__PAGEFLOW:
- return getPageflow();
- case PageflowPackage.PF_PAGE__OUTLINKS:
- return getOutlinks();
- case PageflowPackage.PF_PAGE__INLINKS:
- return getInlinks();
- case PageflowPackage.PF_PAGE__PATH:
- return getPath();
- case PageflowPackage.PF_PAGE__SMALLICON:
- return getSmallicon();
- case PageflowPackage.PF_PAGE__LARGEICON:
- return getLargeicon();
- }
- return super.eGet(eFeature, resolve);
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public void eSet(EStructuralFeature eFeature, Object newValue) {
- switch (eDerivedStructuralFeatureID(eFeature)) {
- case PageflowPackage.PF_PAGE__NAME:
- setName((String) newValue);
- return;
- case PageflowPackage.PF_PAGE__COMMENT:
- setComment((String) newValue);
- return;
- case PageflowPackage.PF_PAGE__X:
- setX(((Integer) newValue).intValue());
- return;
- case PageflowPackage.PF_PAGE__Y:
- setY(((Integer) newValue).intValue());
- return;
- case PageflowPackage.PF_PAGE__WIDTH:
- setWidth(((Integer) newValue).intValue());
- return;
- case PageflowPackage.PF_PAGE__HEIGHT:
- setHeight(((Integer) newValue).intValue());
- return;
- case PageflowPackage.PF_PAGE__ID:
- setId((String) newValue);
- return;
- case PageflowPackage.PF_PAGE__PAGEFLOW:
- setPageflow((Pageflow) newValue);
- return;
- case PageflowPackage.PF_PAGE__OUTLINKS:
- getOutlinks().clear();
- getOutlinks().addAll((Collection) newValue);
- return;
- case PageflowPackage.PF_PAGE__INLINKS:
- getInlinks().clear();
- getInlinks().addAll((Collection) newValue);
- return;
- case PageflowPackage.PF_PAGE__PATH:
- setPath((String) newValue);
- return;
- case PageflowPackage.PF_PAGE__SMALLICON:
- setSmallicon((String) newValue);
- return;
- case PageflowPackage.PF_PAGE__LARGEICON:
- setLargeicon((String) newValue);
- return;
- }
- super.eSet(eFeature, newValue);
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public void eUnset(EStructuralFeature eFeature) {
- switch (eDerivedStructuralFeatureID(eFeature)) {
- case PageflowPackage.PF_PAGE__NAME:
- setName(NAME_EDEFAULT);
- return;
- case PageflowPackage.PF_PAGE__COMMENT:
- setComment(COMMENT_EDEFAULT);
- return;
- case PageflowPackage.PF_PAGE__X:
- setX(X_EDEFAULT);
- return;
- case PageflowPackage.PF_PAGE__Y:
- setY(Y_EDEFAULT);
- return;
- case PageflowPackage.PF_PAGE__WIDTH:
- setWidth(WIDTH_EDEFAULT);
- return;
- case PageflowPackage.PF_PAGE__HEIGHT:
- setHeight(HEIGHT_EDEFAULT);
- return;
- case PageflowPackage.PF_PAGE__ID:
- setId(ID_EDEFAULT);
- return;
- case PageflowPackage.PF_PAGE__PAGEFLOW:
- setPageflow((Pageflow) null);
- return;
- case PageflowPackage.PF_PAGE__OUTLINKS:
- getOutlinks().clear();
- return;
- case PageflowPackage.PF_PAGE__INLINKS:
- getInlinks().clear();
- return;
- case PageflowPackage.PF_PAGE__PATH:
- setPath(PATH_EDEFAULT);
- return;
- case PageflowPackage.PF_PAGE__SMALLICON:
- setSmallicon(SMALLICON_EDEFAULT);
- return;
- case PageflowPackage.PF_PAGE__LARGEICON:
- setLargeicon(LARGEICON_EDEFAULT);
- return;
- }
- super.eUnset(eFeature);
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public boolean eIsSet(EStructuralFeature eFeature) {
- switch (eDerivedStructuralFeatureID(eFeature)) {
- case PageflowPackage.PF_PAGE__NAME:
- return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT
- .equals(name);
- case PageflowPackage.PF_PAGE__COMMENT:
- return COMMENT_EDEFAULT == null ? comment != null
- : !COMMENT_EDEFAULT.equals(comment);
- case PageflowPackage.PF_PAGE__X:
- return x != X_EDEFAULT;
- case PageflowPackage.PF_PAGE__Y:
- return y != Y_EDEFAULT;
- case PageflowPackage.PF_PAGE__WIDTH:
- return width != WIDTH_EDEFAULT;
- case PageflowPackage.PF_PAGE__HEIGHT:
- return height != HEIGHT_EDEFAULT;
- case PageflowPackage.PF_PAGE__ID:
- return ID_EDEFAULT == null ? getId() != null : !ID_EDEFAULT
- .equals(getId());
- case PageflowPackage.PF_PAGE__PAGEFLOW:
- return getPageflow() != null;
- case PageflowPackage.PF_PAGE__OUTLINKS:
- return outlinks != null && !outlinks.isEmpty();
- case PageflowPackage.PF_PAGE__INLINKS:
- return inlinks != null && !inlinks.isEmpty();
- case PageflowPackage.PF_PAGE__PATH:
- return PATH_EDEFAULT == null ? getPath() != null : !PATH_EDEFAULT
- .equals(getPath());
- case PageflowPackage.PF_PAGE__SMALLICON:
- return SMALLICON_EDEFAULT == null ? getSmallicon() != null
- : !SMALLICON_EDEFAULT.equals(getSmallicon());
- case PageflowPackage.PF_PAGE__LARGEICON:
- return LARGEICON_EDEFAULT == null ? getLargeicon() != null
- : !LARGEICON_EDEFAULT.equals(getLargeicon());
- }
- return super.eIsSet(eFeature);
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public String toString() {
- if (eIsProxy())
- return super.toString();
-
- StringBuffer result = new StringBuffer(super.toString());
- result.append(" (path: "); //$NON-NLS-1$
- result.append(getPath());
- result.append(", smallicon: "); //$NON-NLS-1$
- result.append(getSmallicon());
- result.append(", largeicon: "); //$NON-NLS-1$
- result.append(getLargeicon());
- result.append(')');
- return result.toString();
- }
-
- public ReferenceElement getFCElements() {
-
- if (refElement == null) {
- refElement = new PageReferenceElement(this);
- }
- return refElement;
- }
-
-}
-// PFPageImpl
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/model/impl/ReferenceElement.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/model/impl/ReferenceElement.java
deleted file mode 100644
index d013ee6..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/model/impl/ReferenceElement.java
+++ /dev/null
@@ -1,168 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.impl;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowElement;
-import org.eclipse.wst.common.internal.emf.resource.CompatibilityXMIResource;
-
-/**
- * The base class for mapping facesconfig node from pageflow node. The
- * ReferenceElement could be extended later to enable other model to be
- * referenced by pageflow.
- *
- * @author hmeng
- *
- */
-public abstract class ReferenceElement {
-
- private List data = new ArrayList();
-
- /**
- * the pageflow element
- */
- protected PageflowElement pageflowElement;
-
- /**
- * @param pageflowElement
- */
- public ReferenceElement(PageflowElement pageflowElement) {
- this.pageflowElement = pageflowElement;
- }
-
- /**
- * @param pageflowElement
- * @param facesConfigObject
- */
- public ReferenceElement(PageflowElement pageflowElement,
- EObject facesConfigObject) {
- this(pageflowElement);
- this.add(facesConfigObject);
- }
-
- /**
- * Add object to the list.
- *
- * @param object
- */
- public void add(EObject object) {
- if (!data.contains(object)) {
- data.add(object);
- }
- }
-
-
- /**
- * The fragment path of a node.
- *
- * @param object
- * @return the path
- */
- public static String resolvePath(EObject object) {
- if (object != null) {
- ((CompatibilityXMIResource) object.eResource())
- .setFormat(CompatibilityXMIResource.FORMAT_EMF1);
- String uriTarget = object.eResource().getURIFragment(object);
- return uriTarget;
- }
- return ""; //$NON-NLS-1$
- }
-
- /**
- * Resolve each referenced data's path and combine the result into one
- * string, the path will be seperated with '|'.
- *
- * @return the resolved string
- */
- public String resolveReferenceString() {
- String result = ""; //$NON-NLS-1$
- for (int i = 0, n = data.size(); i < n; i++) {
- result += resolvePath((EObject) data.get(i)) + "|"; //$NON-NLS-1$
- }
- if (result.length() > 0) {
- result = result.substring(0, result.length());
- }
- return result;
- }
-
- /**
- * The EMF paths of all referenced elements.
- *
- * @return the list of resolved paths for the data elements
- */
- public List getPaths() {
- List paths = new ArrayList();
- for (int i = 0, n = data.size(); i < n; i++) {
- paths.add(resolvePath((EObject) data.get(i)));
- }
- return paths;
- }
-
- /**
- * The facesconfig elements that are referenced.
- *
- * @return the list of elements
- */
- public List getData() {
- return data;
- }
-
- /**
- * Clear the data
- */
- public void clear() {
- if (!data.isEmpty()) {
- data.clear();
- }
- }
-
- /**
- * @return true if the data is empty
- */
- public boolean isEmpty() {
- return data.isEmpty();
- }
-
- /**
- * Dispose the element
- */
- public void dispose() {
- clear();
- }
-
- /**
- * Update the referenced faces-config elements.
- *
- */
- abstract public void update();
-
- /**
- * Return a pageflow property's value with referenced faces-config element.
- *
- * @param eFeature
- * @return the value for eFeature
- */
- abstract public Object get(int eFeature);
-
- /**
- * To set a pageflow property's value will result in seting a faces-config
- * element.
- *
- * @param eFeature
- * @param newValue
- */
- abstract public void set(EStructuralFeature eFeature, Object newValue);
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/properties/ActionDialogCellEditor.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/properties/ActionDialogCellEditor.java
deleted file mode 100644
index a68e86c..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/properties/ActionDialogCellEditor.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow.properties;
-
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-
-/**
- *
- * Dialog Cell Editor for Action browser.
- *
- * @author Xiao-guang Zhang
- */
-public class ActionDialogCellEditor extends EditableDialogCellEditor {
-
-
- /**
- * Default constructor
- */
- public ActionDialogCellEditor() {
- super();
- }
-
-
- /**
- * @param parent
- */
- public ActionDialogCellEditor(Composite parent) {
- super(parent);
- }
-
- /**
- * @param parent
- * @param style
- */
- public ActionDialogCellEditor(Composite parent, int style) {
- super(parent, style);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see DialogCellEditor#openDialogBox(org.eclipse.swt.widgets.Control)
- */
- protected Object openDialogBox(Control cellEditorWindow) {
- String actionExpression = getDefaultText().getText();
- // IStructuredSelection selectionToPass = StructuredSelection.EMPTY;
- // Create a new jsf Wizard
-
- // FIXME sfshi 2005-11-16
- // ActionSelectionWizard actionSelectionWizard =
- // new ActionSelectionWizard(ActionSelectionWizard.CONSIDER_METHODS);
- // actionSelectionWizard.init(EditorPlugin.getDefault().getWorkbench(),
- // selectionToPass);
- // actionSelectionWizard.setActionExpression(actionExpression);
- // //using a wizard dialog to display the new jsf wizard
- // WizardDialog actionSelectionWizardDialog =
- // new WizardDialog(cellEditorWindow.getShell(),actionSelectionWizard);
- // if (actionSelectionWizardDialog.open() == WizardDialog.OK )
- // {
- // actionExpression = actionSelectionWizard.getActionExpression();
- // }
- return actionExpression;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/properties/ActionOutcomeDialogCellEditor.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/properties/ActionOutcomeDialogCellEditor.java
deleted file mode 100644
index 3c68341..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/properties/ActionOutcomeDialogCellEditor.java
+++ /dev/null
@@ -1,103 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow.properties;
-
-import org.eclipse.jface.window.Window;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowLink;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowPage;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowElement;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowNode;
-import org.eclipse.jst.jsf.facesconfig.ui.util.WebrootUtil;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-
-/**
- *
- * Dialog Cell Editor for Action's outcome browser.
- *
- * @author Xiao-guang Zhang
- */
-public class ActionOutcomeDialogCellEditor extends EditableDialogCellEditor {
- /** the source PFLink element */
- PageflowElement element;
-
- /**
- * @param element
- */
- public ActionOutcomeDialogCellEditor(PageflowElement element) {
- super();
- this.element = element;
- }
-
- /**
- * @param parent
- * @param element
- */
- public ActionOutcomeDialogCellEditor(Composite parent,
- PageflowElement element) {
- super(parent);
- this.element = element;
- }
-
-
- /**
- * @param parent
- * @param style
- * @param element
- */
- public ActionOutcomeDialogCellEditor(Composite parent, int style,
- PageflowElement element) {
- super(parent, style);
- this.element = element;
- }
-
- /**
- * get the previous JSP page, it can be null if the previous node is not
- * PFPage, but PFAction.
- *
- * @param element_
- * @return
- */
- private String getPreviousJSPPath(PageflowElement element_) {
- String jspPath = null;
- if (element_ instanceof PageflowLink) {
- PageflowNode source = ((PageflowLink) element_).getSource();
-
- if (source instanceof PageflowPage) {
- jspPath = ((PageflowPage) source).getPath();
- }
- }
- return jspPath;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see DialogCellEditor#openDialogBox(org.eclipse.swt.widgets.Control)
- */
- protected Object openDialogBox(Control cellEditorWindow) {
- String outcome = getDefaultText().getText();
-
- String jspPathName = WebrootUtil.getProjectPath(element,
- getPreviousJSPPath(element));
-
- ActionOutcomeSelectionDialog selectionDialog = new ActionOutcomeSelectionDialog(
- getControl().getShell(), outcome, jspPathName);
-
- if (selectionDialog.open() == Window.OK) {
- outcome = selectionDialog.getSelectedAction();
- }
-
- return outcome;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/properties/ActionOutcomeSelectionDialog.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/properties/ActionOutcomeSelectionDialog.java
deleted file mode 100644
index b788e53..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/properties/ActionOutcomeSelectionDialog.java
+++ /dev/null
@@ -1,379 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow.properties;
-
-import java.util.List;
-
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.jface.viewers.ColumnPixelData;
-import org.eclipse.jface.viewers.TableLayout;
-import org.eclipse.jst.jsf.common.ui.internal.dialogfield.Separator;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.PageflowMessages;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.util.JSPUtil;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.TableColumn;
-import org.eclipse.swt.widgets.TableItem;
-import org.eclipse.swt.widgets.Text;
-import org.w3c.dom.Attr;
-import org.w3c.dom.Element;
-
-/**
- * This dialog is used to edit outcome property of link component of Pageflow
- * Designer.
- *
- * @author Xiao-guang Zhang
- */
-public class ActionOutcomeSelectionDialog extends Dialog {
-
- /** property's name text control */
- private Text actionText;
-
- /** linked source jsp file name */
- private String jspName;
-
- /** the current outcome */
- private String outcome;
-
- /** action table control */
- private Table actionTable;
-
- /** Column width of component name and action */
- private static final int COMPONENT_COL_WIDTH = 160;
-
- private static final int ACTION_COL_WIDTH = 160;
-
- /** Dialog default height and width */
- private static final int DIALOG_DEFAULT_WIDTH = 400;
-
- private static final int DIALOG_DEFAULT_HEIGHT = 300;
-
- private static String JSF_EL_LEFT_BRACE = "#{"; //$NON-NLS-1$
-
- private static String JSF_EL_RIGHT_BRACE = "}"; //$NON-NLS-1$
-
- /** the listener for the text modification */
- private ModifyListener modifyListener;
-
- /**
- * @param parentShell
- * @param outcome
- * @param jspName
- */
- public ActionOutcomeSelectionDialog(Shell parentShell, String outcome,
- String jspName) {
- super(parentShell);
- this.outcome = outcome;
- this.jspName = jspName;
-
- modifyListener = new ModifyListener() {
- public void modifyText(ModifyEvent e) {
- verifyComplete();
- }
- };
- }
-
- /*
- * (non-Javadoc)
- *
- * @see Dialog#createDialogArea(Composite)
- */
- protected Control createDialogArea(Composite parent) {
- GridLayout gridLayout;
-
- Composite container = (Composite) super.createDialogArea(parent);
- gridLayout = new GridLayout();
- gridLayout.numColumns = 1;
- gridLayout.marginWidth = 10;
- gridLayout.marginHeight = 10;
- container.setLayout(gridLayout);
- GridData gd = new GridData(GridData.FILL_BOTH);
- // gd.widthHint = 300;
- gd.heightHint = DIALOG_DEFAULT_HEIGHT;
- gd.widthHint = DIALOG_DEFAULT_WIDTH;
- container.setLayoutData(gd);
-
- Label choiceLabel = new Label(container, SWT.LEFT);
- gd = new GridData(GridData.HORIZONTAL_ALIGN_FILL);
- // gd.widthHint = 100;
- choiceLabel.setLayoutData(gd);
- // Pageflow.Property.Action.OutcomeSelectionDialog.Choice = Enter the
- // outcome or select one from action list below:
- choiceLabel
- .setText(PageflowMessages.Pageflow_Property_Action_OutcomeSelectionDialog_Choice);
-
- createOutcomeSection(container);
-
- createActionListSection(container);
-
- return container;
- }
-
- /**
- * create a Outcome input section
- *
- * @param container
- */
- protected void createOutcomeSection(Composite container) {
- Composite outcomeSection = new Composite(container, SWT.NONE);
- GridLayout gl = new GridLayout();
- gl.numColumns = 1;
- gl.marginWidth = 0;
- outcomeSection.setLayout(gl);
- GridData gd = new GridData(GridData.FILL_HORIZONTAL);
- outcomeSection.setLayoutData(gd);
-
- actionText = new Text(outcomeSection, SWT.BORDER);
- gd = new GridData(GridData.HORIZONTAL_ALIGN_FILL
- | GridData.FILL_HORIZONTAL);
- actionText.setLayoutData(gd);
-
- actionText.addModifyListener(modifyListener);
-
- if (outcome != null && outcome.length() > 0) {
- actionText.setText(outcome);
- }
- }
-
- /**
- * create action list table section
- *
- * @param container
- */
- protected void createActionListSection(Composite container) {
- final Group actionSection = new Group(container, SWT.NONE);
- GridLayout gridLayout = new GridLayout();
- gridLayout.numColumns = 1;
- actionSection.setLayout(gridLayout);
- GridData gd = new GridData(GridData.FILL_BOTH);
- actionSection.setLayoutData(gd);
-
- String actionListTitle = null;
- if (jspName != null && jspName.length() > 0) {
- actionListTitle = NLS.bind(PageflowMessages.Pageflow_Property_Action_OutcomeSelectionDialog_ActionListTableWithJSP_Title, jspName);
- } else {
- actionListTitle = PageflowMessages.Pageflow_Property_Action_OutcomeSelectionDialog_ActionListTable_Title;
- }
-
- // Pageflow.Property.Action.OutcomeSelectionDialog.ActionListTable.Title
- // = Actions
- actionSection.setText(actionListTitle);
-
- actionTable = new Table(actionSection, SWT.BORDER | SWT.FULL_SELECTION);
- actionTable.setLayoutData(new GridData(GridData.FILL_BOTH));
- actionTable.setHeaderVisible(true);
- actionTable.setLinesVisible(true);
- TableLayout layout = new TableLayout();
- actionTable.setLayout(layout);
-
- layout.addColumnData(new ColumnPixelData(COMPONENT_COL_WIDTH));
- layout.addColumnData(new ColumnPixelData(ACTION_COL_WIDTH));
- TableColumn componentCol = new TableColumn(actionTable, SWT.NONE);
- // Pageflow.Property.Action.OutcomeSelectionDialog.ActionListTable.Component
- // = Component ID
- componentCol
- .setText(PageflowMessages.Pageflow_Property_Action_OutcomeSelectionDialog_ActionListTable_Component);
- TableColumn actionCol = new TableColumn(actionTable, SWT.NONE);
-
- // Pageflow.Property.Action.OutcomeSelectionDialog.ActionListTable.Action
- // = Action
- actionCol
- .setText(PageflowMessages.Pageflow_Property_Action_OutcomeSelectionDialog_ActionListTable_Action);
-
- actionTable.addSelectionListener(new SelectionAdapter() {
- public void widgetSelected(SelectionEvent e) {
- TableItem selItem = (TableItem) e.item;
- String action = selItem.getText(1);
- if (action != null && action.length() > 0)
- actionText.setText(action);
- }
- });
-
- addActionsInJSP();
-
- }
-
- /**
- * Creates a separator line. Expects a <code>GridLayout</code> with at
- * least 1 column.
- *
- * @param composite
- * the parent composite
- * @param nColumns
- * number of columns to span
- */
- protected void createSeparator(Composite composite, int nColumns) {
- (new Separator(SWT.SEPARATOR | SWT.HORIZONTAL)).doFillIntoGrid(null,
- composite, nColumns, convertHeightInCharsToPixels(1));
- }
-
- /*
- * (non-Javadoc)
- *
- * @see Dialog#createButtonsForButtonBar(Composite)
- */
- protected void createButtonsForButtonBar(Composite parent) {
- createButton(parent, IDialogConstants.OK_ID, IDialogConstants.OK_LABEL,
- true);
- createButton(parent, IDialogConstants.CANCEL_ID,
- IDialogConstants.CANCEL_LABEL, false);
-
- verifyComplete();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see Dialog#configureShell(Shell)
- */
- protected void configureShell(Shell newShell) {
- super.configureShell(newShell);
-
- // Pageflow.Property.Action.OutcomeSelectionDialog.Title = Outcome
- // Selection
- newShell
- .setText(PageflowMessages.Pageflow_Property_Action_OutcomeSelectionDialog_Title);
-
- }
-
- /*
- * (non-Javadoc)
- *
- * @see Dialog#buttonPressed(int)
- */
- protected void buttonPressed(int buttonId) {
- if (buttonId == IDialogConstants.CANCEL_ID) {
- setReturnCode(CANCEL);
- close();
- return;
- } else if (buttonId == IDialogConstants.OK_ID) {
- setReturnCode(OK);
-
- outcome = actionText.getText();
-
- close();
- return;
- }
- super.buttonPressed(buttonId);
- }
-
- /**
- *
- * check the dialog inputs are complete or not, and set the OK button enable
- * or not.
- */
- private void verifyComplete() {
- if (getButton(IDialogConstants.OK_ID) != null) {
- getButton(IDialogConstants.OK_ID).setEnabled(isDialogComplete());
- }
- }
-
- /**
- * check the dialog inputs are complete or not.
- *
- * @return
- */
- private boolean isDialogComplete() {
- return isValidName();
- }
-
- /**
- * the input name is valid or not
- *
- * @return
- */
- private boolean isValidName() {
- return actionText.getText().length() > 0;
- }
-
- /**
- * get the selected action in the action table
- *
- * @return - selected action
- */
- public String getSelectedAction() {
- return outcome;
- }
-
- /**
- * add actions in the source jsp file to the action list table control
- *
- */
- private void addActionsInJSP() {
- List actionNodes = JSPUtil.getActionListInJSPFile(jspName);
-
- if (actionNodes != null) {
- for (int i = 0, n = actionNodes.size(); i < n; i++) {
- Element node = (Element) actionNodes.get(i);
- StringBuffer componentName = new StringBuffer();
-
- Attr idAttr = node.getAttributeNode("id"); //$NON-NLS-1$
- if (idAttr != null)
- componentName.append(idAttr.getNodeValue());
-
- componentName.append("(").append(node.getTagName()).append(")"); //$NON-NLS-1$ //$NON-NLS-2$
-
- Attr actionAttr = node.getAttributeNode("action"); //$NON-NLS-1$
- if (actionAttr != null) {
- String action = actionAttr.getValue();
- if (isValidEL(action))
- addActionTableItem(componentName.toString(), action);
- }
- }
- }
- }
-
- /**
- * @param expressionString
- * @return true if expressionString is valid EL
- */
- public static boolean isValidEL(String expressionString) {
- if (expressionString == null || expressionString.length() == 0)
- return true;
-
- return (expressionString.startsWith(JSF_EL_LEFT_BRACE) && expressionString
- .endsWith(JSF_EL_RIGHT_BRACE))
- || (!expressionString.startsWith(JSF_EL_LEFT_BRACE) && !expressionString
- .endsWith(JSF_EL_RIGHT_BRACE));
- }
-
- /**
- * add a new action item in the previous jsp page.
- *
- * @param componentName -
- * JSF component element
- * @param action -
- * value of action's attribute
- */
- private void addActionTableItem(String componentName, String action) {
- if (componentName != null && componentName.length() > 0
- && action != null && action.length() > 0) {
- TableItem item = new TableItem(actionTable, SWT.NONE);
- item.setText(0, componentName);
- item.setText(1, action);
- }
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/properties/ActionSectionDescriptor.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/properties/ActionSectionDescriptor.java
deleted file mode 100644
index 85ff2e2..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/properties/ActionSectionDescriptor.java
+++ /dev/null
@@ -1,11 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2007 Oracle Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Oracle Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow.properties;
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/properties/EditableDialogCellEditor.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/properties/EditableDialogCellEditor.java
deleted file mode 100644
index ee2cd23..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/properties/EditableDialogCellEditor.java
+++ /dev/null
@@ -1,147 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow.properties;
-
-import java.text.MessageFormat;
-
-import org.eclipse.jface.viewers.DialogCellEditor;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.FocusAdapter;
-import org.eclipse.swt.events.FocusEvent;
-import org.eclipse.swt.events.KeyAdapter;
-import org.eclipse.swt.events.KeyEvent;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Text;
-
-/**
- * @author Hong-tao Meng
- */
-public abstract class EditableDialogCellEditor extends DialogCellEditor {
- private Text text;
-
- /**
- *
- */
- public EditableDialogCellEditor() {
- super();
- }
-
- /**
- * @param parent
- */
- public EditableDialogCellEditor(Composite parent) {
- super(parent);
- }
-
- /**
- * @param parent
- * @param style
- */
- public EditableDialogCellEditor(Composite parent, int style) {
- super(parent, style);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.DialogCellEditor#createContents(org.eclipse.swt.widgets.Composite)
- */
- protected Control createContents(Composite cell) {
- text = new Text(cell, SWT.LEFT);
- text.setFont(cell.getFont());
- text.setBackground(cell.getBackground());
- text.addKeyListener(new KeyAdapter() {
- // hook key pressed - see PR 14201
- public void keyPressed(KeyEvent e) {
- keyReleaseOccured(e);
- // disposed this cell editor
- if ((getControl() == null) || getControl().isDisposed()) {
- return;
- }
- }
- });
- // when the text control has focus, the cellEditor will deactive even
- // when you press the button.
- // Add the follow codes enable switch to the button control.
- text.addFocusListener(new FocusAdapter() {
- public void focusLost(FocusEvent e) {
- boolean newValidState = isCorrect(text.getText());
- if (newValidState) {
- markDirty();
- doSetValue(text.getText());
- } else {
- // try to insert the current value into the error message.
- setErrorMessage(MessageFormat.format(getErrorMessage(),
- new Object[] { text.getText().toString() }));
- }
- }
- });
-
- return text;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.CellEditor#doSetFocus()
- */
- protected void doSetFocus() {
- text.setFocus();
- text.selectAll();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.DialogCellEditor#updateContents(java.lang.Object)
- */
- protected void updateContents(Object value) {
- if (text == null) {
- return;
- }
-
- String text_ = "";//$NON-NLS-1$
- if (value != null) {
- text_ = value.toString();
- }
- this.text.setText(text_);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.CellEditor#keyReleaseOccured(org.eclipse.swt.events.KeyEvent)
- */
- protected void keyReleaseOccured(KeyEvent keyEvent) {
- if (keyEvent.character == '\r') {
- boolean newValidState = isCorrect(text.getText());
- if (newValidState) {
- markDirty();
- doSetValue(text.getText());
- } else {
- // try to insert the current value into the error message.
- setErrorMessage(MessageFormat.format(getErrorMessage(),
- new Object[] { text.getText().toString() }));
- }
- fireApplyEditorValue();
- }
- super.keyReleaseOccured(keyEvent);
- }
-
- /**
- * @return the default text
- */
- public Text getDefaultText() {
- return text;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/properties/EditorSectionDescriptor.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/properties/EditorSectionDescriptor.java
deleted file mode 100644
index 6628690..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/properties/EditorSectionDescriptor.java
+++ /dev/null
@@ -1,110 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow.properties;
-
-import java.util.List;
-
-import org.eclipse.jface.viewers.IFilter;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.editpart.PageflowEditPart;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.properties.section.EditorSection;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.views.properties.tabbed.ISection;
-import org.eclipse.ui.views.properties.tabbed.ISectionDescriptor;
-
-
-
-/**
- * @author jchoi
- */
-public class EditorSectionDescriptor implements ISectionDescriptor {
- /**
- * constructor
- */
- public EditorSectionDescriptor() {
- super();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptor#getId()
- */
- public String getId() {
- return ITabbedPropertiesConstants.EDITOR_SECTION;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptor#getInputTypes()
- */
- public List getInputTypes() {
- return null;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptor#getSectionClass()
- */
- public ISection getSectionClass() {
- return new EditorSection();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptor#getTargetTab()
- */
- public String getTargetTab() {
- return ITabbedPropertiesConstants.ATTRIBUTE_TAB_ID;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptor#appliesTo(org.eclipse.ui.IWorkbenchPart,
- * org.eclipse.jface.viewers.ISelection)
- */
- public boolean appliesTo(IWorkbenchPart part, ISelection selection) {
- Object object = null;
- if (selection instanceof StructuredSelection) {
- StructuredSelection structuredSelection = (StructuredSelection) selection;
- object = structuredSelection.getFirstElement();
- // The editor section in the attribute tab will be shown for only
- // pageflow element
- if (object instanceof PageflowEditPart) {
- return true;
- }
- }
- return false;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptor#getAfterSection()
- */
- public String getAfterSection() {
- return ITabbedPropertiesConstants.TOP_SECTION;
- }
-
- public int getEnablesFor() {
- return ENABLES_FOR_ANY;
- }
-
- public IFilter getFilter() {
- return null;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/properties/ExistingPagePathDialogCellEditor.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/properties/ExistingPagePathDialogCellEditor.java
deleted file mode 100644
index 121a2da..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/properties/ExistingPagePathDialogCellEditor.java
+++ /dev/null
@@ -1,101 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-
-
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow.properties;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import org.eclipse.jface.window.Window;
-import org.eclipse.jst.jsf.facesconfig.ui.dialog.ListChoiceDialog;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.PageflowMessages;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.Pageflow;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowPage;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-
-/**
- * The cell editor used to locate an existing pageflow page node in current
- * pageflow.
- *
- * @author hmeng
- *
- */
-public class ExistingPagePathDialogCellEditor extends EditableDialogCellEditor {
- Pageflow pageflow;
-
- /**
- *
- */
- public ExistingPagePathDialogCellEditor() {
- super();
- }
-
- /**
- * @param parent
- * @param style
- */
- public ExistingPagePathDialogCellEditor(Composite parent, int style) {
- super(parent, style);
- }
-
- /**
- * @param parent
- * @param pageflow
- */
- public ExistingPagePathDialogCellEditor(Composite parent, Pageflow pageflow) {
- super(parent);
- this.pageflow = pageflow;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see DialogCellEditor#openDialogBox(Control)
- */
- protected Object openDialogBox(Control cellEditorWindow) {
- String jsfSelection = ""; //$NON-NLS-1$
- if (getDefaultText() != null && getDefaultText().getText().length() > 0) {
- jsfSelection = getDefaultText().getText();
- }
- ListChoiceDialog dialog = new ListChoiceDialog(cellEditorWindow
- .getShell(), getPagePaths(),
- PageflowMessages.ExistingPagePathDialogCellEdito_LabelText);
-
- if (dialog.open() == Window.OK) {
- jsfSelection = dialog.getResult();
- }
- return jsfSelection;
- }
-
- /**
- * Collect page paths in current pageflow.
- *
- * @return
- */
- private String[] getPagePaths() {
- List result = new ArrayList();
- List list = pageflow.getNodes();
- for (int i = 0; i < list.size(); i++) {
- String path = ((PageflowPage) list.get(i)).getPath();
- if (path != null && path.trim().length() > 0) {
- result.add(path);
- }
- }
- String[] r = (String[]) result.toArray(new String[result.size()]);
- Arrays.sort(r);
- return r;
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/properties/GeneralViewSection.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/properties/GeneralViewSection.java
deleted file mode 100644
index 85884e3..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/properties/GeneralViewSection.java
+++ /dev/null
@@ -1,379 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow.properties;
-
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.FillLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.part.MultiPageEditorPart;
-import org.eclipse.ui.part.PageBook;
-import org.eclipse.ui.views.properties.IPropertySheetPage;
-import org.eclipse.ui.views.properties.PropertySheetPage;
-import org.eclipse.ui.views.properties.tabbed.ISection;
-import org.eclipse.ui.views.properties.tabbed.ITabbedPropertyConstants;
-import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetPage;
-import org.eclipse.wst.sse.ui.StructuredTextEditor;
-
-/**
- * This class defines the general tab for pageflow attributes. This class
- * defines the controls shown in this sectin and their event handler. For
- * MultiPageEditorPart, if it support getAdapter(IEditorPart.class) to get the
- * current active editor, then, this section can get the different
- * PropertySheetPage for different sub EditorPart.
- *
- * @author Xiao-guang Zhang
- */
-public class GeneralViewSection implements ISection,
- ISelectionChangedListener {
- /** the pagebook */
- private PageBook pageBook = null;
-
- /**
- * A data structure used to store the information about a single page within
- * a MultiPageEditorPart
- */
- protected static class PageRec {
-
- /**
- * The part including editorpart, or Control
- */
- public IWorkbenchPart part;
-
- /**
- * The page.
- */
- public IPropertySheetPage page;
-
- /**
- * Creates a new page record initialized to the given part and page.
- *
- * @param part
- * @param page
- */
- public PageRec(IWorkbenchPart part, IPropertySheetPage page) {
- this.part = part;
- this.page = page;
- }
-
- /**
- * Disposes of this page record by <code>null</code>ing its fields.
- */
- public void dispose() {
- part = null;
- page = null;
- }
- }
-
- /**
- * Map from parts to part records (key type: <code>IWorkbenchPart</code>;
- * value type: <code>PartRec</code>).
- */
- private Map mapPartToRec = new HashMap();
-
- /**
- * The page record for the default page.
- */
- private PageRec defaultPageRec;
-
- /**
- * The page rec which provided the current page or <code>null</code>
- */
- private PageRec activeRec;
-
- /*
- * (non-Javadoc)
- *
- * @see com.createControls(Composite, TabbedPropertySheetPage)
- */
- public void createControls(Composite parent,
- TabbedPropertySheetPage tabbedPropertySheetPage) {
- FillLayout layout = new FillLayout();
- layout.marginWidth = ITabbedPropertyConstants.HSPACE;
- layout.marginHeight = ITabbedPropertyConstants.VSPACE;
-
- // composite.setLayout(layout);
- parent.setLayout(layout);
- // pagebook
- pageBook = new PageBook(parent, SWT.BORDER);
-
- // create a default property page.
- createDefaultPage();
-
- // Show the default page
- if (defaultPageRec != null) {
- showPageRec(defaultPageRec);
- }
- }
-
- /**
- * Shows page contained in the given page record in this view. The page
- * record must be one from this pagebook view.
- * <p>
- * The <code>PageBookView</code> implementation of this method asks the
- * pagebook control to show the given page's control, and records that the
- * given page is now current. Subclasses may extend.
- * </p>
- *
- * @param pageRec
- * the page record containing the page to show
- */
- protected void showPageRec(PageRec pageRec) {
- // If already showing do nothing
- if (activeRec == pageRec) {
- return;
- }
- // If the page is the same, just set activeRec to pageRec
- if (activeRec != null && pageRec != null
- && activeRec.page == pageRec.page) {
- activeRec = pageRec;
- return;
- }
-
- // Show new page.
- activeRec = pageRec;
- Control pageControl = activeRec.page.getControl();
- if (pageControl != null && !pageControl.isDisposed()) {
- // Verify that the page control is not disposed
- // If we are closing, it may have already been disposed
- pageBook.showPage(pageControl);
- }
- }
-
- /**
- * Creates a page for a given part. Adds it to the pagebook but does not
- * show it.
- *
- * @param part
- * The part we are making a page for.
- * @return IWorkbenchPart
- */
- private PageRec createPage(IWorkbenchPart part) {
- PageRec rec = doCreatePage(part);
- if (rec != null) {
- mapPartToRec.put(part, rec);
- }
- return rec;
- }
-
- /*
- * (non-Javadoc) Method declared on PageBookView.
- */
- /**
- * @param part
- * @return PageRec for part
- */
- protected PageRec doCreatePage(IWorkbenchPart part) {
- // FIXME: Because the PropertySheetPage of StructuredTextEditor has a
- // bug:
- // the editor can't be opened twice if the property view is shown.
- // This bug only exists in WTP 1.0.0 version.
- if (part instanceof StructuredTextEditor) {
- return null;
- }
- // Try to get an property page.
- Object obj = part.getAdapter(IPropertySheetPage.class);
- if (obj instanceof IPropertySheetPage) {
- IPropertySheetPage page = (IPropertySheetPage) obj;
-
- page.createControl(getPageBook());
-
- return new PageRec(part, page);
- }
- // There is no content property page
- return null;
- }
-
- private void createDefaultPage() {
- // Create the default PropertySheetPage rec.
- IPropertySheetPage defaultPage = new PropertySheetPage();
- defaultPage.createControl(getPageBook());
-
- defaultPageRec = new PageRec(null, defaultPage);
- }
-
- /**
- * Returns the pagebook control for this view.
- *
- * @return the pagebook control, or <code>null</code> if not initialized
- */
- protected PageBook getPageBook() {
- return pageBook;
- }
-
- /**
- * Returns the page record for the given part.
- *
- * @param part
- * the part
- * @return the corresponding page record, or <code>null</code> if not
- * found
- */
- protected PageRec getPageRec(Object part) {
- return (PageRec) mapPartToRec.get(part);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see ISection#setInput(IWorkbenchPart, ISelection)
- */
- public void setInput(IWorkbenchPart part, ISelection selection) {
- if (part instanceof MultiPageEditorPart) {
- IEditorPart subPage = (IEditorPart) part
- .getAdapter(IEditorPart.class);
- if (subPage != null) {
- // get or Create a PropertySheetPage for the part.
- PageRec rec = getPageRec(subPage);
- if (rec == null) {
- rec = createPage(subPage);
- }
-
- // Show the page.
- if (rec != null) {
- showPageRec(rec);
- } else {
- showPageRec(defaultPageRec);
- }
- }
- }
- activeRec.page.selectionChanged(part, selection);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see ISection#aboutToBeShown()
- */
- public void aboutToBeShown() {
- refresh();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see ISection#aboutToBeHidden()
- */
- public void aboutToBeHidden() {
- // do nothing
- }
-
- /*
- * (non-Javadoc)
- *
- * @see ISection#dispose()
- */
- public void dispose() {
- // Deref all of the pages.
- activeRec = null;
- if (defaultPageRec != null) {
- // check for null since the default page may not have
- // been created (ex. perspective never visible)
- defaultPageRec.page.dispose();
- defaultPageRec = null;
- }
- Map clone = (Map) ((HashMap) mapPartToRec).clone();
- Iterator iter = clone.values().iterator();
- while (iter.hasNext()) {
- PageRec rec = (PageRec) iter.next();
- removePage(rec);
- }
- }
-
- /**
- * Removes a page record. If it is the last reference to the page dispose of
- * it - otherwise just decrement the reference count.
- *
- * @param rec
- */
- private void removePage(PageRec rec) {
- mapPartToRec.remove(rec.part);
-
- Control control = rec.page.getControl();
- if (control != null && !control.isDisposed()) {
- // Dispose the page's control so pages don't have to do this in
- // their
- // dispose method.
- // The page's control is a child of this view's control so if this
- // view
- // is closed, the page's control will already be disposed.
- control.dispose();
- }
-
- // free the page
- doDestroyPage(rec.part, rec);
- }
-
- /**
- * Destroys a page in the pagebook for a particular part.
- *
- * @param part
- * the input part
- * @param rec
- * a page record for the part
- */
- protected void doDestroyPage(IWorkbenchPart part, PageRec rec) {
- IPropertySheetPage page = rec.page;
- page.dispose();
- rec.dispose();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see ISection#getMinimumHeight()
- */
- public int getMinimumHeight() {
- return SWT.DEFAULT;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see com.ibm.xtools.common.ui.properties.ISection#shouldUseExtraSpace()
- */
- public boolean shouldUseExtraSpace() {
- /**
- * here should return true, otherwise, the component controls will not
- * fill the whole panel of the tab.
- */
- return true;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see com.ibm.xtools.common.ui.properties.ISection#refresh()
- */
- public void refresh() {
- return;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.ISelectionChangedListener#selectionChanged(org.eclipse.jface.viewers.SelectionChangedEvent)
- */
- public void selectionChanged(SelectionChangedEvent event) {
- setInput((IWorkbenchPart) event.getSource(), event.getSelection());
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/properties/GeneralViewSectionDescriptor.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/properties/GeneralViewSectionDescriptor.java
deleted file mode 100644
index 4a75028..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/properties/GeneralViewSectionDescriptor.java
+++ /dev/null
@@ -1,132 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow.properties;
-
-import java.util.List;
-
-import org.eclipse.jface.text.ITextSelection;
-import org.eclipse.jface.viewers.IFilter;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.editpart.PageflowElementEditPart;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.editpart.PageflowElementTreeEditPart;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.editpart.PageflowLinkEditPart;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowLink;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.util.PageflowValidation;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.views.properties.tabbed.ISection;
-import org.eclipse.ui.views.properties.tabbed.ISectionDescriptor;
-
-/**
- * This class defines the section descriptor for pageflow attributes. Following
- * is the typical function of SectionDescriptor for tabbed property views. 1. In
- * tabbed property view, there are multiple sections, one or more than one
- * sections can be composed of one tab. 2. Each of section has an ID, and their
- * relationship is defined by the function "getAfterSection". 3. Not all
- * sections are enabled always. They are enabled according to current
- * WorkbenchPart and selection, which is defined in function "appliesTo".
- *
- * @author Xiao-guang Zhang
- */
-public class GeneralViewSectionDescriptor implements ISectionDescriptor {
-
- /*
- * (non-Javadoc)
- *
- * @see ISectionDescriptor#getId()
- */
- public String getId() {
- return ITabbedPropertiesConstants.GENERAL_TAB_ID;
- }
-
-
- /*
- * (non-Javadoc)
- *
- * @see ISectionDescriptor#getInputTypes()
- */
- public List getInputTypes() {
- return null;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see ISectionDescriptor#getSectionClass()
- */
- public ISection getSectionClass() {
- return new GeneralViewSection();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see com.ibm.xtools.common.ui.properties.ISectionDescriptor#getTargetTab()
- */
- public String getTargetTab() {
- return ITabbedPropertiesConstants.GENERAL_TAB_ID;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see ISectionDescriptor#appliesTo(IWorkbenchPart, ISelection)
- */
- public boolean appliesTo(IWorkbenchPart part, ISelection selection) {
- Object object = null;
- // FIXME: Should move the appliesTo to differnt page of
- // MultiPageEditorPart.
- if (selection instanceof StructuredSelection) {
- StructuredSelection structuredSelection = (StructuredSelection) selection;
- object = structuredSelection.getFirstElement();
- // The general tab will be shown for only pageflow element and
- // pageflow link editparts
- if (object instanceof PageflowElementEditPart
- || object instanceof PageflowElementTreeEditPart) {
- return true;
- } else if (object instanceof PageflowLinkEditPart) {
- PageflowLink pfLink = (PageflowLink) ((PageflowLinkEditPart) object)
- .getModel();
- if (PageflowValidation.getInstance().isValidLinkForProperty(
- pfLink)) {
- return true;
- }
- } else {
- return true;
- }
- } else if (selection instanceof ITextSelection) {
- return true;
- }
-
- return false;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see ISectionDescriptor#getAfterSection()
- */
- public String getAfterSection() {
- return ""; //$NON-NLS-1$
- }
-
- public int getEnablesFor() {
- return ENABLES_FOR_ANY;
- }
-
-
- public IFilter getFilter() {
- // TODO Auto-generated method stub
- return null;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/properties/ITabbedPropertiesConstants.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/properties/ITabbedPropertiesConstants.java
deleted file mode 100644
index 54e6e75..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/properties/ITabbedPropertiesConstants.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow.properties;
-
-/**
- * @author jchoi
- * @version
- */
-public interface ITabbedPropertiesConstants {
- /**
- * used to set grid data height hints on dialog fields
- */
- public static int BROWSE_HEIGHT = 18;
-
- /**
- * used to set grid data width hints on dialog fields
- */
- public static int BROWSE_WIDTH = 20;
-
- /**
- * the general tag id
- */
- public static final String GENERAL_TAB_ID = "org.eclipse.jst.jsf.facesconfig.ui.pageflow.properties.general"; //$NON-NLS-1$
-
- /**
- * the attribute tag id
- */
- public static final String ATTRIBUTE_TAB_ID = "org.eclipse.jst.jsf.facesconfig.ui.pageflow.properties.attribute"; //$NON-NLS-1$
-
- /**
- * the link section id
- */
- public static final String LINK_SECTION = "attribute.link"; // 4 //$NON-NLS-1$
-
- /**
- * the page section id
- */
- public static final String PAGE_SECTION = "attribute.page"; // 3 //$NON-NLS-1$
-
- /**
- * the editor section id
- */
- public static final String EDITOR_SECTION = "attribute.editor"; // 1 //$NON-NLS-1$
-
- /**
- * the top section id
- */
- public static final String TOP_SECTION = "top"; // 0 //$NON-NLS-1$
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/properties/LinkSectionDescriptor.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/properties/LinkSectionDescriptor.java
deleted file mode 100644
index d0cc430..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/properties/LinkSectionDescriptor.java
+++ /dev/null
@@ -1,111 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow.properties;
-
-import java.util.List;
-
-import org.eclipse.jface.viewers.IFilter;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.editpart.PageflowLinkEditPart;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowLink;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.properties.section.LinkSection;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.util.PageflowValidation;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.views.properties.tabbed.ISection;
-import org.eclipse.ui.views.properties.tabbed.ISectionDescriptor;
-
-/**
- * @author jchoi
- * @version
- */
-public class LinkSectionDescriptor implements ISectionDescriptor {
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptor#getId()
- */
- public String getId() {
- return ITabbedPropertiesConstants.LINK_SECTION;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptor#getInputTypes()
- */
- public List getInputTypes() {
- return null;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptor#getSectionClass()
- */
- public ISection getSectionClass() {
- return new LinkSection();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptor#getTargetTab()
- */
- public String getTargetTab() {
- return ITabbedPropertiesConstants.ATTRIBUTE_TAB_ID;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptor#appliesTo(org.eclipse.ui.IWorkbenchPart,
- * org.eclipse.jface.viewers.ISelection)
- */
- public boolean appliesTo(IWorkbenchPart part, ISelection selection) {
- Object object = null;
- if (selection instanceof StructuredSelection) {
- StructuredSelection structuredSelection = (StructuredSelection) selection;
- object = structuredSelection.getFirstElement();
- if (object instanceof PageflowLinkEditPart) {
- PageflowLink pfLink = (PageflowLink) ((PageflowLinkEditPart) object).getModel();
- if (PageflowValidation.getInstance().isValidLinkForProperty(
- pfLink)) {
-
- return true;
- }
-
- }
- }
- return false;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptor#getAfterSection()
- */
- public String getAfterSection() {
- return ITabbedPropertiesConstants.TOP_SECTION;
- }
-
- public int getEnablesFor() {
- return ENABLES_FOR_ANY;
- }
-
- public IFilter getFilter() {
- return null;
- }
-
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/properties/PagePathDialogCellEditor.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/properties/PagePathDialogCellEditor.java
deleted file mode 100644
index fbe5502..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/properties/PagePathDialogCellEditor.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow.properties;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jface.window.Window;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowPage;
-import org.eclipse.jst.jsf.facesconfig.ui.util.WebrootUtil;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-
-/**
- * Dialog Cell Editor for Page path browser.
- *
- * @author Xiao-guang Zhang
- */
-public class PagePathDialogCellEditor extends EditableDialogCellEditor {
- PageflowPage element;
-
- /**
- * Default constructor
- */
- public PagePathDialogCellEditor() {
- super();
- }
-
- /**
- * @param parent
- * @param element
- */
- public PagePathDialogCellEditor(Composite parent, PageflowPage element) {
- super(parent);
- this.element = element;
- }
-
-
- /**
- * @param parent
- * @param style
- */
- public PagePathDialogCellEditor(Composite parent, int style) {
- super(parent, style);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see DialogCellEditor#openDialogBox(Control)
- */
- protected Object openDialogBox(Control cellEditorWindow) {
- String jsfSelection = ""; //$NON-NLS-1$
- if (getDefaultText() != null && getDefaultText().getText().length() > 0) {
- jsfSelection = getDefaultText().getText();
- IProject project = WebrootUtil.getProject(element);
- ProjectWebPageSelectionDialog dlg = new ProjectWebPageSelectionDialog(
- cellEditorWindow.getShell(), project);
- if (dlg.open() == Window.OK) {
- jsfSelection = dlg.getResultFilePath();
- }
- }
- return jsfSelection;
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/properties/PageSectionDescriptor.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/properties/PageSectionDescriptor.java
deleted file mode 100644
index 4e7fc80..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/properties/PageSectionDescriptor.java
+++ /dev/null
@@ -1,108 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow.properties;
-
-import java.util.List;
-
-import org.eclipse.jface.viewers.IFilter;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.editpart.PageflowNodeEditPart;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.impl.PageflowPageImpl;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.properties.section.PageSection;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.views.properties.tabbed.ISection;
-import org.eclipse.ui.views.properties.tabbed.ISectionDescriptor;
-
-/**
- * @author jchoi
- * @version
- */
-public class PageSectionDescriptor implements ISectionDescriptor {
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptor#getId()
- */
- public String getId() {
- return ITabbedPropertiesConstants.PAGE_SECTION;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptor#getInputTypes()
- */
- public List getInputTypes() {
- return null;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptor#getSectionClass()
- */
- public ISection getSectionClass() {
- return new PageSection();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptor#getTargetTab()
- */
- public String getTargetTab() {
- return ITabbedPropertiesConstants.ATTRIBUTE_TAB_ID;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptor#appliesTo(org.eclipse.ui.IWorkbenchPart,
- * org.eclipse.jface.viewers.ISelection)
- */
- public boolean appliesTo(IWorkbenchPart part, ISelection selection) {
- Object object = null;
- if (selection instanceof StructuredSelection) {
- StructuredSelection structuredSelection = (StructuredSelection) selection;
- object = structuredSelection.getFirstElement();
- if (object instanceof PageflowNodeEditPart) {
- Object model = ((PageflowNodeEditPart) object).getModel();
- if (model instanceof PageflowPageImpl) {
- return true;
- }
- }
- }
- return false;
-
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptor#getAfterSection()
- */
- public String getAfterSection() {
- return ITabbedPropertiesConstants.TOP_SECTION;
- }
-
- public int getEnablesFor() {
- return ENABLES_FOR_ANY;
- }
-
-
- public IFilter getFilter() {
- return null;
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/properties/PageflowElementPropertySource.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/properties/PageflowElementPropertySource.java
deleted file mode 100644
index 8eebce5..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/properties/PageflowElementPropertySource.java
+++ /dev/null
@@ -1,478 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow.properties;
-
-import java.util.Iterator;
-import java.util.List;
-import java.util.Vector;
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EDataType;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.jface.viewers.CellEditor;
-import org.eclipse.jface.viewers.ICellEditorValidator;
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.jst.jsf.facesconfig.ui.EditorPlugin;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.PageflowMessages;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowElement;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowPackage;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowPage;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.util.PageflowValidation;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.views.properties.ComboBoxPropertyDescriptor;
-import org.eclipse.ui.views.properties.IPropertyDescriptor;
-import org.eclipse.ui.views.properties.IPropertySource;
-import org.eclipse.ui.views.properties.PropertyDescriptor;
-import org.eclipse.ui.views.properties.TextPropertyDescriptor;
-
-/**
- * This class is intended to be a generic property source for all the objects in
- * the application's model. It currently only supports String and boolean types,
- * and doesn't support reset or nested properties. It uses information in the
- * EMF EAttribute and EDataType classes to get the id, display name, and type
- * information.
- *
- * @author Xiao-guang Zhang
- */
-public class PageflowElementPropertySource implements IPropertySource {
- /** attribute name of "path" and "action", which have special property editor */
- private static final String PAGEFLOW_PATH = "path"; //$NON-NLS-1$
-
- static final String PAGEFLOW_NAME = "name"; //$NON-NLS-1$
-
- static final String PAGEFLOW_COMMENT = "comment"; //$NON-NLS-1$
-
- private static final String PAGEFLOW_CONFIG_FILE = "configfile"; //$NON-NLS-1$
-
- /** pageflow elememt */
- PageflowElement element;
-
- /** boolean value's label */
- private static final String P_VALUE_TRUE_LABEL = PageflowMessages.Pageflow_Label_True;
-
- private static final String P_VALUE_FALSE_LABEL = PageflowMessages.Pageflow_Label_False;
-
- /** Integer value for boolean type */
- private static final int P_VALUE_TRUE = 0;
-
- private static final int P_VALUE_FALSE = 1;
-
- static class BooleanLabelProvider extends LabelProvider {
- public String getText(Object element) {
- String[] values = new String[] { P_VALUE_TRUE_LABEL,
- P_VALUE_FALSE_LABEL };
- return values[((Integer) element).intValue()];
- }
-
- public Image getImage(Object element) {
- return EditorPlugin.getDefault().getImage(
- "facesconfig/Pageflow_BooleanValue.gif"); //$NON-NLS-1$
- }
- }
-
- static class PageflowLabelProvider extends LabelProvider {
-
- public Image getImage(Object element) {
- if (element instanceof String) {
- return EditorPlugin.getDefault().getImage(
- "facesconfig/Pageflow_TextValue.gif");//$NON-NLS-1$
- } else if (element instanceof Integer) {
- return EditorPlugin.getDefault().getImage(
- "facesconfig/Pageflow_IntegralValue.gif");//$NON-NLS-1$
- } else {
- return EditorPlugin.getDefault().getImage(
- "facesconfig/Pageflow_GenericValue.gif");//$NON-NLS-1$
- }
- }
- }
-
- /**
- * constructor
- *
- * @param element -
- * pageflow element model.
- */
- public PageflowElementPropertySource(PageflowElement element) {
- this.element = element;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see IPropertySource#getEditableValue()
- */
- public Object getEditableValue() {
- return element;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see IPropertySource#getPropertyDescriptors()
- */
- public IPropertyDescriptor[] getPropertyDescriptors() {
- // property descriptors
- List propertyDescriptors = new Vector();
-
- // if (element instanceof PageflowLink) {
- // return getLinkPropertyDescriptors();
- // }
-
- Iterator it;
- EClass cls = element.eClass();
-
- it = cls.getEAllAttributes().iterator();
- while (it.hasNext()) {
- EAttribute attr = (EAttribute) it.next();
- if (attr.isID()
- || attr.getFeatureID() == PageflowPackage.PAGEFLOW__REFERENCE_LINK) {
- continue;
- }
- EDataType type = attr.getEAttributeType();
- if (type.getInstanceClass() == String.class) {
- PropertyDescriptor propertyDescriptor;
- if (attr.getName().equalsIgnoreCase(PAGEFLOW_PATH)) {
- propertyDescriptor = getPagePathPropertyDescriptor(attr);
- } else if (attr.getName()
- .equalsIgnoreCase(PAGEFLOW_CONFIG_FILE)) {
- propertyDescriptor = null;
- } else {
- propertyDescriptor = new TextPropertyDescriptor(Integer
- .toString(attr.getFeatureID()), getString(attr
- .getName()));
- }
- if (propertyDescriptor != null) {
- propertyDescriptor
- .setLabelProvider(new PageflowLabelProvider());
- propertyDescriptors.add(propertyDescriptor);
- }
-
- } else if (type.getInstanceClass() == boolean.class) {
- PropertyDescriptor propertyDescriptor;
- propertyDescriptor = getBooleanTypePropertyDescriptor(attr);
- propertyDescriptor.setLabelProvider(new BooleanLabelProvider());
- propertyDescriptors.add(propertyDescriptor);
- }
- }
-
- return (IPropertyDescriptor[]) propertyDescriptors
- .toArray(new IPropertyDescriptor[] {});
- }
-
- /**
- * @return
- */
- // TODO: method not used; dead?
-// private IPropertyDescriptor[] getLinkPropertyDescriptors() {
-// // property descriptors
-// List propertyDescriptors = new Vector();
-//
-// Iterator it;
-// EClass cls = element.eClass();
-//
-// it = cls.getEAllAttributes().iterator();
-// while (it.hasNext()) {
-// EAttribute attr = (EAttribute) it.next();
-// if (attr.isID()
-// || attr.getName().equalsIgnoreCase(PAGEFLOW_NAME)
-// || attr.getName().equalsIgnoreCase(PAGEFLOW_COMMENT)
-// || attr.getFeatureID() == PageflowPackage.PAGEFLOW__REFERENCE_LINK) {
-// continue;
-// }
-//
-// EDataType type = attr.getEAttributeType();
-// if (type.getInstanceClass() == String.class) {
-// PropertyDescriptor propertyDescriptor;
-//
-// propertyDescriptor = new TextPropertyDescriptor(Integer
-// .toString(attr.getFeatureID()), getString(attr
-// .getName()));
-//
-// if (propertyDescriptor != null) {
-// propertyDescriptor
-// .setLabelProvider(new PageflowLabelProvider());
-// propertyDescriptors.add(propertyDescriptor);
-// }
-//
-// } else if (type.getInstanceClass() == boolean.class) {
-// PropertyDescriptor propertyDescriptor;
-// propertyDescriptor = getBooleanTypePropertyDescriptor(attr);
-// propertyDescriptor.setLabelProvider(new BooleanLabelProvider());
-// propertyDescriptors.add(propertyDescriptor);
-// }
-// }
-//
-// return (IPropertyDescriptor[]) propertyDescriptors
-// .toArray(new IPropertyDescriptor[] {});
-// }
-
- /**
- * get the property descriptor for the attribute "path" of page component
- *
- * @param attr -
- * EAttribute
- * @return
- */
- private PropertyDescriptor getPagePathPropertyDescriptor(EAttribute attr) {
- PropertyDescriptor propertyDescriptor = new PropertyDescriptor(Integer
- .toString(attr.getFeatureID()), getString(attr.getName())) {
- public CellEditor createPropertyEditor(Composite parent) {
- CellEditor editor = new PagePathDialogCellEditor(parent,
- (PageflowPage) element);
- if (getValidator() != null) {
- editor.setValidator(getValidator());
- }
- return editor;
- }
-
- /**
- * Returns the input validator for editing the property.
- *
- * @return the validator used to verify correct values for this
- * property, or <code>null</code>
- */
- protected ICellEditorValidator getValidator() {
- return new ICellEditorValidator() {
- public String isValid(Object value) {
- if (((PageflowPage) element).getPath() != null
- && value != null
- && !((PageflowPage) element).getPath()
- .equalsIgnoreCase((String) value)) {
- if (PageflowValidation.getInstance().isExistedPage(
- ((PageflowPage) element).getPageflow(),
- (String) value)) {
- // Pageflow.PageflowEditor.Alert.DNDResourceTitle
- // = Pageflow Creation Error
- // Pageflow.PageflowEditor.Alert.ExistingPage =
- // The web page {0} is already existed in
- // current PageFlow.
- EditorPlugin
- .getAlerts()
- .error(
- "Pageflow.PageflowEditor.Alert.DNDResourceTitle", //$NON-NLS-1$
- "Pageflow.PageflowEditor.Alert.ExistingPage", //$NON-NLS-1$
- value);
-
- return EditorPlugin
- .getResourceString("Pageflow.PageflowEditor.Alert.ExistingPage"); //$NON-NLS-1$
- }
- }
- return null;
- }
-
- };
- }
-
- };
- return propertyDescriptor;
- }
-
- /**
- * get the property descriptor for the attribute "action" of Action
- * component
- *
- * @param attr -
- * EAttribute
- * @return
- */
- // TODO: method not used; dead?
-// private PropertyDescriptor getActionPropertyDescriptor(EAttribute attr) {
-// PropertyDescriptor propertyDescriptor = new PropertyDescriptor(Integer
-// .toString(attr.getFeatureID()), getString(attr.getName())) {
-// public CellEditor createPropertyEditor(Composite parent) {
-// CellEditor editor = new ActionDialogCellEditor(parent);
-// if (getValidator() != null) {
-// editor.setValidator(getValidator());
-// }
-// return editor;
-// }
-//
-// /**
-// * Returns the input validator for editing the property.
-// *
-// * @return the validator used to verify correct values for this
-// * property, or <code>null</code>
-// */
-// protected ICellEditorValidator getValidator() {
-// return new ICellEditorValidator() {
-// public String isValid(Object value) {
-//
-// return null;
-// }
-//
-// };
-// }
-// };
-// return propertyDescriptor;
-// }
-
- /**
- * get the property descriptor for the attribute "outcome" of Link component
- *
- * @param attr -
- * EAttribute
- * @return
- */
- // TODO: method not used; dead?
-// private PropertyDescriptor getActionOutcomePropertyDescriptor(
-// EAttribute attr) {
-// PropertyDescriptor propertyDescriptor = new PropertyDescriptor(Integer
-// .toString(attr.getFeatureID()), getString(attr.getName())) {
-// public CellEditor createPropertyEditor(Composite parent) {
-// CellEditor editor = new ActionOutcomeDialogCellEditor(parent,
-// element);
-// if (getValidator() != null) {
-// editor.setValidator(getValidator());
-// }
-// return editor;
-// }
-// };
-// return propertyDescriptor;
-// }
-
- /**
- * get property descriptor for the attribute with the boolean type
- *
- * @param attr -
- * EAttribute
- * @return
- */
- PropertyDescriptor getBooleanTypePropertyDescriptor(EAttribute attr) {
- PropertyDescriptor propertyDescriptor;
- propertyDescriptor = new ComboBoxPropertyDescriptor(Integer
- .toString(attr.getFeatureID()), getString(attr.getName()),
- new String[] { P_VALUE_TRUE_LABEL, P_VALUE_FALSE_LABEL });
- return propertyDescriptor;
- }
-
- /**
- * Get a translated string from the resource locator.
- * @param key
- * @return the string for the key
- */
- protected final String getString(String key) {
- if ("comment".equals(key)) { //$NON-NLS-1$
- return PageflowMessages.Pageflow_Model_Attributes_comment;
- }
-
- if ("name".equals(key)) { //$NON-NLS-1$
- return PageflowMessages.Pageflow_Model_Attributes_name;
- }
-
- if ("largeicon".equals(key)) { //$NON-NLS-1$
- return PageflowMessages.Pageflow_Model_Attributes_largeicon;
- }
-
- if ("smallicon".equals(key)) { //$NON-NLS-1$
- return PageflowMessages.Pageflow_Model_Attributes_smallicon;
- }
-
- if ("source".equals(key)) { //$NON-NLS-1$
- return PageflowMessages.Pageflow_Model_Attributes_source;
- }
-
- if ("target".equals(key)) { //$NON-NLS-1$
- return PageflowMessages.Pageflow_Model_Attributes_target;
- }
-
- if ("fromaction".equals(key)) { //$NON-NLS-1$
- return PageflowMessages.Pageflow_Model_Attributes_fromaction;
- }
-
- if ("path".equals(key)) { //$NON-NLS-1$
- return PageflowMessages.Pageflow_Model_Attributes_path;
- }
- if ("begin".equals(key)) { //$NON-NLS-1$
- return PageflowMessages.Pageflow_Model_Attributes_begin;
- }
- if ("end".equals(key)) { //$NON-NLS-1$
- return PageflowMessages.Pageflow_Model_Attributes_end;
- }
- if ("configfile".equals(key)) { //$NON-NLS-1$
- return PageflowMessages.Pageflow_Model_Attributes_configfile;
- }
- if ("outcome".equals(key)) { //$NON-NLS-1$
- return PageflowMessages.Pageflow_Model_Attributes_outcome;
- }
- if ("redirect".equals(key)) { //$NON-NLS-1$
- return PageflowMessages.Pageflow_Model_Attributes_redirect;
- }
-
- return ""; //$NON-NLS-1$
- }
-
- /*
- * (non-Javadoc)
- *
- * @see IPropertySource#getPropertyValue(Object)
- */
- public Object getPropertyValue(Object id) {
- EStructuralFeature feature = element.eClass().getEStructuralFeature(
- Integer.parseInt((String) id));
-
- Object result = element.eGet(feature);
-
- if (result instanceof Boolean) {
- if (result == Boolean.TRUE) {
- result = new Integer(P_VALUE_TRUE);
- } else {
- result = new Integer(P_VALUE_FALSE);
- }
- }
-
- return result != null ? result : ""; //$NON-NLS-1$
- }
-
- /*
- * (non-Javadoc)
- *
- * @see IPropertySource#isPropertySet(Object)
- */
- public boolean isPropertySet(Object id) {
- return false;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see IPropertySouce#resetPropertyValue(Object)
- */
- public void resetPropertyValue(Object id) {
- // do nothing
- }
-
- /*
- * (non-Javadoc)
- *
- * @see IPropertySource#setPropertyValue(Object, Object)
- */
- public void setPropertyValue(Object id, Object value) {
- EStructuralFeature feature = element.eClass().getEStructuralFeature(
- Integer.parseInt((String) id));
-
- Object result = element.eGet(feature);
- // if the attribute is boolean type, the value should be changed from
- // string "true" or "false"
- // to Boolean.TRUE or Boolean.FALSE
- if (result instanceof Boolean) {
- if (value.equals(new Integer(P_VALUE_TRUE))) {
- value = Boolean.TRUE;
- } else {
- value = Boolean.FALSE;
- }
- }
- element.eSet(feature, value);
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/properties/PageflowLinkPropertySource.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/properties/PageflowLinkPropertySource.java
deleted file mode 100644
index e3c1f30..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/properties/PageflowLinkPropertySource.java
+++ /dev/null
@@ -1,189 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow.properties;
-
-import java.util.Iterator;
-import java.util.List;
-import java.util.Vector;
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EDataType;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.jface.viewers.CellEditor;
-import org.eclipse.jface.viewers.ICellEditorValidator;
-import org.eclipse.jst.jsf.facesconfig.ui.EditorPlugin;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.PageflowMessages;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.Pageflow;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowElement;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowLink;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowPackage;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowPage;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.util.PageflowValidation;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.views.properties.IPropertyDescriptor;
-import org.eclipse.ui.views.properties.PropertyDescriptor;
-import org.eclipse.ui.views.properties.TextPropertyDescriptor;
-
-/**
- * The property source for Pageflow Link.
- *
- * @author hmeng
- */
-
-public class PageflowLinkPropertySource extends PageflowElementPropertySource {
-
- /**
- * @param element
- */
- public PageflowLinkPropertySource(PageflowElement element) {
- super(element);
- }
-
- public Object getPropertyValue(Object id) {
- Object result = super.getPropertyValue(id);
- if (Integer.parseInt((String) id) == PageflowPackage.PF_LINK__SOURCE
- || Integer.parseInt((String) id) == PageflowPackage.PF_LINK__TARGET) {
- result = ((PageflowPage) result).getPath();
- }
- return result;
- }
-
- public void setPropertyValue(Object id, Object value) {
- if (Integer.parseInt((String) id) == PageflowPackage.PF_LINK__SOURCE) {
- ((PageflowLink) element).setSourcePath((String) value);
-
- } else if (Integer.parseInt((String) id) == PageflowPackage.PF_LINK__TARGET) {
- ((PageflowLink) element).setTargetPath((String) value);
- } else {
- super.setPropertyValue(id, value);
- }
- }
-
- public IPropertyDescriptor[] getPropertyDescriptors() {
- // property descriptors
- List propertyDescriptors = new Vector();
-
- Iterator it;
- EClass cls = element.eClass();
-
- it = cls.getEAllAttributes().iterator();
- while (it.hasNext()) {
- EAttribute attr = (EAttribute) it.next();
- if (attr.isID()
- || attr.getName().equalsIgnoreCase(PAGEFLOW_NAME)
- || attr.getName().equalsIgnoreCase(PAGEFLOW_COMMENT)
- || attr.getFeatureID() == PageflowPackage.PAGEFLOW__REFERENCE_LINK) {
- continue;
- }
-
- EDataType type = attr.getEAttributeType();
- if (type.getInstanceClass() == String.class) {
- PropertyDescriptor propertyDescriptor;
-
- propertyDescriptor = new TextPropertyDescriptor(Integer
- .toString(attr.getFeatureID()),
- getString(attr.getName()));
-
- if (propertyDescriptor != null) {
- propertyDescriptor
- .setLabelProvider(new PageflowLabelProvider());
- propertyDescriptors.add(propertyDescriptor);
- }
-
- } else if (type.getInstanceClass() == boolean.class) {
- PropertyDescriptor propertyDescriptor;
- propertyDescriptor = getBooleanTypePropertyDescriptor(attr);
- propertyDescriptor.setLabelProvider(new BooleanLabelProvider());
- propertyDescriptors.add(propertyDescriptor);
- }
- }
- it = cls.getEReferences().iterator();
- while (it.hasNext()) {
- EReference attr = (EReference) it.next();
- if (attr.getFeatureID() == PageflowPackage.PF_LINK__SOURCE
- || attr.getFeatureID() == PageflowPackage.PF_LINK__TARGET) {
-
- PropertyDescriptor propertyDescriptor;
-
- propertyDescriptor = getExistingPagePathPropertyDescriptor(attr);
-
- if (propertyDescriptor != null) {
- propertyDescriptor
- .setLabelProvider(new PageflowLabelProvider());
- propertyDescriptors.add(propertyDescriptor);
- }
- }
- }
-
- return (IPropertyDescriptor[]) propertyDescriptors
- .toArray(new IPropertyDescriptor[] {});
- }
-
- /**
- * The link's ends can be modified to another page existing in current pageflow.
- * @param attr
- * @return
- */
- private PropertyDescriptor getExistingPagePathPropertyDescriptor(
- EReference attr) {
- PropertyDescriptor propertyDescriptor = new PropertyDescriptor(Integer
- .toString(attr.getFeatureID()), getString(attr.getName())) {
- public CellEditor createPropertyEditor(Composite parent) {
- CellEditor editor = new ExistingPagePathDialogCellEditor(
- parent, (Pageflow) element.eContainer());
- if (getValidator() != null) {
- editor.setValidator(getValidator());
- }
- return editor;
- }
-
- /**
- * Returns the input validator for editing the property.
- *
- * @return the validator used to verify correct values for this
- * property, or <code>null</code>
- */
- protected ICellEditorValidator getValidator() {
- return new ICellEditorValidator() {
- public String isValid(Object value) {
- if (value != null) {
- if (!PageflowValidation.getInstance()
- .isExistedPage(
- ((Pageflow) element.eContainer()),
- (String) value)) {
- // Pageflow.PageflowEditor.Alert.DNDResourceTitle
- // = Pageflow Creation Error
- // Pageflow.PageflowEditor.Alert.ExistingPage =
- // The web page {0} is already existed in
- // current PageFlow.
- EditorPlugin.getAlerts().info(PageflowMessages.PageflowLinkPropertySource_Title,
- PageflowMessages.PageflowLinkPropertySource_Text);
- // "Pageflow.PageflowEditor.Alert.DNDResourceTitle",
- // "Pageflow.PageflowEditor.Alert.ExistingPage",
- // (String) value);
-
- return EditorPlugin
- .getResourceString("Pageflow.PageflowEditor.Alert.ExistingPage"); //$NON-NLS-1$
- }
- }
- return null;
- }
-
- };
- }
-
- };
- return propertyDescriptor;
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/properties/PageflowSectionDescriptorProvider.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/properties/PageflowSectionDescriptorProvider.java
deleted file mode 100644
index e36d282..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/properties/PageflowSectionDescriptorProvider.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow.properties;
-
-import org.eclipse.ui.views.properties.tabbed.ISectionDescriptor;
-import org.eclipse.ui.views.properties.tabbed.ISectionDescriptorProvider;
-
-/**
- * this class defines all section descriptors for pageflow. Similar with
- * PropertyDescriptors, this class defines all sections used by pageflow through
- * SectionDescriptor.
- *
- */
-public class PageflowSectionDescriptorProvider implements
- ISectionDescriptorProvider {
- /**
- * Default constructor
- */
- public PageflowSectionDescriptorProvider() {
- super();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see ISectionDescriptorProvider#getSectionDescriptors()
- */
- public ISectionDescriptor[] getSectionDescriptors() {
- ISectionDescriptor[] descriptors = new ISectionDescriptor[] {
- new LinkSectionDescriptor(), new PageSectionDescriptor(),
- new EditorSectionDescriptor(),
- new GeneralViewSectionDescriptor() };
- return descriptors;
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/properties/PageflowSectionLabelProvider.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/properties/PageflowSectionLabelProvider.java
deleted file mode 100644
index 1c72dae..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/properties/PageflowSectionLabelProvider.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow.properties;
-
-import org.eclipse.gef.editparts.AbstractEditPart;
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jst.jsf.facesconfig.ui.EditorPlugin;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.PageflowMessages;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.editpart.PageflowElementEditPart;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.editpart.PageflowElementTreeEditPart;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.editpart.PageflowLinkEditPart;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowElement;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowPackage;
-import org.eclipse.swt.graphics.Image;
-
-/**
- * This class defines label provider for the property view's title. Tabbed
- * property view has a common area as a Title. Different decription and image
- * can be shown according to Different selection.
- *
- */
-public class PageflowSectionLabelProvider extends LabelProvider {
-
- private static final String PAGEFLOW_IMAGE_FILE = "facesconfig/FacesConfig_Pageflow16.gif"; //$NON-NLS-1$
-
- /**
- * Default constructor
- */
- public PageflowSectionLabelProvider() {
- super();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see getImage(java.lang.Object)
- */
- public Image getImage(Object object) {
- Image result = EditorPlugin.getDefault().getImage(
- PAGEFLOW_IMAGE_FILE);
-
- return result;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see getText(java.lang.Object)
- */
- public String getText(Object object) {
- String result = null;
- if (object instanceof StructuredSelection) {
- StructuredSelection structuredSelection = (StructuredSelection) object;
- Object pageflow = structuredSelection.getFirstElement();
- if (pageflow instanceof PageflowElementEditPart
- || pageflow instanceof PageflowLinkEditPart
- || pageflow instanceof PageflowElementTreeEditPart) {
-
- if (((PageflowElement) ((AbstractEditPart) pageflow).getModel())
- .eClass() == PageflowPackage.eINSTANCE.getPageflow()) {
- result = PageflowMessages.Pageflow_Model_Items_Pageflow;
- } else if (((PageflowElement) ((AbstractEditPart) pageflow)
- .getModel()).eClass() == PageflowPackage.eINSTANCE
- .getPFPage()) {
- result = PageflowMessages.Pageflow_Model_Items_PFPage;
- } else if (((PageflowElement) ((AbstractEditPart) pageflow)
- .getModel()).eClass() == PageflowPackage.eINSTANCE
- .getPFLink()) {
- result = PageflowMessages.Pageflow_Model_Items_PFLink;
- }
- }
- }
- return result;
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/properties/ProjectWebPageSelectionDialog.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/properties/ProjectWebPageSelectionDialog.java
deleted file mode 100644
index 7d668d7..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/properties/ProjectWebPageSelectionDialog.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow.properties;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.jst.jsf.common.ui.internal.dialogs.CommonResourceDialog;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.PageflowMessages;
-import org.eclipse.swt.widgets.Shell;
-
-/**
- * @author hmeng
- */
-
-public class ProjectWebPageSelectionDialog extends CommonResourceDialog {
-
- /**
- * @param parentShell
- * @param project
- * @param style
- */
- public ProjectWebPageSelectionDialog(Shell parentShell, IProject project,
- int style) {
- super(parentShell, project, style);
- init();
- }
-
- /**
- * @param parentShell
- * @param project
- */
- public ProjectWebPageSelectionDialog(Shell parentShell, IProject project) {
- super(parentShell, project);
- init();
- }
-
- private void init() {
- setResourceDescription(PageflowMessages.ProjectWebPageSelectionDialog_Description);
- setSuffixs(new String[] { "jsp", "jspx", "jsf", "html", "htm" }); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
- }
-
- /**
- * @return the rseult file path
- */
- public String getResultFilePath() {
- String result = ""; //$NON-NLS-1$
- IFile selectedFile = (IFile) getResult()[0];
- IPath path = selectedFile.getProjectRelativePath();
- path = path.removeFirstSegments(1);
- result = "/" + path.toString(); //$NON-NLS-1$
- return result;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/properties/PropertyMessages.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/properties/PropertyMessages.java
deleted file mode 100644
index d8fb04d..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/properties/PropertyMessages.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow.properties;
-
-import org.eclipse.osgi.util.NLS;
-
-/**
- * NLS Message bundle for properties
- *
- */
-public final class PropertyMessages extends NLS {
-
- private static final String BUNDLE_NAME = "org.eclipse.jst.jsf.facesconfig.ui.pageflow.properties.PropertyMessages"; //$NON-NLS-1$
-
- private PropertyMessages() {
- // Do not instantiate
- }
-
- static {
- NLS.initializeMessages(BUNDLE_NAME, PropertyMessages.class);
- }
-
- /**
- * see PropertyMessages.properties
- */
- public static String property_displayName;
- /**
- * see PropertyMessages.properties
- */
- public static String property_description;
- /**
- * see PropertyMessages.properties
- */
- public static String property_configFile;
- /**
- * see PropertyMessages.properties
- */
- public static String property_largeIcon;
-
- /**
- * see PropertyMessages.properties
- */
- public static String property_smallIcon;
-
- /**
- * see PropertyMessages.properties
- */
- public static String property_fromAction;
-
- /**
- * see PropertyMessages.properties
- */
- public static String property_fromView;
-
- /**
- * see PropertyMessages.properties
- */
- public static String property_fromOutcome;
-
- /**
- * see PropertyMessages.properties
- */
- public static String property_redirect;
-
- /**
- * see PropertyMessages.properties
- */
- public static String property_browseButton;
-
- /**
- * see PropertyMessages.properties
- */
- public static String property_Command_SetValue;
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/properties/PropertyMessages.properties b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/properties/PropertyMessages.properties
deleted file mode 100644
index 3de4f3a..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/properties/PropertyMessages.properties
+++ /dev/null
@@ -1,22 +0,0 @@
-###############################################################################
-# Copyright (c) 2001, 2007 Oracle Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# Oracle Corporation - initial API and implementation
-###############################################################################
-property_displayName=Display Name:
-property_description=Description:
-property_configFile=Faces-config file:
-property_largeIcon=Large Icon:
-property_smallIcon=Small Icon:
-property_fromAction=From Action:
-property_fromView=Page Path:
-property_fromOutcome=From Outcome:
-property_redirect=Redirect:
-property_browseButton=...
-
-property_Command_SetValue=Set {0} Property
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/properties/section/AbstractEditPartGroup.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/properties/section/AbstractEditPartGroup.java
deleted file mode 100644
index 6ccbc2c..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/properties/section/AbstractEditPartGroup.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow.properties.section;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jst.jsf.common.ui.internal.dialogfield.DialogFieldGroup;
-import org.eclipse.jst.jsf.common.ui.internal.dialogfield.StringDialogField;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowElement;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.properties.PropertyMessages;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-
-/**
- * @author jchoi
- * @version
- */
-/*package*/ abstract class AbstractEditPartGroup extends DialogFieldGroup {
-
- private StringDialogField descField;
-
- private StringDialogField displayNameField;
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.jsf.facesconfig.ui.common.dialogfield.DialogFieldGroup#initialize()
- */
- public void initialize() {
- displayNameField = new StringDialogField();
- displayNameField.setLabelText(PropertyMessages.property_displayName);
- displayNameField
- .setDialogFieldChangeListener(getDefaultChangeListener());
- descField = new StringDialogField();
-
- descField.setLabelText(PropertyMessages.property_description);
- descField.setDialogFieldChangeListener(getDefaultChangeListener());
-
- }
-
-
- /**
- * @param toolkit
- * @param parent
- * @param col
- */
- protected void layoutDialogFields(FormToolkit toolkit, Composite parent,
- int col) {
- displayNameField.doFillIntoGrid(toolkit, parent, col);
- descField.doFillIntoGrid(toolkit, parent, col);
-
- }
-
- /**
- * @param elem
- */
- protected void refreshData(PageflowElement elem) {
- descField.setTextWithoutUpdate(elem.getComment());
- displayNameField.setTextWithoutUpdate(elem.getName());
- }
-
- /**
- * @return the description field
- */
- protected StringDialogField getDescField() {
- return descField;
- }
-
- /**
- * @return the display name field
- */
- protected StringDialogField getDisplayNameField() {
- return displayNameField;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.jsf.facesconfig.ui.common.dialogfield.DialogFieldGroup#initialize()
- */
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.jsf.facesconfig.ui.common.dialogfield.DialogFieldGroup#validateDialogFields()
- */
- public IStatus[] validateDialogFields() {
-
- return null;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/properties/section/AbstractEditPartSection.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/properties/section/AbstractEditPartSection.java
deleted file mode 100644
index 00dcfca..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/properties/section/AbstractEditPartSection.java
+++ /dev/null
@@ -1,238 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow.properties.section;
-
-import java.util.EventObject;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.commands.CommandStack;
-import org.eclipse.gef.commands.CommandStackListener;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jst.jsf.common.ui.internal.dialogfield.DialogField;
-import org.eclipse.jst.jsf.common.ui.internal.dialogfield.IDialogFieldChangeListener;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.views.properties.IPropertySource;
-import org.eclipse.ui.views.properties.tabbed.AbstractPropertySection;
-
-/**
- * This is base section, which support GEF command stack to redo/undo setting
- * properties.
- *
- * @author jchoi, Xiao-guang Zhang
- */
-/*package*/ abstract class AbstractEditPartSection extends AbstractPropertySection {
-
- IDialogFieldChangeListener changeListener = new IDialogFieldChangeListener() {
- public void dialogFieldChanged(DialogField field) {
- validate();
- }
- };
-
- /** property source of edit part */
- private IPropertySource propertySource;
-
- /** EditPart instance */
- private EditPart editPart;
-
- /** map for property registry to store a map between the property id and name */
- private Map propertyRegistry;
-
- /** GEF command stack */
- private CommandStack commandStack;
-
- /** command stack listener to refresh the section */
- private CommandStackListener commandStackListener;
-
- /**
- *
- */
- public AbstractEditPartSection() {
- super();
- }
-
- /**
- * refresh the whole section
- *
- */
- public void refreshData() {
- super.refresh();
- }
-
- /**
- * TODO: this method seems unused
- */
- public abstract void validate();
-
- /**
- * dispose the command stack listener
- */
- public void dispose() {
- super.dispose();
- if (getCommandStack() != null) {
- getCommandStack().removeCommandStackListener(
- getCommandStackListener());
- }
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISection#setInput(org.eclipse.ui.IWorkbenchPart,
- * org.eclipse.jface.viewers.ISelection)
- */
- public void setInput(IWorkbenchPart part, ISelection selection) {
- if (part != null) {
- if (part.getAdapter(CommandStack.class) != null) {
- setCommandStack((CommandStack) part
- .getAdapter(CommandStack.class));
- }
-
- if (selection instanceof StructuredSelection) {
- StructuredSelection structuredSelection = (StructuredSelection) selection;
- if (structuredSelection.getFirstElement() instanceof EditPart) {
- editPart = (EditPart) structuredSelection.getFirstElement();
- }
-
- if (editPart != null
- && ((IAdaptable) editPart)
- .getAdapter(IPropertySource.class) != null) {
- propertySource = (IPropertySource) ((IAdaptable) editPart)
- .getAdapter(IPropertySource.class);
- }
-
- }
- }
-
- super.setInput(part, selection);
- }
-
- /**
- * get the commandstacklistener, if not existed, create a new one.
- *
- * @return
- */
- private CommandStackListener getCommandStackListener() {
- if (commandStackListener == null) {
- commandStackListener = new CommandStackListener() {
- public void commandStackChanged(EventObject e) {
- refreshData();
- }
- };
- }
- return commandStackListener;
- }
-
- /**
- * set a <code>CommandStack</code> forthis section, and add a
- * <code>CommandStackListener</code> for this commandstack
- *
- * @param stack
- */
- public void setCommandStack(CommandStack stack) {
- commandStack = stack;
- stack.addCommandStackListener(getCommandStackListener());
- }
-
- /**
- * get the <code>CommandStack</code>
- *
- * @return the command stack
- */
- public CommandStack getCommandStack() {
- return commandStack;
- }
-
- /**
- * get the property source registered for current editpart
- *
- * @return the property source
- */
- public IPropertySource getPropertySource() {
- return propertySource;
- }
-
- /**
- * get the property's EMF featureID based on property name.
- *
- * @param propertyName
- * @return the feature id for propertyName
- */
- protected Object getFeatureID(String propertyName) {
- if (editPart != null && !(editPart.getModel() instanceof EObject)) {
- return null;
- }
-
- Object propertyID = getPropertyRegistry().get(propertyName);
- if (propertyID == null) {
-
- EClass cls = ((EObject) editPart.getModel()).eClass();
- for (Iterator it = cls.getEAllAttributes().iterator(); it.hasNext();) {
- EAttribute attr = (EAttribute) it.next();
- if (attr.getName().equalsIgnoreCase(propertyName)) {
- propertyID = Integer.toString(attr.getFeatureID());
- getPropertyRegistry().put(propertyName, propertyID);
- break;
- }
- }
- }
- return propertyID;
- }
-
- /**
- * @return the property registry
- */
- protected Map getPropertyRegistry() {
- if (propertyRegistry == null) {
- propertyRegistry = new HashMap();
- }
- return propertyRegistry;
- }
-
- /**
- * get the input edit part
- *
- * @return the input
- */
- public Object getInput() {
- return editPart;
- }
-
- /**
- * set the value of property
- *
- * @param propertyName
- * @param propertyValue
- */
- public void setValue(String propertyName, Object propertyValue) {
- if (propertyName != null && propertyValue != null
- && getPropertySource() != null) {
- SetPropertyValueCommand setCommand = new SetPropertyValueCommand(
- propertyName);
- setCommand.setTarget(getPropertySource());
- setCommand.setPropertyId(getFeatureID(propertyName));
- setCommand.setPropertyValue(propertyValue);
- if (getCommandStack() != null) {
- getCommandStack().execute(setCommand);
- } else {
- setCommand.execute();
- }
- }
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/properties/section/EditorGroup.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/properties/section/EditorGroup.java
deleted file mode 100644
index dd6bea9..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/properties/section/EditorGroup.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow.properties.section;
-
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.Pageflow;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.FillLayout;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-
-/**
- * @author jchoi
- * @version
- */
-/*package*/ class EditorGroup extends AbstractEditPartGroup {
- private Pageflow pageflow = null;
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.jsf.facesconfig.ui.common.dialogfield.DialogFieldGroup#initialize()
- */
- public void initialize() {
- super.initialize();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.jsf.facesconfig.ui.common.dialogfield.DialogFieldGroup#refreshData()
- */
- public void refreshData() {
- if (pageflow != null) {
- super.refreshData(pageflow);
- }
-
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.jsf.facesconfig.ui.common.dialogfield.DialogFieldGroup#layoutDialogFields(org.eclipse.ui.forms.widgets.FormToolkit,
- * org.eclipse.swt.widgets.Composite)
- */
- public void layoutDialogFields(FormToolkit toolkit, Composite parent) {
- Composite top;
- if (toolkit == null) {
- top = new Composite(parent, SWT.NONE);
- } else {
- top = toolkit.createComposite(parent);
- }
- FillLayout fillLayout = new FillLayout(SWT.VERTICAL);
- parent.setLayout(fillLayout);
-
- GridLayout layout = new GridLayout();
- layout.numColumns = 3;
- top.setLayout(layout);
-
- Label separator = toolkit.createSeparator(top, SWT.HORIZONTAL);
- GridData data = new GridData(GridData.FILL_HORIZONTAL);
- data.horizontalSpan = 3;
- separator.setLayoutData(data);
- super.layoutDialogFields(toolkit, top, 3);
-
- }
-
- /**
- * @param elem
- */
- public void setPropertyProvider(Pageflow elem) {
- pageflow = elem;
- this.refreshData();
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/properties/section/EditorSection.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/properties/section/EditorSection.java
deleted file mode 100644
index 1b9d62c..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/properties/section/EditorSection.java
+++ /dev/null
@@ -1,117 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow.properties.section;
-
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jst.jsf.common.ui.internal.dialogfield.DialogField;
-import org.eclipse.jst.jsf.common.ui.internal.dialogfield.IDialogFieldApplyListener;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.editpart.PageflowEditPart;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.Pageflow;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.impl.PageflowPackageImpl;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetPage;
-import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetWidgetFactory;
-
-/**
- * Edit section for Pagflow (EditPart)
- *
- * @author jchoi, Xiao-guang Zhang
- */
-public class EditorSection extends AbstractEditPartSection {
- /** edit group */
- private EditorGroup group;
-
- /** the emf model for Pageflow */
- private Pageflow pageflow;
-
- /**
- *
- */
- public EditorSection() {
- super();
- group = new EditorGroup();
- group.setDefaultChangeListener(changeListener);
- group.initialize();
-
- group.getDisplayNameField().setDialogFieldApplyListener(
- new IDialogFieldApplyListener() {
- public void dialogFieldApplied(DialogField field) {
- EditorSection.this.setValue(
- PageflowPackageImpl.eINSTANCE
- .getPageflowElement_Name().getName(),
- group.getDisplayNameField().getText());
- }
- });
-
- group.getDescField().setDialogFieldApplyListener(
- new IDialogFieldApplyListener() {
- public void dialogFieldApplied(DialogField field) {
- EditorSection.this
- .setValue(
- PageflowPackageImpl.eINSTANCE
- .getPageflowElement_Comment()
- .getName(), group
- .getDescField().getText());
- }
- });
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISection#createControls(org.eclipse.swt.widgets.Composite,
- * org.eclipse.wst.common.ui.properties.internal.provisional.TabbedPropertySheetPage)
- */
- public void createControls(Composite parent,
- TabbedPropertySheetPage aTabbedPropertySheetPage) {
- super.createControls(parent, aTabbedPropertySheetPage);
- TabbedPropertySheetWidgetFactory factory = aTabbedPropertySheetPage
- .getWidgetFactory();
- Composite top = factory.createFlatFormComposite(parent);
-
- group.layoutDialogFields(factory, top);
-
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISection#setInput(org.eclipse.ui.IWorkbenchPart,
- * org.eclipse.jface.viewers.ISelection)
- */
- public void setInput(IWorkbenchPart part, ISelection selection) {
- super.setInput(part, selection);
-
- if (getInput() != null && getInput() instanceof PageflowEditPart) {
- Object model = ((PageflowEditPart) getInput()).getModel();
- if (model instanceof Pageflow) {
- pageflow = (Pageflow) model;
- refreshData();
- }
- }
- }
-
- /*
- * (non-Javadoc)
- *
- * @see com.sybase.stf.jmt.editors.pageflow.properties.sections.AbstractEditPartSection#refreshData()
- */
- public void refreshData() {
- super.refreshData();
- group.setPropertyProvider(pageflow);
- }
-
- public void validate() {
- // do nothing.
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/properties/section/LinkGroup.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/properties/section/LinkGroup.java
deleted file mode 100644
index bfe0d87..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/properties/section/LinkGroup.java
+++ /dev/null
@@ -1,216 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow.properties.section;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.jface.window.Window;
-import org.eclipse.jst.jsf.common.ui.internal.dialogfield.ComboDialogField;
-import org.eclipse.jst.jsf.common.ui.internal.dialogfield.DialogField;
-import org.eclipse.jst.jsf.common.ui.internal.dialogfield.IStringButtonAdapter;
-import org.eclipse.jst.jsf.common.ui.internal.dialogfield.LayoutUtil;
-import org.eclipse.jst.jsf.common.ui.internal.dialogfield.StringButtonDialogField;
-import org.eclipse.jst.jsf.common.ui.internal.dialogfield.StringDialogField;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowElement;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowLink;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowNode;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowPage;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.properties.ActionOutcomeSelectionDialog;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.properties.ITabbedPropertiesConstants;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.properties.PropertyMessages;
-import org.eclipse.jst.jsf.facesconfig.ui.util.WebrootUtil;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.FillLayout;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-
-/**
- * @author jchoi
- * @version
- */
-/*package*/ class LinkGroup extends AbstractEditPartGroup {
- private StringButtonDialogField fromOutcomeField;
-
- private StringDialogField fromActionField;
-
- private ComboDialogField redirectField;
-
- private PageflowLink pfLink;
-
- /** Integer value for boolean type */
- private static final Integer P_VALUE_TRUE = new Integer(0);
-
- private static final Integer P_VALUE_FALSE = new Integer(1);
-
- private class StringButtonAdapter implements IStringButtonAdapter {
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.jsf.facesconfig.ui.common.dialogfield.IStringButtonAdapter#changeControlPressed(org.eclipse.jst.jsf.facesconfig.ui.common.dialogfield.DialogField)
- */
- public void changeControlPressed(DialogField field) {
- String outcome = ""; //$NON-NLS-1$
- String jspPage = ""; //$NON-NLS-1$
- Shell shell = field.getLabelControl(null, null).getShell();
- if (pfLink != null) {
- outcome = pfLink.getOutcome();
- jspPage = WebrootUtil.getProjectPath(pfLink,
- getPreviousJSPPath(pfLink));
- ActionOutcomeSelectionDialog actionDialog = new ActionOutcomeSelectionDialog(
- shell, outcome, jspPage);
- if (actionDialog.open() == Window.OK) {
- outcome = actionDialog.getSelectedAction();
- fromOutcomeField.setText(outcome);
- pfLink.setOutcome(outcome);
- refreshData();
- }
- }
- }
-
- /**
- * @param _element
- * @return
- */
- private String getPreviousJSPPath(PageflowElement element) {
- String jspPath = null;
- if (element instanceof PageflowLink) {
- PageflowNode source = ((PageflowLink) element).getSource();
- if (source instanceof PageflowPage) {
- jspPath = ((PageflowPage) source).getPath();
- }
- }
- return jspPath;
- }
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.jsf.facesconfig.ui.common.dialogfield.DialogFieldGroup#initialize()
- */
- public void initialize() {
- fromOutcomeField = new StringButtonDialogField(
- new StringButtonAdapter());
- fromOutcomeField.setLabelText(PropertyMessages.property_fromOutcome);
- fromOutcomeField.setButtonLabel(PropertyMessages.property_browseButton);
- fromOutcomeField
- .setDialogFieldChangeListener(getDefaultChangeListener());
- fromActionField = new StringDialogField();
- fromActionField.setLabelText(PropertyMessages.property_fromAction);
- fromActionField
- .setDialogFieldChangeListener(getDefaultChangeListener());
- redirectField = new ComboDialogField(SWT.DROP_DOWN | SWT.READ_ONLY);
- redirectField.setLabelText(PropertyMessages.property_redirect);
- redirectField
- .setDialogFieldChangeListener((getDefaultChangeListener()));
- List redirectList;
- redirectList = new ArrayList();
- redirectList.add(Boolean.TRUE.toString());
- redirectList.add(Boolean.FALSE.toString());
- redirectField.setItems((String[]) redirectList.toArray(new String[0]));
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.jsf.facesconfig.ui.common.dialogfield.DialogFieldGroup#refreshData()
- */
- public void refreshData() {
- if (pfLink != null) {
- fromOutcomeField.setTextWithoutUpdate(pfLink.getOutcome());
- fromActionField.setTextWithoutUpdate(pfLink.getFromaction());
- if (pfLink.isRedirect()) {
- redirectField.setTextWithoutUpdate(Boolean.TRUE.toString());
- } else {
- redirectField.setTextWithoutUpdate(Boolean.FALSE.toString());
- }
- }
-
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.jsf.facesconfig.ui.common.dialogfield.DialogFieldGroup#layoutDialogFields(org.eclipse.ui.forms.widgets.FormToolkit,
- * org.eclipse.swt.widgets.Composite)
- */
- public void layoutDialogFields(FormToolkit toolkit, Composite parent) {
- Composite top;
- if (toolkit == null) {
- top = new Composite(parent, SWT.NONE);
- } else {
- top = toolkit.createComposite(parent);
- }
- FillLayout fillLayout = new FillLayout(SWT.VERTICAL);
- parent.setLayout(fillLayout);
-
- int numberOfColumns = 4;
- GridLayout layout = new GridLayout(numberOfColumns, false);
- top.setLayout(layout);
-
- fromActionField.doFillIntoGrid(toolkit, top, numberOfColumns);
- fromOutcomeField.doFillIntoGrid(toolkit, top, numberOfColumns);
- redirectField.doFillIntoGrid(toolkit, top, numberOfColumns);
-
- LayoutUtil.setHorizontalGrabbing(fromOutcomeField.getTextControl(
- toolkit, top));
- GridData data = new GridData();
- data.widthHint = ITabbedPropertiesConstants.BROWSE_WIDTH;
- data.heightHint = ITabbedPropertiesConstants.BROWSE_HEIGHT;
-
- fromOutcomeField.getChangeControl(toolkit, top).setLayoutData(data);
-
- }
-
- /**
- * @param elem
- */
- public void setPropertyProvider(PageflowLink elem) {
- pfLink = elem;
- this.refreshData();
- }
-
- /**
- * @return the outcome field
- */
- public StringButtonDialogField getFromOutcomeField() {
- return fromOutcomeField;
- }
-
- /**
- * @return the fromAction field
- */
- public StringDialogField getFromActionField() {
- return fromActionField;
- }
-
- /**
- * @return the redirect field
- */
- public ComboDialogField getRedirectField() {
- return redirectField;
- }
-
- /**
- * @return the redirect value
- */
- public Integer getRedirectValue() {
- if (redirectField.getText().equalsIgnoreCase(Boolean.TRUE.toString())) {
- return LinkGroup.P_VALUE_TRUE;
- }
- return LinkGroup.P_VALUE_FALSE;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/properties/section/LinkSection.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/properties/section/LinkSection.java
deleted file mode 100644
index c6b0dce..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/properties/section/LinkSection.java
+++ /dev/null
@@ -1,126 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow.properties.section;
-
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jst.jsf.common.ui.internal.dialogfield.DialogField;
-import org.eclipse.jst.jsf.common.ui.internal.dialogfield.IDialogFieldApplyListener;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.editpart.PageflowLinkEditPart;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowLink;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.impl.PageflowPackageImpl;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.util.PageflowValidation;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetPage;
-import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetWidgetFactory;
-
-/**
- * Edit section for Pagflow Link element (EditPart)
- *
- * @author jchoi
- */
-public class LinkSection extends AbstractEditPartSection {
- /** edit group */
- private LinkGroup group;
-
- /** the emf model for Pageflow link */
- private PageflowLink pfLink;
-
- /**
- *
- */
- public LinkSection() {
- super();
- group = new LinkGroup();
- group.setDefaultChangeListener(changeListener);
- group.initialize();
-
- group.getFromOutcomeField().setDialogFieldApplyListener(
- new IDialogFieldApplyListener() {
- public void dialogFieldApplied(DialogField field) {
- LinkSection.this.setValue(PageflowPackageImpl.eINSTANCE
- .getPFLink_Outcome().getName(), group
- .getFromOutcomeField().getText());
- }
- });
-
- group.getRedirectField().setDialogFieldApplyListener(
- new IDialogFieldApplyListener() {
- public void dialogFieldApplied(DialogField field) {
- LinkSection.this.setValue(PageflowPackageImpl.eINSTANCE
- .getPFLink_Redirect().getName(), group
- .getRedirectValue());
- }
- });
- group.getFromActionField().setDialogFieldApplyListener(
- new IDialogFieldApplyListener() {
- public void dialogFieldApplied(DialogField field) {
- LinkSection.this.setValue(PageflowPackageImpl.eINSTANCE
- .getPFLink_Fromaction().getName(), group
- .getFromActionField().getText());
- }
- });
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISection#createControls(org.eclipse.swt.widgets.Composite,
- * org.eclipse.wst.common.ui.properties.internal.provisional.TabbedPropertySheetPage)
- */
- public void createControls(Composite parent,
- TabbedPropertySheetPage aTabbedPropertySheetPage) {
- super.createControls(parent, aTabbedPropertySheetPage);
- TabbedPropertySheetWidgetFactory factory = aTabbedPropertySheetPage
- .getWidgetFactory();
- Composite top = factory.createFlatFormComposite(parent);
-
- group.layoutDialogFields(factory, top);
-
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISection#setInput(org.eclipse.ui.IWorkbenchPart,
- * org.eclipse.jface.viewers.ISelection)
- */
- public void setInput(IWorkbenchPart part, ISelection selection) {
- super.setInput(part, selection);
-
- if (getInput() != null && getInput() instanceof PageflowLinkEditPart) {
- Object model = ((PageflowLinkEditPart) getInput()).getModel();
- if (model instanceof PageflowLink) {
- pfLink = (PageflowLink) model;
- if (PageflowValidation.getInstance().isValidLinkForProperty(
- pfLink)) {
- refreshData();
- }
- }
- }
- }
-
- /*
- * (non-Javadoc)
- *
- * @see com.sybase.stf.jmt.editors.pageflow.properties.sections.AbstractEditPartSection#refreshData()
- */
- public void refreshData() {
- super.refresh();
- group.setPropertyProvider(pfLink);
- }
-
- public void validate() {
- // do nothing
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/properties/section/PageGroup.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/properties/section/PageGroup.java
deleted file mode 100644
index 6d3252b..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/properties/section/PageGroup.java
+++ /dev/null
@@ -1,173 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow.properties.section;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jface.window.Window;
-import org.eclipse.jst.jsf.common.ui.internal.dialogfield.DialogField;
-import org.eclipse.jst.jsf.common.ui.internal.dialogfield.IStringButtonAdapter;
-import org.eclipse.jst.jsf.common.ui.internal.dialogfield.LayoutUtil;
-import org.eclipse.jst.jsf.common.ui.internal.dialogfield.StringButtonDialogField;
-import org.eclipse.jst.jsf.common.ui.internal.dialogfield.StringDialogField;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowPage;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.properties.ITabbedPropertiesConstants;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.properties.ProjectWebPageSelectionDialog;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.properties.PropertyMessages;
-import org.eclipse.jst.jsf.facesconfig.ui.util.WebrootUtil;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.FillLayout;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-
-/**
- * @author jchoi
- * @version
- */
-/*package*/ class PageGroup extends AbstractEditPartGroup {
-
- private StringButtonDialogField fromViewField;
-
- private PageflowPage pfPage = null;
-
- private StringDialogField largeIconField;
-
- private StringDialogField smallIconField;
-
- class StringButtonAdapter implements IStringButtonAdapter {
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.jsf.facesconfig.ui.common.dialogfield.IStringButtonAdapter#changeControlPressed(org.eclipse.jst.jsf.facesconfig.ui.common.dialogfield.DialogField)
- */
- public void changeControlPressed(DialogField field) {
- IProject project = WebrootUtil.getProject(pfPage);
- ProjectWebPageSelectionDialog dlg = new ProjectWebPageSelectionDialog(
- field.getLabelControl(null, null).getShell(), project);
- if (dlg.open() == Window.OK) {
- fromViewField.setText(dlg.getResultFilePath());
- }
- }
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.jsf.facesconfig.ui.common.dialogfield.DialogFieldGroup#initialize()
- */
- public void initialize() {
- fromViewField = new StringButtonDialogField(new StringButtonAdapter());
- fromViewField.setLabelText(PropertyMessages.property_fromView);
- fromViewField.setButtonLabel(PropertyMessages.property_browseButton);
- fromViewField.setDialogFieldChangeListener(getDefaultChangeListener());
-
- largeIconField = new StringDialogField();
- largeIconField.setLabelText(PropertyMessages.property_largeIcon);
- largeIconField
- .setDialogFieldChangeListener((getDefaultChangeListener()));
- smallIconField = new StringDialogField();
- smallIconField.setLabelText(PropertyMessages.property_smallIcon);
- smallIconField
- .setDialogFieldChangeListener((getDefaultChangeListener()));
- super.initialize();
-
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.jsf.facesconfig.ui.common.dialogfield.DialogFieldGroup#refreshData()
- */
- public void refreshData() {
- if (pfPage != null) {
- fromViewField.setTextWithoutUpdate(assertString(pfPage.getPath()));
- largeIconField.setTextWithoutUpdate(assertString(pfPage
- .getLargeicon()));
- smallIconField.setTextWithoutUpdate(assertString(pfPage
- .getSmallicon()));
- super.refreshData(pfPage);
-
- }
-
- }
- /**
- * @param value
- * @return the assertion string
- */
- private static String assertString(String value) {
- return value == null ? "" : value; //$NON-NLS-1$
- }
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.jsf.facesconfig.ui.common.dialogfield.DialogFieldGroup#layoutDialogFields(org.eclipse.ui.forms.widgets.FormToolkit,
- * org.eclipse.swt.widgets.Composite)
- */
- public void layoutDialogFields(FormToolkit toolkit, Composite parent) {
- Composite top;
- if (toolkit == null) {
- top = new Composite(parent, SWT.NONE);
- } else {
- top = toolkit.createComposite(parent);
- }
- FillLayout fillLayout = new FillLayout(SWT.VERTICAL);
- parent.setLayout(fillLayout);
-
- int numberOfColumns = 4;
- GridLayout layout = new GridLayout(numberOfColumns, false);
- top.setLayout(layout);
-
- fromViewField.doFillIntoGrid(toolkit, top, numberOfColumns);
- LayoutUtil.setHorizontalGrabbing(fromViewField.getTextControl(toolkit,
- top));
- largeIconField.doFillIntoGrid(toolkit, top, numberOfColumns);
- smallIconField.doFillIntoGrid(toolkit, top, numberOfColumns);
- super.layoutDialogFields(toolkit, top, 4);
-
- GridData data = new GridData();
- data.widthHint = ITabbedPropertiesConstants.BROWSE_WIDTH;
- data.heightHint = ITabbedPropertiesConstants.BROWSE_HEIGHT;
-
- fromViewField.getChangeControl(toolkit, top).setLayoutData(data);
- }
-
- /**
- * @param elem
- */
- public void setPropertyProvider(PageflowPage elem) {
- pfPage = elem;
- this.refreshData();
- }
-
- /**
- * @return the fromView field
- */
- public StringButtonDialogField getFromViewField() {
- return fromViewField;
- }
-
- /**
- * @return the large icon field
- */
- public StringDialogField getLargeIconField() {
- return largeIconField;
- }
-
- /**
- * @return the small icon field
- */
- public StringDialogField getSmallIconField() {
- return smallIconField;
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/properties/section/PageSection.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/properties/section/PageSection.java
deleted file mode 100644
index 5a09203..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/properties/section/PageSection.java
+++ /dev/null
@@ -1,168 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow.properties.section;
-
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jst.jsf.common.ui.internal.dialogfield.DialogField;
-import org.eclipse.jst.jsf.common.ui.internal.dialogfield.IDialogFieldApplyListener;
-import org.eclipse.jst.jsf.facesconfig.ui.EditorPlugin;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.editpart.PageflowNodeEditPart;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowPage;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.impl.PageflowPackageImpl;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.util.PageflowValidation;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetPage;
-import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetWidgetFactory;
-
-/**
- * Edit section for Pagflow Page Element (EditPart)
- *
- * @author jchoi, Xiao-guang Zhang
- */
-public class PageSection extends AbstractEditPartSection {
- /** edit group */
- private PageGroup group;
-
- /** the emf model for Pageflow page */
- private PageflowPage pfPage = null;
-
- /**
- *
- */
- public PageSection() {
- super();
- group = new PageGroup();
- group.setDefaultChangeListener(changeListener);
- group.initialize();
-
- group.getFromViewField().setDialogFieldApplyListener(
- new IDialogFieldApplyListener() {
-
- public void dialogFieldApplied(DialogField field) {
- if (pfPage != null) {
- String jsfNew = group.getFromViewField().getText();
- if (jsfNew != null && jsfNew.length() > 0) {
- if (PageflowValidation.getInstance()
- .isExistedPage(pfPage.getPageflow(),
- jsfNew)) {
- // Pageflow.PageflowEditor.Alert.DNDResourceTitle
- // = Pageflow Creation Error
- // Pageflow.PageflowEditor.Alert.ExistingPage
- // = The web page {0} is already existed in
- // current PageFlow.
- EditorPlugin
- .getAlerts()
- .error(
- "Pageflow.PageflowEditor.Alert.DNDResourceTitle", //$NON-NLS-1$
- "Pageflow.PageflowEditor.Alert.ExistingPage", //$NON-NLS-1$
- jsfNew);
- } else {
- PageSection.this
- .setValue(
- PageflowPackageImpl.eINSTANCE
- .getPFPage_Path()
- .getName(), jsfNew);
- }
- }
- }
- }
- });
-
- group.getLargeIconField().setDialogFieldApplyListener(
- new IDialogFieldApplyListener() {
-
- public void dialogFieldApplied(DialogField field) {
- PageSection.this.setValue(PageflowPackageImpl.eINSTANCE
- .getPFPage_Largeicon().getName(), group
- .getLargeIconField().getText());
- }
- });
- group.getSmallIconField().setDialogFieldApplyListener(
- new IDialogFieldApplyListener() {
-
- public void dialogFieldApplied(DialogField field) {
- PageSection.this.setValue(PageflowPackageImpl.eINSTANCE
- .getPFPage_Smallicon().getName(), group
- .getSmallIconField().getText());
- }
- });
-
- group.getDescField().setDialogFieldApplyListener(
- new IDialogFieldApplyListener() {
-
- public void dialogFieldApplied(DialogField field) {
- PageSection.this.setValue(PageflowPackageImpl.eINSTANCE
- .getPageflowElement_Comment().getName(), group
- .getDescField().getText());
- }
- });
-
- group.getDisplayNameField().setDialogFieldApplyListener(
- new IDialogFieldApplyListener() {
-
- public void dialogFieldApplied(DialogField field) {
- PageSection.this.setValue(PageflowPackageImpl.eINSTANCE
- .getPageflowElement_Name().getName(), group
- .getDisplayNameField().getText());
- }
- });
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISection#createControls(org.eclipse.swt.widgets.Composite,
- * org.eclipse.wst.common.ui.properties.internal.provisional.TabbedPropertySheetPage)
- */
- public void createControls(Composite parent,
- TabbedPropertySheetPage aTabbedPropertySheetPage) {
- super.createControls(parent, aTabbedPropertySheetPage);
- TabbedPropertySheetWidgetFactory factory = aTabbedPropertySheetPage
- .getWidgetFactory();
- Composite top = factory.createFlatFormComposite(parent);
-
- group.layoutDialogFields(factory, top);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISection#setInput(org.eclipse.ui.IWorkbenchPart,
- * org.eclipse.jface.viewers.ISelection)
- */
- public void setInput(IWorkbenchPart part, ISelection selection) {
- super.setInput(part, selection);
-
- if (getInput() != null && getInput() instanceof PageflowNodeEditPart) {
- Object model = ((PageflowNodeEditPart) getInput()).getModel();
- if (model instanceof PageflowPage) {
- pfPage = (PageflowPage) model;
- refreshData();
- }
- }
- }
-
- /*
- * (non-Javadoc)
- *
- * @see com.sybase.stf.jmt.editors.pageflow.properties.sections.AbstractEditPartSection#refreshData()
- */
- public void refreshData() {
- super.refreshData();
- group.setPropertyProvider(pfPage);
- }
-
- public void validate() {
- // do nothing
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/properties/section/SetPropertyValueCommand.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/properties/section/SetPropertyValueCommand.java
deleted file mode 100644
index 96d2276..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/properties/section/SetPropertyValueCommand.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow.properties.section;
-
-import java.text.MessageFormat;
-
-import org.eclipse.gef.commands.Command;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.properties.PropertyMessages;
-import org.eclipse.ui.views.properties.IPropertySource;
-
-/*package*/ class SetPropertyValueCommand extends Command {
-
- private Object propertyValue;
-
- private Object propertyID;
-
- private Object undoValue;
-
- private boolean resetOnUndo;
-
- private IPropertySource target;
-
- /**
- * @param propLabel
- */
- public SetPropertyValueCommand(String propLabel) {
- super(MessageFormat.format(
- PropertyMessages.property_Command_SetValue,
- new Object[] { propLabel }).trim());
- }
-
- public boolean canExecute() {
- return true;
- }
-
- public void execute() {
- boolean wasPropertySet = getTarget().isPropertySet(propertyID);
- undoValue = getTarget().getPropertyValue(propertyID);
- if (undoValue instanceof IPropertySource) {
- undoValue = ((IPropertySource) undoValue).getEditableValue();
- }
- if (propertyValue instanceof IPropertySource) {
- propertyValue = ((IPropertySource) propertyValue)
- .getEditableValue();
- }
- getTarget().setPropertyValue(propertyID, propertyValue);
- resetOnUndo = wasPropertySet != getTarget().isPropertySet(propertyID);
- if (resetOnUndo) {
- undoValue = null;
- }
- }
-
- /**
- * @return the target
- */
- private IPropertySource getTarget() {
- return target;
- }
-
- void setTarget(IPropertySource aTarget) {
- target = aTarget;
- }
-
- public void redo() {
- execute();
- }
-
- void setPropertyId(Object pName) {
- propertyID = pName;
- }
-
- void setPropertyValue(Object val) {
- propertyValue = val;
- }
-
- public void undo() {
- if (resetOnUndo) {
- getTarget().resetPropertyValue(propertyID);
- } else {
- getTarget().setPropertyValue(propertyID, undoValue);
- }
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/synchronization/FC2PFSynchronizer.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/synchronization/FC2PFSynchronizer.java
deleted file mode 100644
index 2cc7a13..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/synchronization/FC2PFSynchronizer.java
+++ /dev/null
@@ -1,271 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow.synchronization;
-
-import org.eclipse.core.runtime.Assert;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.common.notify.impl.AdapterImpl;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.jst.jsf.common.ui.internal.logging.Logger;
-import org.eclipse.jst.jsf.facesconfig.emf.FacesConfigPackage;
-import org.eclipse.jst.jsf.facesconfig.emf.FromViewIdType;
-import org.eclipse.jst.jsf.facesconfig.emf.NavigationCaseType;
-import org.eclipse.jst.jsf.facesconfig.emf.NavigationRuleType;
-import org.eclipse.jst.jsf.facesconfig.emf.ToViewIdType;
-import org.eclipse.jst.jsf.facesconfig.ui.EditorPlugin;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowPackage;
-
-/**
- * The adapter that listens to modification of faces-config and updates pageflow
- * as needed.
- *
- * @author hmeng
- *
- */
-
-public class FC2PFSynchronizer extends AdapterImpl {
- private final boolean DEBUG = false;
-
- FC2PFTransformer transformer;
-
- private static final Logger logger = EditorPlugin
- .getLogger(FC2PFSynchronizer.class);
-
- /**
- * @param transformer
- */
- public FC2PFSynchronizer(FC2PFTransformer transformer) {
- this.transformer = transformer;
- }
-
- public Notifier getTarget() {
- // can't set target so return null
- return null;
- }
-
- public void setTarget(Notifier newTarget) {
- // do nothing
- }
-
- public boolean isAdapterForType(Object type) {
- return type == FC2PFSynchronizer.class;
- }
-
- public void notifyChanged(Notification notification) {
- if (!isProcessorFor(notification)) {
- return;
- }
- transformer.setInEvent(true);
- try {
- int type = notification.getEventType();
- switch (type) {
- case Notification.ADD: {
- processAdd(notification);
- notifyPageflow(notification);
- break;
- }
- case Notification.SET: {
- processSet(notification);
- notifyPageflow(notification);
- break;
- }
- case Notification.REMOVE:
- processRemove(notification);
- notifyPageflow(notification);
- break;
- }
- } catch (Exception e) {
- logger.error(e);
- } finally {
- if (notification.getEventType() != Notification.REMOVING_ADAPTER) {
- transformer.refreshFCAdapter((EObject) notification
- .getNotifier());
- transformer.refreshPFAdapter(transformer.getPageflow());
- }
- transformer.setInEvent(false);
- }
- }
-
- private boolean isProcessorFor(Notification notification) {
- boolean result = false;
- if (transformer.isListenToNotify()
- && (notification.getNotifier() instanceof EObject)) {
- if (notification.getNotifier() == transformer.getFacesConfig()) {
- // For faces-config, only navigation rule's change is awared.
- if (notification.getFeature() == FacesConfigPackage.eINSTANCE
- .getFacesConfigType_NavigationRule()) {
- result = true;
- }
- } else {
- result = true;
- }
- }
- return result;
- }
-
- private void processAdd(Notification notification) {
- Object feature = notification.getFeature();
- if (feature == FacesConfigPackage.eINSTANCE
- .getNavigationRuleType_NavigationCase()) {
- if (DEBUG)
- System.out.println("New navigation case"); //$NON-NLS-1$
- NavigationCaseType newCase = (NavigationCaseType) notification
- .getNewValue();
- transformer.updatePageflowElements(transformer.getPageflow(),
- newCase);
- } else if (feature == FacesConfigPackage.eINSTANCE
- .getFacesConfigType_NavigationRule()) {
- NavigationRuleType newRule = (NavigationRuleType) notification
- .getNewValue();
- if (newRule.getNavigationCase().size() > 0) {
- for (int i = 0; i < newRule.getNavigationCase().size(); i++) {
- transformer.updatePageflowElements(transformer
- .getPageflow(), (NavigationCaseType) newRule
- .getNavigationCase().get(i));
- }
- }
- if (DEBUG)
- System.out.println("New navigation rule"); //$NON-NLS-1$
- } else if (DEBUG)
- System.out.println("Something is added"); //$NON-NLS-1$
- }
-
- /**
- * Notify pageflow the changes.
- *
- * @param notification
- */
- private void notifyPageflow(Notification notification) {
- Assert.isTrue(notification.getNotifier() instanceof InternalEObject);
- transformer.getPageflow().notifyModelChanged(
- new ENotificationImpl((InternalEObject) notification
- .getNotifier(), Notification.SET,
- PageflowPackage.PAGEFLOW, null, null));
- }
-
- /**
- * Deal with the case when some element is removed.
- *
- * @param notification
- */
- private void processRemove(Notification notification) {
- if (notification.getFeature() == FacesConfigPackage.eINSTANCE
- .getNavigationRuleType_NavigationCase()) {
- if (notification.getOldValue() instanceof NavigationCaseType) {
- NavigationCaseType caseType = (NavigationCaseType) notification
- .getOldValue();
- transformer.removeLink(caseType);
- }
- if (DEBUG)
- System.out.println("Navigation case"); //$NON-NLS-1$
- } else if (notification.getFeature() == FacesConfigPackage.eINSTANCE
- .getNavigationCaseType()) {
- if (notification.getOldValue() instanceof NavigationRuleType) {
- NavigationRuleType rule = (NavigationRuleType) notification
- .getOldValue();
- for (int i = 0; i < rule.getNavigationCase().size(); i++) {
- NavigationCaseType caseType = (NavigationCaseType) rule
- .getNavigationCase().get(i);
- transformer.refreshLink(caseType);
- }
- }
- if (DEBUG)
- System.out.println("navigation rule"); //$NON-NLS-1$
- } else if (notification.getFeature() == FacesConfigPackage.eINSTANCE
- .getFacesConfigType_NavigationRule()) {
- if (notification.getOldValue() instanceof NavigationRuleType) {
- NavigationRuleType rule = (NavigationRuleType) notification
- .getOldValue();
- for (int i = 0; i < rule.getNavigationCase().size(); i++) {
- NavigationCaseType caseType = (NavigationCaseType) rule
- .getNavigationCase().get(i);
- transformer.refreshLink(caseType);
- }
- }
- }
- if (DEBUG)
- System.out.println("Something is removed"); //$NON-NLS-1$
- }
-
- /**
- * Deal with property change.
- *
- * @param notification
- */
- private void processSet(Notification notification) {
- Object feature = notification.getFeature();
- if (feature == FacesConfigPackage.eINSTANCE
- .getFromViewIdType_TextContent()
- || feature == FacesConfigPackage.eINSTANCE
- .getNavigationRuleType_FromViewId()) {
- fromViewIdChanged(notification);
- } else if (feature == FacesConfigPackage.eINSTANCE
- .getToViewIdType_TextContent()
- || feature == FacesConfigPackage.eINSTANCE
- .getNavigationCaseType_ToViewId()) {
- toViewIdChanged(notification);
- }
- if (DEBUG)
- System.out.println("Something is set"); //$NON-NLS-1$
- }
-
- private void fromViewIdChanged(Notification notification) {
- // remove
- Object feature = notification.getFeature();
- if (feature == FacesConfigPackage.eINSTANCE
- .getNavigationRuleType_FromViewId()
- && notification.getNewValue() == null
- && notification.getOldValue() instanceof FromViewIdType) {
- NavigationRuleType rule = (NavigationRuleType) notification
- .getNotifier();
- for (int i = 0; i < rule.getNavigationCase().size(); i++) {
- NavigationCaseType caseType = (NavigationCaseType) rule
- .getNavigationCase().get(i);
- transformer.refreshLink(caseType);
- }
- }
- // add or change
- else if (feature == FacesConfigPackage.eINSTANCE
- .getFromViewIdType_TextContent()) {
- NavigationRuleType rule = (NavigationRuleType) ((EObject) notification
- .getNotifier()).eContainer();
- for (int i = 0; i < rule.getNavigationCase().size(); i++) {
- NavigationCaseType caseType = (NavigationCaseType) rule
- .getNavigationCase().get(i);
- transformer.refreshLink(caseType);
- }
- }
- }
-
- private void toViewIdChanged(Notification notification) {
- // remove
- Object feature = notification.getFeature();
- if (feature == FacesConfigPackage.eINSTANCE
- .getNavigationCaseType_ToViewId()
- && notification.getNewValue() == null
- && notification.getOldValue() instanceof ToViewIdType) {
- NavigationCaseType caseType = (NavigationCaseType) notification
- .getNotifier();
- transformer.refreshLink(caseType);
- }
- // add or change
- else if (feature == FacesConfigPackage.eINSTANCE
- .getToViewIdType_TextContent()) {
- NavigationCaseType caseType = (NavigationCaseType) ((EObject) notification
- .getNotifier()).eContainer();
- transformer.refreshLink(caseType);
- }
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/synchronization/FC2PFTransformer.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/synchronization/FC2PFTransformer.java
deleted file mode 100644
index e2a9fb0..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/synchronization/FC2PFTransformer.java
+++ /dev/null
@@ -1,983 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow.synchronization;
-
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.core.runtime.Assert;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.common.notify.impl.AdapterImpl;
-import org.eclipse.emf.common.util.TreeIterator;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.jst.jsf.facesconfig.emf.DescriptionType;
-import org.eclipse.jst.jsf.facesconfig.emf.DisplayNameType;
-import org.eclipse.jst.jsf.facesconfig.emf.FacesConfigFactory;
-import org.eclipse.jst.jsf.facesconfig.emf.FacesConfigPackage;
-import org.eclipse.jst.jsf.facesconfig.emf.FacesConfigType;
-import org.eclipse.jst.jsf.facesconfig.emf.FromViewIdType;
-import org.eclipse.jst.jsf.facesconfig.emf.IconType;
-import org.eclipse.jst.jsf.facesconfig.emf.LargeIconType;
-import org.eclipse.jst.jsf.facesconfig.emf.NavigationCaseType;
-import org.eclipse.jst.jsf.facesconfig.emf.NavigationRuleType;
-import org.eclipse.jst.jsf.facesconfig.emf.SmallIconType;
-import org.eclipse.jst.jsf.facesconfig.emf.ToViewIdType;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.Pageflow;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowElement;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowFactory;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowLink;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowNode;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowPage;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.impl.PageReferenceElement;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.impl.ReferenceElement;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.util.PageflowModelManager;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.util.PageflowTransform;
-import org.eclipse.jst.jsf.facesconfig.ui.util.WebrootUtil;
-
-/**
- * Update and synchronize pageflow from faces-config or vice-versa.
- *
- * @author hmeng
- *
- */
-
-public class FC2PFTransformer extends AdapterImpl {
-
- // For code debug.
- private static final boolean DEBUG = false;
-
- /**
- * the first notification event type after the defaults
- */
- public static final int MY_NOTIFICATION_TYPE = Notification.EVENT_TYPE_COUNT + 1;
-
- /**
- * the first notification event type after MY_NOTIFICATION_TYPE
- */
- public static final int MY_NOTIFICATION_TYPE1 = MY_NOTIFICATION_TYPE + 1;
-
- /**
- * The listener is active.
- */
- private boolean listenToNotify;
-
- /**
- * Avoid redundent event.
- */
- private boolean isInEvent;
-
- boolean pageflowChanged = false;
-
- /**
- * Perform operations batched.
- */
- boolean needBatchOperations = false;
-
- /**
- * Catches
- */
- private Map mapPaths2PF = new HashMap();
-
- private Map mapCases2Links = new HashMap();
-
- /**
- * The pageflow model.
- */
- private Pageflow pageflow;
-
- /**
- * The faces-config model.
- */
- FacesConfigType facesConfig;
-
- /**
- * Default constructor
- */
- public FC2PFTransformer() {
- super();
- // TODO Auto-generated constructor stub
- }
-
- /**
- * @param listenToNotify
- */
- public void setListenToNotify(boolean listenToNotify) {
- this.listenToNotify = listenToNotify;
- }
-
- private void postEMFChanged() {
- startFCNotify();
- // Refresh all facesConfig?
- facesConfig.eNotify(new ENotificationImpl(
- (InternalEObject) facesConfig, Notification.REMOVE,
- FacesConfigPackage.FACES_CONFIG_TYPE__NAVIGATION_RULE, null,
- null));
- List rules;
- rules = facesConfig.getNavigationRule();
- for (int i = 0; i < rules.size(); i++) {
- ((NavigationRuleType) rules.get(i)).eNotify(new ENotificationImpl(
- (InternalEObject) rules.get(i), Notification.REMOVE,
- FacesConfigPackage.NAVIGATION_RULE_TYPE__NAVIGATION_CASE,
- null, null));
- }
- }
-
- /**
- * Set notify adapters.
- *
- */
- private void startFCNotify() {
- TreeIterator iterator = facesConfig.eAllContents();
- while (iterator.hasNext()) {
- EObject object = (EObject) iterator.next();
- object.eSetDeliver(true);
- }
- facesConfig.eSetDeliver(true);
- }
-
- /**
- * Set not notify adapters
- *
- * @return
- */
- private TreeIterator stopFCNotify() {
- TreeIterator iterator = facesConfig.eAllContents();
- // Stop the listener
- while (iterator.hasNext()) {
- EObject object = (EObject) iterator.next();
- object.eSetDeliver(false);
- }
- facesConfig.eSetDeliver(false);
- return iterator;
- }
-
- /**
- * For performance issue, we are going to update DOM only after the EMF
- * modifications are done.
- */
- boolean isNeedBatchOperations() {
- return needBatchOperations;
- }
-
- /**
- * @param enable
- */
- public void setNeedBatchOperations(boolean enable) {
- this.needBatchOperations = enable;
- if (!enable) {
- isInEvent = true;
- postEMFChanged();
- isInEvent = false;
- } else {
- stopFCNotify();
- }
- }
-
- private void updateFacesRule(NavigationRuleType navigationRule,
- PageflowPage pageSource) {
- FacesConfigFactory factory = FacesConfigFactory.eINSTANCE;
- if (pageSource.getComment() != null) {
- DescriptionType description = factory.createDescriptionType();
- description.setTextContent(pageSource.getComment());
- navigationRule.getDescription().clear();
- navigationRule.getDescription().add(description);
- }
- // set the navigation rule's icon
- if (pageSource.getLargeicon() != null
- || pageSource.getSmallicon() != null) {
- IconType icon = factory.createIconType();
- if (pageSource.getLargeicon() != null) {
- LargeIconType largeicon = factory.createLargeIconType();
- largeicon.setTextContent(pageSource.getLargeicon());
- icon.setLargeIcon(largeicon);
- }
-
- if (pageSource.getSmallicon() != null) {
- SmallIconType smallicon = factory.createSmallIconType();
- smallicon.setTextContent(pageSource.getSmallicon());
- icon.setSmallIcon(smallicon);
- }
- navigationRule.getIcon().clear();
- navigationRule.getIcon().add(icon);
- }
- if (pageSource.getName() != null) {
- DisplayNameType displayName = factory.createDisplayNameType();
- displayName.setTextContent(pageSource.getName());
- navigationRule.getDisplayName().clear();
- navigationRule.getDisplayName().add(displayName);
- }
- }
-
- /**
- * TODO: If we cache the case's properties in a link, then we can restore
- * them.
- *
- * @param navigationCase
- * @param link
- */
- // TODO: not used, dead?
-// private void updateFacesCase(NavigationCaseType navigationCase,
-// PageflowLink link) {
-// FacesConfigFactory factory = FacesConfigFactory.eINSTANCE;
-// if (link.getComment() != null) {
-// DescriptionType description = factory.createDescriptionType();
-// description.setTextContent(link.getComment());
-// navigationCase.getDescription().clear();
-// navigationCase.getDescription().add(description);
-// }
-// // set the navigation rule's icon
-// if (link.getLargeicon() != null || link.getSmallicon() != null) {
-// IconType icon = factory.createIconType();
-// if (link.getLargeicon() != null) {
-// LargeIconType largeicon = factory.createLargeIconType();
-// largeicon.setTextContent(link.getLargeicon());
-// icon.setLargeIcon(largeicon);
-// }
-//
-// if (link.getSmallicon() != null) {
-// SmallIconType smallicon = factory.createSmallIconType();
-// smallicon.setTextContent(link.getSmallicon());
-// icon.setSmallIcon(smallicon);
-// }
-// navigationCase.getIcon().clear();
-// navigationCase.getIcon().add(icon);
-// }
-// if (link.getFromaction() != null) {
-// FromActionType fromAction = factory.createFromActionType();
-// fromAction.setTextContent(link.getFromaction());
-// navigationCase.setFromAction(fromAction);
-// }
-// if (link.getOutcome() != null) {
-// FromOutcomeType fromOutcome = factory.createFromOutcomeType();
-// fromOutcome.setTextContent(link.getOutcome());
-// navigationCase.setFromOutcome(fromOutcome);
-// }
-// }
-
- private void createFacesCase(PageflowLink link, PageflowPage source,
- PageflowPage target_) {
- NavigationRuleType rule = FacesConfigFactory.eINSTANCE
- .createNavigationRuleType();
- FromViewIdType from = FacesConfigFactory.eINSTANCE
- .createFromViewIdType();
- from.setTextContent((source).getPath());
- rule.setFromViewId(from);
- NavigationCaseType navCase = FacesConfigFactory.eINSTANCE
- .createNavigationCaseType();
- ToViewIdType toView = FacesConfigFactory.eINSTANCE.createToViewIdType();
- toView.setTextContent((target_).getPath());
- navCase.setToViewId(toView);
- rule.getNavigationCase().add(navCase);
- facesConfig.getNavigationRule().add(rule);
- updateFacesRule(rule, source);
- source.getFCElements().add(from);
- target_.getFCElements().add(toView);
- link.getFCElements().add(navCase);
- mapCases2Links.put(navCase, link);
- }
-
- private void removePageflowPage(PageflowPage source) {
- Assert.isTrue(source.getOutlinks().size() == 0
- && source.getInlinks().size() == 0);
- pageflow.getNodes().remove(source);
- }
-
- void removeCase(NavigationCaseType navCase) {
- NavigationRuleType rule = (NavigationRuleType) navCase.eContainer();
- (rule).getNavigationCase().remove(navCase);
- if (rule.getNavigationCase().size() == 0) {
- facesConfig.getNavigationRule().remove(rule);
- }
- }
-
- /**
- * Remove a link in pageflow model.
- *
- * @param pLink
- */
- private void removeLink(PageflowLink pLink) {
- // Link
- PageflowPage source = (PageflowPage) pLink.getSource();
- PageflowPage target_ = (PageflowPage) pLink.getTarget();
- pLink.getPageflow().getLinks().remove(pLink);
- source.getOutlinks().remove(pLink);
- target_.getInlinks().remove(pLink);
- // Navigation case
- pLink.getFCElements().clear();
- cleanPage(source);
- cleanPage(target_);
- }
-
- /**
- * Remove a link in pageflow model.
- *
- * @param pLink
- */
- void changePFLinkStart(PageflowLink pLink, String newValue) {
- PageflowPage newPage = null;
- if ((newPage = getValidPFPageInCache(newValue)) != null) {
- if (newValue.equals(((PageflowPage) pLink.getSource()).getPath())) {
- return;
- }
- } else if ((newPage = TransformUtil.findPage(newValue, pageflow)) == null) {
- return;
- }
-
- // remove old case
- NavigationCaseType caseType = (NavigationCaseType) pLink
- .getFCElements().getData().get(0);
- //NavigationRuleType rule = (NavigationRuleType) caseType.eContainer();
- removeCase(caseType);
-
- // create new rule / case
- NavigationCaseType newCase = FacesConfigFactory.eINSTANCE
- .createNavigationCaseType();
- ToViewIdType toView = FacesConfigFactory.eINSTANCE.createToViewIdType();
- toView.setTextContent(caseType.getToViewId().getTextContent());
- newCase.setToViewId(toView);
-
- NavigationRuleType newRule = FacesConfigFactory.eINSTANCE
- .createNavigationRuleType();
- FromViewIdType fromView = FacesConfigFactory.eINSTANCE
- .createFromViewIdType();
- fromView.setTextContent(newValue);
- newRule.setFromViewId(fromView);
- newRule.getNavigationCase().add(newCase);
- facesConfig.getNavigationRule().add(newRule);
-
- // update
- // updateNode(rule, newRule);
- updateNode(caseType, newCase);
-
- pLink.getFCElements().clear();
- pLink.getFCElements().add(newCase);
- pLink.setSource(newPage);
-
- updatePageflowElements(pageflow, newCase);
- }
-
- private void updateNode(EObject old, EObject newOne) {
- if (old instanceof NavigationRuleType) {
- ((NavigationRuleType) newOne).getDescription().clear();
- ((NavigationRuleType) newOne).getDescription().addAll(
- ((NavigationRuleType) old).getDescription());
- ((NavigationRuleType) newOne).getDisplayName().clear();
- ((NavigationRuleType) newOne).getDisplayName().addAll(
- ((NavigationRuleType) old).getDisplayName());
- ((NavigationRuleType) newOne).getDescription().clear();
- ((NavigationRuleType) newOne).getIcon().clear();
- ((NavigationRuleType) newOne).getIcon().addAll(
- ((NavigationRuleType) old).getIcon());
- } else if (old instanceof NavigationCaseType) {
- ((NavigationCaseType) newOne).getDescription().clear();
- ((NavigationCaseType) newOne).getDescription().addAll(
- ((NavigationCaseType) old).getDescription());
- ((NavigationCaseType) newOne).getDisplayName().clear();
- ((NavigationCaseType) newOne).getDisplayName().addAll(
- ((NavigationCaseType) old).getDisplayName());
- ((NavigationCaseType) newOne).getDescription().clear();
- ((NavigationCaseType) newOne).getIcon().clear();
- ((NavigationCaseType) newOne).getIcon().addAll(
- ((NavigationCaseType) old).getIcon());
- ((NavigationCaseType) newOne)
- .setFromAction(((NavigationCaseType) old).getFromAction());
- ((NavigationCaseType) newOne)
- .setFromOutcome(((NavigationCaseType) old).getFromOutcome());
- }
- }
-
- void changePFLinkEnd(PageflowLink pLink, String newValue) {
- PageflowPage newPage = null;
- if ((newPage = getValidPFPageInCache(newValue)) != null) {
- if (newValue.equals(((PageflowPage) pLink.getSource()).getPath())) {
- return;
- }
- } else if ((newPage = TransformUtil.findPage(newValue, pageflow)) == null) {
- return;
- }
-
- // remove old case
- NavigationCaseType caseType = (NavigationCaseType) pLink
- .getFCElements().getData().get(0);
- ToViewIdType toView = caseType.getToViewId(); // FacesConfigFactory.eINSTANCE.createToViewIdType();
- if (toView == null) {
- toView = FacesConfigFactory.eINSTANCE.createToViewIdType();
- }
- toView.setTextContent(newValue);
- caseType.setToViewId(toView);
-
- pLink.setTarget(newPage);
-
- updatePageflowElements(pageflow, caseType);
- }
-
- void removeLink(NavigationCaseType caseType) {
- PageflowLink link = (PageflowLink) mapCases2Links.get(caseType);
- if (link != null) {
- removeLink(link);
- }
- }
-
- void addLink(PageflowPage source, PageflowPage target_, PageflowLink value) {
- if (source != null && target_ != null && value != null) {
- createFacesCase(value, source, target_);
- }
- }
-
- private void cleanPage(PageflowPage source) {
- if (source.getInlinks().size() == 0 && source.getOutlinks().size() == 0) {
- removePageflowPage(source);
- }
- source.update();
- }
-
- void refreshPFAdapter(EObject object) {
- TreeIterator content = object.eAllContents();
- while (content.hasNext()) {
- Object next = content.next();
- adapt((EObject) next);
- }
- adapt(object);
- }
-
- void refreshFCAdapter(EObject object) {
- List rules = facesConfig.getNavigationRule();
- if (rules != null) {
- for (int i = 0; i < rules.size(); i++) {
- NavigationRuleType rule = (NavigationRuleType) rules.get(i);
- adapt(rule);
- TreeIterator children = rule.eAllContents();
- while (children.hasNext()) {
- adapt((EObject) children.next());
- }
- }
- }
- adapt(facesConfig);
- }
-
- /**
- * @param facesConfig
- */
- public void setFacesConfig(FacesConfigType facesConfig) {
- this.facesConfig = facesConfig;
- refreshFCAdapter(facesConfig);
- }
-
- /**
- * @param pageflow
- */
- public void setPageflow(Pageflow pageflow) {
- this.pageflow = pageflow;
- pageflow.eAdapters().add(this);
- refreshPFAdapter(pageflow);
- }
-
- /**
- * Install compatible synchronization adapter for particular object.
- *
- * @param object
- */
- public void adapt(EObject object) {
- if (object != null && !isAdapted(object)) {
- if (object instanceof PageflowElement) {
- object.eAdapters().add(new PF2FCSynchronizer(this));
- } else {
- object.eAdapters().add(new FC2PFSynchronizer(this));
- }
- }
- }
-
- /**
- * Remove the synchronization adapter.
- *
- * @param object
- */
- public void unAdapt(EObject object) {
- Iterator adapters = object.eAdapters().iterator();
- while (adapters.hasNext()) {
- Object adapter = adapters.next();
- if (adapter instanceof FC2PFSynchronizer
- || adapter instanceof PF2FCSynchronizer) {
- adapters.remove();
- }
- }
- }
-
- /**
- * @param object
- * @return true if this transformer adapts object
- */
- public boolean isAdapted(EObject object) {
- if (object != null) {
- Iterator adapters = object.eAdapters().iterator();
- while (adapters.hasNext()) {
- Object adapter = adapters.next();
- if (adapter instanceof FC2PFSynchronizer
- || adapter instanceof PF2FCSynchronizer) {
- return true;
- }
- }
- }
- return false;
- }
-
- /**
- * clear the internal maps
- */
- public void clearCaches() {
- mapPaths2PF.clear();
- mapCases2Links.clear();
- }
-
- /**
- * dispose of this object.
- */
- public void dispose() {
- clearCaches();
- Pageflow pageFlow = getPageflow();
-
- if (pageFlow != null)
- {
- pageFlow.dispose();
- }
- }
-
- public Notifier getTarget() {
- return null;
- }
-
- public boolean isAdapterForType(Object type) {
- return false;
- }
-
- public void setTarget(Notifier newTarget) {
- // do nothing
- }
-
- /**
- * @param caseType
- * @return the from view id in caseType
- */
- public static FromViewIdType getSource(NavigationCaseType caseType) {
- if (caseType.eContainer() instanceof NavigationRuleType) {
- NavigationRuleType rule = (NavigationRuleType) caseType
- .eContainer();
- return rule.getFromViewId();
- }
- return null;
- }
-
- private PageflowPage getOrCreateStartPage(NavigationCaseType navCase) {// FromViewIdType
- PageflowPage startPageflowNode = null;
- String path = "*"; //$NON-NLS-1$
- NavigationRuleType rule = (NavigationRuleType) navCase.eContainer();
- FromViewIdType source = getSource(navCase);
- if (source != null) {
- path = source.getTextContent();
- }
- if (getValidPFPageInCache(path) == null) {
- startPageflowNode = TransformUtil.findPage(path, pageflow);
-
- if (startPageflowNode == null) {
- // not exist or is "*"
- if (DEBUG)
- System.out.println("Create new start page"); //$NON-NLS-1$
- startPageflowNode = createPFPage(path);
- pageflowChanged = true;
- }
- mapPaths2PF.put(path, startPageflowNode);
- PageflowTransform.getInstance().updatePageflowSourcePage(
- startPageflowNode, rule);
- } else {
- startPageflowNode = (PageflowPage) mapPaths2PF.get(path);
- }
- if (source != null) {
- ReferenceElement element = new PageReferenceElement(
- startPageflowNode);
- element.add(source);
- startPageflowNode
- .setReferenceLink(element.resolveReferenceString());
- startPageflowNode.getFCElements().add(source);
- }
- return startPageflowNode;
- }
-
- /**
- * Search for an existing pageflow page matching to navigation case's
- * target, if there is no such page existing, create one.
- *
- * @param navCase
- * @return
- */
- private PageflowPage getOrCreateEndPage(NavigationCaseType navCase) {
- PageflowPage endPageflowNode = null;
- ToViewIdType target_ = navCase.getToViewId();
- if (target_ != null) {
- String path = target_.getTextContent();
- if (getValidPFPageInCache(path) == null) {
- endPageflowNode = TransformUtil.findPage(path, pageflow);
- if (endPageflowNode == null) {
- endPageflowNode = createPFPage(path);
- if (DEBUG)
- System.out.println("Create new end page"); //$NON-NLS-1$
- pageflowChanged = true;
- }
- mapPaths2PF.put(path, endPageflowNode);
- PageflowTransform.getInstance().updatePageflowTargetPage(
- endPageflowNode, navCase);
- } else {
- endPageflowNode = (PageflowPage) mapPaths2PF.get(path);
- }
- if (target_ != null) {
- ReferenceElement element = new PageReferenceElement(
- endPageflowNode);
- element.add(target_);
- endPageflowNode.setReferenceLink(element
- .resolveReferenceString());
- endPageflowNode.getFCElements().add(target_);
- }
- }
- return endPageflowNode;
- }
-
- /**
- * Return a valid cached pageflow node.
- *
- * @param key
- * @return
- */
- private PageflowPage getValidPFPageInCache(Object key) {
- EObject element = (EObject) mapPaths2PF.get(key);
- if (!TransformUtil.isValidPageflowElement(element)
- || !(element instanceof PageflowPage)
- || !((PageflowPage) element).getPath().equals(key)) {
- mapPaths2PF.remove(key);
- element = null;
- }
- return (PageflowPage) element;
- }
-
- /**
- * Return a valid cached pageflow link.
- *
- * @param caseType
- * @return
- */
- private PageflowLink getValidPFLinkInCache(EObject caseType) {
- PageflowLink link = (PageflowLink) mapCases2Links.get(caseType);
- if (!TransformUtil.isValidLink(link)) {
- mapCases2Links.remove(caseType);
- link = null;
- }
- return link;
-
- }
-
- /**
- * Update pageflow model elements against faces-config navigation case.
- * @param pageflow_
- * @param caseFC
- * @return true if the pageflow was changed
- */
- public boolean updatePageflowElements(Pageflow pageflow_,
- NavigationCaseType caseFC) {
- this.pageflowChanged = false;
- this.pageflow = pageflow_;
- ToViewIdType target_ = caseFC.getToViewId();
- if (target_ == null) {
- return false;
- }
-
- PageflowPage start = null, end = null;
- // start page
- start = getOrCreateStartPage(caseFC);
- String action = null;
- // action
- if (caseFC.getFromAction() != null) {
- action = caseFC.getFromAction().getTextContent();
- }
- // from outcome
- String fromOutCome = null;
- if (caseFC.getFromOutcome() != null) {
- fromOutCome = caseFC.getFromOutcome().getTextContent();
- }
- // end page
- end = getOrCreateEndPage(caseFC);
- // link
- // Is there a link in pageflow model?
- PageflowLink link = null;
- if ((link = findUnmappedLink(start, end, caseFC)) == null) {
- if (end != null) {
- if (DEBUG)
- System.out.println("Create new link"); //$NON-NLS-1$
- link = createPFLink(start, end, action, fromOutCome);
- pageflowChanged = true;
- }
- }
- if (link != null) {
- link.getFCElements().clear();
- link.getFCElements().add(caseFC);
- mapCases2Links.put(caseFC, link);
- }
- adapt(start);
- adapt(end);
- adapt(caseFC);
- adapt(link);
- return pageflowChanged;
- }
-
- private boolean cleanPageflowNavigationRule(Pageflow pageflow_) {
- boolean dirty = false;
- List links = pageflow_.getLinks();
- Iterator linksIterator = links.iterator();
- while (linksIterator.hasNext()) {
- PageflowLink link = (PageflowLink) linksIterator.next();
- if (link.getFCElements().isEmpty()) {
- linksIterator.remove();
- if (link.getSource() != null) {
- link.getSource().getOutlinks().remove(link);
- }
- if (link.getTarget() != null) {
- link.getTarget().getInlinks().remove(link);
- }
- dirty = true;
- }
- }
- return dirty;
- }
-
- /**
- * merge the two navigation rules list between pageflow and face-config
- * file. merge rule: 1. if the from-view-id, from-action, and from-outcome
- * are same, they are the same navigation case, then the navigation case in
- * face-config file should be updated by one in the pageflow. 2. otherwise
- * the new navigation case should be created.
- *
- * FIXME: Not merge, only update page flow from faces-config.
- *
- * @param rulesFC -
- * navigation rules in faces-config.
- * @param navigationRulesInPageflow -
- * navigation rules in pageflow model.
- *
- * @return boolean - whether add a new rule or not.
- */
- private boolean updateNavigationRulesInPageflowFromFacesConfig(List rulesFC) {
- boolean isNew = false;
- // if the faces-config file is empty, the links should be removed.
- if (rulesFC == null || rulesFC.isEmpty()) {
- for (Iterator iterLink = pageflow.getLinks().iterator(); iterLink
- .hasNext();) {
- PageflowLink link = (PageflowLink) iterLink.next();
- link.getSource().getOutlinks().remove(link);
- link.getTarget().getInlinks().remove(link);
- }
- pageflow.getLinks().clear();
- } else {
- // Rule - Cases
- for (Iterator iterRulesFC = rulesFC.iterator(); iterRulesFC
- .hasNext();) {
- NavigationRuleType ruleFC = (NavigationRuleType) iterRulesFC
- .next();
-
- List casesFC = ruleFC.getNavigationCase();
- for (Iterator iterCasesFC = casesFC.iterator(); iterCasesFC
- .hasNext();) {
- NavigationCaseType navigationCaseFC = (NavigationCaseType) iterCasesFC
- .next();
- isNew |= updatePageflowElements(pageflow, navigationCaseFC);
- }
- }
- }
- isNew |= cleanPageflowNavigationRule(pageflow);
- return isNew;
- }
-
- /**
- * Find a pageflow link that is not linked to a faces-config element. Since
- * user might edit faces-config file with other editor, so the path is not
- * always valid, here we still try to match link and navigation case. TODO:
- * should we always resolve mapping from referenceLink on PageflowElement?
- */
- private PageflowLink findUnmappedLink(PageflowPage start, PageflowPage end,
- NavigationCaseType caseFC) {
- List links = start.getOutlinks();
- for (int i = 0, n = links.size(); i < n; i++) {
- PageflowLink link = (PageflowLink) links.get(i);
- if (link.getSource() == start && link.getTarget() == end) {
- link.update();
- if (link.getFCElements().isEmpty()
- || link.getFCElements().getData().get(0) == caseFC) {
- return link;
- }
- }
- }
- return null;
- }
-
- /**
- * create a new PFLink object according to fromOutcome attribute
- *
- * @param fromOutcome -
- * PFLink's fromOutcome attribute
- * @return - new PFLink object
- */
- public PageflowLink createPFLink(String fromOutcome) {
- PageflowLink link = null;
- link = PageflowModelManager.getFactory().createPFLink();
- if (fromOutcome != null && fromOutcome.length() > 0) {
- link.setOutcome(fromOutcome.trim());
- }
- pageflow.getLinks().add(link);
- return link;
- }
-
- /**
- * create a new PFLink object according to fromOutcome attribute
- * @param start
- * @param target_
- * @param action
- *
- * @param fromOutcome -
- * PFLink's fromOutcome attribute
- * @return - new PFLink object
- */
- public PageflowLink createPFLink(PageflowNode start, PageflowNode target_,
- String action, String fromOutcome) {
- Assert.isTrue(start != null && target_ != null);
- PageflowLink link = null;
- link = createPFLink(fromOutcome);
- link.setFromaction(action);
- link.setSource(start);
- link.setTarget(target_);
- start.getOutlinks().add(link);
- target_.getInlinks().add(link);
- return link;
- }
-
- /**
- * Create a new PFPage according to from-view-id
- *
- * @param fromViewID -
- * page's from-view-id
- * @return the page flow page
- */
- public PageflowPage createPFPage(String fromViewID) {
- PageflowPage page = PageflowFactory.eINSTANCE.createPFPage();
- if (fromViewID != null && fromViewID.length() > 0) {
- page.setPath(fromViewID.trim());
- page.setName(WebrootUtil.getPageNameFromWebPath(fromViewID.trim()));
- }
- this.pageflow.getNodes().add(page);
- return page;
- }
-
- /**
- * update pageflow model according to the face-config model
- *
- * @author sfshi
- * @return true if new rules were added
- */
- public boolean updatePageflowModelFromEMF() {
- if (pageflow != null && facesConfig != null) {
- List navigationRulesInFacesconfig = facesConfig.getNavigationRule();
- clearCaches();
- // if add new one, we can relayout the current pageflow.
- return updateNavigationRulesInPageflowFromFacesConfig(navigationRulesInFacesconfig);
- }
- return false;
- }
-
- void refreshLink(NavigationCaseType caseType) {
- PageflowLink link = getValidPFLinkInCache(caseType);
- if (link != null) {
- removeLink(link);
- }
- // update pageflow
- if (TransformUtil.isValidFacesConfigElement(caseType)) {
- updatePageflowElements(pageflow, caseType);
- }
- }
-
- public void notifyChanged(Notification msg) {
- int type = msg.getEventType();
- switch (type) {
- case MY_NOTIFICATION_TYPE:
- setNeedBatchOperations(true);
- break;
- case MY_NOTIFICATION_TYPE1:
- setNeedBatchOperations(false);
- }
- }
-
- /**
- * @return true if is listening to notifications and not
- * currently in an event
- */
- public boolean isListenToNotify() {
- return listenToNotify && !isInEvent;
- }
-
- /**
- * @return true if in event
- */
-// public boolean isInEvent() {
-// return isInEvent;
-// }
-
- /**
- * @param isInEvent
- */
- public void setInEvent(boolean isInEvent) {
- this.isInEvent = isInEvent;
- }
-
- /**
- * @return the faces config model
- */
- public FacesConfigType getFacesConfig() {
- return facesConfig;
- }
-
- /**
- * @return the root page flow
- */
- public Pageflow getPageflow() {
- return pageflow;
- }
-
- /**
- * @param value
- * @return a new fromViewId with the text content set to value
- */
- public static FromViewIdType createRLFromViewID(String value) {
- FromViewIdType fromView = FacesConfigFactory.eINSTANCE
- .createFromViewIdType();
- fromView.setTextContent(value);
- return fromView;
- }
-
- /**
- * @param value
- * @return a new to view with the text content set to value
- */
- public static ToViewIdType createFCToViewID(String value) {
- ToViewIdType toView = FacesConfigFactory.eINSTANCE.createToViewIdType();
- toView.setTextContent(value);
- return toView;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/synchronization/PF2FCSynchronizer.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/synchronization/PF2FCSynchronizer.java
deleted file mode 100644
index 88b4953..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/synchronization/PF2FCSynchronizer.java
+++ /dev/null
@@ -1,218 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow.synchronization;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.common.notify.impl.AdapterImpl;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.jst.jsf.common.ui.internal.logging.Logger;
-import org.eclipse.jst.jsf.facesconfig.emf.NavigationCaseType;
-import org.eclipse.jst.jsf.facesconfig.ui.EditorPlugin;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowElement;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowLink;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowNode;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowPackage;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowPage;
-
-/**
- * The adapter that listens to modification of pageflow and updates faces-config
- * as needed.
- *
- * @author hmeng
- *
- */
-public class PF2FCSynchronizer extends AdapterImpl {
- FC2PFTransformer tranformer;
-
- private final boolean DEBUG = false;
-
- private static final Logger logger = EditorPlugin
- .getLogger(PF2FCSynchronizer.class);
-
- /**
- * @param tranformer
- */
- public PF2FCSynchronizer(FC2PFTransformer tranformer) {
- this.tranformer = tranformer;
- }
-
- public Notifier getTarget() {
- // TODO Auto-generated method stub
- return null;
- }
-
- public void setTarget(Notifier newTarget) {
- // TODO Auto-generated method stub
-
- }
-
- public boolean isAdapterForType(Object type) {
- return type == PF2FCSynchronizer.class;
- }
-
- public void notifyChanged(Notification notification) {
- if (!isProcessorFor(notification)) {
- return;
- }
- tranformer.setInEvent(true);
- try {
- if (!(notification.getNotifier() instanceof PageflowElement)) {
- return;
- }
- processChange(notification);
- } catch (Exception e) {
- logger.error(e);
- } finally {
- if (notification.getEventType() != Notification.REMOVING_ADAPTER) {
- tranformer.refreshPFAdapter(tranformer.getPageflow());
- tranformer.refreshFCAdapter(tranformer.getFacesConfig());
- }
- tranformer.setInEvent(false);
- }
- }
-
- private boolean isProcessorFor(Notification notification) {
- return tranformer.isListenToNotify();
- }
-
- private void processChange(Notification notification) {
- PageflowElement element;
- element = (PageflowElement) notification.getNotifier();
- int type = notification.getEventType();
- switch (type) {
- case Notification.ADD: {
- int featureId = notification.getFeatureID(PageflowPackage.class);
- switch (featureId) {
- case PageflowPackage.PAGEFLOW_NODE__OUTLINKS:
- addOutLink(notification, element);
- break;
- case PageflowPackage.PAGEFLOW_NODE__INLINKS:
- addInLink(notification, element);
- break;
- case PageflowPackage.PAGEFLOW:
- break;
- }
- if (!tranformer.isNeedBatchOperations()) {
- updateAndNotify(notification);
- }
- break;
- }
- case Notification.SET:
- if (notification.getNewValue() != null) {
- processSet(notification, element);
- updateAndNotify(notification);
- }
- break;
- case Notification.REMOVE:
- case Notification.REMOVE_MANY: {
- int featureId = notification.getFeatureID(PageflowPackage.class);
- switch (featureId) {
- case PageflowPackage.PF_PAGE:
- // removePage(notification, (PageflowPage) element);
- break;
- case PageflowPackage.PAGEFLOW_NODE__OUTLINKS:
- case PageflowPackage.PAGEFLOW_NODE__INLINKS:
- removeLink(notification, element);
- break;
- }
- if (!tranformer.isNeedBatchOperations()) {
- updateAndNotify(notification);
- }
- break;
- }
- }
- }
-
- private void processSet(Notification notification, PageflowElement element) {
- if (notification.getNewValue() != null) {
- int value = notification.getFeatureID(PageflowPackage.class);
- if (element instanceof PageflowPage) {
- setProperties(notification, element, value);
- } else if (element instanceof PageflowLink) {
- if (DEBUG)
- System.out.println("The link property is changed"); //$NON-NLS-1$
- setProperties(notification, element, value);
- }
- }
- }
-
- private void setProperties(Notification notification,
- PageflowElement element, int value) {
- if (notification.getFeature() == PageflowPackage.eINSTANCE
- .getPFLink_Source()) {
- if (notification.getNewValue() instanceof String) {
- tranformer.changePFLinkStart((PageflowLink) element,
- (String) notification.getNewValue());
- }
- } else if (notification.getFeature() == PageflowPackage.eINSTANCE
- .getPFLink_Target()) {
- if (notification.getNewValue() instanceof String) {
- tranformer.changePFLinkEnd((PageflowLink) element,
- (String) notification.getNewValue());
- }
- } else {
- element.getFCElements().set(
- (EStructuralFeature) notification.getFeature(),
- notification.getNewValue());
- }
- }
-
- private void addInLink(Notification notification, PageflowElement element) {
- Object value = notification.getNewValue();
- PageflowLink link = (PageflowLink) value;
- if (element instanceof PageflowPage) {
- PageflowNode source = link.getSource();
- if (source instanceof PageflowPage) {
- tranformer.addLink((PageflowPage) source,
- (PageflowPage) element, link);
- }
- }
-
- }
-
- private void addOutLink(Notification notification, PageflowElement element) {
- Object value = notification.getNewValue();
- // for outLink remove, only target is referenced.
- PageflowLink link = (PageflowLink) value;
- if (element instanceof PageflowPage) {
- PageflowNode target_ = link.getTarget();
- // page->page
- if (target_ instanceof PageflowPage) {
- tranformer.addLink((PageflowPage) element,
- (PageflowPage) target_, link);
- }
- }
- }
-
- private void removeLink(Notification notification, PageflowElement element) {
- Object value = notification.getOldValue();
- PageflowLink link = (PageflowLink) value;
-
- if (!link.getFCElements().isEmpty()) {
- NavigationCaseType caseFC = (NavigationCaseType) link
- .getFCElements().getData().get(0);
- if (caseFC != null)
- tranformer.removeCase(caseFC);
- }
- link.update();
- }
-
- private void updateAndNotify(Notification notification) {
- tranformer.getPageflow().notifyModelChanged(
- new ENotificationImpl((InternalEObject) notification
- .getNotifier(), Notification.SET,
- PageflowPackage.PAGEFLOW, null, null));
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/synchronization/PFBatchAdapter.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/synchronization/PFBatchAdapter.java
deleted file mode 100644
index d30e7d1..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/synchronization/PFBatchAdapter.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow.synchronization;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.impl.AdapterImpl;
-import org.eclipse.gef.editparts.AbstractGraphicalEditPart;
-import org.eclipse.ui.PlatformUI;
-
-/**
- * @author hmeng
- */
-
-public abstract class PFBatchAdapter extends AdapterImpl {
- private boolean needPostpone;
-
- AbstractGraphicalEditPart editPart;
-
- /**
- * @param msg
- * @return true postponement needed
- */
- public boolean isNeedPostpone(Notification msg) {
- return needPostpone
- && !(msg.getEventType() == FC2PFTransformer.MY_NOTIFICATION_TYPE || msg
- .getEventType() == FC2PFTransformer.MY_NOTIFICATION_TYPE1);
- }
-
- /**
- * @param needPostpone
- */
- public void setNeedPostpone(boolean needPostpone) {
- this.needPostpone = needPostpone;
- }
-
- final public void notifyChanged(final Notification msg) {
- if (!isNeedPostpone(msg)) {
- if (Thread.currentThread() == PlatformUI.getWorkbench().getDisplay().getThread())
- doNotifyChanged(msg);
- else {
- PlatformUI.getWorkbench().getDisplay().asyncExec(new Runnable() {
- public void run() {
- doNotifyChanged(msg);
- }
- });
- }
- }
- }
-
- /**
- * @param notification
- */
- abstract public void doNotifyChanged(Notification notification);
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/synchronization/TransformUtil.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/synchronization/TransformUtil.java
deleted file mode 100644
index d2b40b9..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/synchronization/TransformUtil.java
+++ /dev/null
@@ -1,131 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow.synchronization;
-
-import java.util.List;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.jst.jsf.facesconfig.emf.FacesConfigType;
-import org.eclipse.jst.jsf.facesconfig.emf.FromOutcomeType;
-import org.eclipse.jst.jsf.facesconfig.emf.NavigationCaseType;
-import org.eclipse.jst.jsf.facesconfig.emf.NavigationRuleType;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.Pageflow;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowLink;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowNode;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowPage;
-
-/**
- * The util for pageflow and faces-config transforming
- *
- * @author hmeng
- */
-
-public class TransformUtil {
-
- /**
- * To see if the faces-config element is on a valid hirachy.
- * @param object
- * @return true if object's root ancestor is a facesConfig model
- */
- public static boolean isValidFacesConfigElement(EObject object) {
- EObject parent = EcoreUtil.getRootContainer(object);
- boolean result = parent instanceof FacesConfigType;
- return result;
- }
-
- /**
- * To see if the pageflow element is on a valid hirachy.
- * @param element
- * @return true if element's root ancestor is a page flow element
- */
- public static boolean isValidPageflowElement(EObject element) {
- EObject root = EcoreUtil.getRootContainer(element);
- boolean result = root instanceof Pageflow;
- return result;
- }
-
- /**
- * @param link
- * @return true the link is valid
- */
- public static boolean isValidLink(PageflowLink link) {
- return isValidPageflowElement(link) && link.getSource() != null
- && link.getTarget() != null;
- }
-
- /**
- * @param rule
- * @return gets the from-view-id from rule
- */
- public static String getFromViewID(NavigationRuleType rule) {
- String result = "*"; //$NON-NLS-1$
- if (rule.getFromViewId() != null) {
- result = rule.getFromViewId().getTextContent();
- }
- return result;
- }
-
- /**
- * @param navCase
- * @return gets the to-view-id from navCase
- */
- public static String getToViewID(NavigationCaseType navCase) {
- String result = "*"; //$NON-NLS-1$
- if (navCase.getToViewId() != null) {
- result = navCase.getToViewId().getTextContent();
- }
- return result;
- }
-
- /**
- * @param path
- * @param pageflow
- * @return get pageflowpage in pageflow corresponding to path
- */
- public static PageflowPage findPage(String path, Pageflow pageflow) {
- List nodes = pageflow.getNodes();
- for (int i = 0; i < nodes.size(); i++) {
- if (nodes.get(i) instanceof PageflowPage) {
- if (path != null) {
- if (path.equals(((PageflowPage) nodes.get(i)).getPath())) {
- return (PageflowPage) nodes.get(i);
- }
- }
- }
- }
- return null;
- }
-
- /**
- * @param action
- * @param outcome
- * @param pageflow
- * @return find the end case
- */
- public static PageflowNode findCaseEnd(PageflowPage action,
- FromOutcomeType outcome, Pageflow pageflow) {
- // TODO: find a case end in pageflow model
- List links = action.getOutlinks();
- for (int i = 0; i < links.size(); i++) {
- PageflowLink link = (PageflowLink) links.get(i);
- String outcomeStr = ""; //$NON-NLS-1$
- if (outcome != null) {
- outcomeStr = outcome.getTextContent();
- }
- if (link.getOutcome().equals(outcomeStr)) {
- return link.getTarget();
- }
- }
- return null;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/util/EditPartMarkerUtil.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/util/EditPartMarkerUtil.java
deleted file mode 100644
index a1e3c64..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/util/EditPartMarkerUtil.java
+++ /dev/null
@@ -1,216 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow.util;
-
-import java.util.Iterator;
-
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gef.GraphicalEditPart;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowElement;
-import org.eclipse.jst.jsf.facesconfig.ui.util.WebrootUtil;
-
-/**
- *
- * Utility class to add and remove edit part markers.
- *
- * FIXME: add the identification mechanism of the model and remove the
- * dependency on the PageflowElement
- *
- * @author Xiao-guang Zhang
- *
- *
- */
-public class EditPartMarkerUtil {
-
- /**
- * Removes all markers that were created using createMarker()
- *
- * @param model -
- * the emf model related with edit part
- * @throws CoreException
- */
- public static void removeAllMarkers(EObject model) throws CoreException {
- IResource resource = getResource(model);
-
- if (resource != null) {
- String markerTypes[] = { IMarker.PROBLEM, IMarker.TASK };
-
- for (int iMT = 0; iMT < markerTypes.length; iMT++) {
- IMarker[] markers = resource.findMarkers(markerTypes[iMT],
- false, IResource.DEPTH_ONE);
-
- for (int iMark = 0; iMark < markers.length; iMark++) {
- markers[iMark].delete();
- }
- }
- }
- }
-
- /**
- * Removes a specific problem marker type with the given severity.
- *
- * @param model -
- * the model related with this edit part.
- * @param sMarkerType -
- * the marker type, either IMarker.PROBLEM or IMarker.TASK
- * @param iSeverity -
- * severity/priority: if sMarkerType is IMarker.PROBLEM, then
- * this value is one of the PROBLEM severities; if sMarkerType is
- * IMarker.TASK, this is a task priority.
- * @throws CoreException
- * passed on from IResource.findMarkers()
- */
- public static void removeAllMarkers(EObject model, String sMarkerType,
- int iSeverity) throws CoreException {
- IResource resource = getResource(model);
-
- if (resource != null) {
- IMarker[] markers = resource.findMarkers(sMarkerType, false,
- IResource.DEPTH_ONE);
-
- for (int i = 0; i < markers.length; i++) {
- IMarker marker = markers[i];
- int iMarkerSeverity = marker.getAttribute(IMarker.SEVERITY,
- IMarker.SEVERITY_ERROR);
-
- if (iMarkerSeverity == iSeverity || iSeverity == -1) {
- markers[i].delete();
- }
- }
- }
- }
-
- /**
- * get the resouce according to part or model.
- *
- * @param part
- * @param model
- * @return
- */
- private static IResource getResource(EObject model) {
- IResource resource = null;
- resource = WebrootUtil.getResource(model);
- return resource;
- }
-
- /**
- * Create a problem marker.
- *
- * @param model -
- * the model related with this edit part.
- * @param sMarkerType
- * @param severity -
- * the problem severity, one of IMarker.SEVERITY_ERROR,
- * IMarker.SEVERITY_WARNING or IMarker.SEVERITY_INFO
- * @param message -
- * the text associated with this marker
- * @param location -
- * a unique ID that the application can use to locate the
- * editpart
- *
- * that corresponds to this marker; this is typically the DiagramElement's
- * ID string
- * @throws CoreException
- */
- public static void createMarker(EObject model, String sMarkerType,
- int severity, String message, String location) throws CoreException {
- IResource resource = getResource(model);
-
- if (resource != null) {
- IMarker marker = resource.createMarker(sMarkerType);
- marker.setAttribute(IMarker.MESSAGE, message);
- marker.setAttribute(IMarker.SEVERITY, severity);
- // The problem view doesn't show the location - only the line number
- // is shown in the "location" column. Doh!
- if (location != null && location.length() > 0) {
- marker.setAttribute(IMarker.LOCATION, location);
- }
- }
- }
-
- /**
- * Removes a specific problem marker type with the given severity.
- *
- * @param model -
- * the model related with this edit part.
- * @param sMarkerType -
- * the marker type, either IMarker.PROBLEM or IMarker.TASK
- * @throws CoreException
- * passed on from IResource.findMarkers()
- */
- public static void removeMarker(EObject model, String sMarkerType)
- throws CoreException {
- IResource resource = getResource(model);
- if (resource != null) {
- IMarker[] markers = resource.findMarkers(sMarkerType, false,
- IResource.DEPTH_ONE);
-
- for (int i = 0; i < markers.length; i++) {
- IMarker marker = markers[i];
- // get the marker's location
- Object id = marker.getAttribute(IMarker.LOCATION);
-
- if (model instanceof PageflowElement) {
- if (((PageflowElement) model).getId().equals(id)) {
- markers[i].delete();
- }
- }
- }
- }
- }
-
- /**
- * Searches the hierarchy starting at the given EditPart for a given model
- * object ID string (the DiagramElement.ID value) and returns that EditPart
- *
- * @param containerPart
- * @param id
- * @return the EditPart that corresponds to the given ID string, or null if
- * not found
- */
- public static GraphicalEditPart findEditPart(
- GraphicalEditPart containerPart, String id) {
- Object model = containerPart.getModel();
- if (model instanceof PageflowElement) {
- String modelId = ((PageflowElement) model).getId();
- if (modelId != null && modelId.equals(id)) {
- return containerPart;
- }
- }
-
- Iterator iterNode = containerPart.getChildren().iterator();
- while (iterNode.hasNext()) {
- GraphicalEditPart child = (GraphicalEditPart) iterNode.next();
- GraphicalEditPart foundPart = findEditPart(child, id);
- if (foundPart != null) {
- return foundPart;
- }
- }
-
- Iterator iterConnection = containerPart.getSourceConnections()
- .iterator();
- while (iterConnection.hasNext()) {
- GraphicalEditPart child = (GraphicalEditPart) iterConnection.next();
- GraphicalEditPart foundPart = findEditPart(child, id);
- if (foundPart != null) {
- return foundPart;
- }
- }
-
- return null;
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/util/JSPDomAdapter.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/util/JSPDomAdapter.java
deleted file mode 100644
index 36845dc..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/util/JSPDomAdapter.java
+++ /dev/null
@@ -1,216 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow.util;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jst.jsf.common.ui.internal.logging.Logger;
-import org.eclipse.jst.jsf.context.resolver.structureddocument.ITaglibContextResolver;
-import org.eclipse.jst.jsf.context.resolver.structureddocument.internal.IStructuredDocumentContextResolverFactory2;
-import org.eclipse.jst.jsf.context.structureddocument.IStructuredDocumentContext;
-import org.eclipse.jst.jsf.context.structureddocument.IStructuredDocumentContextFactory;
-import org.eclipse.jst.jsf.facesconfig.ui.EditorPlugin;
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.w3c.dom.Document;
-import org.w3c.dom.NodeList;
-
-/**
- * This class is defined as a simple adapter to JSP DOM model. User can get the
- * taglib prefix, and get the needed element by element tage name, and
- * namespace(prefix) Usage: User should initialize this class instance before
- * using it. Following is a typical example: JSPDomAdapter jspAdapter = new
- * JSPDomAdapter(); IFile jspFile =
- * ResourcesPlugin.getWorkspace().getRoot().getFile(jspPath); if
- * (_jspAdapter.initialize(jspFile)) { //the prefix of JSF HTML TagLib String
- * prefix = _jspAdapter.getTagLibPrefix(JSPDomAdapter.JSF_HTML_TAGLIB); }
- *
- * @author Xiao-guang Zhang
- */
-public class JSPDomAdapter {
- /** log instance */
- private static final Logger log = EditorPlugin
- .getLogger(JSPDomAdapter.class);
-
- /** JSP Taglib's tag name */
- public static String JSP_TAGLIB_TAG = "jsp:directive.taglib"; //$NON-NLS-1$
-
- /** JSF HTML TagLib name */
- public static String JSF_HTML_TAGLIB = "http://java.sun.com/jsf/html"; //$NON-NLS-1$
-
- /** singleton model manager */
- private static IModelManager modelManager;
-
- /** source jsp file */
- private IFile jspFile;
-
- /** Structured Model of JSP File */
- private IStructuredModel model;
-
- /** Root Document (Node) of JSP file */
- private Document document;
-
- /**
- *
- */
- public JSPDomAdapter() {
- super();
-
- }
-
- /**
- * initialize this adapter to get the StructuredModel for the input file.
- * At last user should call releaseModel() method to release the Structured Model.
- *
- * @param file -
- * JSP file
- * @return - True means sucessfully load jsp file.
- */
- public boolean initialize(final IFile file) {
- jspFile = file;
-
- if (jspFile != null && jspFile.exists()) {
- try {
- model = getModel(jspFile);
- } catch (final IOException e) {
- // PageFlow.JSPDomAdapter.FailToGetStructuredModel = Failed to
- // get the structured model
- log.error("PageFlow.JSPDomAdapter.FailToGetStructuredModel", e); //$NON-NLS-1$
- } catch (final CoreException e) {
- // PageFlow.JSPDomAdapter.FailToGetStructuredModel = Failed to
- // get the structured model
- log.error("PageFlow.JSPDomAdapter.FailToGetStructuredModel", e);//$NON-NLS-1$
- }
-
- if (model != null && model instanceof IDOMModel) {
- return true;
- }
- }
-
- return false;
- }
-
- /**
- * get the prefix for the input taglib URI, e.g.,
- * http://java.sun.com/jsf/html -> "h"
- *
- * @param taglibURI
- * @return the prefix
- */
- public String getTagLibPrefix(final String taglibURI) {
- String prefix = null;
-
- final IStructuredDocument sdocument = model.getStructuredDocument();
-
- if (sdocument != null)
- {
- IStructuredDocumentContext context =
- IStructuredDocumentContextFactory.INSTANCE.getContext(sdocument, -1);
- ITaglibContextResolver resolver =
- IStructuredDocumentContextResolverFactory2.INSTANCE.getTaglibContextResolverFromDelegates(context);
- prefix = resolver.getTagPrefixForURI(taglibURI);
- }
-
- return prefix;
- }
-
- /**
- * get the elements by the namespace and its tag name, e.g., h and
- * commandButton.
- *
- * @param namespace -
- * namespace for the taglib, e.g., h for
- * http://java.sun.com/jsf/html
- * @param elementName -
- * element Tag Name, e.g., h
- * @return - Element Node list.
- */
- public List getElementsByTagNameNS(final String namespace, final String elementName) {
- List nodes = null;
-
- if (getDocument() != null) {
- NodeList listNodes = null;
- if (namespace != null) {
- listNodes = getDocument().getElementsByTagName(
- namespace + ":" + elementName); //$NON-NLS-1$
- } else {
- listNodes = getDocument().getElementsByTagName(elementName);
- }
-
- if (listNodes != null && listNodes.getLength() > 0) {
- nodes = new ArrayList();
- for (int i = 0; i < listNodes.getLength(); i++) {
- nodes.add(listNodes.item(i));
- }
- }
- }
- return nodes;
- }
-
- /**
- * get the singleton model manager.
- *
- * @return
- */
- private IModelManager getModelManager() {
- if (modelManager == null) {
- modelManager = StructuredModelManager.getModelManager();
- }
- return modelManager;
- }
-
- /**
- * get the structured model for the JSP file
- *
- * @param file -
- * JSP File
- * @return - IStructuredModel
- * @throws IOException
- * @throws CoreException
- */
- private IStructuredModel getModel(final IFile file) throws IOException,
- CoreException {
- return getModelManager().getModelForRead(file);
- }
-
- /**
- * get the root docuement for the StructuredModel
- *
- * @return
- */
- private Document getDocument() {
- if (document == null) {
- if (model != null && model instanceof IDOMModel) {
- document = ((IDOMModel) model).getDocument();
- }
- }
- return document;
- }
-
-
- /**
- * signal we are done with the model
- */
- public void releaseModel() {
- if (model != null) {
- model.releaseFromRead();
- }
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/util/JSPUtil.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/util/JSPUtil.java
deleted file mode 100644
index 7b1414b..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/util/JSPUtil.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow.util;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-
-/**
- * utility class for JSP related information.
- *
- * @author Yang Liu
- */
-public class JSPUtil {
-
- /**
- * get the action list in the jsp file
- * @param jspFileName
- *
- * @return - action list
- */
- public static List getActionListInJSPFile(String jspFileName) {
- /** jsp dom adapter */
-
- List actions = new ArrayList();
-
- // convert the relative directory to project directory, e.g., /a.jsp to
- // /testproject/webroot/a.sjp
- String physicalJspPath = jspFileName;
- if (physicalJspPath != null && physicalJspPath.length() > 0)
- {
- IPath jspPath = new Path(physicalJspPath);
- IFile jspFile = ResourcesPlugin.getWorkspace().getRoot().getFile(
- jspPath);
-
- if (jspFile != null && jspFile.exists())
- {
- JSPDomAdapter jspAdapter = null;
- try
- {
- jspAdapter = new JSPDomAdapter();
- // initialize the adapter to initialize the model of jsp
- if (jspAdapter.initialize(jspFile))
- {
- // the prefix of JSF HTML TagLib
- String prefix = jspAdapter
- .getTagLibPrefix(JSPDomAdapter.JSF_HTML_TAGLIB);
-
- // get the command butonns
- List buttonActions = jspAdapter.getElementsByTagNameNS(
- prefix, "commandButton");//$NON-NLS-1$
- if (buttonActions != null)
- actions.addAll(buttonActions);
-
- // get the command links
- List linkActions = jspAdapter.getElementsByTagNameNS(
- prefix, "commandLink");//$NON-NLS-1$
- if (linkActions != null)
- actions.addAll(linkActions);
- }
- }
- finally
- {
- if (jspAdapter != null)
- {
- jspAdapter.releaseModel();
- }
- }
- }
- }
- return actions;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/util/ModelCreationFactory.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/util/ModelCreationFactory.java
deleted file mode 100644
index b869353..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/util/ModelCreationFactory.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow.util;
-
-import org.eclipse.gef.requests.CreationFactory;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowLink;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowPage;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowFactory;
-
-/**
- * This class implements the CreationFactory used by the CreationTool. It in
- * turn uses the EMF-generated factories to create the model instances
- *
- * @author Xiao-guang Zhang
- */
-public class ModelCreationFactory implements CreationFactory {
- private Class targetClass;
-
- /**
- * @param targetClass
- */
- public ModelCreationFactory(Class targetClass) {
- this.targetClass = targetClass;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.gef.requests.CreationFactory#getNewObject()
- */
- public Object getNewObject() {
- PageflowFactory factory = PageflowModelManager.getFactory();
-
- Object result = null;
-
- if (targetClass.equals(PageflowLink.class)) {
- result = factory.createPFLink();
-
- } else if (targetClass.equals(PageflowPage.class)) {
- result = factory.createPFPage();
- }
-
- return result;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.gef.requests.CreationFactory#getObjectType()
- */
- public Object getObjectType() {
- return targetClass;
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/util/PageflowAdapterFactory.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/util/PageflowAdapterFactory.java
deleted file mode 100644
index 8da99bf..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/util/PageflowAdapterFactory.java
+++ /dev/null
@@ -1,256 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow.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.jst.jsf.facesconfig.ui.pageflow.model.PageflowLink;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowLinkBendpoint;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowPage;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.Pageflow;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowElement;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowNode;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowPackage;
-
-/**
- * <!-- 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.jst.jsf.facesconfig.ui.pageflow.model.PageflowPackage
- * @generated
- */
-// FIXME: this appears to be a dead class.
-public class PageflowAdapterFactory extends AdapterFactoryImpl {
- /**
- * The cached model package. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- protected static PageflowPackage modelPackage;
-
- /**
- * Creates an instance of the adapter factory. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public PageflowAdapterFactory() {
- if (modelPackage == null) {
- modelPackage = PageflowPackage.eINSTANCE;
- }
- }
-
- /**
- * Returns whether this factory is applicable for the type of the object.
- * <!-- begin-user-doc --> This implementation returns <code>true</code>
- * if the object is either the model's package or is an instance object of
- * the model. <!-- end-user-doc -->
- *
- * @return whether this factory is applicable for the type of the object.
- * @generated
- */
- public boolean isFactoryForType(Object object) {
- if (object == modelPackage) {
- return true;
- }
- if (object instanceof EObject) {
- return ((EObject) object).eClass().getEPackage() == modelPackage;
- }
- return false;
- }
-
- /**
- * The switch the delegates to the <code>createXXX</code> methods. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- protected PageflowSwitch modelSwitch = new PageflowSwitch() {
- public Object casePageflow(Pageflow object) {
- return createPageflowAdapter();
- }
-
- public Object casePageflowNode(PageflowNode object) {
- return createPageflowNodeAdapter();
- }
-
- public Object casePFLink(PageflowLink object) {
- return createPFLinkAdapter();
- }
-
- public Object casePageflowElement(PageflowElement object) {
- return createPageflowElementAdapter();
- }
-
- public Object casePFPage(PageflowPage object) {
- return createPFPageAdapter();
- }
-
- public Object casePFLinkBendpoint(PageflowLinkBendpoint object) {
- return createPFLinkBendpointAdapter();
- }
-
- 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.jst.jsf.facesconfig.ui.pageflow.model.Pageflow <em>Pageflow</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.jst.jsf.facesconfig.ui.pageflow.model.Pageflow
- * @generated
- */
- public Adapter createPageflowAdapter() {
- return null;
- }
-
- /**
- * Creates a new adapter for an object of class '{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowNode <em>Node</em>}'.
- * <!-- begin-user-doc --> This default implementation returns null so that
- * we can easily ignore cases; it's useful to ignore a case when inheritance
- * will catch all the cases anyway. <!-- end-user-doc -->
- *
- * @return the new adapter.
- * @see org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowNode
- * @generated
- */
- public Adapter createPageflowNodeAdapter() {
- return null;
- }
-
- /**
- * Creates a new adapter for an object of class '{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowLink <em>PF Link</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.jst.jsf.facesconfig.ui.pageflow.model.PageflowLink
- * @generated
- */
- public Adapter createPFLinkAdapter() {
- return null;
- }
-
- /**
- * Creates a new adapter for an object of class '{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowElement <em>Element</em>}'.
- * <!-- begin-user-doc --> This default implementation returns null so that
- * we can easily ignore cases; it's useful to ignore a case when inheritance
- * will catch all the cases anyway. <!-- end-user-doc -->
- *
- * @return the new adapter.
- * @see org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowElement
- * @generated
- */
- public Adapter createPageflowElementAdapter() {
- return null;
- }
-
- /**
- * <!-- 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.
- * @generated
- */
- public Adapter createPFActionAdapter() {
- return null;
- }
-
- /**
- * Creates a new adapter for an object of class '{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowPage <em>PF Page</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.jst.jsf.facesconfig.ui.pageflow.model.PageflowPage
- * @generated
- */
- public Adapter createPFPageAdapter() {
- return null;
- }
-
- /**
- * <!-- 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.
- * @generated
- */
- public Adapter createPFBeginAdapter() {
- return null;
- }
-
- /**
- * <!-- 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.
- * @generated
- */
- public Adapter createPFEndAdapter() {
- return null;
- }
-
- /**
- * Creates a new adapter for an object of class '{@link org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowLinkBendpoint <em>PF Link Bendpoint</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.jst.jsf.facesconfig.ui.pageflow.model.PageflowLinkBendpoint
- * @generated
- */
- public Adapter createPFLinkBendpointAdapter() {
- 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;
- }
-
-}
-// PageflowAdapterFactory
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/util/PageflowAnnotationUtil.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/util/PageflowAnnotationUtil.java
deleted file mode 100644
index b6a2362..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/util/PageflowAnnotationUtil.java
+++ /dev/null
@@ -1,168 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow.util;
-
-import java.util.Iterator;
-
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.gef.GraphicalEditPart;
-import org.eclipse.jface.text.source.Annotation;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.editpart.IAnnotationEditPart;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.editpart.PFValidator;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.editpart.PageflowElementEditPart;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.editpart.PageflowLinkEditPart;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.editpart.PageflowNodeEditPart;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowLink;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowPage;
-
-/**
- * This class can be used to add annotation for the current pageflow model and
- * decoration for view.
- *
- * @author Xiao-guang Zhang
- *
- *
- */
-public class PageflowAnnotationUtil {
-
- /**
- *
- * validate the pageflow and its edit part
- *
- * @param containerPart -
- * it can be null, then the edit part will not be updated
- */
- public static void validatePageflow(final GraphicalEditPart containerPart) {
- if (containerPart == null) {
- return;
- }
-
- // removeAllAnnotations(containerPart);
-
- // validate the nodes including page and actions.
- final Iterator iterChild = containerPart.getChildren().iterator();
- while (iterChild.hasNext()) {
-
- final PageflowElementEditPart element = (PageflowElementEditPart) iterChild
- .next();
- // String errorMessage = null;
- if (element instanceof PFValidator) {
- ((PFValidator) element).validate();
- }
- // if (element.getModel() instanceof PageflowPage) {
- // errorMessage = PageflowValidation.getInstance().getNotifyMessage(
- // (PageflowPage) element.getModel());
- // }
-
- // if (errorMessage != null) {
- // addAnnotation(element, errorMessage);
- // } else {
- // removeAnnotation(element);
- // }
-
- // validate the connections.
- final Iterator iterLinks = element.getSourceConnections().iterator();
- while (iterLinks.hasNext()) {
- final PageflowLinkEditPart link = (PageflowLinkEditPart) iterLinks
- .next();
- link.validate();
- // validateLink(link);
- }
- }
-
- }
-
- /**
- * validate the page based on model and its's edit part.
- *
- * @param pagePart -
- * it can be null, then the edit part will not be updated
- */
- public static void validatePage(final PageflowNodeEditPart pagePart) {
- if (pagePart != null && pagePart.getParent() != null) {
- return;
- }
-
- String errorMessage = null;
-
- removeAnnotation(pagePart);
-
- errorMessage = PageflowValidation.getInstance().getNotifyMessage(
- (PageflowPage) pagePart.getModel());
-
- if (errorMessage != null) {
- addAnnotation(pagePart, errorMessage);
- } else {
- removeAnnotation(pagePart);
- }
-
- // validate the connections.
- // Iterator iterLinks = pagePart.getSourceConnections().iterator();
- // while (iterLinks.hasNext()) {
- // PageflowLinkEditPart link = (PageflowLinkEditPart) iterLinks.next();
- //
- // validateLink(link);
- // }
- }
-
- /**
- * validate the link based on model and its's edit part.
- *
- * @param linkPart -
- * it can be null, then the edit part will not be updated
- */
- public static void validateLink(final PageflowLinkEditPart linkPart) {
- if (linkPart != null && linkPart.getParent() != null) {
- String errorMessage = null;
-
- removeAnnotation(linkPart);
-
- errorMessage = PageflowValidation.getInstance().isValidLink(
- (PageflowLink) linkPart.getModel());
-
- if (errorMessage != null) {
- addAnnotation(linkPart, errorMessage);
- } else {
- removeAnnotation(linkPart);
- }
- }
- }
-
- /**
- * add a marker with IMarker.PROBLEM type, IMarker.SEVERITY_ERROR severity,
- * and message.
- *
- * @param editPart
- * @param model
- * @param message
- */
- private static void addAnnotation(final GraphicalEditPart editPart, final String message) {
- if (editPart != null && editPart instanceof IAnnotationEditPart) {
- final Annotation annotation = new Annotation(IMarker.PROBLEM, false,
- message);
- ((IAnnotationEditPart) editPart).addAnnotation(annotation);
- }
- }
-
- /**
- * remove a marker
- *
- * @param editPart
- * @param model
- */
- private static void removeAnnotation(final GraphicalEditPart editPart) {
- if (editPart != null && editPart instanceof IAnnotationEditPart) {
- ((IAnnotationEditPart) editPart).removeAnnotation();
- }
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/util/PageflowModelManager.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/util/PageflowModelManager.java
deleted file mode 100644
index 5e2689a..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/util/PageflowModelManager.java
+++ /dev/null
@@ -1,279 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow.util;
-
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
-import org.eclipse.emf.ecore.xmi.XMLResource;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowPage;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.Pageflow;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowFactory;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowNode;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowPackage;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.impl.PageflowPackageImpl;
-
-/**
- * Drives the model. Acts as the model entry point, including create, load, save
- * operations.
- *
- * @author Xiao-guang Zhang
- */
-public class PageflowModelManager {
- /**
- * In EMF, a resource provides the way to have access to the model content.
- */
- private Resource resourcePageflow = null;
-
- /**
- * the path of current pageflow model resource provides the way to have
- * access to the model content.
- */
- private IPath pathPageflow = null;
-
- /**
- * Contains the factory associated with the model.
- */
- private static PageflowFactory pageflowFactory = null;
-
- /**
- * Gives access to the top level pageflow contained in the resource.
- */
- private Pageflow pageflow = null;
-
- /**
- * resource set
- */
- private ResourceSet resourceSet = null;
-
- /** unicode encoding UTF-8 support */
- private static HashMap defaultSaveOptions = new HashMap();
-
- static {
- defaultSaveOptions.put(XMLResource.OPTION_ENCODING, "UTF-8"); //$NON-NLS-1$
- }
-
- /**
- * Uses lazy initialization.
- *
- * @param path -
- * pageflow file name
- * @return the resource containing the pageflow
- */
- public Resource getResource(IPath path) {
- if (resourcePageflow == null) {
- pathPageflow = path;
- ResourceSet resSet = getResourceSet();
- resourcePageflow = resSet.getResource(URI.createPlatformResourceURI(path
- .toString(), false), true);
- }
-
- return resourcePageflow;
- }
-
- /**
- *
- * @return the top level pageflow model
- */
- public Pageflow getModel() {
- if (null == pageflow) {
- EList l = resourcePageflow.getContents();
- Iterator i = l.iterator();
- while (i.hasNext()) {
- Object o = i.next();
- if (o instanceof Pageflow) {
- pageflow = (Pageflow) o;
- }
- }
- }
- return pageflow;
- }
-
- /**
- * Creates a resource to contain the network. The resource file does not
- * exist yet.
- *
- * @param path
- * @return
- */
- private Resource createResource(IPath path) {
- if (resourcePageflow == null) {
- pathPageflow = path;
- ResourceSet resSet = getResourceSet();
- resourcePageflow = resSet.createResource(URI.createPlatformResourceURI(path
- .toString(), false));
- }
- return resourcePageflow;
- }
-
- /**
- * Returns the resource set.
- *
- * @param
- * @return
- */
- private ResourceSet getResourceSet() {
- if (null == resourceSet) {
- // Initialize the pageflow package, this line can not be removed.
- PageflowPackageImpl.init();
- // Register the XML resource factory for the .pageflow extension
- Resource.Factory.Registry reg = Resource.Factory.Registry.INSTANCE;
- Map regMap = reg.getExtensionToFactoryMap();
- // m.put("pageflow", new XMIResourceFactoryImpl());
- regMap.put("pageflow", new PageflowResourceFactoryImpl()); //$NON-NLS-1$
-
- resourceSet = new ResourceSetImpl();
- }
-
- return resourceSet;
- }
-
- /**
- * Returns the factory associated with the model. Object creation are made
- * through that factory.
- *
- * @return - pageflow factory
- */
- static public PageflowFactory getFactory() {
- if (pageflowFactory == null) {
- // Access the factory (needed to create instances)
- Map registry = EPackage.Registry.INSTANCE;
- String pageflowURI = PageflowPackage.eNS_URI;
- PageflowPackage pageflowPackage = (PageflowPackage) registry
- .get(pageflowURI);
- pageflowFactory = pageflowPackage.getPageflowFactory();
- }
- return pageflowFactory;
- }
-
- /**
- * Creates a new pageflow model with begin and end nodes.
- *
- * @param path -
- * the new pageflow file name
- * @return - new pageflow model
- */
- public Pageflow createPageflow(IPath path) {
- createResource(path);
- // Create a new pageflow model
- Map registry = EPackage.Registry.INSTANCE;
- String pageflowURI = PageflowPackage.eNS_URI;
- PageflowPackage nPackage = (PageflowPackage) registry.get(pageflowURI);
- PageflowFactory nFactory = nPackage.getPageflowFactory();
- pageflow = nFactory.createPageflow();
-
- resourcePageflow.getContents().add(pageflow);
- return pageflow;
- }
-
- /**
- * Loads the content of the model from the file.
- *
- * @param path
- */
- public void load(IPath path) {
- getResource(path);
- }
-
- /**
- * reloads the content of the model from the file.
- *
- * @param path
- */
- public void reload(IPath path) {
- getResource(path).unload();
- load(path);
- }
-
- /**
- * Saves the content of the model to the file.
- *
- * @param path
- * @throws IOException
- */
- public void save(final IPath path) throws IOException {
- if (!pathPageflow.toString().equalsIgnoreCase(path.toString())) {
- pathPageflow = path;
- URI fileURI = URI.createPlatformResourceURI(path.toString(), false);
- resourcePageflow.setURI(fileURI);
- }
- resourcePageflow.save(defaultSaveOptions);
- }
-
- /**
- * get the file path of current pageflow resource
- *
- * @return - the file path
- */
- public IPath getPath() {
- return pathPageflow;
- }
-
- /**
- * @param webPath
- * @return found page node according the web path.
- */
- public PageflowPage foundPage(String webPath) {
- PageflowPage page = null;
-
- if (getModel() != null) {
- Iterator iterNodes = getModel().getNodes().iterator();
- while (iterNodes.hasNext()) {
- PageflowNode node = (PageflowNode) iterNodes.next();
- if (node instanceof PageflowPage) {
- if (((PageflowPage) node).getPath().equalsIgnoreCase(webPath)) {
- page = (PageflowPage) node;
- break;
- }
- }
- }
- }
-
- return page;
- }
-
- /**
- *
- * Build a path for the resource in the .metadata directory given the path
- * of the model resource. For example, given a model resource path of
- * \test\folder\filename.ext the resulting Pageflow path name will be
- * \test\.metadata\folder\filename.pageflow
- *
- * @param pathFacesConfig -
- * faces-config file path.
- *
- * @return the ipath
- */
- public static IPath makePageflowPath(IPath pathFacesConfig) {
- IPath pageflowPath;
- String[] segs = pathFacesConfig.removeFileExtension().segments();
- pageflowPath = new Path(segs[0]).makeAbsolute();
- pageflowPath = pageflowPath.append(".metadata"); //$NON-NLS-1$
- for (int i = 1; i < segs.length; i++) {
- pageflowPath = pageflowPath.append(segs[i]);
- }
- // pageflowPath.removeFileExtension();
- pageflowPath = pageflowPath.addFileExtension("pageflow"); //$NON-NLS-1$
- return pageflowPath;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/util/PageflowResourceFactory.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/util/PageflowResourceFactory.java
deleted file mode 100644
index 24f995c..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/util/PageflowResourceFactory.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow.util;
-
-import org.eclipse.core.resources.IResource;
-import org.eclipse.gef.requests.CreationFactory;
-import org.eclipse.jst.jsf.facesconfig.ui.EditorPlugin;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowPage;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowFactory;
-import org.eclipse.jst.jsf.facesconfig.ui.util.WebrootUtil;
-
-/**
- *
- * This is the Page Flow Resource Factory for resource drag and drop
- *
- * @author Xiao-guang Zhang
- */
-public class PageflowResourceFactory implements CreationFactory {
- /** resource */
- private IResource resource;
-
- /**
- * @param resource
- */
- public PageflowResourceFactory(IResource resource) {
- this.resource = resource;
- }
-
- /*
- * (non-javadoc)
- *
- * @see Factory#getNewObject()
- */
- public Object getNewObject() {
- if (null == resource) {
- return null;
- }
-
- String strWebPath = WebrootUtil.getWebPath(resource.getFullPath());
- if (strWebPath.length() > 0) {
- PageflowFactory factory = PageflowModelManager.getFactory();
- Object result = factory.createPFPage();
- PageflowPage page = (PageflowPage) result;
- page.setPath(strWebPath);
- page.setName(WebrootUtil.getPageNameFromWebPath(strWebPath));
- return page;
- }
-
- EditorPlugin
- .getAlerts()
- .error(
- "Pageflow.Error.DNDResourceTitle", //$NON-NLS-1$
- EditorPlugin
- .getResourceString("Pageflow.Error.InvalidResource") //$NON-NLS-1$
- + resource.getName());
-
- return null;
- }
-
- /*
- * (non-javadoc)
- *
- * @see Factory#getObjectType()
- */
- public Object getObjectType() {
- return resource;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/util/PageflowResourceFactoryImpl.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/util/PageflowResourceFactoryImpl.java
deleted file mode 100644
index 1181474..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/util/PageflowResourceFactoryImpl.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow.util;
-
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.xmi.impl.XMLResourceFactoryImpl;
-
-/**
- * The <b>Resource Factory</b> associated with the package.
- *
- * @author Xiao-guang Zhang
- */
-public class PageflowResourceFactoryImpl extends XMLResourceFactoryImpl {
- /**
- * Creates an instance of the resource factory.
- */
- public PageflowResourceFactoryImpl() {
- super();
- }
-
- /**
- * Creates an instance of the resource.
- */
- public Resource createResource(URI uri) {
- Resource result = new PageflowResourceImpl(uri);
- return result;
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/util/PageflowResourceImpl.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/util/PageflowResourceImpl.java
deleted file mode 100644
index 07e13ee..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/util/PageflowResourceImpl.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow.util;
-
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.xmi.impl.XMLResourceImpl;
-
-/**
- *
- * The <b>Resource </b> associated with the package.
- *
- * @author Xiao-guang Zhang
- */
-public class PageflowResourceImpl extends XMLResourceImpl {
- /**
- * Creates an instance of the resource. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @param uri
- * the URI of the new resource.
- * @generated
- */
- public PageflowResourceImpl(URI uri) {
- super(uri);
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/util/PageflowSwitch.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/util/PageflowSwitch.java
deleted file mode 100644
index 3487f12..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/util/PageflowSwitch.java
+++ /dev/null
@@ -1,262 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow.util;
-
-import java.util.List;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowLink;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowLinkBendpoint;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowPage;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.Pageflow;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowElement;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowNode;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowPackage;
-
-/**
- * <!-- begin-user-doc --> The <b>Switch</b> for the model's inheritance
- * hierarchy. It supports the call {@link #doSwitch(EObject)} 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.jst.jsf.facesconfig.ui.pageflow.model.PageflowPackage
- * @generated
- */
-public class PageflowSwitch {
- /**
- * The cached model package <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- protected static PageflowPackage modelPackage;
-
- /**
- * Creates an instance of the switch. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public PageflowSwitch() {
- if (modelPackage == null) {
- modelPackage = PageflowPackage.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 -->
- * @param theEObject
- *
- * @return the first non-null result returned by a <code>caseXXX</code>
- * call.
- * <!-- end-user-doc -->
- * @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 -->
- * @param theEClass
- * @param theEObject
- *
- * @return the first non-null result returned by a <code>caseXXX</code>
- * call.
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected Object doSwitch(EClass theEClass, EObject theEObject) {
- if (theEClass.eContainer() == modelPackage) {
- return doSwitch(theEClass.getClassifierID(), theEObject);
- }
- 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 -->
- * @param classifierID
- * @param theEObject
- *
- * @return the first non-null result returned by a <code>caseXXX</code>
- * call.
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected Object doSwitch(int classifierID, EObject theEObject) {
- switch (classifierID) {
- case PageflowPackage.PAGEFLOW: {
- Pageflow pageflow = (Pageflow) theEObject;
- Object result = casePageflow(pageflow);
- if (result == null)
- result = casePageflowElement(pageflow);
- if (result == null)
- result = defaultCase(theEObject);
- return result;
- }
- case PageflowPackage.PF_LINK: {
- PageflowLink pfLink = (PageflowLink) theEObject;
- Object result = casePFLink(pfLink);
- if (result == null)
- result = casePageflowElement(pfLink);
- if (result == null)
- result = defaultCase(theEObject);
- return result;
- }
-
- case PageflowPackage.PF_PAGE: {
- PageflowPage pfPage = (PageflowPage) theEObject;
- Object result = casePFPage(pfPage);
- if (result == null)
- result = casePageflowNode(pfPage);
- if (result == null)
- result = casePageflowElement(pfPage);
- if (result == null)
- result = defaultCase(theEObject);
- return result;
- }
-
- case PageflowPackage.PF_LINK_BENDPOINT: {
- PageflowLinkBendpoint pfLinkBendpoint = (PageflowLinkBendpoint) theEObject;
- Object result = casePFLinkBendpoint(pfLinkBendpoint);
- if (result == null)
- result = defaultCase(theEObject);
- return result;
- }
- default:
- return defaultCase(theEObject);
- }
- }
-
- /**
- * Returns the result of interpretting the object as an instance of '<em>Pageflow</em>'.
- * <!-- begin-user-doc --> This implementation returns null; returning a
- * non-null result will terminate the switch. <!-- end-user-doc -->
- *
- * @param object
- * the target of the switch.
- * @return the result of interpretting the object as an instance of '<em>Pageflow</em>'.
- * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
- * @generated
- */
- public Object casePageflow(Pageflow object) {
- return null;
- }
-
- /**
- * Returns the result of interpretting the object as an instance of '<em>Node</em>'.
- * <!-- begin-user-doc --> This implementation returns null; returning a
- * non-null result will terminate the switch. <!-- end-user-doc -->
- *
- * @param object
- * the target of the switch.
- * @return the result of interpretting the object as an instance of '<em>Node</em>'.
- * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
- * @generated
- */
- public Object casePageflowNode(PageflowNode object) {
- return null;
- }
-
- /**
- * Returns the result of interpretting the object as an instance of '<em>PF Link</em>'.
- * <!-- begin-user-doc --> This implementation returns null; returning a
- * non-null result will terminate the switch. <!-- end-user-doc -->
- *
- * @param object
- * the target of the switch.
- * @return the result of interpretting the object as an instance of '<em>PF Link</em>'.
- * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
- * @generated
- */
- public Object casePFLink(PageflowLink object) {
- return null;
- }
-
- /**
- * Returns the result of interpretting the object as an instance of '<em>Element</em>'.
- * <!-- begin-user-doc --> This implementation returns null; returning a
- * non-null result will terminate the switch. <!-- end-user-doc -->
- *
- * @param object
- * the target of the switch.
- * @return the result of interpretting the object as an instance of '<em>Element</em>'.
- * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
- * @generated
- */
- public Object casePageflowElement(PageflowElement object) {
- return null;
- }
-
- /**
- * Returns the result of interpretting the object as an instance of '<em>PF Page</em>'.
- * <!-- begin-user-doc --> This implementation returns null; returning a
- * non-null result will terminate the switch. <!-- end-user-doc -->
- *
- * @param object
- * the target of the switch.
- * @return the result of interpretting the object as an instance of '<em>PF Page</em>'.
- * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
- * @generated
- */
- public Object casePFPage(PageflowPage object) {
- return null;
- }
-
- /**
- * Returns the result of interpretting the object as an instance of '<em>PF Link Bendpoint</em>'.
- * <!-- begin-user-doc --> This implementation returns null; returning a
- * non-null result will terminate the switch. <!-- end-user-doc -->
- *
- * @param object
- * the target of the switch.
- * @return the result of interpretting the object as an instance of '<em>PF Link Bendpoint</em>'.
- * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
- * @generated
- */
- public Object casePFLinkBendpoint(PageflowLinkBendpoint object) {
- return null;
- }
-
- /**
- * Returns the result of interpretting the object as an instance of '<em>EObject</em>'.
- * <!-- begin-user-doc --> This implementation returns null; returning a
- * non-null result will terminate the switch, but this is the last case
- * anyway. <!-- end-user-doc -->
- *
- * @param object
- * the target of the switch.
- * @return the result of interpretting the object as an instance of '<em>EObject</em>'.
- * @see #doSwitch(org.eclipse.emf.ecore.EObject)
- * @generated
- */
- public Object defaultCase(EObject object) {
- return null;
- }
-
-}
-// PageflowSwitch
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/util/PageflowTransform.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/util/PageflowTransform.java
deleted file mode 100644
index 327af05..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/util/PageflowTransform.java
+++ /dev/null
@@ -1,164 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow.util;
-
-import org.eclipse.jst.jsf.facesconfig.emf.DescriptionType;
-import org.eclipse.jst.jsf.facesconfig.emf.DisplayNameType;
-import org.eclipse.jst.jsf.facesconfig.emf.IconType;
-import org.eclipse.jst.jsf.facesconfig.emf.NavigationCaseType;
-import org.eclipse.jst.jsf.facesconfig.emf.NavigationRuleType;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.Pageflow;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowPage;
-
-/**
- * The tranform between pageflow and navigation rules in faces-config file.
- *
- * @author Xiao-guang Zhang
- */
-public class PageflowTransform {
-
- /** The shared singleton instance. */
- private static PageflowTransform transform;
-
- private PageflowTransform() {
- // private contructor
- }
-
- /**
- * Returns the shared singleton instance.
- * @return the singleton transform instance
- */
- public static PageflowTransform getInstance() {
- if (transform == null) {
- transform = new PageflowTransform();
- }
- return transform;
- }
-
- /**
- * Update source PFPage with Faces-config model.
- *
- * @param sourcePage
- * @param navigationRuleFC
- * @author sfshi
- */
- public void updatePageflowSourcePage(PageflowPage sourcePage,
- NavigationRuleType navigationRuleFC) {
- // set the descriiption of link
- if (navigationRuleFC.getDescription() != null
- && navigationRuleFC.getDescription().size() > 0) {
- String description = ((DescriptionType) navigationRuleFC
- .getDescription().get(0)).getTextContent();
- sourcePage.setComment(description);
- }
- // set the display-name of link
- if (navigationRuleFC.getDisplayName() != null
- && navigationRuleFC.getDisplayName().size() > 0) {
- String displayName = ((DisplayNameType) navigationRuleFC
- .getDisplayName().get(0)).getTextContent();
- sourcePage.setName(displayName);
- }
-
- // Set the icon of link
- if (navigationRuleFC.getIcon() != null
- && navigationRuleFC.getIcon().size() > 0) {
- boolean largeUpdated = false;
- boolean smallUpdated = false;
- for (int i = 0; i < navigationRuleFC.getIcon().size(); i++) {
- IconType icon = (IconType) navigationRuleFC.getIcon().get(i);
- if (!largeUpdated && icon.getLargeIcon() != null) {
- sourcePage.setLargeicon(icon.getLargeIcon()
- .getTextContent());
- largeUpdated = true;
- }
-
- if (!smallUpdated && icon.getSmallIcon() != null) {
- sourcePage.setSmallicon(icon.getSmallIcon()
- .getTextContent());
- smallUpdated = true;
- }
- if (largeUpdated && smallUpdated) {
- return;
- }
- }
- }
- }
-
- /**
- * Update target PFPage with Faces-config model.
- *
- * @param targetPage
- * @param navigationCaseFC
- * @author sfshi
- */
- public void updatePageflowTargetPage(PageflowPage targetPage,
- NavigationCaseType navigationCaseFC) {
- // set the descriiption of link
- if (navigationCaseFC.getDescription() != null
- && navigationCaseFC.getDescription().size() > 0) {
- String description = ((DescriptionType) navigationCaseFC
- .getDescription().get(0)).getTextContent();
- targetPage.setComment(description);
- }
- // set the display-name of link
- if (navigationCaseFC.getDisplayName() != null
- && navigationCaseFC.getDisplayName().size() > 0) {
- String displayName = ((DisplayNameType) navigationCaseFC
- .getDisplayName().get(0)).getTextContent();
- targetPage.setName(displayName);
- }
-
- // Set the icon of link
- if (navigationCaseFC.getIcon() != null
- && navigationCaseFC.getIcon().size() > 0) {
- boolean largeUpdated = false;
- boolean smallUpdated = false;
- for (int i = 0; i < navigationCaseFC.getIcon().size(); i++) {
- IconType icon = (IconType) navigationCaseFC.getIcon().get(0);
- if (!largeUpdated && icon.getLargeIcon() != null) {
- targetPage.setLargeicon(icon.getLargeIcon()
- .getTextContent());
- largeUpdated = true;
- }
-
- if (!smallUpdated && icon.getSmallIcon() != null) {
- targetPage.setSmallicon(icon.getSmallIcon()
- .getTextContent());
- smallUpdated = true;
- }
- if (largeUpdated && smallUpdated) {
- return;
- }
- }
- }
- }
-
- /**
- * update the pageflow model 's information, including pageflow's name,
- * description and related config file
- *
- * @param newPageflow
- * @param oldPageflow
- */
- public static void updatePageflowModelInfo(Pageflow newPageflow,
- Pageflow oldPageflow) {
- if (newPageflow == null || oldPageflow == null) {
- return;
- }
- newPageflow.setName(oldPageflow.getName());
- newPageflow.setComment(oldPageflow.getComment());
- newPageflow.setConfigfile(oldPageflow.getConfigfile());
-
- }
-}
-// PageflowTransform
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/util/PageflowValidation.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/util/PageflowValidation.java
deleted file mode 100644
index 7f69a64..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/pageflow/util/PageflowValidation.java
+++ /dev/null
@@ -1,288 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.jsf.facesconfig.ui.pageflow.util;
-
-import java.util.Iterator;
-
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.PageflowMessages;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.Pageflow;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowLink;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowNode;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.model.PageflowPage;
-import org.eclipse.jst.jsf.facesconfig.ui.util.WebrootUtil;
-import org.eclipse.osgi.util.NLS;
-
-/**
- * Pageflow's validation functions
- *
- * @author Xiao-guang Zhang
- */
-public class PageflowValidation {
- /** PageflowValidation singleton instance */
- private static PageflowValidation instance;
-
- /** constructor */
- private PageflowValidation() {
- // no external instantiation
- }
-
- /**
- * get the singleton instance of pageflow validation
- *
- * @return the singleton instance of pageflow validation
- */
- public static PageflowValidation getInstance() {
- if (instance == null) {
- instance = new PageflowValidation();
- }
- return instance;
- }
-
- /**
- * check whether the source and target pageflow node are allowed to create a
- * new link NOT allowed source and target: 1. target node is Begin or source
- * node is End 2. both of source and target node are Action. 3. double
- * connection from the same source to target
- *
- * @param source -
- * source pageflow node
- * @param target -
- * target pageflow node
- * @return - is valid link or not.
- *
- */
- public boolean isValidLinkForCreation(PageflowNode source,
- PageflowNode target) {
- // Source and target must be pointing to some real pageflow node
- if (source == null || target == null) {
- return false;
- }
- return true;
- }
-
- /**
- * determine the pflink is valid or not for property souce. in our model,
- * there are five types of invalid pflinke for property source. 1. link
- * between page and action 2. the source of link is Begin or End node 3. the
- * target of link is Begin or End node.
- * @param link
- *
- * @return - valid link or not.
- *
- */
- public boolean isValidLinkForProperty(PageflowLink link) {
- return true;
- }
-
- /**
- * determine the pflink is valid or not for face-config rule in our model,
- * there are four types of invalid pflinke. 1. the source of link is Begin
- * or End node 2. the target of link is Begin or End node.
- * @param link
- *
- * @return - valid link or not.
- *
- */
- public boolean isValidLinkForNavigationRule(PageflowLink link) {
- return true;
- }
-
- /**
- * determine the pflink is valid or not for face-config rule in our model,
- * there are four types of invalid pflinke.
- * @param link
- *
- * @return - valid link or not.
- *
- */
- public String isValidLink(PageflowLink link) {
- String errorMessage = null;
- // action-page style
- // TODO: it should guarantee that outcome should be defined in the
- // managed bean's method.
-
- if (link.getSource() instanceof PageflowPage
- && link.getTarget() instanceof PageflowPage) {
- String outcome = link.getOutcome();
- if (outcome != null && outcome.length() >= 0) {
- // if (isValidServiceOutcome(outcome))
- // {
- // return errorMessage;
- // }
- String webPath = ((PageflowPage) link.getSource()).getPath();
- if (webPath != null) {
- String projectPath = WebrootUtil.getProjectPath(link,
- webPath);
-
- Path resourcePath = new Path(projectPath);
- IWorkspaceRoot workspaceRoot = ResourcesPlugin
- .getWorkspace().getRoot();
- final IResource resource = workspaceRoot
- .findMember(resourcePath);
-
- if (resource == null || !resource.exists()) {
- // Pageflow.Validation.NotExistedSourcePage = The source
- // page {0} is not existed.
- errorMessage = NLS
- .bind(
- PageflowMessages.Pageflow_Validation_UndefinedOutcome,
- outcome, webPath);
- }
- } else {
- // Pageflow.Validation.MissingSourcePage = The source page
- // should be specified.
- errorMessage = PageflowMessages.Pageflow_Validation_MissingSourcePage;
- }
- }
- }
- return errorMessage;
- }
-
- /**
- * Check whether the page is already existed in the pageflow.
- *
- * @param pageflow
- * @param page
- * @return true if page exists (?)
- */
- public boolean isExistedPage(Pageflow pageflow, PageflowPage page) {
- if (pageflow == null || page == null || page.getPath() == null) {
- return false;
- }
-
- return isExistedPage(pageflow, page.getPath());
- }
-
- /**
- * Check whether the page is already existed in the pageflow.
- *
- * @param pageflow
- * @param pagePath
- * @return true if pageflow's path is equal to pagePath
- */
- public boolean isExistedPage(Pageflow pageflow, String pagePath) {
- if (pageflow == null || pagePath == null) {
- return false;
- }
-
- Iterator iter = pageflow.getNodes().iterator();
-
- while (iter.hasNext()) {
- PageflowNode existedNode = (PageflowNode) iter.next();
-
- if (existedNode instanceof PageflowPage) {
- if (((PageflowPage) existedNode).getPath() != null
- && ((PageflowPage) existedNode).getPath()
- .equalsIgnoreCase(pagePath)) {
- return true;
- }
- }
- }
-
- return false;
- }
-
- /**
- * Check whether the page is valid or not validate page is : 1. if the page
- * is general jsp page, it should physically existed. 2. if the page is in
- * the form of /foldername/* (it contains the folder), the folder should be
- * existed.
- *
- * @param page
- * @return the notify message for page
- */
- public String getNotifyMessage(PageflowPage page) {
- String errorMessage = null;
- IWorkspaceRoot workspaceRoot = ResourcesPlugin.getWorkspace().getRoot();
- String pagePath = page.getPath();
-
- // Check the path is empty or not
- if (pagePath != null && pagePath.length() > 0) {
- String resourceName = WebrootUtil.getProjectPath(page, pagePath);
- Path resourcePath = new Path(resourceName);
-
- final IResource resource = workspaceRoot.findMember(resourcePath);
-
- if (resource != null && resource.exists()) {
- // This page is related with jsp file
- if (resourcePath.getFileExtension() != null) {
- if (!WebrootUtil.isValidWebFile(resourcePath)) {
- // Pageflow.Validation.InvalidWebPage = the file {0} is
- // not valid web file.
- errorMessage = NLS
- .bind(
- PageflowMessages.Pageflow_Validation_InvalidWebPage,
- pagePath);
- }
- }
- } else {
- // Pageflow.Validation.NotExitedWebPage = the web page {0} is
- // not existed.
- errorMessage = NLS.bind(
- PageflowMessages.Pageflow_Validation_NotExitedWebPage,
- pagePath);
- }
- } else {
- // Pageflow.Validation.MissingWebPage = the web page's path should
- // be specified.
- errorMessage = PageflowMessages.Pageflow_Validation_MissingWebPage;
- }
- return errorMessage;
- }
-
- /**
- * check that the action is valid EL or not,
- *
- * @param actionEL -
- * action string, it should be in the form of #{...}
- * @return - True or False
- */
- public static boolean isValidActionEL(String actionEL) {
- if (actionEL != null && actionEL.length() > 3) {
- // action is defined in JSF expression language, e.g,
- // #{beanname.methodname}
- if (actionEL.substring(0, 2).equalsIgnoreCase("#{")//$NON-NLS-1$
- && actionEL.substring(actionEL.length() - 1,
- actionEL.length()).equalsIgnoreCase("}"))//$NON-NLS-1$
- {
- // Check the bean is existed or not.
- return true;
- }
-
- }
- return false;
- }
-
- /**
- * get the managed bean from action's expression, e.g., beanName.methodName.
- * The return will be beanName.
- *
- * @param actionEL
- * @return the managed bean name
- */
- public static String getManagedBeanforAction(String actionEL) {
- String managedBeanName = null;
- if (isValidActionEL(actionEL)) {
- actionEL = actionEL.substring(2, actionEL.length() - 1);
- String[] actionParts = actionEL.split("[.]"); //$NON-NLS-1$
- managedBeanName = actionParts[0];
- }
-
- return managedBeanName;
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/preference/BaseFigureDecorator.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/preference/BaseFigureDecorator.java
deleted file mode 100644
index ffe8a64..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/preference/BaseFigureDecorator.java
+++ /dev/null
Binary files differ
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/preference/BaseNodeFigure.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/preference/BaseNodeFigure.java
deleted file mode 100644
index 096bef9..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/preference/BaseNodeFigure.java
+++ /dev/null
@@ -1,946 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui.preference;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.Enumeration;
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Vector;
-
-import org.eclipse.draw2d.ConnectionAnchor;
-import org.eclipse.draw2d.Figure;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Layer;
-import org.eclipse.draw2d.LayoutManager;
-import org.eclipse.draw2d.PolylineConnection;
-import org.eclipse.draw2d.PositionConstants;
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.Insets;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.swt.graphics.Image;
-
-/**
- * The <code>BaseNodeFigure</code> class is the base class for all the figures
- * representing DiagramNodes, ie those that can have ports with maxConnections
- * to other nodes.
- *
- * Assumes that all NodeFigures have some number of input and output ports
- *
- * @author ddean
- *
- */
-/*package*/ class BaseNodeFigure extends Figure implements IBaseFigure {
- private IBaseFigure baseFigure;
-
- private boolean anchorsVisible = true;
-
- private Hashtable connectionAnchors = new Hashtable(7);
-
- private Vector inputConnectionAnchors = new Vector(2, 2);
-
- private Vector outputConnectionAnchors = new Vector(2, 2);
-
- private Vector topConnectionAnchors = new Vector();
-
- private Vector bottomConnectionAnchors = new Vector();
-
- private Vector leftConnectionAnchors = new Vector();
-
- private Vector rightConnectionAnchors = new Vector();
-
- /**
- * @param figure
- */
- public BaseNodeFigure(IBaseFigure figure) {
- setBaseFigure(figure);
- ObserveVisibleXYLayout layout = new ObserveVisibleXYLayout();
- layout.setObserveVisibility(true);
- setLayoutManager(layout);
- }
-
- /**
- * @param figure
- */
- public void setBaseFigure(IBaseFigure figure) {
- setBaseFigure(figure, new Rectangle(0, 0, -1, -1));
- }
-
- public void setHighlight(boolean flag) {
- if (baseFigure != null) {
- moveToTop(this, baseFigure);
- baseFigure.setHighlight(flag);
- }
- }
-
- /**
- * @param figure
- * @param constraint
- */
- public void setBaseFigure(IBaseFigure figure, Rectangle constraint) {
- if (!getChildren().contains(figure)) {
- if (getChildren().contains(baseFigure))
- remove(baseFigure);
-
- baseFigure = figure;
- if (!getChildren().contains(baseFigure)) {
- // CR389070: Figures are abbreviating rule figures names and
- // making them unreadable
- if (getParent() != null
- && getParent().getLayoutManager() != null) {
- Rectangle r = getBounds().getCopy();
- r.width = -1;
- r.height = -1;
- getParent().getLayoutManager().setConstraint(this, r);
- }
- // CR389495: Working with nested complex activities causes in
- // the BP editor causes lockup
- // ensure that constraints are set on figure before add() - this
- // will cause a layout()
- this.add(baseFigure, constraint, 0);
- }
- }
- }
-
- /**
- * @return the base figure
- */
- public IBaseFigure getBaseFigure() {
- return baseFigure;
- }
-
- /***************************************************************************
- * Input/Output Ports
- **************************************************************************/
-
- /**
- * Add an input port and its anchor
- *
- * @param portName
- * unique name to refer to the port
- */
- public void addInput(String portName) {
- InputPortFigure inputPort = new InputPortFigure();
- add(inputPort);
- inputPort.setToolTipText(portName);
-
- PortConnectionAnchor anchor = new PortConnectionAnchor(inputPort);
- getTargetConnectionAnchors().add(anchor);
- connectionAnchors.put(portName, anchor);
- }
-
- /**
- * Add an output port and its anchor
- *
- * @param portName
- * unique name to refer to the port
- * @return the connection anchor
- */
- public PortConnectionAnchor addOutput(String portName) {
- OutputPortFigure outputPort = new OutputPortFigure();
- add(outputPort);
- outputPort.setToolTipText(portName);
-
- PortConnectionAnchor anchor = new PortConnectionAnchor(outputPort);
- getSourceConnectionAnchors().add(anchor);
- connectionAnchors.put(portName, anchor);
- return anchor;
- }
-
- /**
- * Searches for and returns the anchor on this figure that is closest to the
- * reference point <code>p</code>
- *
- * @param p
- * the reference point
- * @return the anchor on this figure that is closest to <code>p</code>
- */
- public ConnectionAnchor connectionAnchorAt(Point p) {
- ConnectionAnchor closest = null;
- long min = Long.MAX_VALUE;
-
- Enumeration e = getSourceConnectionAnchors().elements();
- while (e.hasMoreElements()) {
- ConnectionAnchor c = (ConnectionAnchor) e.nextElement();
- Point p2 = c.getLocation(null);
- long d = p.getDistance2(p2);
- if (d < min) {
- min = d;
- closest = c;
- }
- }
- e = getTargetConnectionAnchors().elements();
- while (e.hasMoreElements()) {
- ConnectionAnchor c = (ConnectionAnchor) e.nextElement();
- Point p2 = c.getLocation(null);
- long d = p.getDistance2(p2);
- if (d < min) {
- min = d;
- closest = c;
- }
- }
- return closest;
- }
-
- /**
- * returns an anchor given its name
- *
- * @param portName
- * name of the anchor
- * @return the anchor with the name <code>portName</code>
- */
- public ConnectionAnchor getConnectionAnchor(String portName) {
- return (ConnectionAnchor) connectionAnchors.get(portName);
- }
-
- /**
- * returns the name of the specified anchor
- *
- * @param c
- * the anchor whose name is requested
- * @return the name of the specifed anchor
- */
- public String getConnectionAnchorName(ConnectionAnchor c) {
- Enumeration enumer = connectionAnchors.keys();
- String key;
- while (enumer.hasMoreElements()) {
- key = (String) enumer.nextElement();
- if (connectionAnchors.get(key).equals(c))
- return key;
- }
- return null;
- }
-
- /**
- * returns the source connection anchor that is closest to the reference
- * point
- *
- * @param p
- * the reference point
- * @return the closest connection anchor to <code>p</code>
- */
- public ConnectionAnchor getSourceConnectionAnchorAt(Point p) {
- ConnectionAnchor closest = null;
- long min = Long.MAX_VALUE;
-
- Enumeration e = getSourceConnectionAnchors().elements();
- while (e.hasMoreElements()) {
- ConnectionAnchor c = (ConnectionAnchor) e.nextElement();
- Point p2 = c.getLocation(null);
- long d = p.getDistance2(p2);
- if (d < min) {
- min = d;
- closest = c;
- }
- }
- return closest;
- }
-
- /**
- * returns all the source connection anchors on this node figure
- *
- * @return a vector of all the source connection anchors for this figure
- */
- public Vector getSourceConnectionAnchors() {
- return outputConnectionAnchors;
- }
-
- /**
- * returns the target connection anchor that is closest to the reference
- * point
- *
- * @param p
- * the reference point
- * @return the closest target connection anchor to <code>p</code>
- */
- public ConnectionAnchor getTargetConnectionAnchorAt(Point p) {
- ConnectionAnchor closest = null;
- long min = Long.MAX_VALUE;
-
- Enumeration e = getTargetConnectionAnchors().elements();
- while (e.hasMoreElements()) {
- ConnectionAnchor c = (ConnectionAnchor) e.nextElement();
- Point p2 = c.getLocation(null);
- long d = p.getDistance2(p2);
- if (d < min) {
- min = d;
- closest = c;
- }
- }
- return closest;
- }
-
- /**
- * returns all the target connection anchors on this node figure
- *
- * @return a vector of all the target connection anchors for this figure
- */
- public Vector getTargetConnectionAnchors() {
- return inputConnectionAnchors;
- }
-
- /**
- * Returns the name of the specified anchor
- *
- * @param anchor
- * the connectio anchor whose name is requested
- * @return the anchor's name
- */
- public String getNameForAnchor(ConnectionAnchor anchor) {
- if (anchor != null) {
- Iterator it = connectionAnchors.keySet().iterator();
- String name;
-
- while (it.hasNext()) {
- name = (String) it.next();
-
- if (anchor.equals(connectionAnchors.get(name))) {
- return name;
- }
- }
- }
- return null;
- }
-
- /**
- * @param visible
- */
- public void setAnchorsVisible(boolean visible) {
- if (anchorsVisible != visible) {
- anchorsVisible = visible;
- //ConnectionAnchor port;
- List all = new ArrayList();
- all.addAll(getTargetConnectionAnchors());
- all.addAll(getSourceConnectionAnchors());
- Iterator it = all.iterator();
- while (it.hasNext()) {
- IFigure fig = ((ConnectionAnchor) it.next()).getOwner();
- fig.setVisible(visible);
- }
- validate();
- }
- }
-
- /**
- * Determine which side of the figure to place each anchor based on the
- * relative position (north, south, east or west) of the connection line's
- * opposite anchor. If the anchor is not connected to anything else, the
- * default is to place target (input) anchors on the left and source
- * (output) anchors on the right.
- */
- private void determineAnchorPositions() {
- Iterator it;
- topConnectionAnchors.clear();
- bottomConnectionAnchors.clear();
- leftConnectionAnchors.clear();
- rightConnectionAnchors.clear();
-
- if (anchorsVisible) {
- //final Dimension size = baseFigure.getPreferredSize();
- PortConnectionAnchor port;
-
- // start with outputs
- it = getSourceConnectionAnchors().iterator();
- while (it.hasNext()) {
- port = (PortConnectionAnchor) it.next();
- // CR386077: SplitActivity True and False outputs switch
- // positions based on their targets
- int direction = port.getOrientation();
- if (direction == PositionConstants.NONE) {
- Point loc = port.getOwner().getParent().getBounds()
- .getLocation();
- // loc.x += size.width/2;
- // loc.y += size.height/2;
- Iterator itc = port.getConnections().iterator();
- if (itc.hasNext()) {
- while (itc.hasNext()) {
- PolylineConnection conn = (PolylineConnection) itc
- .next();
- ConnectionAnchor otherPort;
- if (port == conn.getSourceAnchor())
- otherPort = conn.getTargetAnchor();
- else
- otherPort = conn.getSourceAnchor();
- if (otherPort.getOwner() == null)
- continue;
- Point otherLoc = otherPort.getOwner().getParent()
- .getBounds().getLocation();
- // Dimension otherSize =
- // ((BaseNodeFigure)otherPort.getOwner().getParent()).getBaseFigure().getPreferredSize();
- // otherLoc.x += otherSize.width/2;
- // otherLoc.y += otherSize.height/2;
- direction = loc.getPosition(otherLoc);
- if (direction == PositionConstants.NORTH)
- topConnectionAnchors.add(port);
- else if (direction == PositionConstants.SOUTH)
- bottomConnectionAnchors.add(port);
- else if (direction == PositionConstants.WEST)
- leftConnectionAnchors.add(port);
- else
- rightConnectionAnchors.add(port);
- ((PortFigure) port.getOwner())
- .setOrientation(direction);
- break; // currently, only the first connection is
- // considered
- }
- } else {
- rightConnectionAnchors.add(port);
- ((PortFigure) port.getOwner())
- .setOrientation(PositionConstants.EAST);
- }
- } else {
- // CR386077: SplitActivity True and False outputs switch
- // positions based on their targets
- if (direction == PositionConstants.NORTH)
- topConnectionAnchors.add(port);
- else if (direction == PositionConstants.SOUTH)
- bottomConnectionAnchors.add(port);
- else if (direction == PositionConstants.WEST)
- leftConnectionAnchors.add(port);
- else
- rightConnectionAnchors.add(port);
- }
- }
- it = getTargetConnectionAnchors().iterator();
- while (it.hasNext()) {
- port = (PortConnectionAnchor) it.next();
- // CR386077: SplitActivity True and False outputs switch
- // positions based on their targets
- int direction = port.getOrientation();
- if (direction == PositionConstants.NONE) {
- Point loc = port.getOwner().getParent().getBounds()
- .getLocation();
- // loc.x += size.width/2;
- // loc.y += size.height/2;
- Iterator itc = port.getConnections().iterator();
- if (itc.hasNext()) {
- while (itc.hasNext()) {
- PolylineConnection conn = (PolylineConnection) itc
- .next();
- ConnectionAnchor otherPort;
- if (port == conn.getSourceAnchor())
- otherPort = conn.getTargetAnchor();
- else
- otherPort = conn.getSourceAnchor();
- if (otherPort.getOwner() == null)
- continue;
- Point otherLoc = otherPort.getOwner().getParent()
- .getBounds().getLocation();
- // Dimension otherSize =
- // ((BaseNodeFigure)otherPort.getOwner().getParent()).getBaseFigure().getPreferredSize();
- // otherLoc.x += otherSize.width/2;
- // otherLoc.y += otherSize.height/2;
- direction = loc.getPosition(otherLoc);
- if (direction == PositionConstants.NORTH)
- topConnectionAnchors.add(port);
- else if (direction == PositionConstants.SOUTH)
- bottomConnectionAnchors.add(port);
- else if (direction == PositionConstants.EAST)
- rightConnectionAnchors.add(port);
- else
- leftConnectionAnchors.add(port);
- ((PortFigure) port.getOwner())
- .setOrientation(direction);
- break; // currently, only the first connection is
- // considered
- }
- } else {
- leftConnectionAnchors.add(port);
- ((PortFigure) port.getOwner())
- .setOrientation(PositionConstants.WEST);
- }
- } else {
- // CR386077: SplitActivity True and False outputs switch
- // positions based on their targets
- if (direction == PositionConstants.NORTH)
- topConnectionAnchors.add(port);
- else if (direction == PositionConstants.SOUTH)
- bottomConnectionAnchors.add(port);
- else if (direction == PositionConstants.EAST)
- rightConnectionAnchors.add(port);
- else
- leftConnectionAnchors.add(port);
- }
- }
-
- Comparator comparePorts = new Comparator() {
- public int compare(Object arg0, Object arg1) {
- PortConnectionAnchor port0 = (PortConnectionAnchor) arg0;
- if (port0.getConnections().size() < 1)
- return 0;
- PortConnectionAnchor port1 = (PortConnectionAnchor) arg1;
- if (port1.getConnections().size() < 1)
- return 0;
- // CR386077: SplitActivity True and False outputs switch
- // positions based on their targets
- if (port0.getOrientation() != PositionConstants.NONE)
- return 0;
- if (port1.getOrientation() != PositionConstants.NONE)
- return 0;
-
- PolylineConnection conn0 = (PolylineConnection) port0
- .getConnections().get(0);
- ConnectionAnchor otherPort0;
- if (port0 == conn0.getSourceAnchor())
- otherPort0 = conn0.getTargetAnchor();
- else
- otherPort0 = conn0.getSourceAnchor();
- Point otherLoc0 = otherPort0.getOwner().getParent()
- .getBounds().getLocation();
- // Dimension otherSize0 =
- // ((BaseNodeFigure)otherPort0.getOwner().getParent()).getBaseFigure().getPreferredSize();
- // otherLoc0.x += otherSize0.width/2;
- // otherLoc0.y += otherSize0.height/2;
-
- PolylineConnection conn1 = (PolylineConnection) port1
- .getConnections().get(0);
- ConnectionAnchor otherPort1;
- if (port1 == conn1.getSourceAnchor())
- otherPort1 = conn1.getTargetAnchor();
- else
- otherPort1 = conn1.getSourceAnchor();
- Point otherLoc1 = otherPort1.getOwner().getParent()
- .getBounds().getLocation();
-// Dimension otherSize1 = ((BaseNodeFigure) otherPort1
-// .getOwner().getParent()).getBaseFigure()
-// .getPreferredSize();
- // otherLoc1.x += otherSize1.width/2;
- // otherLoc1.y += otherSize1.height/2;
-
- switch (((PortFigure) port0.getOwner()).getOrientation()) {
- case PositionConstants.NORTH:
- case PositionConstants.SOUTH:
- return otherLoc0.x - otherLoc1.x;
- case PositionConstants.EAST:
- case PositionConstants.WEST:
- return otherLoc0.y - otherLoc1.y;
- }
- return 0;
- }
- };
-
- // order the anchors on each side so connection lines don't cross
- Collections.sort(topConnectionAnchors, comparePorts);
- Collections.sort(leftConnectionAnchors, comparePorts);
- Collections.sort(bottomConnectionAnchors, comparePorts);
- Collections.sort(rightConnectionAnchors, comparePorts);
- }
- }
-
- private void placeAnchors() {
- determineAnchorPositions();
- if (anchorsVisible) {
- Iterator it;
- PortConnectionAnchor port;
- int y, x;
-
- Dimension sz = baseFigure.getPreferredSize();
- LayoutManager layout = getLayoutManager();
- // CR389070: Figures are abbreviating rule figures names and making
- // them unreadable
- Dimension d = getAnchorSize();
-
- // left ports
- x = 0;
- y = FigureConstants.PORT_SPACING / 2;
- // CR374981: Long activity labels do not get wrapped or truncated
- // keep a constant inset on all 4 sides of the icon
- // if ( topConnectionAnchors.size()>0 )
- y += d.height;
- y += (sz.height - (leftConnectionAnchors.size() * (d.height + FigureConstants.PORT_SPACING))) / 2;
- it = leftConnectionAnchors.iterator();
- while (it.hasNext()) {
- port = (PortConnectionAnchor) it.next();
-
- Rectangle r = new Rectangle(x, y, -1, -1);
- Rectangle oldrect = (Rectangle) layout.getConstraint(port
- .getOwner());
- if (!r.equals(oldrect))
- layout.setConstraint(port.getOwner(), new Rectangle(x, y,
- -1, -1));
-
- y += d.height + FigureConstants.PORT_SPACING;
- }
-
- // right ports
- x = sz.width;
- // CR374981: Long activity labels do not get wrapped or truncated
- // if ( leftConnectionAnchors.size()>0 )
- x += d.width;
- y = FigureConstants.PORT_SPACING / 2;
- // CR374981: Long activity labels do not get wrapped or truncated
- // if ( topConnectionAnchors.size()>0 )
- y += d.height;
- y += (sz.height - (rightConnectionAnchors.size() * (d.height + FigureConstants.PORT_SPACING))) / 2;
- it = rightConnectionAnchors.iterator();
- while (it.hasNext()) {
- port = (PortConnectionAnchor) it.next();
-
- Rectangle r = new Rectangle(x, y, -1, -1);
- Rectangle oldrect = (Rectangle) layout.getConstraint(port
- .getOwner());
- if (!r.equals(oldrect))
- layout.setConstraint(port.getOwner(), new Rectangle(x, y,
- -1, -1));
-
- y += d.height + FigureConstants.PORT_SPACING;
- }
-
- // top ports
- y = 0;
- x = FigureConstants.PORT_SPACING / 2;
- // CR374981: Long activity labels do not get wrapped or truncated
- // if ( leftConnectionAnchors.size()>0 )
- x += d.width;
- x += (sz.width - (topConnectionAnchors.size() * (d.width + FigureConstants.PORT_SPACING))) / 2;
- it = topConnectionAnchors.iterator();
- while (it.hasNext()) {
- port = (PortConnectionAnchor) it.next();
-
- Rectangle r = new Rectangle(x, y, -1, -1);
- Rectangle oldrect = (Rectangle) layout.getConstraint(port
- .getOwner());
- if (!r.equals(oldrect))
- layout.setConstraint(port.getOwner(), new Rectangle(x, y,
- -1, -1));
-
- x += d.width + FigureConstants.PORT_SPACING;
- }
-
- // bottom ports
- y = sz.height;
- // CR374981: Long activity labels do not get wrapped or truncated
- // if ( topConnectionAnchors.size()>0 )
- y += d.height;
- x = FigureConstants.PORT_SPACING / 2;
- // CR374981: Long activity labels do not get wrapped or truncated
- // if ( leftConnectionAnchors.size()>0 )
- x += d.width;
- x += (sz.width - (bottomConnectionAnchors.size() * (d.width + FigureConstants.PORT_SPACING))) / 2;
- it = bottomConnectionAnchors.iterator();
- while (it.hasNext()) {
- port = (PortConnectionAnchor) it.next();
-
- Rectangle r = new Rectangle(x, y, -1, -1);
- Rectangle oldrect = (Rectangle) layout.getConstraint(port
- .getOwner());
- if (!r.equals(oldrect))
- layout.setConstraint(port.getOwner(), new Rectangle(x, y,
- -1, -1));
-
- x += d.width + FigureConstants.PORT_SPACING;
- }
- }
- }
-
- /**
- * CR389070: Figures are abbreviating rule figures names and making them
- * unreadable Anchor size is now dependent on icon size, not constant. Asks
- * the connection anchor for its size.
- */
- private Dimension getAnchorSize() {
- Dimension d = new Dimension(FigureConstants.PORT_SIDE,
- FigureConstants.PORT_SIDE);
- if (!connectionAnchors.isEmpty()) {
- Iterator iter = connectionAnchors.values().iterator();
- PortConnectionAnchor a = (PortConnectionAnchor) iter.next();
- d = a.getOwner().getPreferredSize();
- }
- return d;
- }
-
- /**
- * @return the anchor insets
- */
- protected final Insets getAnchorInsets() {
- Insets in = new Insets(0, 0, 0, 0);
- // CR389070: Figures are abbreviating rule figures names and making them
- // unreadable
- Dimension d = getAnchorSize();
- // CR374981: Long activity labels do not get wrapped or truncated
- // if ( leftConnectionAnchors.size()>0 )
- in.left = d.width;
- // CR374981: Long activity labels do not get wrapped or truncated
- // if ( rightConnectionAnchors.size()>0 )
- in.right = d.width;
- // CR374981: Long activity labels do not get wrapped or truncated
- // if ( topConnectionAnchors.size()>0 )
- in.top = d.height;
- // CR374981: Long activity labels do not get wrapped or truncated
- // if ( bottomConnectionAnchors.size()>0 )
- in.bottom = d.height;
- return in;
- }
-
- public void invalidate() {
- super.invalidate();
- }
-
- /**
- * validate method override to arrange the input and output ports around the
- * links of the node figures
- */
- public void validate() {
- placeAnchors();
- // CR389070: Figures are abbreviating rule figures names and making them
- // unreadable
- int x = 0;
- int y = 0;
- // if anchors are not visible (CompoundNodeFigure is maximized) always
- // set position at 0,0
- if (anchorsVisible) {
- Dimension d = getAnchorSize();
- // CR374981: Long activity labels do not get wrapped or truncated
- // if ( leftConnectionAnchors.size()>0 )
- x = d.width;
- // CR374981: Long activity labels do not get wrapped or truncated
- // if ( topConnectionAnchors.size()>0 )
- y = d.height;
- }
- getLayoutManager().setConstraint(baseFigure,
- new Rectangle(x, y, -1, -1));
- layout();
- super.validate();
- }
-
- /***************************************************************************
- * Miscellaneous
- **************************************************************************/
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.draw2d.Figure#useLocalCoordinates()
- */
- protected boolean useLocalCoordinates() {
- return true;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.draw2d.IFigure#setBounds(org.eclipse.draw2d.geometry.Rectangle)
- */
- public void setBounds(Rectangle rect) {
- Rectangle r = rect.getCopy();
- r.x = 0;
- r.y = 0;
- if (anchorsVisible) {
- // CR389070: Figures are abbreviating rule figures names and making
- // them unreadable
- Dimension d = getAnchorSize();
- // CR374981: Long activity labels do not get wrapped or truncated
- // if ( leftConnectionAnchors.size()>0 )
- {
- r.x += d.width;
- r.width -= d.width;
- }
- // CR374981: Long activity labels do not get wrapped or truncated
- // if ( rightConnectionAnchors.size()>0 )
- r.width -= d.width;
- // CR374981: Long activity labels do not get wrapped or truncated
- // if ( topConnectionAnchors.size()>0 )
- {
- r.y += d.height;
- r.height -= d.height;
- }
- // CR374981: Long activity labels do not get wrapped or truncated
- // if ( bottomConnectionAnchors.size()>0 )
- r.height -= d.height;
- }
- baseFigure.setBounds(r);
- r.setLocation(rect.getLocation());
- super.setBounds(r);
- }
-
- public Rectangle getBounds() {
- Dimension size = baseFigure.getBounds().getSize();
- if (anchorsVisible) {
- // CR389070: Figures are abbreviating rule figures names and making
- // them unreadable
- Dimension d = getAnchorSize();
- // CR374981: Long activity labels do not get wrapped or truncated
- // if ( leftConnectionAnchors.size()>0 )
- size.width += d.width;
- // CR374981: Long activity labels do not get wrapped or truncated
- // if ( rightConnectionAnchors.size()>0 )
- size.width += d.width;
- // CR374981: Long activity labels do not get wrapped or truncated
- // if ( topConnectionAnchors.size()>0 )
- size.height += d.height;
- // CR374981: Long activity labels do not get wrapped or truncated
- // if ( bottomConnectionAnchors.size()>0 )
- size.height += d.height;
- }
- Rectangle r = super.getBounds();
- r.setSize(size);
- return r;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.draw2d.IFigure#getPreferredSize(int, int)
- */
- public Dimension getPreferredSize(int wHint, int hHint) {
- Dimension size = baseFigure.getPreferredSize(wHint, hHint).getCopy();
- if (anchorsVisible) {
- // CR389070: Figures are abbreviating rule figures names and making
- // them unreadable
- Dimension d = getAnchorSize();
- // CR374981: Long activity labels do not get wrapped or truncated
- // if ( leftConnectionAnchors.size()>0 )
- size.width += d.width;
- // CR374981: Long activity labels do not get wrapped or truncated
- // if ( rightConnectionAnchors.size()>0 )
- size.width += d.width;
- // CR374981: Long activity labels do not get wrapped or truncated
- // if ( topConnectionAnchors.size()>0 )
- size.height += d.height;
- // CR374981: Long activity labels do not get wrapped or truncated
- // if ( bottomConnectionAnchors.size()>0 )
- size.height += d.height;
- }
- return size;
- }
-
- private static void moveToTop(IFigure parent, IFigure child) {
- parent.getChildren().remove(child);
- parent.getChildren().add(child);
- }
-
- /**
- * move to top layer
- */
- protected final void moveToTop() {
- IFigure parent = getParent();
- IFigure child = this;
- while (parent != null && !(parent instanceof Layer)) {
- child = parent;
- parent = parent.getParent();
- }
- if (parent instanceof Layer) {
- parent.getChildren().remove(child);
- parent.getChildren().add(child);
- }
- }
-
- /***************************************************************************
- * IBaseFigure methods delegate to the baseFigure
- **************************************************************************/
-
- /*
- * (non-Javadoc)
- *
- * @see com.sybase.stf.gem.diagram.editor.figures.IBaseFigure#setText(java.lang.String)
- */
- public void setText(String text) {
- baseFigure.setText(text);
- }
-
- public void setIcon(Image image) {
- baseFigure.setIcon(image);
- }
-
- /**
- * The description property of a DiagramNode is displayed as a tool tip.
- * This method is used to set it. Passing a null or zero-length string will
- * remove the tool tip
- *
- * @param text
- * the description to use for this node's tool tip
- *
- * @see IBaseFigure#setToolTipText(java.lang.String)
- */
- public void setToolTipText(String text) {
- baseFigure.setToolTipText(text);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see com.sybase.stf.gem.diagram.editor.figures.IBaseFigure#addDecorator(com.sybase.stf.gem.diagram.editor.figures.BaseFigureDecorator)
- */
- public void addDecorator(BaseFigureDecorator decorator) {
- baseFigure.addDecorator(decorator);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see com.sybase.stf.gem.diagram.editor.figures.IBaseFigure#removeDecorator()
- */
- public void removeDecorator() {
- baseFigure.removeDecorator();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see com.sybase.stf.gem.diagram.editor.figures.IBaseFigure#removeDecorator(int)
- */
- public void removeDecorator(int position) {
- baseFigure.removeDecorator(position);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see com.sybase.stf.gem.diagram.editor.figures.IBaseFigure#getDecorators()
- */
- public List getDecorators() {
- return baseFigure.getDecorators();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see com.sybase.stf.gem.diagram.editor.figures.IBaseFigure#getText()
- */
- public String getText() {
- return baseFigure.getText();
- }
-
- /*
- * CR374981: Long activity labels do not get wrapped or truncated This
- * method was added to the IBaseFigure interface to support direct edit of
- * figure labels on the canvas.
- */
- public Rectangle getTextBounds() {
- Rectangle r = baseFigure.getTextBounds().getCopy();
- r.x += getBounds().x;
- r.y += getBounds().y;
- return r;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see com.sybase.stf.gem.diagram.editor.figures.IBaseFigure#getIcon()
- */
- public Image getIcon() {
- return baseFigure.getIcon();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see com.sybase.stf.gem.diagram.editor.figures.IBaseFigure#getToolTipText()
- */
- public String getToolTipText() {
- return baseFigure.getToolTipText();
- }
-}
\ No newline at end of file
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/preference/ColorFontFieldEditor.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/preference/ColorFontFieldEditor.java
deleted file mode 100644
index f67bbaa..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/preference/ColorFontFieldEditor.java
+++ /dev/null
Binary files differ
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/preference/ComboFieldEditor.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/preference/ComboFieldEditor.java
deleted file mode 100644
index 53ce7b2..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/preference/ComboFieldEditor.java
+++ /dev/null
Binary files differ
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/preference/CompoundFigureListener.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/preference/CompoundFigureListener.java
deleted file mode 100644
index c264648..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/preference/CompoundFigureListener.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.jsf.facesconfig.ui.preference;
-
-/**
- * @author bbrodt
- *
- * Interface definition for listeners of CompoundFigure events. Events are
- * generated when a user presses a different tab (tabChanged event) or presses
- * one of the minimize/maximize/restore buttons (stateChanged event)
- */
-/*package*/ interface CompoundFigureListener extends WindowFigureListener {
- /**
- * @param oldState
- * @param newState
- */
- void stateChanged(int oldState, int newState);
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/preference/CompoundNodeFigure.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/preference/CompoundNodeFigure.java
deleted file mode 100644
index 8de3c5e..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/preference/CompoundNodeFigure.java
+++ /dev/null
@@ -1,480 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui.preference;
-
-import java.util.Iterator;
-
-import org.eclipse.draw2d.ActionEvent;
-import org.eclipse.draw2d.ActionListener;
-import org.eclipse.draw2d.FreeformFigure;
-import org.eclipse.draw2d.FreeformListener;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.Layer;
-import org.eclipse.draw2d.LayoutManager;
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.Insets;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.jst.jsf.facesconfig.ui.EditorPlugin;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.Font;
-import org.eclipse.swt.graphics.Image;
-
-/**
- * The figure for Compound nodes
- */
-/*package*/ class CompoundNodeFigure extends BaseNodeFigure implements
- FreeformFigure, IContainerFigure {
-
- private static final String RESTORE_HILITE_IMAGE_FILE = "restore_hilite.gif"; //$NON-NLS-1$
-
- private static final String RESTORE_IMAGE_FILE = "restore.gif"; //$NON-NLS-1$
-
- private static final String MAXIMIZE_HILITE_IMAGE_FILE = "maximize_hilite.gif"; //$NON-NLS-1$
-
- private static final String MAXIMIZE_IMAGE_FILE = "maximize.gif"; //$NON-NLS-1$
-
- private static final String MINIMIZE_HILITE_IMAGE_FILE = "minimize_hilite.gif"; //$NON-NLS-1$
-
- private static final String MINIMIZE_IMAGE_FILE = "minimize.gif"; //$NON-NLS-1$
-
- private final static int MINIMIZED = 1;
-
- final static int RESTORED = 2;
-
- private final static int MAXIMIZED = 3;
-
- private int state = RESTORED;
-
- private TitleBarButton minButton;
-
- private TitleBarButton maxButton;
-
- private IconFigure iconFigure;
-
- private WindowFigure windowFigure;
-
- private static String DEFAULT_NAME = "CompoundNode"; //$NON-NLS-1$
-
- private static String DEFAULT_ICON = "editor/CompoundNode.gif"; //$NON-NLS-1$
-
- private static Image minimizeImage = EditorPlugin.getDefault().getImage(
- MINIMIZE_IMAGE_FILE);
-
- private static Image minimizeHiliteImage = EditorPlugin.getDefault()
- .getImage(MINIMIZE_HILITE_IMAGE_FILE);
-
- private static Image maximizeImage = EditorPlugin.getDefault().getImage(
- MAXIMIZE_IMAGE_FILE);
-
- private static Image maximizeHiliteImage = EditorPlugin.getDefault()
- .getImage(MAXIMIZE_HILITE_IMAGE_FILE);
-
- private static Image restoreImage = EditorPlugin.getDefault().getImage(
- RESTORE_IMAGE_FILE);
-
- private static Image restoreHiliteImage = EditorPlugin.getDefault()
- .getImage(RESTORE_HILITE_IMAGE_FILE);
-
- /**
- * Default constructor
- */
- public CompoundNodeFigure() {
- // create all of the figures and adornments:
- // the icon figure
- super(new IconFigure(DEFAULT_NAME, EditorPlugin.getDefault().getImage(
- DEFAULT_ICON)));
- iconFigure = (IconFigure) getBaseFigure();
- // and the window figure
- windowFigure = new WindowFigure();
- windowFigure.setForegroundColor(IconFigure.defaultForegroundColor);
- windowFigure.setFont(IconFigure.defaultFont);
-
- // then the minimize/maximize buttons.
- // Note that the maxButton is also used for the "Restore" action
- // TODO:
- // The reason for putting these buttons in CompoundNodeFigure instead of
- // WindowFigure where they really belong, is that the TitleBarButton is
- // a
- // draw2d Button (which subclasses Figure) and these must be placed in
- // the
- // titlebar (i.e. a SchemeBorder) because that's where they belong. The
- // problem
- // with this is that the Figure.paint() method first draws all of its
- // children
- // figures, then the border which means that the buttons would be
- // obscured.
- // This should be fixed as time allows and the WindowFigureListener
- // interface
- // should then also be modified to include a buttonPressed()
- // notification
- // for which CompoundNodeFigure can be a listener.
- minButton = new TitleBarButton(minimizeImage, minimizeHiliteImage,
- null, null);
- maxButton = new TitleBarButton(maximizeImage, maximizeHiliteImage,
- restoreImage, restoreHiliteImage);
-
- add(minButton);
- add(maxButton);
-
- minButton.addActionListener(new ActionListener() {
- public void actionPerformed(ActionEvent event) {
- setState(CompoundNodeFigure.MINIMIZED);
- }
- });
- maxButton.addActionListener(new ActionListener() {
- public void actionPerformed(ActionEvent event) {
- setState(maxButton.getState() ? CompoundNodeFigure.MAXIMIZED
- : CompoundNodeFigure.RESTORED);
- }
- });
-
- // show as a normal window initially
- showIcon();
-
- // testing BaseFigureDecorators:
- // BaseFigureDecorator decorator;
- // decorator = new
- // BaseFigureDecorator(EditorPlugin.getDefault().getGEMImage("delete.gif"),
- // "top right",
- // PositionConstants.NORTH_EAST);
- // addDecorator(decorator);
- // decorator = new
- // BaseFigureDecorator(EditorPlugin.getDefault().getGEMImage("delete.gif"),
- // "top left",
- // PositionConstants.NORTH_WEST);
- // addDecorator(decorator);
- // decorator = new
- // BaseFigureDecorator(EditorPlugin.getDefault().getGEMImage("delete.gif"),
- // "bottom right",
- // PositionConstants.SOUTH_EAST);
- // addDecorator(decorator);
- // decorator = new
- // BaseFigureDecorator(EditorPlugin.getDefault().getGEMImage("delete.gif"),
- // "bottom left",
- // PositionConstants.SOUTH_WEST);
- // addDecorator(decorator);
- }
-
- public void setOpaque(boolean flag) {
- windowFigure.setOpaque(flag);
- }
-
- /*
- * Remove the window figure and its buttons and replace them with the icon
- * figure.
- */
- private void showIcon() {
- // CR400779: GEM minimizing a complex activity sometimes leaves junk on
- // the screen
- setVisible(false);
- minButton.setVisible(false);
- maxButton.setVisible(false);
- super.setBaseFigure(iconFigure);
-
- setAnchorsVisible(true);
- // CR400779: GEM minimizing a complex activity sometimes leaves junk on
- // the screen
- setVisible(true);
- }
-
- /*
- * Remove the icon figure and replace with the window figure. Make sure the
- * buttons are reset to their correct states.
- */
- private void showWindow() {
- // CR400779: GEM minimizing a complex activity sometimes leaves junk on
- // the screen
- setVisible(false);
- if (state == RESTORED) {
- super.setBaseFigure(windowFigure);
-
- minButton.setVisible(true);
- minButton.setState(false);
- minButton.setToolTip(new Label(PreferenceMessages.CompoundNodeFigure_MinimizeLabel));
-
- maxButton.setVisible(true);
- maxButton.setState(false);
- maxButton.setToolTip(new Label(PreferenceMessages.CompoundNodeFigure_MaximizeLabel));
-
- setAnchorsVisible(true);
- } else if (state == MAXIMIZED) {
- setAnchorsVisible(false);
-
- Rectangle constraint = new Rectangle(0, 0, -1, -1);
- IFigure parent = getParent();
- if (parent != null) {
- constraint = parent.getBounds().getCopy();
- constraint.width += constraint.x;
- constraint.height += constraint.y;
- constraint.x = 0;
- constraint.y = 0;
- }
-
- super.setBaseFigure(windowFigure, constraint);
- if (parent != null && parent.getLayoutManager() != null) {
- // System.out.println("CompoundNode.showWindow: maximize
- // "+constraint);
- parent.getLayoutManager().setConstraint(this, constraint);
- }
-
- // the maximize button is used for both Maximize and Restore actions
- minButton.setVisible(false);
-
- maxButton.setVisible(true);
- maxButton.setState(true);
- maxButton.setToolTip(new Label(PreferenceMessages.CompoundNodeFigure_RestoreLabel));
- }
- // CR400779: GEM minimizing a complex activity sometimes leaves junk on
- // the screen
- setVisible(true);
- }
-
- public void addDecorator(BaseFigureDecorator decorator) {
- iconFigure.addDecorator(decorator);
- }
-
- public void removeDecorator() {
- iconFigure.removeDecorator();
- }
-
- public void removeDecorator(int position) {
- iconFigure.removeDecorator(position);
- }
-
- /**
- * @param flag
- */
- public void setHilight(boolean flag) {
- windowFigure.setHighlight(flag);
- if (flag)
- moveToTop();
- }
-
- public void setText(String name) {
- iconFigure.setText(name);
- windowFigure.setText(name);
- }
-
- public void setIcon(Image image) {
- iconFigure.setIcon(image);
- }
-
- public void setToolTipText(String text) {
- iconFigure.setToolTipText(text);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.draw2d.Figure#layout()
- */
- public void validate() {
- LayoutManager layout = getLayoutManager();
- if (state == MINIMIZED) {
- // iconFigure.validate();
- } else if (state == RESTORED) {
- Rectangle r = windowFigure.getBounds().getCopy();
- Insets i = windowFigure.getInsets();
- Dimension dm = maxButton.getSize();
- Insets p = windowFigure.getTabbedTitleBarBorder().getPadding();
- layout.setConstraint(maxButton, new Rectangle(r.x + r.width
- - dm.width - p.right - i.right, r.y + p.top + i.top
- - dm.height - i.bottom, -1, -1));
- layout.setConstraint(minButton, new Rectangle(r.x + r.width - 2
- * dm.width - 2 * p.right - i.right, r.y + p.top + i.top
- - dm.height - i.bottom, -1, -1));
- } else if (state == MAXIMIZED) {
- // CR387660: restore icon on complex activity bounces around
- // we need to use the parent's bounds when maximized instead of
- // current window bounds
- if (getParent() == null)
- return;
- Rectangle r = getParent().getBounds().getCopy();
- Insets i = windowFigure.getInsets();
- Dimension dm = maxButton.getSize();
- Insets p = windowFigure.getTabbedTitleBarBorder().getPadding();
- layout.setConstraint(maxButton, new Rectangle(r.x + r.width
- - dm.width - p.right - i.right, r.y + p.top, -1, -1));
- }
- super.validate();
- }
- /**
- * @return the window figure
- */
- public WindowFigure getWindowFigure() {
- return windowFigure;
- }
-
- public void setFont(Font f) {
- iconFigure.setFont(f);
- windowFigure.setFont(f);
- }
-
- public void setForegroundColor(Color c) {
- iconFigure.setForegroundColor(c);
- windowFigure.setForegroundColor(c);
- }
-
- public void setBackgroundColor(Color c) {
- iconFigure.setBackgroundColor(c);
- windowFigure.setBackgroundColor(c);
- }
-
- /**
- * @return the state
- */
- public int getState() {
- return state;
- }
-
- /**
- * @param newState
- */
- public void setState(int newState) {
- int oldState = state;
- state = newState;
-
- if (state == CompoundNodeFigure.MINIMIZED) {
- if (getParent() != null && getParent().getLayoutManager() != null) {
- Rectangle constraint = (Rectangle) getParent()
- .getLayoutManager().getConstraint(this);
- constraint.width = -1;
- constraint.height = -1;
- }
- showIcon();
- } else if (state == CompoundNodeFigure.MAXIMIZED) {
- if (getParent() != null && getParent().getLayoutManager() != null) {
- Rectangle constraint = (Rectangle) getParent()
- .getLayoutManager().getConstraint(this);
- constraint.x = 0;
- constraint.y = 0;
- constraint.width = -1;
- constraint.height = -1;
- }
- showWindow();
- } else if (state == CompoundNodeFigure.RESTORED) {
- if (getParent() != null && getParent().getLayoutManager() != null) {
- Rectangle constraint = (Rectangle) getParent()
- .getLayoutManager().getConstraint(this);
- constraint.setSize(windowFigure.getBounds().getSize());
- }
- showWindow();
- }
- fireStateChanged(oldState, newState);
- }
-
- private void fireStateChanged(int oldState, int newState) {
- Object l[] = windowFigure.getTabbedTitleBarBorder().getListeners();
- for (int i = 0; i < l.length; ++i) {
- if (l[i] instanceof CompoundFigureListener)
- ((CompoundFigureListener) l[i])
- .stateChanged(oldState, newState);
- }
- }
-
- public Dimension getMinimumSize(int wHint, int hHint) {
- if (getState() == CompoundNodeFigure.RESTORED) {
- Dimension d = windowFigure.getMinimumSize(wHint, hHint);
- d.width += minButton.getSize().width
- + maxButton.getSize().width
- + 2
- * windowFigure.getTabbedTitleBarBorder().getPadding()
- .getWidth();
- return d;
- }
- if (getState() == CompoundNodeFigure.MINIMIZED)
- return iconFigure.getMinimumSize(wHint, hHint);
- return super.getMinimumSize(wHint, hHint);
- }
-
- // //////////////////////////////////////////////////////////////////////
- // FreeformFigure methods
- // //////////////////////////////////////////////////////////////////////
-
- private WindowFreeformHelper helper = new WindowFreeformHelper(this);
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.draw2d.FreeformFigure#addFreeformListener(org.eclipse.draw2d.FreeformListener)
- */
- public void addFreeformListener(FreeformListener listener) {
- addListener(FreeformListener.class, listener);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.draw2d.FreeformFigure#fireExtentChanged()
- */
- public void fireExtentChanged() {
- // CR389495: Working with nested complex activities causes in the BP
- // editor causes lockup
- // not specifically related to this CR, but caused a problem when
- // compound node
- // was moved beyond viewport's client area and de-selected - this would
- // resize
- // the viewport so that compound node no longer participated in bounds
- // calculation.
- if (state == MAXIMIZED) {
- Iterator iter = getListeners(FreeformListener.class);
- while (iter.hasNext())
- ((FreeformListener) iter.next()).notifyFreeformExtentChanged();
- }
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.draw2d.FreeformFigure#getFreeformExtent()
- */
- public Rectangle getFreeformExtent() {
- // CR389495: Working with nested complex activities causes in the BP
- // editor causes lockup
- // same as above
- if (state == MAXIMIZED)
- return helper.getFreeformExtent();
- return getBounds();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.draw2d.FreeformFigure#removeFreeformListener(org.eclipse.draw2d.FreeformListener)
- */
- public void removeFreeformListener(FreeformListener listener) {
- removeListener(FreeformListener.class, listener);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.draw2d.FreeformFigure#setFreeformBounds(org.eclipse.draw2d.geometry.Rectangle)
- */
- public void setFreeformBounds(Rectangle bounds) {
- if (getState() == MAXIMIZED)
- helper.setFreeformBounds(bounds);
- }
-
- /*
- * CR389070: Figures are abbreviating rule figures names and making them
- * unreadable New Method on IContainerFigure
- *
- * @see com.sybase.stf.gem.diagram.editor.figures.IContainerFigure#getLayer(java.lang.Object)
- */
- public Layer getLayer(Object key) {
- if (windowFigure != null && windowFigure.isVisible())
- return windowFigure.getLayer(key);
- return null;
- }
-}
\ No newline at end of file
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/preference/FigureConstants.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/preference/FigureConstants.java
deleted file mode 100644
index bb57abe..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/preference/FigureConstants.java
+++ /dev/null
Binary files differ
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/preference/GEMPreferences.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/preference/GEMPreferences.java
deleted file mode 100644
index 790f2c5..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/preference/GEMPreferences.java
+++ /dev/null
@@ -1,834 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui.preference;
-
-import org.eclipse.draw2d.ColorConstants;
-import org.eclipse.jface.preference.BooleanFieldEditor;
-import org.eclipse.jface.preference.ColorFieldEditor;
-import org.eclipse.jface.preference.FieldEditorPreferencePage;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.jface.preference.IntegerFieldEditor;
-import org.eclipse.jface.preference.PreferenceConverter;
-import org.eclipse.jface.resource.ColorRegistry;
-import org.eclipse.jface.resource.JFaceResources;
-import org.eclipse.jst.jsf.facesconfig.ui.EditorPlugin;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.accessibility.AccessibleAdapter;
-import org.eclipse.swt.accessibility.AccessibleEvent;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.Font;
-import org.eclipse.swt.graphics.RGB;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchPreferencePage;
-
-/**
- * This class represents a preference page that is contributed to the
- * Preferences dialog. By subclassing <samp>FieldEditorPreferencePage </samp>,
- * we can use the field support built into JFace that allows us to create a page
- * that is small and knows how to save, restore and apply itself.
- * <p>
- * This page is used to modify preferences only. They are stored in the
- * preference store that belongs to the main plug-in class. That way,
- * preferences can be accessed directly via the preference store.
- */
-
-public final class GEMPreferences extends FieldEditorPreferencePage implements
- IWorkbenchPreferencePage {
- // appearance
- /**
- * Key for preference for whether or not the intro editor should be shown
- */
- public final static String SHOW_INTRO_EDITOR = "ShowIntroEditor"; //$NON-NLS-1$
-
- /**
- * use system colors preference
- */
- public final static String USE_SYSTEM_COLORS = "UseSystemColors"; //$NON-NLS-1$
-
- /**
- * canvas color preference
- */
- public final static String CANVAS_COLOR = "CanvasColor"; //$NON-NLS-1$
-
- /**
- * figure label font
- */
- public final static String FIGURE_LABEL_FONT = "FigureLabelFont"; //$NON-NLS-1$
-
- /**
- *
- */
- public final static String FIGURE_LABEL_FONT_COLOR = "FigureLabelFontColor"; //$NON-NLS-1$
-
- /**
- *
- */
- public final static String LABEL_PLACEMENT = "LabelPlacement"; //$NON-NLS-1$
-
- /**
- *
- */
- public final static String INPUT_PORT_COLOR = "InputPortColor"; //$NON-NLS-1$
-
- /**
- *
- */
- public final static String OUTPUT_PORT_COLOR = "OutputPortColor"; //$NON-NLS-1$
-
- /**
- *
- */
- public final static String SHOW_LINE_LABELS = "ShowLineLabels"; //$NON-NLS-1$
-
- /**
- *
- */
- public final static String LINE_LABEL_FONT = "LineLabelFont"; //$NON-NLS-1$
-
- /**
- *
- */
- public final static String LINE_LABEL_FONT_COLOR = "LineLabelFontColor"; //$NON-NLS-1$
-
- /**
- *
- */
- public final static String LINE_LABEL_COLOR = "LineLabelColor"; //$NON-NLS-1$
-
- /**
- *
- */
- public final static String LINE_WIDTH = "LineWidth"; //$NON-NLS-1$
-
- /**
- *
- */
- public final static String LINE_COLOR = "LineColor"; //$NON-NLS-1$
-
- /**
- *
- */
- public final static String LINE_ROUTING = "LineRouting"; //$NON-NLS-1$
-
- /**
- *
- */
- public final static String SNAP_TO_GRID = "SnapToGrid"; //$NON-NLS-1$
-
- /**
- *
- */
- public final static String SNAP_TO_GEOMETRY = "SnapToGeometry"; //$NON-NLS-1$
-
- /**
- *
- */
- public final static String GRID_WIDTH = "GridWidth"; //$NON-NLS-1$
-
- /**
- *
- */
- public final static String GRID_HEIGHT = "GridHeight"; //$NON-NLS-1$
-
- /**
- *
- */
- public final static String GRID_COLOR = "GridColor"; //$NON-NLS-1$
-
- /**
- *
- */
- public final static String LABEL_PLACEMENT_TOP = "Top"; //$NON-NLS-1$
-
- /**
- *
- */
- public final static String LABEL_PLACEMENT_BOTTOM = "Bottom"; //$NON-NLS-1$
-
- /**
- *
- */
- public final static String LABEL_PLACEMENT_LEFT = "Left"; //$NON-NLS-1$
-
- /**
- *
- */
- public final static String LABEL_PLACEMENT_RIGHT = "Right"; //$NON-NLS-1$
-
- //
- /**
- * "Direct" routing was intended for connections lines without bendpoints;
- * this has been removed because it is unnecessary.
- * public final static String LINE_ROUTING_DIRECT = "Direct";
- * "Manhattan" line routing creates orthogonal lines
- */
- public final static String LINE_ROUTING_MANHATTAN = "Manhattan"; //$NON-NLS-1$
-
- /**
- * "Manual" routing allows user to create bendpoints
- */
- public final static String LINE_ROUTING_MANUAL = "Manaul"; //$NON-NLS-1$
-
- private final static String[][] m_lineRoutingLabels = {
- // display, key
- // { GEMPlugin.getResourceString("CanvasPreferences.LABEL.Direct"),
- // LINE_ROUTING_DIRECT }, //$NON-NLS-1$ //$NON-NLS-2$
- {
- PreferenceMessages.CanvasPreferences_LABEL_Manual, LINE_ROUTING_MANUAL },
- {
- PreferenceMessages.CanvasPreferences_LABEL_Manhattan, LINE_ROUTING_MANHATTAN }
- };
-
- private final static String[][] m_labelPlacementLabels = {
- {
- PreferenceMessages.CanvasPreferences_LABEL_Top, LABEL_PLACEMENT_TOP },
- {
- PreferenceMessages.CanvasPreferences_LABEL_Bottom, LABEL_PLACEMENT_BOTTOM },
- {
- PreferenceMessages.CanvasPreferences_LABEL_Left, LABEL_PLACEMENT_LEFT },
- {
- PreferenceMessages.CanvasPreferences_LABEL_Right, LABEL_PLACEMENT_RIGHT }
- };
-
- private Group canvasGroup;
-
- private Group iconGroup;
-
- private Group lineGroup;
-
- private BooleanField useSystemColors;
-
- private ColorFieldEditor canvasColor;
-
- private BooleanField snapToGrid;
-
- private IntegerFieldEditor gridWidth;
-
- private IntegerFieldEditor gridHeight;
-
- private ColorFieldEditor gridColor;
-
- private BooleanField showLineLabels;
-
- private ColorFieldEditor lineLabelColor;
-
- private ColorFieldEditor lineColor;
-
- private ColorFontFieldEditor iconFont;
-
- private ColorFontFieldEditor lineFont;
-
- // private ColorFieldEditor inputPortColor;
- //
- // private ColorFieldEditor outputPortColor;
-
- // CR392586: resource leaks
- // at least keep leaks bounded...
-// private static Hashtable resourceRegistry = new Hashtable();
-
- private class BooleanField extends BooleanFieldEditor {
- private Composite parent;
-
- /**
- * @param name
- * @param label
- * @param parent
- */
- public BooleanField(String name, String label, Composite parent) {
- super(name, label, parent);
- this.parent = parent;
- }
-
- /**
- * @return the change control button
- */
- public Button getButton() {
- return getChangeControl(parent);
- }
- }
-
- /**
- * Constructor
- */
- public GEMPreferences() {
- super(GRID);
- // FIXME: we should be encapsulating what pref store is used for all callers of this class
- setPreferenceStore(EditorPlugin.getDefault().getPreferenceStore());
- setDescription(PreferenceMessages.GEMPreferences_description);
- }
-
- /**
- * Sets the default values of the preferences.
- */
- public static void initializeDefaults() {
- IPreferenceStore store = EditorPlugin.getDefault().getPreferenceStore();
- Font f = JFaceResources.getFontRegistry().get(
- JFaceResources.DEFAULT_FONT);
-
- store.setDefault(SHOW_INTRO_EDITOR, true);
- store.setDefault(USE_SYSTEM_COLORS, true);
- PreferenceConverter.setDefault(store, CANVAS_COLOR, new RGB(255, 255,
- 255));
- PreferenceConverter.setDefault(store, FIGURE_LABEL_FONT, f
- .getFontData());
- store.setDefault(LINE_WIDTH, 1);
- store.setDefault(LINE_ROUTING, getLineRoutingLabels()[0][1]);
- store.setDefault(SHOW_LINE_LABELS, true);
- PreferenceConverter.setDefault(store, LINE_COLOR, new RGB(0, 0, 0));
- PreferenceConverter.setDefault(store, LINE_LABEL_COLOR, new RGB(255,
- 255, 255));
- PreferenceConverter.setDefault(store, LINE_LABEL_FONT, f.getFontData());
- store.setDefault(SNAP_TO_GEOMETRY, true);
- store.setDefault(SNAP_TO_GRID, true);
- store.setDefault(GRID_WIDTH, 12);
- store.setDefault(GRID_HEIGHT, 12);
- PreferenceConverter.setDefault(store, GRID_COLOR,
- new RGB(230, 230, 230));
- store.setDefault(LABEL_PLACEMENT, LABEL_PLACEMENT_BOTTOM);
- }
-
- /**
- * Creates the field editors. Field editors are abstractions of the common
- * GUI blocks needed to manipulate various types of preferences. Each field
- * editor knows how to save and restore itself.
- */
-
- public void createFieldEditors() {
-
- // note, we aren't saving the reference. It's assumed that parent
- // worries about destruction, persistence etc.
- addBooleanField(
- SHOW_INTRO_EDITOR,
- PreferenceMessages.EditorPreferences_LABEL_ShowIntroEditor,
- getFieldEditorParent());
-
- useSystemColors = addBooleanField(
- USE_SYSTEM_COLORS,
- PreferenceMessages.CanvasPreferenceTab_LABEL_UseSystemColors,
- getFieldEditorParent());
-
- canvasGroup = new Group(getFieldEditorParent(), SWT.NULL);
- lineGroup = new Group(getFieldEditorParent(), SWT.NULL);
- iconGroup = new Group(getFieldEditorParent(), SWT.NULL);
-
- canvasGroup.setText(PreferenceMessages.CanvasPreferenceTab_LABEL_Canvas);
- canvasColor = addColorField(
- CANVAS_COLOR,
- PreferenceMessages.CanvasPreferenceTab_LABEL_BackgroundColor, canvasGroup);
- // Fix for Bug 268443: [hotbug] FacesConfig Editor preferences page needs more info for screen readers
- // https://bugs.eclipse.org/bugs/show_bug.cgi?id=268443
- canvasColor.getColorSelector().getButton().getAccessible().addAccessibleListener(
- new AccessibleAdapter () {
- public void getName (final AccessibleEvent e) {
- e.result = PreferenceMessages.CanvasPreferenceTab_LABEL_BackgroundColor;
- }
- });
-
- addBooleanField(
- SNAP_TO_GEOMETRY,
- PreferenceMessages.CanvasPreferenceTab_LABEL_SnapToGeometry, canvasGroup);
- snapToGrid = addBooleanField(
- SNAP_TO_GRID,
- PreferenceMessages.CanvasPreferenceTab_LABEL_SnapToGrid, canvasGroup);
- gridColor = addColorField(
- GRID_COLOR,
- PreferenceMessages.CanvasPreferenceTab_LABEL_GridLineColor, canvasGroup);
- gridColor.getColorSelector().getButton().getAccessible().addAccessibleListener(
- new AccessibleAdapter () {
- public void getName (final AccessibleEvent e) {
- e.result = PreferenceMessages.CanvasPreferenceTab_LABEL_GridLineColor;
- }
- });
- gridWidth = addIntegerField(
- GRID_WIDTH,
- PreferenceMessages.CanvasPreferenceTab_LABEL_GridWidth, canvasGroup);
- gridHeight = addIntegerField(
- GRID_HEIGHT,
- PreferenceMessages.CanvasPreferenceTab_LABEL_GridHeight, canvasGroup);
-
- iconGroup.setText(PreferenceMessages.CanvasPreferenceTab_LABEL_IconGroup);
- iconFont = addFontField(
- FIGURE_LABEL_FONT,
- PreferenceMessages.CanvasPreferenceTab_LABEL_IconLabelFont, iconGroup);
- iconFont.getChangeControl(iconGroup).getAccessible().addAccessibleListener(
- new AccessibleAdapter () {
- public void getName (final AccessibleEvent e) {
- e.result = PreferenceMessages.CanvasPreferenceTab_LABEL_IconLabelFont;
- }
- });
- addComboField(LABEL_PLACEMENT, PreferenceMessages.CanvasPreferenceTab_LABEL_LabelPlacement,
- getLabelPlacementLabels(), iconGroup);
- // inputPortColor = addColorField(
- // INPUT_PORT_COLOR,
- // EditorPlugin
- // .getResourceString("CanvasPreferenceTab.LABEL.InputPortColor"),
- // iconGroup); //$NON-NLS-1$
- // outputPortColor = addColorField(
- // OUTPUT_PORT_COLOR,
- // EditorPlugin
- // .getResourceString("CanvasPreferenceTab.LABEL.OutputPortColor"),
- // iconGroup); //$NON-NLS-1$
-
- lineGroup.setText(PreferenceMessages.CanvasPreferenceTab_LABEL_LineGroup);
- showLineLabels = addBooleanField(SHOW_LINE_LABELS, PreferenceMessages.CanvasPreferenceTab_LABEL_ShowLineLabels,
- lineGroup);
- lineFont = addFontField(
- LINE_LABEL_FONT,
- PreferenceMessages.CanvasPreferenceTab_LABEL_LineLabelFont, lineGroup);
- lineFont.getChangeControl(lineGroup).getAccessible().addAccessibleListener(
- new AccessibleAdapter () {
- public void getName (final AccessibleEvent e) {
- e.result = PreferenceMessages.CanvasPreferenceTab_LABEL_LineLabelFont;
- }
- });
- lineLabelColor = addColorField(
- LINE_LABEL_COLOR,
- PreferenceMessages.CanvasPreferenceTab_LABEL_LineLabelColor, lineGroup);
- lineLabelColor.getColorSelector().getButton().getAccessible().addAccessibleListener(
- new AccessibleAdapter () {
- public void getName (final AccessibleEvent e) {
- e.result = PreferenceMessages.CanvasPreferenceTab_LABEL_LineLabelColor;
- }
- });
-
- lineColor = addColorField(
- LINE_COLOR,
- PreferenceMessages.CanvasPreferenceTab_LABEL_LineColor, lineGroup);
- lineColor.getColorSelector().getButton().getAccessible().addAccessibleListener(
- new AccessibleAdapter () {
- public void getName (final AccessibleEvent e) {
- e.result = PreferenceMessages.CanvasPreferenceTab_LABEL_LineColor;
- }
- });
- addIntegerField(
- LINE_WIDTH,
- PreferenceMessages.CanvasPreferenceTab_LABEL_LineWidth, lineGroup);
- addComboField(LINE_ROUTING, PreferenceMessages.CanvasPreferenceTab_LABEL_LineRouting,
- getLineRoutingLabels(), lineGroup);
- }
-
- protected void initialize() {
- // Color use: Default canvas colors should pick up system defaults
- // enable or disable all of the color and font selection controls in the
- // preference dialog
- // depending on whether the "Use System Colors" checkbox is selected.
- super.initialize();
-
- ((GridLayout) getFieldEditorParent().getLayout()).numColumns = 2;
-
- canvasGroup.setLayout(new GridLayout(3, false));
- canvasGroup.setLayoutData(new GridData(GridData.FILL_HORIZONTAL
- | GridData.VERTICAL_ALIGN_BEGINNING));
- canvasColor.fillIntoGrid(canvasGroup, 3);
- gridColor.fillIntoGrid(canvasGroup, 3);
-
- iconGroup.setLayout(new GridLayout(3, false));
- iconGroup.setLayoutData(new GridData(GridData.FILL_HORIZONTAL
- | GridData.VERTICAL_ALIGN_BEGINNING));
- iconFont.fillIntoGrid(iconGroup, 3);
-
- lineGroup.setLayout(new GridLayout(3, false));
- lineGroup.setLayoutData(new GridData(GridData.FILL_HORIZONTAL
- | GridData.VERTICAL_ALIGN_BEGINNING));
- lineColor.fillIntoGrid(lineGroup, 3);
- lineLabelColor.fillIntoGrid(lineGroup, 3);
- lineFont.fillIntoGrid(lineGroup, 3);
-
- boolean userColorsValue = !useSystemColors.getBooleanValue();
- boolean showLineLabelsValue = showLineLabels.getBooleanValue();
- boolean snapToGridValue = snapToGrid.getBooleanValue();
- canvasColor.setEnabled(userColorsValue, canvasGroup);
- gridColor.setEnabled(snapToGridValue && userColorsValue, canvasGroup);
- iconFont.setEnabled(userColorsValue, iconGroup);
- // inputPortColor.setEnabled(userColorsValue, iconGroup);
- // outputPortColor.setEnabled(userColorsValue, iconGroup);
- lineColor.setEnabled(userColorsValue, lineGroup);
- lineLabelColor.setEnabled(showLineLabelsValue && userColorsValue,
- lineGroup);
- lineFont.setEnabled(showLineLabelsValue && userColorsValue, lineGroup);
- gridWidth.setEnabled(snapToGridValue, canvasGroup);
- gridHeight.setEnabled(snapToGridValue, canvasGroup);
-
- useSystemColors.getButton().addSelectionListener(
- new SelectionAdapter() {
- public void widgetSelected(SelectionEvent e) {
- boolean userColorsValue_ = !useSystemColors
- .getBooleanValue();
- boolean showLineLabelsValue_ = showLineLabels
- .getBooleanValue();
- boolean snapToGridValue_ = snapToGrid.getBooleanValue();
-
- canvasColor.setEnabled(userColorsValue_, canvasGroup);
- gridColor
- .setEnabled(snapToGridValue_ && userColorsValue_,
- canvasGroup);
- iconFont.setEnabled(userColorsValue_, iconGroup);
- // inputPortColor.setEnabled(userColorsValue,
- // iconGroup);
- // outputPortColor.setEnabled(userColorsValue,
- // iconGroup);
- lineColor.setEnabled(userColorsValue_, lineGroup);
- lineLabelColor.setEnabled(showLineLabelsValue_
- && userColorsValue_, lineGroup);
- lineFont.setEnabled(showLineLabelsValue_
- && userColorsValue_, lineGroup);
- }
- });
-
- showLineLabels.getButton().addSelectionListener(new SelectionAdapter() {
- public void widgetSelected(SelectionEvent e) {
- boolean userColorsValue_ = !useSystemColors.getBooleanValue();
- boolean showLineLabelsValue_ = showLineLabels.getBooleanValue();
- lineLabelColor.setEnabled(showLineLabelsValue_
- && userColorsValue_, lineGroup);
- lineFont.setEnabled(showLineLabelsValue_ && userColorsValue_,
- lineGroup);
- }
- });
-
- snapToGrid.getButton().addSelectionListener(new SelectionAdapter() {
- public void widgetSelected(SelectionEvent e) {
- boolean userColorsValue_ = !useSystemColors.getBooleanValue();
- boolean snapToGridValue_ = snapToGrid.getBooleanValue();
-
- gridColor.setEnabled(snapToGridValue_ && userColorsValue_,
- canvasGroup);
- gridWidth.setEnabled(snapToGridValue_, canvasGroup);
- gridHeight.setEnabled(snapToGridValue_, canvasGroup);
- }
- });
-
- }
-
- public void init(IWorkbench workbench) {
- // no initialization
- }
-
- private ColorFieldEditor addColorField(String name, String labelText,
- Composite parent) {
- ColorFieldEditor f = new ColorFieldEditor(name, labelText, parent);
- addField(f);
- return f;
- }
-
- private ComboFieldEditor addComboField(String name, String labelText,
- String[][] entryNamesAndValues, Composite parent) {
- ComboFieldEditor f = new ComboFieldEditor(name, labelText,
- entryNamesAndValues, parent);
- addField(f);
- return f;
- }
-
- private IntegerFieldEditor addIntegerField(String name, String labelText,
- Composite parent) {
- IntegerFieldEditor f = new IntegerFieldEditor(name, labelText, parent);
- addField(f);
- return f;
- }
-
- private BooleanField addBooleanField(String name, String labelText,
- Composite parent) {
- BooleanField f = new BooleanField(name, labelText, parent);
- addField(f);
- return f;
- }
-
-// private StringFieldEditor addStringField(String name, String labelText,
-// Composite parent) {
-// StringFieldEditor f = new StringFieldEditor(name, labelText, parent);
-// addField(f);
-// return f;
-// }
-
- // protected NumberField addNumberField(String name, String labelText,
- // Composite parent)
- // {
- // NumberField f = new NumberField(name,labelText,parent);
- // addField(f);
- // return f;
- // }
-
- private ColorFontFieldEditor addFontField(String name, String labelText,
- Composite parent) {
- ColorFontFieldEditor f = new ColorFontFieldEditor(name, labelText,
- parent);
- addField(f);
- return f;
- }
-
- private static String[][] getLineRoutingLabels() {
- return m_lineRoutingLabels;
- }
-
- private static String[][] getLabelPlacementLabels() {
- return m_labelPlacementLabels;
- }
-
-// private static void propagateProperty(String property, EditPart part) {
-// Iterator iter = part.getChildren().iterator();
-// while (iter.hasNext()) {
-// EditPart child = (EditPart) iter.next();
-// Figure fig = (Figure) ((GraphicalEditPart) child).getFigure();
-// GEMPreferences.propagateProperty(property, fig);
-// propagateProperty(property, child);
-// }
-// }
-
- /**
- * @return true if the preference is set to show the introduction
- * editor. false otherwise.
- */
- public static boolean getShowIntroEditor()
- {
- IPreferenceStore store = EditorPlugin.getDefault().getPreferenceStore();
- return store.getBoolean(SHOW_INTRO_EDITOR);
- }
-
- /**
- * @param store
- * @param property
- * @return the color property for the key 'property'
- */
- public static Color getColor(IPreferenceStore store, String property) {
- boolean useSystemColors = store.getBoolean(USE_SYSTEM_COLORS);
-
- Color c = ColorConstants.black;
- if (useSystemColors) {
- if (GRID_COLOR.equals(property))
- // c = ColorConstants.buttonDarkest;
- c = ColorConstants.button;
- if (LINE_COLOR.equals(property))
- c = ColorConstants.listForeground;
- if (LINE_LABEL_FONT_COLOR.equals(property))
- c = ColorConstants.listForeground;
- if (LINE_LABEL_COLOR.equals(property))
- c = ColorConstants.listBackground;
- if (CANVAS_COLOR.equals(property))
- c = ColorConstants.listBackground;
- if (INPUT_PORT_COLOR.equals(property))
- c = ColorConstants.listForeground;
- if (OUTPUT_PORT_COLOR.equals(property))
- c = ColorConstants.listForeground;
- if (FIGURE_LABEL_FONT_COLOR.equals(property))
- c = ColorConstants.listForeground;
- } else {
- // CR392586: resource leaks
- RGB rgb = PreferenceConverter.getColor(store, property);
- ColorRegistry registry = JFaceResources.getColorRegistry();
- if (registry.get(rgb.toString()) != null)
- return registry.get(rgb.toString());
- registry.put(rgb.toString(), rgb);
- c = registry.get(rgb.toString());
- }
- return c;
- }
-
-// // CR392586: resource leaks
-// private static Font getFont(IPreferenceStore store, String property) {
-// FontData fd = PreferenceConverter.getFontData(store, property);
-// FontRegistry registry = JFaceResources.getFontRegistry();
-// if (!registry.get(fd.toString()).equals(registry.defaultFont()))
-// return registry.get(fd.toString());
-//
-// registry.put(fd.toString(), new FontData[] {fd});
-// return registry.get(fd.toString());
-// }
-
-// private static void propagateProperty(String property, Figure fig) {
-// IPreferenceStore store = EditorPlugin.getDefault().getPreferenceStore();
-// WindowFigure window = null;
-// IconFigure icon = null;
-// LinkFigure link = null;
-// if (fig instanceof CompoundNodeFigure) {
-// window = ((CompoundNodeFigure) fig).getWindowFigure();
-// icon = ((CompoundNodeFigure) fig).getIconFigure();
-// } else if (fig instanceof WindowFigure)
-// window = (WindowFigure) fig;
-// else if (fig instanceof LinkFigure)
-// link = (LinkFigure) fig;
-//
-// if (property != null && property.equals(USE_SYSTEM_COLORS))
-// // reload all properties - it's easiest
-// property = null;
-//
-// if (property == null || SNAP_TO_GRID.equals(property)) {
-// boolean b = store.getBoolean(SNAP_TO_GRID);
-// WindowFigure.defaultGridEnabled = b;
-//
-// if (window != null)
-// window.getGridLayer().setVisible(b);
-// }
-//
-// if (property == null || GRID_WIDTH.equals(property)
-// || GRID_HEIGHT.equals(property)) {
-// Dimension d = new Dimension(store.getInt(GRID_WIDTH), store
-// .getInt(GRID_HEIGHT));
-// WindowFigure.defaultGridSpacing = d;
-//
-// if (window != null)
-// window.getGridLayer().setSpacing(d);
-// }
-//
-// if (property == null || GRID_COLOR.equals(property)) {
-// Color c = getColor(store, GRID_COLOR);
-// WindowFigure.defaultGridColor = c;
-//
-// if (window != null)
-// window.getGridLayer().setForegroundColor(c);
-// }
-//
-// // TODO: since the line router is managed by the EditPart for the
-// // container figure, setting the line routing style in the WindowFigure
-// // does not change the line routing immediately. The editor must be
-// // restarted for line routing to take effect.
-// if (property == null || LINE_ROUTING.equals(property)) {
-// String s = store.getString(LINE_ROUTING);
-// int style;
-// if (LINE_ROUTING_MANHATTAN.equals(s))
-// style = WindowFigure.LINE_ROUTING_MANHATTAN;
-// else
-// style = WindowFigure.LINE_ROUTING_MANUAL;
-//
-// WindowFigure.defaultLineRoutingStyle = style;
-// if (window != null)
-// window.setLineRoutingStyle(style);
-// }
-//
-// if (property == null || LINE_WIDTH.equals(property)) {
-// int w = store.getInt(LINE_WIDTH);
-// LinkFigure.defaultLineWidth = w;
-//
-// if (link != null)
-// link.setLineWidth(w);
-// }
-//
-// if (property == null || LINE_COLOR.equals(property)) {
-// Color c = getColor(store, LINE_COLOR);
-// LinkFigure.defaultLineColor = c;
-//
-// if (link != null)
-// link.setForegroundColor(c);
-// }
-//
-// if (property == null || SHOW_LINE_LABELS.equals(property)) {
-// boolean b = store.getBoolean(SHOW_LINE_LABELS);
-// LinkFigure.defaultLabelVisible = b;
-//
-// if (link != null)
-// link.setLabelVisible(b);
-// }
-//
-// if (property == null || LINE_LABEL_FONT.equals(property)
-// || LINE_LABEL_FONT_COLOR.equals(property)) {
-// // CR392586: resource leaks
-// Font f = getFont(store, LINE_LABEL_FONT);
-// Color c = getColor(store, LINE_LABEL_FONT_COLOR);
-// LinkFigure.defaultFont = f;
-// LinkFigure.defaultLabelForeground = c;
-//
-// if (link != null) {
-// link.setFont(f);
-// link.setLabelForeground(c);
-// }
-// }
-//
-// if (property == null || LINE_LABEL_COLOR.equals(property)) {
-// Color c = getColor(store, LINE_LABEL_COLOR);
-// LinkFigure.defaultLabelBackground = c;
-//
-// if (link != null)
-// link.setLabelBackground(c);
-// }
-//
-// if (property == null || CANVAS_COLOR.equals(property)) {
-// Color c = getColor(store, CANVAS_COLOR);
-// WindowFigure.defaultBackgroundColor = c;
-//
-// if (window != null)
-// window.setBackgroundColor(c);
-// if (icon != null)
-// icon.setBackgroundColor(c);
-// }
-//
-// if (property == null || INPUT_PORT_COLOR.equals(property)) {
-// Color c = getColor(store, INPUT_PORT_COLOR);
-// InputPortFigure.defaultForegroundColor = c;
-//
-// if (fig instanceof InputPortFigure)
-// fig.setForegroundColor(c);
-// }
-//
-// if (property == null || OUTPUT_PORT_COLOR.equals(property)) {
-// Color c = getColor(store, OUTPUT_PORT_COLOR);
-// OutputPortFigure.defaultForegroundColor = c;
-//
-// if (fig instanceof OutputPortFigure)
-// fig.setForegroundColor(c);
-// }
-//
-// if (property == null || FIGURE_LABEL_FONT.equals(property)
-// || FIGURE_LABEL_FONT_COLOR.equals(property)) {
-// // CR392586: resource leaks
-// Font f = getFont(store, FIGURE_LABEL_FONT);
-// Color c = getColor(store, FIGURE_LABEL_FONT_COLOR);
-// IconFigure.defaultFont = f;
-// IconFigure.defaultForegroundColor = c;
-// WindowFigure.defaultFont = f;
-// WindowFigure.defaultForegroundColor = c;
-//
-// if (window != null) {
-// window.setFont(f);
-// window.setForegroundColor(c);
-// }
-// if (icon != null) {
-// icon.setFont(f);
-// icon.setForegroundColor(c);
-// }
-// if (fig instanceof IconFigure) {
-// fig.setFont(f);
-// fig.setForegroundColor(c);
-// }
-// }
-//
-// if (property == null || LABEL_PLACEMENT.equals(property)) {
-// int placement = PositionConstants.SOUTH;
-// String s = store.getString(LABEL_PLACEMENT);
-// if (LABEL_PLACEMENT_TOP.equals(s))
-// placement = PositionConstants.NORTH;
-// if (LABEL_PLACEMENT_BOTTOM.equals(s))
-// placement = PositionConstants.SOUTH;
-// if (LABEL_PLACEMENT_LEFT.equals(s))
-// placement = PositionConstants.WEST;
-// if (LABEL_PLACEMENT_RIGHT.equals(s))
-// placement = PositionConstants.EAST;
-// IconFigure.defaultTextPlacement = placement;
-//
-// if (icon != null)
-// icon.setTextPlacement(placement);
-// if (fig instanceof IconFigure)
-// ((IconFigure) fig).setTextPlacement(placement);
-// }
-//
-// Iterator iter = fig.getChildren().iterator();
-// while (iter.hasNext()) {
-// Figure child = (Figure) iter.next();
-// propagateProperty(property, child);
-// }
-// }
-}
\ No newline at end of file
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/preference/IBaseFigure.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/preference/IBaseFigure.java
deleted file mode 100644
index 4119636..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/preference/IBaseFigure.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.jsf.facesconfig.ui.preference;
-
-import java.util.List;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.swt.graphics.Image;
-
-/**
- * @author Bob
- */
-/*package*/ interface IBaseFigure extends IFigure
-{
- /**
- * @param text
- */
- public abstract void setText(String text);
-
- /**
- * @return the text
- */
- public abstract String getText();
-
- /**
- * CR374981: Long activity labels do not get wrapped or truncated This
- * method was added to the IBaseFigure interface to support direct edit of
- * figure labels on the canvas.
- * @return the text bounds rectangle
- */
- public abstract Rectangle getTextBounds();
-
- /**
- * @param image
- */
- public abstract void setIcon(Image image);
-
- /**
- * @return the icon
- */
- public abstract Image getIcon();
-
- /**
- * @param text
- */
- public abstract void setToolTipText(String text);
-
- /**
- * @return the tool tip text
- */
- public abstract String getToolTipText();
-
- /**
- * @param flag
- */
- public abstract void setHighlight(boolean flag);
-
- /**
- * Add decorator. May
- * cause the figure to become invalidated
- * @param decorator
- */
- public abstract void addDecorator(BaseFigureDecorator decorator);
-
- /**
- * Remove the decorator
- */
- public abstract void removeDecorator();
-
- /**
- * @param position
- */
- public abstract void removeDecorator(int position);
-
- /**
- * @return the list of decoractors
- */
- public abstract List getDecorators();
-}
\ No newline at end of file
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/preference/IContainerFigure.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/preference/IContainerFigure.java
deleted file mode 100644
index 4de2acb..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/preference/IContainerFigure.java
+++ /dev/null
Binary files differ
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/preference/IconFigure.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/preference/IconFigure.java
deleted file mode 100644
index 1336edc..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/preference/IconFigure.java
+++ /dev/null
@@ -1,415 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.jsf.facesconfig.ui.preference;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.draw2d.AncestorListener;
-import org.eclipse.draw2d.ColorConstants;
-import org.eclipse.draw2d.Graphics;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.Layer;
-import org.eclipse.draw2d.MarginBorder;
-import org.eclipse.draw2d.PositionConstants;
-import org.eclipse.draw2d.XYLayout;
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.jface.resource.JFaceResources;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.Font;
-import org.eclipse.swt.graphics.Image;
-
-/**
- * And IconFigure consists of a bitmap image with a text label below it.
- *
- * @author bbrodt
- */
-/*package*/ class IconFigure extends Label implements IBaseFigure {
- private static int defaultTextPlacement = PositionConstants.SOUTH;
-
- static Font defaultFont = JFaceResources.getFontRegistry().get(
- JFaceResources.DEFAULT_FONT);
-
- static Color defaultForegroundColor = ColorConstants.black;
-
- private ArrayList decorators;
-
- private IconLabel iconLabel = null;
-
- // CR389070: Figures are abbreviating rule figures names and making them
- // unreadable
- // New class that implements a separate "floating" label which is NOT
- // included in bounds calculations for this IconFigure
- private class IconLabel extends Label {
- private LabelLocator locator;
-
- private IconFigure host;
-
- /**
- * @param host
- * @param text
- */
- public IconLabel(IconFigure host, String text) {
- super(text);
- this.host = host;
- locator = new LabelLocator(this);
- }
-
- /**
- * @return the icon figure
- */
- public IconFigure getHost() {
- return host;
- }
-
- public Dimension getPreferredSize(int wHint, int hHing) {
- return host.getTextBounds().getSize();
- }
-
- public void setText(String text) {
- super.setText(text);
- if (locator != null)
- locator.setConstraints();
- }
-
- public void invalidate() {
- if (locator != null)
- locator.setConstraints();
- super.invalidate();
- }
- }
-
- // CR389070: Figures are abbreviating rule figures names and making them
- // unreadable
- // helper class that relocates the IconLabel whenever ancestor is moved or
- // added/removed
- private class LabelLocator implements AncestorListener {
- IconLabel label;
-
- /**
- * @param label
- */
- public LabelLocator(IconLabel label) {
- this.label = label;
- label.getHost().addAncestorListener(this);
- }
-
- // CR408950: BP Save problems
- // fixed icon label refresh problems
- private Layer getParentLayer() {
- IFigure fig = label.getHost();
- while (fig != null) {
- if (fig instanceof Layer)
- return (Layer) fig;
- fig = fig.getParent();
- }
- return null;
- }
-
- public void ancestorAdded(IFigure ancestor) {
- Layer layer = getParentLayer();
- if (layer != null && !layer.getChildren().contains(label)) {
- layer.add(label);
- setConstraints();
- }
- }
-
- public void ancestorMoved(IFigure ancestor) {
- setConstraints();
- }
-
- public void ancestorRemoved(IFigure ancestor) {
- // CR400779: GEM minimizing a complex activity sometimes leaves junk
- // on the screen
- if (label.getParent() != null
- && label.getParent().getChildren().contains(label))
- label.getParent().remove(label);
- }
-
- /**
- *
- */
- public void setConstraints() {
- Layer layer = getParentLayer();
- if (layer != null && layer.getLayoutManager() != null
- && layer.getChildren().contains(label)) {
- Rectangle r = IconFigure.this.getParent().getBounds().getCopy();
- r.translate(IconFigure.this.getBounds().getLocation());
- r.translate(IconFigure.this.getTextLocation());
- r.width = -1;
- r.height = -1;
- Rectangle oldr = (Rectangle) layer.getLayoutManager()
- .getConstraint(label);
- if (oldr == null || oldr.x != r.x || oldr.y != r.y)
- layer.setConstraint(label, r);
- }
- }
- }
-
- /**
- * @param name
- * @param icon
- */
- public IconFigure(String name, Image icon) {
- super(name, icon);
- setTextPlacement(defaultTextPlacement);
- setOpaque(false);
- setIcon(icon);
- setIconTextGap(0);
- setForegroundColor(defaultForegroundColor);
- // CR396303: DND in RulePanel does not get correct location if viewer is
- // scrolled
- setBackgroundColor(ColorConstants.titleGradient);
- XYLayout layout = new XYLayout();
- setLayoutManager(layout);
-
- // CR389070: Figures are abbreviating rule figures names and making them
- // unreadable
- iconLabel = new IconLabel(this, name);
- iconLabel.setFont(getFont());
- }
-
- // CR389070: Figures are abbreviating rule figures names and making them
- // unreadable
- /**
- * @return the label
- */
- public Label getLabel() {
- return iconLabel;
- }
-
- public List getDecorators() {
- if (decorators == null)
- decorators = new ArrayList();
- return decorators;
- }
-
- public Font getFont() {
- if (defaultFont == null)
- {
- defaultFont = JFaceResources.getFontRegistry().get(
- JFaceResources.DEFAULT_FONT);
- }
-
- if (getLocalFont() == null)
- {
- // TODO: replaced a deprecated assignment to font
- // with this, but the behaviour is a little different
- setFont(defaultFont);
- }
-
- return getLocalFont();
- }
-
- public void setFont(Font f) {
- Font localFont = getLocalFont();
- if (localFont != f) {
- iconLabel.setFont(f);
- }
- super.setFont(f);
- }
-
- public void setVisible(boolean visible) {
- super.setVisible(visible);
- iconLabel.setVisible(visible);
- }
-
- public void setText(String text) {
- super.setText(text);
- // CR389070: Figures are abbreviating rule figures names and making them
- // unreadable
- if (iconLabel != null && iconLabel.isVisible()) {
- iconLabel.setText(text);
- iconLabel.setFont(getFont());
- // labelLocator.setConstraints();
- }
- }
-
- public void setToolTipText(String text) {
- Label toolTipLabel = null;
-
- if (text != null && text.length() > 0) {
- toolTipLabel = new Label(text);
- toolTipLabel.setBorder(new MarginBorder(3));
- }
-
- super.setToolTip(toolTipLabel);
- }
-
- public String getToolTipText() {
- if (getToolTip() != null)
- return ((Label) getToolTip()).getText();
- return null;
- }
-
- public void setHighlight(boolean flag) {
- if (flag)
- setOpaque(true);
- else
- setOpaque(false);
- }
-
- // CR389070: Figures are abbreviating rule figures names and making them
- // unreadable
- protected Dimension getSubStringTextSize() {
- return getTextSize();
- }
-
- /*
- * CR374981: Long activity labels do not get wrapped or truncated We must
- * override this so that the label gets truncated
- */
- public Dimension getPreferredSize(int wHint, int hHint) {
- if (prefSize == null) {
- super.getPreferredSize(-1, -1);
- prefSize.width = getIconBounds().getSize().width;
- Dimension minSize_ = getMinimumSize(wHint, hHint);
- if (prefSize.width < minSize_.width)
- prefSize.width = minSize_.width;
- if (prefSize.height < minSize_.height)
- prefSize.height = minSize_.height;
- }
- return prefSize;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.draw2d.IFigure#getMinimumSize(int, int)
- */
- public Dimension getMinimumSize(int w, int h) {
- return new Dimension(8, 8);
- }
-
- public void addDecorator(BaseFigureDecorator decorator) {
- removeDecorator(decorator.getPosition());
- getDecorators().add(decorator);
- add(decorator);
- invalidate();
- }
-
- public void removeDecorator() {
- removeDecorator(BaseFigureDecorator.DEFAULT_DECORATOR_POSITION);
- }
-
- public void removeDecorator(int position) {
- Iterator it = getDecorators().iterator();
- while (it.hasNext()) {
- BaseFigureDecorator d = (BaseFigureDecorator) it.next();
- if (d.getPosition() == position) {
- it.remove();
- remove(d);
- invalidate();
- break;
- }
- }
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.draw2d.Label#setTextPlacement(int)
- */
- public void setTextPlacement(int where) {
- super.setTextPlacement(where);
- layout();
- invalidate();
- }
-
- public void invalidate() {
- // CR405873: F111-Error decorator missing
- // this was moved to paintFigure()
- // placeDecorators();
- super.invalidate();
- }
-
- private void placeDecorators() {
- Point o = getLocation();
- Point p = getIconBounds().getLocation();
- Dimension size = this.getIconBounds().getSize();
- Iterator it = getDecorators().iterator();
- while (it.hasNext()) {
- int x = p.x - o.x, y = p.y - o.y;
- BaseFigureDecorator decorator = (BaseFigureDecorator) it.next();
- Dimension decoratorSize = decorator.getPreferredSize();
- switch (decorator.getPosition()) {
- case (PositionConstants.CENTER | PositionConstants.MIDDLE):
- // CR378889: Case of decoration that should be right in the
- // middle.
- // Had to add a fudge factor because it's not exactly where I
- // want it.
- int fudge = 4;
- y += size.height / 2 - decoratorSize.height / 2 + fudge;
- x += size.width / 2 - decoratorSize.width / 2;
- break;
- case PositionConstants.NORTH:
- x += size.width / 2 - decoratorSize.width / 2;
- break;
- case PositionConstants.NORTH_EAST:
- x += size.width - decoratorSize.width;
- break;
- case PositionConstants.EAST:
- x += size.width - decoratorSize.width;
- y += size.height / 2 - decoratorSize.height / 2;
- break;
- case PositionConstants.SOUTH_EAST:
- x += size.width - decoratorSize.width;
- y += size.height - decoratorSize.height;
- break;
- case PositionConstants.SOUTH:
- x += size.width / 2 - decoratorSize.width / 2;
- y += size.height - decoratorSize.height;
- break;
- case PositionConstants.SOUTH_WEST:
- y += size.height - decoratorSize.height;
- break;
- case PositionConstants.WEST:
- y += size.height / 2 - decoratorSize.height / 2;
- break;
- case PositionConstants.NORTH_WEST:
- break;
- }
- getLayoutManager().setConstraint(decorator,
- new Rectangle(x, y, -1, -1));
- }
- layout();
- }
-
- // CR389070: Figures are abbreviating rule figures names and making them
- // unreadable
- protected void paintFigure(Graphics graphics) {
- if (isOpaque())
- super.paintFigure(graphics);
- // CR405873: F111-Error decorator missing
- placeDecorators();
- Rectangle bounds_ = getBounds();
- graphics.translate(bounds_.x, bounds_.y);
- if (getIcon() != null)
- graphics.drawImage(getIcon(), getIconLocation());
- if (iconLabel == null || !iconLabel.isVisible()) {
- if (!isEnabled()) {
- graphics.translate(1, 1);
- graphics.setForegroundColor(ColorConstants.buttonLightest);
- graphics.drawText(getSubStringText(), getTextLocation());
- graphics.translate(-1, -1);
- graphics.setForegroundColor(ColorConstants.buttonDarker);
- }
- graphics.drawText(getSubStringText(), getTextLocation());
- }
- graphics.translate(-bounds_.x, -bounds_.y);
- }
-}
\ No newline at end of file
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/preference/InputPortFigure.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/preference/InputPortFigure.java
deleted file mode 100644
index 66ca25b..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/preference/InputPortFigure.java
+++ /dev/null
Binary files differ
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/preference/LinkFigure.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/preference/LinkFigure.java
deleted file mode 100644
index 11e0a80..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/preference/LinkFigure.java
+++ /dev/null
@@ -1,336 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.jsf.facesconfig.ui.preference;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.draw2d.ColorConstants;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.LineBorder;
-import org.eclipse.draw2d.MarginBorder;
-import org.eclipse.draw2d.MidpointLocator;
-import org.eclipse.draw2d.PolylineConnection;
-import org.eclipse.draw2d.PositionConstants;
-import org.eclipse.draw2d.geometry.PointList;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.jface.resource.JFaceResources;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.Font;
-import org.eclipse.swt.graphics.Image;
-
-/**
- * @author Bob
- */
-/*package*/ class LinkFigure extends PolylineConnection implements IBaseFigure {
- private final static Color defaultLineColor = ColorConstants.black;
-
- private final static int defaultLineWidth = 1;
-
- private final static boolean defaultLabelVisible = false;
-
- private final static Color defaultLabelForeground = ColorConstants.black;
-
- private final static Color defaultLabelBackground = ColorConstants.white;
-
- private final static Font defaultFont = JFaceResources.getFontRegistry().get(
- JFaceResources.DEFAULT_FONT);
-
- private LinkLabel label;
-
- /**
- * Default constructor
- */
- public LinkFigure() {
- super();
- setLineWidth(defaultLineWidth);
- setForegroundColor(defaultLineColor);
-
- // BaseFigureDecorator decorator;
- // decorator = new
- // BaseFigureDecorator(GEMPlugin.getDefault().getGEMImage("delete.gif"),"target",PositionConstants.WEST);
- // addDecorator(decorator);
- // decorator = new
- // BaseFigureDecorator(GEMPlugin.getDefault().getGEMImage("delete.gif"),"target",PositionConstants.EAST);
- // addDecorator(decorator);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see com.sybase.stf.gem.diagram.editor.figures.IBaseFigure#setToolTipText()
- */
- public void setToolTipText(final String text) {
- Label toolTip_ = null;
-
- if (text != null && text.length() > 0) {
- toolTip_ = new Label(text);
- toolTip_.setBorder(new MarginBorder(3));
- }
-
- super.setToolTip(toolTip_);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see com.sybase.stf.gem.diagram.editor.figures.IBaseFigure#getToolTipText()
- */
- public String getToolTipText() {
- if (getToolTip() != null)
- {
- return ((Label) getToolTip()).getText();
- }
- return null;
- }
-
- public void setHighlight(final boolean flag) {
- if (flag) {
- setForegroundColor(ColorConstants.titleBackground);
- // setLineWidth(defaultLineWidth * 2);
- } else {
- setForegroundColor(defaultLineColor);
- // setLineWidth(defaultLineWidth);
- }
- }
-
- /*
- * (non-Javadoc)
- *
- * @see com.sybase.stf.gem.diagram.editor.figures.IBaseFigure#setText()
- */
- public void setText(final String text) {
- if (text != null && text.length() == 0) {
- if (label != null) {
- remove(label);
- label = null;
- }
- } else {
- getLabel().setText(text);
- }
- }
-
- /*
- * (non-Javadoc)
- *
- * @see com.sybase.stf.gem.diagram.editor.figures.IBaseFigure#getText()
- */
- public String getText() {
- if (label == null)
- {
- return null;
- }
- return label.getText();
- }
-
- /*
- * CR374981: Long activity labels do not get wrapped or truncated This
- * method was added to the IBaseFigure interface to support direct edit of
- * figure labels on the canvas.
- */
- public Rectangle getTextBounds() {
- return label.getTextBounds();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see com.sybase.stf.gem.diagram.editor.figures.IBaseFigure#setIcon(org.eclipse.swt.graphics.Image)
- */
- public void setIcon(final Image image) {
- getLabel().setIcon(image);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see com.sybase.stf.gem.diagram.editor.figures.IBaseFigure#getIcon()
- */
- public Image getIcon() {
- return getLabel().getIcon();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see com.sybase.stf.gem.diagram.editor.figures.IBaseFigure#addDecorator(com.sybase.stf.gem.diagram.editor.figures.BaseFigureDecorator)
- */
- public void addDecorator(final BaseFigureDecorator decorator) {
- final int pos = decorator.getPosition();
- if (pos == BaseFigureDecorator.DEFAULT_DECORATOR_POSITION
- || pos == PositionConstants.WEST
- || pos == PositionConstants.LEFT) {
- setTargetDecoration(decorator);
- } else if (pos == PositionConstants.EAST
- || pos == PositionConstants.RIGHT) {
- setSourceDecoration(decorator);
- }
- }
-
- /*
- * (non-Javadoc)
- *
- * @see com.sybase.stf.gem.diagram.editor.figures.IBaseFigure#removeDecorator()
- */
- public void removeDecorator() {
- removeDecorator(BaseFigureDecorator.DEFAULT_DECORATOR_POSITION);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see com.sybase.stf.gem.diagram.editor.figures.IBaseFigure#removeDecorator(int)
- */
- public void removeDecorator(final int position) {
- if (position == BaseFigureDecorator.DEFAULT_DECORATOR_POSITION)
- {
- setTargetDecoration(null);
- }
- else
- {
- setSourceDecoration(null);
- }
- }
-
- /*
- * (non-Javadoc)
- *
- * @see com.sybase.stf.gem.diagram.editor.figures.IBaseFigure#getDecorators()
- */
- public List getDecorators() {
- final List list = new ArrayList(2);
- Object d;
- d = getSourceDecoration();
- if (d != null)
- {
- list.add(d);
- }
- d = getTargetDecoration();
- if (d != null)
- {
- list.add(d);
- }
- return list;
- }
-
- private LinkLabel getLabel() {
- if (label == null) {
- label = new LinkLabel();
- add(label, new MidpointLocator(this, 0));
- }
- return label;
- }
-
- @Override
- public void setFont(final Font f) {
- getLabel().setFont(f);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.draw2d.Shape#setLineWidth(int)
- */
- @Override
- public void setLineWidth(final int w) {
- getLabel().setBorderWidth(w);
- super.setLineWidth(w);
- }
-
- @Override
- public void setForegroundColor(final Color c) {
- getLabel().setBorderColor(c);
- super.setForegroundColor(c);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.draw2d.Polyline#setPoints(org.eclipse.draw2d.geometry.PointList)
- */
- @Override
- public void setPoints(final PointList points) {
- super.setPoints(points);
- if (label != null) {
- int i = getPoints().size() / 2 - 1;
- if (i < 0)
- {
- i = 0;
- }
- if (getLayoutManager() != null)
- {
- getLayoutManager().setConstraint(label,
- new MidpointLocator(this, i));
- }
- }
- }
-
- @Override
- public Rectangle getBounds() {
- if (bounds == null) {
- if (bounds == null) {
- bounds = getPoints().getBounds().getExpanded(lineWidth / 2,
- lineWidth / 2);
- }
- // CR382243: Clicking on the node icon selects the connection line
- // rather than the node
- // NOTE: expanding the bounds to include children (in this case,
- // the Link labels) causes problems when the connection line becomes
- // short (i.e., when the 2 anchor figures at each end of the
- // connection are
- // close together) because the bounds of this link figure will be
- // greater
- // than the actual length of the line. This causes the link figure
- // to
- // be hit-tested beyond its visual size.
- if (getLabel().isVisible()) {
- for (int i = 0; i < getChildren().size(); i++) {
- final IFigure child = (IFigure) getChildren().get(i);
- bounds.union(child.getBounds());
- }
- }
- }
- return bounds;
- }
-
- /*
- * Helper class for line labels.
- */
- private static class LinkLabel extends Label {
- LinkLabel() {
- setBorder(new LineBorder());
- setOpaque(true);
- setForegroundColor(defaultLabelForeground);
- setBackgroundColor(defaultLabelBackground);
- setFont(defaultFont);
- final LineBorder border_ = new LineBorder(defaultLineWidth);
- setBorder(border_);
- border_.setColor(defaultLineColor);
- setVisible(defaultLabelVisible);
- }
-
- void setBorderWidth(final int w) {
- ((LineBorder) getBorder()).setWidth(w);
- }
-
- void setBorderColor(final Color c) {
- ((LineBorder) getBorder()).setColor(c);
- }
-
- @Override
- protected boolean useLocalCoordinates() {
- return false;
- }
- }
-}
\ No newline at end of file
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/preference/ObserveVisibleXYLayout.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/preference/ObserveVisibleXYLayout.java
deleted file mode 100644
index bee006f..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/preference/ObserveVisibleXYLayout.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.jsf.facesconfig.ui.preference;
-
-import java.util.Iterator;
-import java.util.ListIterator;
-
-import org.eclipse.draw2d.FreeformLayout;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.Insets;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.Rectangle;
-
-/**
- * @author Bob Brodt
- *
- * This is an XY layout that actually observes visiblity of children figures
- * when doint its layout.
- *
- * Apparently there is a bug in the GEF XYLayout class because it does not
- * observe visibility.
- *
- * @see org.eclipse.draw2d.AbstractLayout#isObservingVisibility()
- */
-/*package*/ class ObserveVisibleXYLayout extends FreeformLayout {
- protected Dimension calculatePreferredSize(IFigure f, int wHint, int hHint) {
- Rectangle rect = new Rectangle();
- ListIterator children = f.getChildren().listIterator();
- while (children.hasNext()) {
- IFigure child = (IFigure) children.next();
- // bug fix
- if (isObservingVisibility() && !child.isVisible())
- continue;
- Rectangle r = (Rectangle) constraints.get(child);
- if (r == null)
- continue;
-
- if (r.width == -1 || r.height == -1) {
- Dimension preferredSize_ = child.getPreferredSize(r.width,
- r.height);
- r = r.getCopy();
- if (r.width == -1)
- r.width = preferredSize_.width;
- if (r.height == -1)
- r.height = preferredSize_.height;
- }
- rect.union(r);
- }
- Dimension d = rect.getSize();
- Insets insets = f.getInsets();
- return new Dimension(d.width + insets.getWidth(), d.height
- + insets.getHeight()).union(getBorderPreferredSize(f));
- }
-
- public void layout(IFigure parent) {
- Iterator children = parent.getChildren().iterator();
- Point offset = getOrigin(parent);
- IFigure f;
- while (children.hasNext()) {
- f = (IFigure) children.next();
- // bug fix
- if (isObservingVisibility() && !f.isVisible())
- continue;
- Rectangle bounds = (Rectangle) getConstraint(f);
- if (bounds == null)
- continue;
-
- if (bounds.width == -1 || bounds.height == -1) {
- Dimension preferredSize_ = f.getPreferredSize(bounds.width,
- bounds.height);
- bounds = bounds.getCopy();
- if (bounds.width == -1)
- bounds.width = preferredSize_.width;
- if (bounds.height == -1)
- bounds.height = preferredSize_.height;
- }
- bounds = bounds.getTranslated(offset);
- f.setBounds(bounds);
- }
- }
-}
\ No newline at end of file
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/preference/OutputPortFigure.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/preference/OutputPortFigure.java
deleted file mode 100644
index 49d9201..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/preference/OutputPortFigure.java
+++ /dev/null
Binary files differ
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/preference/PortConnectionAnchor.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/preference/PortConnectionAnchor.java
deleted file mode 100644
index f81c507..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/preference/PortConnectionAnchor.java
+++ /dev/null
Binary files differ
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/preference/PortFigure.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/preference/PortFigure.java
deleted file mode 100644
index f992902..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/preference/PortFigure.java
+++ /dev/null
Binary files differ
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/preference/PreferenceMessages.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/preference/PreferenceMessages.java
deleted file mode 100644
index e9220c1..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/preference/PreferenceMessages.java
+++ /dev/null
@@ -1,225 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-
-
-package org.eclipse.jst.jsf.facesconfig.ui.preference;
-
-import org.eclipse.osgi.util.NLS;
-
-/**
- * The NLS message manager for PreferenceMessages
- *
- */
-/*package*/ final class PreferenceMessages extends NLS {
-
- private static final String BUNDLE_NAME = "org.eclipse.jst.jsf.facesconfig.ui.preference.PreferenceMessages"; //$NON-NLS-1$
-
- private PreferenceMessages() {
- // Do not instantiate
- }
-
- static {
- NLS.initializeMessages(BUNDLE_NAME, PreferenceMessages.class);
- }
-
- /**
- * see PreferenceMessages.properties
- */
- public static String CanvasPreferenceTab_LABEL_UseSystemColors;
-
- /**
- * see PreferenceMessages.properties
- */
- public static String CanvasPreferenceTab_LABEL_BackgroundColor;
-
- /**
- * see PreferenceMessages.properties
- */
- public static String CanvasPreferenceTab_LABEL_Canvas;
-
- /**
- * see PreferenceMessages.properties
- */
- public static String CanvasPreferenceTab_LABEL_GridHeight;
-
- /**
- * see PreferenceMessages.properties
- */
- public static String CanvasPreferenceTab_LABEL_GridLineColor;
-
- /**
- * see PreferenceMessages.properties
- */
- public static String CanvasPreferenceTab_LABEL_GridWidth;
-
- /**
- * see PreferenceMessages.properties
- */
- public static String CanvasPreferenceTab_LABEL_IconLabelFont;
-
- /**
- * see PreferenceMessages.properties
- */
- public static String CanvasPreferenceTab_LABEL_IconGroup;
-
- /**
- * see PreferenceMessages.properties
- */
- public static String CanvasPreferenceTab_LABEL_InputPortColor;
-
- /**
- * see PreferenceMessages.properties
- */
- public static String CanvasPreferenceTab_LABEL_OutputPortColor;
-
- /**
- * see PreferenceMessages.properties
- */
- public static String CanvasPreferenceTab_LABEL_LineGroup;
-
- /**
- * see PreferenceMessages.properties
- */
- public static String CanvasPreferenceTab_LABEL_LineColor;
-
- /**
- * see PreferenceMessages.properties
- */
- public static String CanvasPreferenceTab_LABEL_ShowLineLabels;
-
- /**
- * see PreferenceMessages.properties
- */
- public static String CanvasPreferenceTab_LABEL_LineLabelColor;
-
- /**
- * see PreferenceMessages.properties
- */
- public static String CanvasPreferenceTab_LABEL_LineLabelFont;
-
- /**
- * see PreferenceMessages.properties
- */
- public static String CanvasPreferenceTab_LABEL_LineRouting;
-
- /**
- * see PreferenceMessages.properties
- */
- public static String CanvasPreferenceTab_LABEL_LineWidth;
-
- /**
- * see PreferenceMessages.properties
- */
- public static String CanvasPreferenceTab_LABEL_SnapToGeometry;
-
- /**
- * see PreferenceMessages.properties
- */
- public static String CanvasPreferenceTab_LABEL_SnapToGrid;
-
- /**
- * see PreferenceMessages.properties
- */
- public static String CanvasPreferenceTab_LABEL_UndoStackSize;
-
- /**
- * see PreferenceMessages.properties
- */
- public static String CanvasPreferences_LABEL_Direct;
-
- /**
- * see PreferenceMessages.properties
- */
- public static String CanvasPreferences_LABEL_Manhattan;
-
- /**
- * see PreferenceMessages.properties
- */
- public static String CanvasPreferences_LABEL_Manual;
-
- /**
- * see PreferenceMessages.properties
- */
- public static String CanvasPreferenceTab_LABEL_LabelPlacement;
-
- /**
- * see PreferenceMessages.properties
- */
- public static String CanvasPreferences_LABEL_Top;
-
- /**
- * see PreferenceMessages.properties
- */
- public static String CanvasPreferences_LABEL_Bottom;
-
- /**
- * see PreferenceMessages.properties
- */
- public static String CanvasPreferences_LABEL_Left;
-
- /**
- * see PreferenceMessages.properties
- */
- public static String CanvasPreferences_LABEL_Right;
-
- /**
- * see PreferenceMessages.properties
- */
- public static String CanvasPreferenceTab_LABEL_IconSize;
-
- /**
- * see PreferenceMessages.properties
- */
- public static String CanvasPreferences_LABEL_Small;
-
- /**
- * see PreferenceMessages.properties
- */
- public static String CanvasPreferences_LABEL_Medium;
-
- /**
- * see PreferenceMessages.properties
- */
- public static String CanvasPreferences_LABEL_Large;
-
- /**
- * label property for check box that selects whether or not
- * the introduction section editor should be loaded.
- */
- public static String EditorPreferences_LABEL_ShowIntroEditor;
-
- /**
- * see PreferenceMessages.properties
- */
- public static String GEMPreferences_description;
- /**
- * see PreferenceMessages.properties
- */
- public static String CompoundNodeFigure_MaximizeLabel;
- /**
- * see PreferenceMessages.properties
- */
- public static String CompoundNodeFigure_MinimizeLabel;
- /**
- * see PreferenceMessages.properties
- */
- public static String CompoundNodeFigure_RestoreLabel;
- /**
- * see PreferenceMessages.properties
- */
- public static String WindowFigure_NoTitleText;
- /**
- * see PreferenceMessages.properties
- */
- public static String WindowFigure_Title;
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/preference/PreferenceMessages.properties b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/preference/PreferenceMessages.properties
deleted file mode 100644
index 5a91a37..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/preference/PreferenceMessages.properties
+++ /dev/null
@@ -1,54 +0,0 @@
-###############################################################################
-# Copyright (c) 2001, 2007 Oracle Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# Oracle Corporation - initial API and implementation
-###############################################################################
-#
-# Appearance preference labels
-#
-CanvasPreferenceTab_LABEL_UseSystemColors=Use System colors
-EditorPreferences_LABEL_ShowIntroEditor=Show Introduction Tab (open editors must be reloaded to take effect)
-CanvasPreferenceTab_LABEL_BackgroundColor=Background color:
-CanvasPreferenceTab_LABEL_Canvas=Canvas
-CanvasPreferenceTab_LABEL_GridHeight=Grid height:
-CanvasPreferenceTab_LABEL_GridLineColor=Grid color:
-CanvasPreferenceTab_LABEL_GridWidth=Grid width:
-CanvasPreferenceTab_LABEL_IconLabelFont=Label font:
-CanvasPreferenceTab_LABEL_IconGroup=Icons
-CanvasPreferenceTab_LABEL_InputPortColor=Input Port color:
-CanvasPreferenceTab_LABEL_OutputPortColor=Output Port color:
-CanvasPreferenceTab_LABEL_LineGroup=Connection Lines
-CanvasPreferenceTab_LABEL_LineColor=Line color:
-CanvasPreferenceTab_LABEL_ShowLineLabels=Show labels
-CanvasPreferenceTab_LABEL_LineLabelColor=Label color:
-CanvasPreferenceTab_LABEL_LineLabelFont=Label font:
-CanvasPreferenceTab_LABEL_LineRouting=Line Routing:
-CanvasPreferenceTab_LABEL_LineWidth=Line width:
-CanvasPreferenceTab_LABEL_SnapToGeometry=Snap to geometry
-CanvasPreferenceTab_LABEL_SnapToGrid=Snap to grid
-CanvasPreferenceTab_LABEL_UndoStackSize="Undo\" stack size:
-CanvasPreferences_LABEL_Direct=Direct
-CanvasPreferences_LABEL_Manhattan=Manhattan
-CanvasPreferences_LABEL_Manual=Manual
-CanvasPreferenceTab_LABEL_LabelPlacement=Label Placement:
-CanvasPreferences_LABEL_Top=Top
-CanvasPreferences_LABEL_Bottom=Bottom
-CanvasPreferences_LABEL_Left=Left
-CanvasPreferences_LABEL_Right=Right
-CanvasPreferenceTab_LABEL_IconSize=Icon Size:
-CanvasPreferences_LABEL_Small=Small
-CanvasPreferences_LABEL_Medium=Medium
-CanvasPreferences_LABEL_Large=Large
-GEMPreferences_description=Preferences for the graphical page of FacesConfig editor.
-
-#################################################
-CompoundNodeFigure_MaximizeLabel=Maximize
-CompoundNodeFigure_MinimizeLabel=Minimize
-CompoundNodeFigure_RestoreLabel=Restore
-WindowFigure_NoTitleText=??
-WindowFigure_Title=Window
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/preference/PrintedPageLayer.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/preference/PrintedPageLayer.java
deleted file mode 100644
index 566958f..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/preference/PrintedPageLayer.java
+++ /dev/null
@@ -1,177 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui.preference;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.draw2d.Figure;
-import org.eclipse.draw2d.FreeformLayer;
-import org.eclipse.draw2d.FreeformLayeredPane;
-import org.eclipse.draw2d.RectangleFigure;
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.gef.LayerConstants;
-
-/**
- * This is a printable layer that draws page outline tiles enclosing all of the
- * printable child figures. The page outlines represent complete pages as they
- * would appear if they were printed on dead trees, thus the pageSize set on
- * this layer should be the currently selected printer's page resolution.
- *
- * The reason this needs to be added to the printable layers is so that it will
- * show up in the content outline viewer.
- */
-/*package*/ class PrintedPageLayer extends FreeformLayer {
- // our layer name
- static final String PRINTED_PAGE_LAYER = "Printed Page"; //$NON-NLS-1$
-
- // the size of the page tiles (this should be the printer's resolution)
- private Dimension pageSize = new Dimension(850, 1100);
-
- // the WindowFigure that owns this layer
- private final WindowFigure host;
-
- // flag to lock out multiple calls to setFreeformBounds() when adding
- // and removing PrintedPageFigures.
- private boolean busy;
-
- // A simple page outline figure. We can get fancy later with turned-up
- // dogears, page numbers, titles and whatnot...
- static class PrintedPageFigure extends RectangleFigure {
- PrintedPageFigure() {
- super();
- setFill(false);
- setOutline(true);
- setLineWidth(1);
- }
- }
-
- /**
- * @param figure
- */
- public PrintedPageLayer(WindowFigure figure) {
- super();
- this.host = figure;
- }
-
- /**
- * @param x
- * @param y
- * @return the print page figure
- */
- protected PrintedPageFigure createPage(int x, int y) {
- PrintedPageFigure page = new PrintedPageFigure();
- page.setBounds(new Rectangle(x, y, pageSize.width, pageSize.height));
- return page;
- }
-
- /**
- * Sets the page width and height. This should be the currently selected
- * printer's page size.
- *
- * @param d
- */
- public void setPageSize(Dimension d) {
- pageSize = d.getCopy();
- }
-
- /**
- * @see org.eclipse.draw2d.FreeformFigure#setFreeformBounds(Rectangle)
- */
- public void setFreeformBounds(Rectangle bounds) {
- if (!busy && getParent() instanceof FreeformLayeredPane
- && pageSize.width > 0 && pageSize.height > 0) {
- busy = true;
-
- // build the new printing layer extent by looking at only the
- // contents of the Primary, Connection and Feedback layers
- Rectangle b;
- FreeformLayer layer;
- layer = (FreeformLayer) host.getLayer(LayerConstants.PRIMARY_LAYER);
- b = layer.getFreeformExtent().getCopy();
- layer = (FreeformLayer) host
- .getLayer(LayerConstants.CONNECTION_LAYER);
- b = b.union(layer.getFreeformExtent());
- layer = (FreeformLayer) host
- .getLayer(LayerConstants.FEEDBACK_LAYER);
- b = b.union(layer.getFreeformExtent());
-
- // calculate x and y for the page tiles
- int x = 0, y = 0;
- if (b.x < 0) {
- while (x > b.x)
- x -= pageSize.width;
- } else {
- while (x + pageSize.width < b.x)
- x += pageSize.width;
- }
- if (b.y < 0) {
- while (y > b.y)
- y -= pageSize.height;
- } else {
- while (y + pageSize.height < b.y)
- y += pageSize.height;
- }
-
- // get list of pagefigures that intersect the new extent
- // and a list of those that don't
- List keepers = new ArrayList();
- List trash = new ArrayList();
- Iterator iter = getChildren().iterator();
- while (iter.hasNext()) {
- Figure child = (Figure) iter.next();
- if (child.getBounds().intersects(b))
- keepers.add(child);
- else
- trash.add(child);
- }
-
- // calculate width and height
- int w = 0, h = 0;
- while (x + w < b.x + b.width)
- w += pageSize.width;
- while (y + h < b.y + b.height)
- h += pageSize.height;
-
- // determine the required pagefigures
- for (int xi = x; xi < x + w; xi += pageSize.width) {
- for (int yi = y; yi < y + h; yi += pageSize.height) {
- boolean found = false;
- iter = keepers.iterator();
- while (iter.hasNext()) {
- Figure child = (Figure) iter.next();
- Point p = child.getBounds().getLocation();
- if (p.x == xi && p.y == yi) {
- found = true;
- break;
- }
- }
- if (!found) {
- // add the new page
- add(createPage(xi, yi));
- }
- }
- }
-
- // remove all the old pages
- iter = trash.iterator();
- while (iter.hasNext())
- remove((Figure) iter.next());
-
- busy = false;
- }
- super.setFreeformBounds(bounds);
- }
-}
\ No newline at end of file
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/preference/RectangleList.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/preference/RectangleList.java
deleted file mode 100644
index 03aadbb..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/preference/RectangleList.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.jsf.facesconfig.ui.preference;
-
-import java.util.ArrayList;
-
-import org.eclipse.draw2d.geometry.Rectangle;
-
-/**
- * A List<Rectangle> implementation with a coordinate-based
- * convenience method for adding rectangles.
- *
- */
-class RectangleList extends ArrayList<Rectangle>
-{
- private static final long serialVersionUID = -4088355285820327890L;
-
- /**
- * Default constructor
- */
- public RectangleList() {
- super();
- }
-
- /**
- * @param x1
- * @param y1
- * @param x2
- * @param y2
- */
- public void addRectangle(int x1, int y1, int x2, int y2) {
- add(new Rectangle(x1, y1, x2 - x1, y2 - y1));
- }
-}
\ No newline at end of file
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/preference/TabbedTitleBarBorder.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/preference/TabbedTitleBarBorder.java
deleted file mode 100644
index 60cd979..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/preference/TabbedTitleBarBorder.java
+++ /dev/null
@@ -1,591 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.jsf.facesconfig.ui.preference;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.runtime.ListenerList;
-import org.eclipse.draw2d.ColorConstants;
-import org.eclipse.draw2d.FigureUtilities;
-import org.eclipse.draw2d.Graphics;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.MouseEvent;
-import org.eclipse.draw2d.MouseListener;
-import org.eclipse.draw2d.SchemeBorder;
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.Insets;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.jface.resource.JFaceResources;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.Font;
-import org.eclipse.swt.widgets.Composite;
-
-/**
- * A border for the tabbed title bar
- *
- */
-/*package*/ class TabbedTitleBarBorder extends SchemeBorder {
- // private int state = CompoundFigureListener.RESTORED;
-
- private IFigure parent;
-
- private ListenerList listenerList;
-
- private List tabList;
-
- private int currentTab;
-
- private Font font;
-
- private boolean visible = true;
-
- // from TitleBarBorder:
- private Color textColor = ColorConstants.black;
-
- private Color bgColor = ColorConstants.menuBackground;
-
- private Insets insets;
-
- private Insets padding = new Insets(2, 2, 2, 2);
-
- /**
- * Constructs a TitleBarBorder with its label set to the name of this class.
- * @param parent
- *
- * @since 2.0
- */
- public TabbedTitleBarBorder(final IFigure parent) {
- super(SCHEMES.LOWERED);
-
- this.parent = parent;
-
- parent.addMouseListener(new MouseListener() {
- public void mousePressed(MouseEvent me) {
- Insets padding_ = getPadding();
- Point mp = me.getLocation();
- mp.x -= padding_.left;
- mp.y -= padding_.top + 3; // 3==width of the outer border
- Point pp = parent.getBounds().getLocation();
- Rectangle tr = new Rectangle(pp.x, pp.y, 0, 0);
- //int activeIndex = -1;
-
- for (int i = 0; i < getTabList().size(); ++i) {
- Tab t = (Tab) tabList.get(i);
- Dimension d = t.getTextExtents();
- d.height += padding_.top + padding_.bottom;
- d.width += padding_.left;
- tr.setSize(d);
- if (tr.contains(mp)) {
- setCurrentTab(i);
- return;
- }
- tr.x += d.width;
- }
- }
-
- public void mouseReleased(MouseEvent me) {
- // do nothing: not handling release
- }
-
- public void mouseDoubleClicked(MouseEvent me) {
- // do nothing: not handling release
- }
- });
- }
-
- /**
- * @return the tab list
- */
- protected List getTabList() {
- if (tabList == null)
- tabList = new ArrayList();
- return tabList;
- }
-
- /**
- * Add a new tab with the text
- * @param text
- * @return the previous number of tabs
- */
- public int addTab(String text) {
- getTabList().add(new Tab(text));
- return getTabList().size() - 1;
- }
-
- /**
- * @param index
- */
- public void removeTab(int index) {
- if (index >= 0 && index < getTabList().size()) {
- tabList.remove(index);
- if (index >= tabList.size())
- index = tabList.size() - 1;
- setCurrentTab(index);
- }
- }
-
- /**
- * @param newIndex
- */
- public void setCurrentTab(int newIndex) {
- if (newIndex >= 0 && newIndex < getTabList().size()) {
- Tab newTab = (Tab) tabList.get(newIndex);
- int oldIndex = -1;
- for (int i = 0; i < tabList.size(); ++i) {
- Tab t = (Tab) tabList.get(i);
- if (t.isActive()) {
- oldIndex = i;
- t.setActive(false);
- break;
- }
- }
- newTab.setActive(true);
- if (parent != null) {
- parent.invalidate();
- parent.repaint();
- }
- currentTab = newIndex;
- fireTabChanged(oldIndex, newIndex);
- }
- }
-
- /**
- * @return the index of the current tab
- */
- public int getCurrentTab() {
- return currentTab;
- }
-
- /**
- * @param index
- * @return the contents object of the tab at index
- * or null if index is out of range
- */
- public Object getContents(int index) {
- if (index >= 0 && index < getTabList().size())
- return ((Tab) tabList.get(index)).getContents();
- return null;
- }
-
- /**
- * @param index
- * @param contents
- */
- public void setContents(int index, Object contents) {
- if (index >= 0 && index < getTabList().size())
- ((Tab) tabList.get(index)).setContents(contents);
- }
-
- /**
- * @param listener
- */
- public void addTabbedWindowListener(WindowFigureListener listener) {
- if (listenerList == null)
- listenerList = new ListenerList(ListenerList.IDENTITY);
- listenerList.add(listener);
- }
-
- /**
- * @param listener
- */
- public void removeTabbedWindowListener(WindowFigureListener listener) {
- if (listenerList != null)
- listenerList.remove(listener);
- }
-
- /**
- * @return the listeners
- */
- public Object[] getListeners() {
- return listenerList.getListeners();
- }
-
- /**
- * @param oldIndex
- * @param newIndex
- */
- protected void fireTabChanged(int oldIndex, int newIndex) {
- Object l[] = listenerList.getListeners();
- for (int i = 0; i < l.length; ++i) {
- if (l[i] instanceof WindowFigureListener)
- ((WindowFigureListener) l[i]).tabChanged(oldIndex, newIndex);
- }
- }
-
- /**
- * @return Returns the font.
- */
- public Font getFont() {
- if (font == null) {
- font = parent.getFont();
- if (font == null)
- font = JFaceResources.getFontRegistry().get(
- JFaceResources.DEFAULT_FONT);
- }
- return font;
- }
-
- /**
- * @param font
- * The font to set.
- */
- public void setFont(Font font) {
- this.font = font;
- invalidate();
- }
-
- /**
- * @return Returns the insets.
- */
- public Insets getInsets() {
- return insets;
- }
-
- /**
- * @param c
- */
- public void setTextColor(Color c) {
- textColor = c;
- }
-
- /**
- * @return the text color
- */
- public Color getTextColor() {
- return textColor;
- }
-
- /**
- * @param c
- */
- public void setBackgroundColor(Color c) {
- bgColor = c;
- }
-
- /**
- * @return the background color
- */
- public Color getBackgroundColor() {
- return bgColor;
- }
-
- /**
- * @param p
- */
- public void setPadding(Insets p) {
- padding = p;
- invalidate();
- }
-
- /**
- * @return the padding insets
- */
- public Insets getPadding() {
- return padding;
- }
-
- /**
- * @param text
- */
- public void setLabel(String text) {
- setLabel(currentTab, text);
- }
-
- /**
- * @param index
- * @param text
- */
- public void setLabel(int index, String text) {
- if (index >= 0 && index < getTabList().size())
- ((Tab) tabList.get(index)).setLabel(text);
- }
-
- /**
- * @return the label
- */
- public String getLabel() {
- return getLabel(currentTab);
- }
-
- /**
- * @param index
- * @return the label
- */
- public String getLabel(int index) {
- if (index >= 0 && index < getTabList().size())
- return ((Tab) tabList.get(index)).getLabel();
- return ""; //$NON-NLS-1$
- }
-
- /**
- * @return the parent figureb
- */
- public IFigure getParent() {
- return parent;
- }
-
- /**
- * validate each of the tabs
- */
- public void invalidate() {
- insets = null;
- for (int i = 0; i < getTabList().size(); ++i) {
- Tab t = (Tab) tabList.get(i);
- t.invalidate();
- }
- }
-
- /**
- * @param f
- * @return the text extends
- */
- public Dimension getTextExtents(IFigure f) {
- Dimension d = new Dimension(0, 0);
- for (int i = 0; i < getTabList().size(); ++i) {
- Tab t = (Tab) tabList.get(i);
- if (d.height == 0)
- d = t.getTextExtents();
- else
- d.width += t.getTextExtents().width;
- }
- return d;
- }
-
- /**
- * Sets the min/max buttons visible
- *
- * @param flag -
- * if true, buttons are made visible.
- */
- public void setVisible(boolean flag) {
- visible = flag;
- }
-
- /**
- * Calculates and returns the Insets for this border.
- *
- * @param figure
- * the figure on which Insets calculations are based
- * @return the calculated Insets
- * @since 2.0
- */
- protected Insets calculateInsets(IFigure figure) {
- insets = new Insets(super.getInsets(figure));
- insets.top = getTextExtents(figure).height;
- return insets;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.draw2d.Border#getInsets(org.eclipse.draw2d.IFigure)
- */
- public Insets getInsets(IFigure figure) {
- if (insets == null)
- calculateInsets(figure);
- return insets;
- }
-
- /**
- * @see org.eclipse.draw2d.Border#paint(IFigure, Graphics, Insets)
- */
- public void paint(IFigure figure, Graphics g, Insets in) {
- if (!visible)
- return;
-
- Insets is = new Insets(in);
- getInsets(figure);
- is.top += insets.top;
- super.paint(figure, g, is);
- // Insets insets = getInsets(pane);
- // Insets padding = getPadding();
- // Insets in = new Insets(figureInsets);
- // in.top += insets.top;
- // super.paint(pane, g, in);
-
- tempRect.setBounds(getPaintRectangle(figure, in));
- Rectangle r = tempRect;
- r.height = Math.min(r.height, getTextExtents(figure).height);
-
- g.clipRect(r);
- g.setBackgroundColor(getBackgroundColor());
- g.fillRectangle(r);
- int x = r.x;
- int y = r.y;
-
- Iterator iter = getTabList().iterator();
- while (iter.hasNext()) {
- Tab t = (Tab) iter.next();
- t.paint(g, figure, x, y);
- x += t.getTextExtents().width;
- }
-
- g.setBackgroundColor(getBackgroundColor());
- }
-
- /**
- * @param wHint
- * @param hHint
- * @return the minimum size
- */
- public Dimension getMinimumSize(int wHint, int hHint) {
- Dimension d = getTextExtents(parent);
- getInsets(parent);
- d.expand(insets.left + insets.right, insets.top + insets.bottom);
- // add enough width for the min/max buttons
- // d.width += minButton.getSize().width + maxButton.getSize().width;
- return d;
- }
-
- private class Tab {
- private String label = ""; //$NON-NLS-1$
-
- private Object contents = null;
-
- private Dimension textExtents;
-
- private boolean active;
-
- /**
- * @param text
- */
- public Tab(String text) {
- this.label = text;
- }
-
- /**
- * @param contents
- */
- public void setContents(Object contents) {
- this.contents = contents;
- }
-
- /**
- * @return the contents
- */
- public Object getContents() {
- return contents;
- }
-
- /**
- * @param active
- */
- public void setActive(boolean active) {
- this.active = active;
- }
-
- /**
- * @return the active state
- */
- public boolean isActive() {
- return active;
- }
-
- /**
- * @return the label
- */
- public String getLabel() {
- return label;
- }
-
- /**
- * @param text
- */
- public void setLabel(String text) {
- if (text == null)
- this.label = ""; //$NON-NLS-1$
- else
- this.label = text;
- textExtents = null;
- }
-
- /**
- * @return the text extents
- */
- public Dimension calculateTextExtents() {
- textExtents = FigureUtilities.getTextExtents(label == null ? "W" //$NON-NLS-1$
- : label, getFont());
- textExtents.width += getPadding().getWidth();
- textExtents.height += getPadding().getHeight();
- return textExtents;
- }
-
- /**
- * @return the text extents. A copy is returned based on what
- * is cached internall by calculateTextExtents
- */
- public Dimension getTextExtents() {
- if (textExtents == null)
- calculateTextExtents();
- return textExtents.getCopy();
- }
-
- /**
- *
- */
- public void invalidate() {
- textExtents = null;
- }
-
- /**
- * @param g
- * @param f
- * @param x
- * @param y
- */
- public void paint(Graphics g, IFigure f, int x, int y) {
- if (contents instanceof Composite) {
- return;
- }
- IFigure pane = (IFigure) contents;
- getTextExtents();
-
- Insets p = getPadding();
- int w = textExtents.width;
- int h = textExtents.height;
- int radius = Math.max(p.getWidth(), p.getHeight()) + 2;
-
- // CR408950: BP Save problems
- // fixed icon label refresh problems
- if (getTabList().size() > 1) {
- // only draw tabList if there are more than 1
- if (active)
- g.setBackgroundColor(pane == null ? ColorConstants.white
- : pane.getBackgroundColor());
- else
- g.setBackgroundColor(getBackgroundColor());
-
- --w;
- g.setForegroundColor(active ? ColorConstants.buttonDarkest
- : ColorConstants.buttonDarker);
- // g.setForegroundColor(ColorConstants.red);
- g.drawRectangle(x, y + h / 2, w, h);
- // g.setBackgroundColor(ColorConstants.green);
- g.fillRoundRectangle(new Rectangle(x, y, w, h), radius, radius);
- // g.setForegroundColor(ColorConstants.blue);
- g.drawRoundRectangle(new Rectangle(x, y, w, h), radius, radius);
- // g.setBackgroundColor(ColorConstants.yellow);
- g.fillRectangle(x + 1, y + h / 2, w - 1, h);
- } else
- g.setBackgroundColor(getBackgroundColor());
-
- g.setFont(getFont());
- g.setForegroundColor(getTextColor());
- if (label != null)
- g.drawString(label, x + padding.left + 1, y + padding.top);
- }
- }
-}
\ No newline at end of file
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/preference/TabbedWindowBorder.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/preference/TabbedWindowBorder.java
deleted file mode 100644
index 6d41870..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/preference/TabbedWindowBorder.java
+++ /dev/null
@@ -1,252 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui.preference;
-
-import org.eclipse.draw2d.ColorConstants;
-import org.eclipse.draw2d.FigureUtilities;
-import org.eclipse.draw2d.FrameBorder;
-import org.eclipse.draw2d.Graphics;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.SchemeBorder;
-import org.eclipse.draw2d.geometry.Insets;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.GC;
-import org.eclipse.swt.widgets.Composite;
-
-/**
- * A frame border for a tabbed window
- *
- */
-/* package */final class TabbedWindowBorder extends FrameBorder
-{
- private boolean isVisible = true;
-
- // CR392586: resource leaks
- private static MySchemeBorder normalBorder = new MySchemeBorder(
- new MySchemeBorder.MyScheme(new Color[]
- { ColorConstants.button, ColorConstants.buttonLightest,
- ColorConstants.button }, new Color[]
- { ColorConstants.buttonDarkest, ColorConstants.buttonDarker,
- ColorConstants.button }));
-
- // CR392586: resource leaks
- private static MySchemeBorder highlightBorder = new MySchemeBorder(
- new MySchemeBorder.MyScheme(new Color[]
- { FigureUtilities.lighter(ColorConstants.titleBackground),
- ColorConstants.titleBackground,
- FigureUtilities.darker(ColorConstants.titleBackground) },
- new Color[]
- {
- FigureUtilities
- .darker(ColorConstants.titleGradient),
- ColorConstants.titleGradient,
- FigureUtilities
- .lighter(ColorConstants.titleGradient) }));
-
- /**
- * A border scheme
- *
- */
- private static class MySchemeBorder extends SchemeBorder
- {
- private static class MyScheme extends SchemeBorder.Scheme
- {
- /**
- * @param highlight
- * @param shadow
- */
- public MyScheme(final Color[] highlight, final Color[] shadow)
- {
- super(highlight, shadow);
- }
-
- @Override
- public Color[] getHighlight()
- {
- return super.getHighlight();
- }
-
- @Override
- public Color[] getShadow()
- {
- return super.getHighlight();
- }
- }
-
- MySchemeBorder(final MyScheme scheme)
- {
- super(scheme);
- }
-
- /**
- * @return the scheme
- */
- public MyScheme getMyScheme()
- {
- return (MyScheme) super.getScheme();
- }
-
- /**
- * @see org.eclipse.draw2d.Border#paint(IFigure, Graphics, Insets)
- * @param comp
- * @param gc
- * @param insets
- */
- public void paint(final Composite comp, final GC gc, final Insets insets)
- {
- final Color[] tl = getMyScheme().getHighlight();
- final Color[] br = getMyScheme().getShadow();
- paint(comp, gc, insets, tl, br);
- }
-
- /**
- * Paints the border using the information in the set Scheme and the
- * inputs given. Side widths are determined by the number of colors in
- * the Scheme for each side.
- *
- * @param comp
- * the composit whose rect should be used for the inset
- * bounds
- * @param gc
- * the graphics object
- * @param insets
- * the insets
- * @param tl
- * the highlight (top/left) colors
- * @param br
- * the shadow (bottom/right) colors
- */
- protected void paint(final Composite comp, final GC gc, final Insets insets, final Color[] tl,
- final Color[] br)
- {
- final org.eclipse.swt.graphics.Rectangle rect = comp.getBounds();
-
- gc.setLineWidth(1);
- gc.setLineStyle(SWT.LINE_SOLID);
-
- final int top = rect.y - insets.top;
- final int left = rect.x - insets.left;
- int bottom = rect.y + rect.height + insets.bottom;
- int right = rect.x + rect.width + insets.right;
- gc.setClipping(new org.eclipse.swt.graphics.Rectangle(left, top,
- right - left, bottom - top));
-
- final Color color = ColorConstants.red;
- gc.setForeground(color);
- gc.drawLine(left, top, right, bottom);
-
- for (int i = 0; i < br.length; i++)
- {
- // color = br[i];
- gc.setForeground(color);
- gc.drawLine(right - i, bottom - i, right - i, top + i);
- gc.drawLine(right - i, bottom - i, left + i, bottom - i);
- }
-
- right--;
- bottom--;
-
- for (int i = 0; i < tl.length; i++)
- {
- // color = tl[i];
- gc.setForeground(color);
- gc.drawLine(left + i, top + i, right - i, top + i);
- gc.drawLine(left + i, top + i, left + i, bottom - i);
- }
- color.dispose();
- }
- }
-
- /**
- * @param parent
- */
- public TabbedWindowBorder(final IFigure parent)
- {
- // apparently paint() gets called before createBorders() has had
- // a chance to create the borders, so we just create them here
- inner = new TabbedTitleBarBorder(parent);
- outer = normalBorder;
- }
-
- /**
- * @param flag
- */
- public void setVisible(final boolean flag)
- {
- if (isVisible != flag)
- {
- isVisible = flag;
- ((TabbedTitleBarBorder) inner).setVisible(flag);
- if (flag)
- {
- ((TabbedTitleBarBorder) inner).getParent().repaint();
- }
- }
- }
-
- /**
- * @param flag
- */
- public void setHighlight(final boolean flag)
- {
- if (flag)
- {
- outer = highlightBorder;
- }
- else
- {
- outer = normalBorder;
- }
- ((TabbedTitleBarBorder) inner).getParent().repaint();
- }
-
- @Override
- protected void createBorders()
- {
- // TODO: NOTE: this is overriding default border creation
- }
-
- @Override
- public void paint(final IFigure figure, final Graphics g, final Insets insets)
- {
- if (isVisible)
- {
- if (comp != null)
- {
- final GC gc = new GC(comp);
- paint(comp, gc, insets);
- gc.dispose();
- }
- else
- {
- super.paint(figure, g, insets);
- }
- }
- }
-
- private Composite comp;
-
- /**
- * @param comp_
- * @param gc
- * @param insets
- */
- public void paint(final Composite comp_, final GC gc, final Insets insets)
- {
- this.comp = comp_;
- if (isVisible)
- {
- ((MySchemeBorder) outer).paint(comp_, gc, insets);
- }
- }
-}
\ No newline at end of file
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/preference/TitleBarButton.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/preference/TitleBarButton.java
deleted file mode 100644
index 1496ca4..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/preference/TitleBarButton.java
+++ /dev/null
@@ -1,240 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.jsf.facesconfig.ui.preference;
-
-import java.util.Iterator;
-
-import org.eclipse.draw2d.ActionEvent;
-import org.eclipse.draw2d.ActionListener;
-import org.eclipse.draw2d.Button;
-import org.eclipse.draw2d.ColorConstants;
-import org.eclipse.draw2d.Cursors;
-import org.eclipse.draw2d.Graphics;
-import org.eclipse.draw2d.MouseEvent;
-import org.eclipse.draw2d.MouseMotionListener;
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.jface.resource.JFaceResources;
-import org.eclipse.swt.graphics.Image;
-
-/**
- * A title bar button
- *
- */
-/*package*/ final class TitleBarButton extends Button {
- private boolean state = false;
-
- private Image uncheckedImage;
-
- private Image checkedImage;
-
- private Image uncheckedHiliteImage;
-
- private Image checkedHiliteImage;
-
- private RectangleList uncheckedRects;
-
- private RectangleList checkedRects;
-
- private boolean hilite = false;
-
-
-
- /**
- * @param unchecked
- * @param uncheckedHilite
- * @param checked
- * @param checkedHilite
- */
- public TitleBarButton(Image unchecked, Image uncheckedHilite,
- Image checked, Image checkedHilite) {
- super();
- uncheckedImage = unchecked;
- if (uncheckedHilite == null)
- uncheckedHiliteImage = unchecked;
- else
- uncheckedHiliteImage = uncheckedHilite;
- if (checked == null)
- checkedImage = unchecked;
- else
- checkedImage = checked;
- if (checkedHilite == null)
- checkedHiliteImage = unchecked;
- else
- checkedHiliteImage = checkedHilite;
- initialize();
- }
-
- /**
- * @param rects
- */
- public TitleBarButton(RectangleList rects) {
- super();
- uncheckedRects = rects;
- initialize();
- }
-
- /**
- * @param unchecked
- * @param checked
- */
- public TitleBarButton(RectangleList unchecked, RectangleList checked) {
- super();
- uncheckedRects = unchecked;
- checkedRects = checked;
- initialize();
- }
-
- /**
- * @return the state
- */
- public boolean getState() {
- return state;
- }
-
- /**
- * @param newState
- */
- public void setState(boolean newState) {
- state = newState;
- hilite = false;
- }
-
- private void initialize() {
- setRequestFocusEnabled(true);
- setFocusTraversable(true);
-
- if (uncheckedImage != null) {
- org.eclipse.swt.graphics.Rectangle r = uncheckedImage.getBounds();
- setBounds(new Rectangle(0, 0, r.width, r.height));
- prefSize = new Dimension(r.width, r.height);
- } else {
- setForegroundColor(ColorConstants.black);
- setBackgroundColor(ColorConstants.white);
- calculatePreferredSize();
- setBounds(new Rectangle(0, 0, prefSize.width, prefSize.height));
- }
- setCursor(Cursors.ARROW);
- setBorder(null);
- setFont(JFaceResources.getFontRegistry().get(
- JFaceResources.DEFAULT_FONT));
-
- addActionListener(new ActionListener() {
- public void actionPerformed(ActionEvent event) {
- setState(!state);
- }
- });
- this.addMouseMotionListener(new MouseMotionListener() {
-
- public void mouseDragged(MouseEvent me) {
- // TODO Auto-generated method stub
-
- }
-
- public void mouseEntered(MouseEvent me) {
- hilite = true;
- repaint();
- }
-
- public void mouseExited(MouseEvent me) {
- hilite = false;
- repaint();
- }
-
- public void mouseHover(MouseEvent me) {
- // TODO Auto-generated method stub
-
- }
-
- public void mouseMoved(MouseEvent me) {
- // TODO Auto-generated method stub
-
- }
- });
- }
-
- /**
- * @return the preferred size dimensions
- */
- public Dimension calculatePreferredSize() {
- if (prefSize == null) {
- Rectangle rect = new Rectangle(0, 0, 0, 0);
- if (uncheckedRects != null) {
- Iterator<Rectangle> iter = uncheckedRects.iterator();
- while (iter.hasNext()) {
- /*Point p =*/ getLocation();
- Rectangle r = iter.next().getCopy();
- rect = rect.getUnion(r);
- }
- }
- if (checkedRects != null) {
- Iterator<Rectangle> iter = checkedRects.iterator();
- while (iter.hasNext()) {
- /*Point p =*/ getLocation();
- Rectangle r = iter.next().getCopy();
- rect = rect.getUnion(r);
- }
- }
- prefSize = rect.getSize();
- if (prefSize.width > prefSize.height)
- prefSize.height = prefSize.width;
- else if (prefSize.height > prefSize.width)
- prefSize.width = prefSize.height;
- prefSize.width += 4;
- prefSize.height += 4;
- }
- return prefSize;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.draw2d.IFigure#paint(org.eclipse.draw2d.Graphics)
- */
- public void paint(Graphics graphics) {
- if (!isVisible())
- return;
- if (uncheckedImage != null) {
- if (hilite) {
- if (state == false)
- graphics.drawImage(uncheckedHiliteImage, getLocation());
- else
- graphics.drawImage(checkedHiliteImage, getLocation());
- } else {
- if (state == false)
- graphics.drawImage(uncheckedImage, getLocation());
- else
- graphics.drawImage(checkedImage, getLocation());
- }
- } else {
- Iterator<Rectangle> iter = null;
- if (state == false)
- iter = uncheckedRects.iterator();
- else
- iter = checkedRects.iterator();
- while (iter.hasNext()) {
- Point p = getLocation();
- Rectangle r = iter.next().getCopy();
- r = r.translate(p.x, p.y);
- graphics.setForegroundColor(getForegroundColor());
- if (hilite)
- graphics.setBackgroundColor(ColorConstants.lightBlue);
- else
- graphics.setBackgroundColor(ColorConstants.white);
- graphics.fillRectangle(r);
- graphics.drawRectangle(r);
- }
- }
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/preference/WindowFigure.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/preference/WindowFigure.java
deleted file mode 100644
index 0734023..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/preference/WindowFigure.java
+++ /dev/null
@@ -1,621 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.jsf.facesconfig.ui.preference;
-
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.draw2d.AncestorListener;
-import org.eclipse.draw2d.ColorConstants;
-import org.eclipse.draw2d.ConnectionLayer;
-import org.eclipse.draw2d.FreeformFigure;
-import org.eclipse.draw2d.FreeformLayer;
-import org.eclipse.draw2d.FreeformLayeredPane;
-import org.eclipse.draw2d.FreeformLayout;
-import org.eclipse.draw2d.FreeformListener;
-import org.eclipse.draw2d.FreeformViewport;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Layer;
-import org.eclipse.draw2d.LayeredPane;
-import org.eclipse.draw2d.ScalableFreeformLayeredPane;
-import org.eclipse.draw2d.ScrollPane;
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.Insets;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.gef.LayerConstants;
-import org.eclipse.gef.editparts.GridLayer;
-import org.eclipse.gef.editparts.GuideLayer;
-import org.eclipse.jface.resource.JFaceResources;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.Font;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Composite;
-
-/**
- * A ScollPane used as figure container
- *
- */
-/*package*/ class WindowFigure extends ScrollPane implements IContainerFigure,
- LayerConstants, FreeformFigure {
- private TabbedWindowBorder windowBorder;
-
- private TabbedTitleBarBorder titleBarBorder;
-
- private FreeformViewport myViewport;
-
- // private FreeformLayeredPane layeredPane;
-
- private ScalableFreeformLayeredPane scaledLayers;
-
- private LayeredPane innerLayers;
-
- private LayeredPane printableLayers;
-
- private FreeformLayer primaryLayer;
-
- private final static Font defaultFont = JFaceResources.getFontRegistry().get(
- JFaceResources.DEFAULT_FONT);
-
- private final static Color defaultForegroundColor = ColorConstants.black;
-
- private final static Color defaultBackgroundColor = ColorConstants.white;
-
- private final static Color defaultGridColor = ColorConstants.lightGray;
-
- private final static Dimension defaultGridSpacing = null;
-
- private final static boolean defaultGridEnabled = false;
-
- // Line Routing is not used within the WindowFigure class; it just serves as
- // a storage
- // location for communicating between the GEMPreferences and EditParts that
- // actually
- // create the line routers.
- private final static int LINE_ROUTING_MANUAL = 0;
-
- // TODO: should this really be static?
- private static int defaultLineRoutingStyle = LINE_ROUTING_MANUAL;
-
- private class MyGridLayer extends GridLayer {
-
-// public Point getOrigin() {
-// return origin.getCopy();
-// }
- }
-
- private class MyFeedbackLayer extends FreeformLayer {
- MyFeedbackLayer() {
- setEnabled(false);
- }
- }
-
- /**
- * Default constructor
- */
- public WindowFigure() {
- super();
-
- windowBorder = new TabbedWindowBorder(this);
- titleBarBorder = (TabbedTitleBarBorder) windowBorder.getInnerBorder();
- setBorder(windowBorder);
- setFont(defaultFont);
- setForegroundColor(defaultForegroundColor);
- setBackgroundColor(defaultBackgroundColor);
-
- innerLayers = new FreeformLayeredPane();
- createLayers(innerLayers);
-
- myViewport = new FreeformViewport();
- myViewport.setContents(innerLayers);
-
- setViewport(myViewport);
-
- // CR389495: Working with nested complex activities causes in the BP
- // editor causes lockup
- // not related to this CR but discovered while working on it:
- // make sure we observe grid visibility from preferences
- getGridLayer().setVisible(defaultGridEnabled);
- getGridLayer().setSpacing(defaultGridSpacing);
- getGridLayer().setForegroundColor(defaultGridColor);
-
- setText(PreferenceMessages.WindowFigure_Title);
-
- addTabbedWindowListener(new WindowFigureListener() {
- public void tabChanged(int oldIndex, int newIndex) {
- internalSetCurrentTab(newIndex);
- validate();
- }
- });
- addAncestorListener(new AncestorListener() {
-
- public void ancestorAdded(IFigure ancestor) {
- setVisible(true);
- }
-
- public void ancestorMoved(IFigure ancestor) {
- // validateComposite();
- }
-
- public void ancestorRemoved(IFigure ancestor) {
- setVisible(false);
- }
- });
- }
-
- // //////////////////////////////////////////////////////////////////////////
- // Layer management
- // //////////////////////////////////////////////////////////////////////////
-
- /**
- * @param layeredPane
- */
- protected void createLayers(LayeredPane layeredPane) {
- layeredPane.add(getScaledLayers(), SCALABLE_LAYERS);
- layeredPane.add(new FreeformLayer(), HANDLE_LAYER);
- // CR377650: Horizontal scrolling needs to be improved
- // moved the feedback layer into printable layers so it shows up in
- // content outline
- // layeredPane.add(new MyFeedbackLayer(), FEEDBACK_LAYER);
- layeredPane.add(new GuideLayer(), GUIDE_LAYER);
- }
-
- /**
- * @return the pane
- */
- protected ScalableFreeformLayeredPane createScaledLayers() {
- ScalableFreeformLayeredPane layers = new ScalableFreeformLayeredPane();
- layers.add(createGridLayer(), GRID_LAYER);
- layers.add(getPrintableLayers(), PRINTABLE_LAYERS);
- // CR389070: Figures are abbreviating rule figures names and making them
- // unreadable
- // not needed (?)
- // layers.add(new MyFeedbackLayer(), SCALED_FEEDBACK_LAYER);
- return layers;
- }
-
- /**
- * @return layered pane
- */
- protected LayeredPane getScaledLayers() {
- if (scaledLayers == null)
- scaledLayers = createScaledLayers();
- return scaledLayers;
- }
-
- /**
- * @return layered pane
- */
- protected LayeredPane createPrintableLayers() {
- FreeformLayeredPane layeredPane = new FreeformLayeredPane();
-
- PrintedPageLayer pageTileLayer = new PrintedPageLayer(this);
- // TODO: get the printer page size from printer preferences
- // and set into the PageTileLayer.
- pageTileLayer.setPageSize(new Dimension(0, 0));
- layeredPane.add(pageTileLayer, PrintedPageLayer.PRINTED_PAGE_LAYER, -1);
-
- // CR400208: Lines bleed from the bp canvas through the Fault handler
- // window
- // changed z-order of connection layer so that it is below figures
- layeredPane.add(new ConnectionLayer(), CONNECTION_LAYER, -1);
- primaryLayer = new FreeformLayer();
- layeredPane.add(primaryLayer, PRIMARY_LAYER, -1);
- primaryLayer.setLayoutManager(new FreeformLayout());
-
- // CR377650: Horizontal scrolling needs to be improved
- // let's put the feedback layer in with the printable layers so
- // we can see the feedback figures in the content outline viewer
- layeredPane.add(new MyFeedbackLayer(), FEEDBACK_LAYER);
- return layeredPane;
- }
-
- /**
- * @return the layered pane
- */
- protected LayeredPane getPrintableLayers() {
- if (printableLayers == null)
- printableLayers = createPrintableLayers();
- return printableLayers;
- }
-
- /**
- * @return the grid layer
- */
- protected GridLayer createGridLayer() {
- return new MyGridLayer();
- }
-
- /**
- * @return the grid layer
- */
- public GridLayer getGridLayer() {
- return (GridLayer) getLayer(GRID_LAYER);
- }
-
- public Layer getLayer(Object key) {
- // ScalableFreeformRootEditPart:
- Layer layer = null;
- if (scaledLayers != null)
- layer = scaledLayers.getLayer(key);
- if (layer != null)
- return layer;
- // FreeformGraphicalRootEditPart:
- if (innerLayers == null)
- return null;
- layer = innerLayers.getLayer(key);
- if (layer != null)
- return layer;
- if (printableLayers == null)
- return null;
- return printableLayers.getLayer(key);
- }
-
- // //////////////////////////////////////////////////////////////////////////
- // Properties
- // //////////////////////////////////////////////////////////////////////////
-
- /**
- * @return the scroll position
- */
- public Point getScrollPosition() {
- int x = getHorizontalScrollBar().getRangeModel().getValue();
- int y = getVerticalScrollBar().getRangeModel().getValue();
- return new Point(x, y);
- }
-
- /**
- * @return the border
- */
- public TabbedTitleBarBorder getTabbedTitleBarBorder() {
- return titleBarBorder;
- }
-
- /**
- * @return the border
- */
- public TabbedWindowBorder getTabbedWindowBorder() {
- return windowBorder;
- }
-
- /**
- * @param listener
- */
- public void addTabbedWindowListener(WindowFigureListener listener) {
- titleBarBorder.addTabbedWindowListener(listener);
- }
-
- /**
- * @param listener
- */
- public void removeTabbedWindowListener(WindowFigureListener listener) {
- titleBarBorder.removeTabbedWindowListener(listener);
- }
-
- public Dimension getMinimumSize(int wHint, int hHint) {
- Dimension d = titleBarBorder.getMinimumSize(wHint, hHint);
- d.expand(getInsets().getWidth(), getInsets().getHeight());
- return d;
- }
-
- /**
- * @param s
- * @return the previous number of tabs
- */
- public int addTab(String s) {
- return titleBarBorder.addTab(s);
- }
-
- /**
- * @param index
- */
- public void removeTab(int index) {
- titleBarBorder.removeTab(index);
- internalSetCurrentTab(titleBarBorder.getCurrentTab());
- }
-
- private void internalSetCurrentTab(int index) {
- // Object contents = titleBarBorder.getContents(index);
- // if (contents instanceof IFigure)
- // setContents((IFigure) contents);
- }
-
- /**
- * @param index
- */
- public void setCurrentTab(int index) {
- internalSetCurrentTab(index);
- titleBarBorder.setCurrentTab(index);
- }
-
- /**
- * @return the current tab index
- */
- public int getCurrentTab() {
- return titleBarBorder.getCurrentTab();
- }
-
- public void setContents(IFigure figure) {
- titleBarBorder.setContents(0, figure);
- super.setContents(figure);
- }
-
- /**
- * @param index
- * @param contents
- */
- public void setContents(int index, Object contents) {
- if (contents instanceof IFigure)
- setContents((IFigure) contents);
- titleBarBorder.setContents(index, contents);
- }
-
- /**
- * @param index
- * @return the content object of the index
- */
- public Object getContents(int index) {
- return titleBarBorder.getContents(index);
- }
-
- public void setVisible(boolean flag) {
- super.setVisible(flag);
- windowBorder.setVisible(flag);
- // hide/show the window contents if it's a SWT composite
- Object contents = getContents();
- if (contents instanceof Composite)
- ((Composite) contents).setVisible(flag);
- }
-
- public void setHighlight(boolean flag) {
- windowBorder.setHighlight(flag);
- }
-
- public void setFont(Font f) {
- titleBarBorder.setFont(f);
- }
-
- public void setForegroundColor(Color c) {
- titleBarBorder.setTextColor(c);
- }
-
- /**
- * @param style
- */
- public void setLineRoutingStyle(int style) {
- defaultLineRoutingStyle = style;
- revalidate();
- }
-
- /**
- * @return the line routing style
- */
- public int getLineRoutingStyle() {
- return defaultLineRoutingStyle;
- }
-
- public Dimension getPreferredSize(int wHint, int hHint) {
- if (prefSize == null) {
- IFigure parent = getParent();
- prefSize = parent.getSize();
- this.getLayoutManager().invalidate();
- Dimension m = super.getPreferredSize(wHint, hHint);
- if (getParent() instanceof CompoundNodeFigure) {
- if (((CompoundNodeFigure) parent).getState() == CompoundNodeFigure.RESTORED) {
- Insets in = ((CompoundNodeFigure) getParent())
- .getAnchorInsets();
- prefSize.width -= in.getWidth();
- prefSize.height -= in.getHeight();
- }
- } else {
- if (m.width > prefSize.width)
- prefSize.width = m.width;
- if (m.height > prefSize.height)
- prefSize.height = m.height;
- }
- }
- return prefSize;
- }
-
- protected boolean isValidationRoot() {
- return true;
- }
-
- // private void validateComposite() {
- // Object contents = getContents();
- // // System.out.println("validate: "+titleBarBorder.getLabel(0)+"
- // // "+contents);
- // if (contents instanceof Composite) {
- // if (getParent() == null) {
- // System.err.println("TabbedWindowFigure.validate() - ERROR");
- // return;
- // }
- // Rectangle r = getBounds().getCopy();
- // r.crop(getInsets());
- // Dimension ps = getParent().getParent().getPreferredSize();
- // Rectangle pr = getParent().getParent().getBounds();
- // titleBarBorder.invalidate();
- // titleBarBorder.getInsets(this);
- // Insets in = getParent().getParent().getInsets();
- // Composite comp = (Composite) getContents();
- // comp.setBounds(pr.x + r.x + in.left, pr.y + r.y, r.width, r.height);
- // comp.moveAbove(null);
- // }
- // }
-
- public void invalidate() {
- prefSize = null;
- super.invalidate();
- }
-
- // //////////////////////////////////////////////////////////////////////
- // IBaseFigure methods
- // //////////////////////////////////////////////////////////////////////
-
- /*
- * (non-Javadoc)
- *
- * @see com.sybase.stf.gem.diagram.editor.figures.IBaseFigure#setText(String
- * text)
- */
- public void setText(String name) {
- titleBarBorder.setLabel(name);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see com.sybase.stf.gem.diagram.editor.figures.IBaseFigure#getText()
- */
- public String getText() {
- if (titleBarBorder == null)
- return PreferenceMessages.WindowFigure_NoTitleText;
- return titleBarBorder.getLabel();
- }
-
- /*
- * CR374981: Long activity labels do not get wrapped or truncated This
- * method was added to the IBaseFigure interface to support direct edit of
- * figure labels on the canvas.
- */
- public Rectangle getTextBounds() {
- Rectangle r = getClientArea().getCopy();
- r.height = titleBarBorder.getTextExtents(this).height;
- r.x += getInsets().left;
- r.y -= getInsets().top;
- return r;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see com.sybase.stf.gem.diagram.editor.figures.IBaseFigure#getIcon()
- */
- public Image getIcon() {
- return null;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see com.sybase.stf.gem.diagram.editor.figures.IBaseFigure#setIcon(org.eclipse.swt.graphics.Image)
- */
- public void setIcon(Image image) {
- // do nothing
- }
-
- /*
- * (non-Javadoc)
- *
- * @see com.sybase.stf.gem.diagram.editor.figures.IBaseFigure#setToolTipText(java.lang.String)
- */
- public void setToolTipText(String text) {
- // do nothing
- }
-
- public String getToolTipText() {
- return null;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see com.sybase.stf.gem.diagram.editor.figures.IBaseFigure#addDecorator(com.sybase.stf.gem.diagram.editor.figures.BaseFigureDecorator)
- */
- public void addDecorator(BaseFigureDecorator decorator) {
- // do nothing
- }
-
- /*
- * (non-Javadoc)
- *
- * @see com.sybase.stf.gem.diagram.editor.figures.IBaseFigure#removeDecorator()
- */
- public void removeDecorator() {
- // do nothing
- }
-
- /*
- * (non-Javadoc)
- *
- * @see com.sybase.stf.gem.diagram.editor.figures.IBaseFigure#removeDecorator(int)
- */
- public void removeDecorator(int position) {
- // do nothing
- }
-
- /*
- * (non-Javadoc)
- *
- * @see com.sybase.stf.gem.diagram.editor.figures.IBaseFigure#getDecorators()
- */
- public List getDecorators() {
- return null;
- }
-
- // //////////////////////////////////////////////////////////////////////
- // FreeformFigure methods
- // //////////////////////////////////////////////////////////////////////
-
- private WindowFreeformHelper helper = new WindowFreeformHelper(this);
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.draw2d.FreeformFigure#addFreeformListener(org.eclipse.draw2d.FreeformListener)
- */
- public void addFreeformListener(FreeformListener listener) {
- addListener(FreeformListener.class, listener);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.draw2d.FreeformFigure#fireExtentChanged()
- */
- public void fireExtentChanged() {
- Iterator iter = getListeners(FreeformListener.class);
- while (iter.hasNext())
- ((FreeformListener) iter.next()).notifyFreeformExtentChanged();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.draw2d.FreeformFigure#getFreeformExtent()
- */
- public Rectangle getFreeformExtent() {
- Rectangle r = helper.getFreeformExtent();
- r.x = 0;
- r.y = 0;
- return r;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.draw2d.FreeformFigure#removeFreeformListener(org.eclipse.draw2d.FreeformListener)
- */
- public void removeFreeformListener(FreeformListener listener) {
- removeListener(FreeformListener.class, listener);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.draw2d.FreeformFigure#setFreeformBounds(org.eclipse.draw2d.geometry.Rectangle)
- */
- public void setFreeformBounds(Rectangle bounds) {
- helper.setFreeformBounds(bounds);
- }
-}
\ No newline at end of file
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/preference/WindowFigureListener.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/preference/WindowFigureListener.java
deleted file mode 100644
index e263904..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/preference/WindowFigureListener.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.jsf.facesconfig.ui.preference;
-
-/**
- * @author Bob Brodt
- *
- * Defines an interface for notifying listeners of page switches on a tabbed
- * window figure.
- */
-/*package*/ interface WindowFigureListener {
- /**
- * @param oldIndex
- * @param newIndex
- */
- void tabChanged(int oldIndex, int newIndex);
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/preference/WindowFreeformHelper.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/preference/WindowFreeformHelper.java
deleted file mode 100644
index 55be3a4..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/preference/WindowFreeformHelper.java
+++ /dev/null
@@ -1,139 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.jsf.facesconfig.ui.preference;
-
-import java.util.List;
-
-import org.eclipse.draw2d.FigureListener;
-import org.eclipse.draw2d.FreeformFigure;
-import org.eclipse.draw2d.FreeformLayeredPane;
-import org.eclipse.draw2d.FreeformListener;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.geometry.Insets;
-import org.eclipse.draw2d.geometry.Rectangle;
-
-/**
- * Stolen from org.eclipse.draw2d.FreeformHelper. See also FreeformLayeredPane.
- *
- * @author bbrodt
- */
-/*package*/ class WindowFreeformHelper implements FreeformListener {
- FreeformLayeredPane x;
-
- class ChildTracker implements FigureListener {
- public void figureMoved(IFigure source) {
- invalidate();
- }
- }
-
- private FreeformFigure host;
-
- private Rectangle freeformExtent;
-
- private FigureListener figureListener = new ChildTracker();
-
- /**
- * @param host
- */
- public WindowFreeformHelper(FreeformFigure host) {
- this.host = host;
- }
-
- /**
- * @return the freeform extent
- */
- public Rectangle getFreeformExtent() {
- if (freeformExtent != null)
- return freeformExtent;
- Rectangle r;
- List children = host.getChildren();
- for (int i = 0; i < children.size(); i++) {
- IFigure child = (IFigure) children.get(i);
- if (child instanceof FreeformFigure)
- r = ((FreeformFigure) child).getFreeformExtent();
- else
- r = child.getBounds();
- if (freeformExtent == null)
- freeformExtent = r.getCopy();
- else
- freeformExtent.union(r);
- }
- Insets insets = host.getInsets();
- if (freeformExtent == null)
- freeformExtent = new Rectangle(0, 0, insets.getWidth(), insets
- .getHeight());
- else {
- host.translateToParent(freeformExtent);
- freeformExtent.expand(insets);
- }
- // System.out.println("New extent calculated for " + host + " = " +
- // freeformExtent);
- return freeformExtent;
- }
-
- /**
- * @param child
- */
- public void hookChild(IFigure child) {
- invalidate();
- if (child instanceof FreeformFigure)
- ((FreeformFigure) child).addFreeformListener(this);
- else
- child.addFigureListener(figureListener);
- }
-
- void invalidate() {
- freeformExtent = null;
- host.fireExtentChanged();
- if (host.getParent() != null)
- host.getParent().revalidate();
- else
- host.revalidate();
- }
-
- public void notifyFreeformExtentChanged() {
- // A childs freeform extent has changed, therefore this extent must be
- // recalculated
- invalidate();
- }
-
- /**
- * @param bounds
- */
- public void setFreeformBounds(Rectangle bounds) {
- host.setBounds(bounds);
- bounds = bounds.getCopy();
- host.translateFromParent(bounds);
- List children = host.getChildren();
- for (int i = 0; i < children.size(); i++) {
- IFigure child = (IFigure) children.get(i);
- if (child instanceof FreeformFigure)
- ((FreeformFigure) child).setFreeformBounds(bounds);
- }
- // CR420954: Compensation Handler canvas goes blank after Variables
- // Sections is expanded
- host.getLayoutManager().layout(host);
- }
-
- /**
- * @param child
- */
- public void unhookChild(IFigure child) {
- invalidate();
- if (child instanceof FreeformFigure)
- ((FreeformFigure) child).removeFreeformListener(this);
- else
- child.removeFigureListener(figureListener);
- }
-
-}
\ No newline at end of file
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/provider/ManagedBeanContentProvider.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/provider/ManagedBeanContentProvider.java
deleted file mode 100644
index 45d15b4..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/provider/ManagedBeanContentProvider.java
+++ /dev/null
@@ -1,138 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.jsf.facesconfig.ui.provider;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.jface.viewers.ITreeContentProvider;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jst.jsf.facesconfig.emf.FacesConfigType;
-import org.eclipse.jst.jsf.facesconfig.emf.ManagedBeanType;
-import org.eclipse.jst.jsf.facesconfig.ui.section.ManagedBeanScopeTreeItem;
-
-/**
- * Managed bean Content Provider.
- * <p>
- * <b>Provides grouping by Scope.</b>
- * </p>
- *
- * @author Xiao-guang Zhang, sfshi
- * @version 1.5
- */
-public class ManagedBeanContentProvider implements ITreeContentProvider {
-
- private List scopeItemList = null;
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.ITreeContentProvider#getChildren(Object
- * parent)
- */
- public Object[] getChildren(Object parent) {
-
- if (parent instanceof FacesConfigType) {
- if (scopeItemList == null) {
- scopeItemList = new ArrayList();
- for (int i = 0; i < ManagedBeanScopeTreeItem.scopeItems.length; i++) {
- ManagedBeanScopeTreeItem scopeTreeItem = new ManagedBeanScopeTreeItem(
- ManagedBeanScopeTreeItem.scopeItems[i],
- (FacesConfigType) parent);
- scopeItemList.add(scopeTreeItem);
- }
- }
- return scopeItemList.toArray();
- } else if (parent instanceof ManagedBeanScopeTreeItem) {
- return ((ManagedBeanScopeTreeItem) parent).getChildren().toArray();
- }
-
- return new Object[0];
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.ITreeContentProvider#getElements(Object
- * parent)
- */
- public Object[] getElements(Object inputElement) {
- return getChildren(inputElement);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.ITreeContentProvider#getParent(java.lang.Object)
- */
- public Object getParent(Object element) {
- if (element instanceof ManagedBeanScopeTreeItem) {
- return ((ManagedBeanScopeTreeItem) element).getParent();
- } else if (element instanceof ManagedBeanType) {
- String scope = null;
- if (((ManagedBeanType) element).getManagedBeanScope() != null) {
- scope = ((ManagedBeanType) element).getManagedBeanScope()
- .getTextContent();
- }
-
- if (scope != null) {
- for (int i = 0; i < scopeItemList.size(); i++) {
- if (((ManagedBeanScopeTreeItem) scopeItemList.get(i))
- .getScope().equals(scope)) {
- return scopeItemList.get(i);
- }
-
- }
- }
- }
-
- return null;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.ITreeContentProvider#hasChildren(java.lang.Object)
- */
- public boolean hasChildren(Object element) {
- if (element instanceof FacesConfigType) {
- return true;
- } else if (element instanceof ManagedBeanScopeTreeItem) {
- return ((ManagedBeanScopeTreeItem) element).hasChildren();
- }
- return false;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.IContentProvider#dispose()
- */
- public void dispose() {
- // TODO Auto-generated method stub
-
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.IContentProvider#inputChanged(org.eclipse.jface.viewers.Viewer,
- * java.lang.Object, java.lang.Object)
- */
- public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
- if (newInput != null) {
-// initialize(newInput);
- }
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/provider/ManagedBeanLabelProvider.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/provider/ManagedBeanLabelProvider.java
deleted file mode 100644
index 8a51f08..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/provider/ManagedBeanLabelProvider.java
+++ /dev/null
@@ -1,121 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui.provider;
-
-import java.util.Hashtable;
-import java.util.Map;
-
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.jst.jsf.facesconfig.emf.ManagedBeanType;
-import org.eclipse.jst.jsf.facesconfig.ui.EditorPlugin;
-import org.eclipse.jst.jsf.facesconfig.ui.IFacesConfigConstants;
-import org.eclipse.jst.jsf.facesconfig.ui.section.ManagedBeanScopeTreeItem;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.ui.ISharedImages;
-import org.eclipse.ui.PlatformUI;
-
-/**
- * The Managed Bean Page's TreeViewer Label Provider
- *
- * @author Xiao-guang Zhang, sfshi
- * @version 1.5
- */
-public class ManagedBeanLabelProvider extends LabelProvider {
-
- private static final String SCOPE_IMAGE_FILE = "Scope.gif"; //$NON-NLS-1$
- private static final String SCOPE_NONE_IMAGE_FILE = "Scope_None.gif"; //$NON-NLS-1$
- private static final String SCOPE_APPLICATION_IMAGE_FILE = "Scope_Application.gif"; //$NON-NLS-1$
- private static final String SCOPE_REQUEST_IMAGE_FILE = "Scope_Request.gif"; //$NON-NLS-1$
- private static final String SCOPE_SESSION_IMAGE_FILE = "Scope_Session.gif"; //$NON-NLS-1$
- private static final String MANAGED_BEAN_IMAGE_FILE = "facesconfig/FacesConfig_ManagedBean.gif"; //$NON-NLS-1$
-
- /** Cache of images that have been dispensed by this provider */
- private Map imageTable;
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.LabelProvider#getText(Object obj)
- */
- public String getText(Object obj) {
- String text = ""; //$NON-NLS-1$
-
- if (obj instanceof ManagedBeanType) {
- ManagedBeanType bean = (ManagedBeanType) obj;
- if (bean.getManagedBeanName() != null) {
- text = bean.getManagedBeanName().getTextContent();
-
- }
- if (text == null || text.length() < 1) {
- if (bean.getManagedBeanClass() != null)
- text = bean.getManagedBeanClass().getTextContent();
- }
- } else if (obj instanceof ManagedBeanScopeTreeItem) {
- text = ((ManagedBeanScopeTreeItem) obj).getScope();
- }
-
- return text;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.LabelProvider#getImage(Object obj)
- */
- public Image getImage(Object obj) {
- ImageDescriptor imageDesc = null;
- if (obj instanceof ManagedBeanType) {
-
- imageDesc = EditorPlugin.getDefault().getImageDescriptor(
- MANAGED_BEAN_IMAGE_FILE);
-
- } else if (obj instanceof ManagedBeanScopeTreeItem) {
- ManagedBeanScopeTreeItem scopeTreeItem = (ManagedBeanScopeTreeItem) obj;
- if (IFacesConfigConstants.MANAGED_BEAN_SCOPE_SESSION
- .equals(scopeTreeItem.getScope())) {
- imageDesc = EditorPlugin.getDefault().getImageDescriptor(
- SCOPE_SESSION_IMAGE_FILE);
- } else if (IFacesConfigConstants.MANAGED_BEAN_SCOPE_REQUEST
- .equals(scopeTreeItem.getScope())) {
- imageDesc = EditorPlugin.getDefault().getImageDescriptor(
- SCOPE_REQUEST_IMAGE_FILE);
- } else if (IFacesConfigConstants.MANAGED_BEAN_SCOPE_APPLICATION
- .equals(scopeTreeItem.getScope())) {
- imageDesc = EditorPlugin.getDefault().getImageDescriptor(
- SCOPE_APPLICATION_IMAGE_FILE);
- } else if (IFacesConfigConstants.MANAGED_BEAN_SCOPE_NONE
- .equals(scopeTreeItem.getScope())) {
- imageDesc = EditorPlugin.getDefault().getImageDescriptor(
- SCOPE_NONE_IMAGE_FILE);
- } else {
- imageDesc = EditorPlugin.getDefault().getImageDescriptor(
- SCOPE_IMAGE_FILE);
- }
- }
-
- if (imageDesc != null) {
- // Obtain the cached image corresponding to the descriptor
- if (imageTable == null) {
- imageTable = new Hashtable(40);
- }
- Image image = (Image) imageTable.get(imageDesc);
- if (image == null) {
- image = imageDesc.createImage();
- imageTable.put(imageDesc, image);
- }
- return image;
- }
- return PlatformUI.getWorkbench().getSharedImages().getImage(
- ISharedImages.IMG_OBJ_ELEMENT);
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/AbstractFacesConfigSection.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/AbstractFacesConfigSection.java
deleted file mode 100644
index 88dc8d8..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/AbstractFacesConfigSection.java
+++ /dev/null
@@ -1,295 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui.section;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.edit.domain.EditingDomain;
-import org.eclipse.help.HelpSystem;
-import org.eclipse.help.IContext;
-import org.eclipse.help.IHelpResource;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.ISelectionProvider;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jst.jsf.facesconfig.ui.EditorPlugin;
-import org.eclipse.jst.jsf.facesconfig.ui.page.IFacesConfigPage;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.forms.IManagedForm;
-import org.eclipse.ui.forms.SectionPart;
-import org.eclipse.ui.forms.events.HyperlinkAdapter;
-import org.eclipse.ui.forms.events.HyperlinkEvent;
-import org.eclipse.ui.forms.widgets.ExpandableComposite;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-import org.eclipse.ui.forms.widgets.ImageHyperlink;
-import org.eclipse.ui.forms.widgets.Section;
-
-
-/**
- * The abstract implementation of IFacesConfigSection.
- *
- *
- * @author jchoi, xgzhang, sfshi
- *
- * @version 1.0
- */
-public abstract class AbstractFacesConfigSection extends SectionPart implements
- IFacesConfigSection, ISelectionProvider, ISelectionChangedListener {
- /** tool kit */
- private FormToolkit toolkit;
-
- /** help context id */
- private String helpContextId = null;
-
- /** help tool tip string */
- private String helpTooltip = null;
-
- /** model object */
- private Object input = null;
-
- private IFacesConfigPage page;
-
- private List selectionChangedListeners = new ArrayList();
-
- /** help image */
- private final static Image HELP_IMAGE = EditorPlugin.getDefault().getImage(
- "help.gif"); //$NON-NLS-1$
-
- /**
- * Constructor with help option.
-
- * @param parent
- * @param managedForm
- * @param page
- * @param toolkit
- * @param helpContextId
- * @param helpTooltip
- */
- public AbstractFacesConfigSection(Composite parent,
- IManagedForm managedForm, IFacesConfigPage page,
- FormToolkit toolkit, String helpContextId, String helpTooltip) {
- super(parent, toolkit, ExpandableComposite.TITLE_BAR
- | ExpandableComposite.TWISTIE | Section.DESCRIPTION
- | ExpandableComposite.EXPANDED);
- super.initialize(managedForm);
- this.page = page;
- this.toolkit = toolkit;
- this.helpContextId = helpContextId;
- this.helpTooltip = helpTooltip;
- }
-
- public void dispose() {
- selectionChangedListeners.clear();
- if (input != null)
- removeAdaptersFromInput(input);
- super.dispose();
- }
- /**
- *
- */
- public void initialize() {
- if (helpContextId != null) {
- createTextClientWithHelp();
- }
-
- getSection().setLayout(new GridLayout());
-
- Composite clientContainer = toolkit.createComposite(getSection());
- GridData gd = new GridData(GridData.FILL_BOTH);
- clientContainer.setLayoutData(gd);
-
- createContents(clientContainer, toolkit);
- getSection().setClient(clientContainer);
-
- }
-
- /**
- *
- *
- */
- private void createTextClientWithHelp() {
- ImageHyperlink helpImage = new ImageHyperlink(getSection(), SWT.NULL);
-
- toolkit.adapt(helpImage, true, true);
-
- helpImage.setImage(HELP_IMAGE);
-
- helpImage.setBackground(getSection().getTitleBarGradientBackground());
- if (helpTooltip != null) {
- helpImage.setToolTipText(helpTooltip);
- }
-
- helpImage.addHyperlinkListener(new HyperlinkAdapter() {
- public void linkActivated(HyperlinkEvent e) {
- IContext context = HelpSystem.getContext(helpContextId);
- if (context != null) {
- IHelpResource[] topics = context.getRelatedTopics();
- if (topics != null && topics.length == 1) {
- EditorPlugin.getDefault().getWorkbench()
- .getHelpSystem().displayHelpResource(
- topics[0].getHref());
- } else {
- EditorPlugin.getDefault().getWorkbench()
- .getHelpSystem().displayHelp(helpContextId);
- }
- }
- }
- });
-
- getSection().setTextClient(helpImage);
- }
-
- /**
- * The sub calss should implement this method to create and fill the
- * contents in the section
- *
- * @param container
- * @param toolkit_
- */
- protected abstract void createContents(Composite container,
- FormToolkit toolkit_);
-
- /**
- * get the input object of this section.
- */
- public Object getInput() {
- return input;
- }
-
- /**
- * set input object for this section.
- */
- public void setInput(Object newInput) {
- if (input != null)
- removeAdaptersFromInput(input);
-
- input = newInput;
-
- if (newInput != null)
- addAdaptersOntoInput(newInput);
- // if (this.getSection().isExpanded())
- refreshAll();
- }
-
- /**
- * Remove adapters from the input object when the section changes it's
- * input. Sub classes should overwrite this method to remove the adapters
- * that they added on.
- *
- * @param oldInput
- */
- protected void removeAdaptersFromInput(Object oldInput) {
- // do nothing; subs should override
- }
-
- /**
- * Add adapters onto the input object when the section has new input. Sub
- * classes should their own adapters.
- *
- * @param newInput
- */
- protected void addAdaptersOntoInput(Object newInput) {
- // do nothing; subs should override
- }
-
- /**
- * @return the page that this section lies in.
- */
- public IFacesConfigPage getPage() {
- return page;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.ISelectionProvider#getSelection()
- */
- public ISelection getSelection() {
- return StructuredSelection.EMPTY;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.ISelectionProvider#setSelection(org.eclipse.jface.viewers.ISelection)
- */
- public void setSelection(ISelection selection) {
- // do nothing: no selection change
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.ISelectionProvider#addSelectionChangedListener(org.eclipse.jface.viewers.ISelectionChangedListener)
- */
- public void addSelectionChangedListener(ISelectionChangedListener listener) {
- selectionChangedListeners.add(listener);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.ISelectionProvider#removeSelectionChangedListener(org.eclipse.jface.viewers.ISelectionChangedListener)
- */
- public void removeSelectionChangedListener(
- ISelectionChangedListener listener) {
- selectionChangedListeners.remove(listener);
- }
-
- /**
- * transfer the selection changed event to detail part.
- */
- public void selectionChanged(SelectionChangedEvent event) {
-
- for (Iterator listeners = selectionChangedListeners.iterator(); listeners
- .hasNext();) {
- ISelectionChangedListener listener = (ISelectionChangedListener) listeners
- .next();
- listener.selectionChanged(new SelectionChangedEvent(this,
- event != null ? event.getSelection()
- : StructuredSelection.EMPTY));
- }
- }
-
- /**
- * the convenient method to get the AdapterFactory instance of the editor;
- *
- * @return the AdapterFactory instance.
- */
- public AdapterFactory getAdapterFactory() {
- return (AdapterFactory) getPage().getEditor().getAdapter(
- AdapterFactory.class);
- }
-
- /**
- * the convenient method to get the EditingDomain instance of the editor;
- *
- * @return the EditingDomain instance.
- */
- public EditingDomain getEditingDomain() {
- return (EditingDomain) getPage().getEditor().getAdapter(
- EditingDomain.class);
- }
-
- public void clearAll()
- {
- // do nothing, sub-classes may choose to override to clear their contents
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/AbstractOverviewSection.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/AbstractOverviewSection.java
deleted file mode 100644
index b8e13ba..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/AbstractOverviewSection.java
+++ /dev/null
@@ -1,136 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.jsf.facesconfig.ui.section;
-
-import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
-import org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider;
-import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jst.jsf.common.ui.internal.actions.OpenPageAction;
-import org.eclipse.jst.jsf.facesconfig.ui.page.IFacesConfigPage;
-import org.eclipse.swt.events.MouseAdapter;
-import org.eclipse.swt.events.MouseEvent;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.ui.forms.IManagedForm;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-
-/**
- * @author sfshi
- *
- */
-public abstract class AbstractOverviewSection extends
- AbstractFacesConfigSection {
-
- /**
- * the common table viewer used for the contents
- */
- protected TableViewer tableViewer;
-
- private String targetPageID;
-
- /**
- *
- * @param parent
- * @param managedForm
- * @param page
- * @param toolkit
- * @param targetPageID
- * @param title
- * @param description
- * @param helpContextId
- * @param helpTooltip
- */
- public AbstractOverviewSection(Composite parent, IManagedForm managedForm,
- IFacesConfigPage page, FormToolkit toolkit, String targetPageID,
- String title, String description, String helpContextId,
- String helpTooltip) {
- super(parent, managedForm, page, toolkit, helpContextId, helpTooltip);
- this.targetPageID = targetPageID;
- getSection().setText(title);
- getSection().setDescription(description);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.jsf.facesconfig.ui.section.AbstractFacesConfigSection#createContents(org.eclipse.swt.widgets.Composite,
- * org.eclipse.ui.forms.widgets.FormToolkit)
- */
- protected void createContents(Composite container, FormToolkit toolkit) {
-
- GridLayout layout = new GridLayout();
- layout.numColumns = 1;
- layout.marginHeight = 2;
- layout.marginWidth = 2;
- layout.verticalSpacing = 5;
- layout.horizontalSpacing = 6;
- container.setLayout(layout);
- toolkit.paintBordersFor(container);
- Table table = createTable(container);
- if (targetPageID != null) {
- table.addMouseListener(new MouseAdapter() {
- public void mouseDoubleClick(MouseEvent e) {
- if (((IStructuredSelection) tableViewer.getSelection())
- .size() == 1) {
- OpenPageAction action = new OpenPageAction();
- action.setPageName(targetPageID);
- action.setSelection(tableViewer.getSelection());
- action.run();
- }
- }
- });
- }
- tableViewer = new TableViewer(table);
- tableViewer.setContentProvider(new AdapterFactoryContentProvider(
- getAdapterFactory()));
- ComposedAdapterFactory factory = (ComposedAdapterFactory)getAdapterFactory();
- tableViewer.setLabelProvider(new AdapterFactoryLabelProvider(factory));
- configTableViewer(tableViewer);
- }
-
- /**
- *
- * @param container
- * @return the table
- */
- abstract protected Table createTable(Composite container);
-
- /**
- *
- * @param tableViewer1
- */
- abstract protected void configTableViewer(TableViewer tableViewer1);
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.jsf.facesconfig.ui.section.IFacesConfigSection#clearAll()
- */
- public void clearAll() {
- tableViewer.setInput(null);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.jsf.facesconfig.ui.section.IFacesConfigSection#refreshAll()
- */
- public void refreshAll() {
- tableViewer.setInput(getInput());
-
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/ApplicationSection.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/ApplicationSection.java
deleted file mode 100644
index b121d0e..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/ApplicationSection.java
+++ /dev/null
@@ -1,216 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui.section;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.emf.common.command.Command;
-import org.eclipse.emf.common.command.CompoundCommand;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.edit.command.AddCommand;
-import org.eclipse.jdt.ui.IJavaElementSearchConstants;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerFilter;
-import org.eclipse.jst.jsf.facesconfig.emf.ApplicationType;
-import org.eclipse.jst.jsf.facesconfig.emf.FacesConfigFactory;
-import org.eclipse.jst.jsf.facesconfig.emf.FacesConfigPackage;
-import org.eclipse.jst.jsf.facesconfig.emf.FacesConfigType;
-import org.eclipse.jst.jsf.facesconfig.ui.dialog.DialogUtil;
-import org.eclipse.jst.jsf.facesconfig.ui.page.IFacesConfigPage;
-import org.eclipse.jst.jsf.facesconfig.ui.page.OthersPage;
-import org.eclipse.jst.jsf.facesconfig.ui.util.ModelUtil;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.forms.IManagedForm;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-
-/**
- * A common <code>IFacesConfigSection</code> implementation for the sections that editing
- * the child elements of <application>, including: <action-listener>,
- * <default-render-kit-id>, <message-bundle>, <navigation-handler>,
- * <view-handler>,<state-manager>, <property-resolver>, <variable-resolver> and
- * <locale-config>. This sections will use the EClass object of these elements
- * as the key.
- *
- * @author Zhi-peng Zhang, sfshi
- * @version
- */
-public class ApplicationSection extends OthersPageBaseSection {
-
- /** The Eclass object this Section operated */
- private EClass applicationChildClass;
-
- /**
- *
- * @param applicationChildClass
- * @param parent
- * @param managedForm
- * @param page
- * @param toolkit
- * @param helpContextId
- * @param helpTooltip
- */
- public ApplicationSection(EClass applicationChildClass, Composite parent,
- IManagedForm managedForm, IFacesConfigPage page,
- FormToolkit toolkit, String helpContextId, String helpTooltip) {
- super(parent, managedForm, page, toolkit, helpContextId, helpTooltip);
- this.applicationChildClass = applicationChildClass;
- }
-
- /**
- *
- * @param componentClass
- * @param parent
- * @param managedForm
- * @param page
- * @param toolkit
- */
- public ApplicationSection(EClass componentClass, Composite parent,
- IManagedForm managedForm, IFacesConfigPage page, FormToolkit toolkit) {
- this(componentClass, parent, managedForm, page, toolkit, null, null);
- }
-
- /**
- * Create an object which is instance of <code>applicationChildClass</code>.
- *
- * @return the child class object
- */
- public EObject createApplicationChildObject() {
- String textValue = null;
- IProject project = (IProject) this.getPage().getEditor().getAdapter(
- IProject.class);
- FacesConfigType facesConfig = (FacesConfigType) this.getPage()
- .getInput();
- if (applicationChildClass == FacesConfigPackage.eINSTANCE
- .getDefaultRenderKitIdType()) {
-
- /** Open a dialog to select a render-kit of this faces config. */
- textValue = DialogUtil.openRenderKitDialog(getSection().getShell(),
- facesConfig);
- } else if (applicationChildClass == FacesConfigPackage.eINSTANCE
- .getMessageBundleType()) {
- /**
- * Open a dialog the select the message bundles that in current
- * project. If user select a bundle that already declared in this
- * faces config, then shows a warning message.
- */
- List bundles = new ArrayList();
- if (facesConfig.getApplication().size() > 0) {
- ApplicationType applicationType = (ApplicationType) facesConfig
- .getApplication().get(0);
- bundles = applicationType.getMessageBundle();
- }
-
- textValue = DialogUtil.openMessageBundleDialog(getSection()
- .getShell(), project, bundles);
-
- } else {
- /**
- * For other types children, open a ClassDialog to select a class in
- * current project.
- */
- String superType = ModelUtil.getSuperType(applicationChildClass);
- textValue = DialogUtil.openClassDialog(getSection().getShell(),
- project, superType,
- IJavaElementSearchConstants.CONSIDER_ALL_TYPES);
- }
- if (textValue != null && textValue.length() > 0) {
- EObject component = FacesConfigFactory.eINSTANCE
- .create(applicationChildClass);
- // set text content.
- EStructuralFeature feature = applicationChildClass
- .getEStructuralFeatures().get(0);
- component.eSet(feature, textValue);
- return component;
- }
- return null;
- }
-
- /**
- * Set the <application> element as the structuredViewer's input.
- *
- * @param input
- */
- protected void setViewerInput(Object input) {
- if (input instanceof ApplicationType) {
- tableViewer.setInput(input);
- } else
- tableViewer.setInput(null);
- }
-
- /**
- * Add a filter on the table viewer. Only the elements that is a instance of
- * <code>applicationChildClass</code> could be selected.
- */
- protected void configTableViewer(TableViewer tableViewer1) {
- tableViewer1.addFilter(new ViewerFilter() {
- public boolean select(Viewer viewer, Object parentElement,
- Object element) {
- return applicationChildClass.isInstance(element);
- }
- });
- }
-
- /**
- * Perform some actions to create new child object and append it to the
- * <application> element.
- */
- void addButtonSelected(SelectionEvent e) {
- /** Create such a new object. */
- EObject obj = createApplicationChildObject();
- if (obj != null) {
-
- boolean needRefreshAll = false;
- Command command = null;
- if (getInput() instanceof ApplicationType) {
- /**
- * The input is a <application> element and not null, append the
- * new object to it.
- */
- ApplicationType application = (ApplicationType) getInput();
- command = AddCommand.create(getEditingDomain(), application,
- null, obj);
- } else {
- /**
- * The input is null, create a <application> element and append
- * it to <faces-config>.
- */
- needRefreshAll = true;
-
- List list = new ArrayList(2);
- ApplicationType application = FacesConfigFactory.eINSTANCE
- .createApplicationType();
- Command cmd1 = AddCommand.create(getEditingDomain(),
- application, null, obj);
- list.add(cmd1);
- Command cmd2 = AddCommand.create(getEditingDomain(), this
- .getPage().getInput(), null, application);
- list.add(cmd2);
- command = new CompoundCommand(list);
- }
-
- if (command.canExecute()) {
- getEditingDomain().getCommandStack().execute(command);
- if (needRefreshAll) {
- /** reset the application input. */
- ((OthersPage) this.getPage()).resetApplicationInput();
- }
- }
- }
-
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/AttributeSection.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/AttributeSection.java
deleted file mode 100644
index 687ffcf..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/AttributeSection.java
+++ /dev/null
@@ -1,509 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui.section;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.Assert;
-import org.eclipse.emf.common.command.Command;
-import org.eclipse.emf.common.command.CompoundCommand;
-import org.eclipse.emf.edit.command.AddCommand;
-import org.eclipse.emf.edit.command.RemoveCommand;
-import org.eclipse.emf.edit.command.SetCommand;
-import org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider;
-import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.viewers.ColumnWeightData;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.TableLayout;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerFilter;
-import org.eclipse.jst.jsf.facesconfig.emf.AttributeClassType;
-import org.eclipse.jst.jsf.facesconfig.emf.AttributeNameType;
-import org.eclipse.jst.jsf.facesconfig.emf.AttributeType;
-import org.eclipse.jst.jsf.facesconfig.emf.DefaultValueType;
-import org.eclipse.jst.jsf.facesconfig.emf.FacesConfigFactory;
-import org.eclipse.jst.jsf.facesconfig.emf.FacesConfigPackage;
-import org.eclipse.jst.jsf.facesconfig.emf.SuggestedValueType;
-import org.eclipse.jst.jsf.facesconfig.ui.EditorPlugin;
-import org.eclipse.jst.jsf.facesconfig.ui.EditorMessages;
-import org.eclipse.jst.jsf.facesconfig.ui.dialog.AddEditAttributeDialog;
-import org.eclipse.jst.jsf.facesconfig.ui.page.IFacesConfigPage;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.MouseAdapter;
-import org.eclipse.swt.events.MouseEvent;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.TableColumn;
-import org.eclipse.ui.forms.IManagedForm;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-
-/**
- * Attribute section
- *
- */
-public class AttributeSection extends AbstractFacesConfigSection {
-
- private static final int TABLE_DEFAULT_HEIGHT = 160;
-
- private TableViewer tableViewer;
-
- private Button removeButton;
-
- private Button editButton;
-
- /**
- *
- * @param parent
- * @param managedForm
- * @param page
- * @param toolkit
- */
- public AttributeSection(Composite parent, IManagedForm managedForm,
- IFacesConfigPage page, FormToolkit toolkit) {
- super(parent, managedForm, page, toolkit, null, null);
- this.getSection().setText(EditorMessages.AttributeSection_Name);
- this.getSection().setDescription(
- EditorMessages.AttributeSection_Description);
-
- }
-
- /**
- *
- */
- protected void createContents(Composite container, FormToolkit toolkit) {
- GridLayout gl = new GridLayout();
- gl.horizontalSpacing = 0;
- gl.marginWidth = 0;
- gl.numColumns = 2;
- container.setLayout(gl);
- GridData td = new GridData(GridData.FILL_BOTH);
- container.setLayoutData(td);
-
- toolkit.paintBordersFor(container);
-
- Composite attributeSection = toolkit.createComposite(container);
- GridLayout gl2 = new GridLayout();
- gl2.horizontalSpacing = 0;
- gl2.verticalSpacing = 0;
- gl2.marginWidth = 0;
- gl2.marginHeight = 0;
- gl2.numColumns = 2;
- attributeSection.setLayout(gl2);
- GridData gd = new GridData(GridData.FILL_BOTH
- | GridData.VERTICAL_ALIGN_BEGINNING);
- attributeSection.setLayoutData(gd);
-
- createTableSection(attributeSection, toolkit);
- createButtonsSection(attributeSection, toolkit);
-
- }
-
- /**
- * create table section
- *
- * @param container
- * @param toolkit
- */
- private void createTableSection(Composite container, FormToolkit toolkit) {
- Composite tableContainer = toolkit.createComposite(container);
- GridData gd = new GridData(GridData.FILL_BOTH
- | GridData.GRAB_HORIZONTAL);
- tableContainer.setLayoutData(gd);
- toolkit.paintBordersFor(tableContainer);
-
- GridLayout gl = new GridLayout();
- tableContainer.setLayout(gl);
-
- Table table = new Table(tableContainer, SWT.H_SCROLL | SWT.V_SCROLL
- | SWT.FULL_SELECTION | SWT.BORDER);
- gd = new GridData(GridData.FILL_BOTH);
- gd.horizontalSpan = 1;
- gd.heightHint = TABLE_DEFAULT_HEIGHT;
- table.setLayoutData(gd);
-
- table.setHeaderVisible(true);
- table.setLinesVisible(true);
- TableLayout layout = new TableLayout();
- table.setLayout(layout);
-
- TableColumn nameCol = new TableColumn(table, SWT.NONE);
- layout.addColumnData(new ColumnWeightData(1, true));
- nameCol
- .setText(EditorMessages.AttributeSection_Table_NameColumn);
-
- TableColumn classCol = new TableColumn(table, SWT.NONE);
- layout.addColumnData(new ColumnWeightData(1, true));
- classCol
- .setText(EditorMessages.AttributeSection_Table_ClassColumn);
-
- TableColumn valueCol = new TableColumn(table, SWT.NONE);
- layout.addColumnData(new ColumnWeightData(1, true));
- valueCol
- .setText(EditorMessages.AttributeSection_Table_DefaultValueColumn);
-
- TableColumn suggestedValueCol = new TableColumn(table, SWT.NONE);
- layout.addColumnData(new ColumnWeightData(1, true));
- suggestedValueCol
- .setText(EditorMessages.AttributeSection_Table_SuggestedValueColumn);
-
- table.addSelectionListener(new SelectionAdapter() {
- public void widgetSelected(SelectionEvent e) {
- updateButtons();
- }
- });
-
- table.addMouseListener(new MouseAdapter() {
- public void mouseDoubleClick(MouseEvent e) {
- if (((IStructuredSelection) tableViewer.getSelection()).size() > 0)
- editButtonSelected();
- }
- });
-
- tableViewer = new TableViewer(table);
- tableViewer.setContentProvider(new AdapterFactoryContentProvider(
- getAdapterFactory()));
- tableViewer.setLabelProvider(new AdapterFactoryLabelProvider(
- getAdapterFactory()));
-
- tableViewer.addFilter(new ViewerFilter() {
- public boolean select(Viewer viewer, Object parentElement,
- Object element) {
- return FacesConfigPackage.eINSTANCE.getAttributeType()
- .isInstance(element);
- }
- });
-
- tableViewer.addSelectionChangedListener(this);
- }
-
- /**
- * Update the buttons' enable and disable status
- */
- private void updateButtons() {
- if (((IStructuredSelection) tableViewer.getSelection()).size() > 0) {
- editButton.setEnabled(true);
- removeButton.setEnabled(true);
- } else {
- editButton.setEnabled(false);
- removeButton.setEnabled(false);
- }
- }
-
- /**
- * create buttons
- *
- * @param container
- * @param toolkit
- */
- private void createButtonsSection(Composite container, FormToolkit toolkit) {
- // create operation buttons's container
- Composite operationContainer = toolkit.createComposite(container);
- GridData gd = new GridData(GridData.FILL_VERTICAL
- | GridData.VERTICAL_ALIGN_BEGINNING);
- operationContainer.setLayoutData(gd);
- GridLayout gl = new GridLayout();
- operationContainer.setLayout(gl);
-
- Button addButton = toolkit.createButton(operationContainer,
- EditorMessages.UI_Button_Add_more,
- SWT.PUSH);
- gd = new GridData(GridData.FILL_HORIZONTAL
- | GridData.VERTICAL_ALIGN_BEGINNING);
- gd.grabExcessHorizontalSpace = false;
- addButton.setLayoutData(gd);
-
- editButton = toolkit.createButton(operationContainer,
- EditorMessages.UI_Button_Edit_more,
- SWT.PUSH);
- gd = new GridData(GridData.FILL_HORIZONTAL
- | GridData.VERTICAL_ALIGN_BEGINNING);
- gd.grabExcessHorizontalSpace = false;
- editButton.setLayoutData(gd);
-
- removeButton = toolkit.createButton(operationContainer,
- EditorMessages.UI_Button_Remove,
- SWT.PUSH);
- gd = new GridData(GridData.FILL_HORIZONTAL
- | GridData.VERTICAL_ALIGN_BEGINNING);
- gd.grabExcessHorizontalSpace = false;
- removeButton.setLayoutData(gd);
-
- addButton.addSelectionListener(new SelectionAdapter() {
-
- public void widgetSelected(SelectionEvent e) {
- addButtonSelected();
- }
-
- });
-
- editButton.addSelectionListener(new SelectionAdapter() {
-
- public void widgetSelected(SelectionEvent e) {
- editButtonSelected();
- }
-
- });
- removeButton.addSelectionListener(new SelectionAdapter() {
-
- public void widgetSelected(SelectionEvent e) {
- removeButtonSelected();
- }
-
- });
- }
-
- /**
- *
- */
- public void refreshAll() {
- tableViewer.setInput(getInput());
- updateButtons();
-
- }
-
- /**
- *
- */
- public void refresh() {
- super.refresh();
- tableViewer.refresh();
- updateButtons();
- }
-
- /**
- * add an attribute.
- *
- */
- private void addButtonSelected() {
- Shell shell = EditorPlugin.getActiveShell();
-
- AddEditAttributeDialog dialog = new AddEditAttributeDialog(shell, true);
- dialog.setProject((IProject) getPage().getEditor().getAdapter(
- IProject.class));
- if (dialog.open() == Dialog.OK) {
-
- // AttributeType newAttribute = dialog.getResult();
- AttributeType newAttribute = FacesConfigFactory.eINSTANCE
- .createAttributeType();
-
- if (dialog.getAttributeName().length() > 0) {
- AttributeNameType attributeNameType = FacesConfigFactory.eINSTANCE
- .createAttributeNameType();
- attributeNameType.setTextContent(dialog.getAttributeName());
- newAttribute.setAttributeName(attributeNameType);
- }
-
- if (dialog.getAttributeClass().length() > 0) {
- AttributeClassType attributeClassType = FacesConfigFactory.eINSTANCE
- .createAttributeClassType();
- attributeClassType.setTextContent(dialog.getAttributeClass());
- newAttribute.setAttributeClass(attributeClassType);
- }
-
- if (dialog.getDefaultValue().length() > 0) {
- DefaultValueType defaultValueType = FacesConfigFactory.eINSTANCE
- .createDefaultValueType();
- defaultValueType.setTextContent(dialog.getDefaultValue());
- newAttribute.setDefaultValue(defaultValueType);
- }
-
- if (dialog.getSuggestedValue().length() > 0) {
- SuggestedValueType suggestedValueType = FacesConfigFactory.eINSTANCE
- .createSuggestedValueType();
- suggestedValueType.setTextContent(dialog.getSuggestedValue());
- newAttribute.setSuggestedValue(suggestedValueType);
- }
-
- Command addCommand = AddCommand.create(this.getEditingDomain(),
- getInput(), null, newAttribute); // getEReference(),
- // newAttribute);
- if (addCommand.canExecute()) {
- this.getEditingDomain().getCommandStack().execute(addCommand);
-
- }
- }
-
- }
-
- /**
- * edit an attribute.
- *
- */
- private void editButtonSelected() {
-
- AttributeType attribute = (AttributeType) ((IStructuredSelection) tableViewer
- .getSelection()).getFirstElement();
-
- Assert.isNotNull(attribute);
-
- Shell shell = EditorPlugin.getActiveShell();
-
- AddEditAttributeDialog dialog = new AddEditAttributeDialog(shell, false);
- dialog.setProject((IProject) getPage().getEditor().getAdapter(
- IProject.class));
- if (attribute.getAttributeName() != null) {
- dialog.setAttributeName(attribute.getAttributeName()
- .getTextContent());
- }
-
- if (attribute.getAttributeClass() != null) {
- dialog.setAttributeClass(attribute.getAttributeClass()
- .getTextContent());
- }
-
- if (attribute.getDefaultValue() != null) {
- dialog
- .setDefaultValue(attribute.getDefaultValue()
- .getTextContent());
- }
-
- if (attribute.getSuggestedValue() != null) {
- dialog.setSuggestedValue(attribute.getSuggestedValue()
- .getTextContent());
- }
-
- if (dialog.open() == Dialog.OK) {
- List commands = new ArrayList(4);
-
- if (attribute.getAttributeName() != null) {
- Command cmd1 = SetCommand.create(this.getEditingDomain(),
- attribute.getAttributeName(),
- FacesConfigPackage.eINSTANCE
- .getAttributeNameType_TextContent(), dialog
- .getAttributeName());
- commands.add(cmd1);
- } else if (dialog.getAttributeName().length() > 0) {
- AttributeNameType attributeNameType = FacesConfigFactory.eINSTANCE
- .createAttributeNameType();
- attributeNameType.setTextContent(dialog.getAttributeName());
-
- Command cmd2 = AddCommand.create(this.getEditingDomain(),
- attribute, FacesConfigPackage.eINSTANCE
- .getAttributeType_AttributeName(),
- attributeNameType);
- commands.add(cmd2);
- }
-
- if (attribute.getAttributeClass() != null) {
- Command cmd3 = SetCommand.create(this.getEditingDomain(),
- attribute.getAttributeClass(),
- FacesConfigPackage.eINSTANCE
- .getAttributeClassType_TextContent(), dialog
- .getAttributeClass());
- commands.add(cmd3);
- } else if (dialog.getAttributeClass().length() > 0) {
- AttributeClassType attributeClassType = FacesConfigFactory.eINSTANCE
- .createAttributeClassType();
- attributeClassType.setTextContent(dialog.getAttributeClass());
-
- Command cmd4 = AddCommand.create(this.getEditingDomain(),
- attribute, FacesConfigPackage.eINSTANCE
- .getAttributeType_AttributeClass(),
- attributeClassType);
- commands.add(cmd4);
- }
-
- if (attribute.getDefaultValue() != null) {
- Command cmd5 = SetCommand.create(this.getEditingDomain(),
- attribute.getDefaultValue(),
- FacesConfigPackage.eINSTANCE
- .getDefaultValueType_TextContent(), dialog
- .getDefaultValue());
- commands.add(cmd5);
-
- } else if (dialog.getDefaultValue().length() > 0) {
- DefaultValueType defaultValueType = FacesConfigFactory.eINSTANCE
- .createDefaultValueType();
- defaultValueType.setTextContent(dialog.getDefaultValue());
- Command cmd6 = AddCommand.create(this.getEditingDomain(),
- attribute, FacesConfigPackage.eINSTANCE
- .getAttributeType_DefaultValue(),
- defaultValueType);
- commands.add(cmd6);
- }
-
- if (attribute.getSuggestedValue() != null) {
- Command cmd7 = SetCommand.create(this.getEditingDomain(),
- attribute.getSuggestedValue(),
- FacesConfigPackage.eINSTANCE
- .getSuggestedValueType_TextContent(), dialog
- .getSuggestedValue());
- commands.add(cmd7);
- } else if (dialog.getSuggestedValue().length() > 0) {
- SuggestedValueType suggestedValueType = FacesConfigFactory.eINSTANCE
- .createSuggestedValueType();
- suggestedValueType.setTextContent(dialog.getSuggestedValue());
- Command cmd8 = AddCommand.create(this.getEditingDomain(),
- attribute, FacesConfigPackage.eINSTANCE
- .getAttributeType_SuggestedValue(),
- suggestedValueType);
- commands.add(cmd8);
- }
-
- CompoundCommand command = new CompoundCommand(commands);
- if (command.canExecute()) {
- this.getEditingDomain().getCommandStack().execute(command);
- tableViewer.refresh(attribute);
-
- }
- }
-
- }
-
- /**
- * remove an attribute.
- *
- */
- private void removeButtonSelected() {
- AttributeType attribute = (AttributeType) ((IStructuredSelection) tableViewer
- .getSelection()).getFirstElement();
-
- Assert.isNotNull(attribute);
-
- Command removeCommand = RemoveCommand.create(this.getEditingDomain(),
- getInput(), null, attribute);// getEReference(), attribute);
-
- if (removeCommand.canExecute()) {
- this.getEditingDomain().getCommandStack().execute(removeCommand);
- refreshAll();
- }
-
- }
-
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.viewers.ISelectionProvider#getSelection()
- */
- public ISelection getSelection() {
- return tableViewer.getSelection();
- }
-
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.viewers.ISelectionProvider#setSelection(org.eclipse.jface.viewers.ISelection)
- */
- public void setSelection(ISelection selection) {
-
- tableViewer.setSelection(selection);
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/ComponentGeneralSection.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/ComponentGeneralSection.java
deleted file mode 100644
index d3c84e9..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/ComponentGeneralSection.java
+++ /dev/null
@@ -1,406 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui.section;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.emf.common.command.Command;
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.impl.AdapterImpl;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.emf.edit.command.AddCommand;
-import org.eclipse.emf.edit.command.SetCommand;
-import org.eclipse.emf.edit.domain.EditingDomain;
-import org.eclipse.jst.jsf.common.ui.internal.dialogfield.ClassButtonDialogField;
-import org.eclipse.jst.jsf.common.ui.internal.dialogfield.DialogField;
-import org.eclipse.jst.jsf.common.ui.internal.dialogfield.IDialogFieldApplyListener;
-import org.eclipse.jst.jsf.common.ui.internal.dialogfield.LayoutUtil;
-import org.eclipse.jst.jsf.common.ui.internal.dialogfield.StringDialogField;
-import org.eclipse.jst.jsf.facesconfig.emf.ComponentClassType;
-import org.eclipse.jst.jsf.facesconfig.emf.ComponentType;
-import org.eclipse.jst.jsf.facesconfig.emf.ComponentTypeType;
-import org.eclipse.jst.jsf.facesconfig.emf.DescriptionType;
-import org.eclipse.jst.jsf.facesconfig.emf.DisplayNameType;
-import org.eclipse.jst.jsf.facesconfig.emf.FacesConfigFactory;
-import org.eclipse.jst.jsf.facesconfig.emf.FacesConfigPackage;
-import org.eclipse.jst.jsf.facesconfig.ui.EditorMessages;
-import org.eclipse.jst.jsf.facesconfig.ui.IFacesConfigConstants;
-import org.eclipse.jst.jsf.facesconfig.ui.page.IFacesConfigPage;
-import org.eclipse.jst.jsf.facesconfig.ui.util.ModelUtil;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.forms.IManagedForm;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-
-/**
- * The sections that used for displaying and editing the general information of
- * a component, the information includs display name, description, component
- * type and component class.
- *
- * @author sfshi
- *
- */
-public class ComponentGeneralSection extends AbstractFacesConfigSection {
-
- private StringDialogField displayNameField;
-
- private StringDialogField descriptionField;
-
- private StringDialogField componentTypeField;
-
- private ClassButtonDialogField componentClassField;
-
- private ComponentGeneralAdapter componentGeneralAdapter;
-
- /**
- *
- * @param parent
- * @param managedForm
- * @param page
- * @param toolkit
- */
- public ComponentGeneralSection(Composite parent, IManagedForm managedForm,
- IFacesConfigPage page, FormToolkit toolkit) {
- super(parent, managedForm, page, toolkit, null, null);
- getSection()
- .setText(EditorMessages.ComponentGeneralSection_Name);
- getSection().setDescription(
- EditorMessages.ComponentGeneralSection_Description);
- }
-
- /**
- * Create the UI fields.
- */
- protected void createContents(Composite container, FormToolkit toolkit) {
- int numberOfColumns = 4;
- GridLayout layout = new GridLayout(numberOfColumns, false);
- container.setLayout(layout);
- GridData td = new GridData(GridData.FILL_HORIZONTAL);
- container.setLayoutData(td);
-
- toolkit.paintBordersFor(container);
- displayNameField = new StringDialogField();
- displayNameField
- .setLabelText(EditorMessages.ComponentGeneralSection_Label_DisplayName);
- displayNameField.doFillIntoGrid(toolkit, container, numberOfColumns);
-
- displayNameField
- .setDialogFieldApplyListener(new IDialogFieldApplyListener() {
-
- public void dialogFieldApplied(DialogField field) {
- String newDisplayNameValue = ((StringDialogField) field)
- .getText().trim();
- Command cmd = null;
- ComponentType component = (ComponentType) getInput();
- EditingDomain editingDomain = getEditingDomain();
- if (component.getDisplayName().size() > 0) {
- DisplayNameType displayName = (DisplayNameType) component
- .getDisplayName().get(0);
- cmd = SetCommand.create(editingDomain, displayName,
- FacesConfigPackage.eINSTANCE
- .getDisplayNameType_TextContent(),
- newDisplayNameValue);
- } else {
- DisplayNameType displayNameType = FacesConfigFactory.eINSTANCE
- .createDisplayNameType();
- displayNameType.setTextContent(newDisplayNameValue);
-
- /** For the new displayname object, add the adapter. */
- displayNameType.eAdapters().add(
- getComponentGeneralAdapter());
- cmd = AddCommand.create(editingDomain, component,
- FacesConfigPackage.eINSTANCE
- .getComponentType_DisplayName(),
- displayNameType);
- }
- if (cmd.canExecute()) {
- editingDomain.getCommandStack().execute(cmd);
- }
- }
-
- });
-
- descriptionField = new StringDialogField(2);
- descriptionField
- .setLabelText(EditorMessages.ComponentGeneralSection_Label_Description);
- descriptionField.doFillIntoGrid(toolkit, container, numberOfColumns);
-
- descriptionField
- .setDialogFieldApplyListener(new IDialogFieldApplyListener() {
- public void dialogFieldApplied(DialogField field) {
- String newDescriptionValue = ((StringDialogField) field)
- .getText().trim();
-
- newDescriptionValue = ModelUtil
- .escapeEntities(newDescriptionValue);
- Command cmd = null;
- ComponentType component = (ComponentType) getInput();
- EditingDomain editingDomain = getEditingDomain();
- if (component.getDescription().size() > 0) {
- DescriptionType description = (DescriptionType) component
- .getDescription().get(0);
- cmd = SetCommand.create(editingDomain, description,
- FacesConfigPackage.eINSTANCE
- .getDescriptionType_TextContent(),
- newDescriptionValue);
- } else {
- DescriptionType description = FacesConfigFactory.eINSTANCE
- .createDescriptionType();
- description.setTextContent(newDescriptionValue);
- /** For the new description object, add the adapter. */
- description.eAdapters().add(
- getComponentGeneralAdapter());
-
- cmd = AddCommand.create(editingDomain, component,
- FacesConfigPackage.eINSTANCE
- .getComponentType_Description(),
- description);
- }
- if (cmd.canExecute()) {
- editingDomain.getCommandStack().execute(cmd);
- }
- }
- });
-
- componentTypeField = new StringDialogField();
- componentTypeField
- .setLabelText(EditorMessages.ComponentGeneralSection_Label_ComponentType);
- componentTypeField.doFillIntoGrid(toolkit, container, numberOfColumns);
- componentTypeField
- .setDialogFieldApplyListener(new IDialogFieldApplyListener() {
- public void dialogFieldApplied(DialogField field) {
- ComponentTypeType componentType = FacesConfigFactory.eINSTANCE
- .createComponentTypeType();
- componentType
- .setTextContent(((StringDialogField) field)
- .getText());
-
- EditingDomain editingDomain = getEditingDomain();
- if (editingDomain != null) {
- Command command = SetCommand.create(editingDomain,
- getInput(), FacesConfigPackage.eINSTANCE
- .getComponentType_ComponentType(),
- componentType);
- if (command.canExecute()) {
- editingDomain.getCommandStack()
- .execute(command);
- }
- }
- }
- });
-
- componentClassField = new ClassButtonDialogField(null);
- componentClassField
- .setLabelText(EditorMessages.ComponentGeneralSection_Label_ComponentClass);
- componentClassField.doFillIntoGrid(toolkit, container, numberOfColumns);
- LayoutUtil.setHorizontalGrabbing(componentClassField.getTextControl(
- toolkit, container));
- componentClassField.setProject((IProject) getPage().getEditor()
- .getAdapter(IProject.class));
- componentClassField
- .setDialogFieldApplyListener(new IDialogFieldApplyListener() {
- public void dialogFieldApplied(DialogField field) {
-
- ComponentClassType componentClass = FacesConfigFactory.eINSTANCE
- .createComponentClassType();
- componentClass
- .setTextContent(((StringDialogField) field)
- .getText());
- EditingDomain editingDomain = getEditingDomain();
- if (editingDomain != null) {
- Command command = SetCommand.create(editingDomain,
- getInput(), FacesConfigPackage.eINSTANCE
- .getComponentType_ComponentClass(),
- componentClass);
- if (command.canExecute()) {
- editingDomain.getCommandStack()
- .execute(command);
- }
- }
-
- }
- });
- componentClassField
- .setSuperClassName(IFacesConfigConstants.COMPONENT_SUPER_CLASS);
- }
-
- /**
- *
- */
- public void refreshAll() {
- refresh();
- }
-
- /**
- * Refresh the content on this section.
- */
- public void refresh() {
- super.refresh();
- Object input = this.getInput();
- if (input instanceof ComponentType) {
- final ComponentType component = (ComponentType) input;
- refreshControls(component);
- }
- }
-
- private void refreshControls(ComponentType component) {
- if (component.getDisplayName().size() > 0) {
- DisplayNameType displayName = (DisplayNameType) component
- .getDisplayName().get(0);
- displayNameField.setTextWithoutUpdate(displayName
- .getTextContent());
- } else {
- displayNameField.setTextWithoutUpdate(""); //$NON-NLS-1$
- }
-
- if (component.getDescription().size() > 0) {
- DescriptionType description = (DescriptionType) component
- .getDescription().get(0);
- String descriptionString = description.getTextContent();
- descriptionString = ModelUtil.unEscapeEntities(descriptionString);
- descriptionField.setTextWithoutUpdate(descriptionString);
- } else {
- descriptionField.setTextWithoutUpdate(""); //$NON-NLS-1$
- }
-
- if (component.getComponentType() != null) {
- componentTypeField.setTextWithoutUpdate(component
- .getComponentType().getTextContent());
- } else {
- componentTypeField.setTextWithoutUpdate(""); //$NON-NLS-1$
- }
-
- if (component.getComponentClass() != null) {
- componentClassField.setTextWithoutUpdate(component
- .getComponentClass().getTextContent());
- } else {
- componentClassField.setTextWithoutUpdate(""); //$NON-NLS-1$
- }
- }
-
- /**
- * Add ComponentGeneralAdapter onto <component> and the first <display-name>
- * and <description> elements.
- */
- protected void addAdaptersOntoInput(Object newInput) {
- ComponentType component = (ComponentType) newInput;
- if (EcoreUtil.getExistingAdapter(component,
- ComponentGeneralSection.class) == null) {
-
- component.eAdapters().add(getComponentGeneralAdapter());
- }
-
- if (component.getDisplayName().size() > 0) {
- DisplayNameType displayName = (DisplayNameType) component
- .getDisplayName().get(0);
- if (EcoreUtil.getExistingAdapter(displayName,
- ComponentGeneralSection.class) == null) {
-
- displayName.eAdapters().add(getComponentGeneralAdapter());
- }
- }
-
- if (component.getDescription().size() > 0) {
- DescriptionType description = (DescriptionType) component
- .getDescription().get(0);
- if (EcoreUtil.getExistingAdapter(description,
- ComponentGeneralSection.class) == null) {
-
- description.eAdapters().add(getComponentGeneralAdapter());
- }
- }
- }
-
- /**
- * Remove ComponentGeneralAdapter from <component> and the first
- * <display-name> and <description> elements.
- */
- protected void removeAdaptersFromInput(Object oldInput) {
- ComponentType component = (ComponentType) oldInput;
- if (EcoreUtil.getExistingAdapter(component,
- ComponentGeneralSection.class) != null) {
- component.eAdapters().remove(getComponentGeneralAdapter());
- }
- if (component.getDisplayName().size() > 0) {
- DisplayNameType displayName = (DisplayNameType) component
- .getDisplayName().get(0);
- if (EcoreUtil.getExistingAdapter(displayName,
- ComponentGeneralSection.class) != null) {
-
- displayName.eAdapters().remove(getComponentGeneralAdapter());
- }
- }
-
- if (component.getDescription().size() > 0) {
- DescriptionType description = (DescriptionType) component
- .getDescription().get(0);
- if (EcoreUtil.getExistingAdapter(description,
- ComponentGeneralSection.class) != null) {
-
- description.eAdapters().remove(getComponentGeneralAdapter());
- }
- }
- }
-
- /**
- *
- * @return
- */
- private Adapter getComponentGeneralAdapter() {
-
- if (componentGeneralAdapter == null) {
- componentGeneralAdapter = new ComponentGeneralAdapter();
- }
- return componentGeneralAdapter;
- }
-
- /**
- * The adapter that will be added onto <component> element, to listen the
- * events of the children that are displayed in this section, notify the
- * section to refresh.
- *
- * @author sfshi
- *
- */
- class ComponentGeneralAdapter extends AdapterImpl {
-
- public boolean isAdapterForType(Object type) {
- if (type == ComponentGeneralSection.class)
- return true;
- return false;
- }
-
- public void notifyChanged(Notification msg) {
-
- if (msg.getEventType() == Notification.ADD
- || msg.getEventType() == Notification.REMOVE
- || msg.getEventType() == Notification.SET) {
- if (msg.getFeature() == FacesConfigPackage.eINSTANCE
- .getComponentType_ComponentClass()
- || msg.getFeature() == FacesConfigPackage.eINSTANCE
- .getComponentType_ComponentType()
- || msg.getFeature() == FacesConfigPackage.eINSTANCE
- .getComponentType_DisplayName()
- || msg.getFeature() == FacesConfigPackage.eINSTANCE
- .getComponentType_Description()) {
- refresh();
- } else if (msg.getFeature() == FacesConfigPackage.eINSTANCE
- .getDisplayNameType_TextContent()
- || msg.getFeature() == FacesConfigPackage.eINSTANCE
- .getDescriptionType_TextContent()) {
- refresh();
- }
- }
- }
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/ComponentMasterSection.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/ComponentMasterSection.java
deleted file mode 100644
index ca2c0ac..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/ComponentMasterSection.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui.section;
-
-import org.eclipse.emf.common.command.Command;
-import org.eclipse.emf.edit.command.AddCommand;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.viewers.StructuredViewer;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerFilter;
-import org.eclipse.jst.jsf.facesconfig.emf.ComponentType;
-import org.eclipse.jst.jsf.facesconfig.emf.FacesConfigFactory;
-import org.eclipse.jst.jsf.facesconfig.emf.FacesConfigPackage;
-import org.eclipse.jst.jsf.facesconfig.ui.EditorMessages;
-import org.eclipse.jst.jsf.facesconfig.ui.page.FacesConfigMasterDetailPage;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.forms.IManagedForm;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-
-/**
- *
- * @author sfshi
- *
- */
-public class ComponentMasterSection extends FacesConfigMasterSection {
-
- /**
- *
- * @param parent
- * @param managedForm
- * @param toolkit
- * @param page
- */
- public ComponentMasterSection(Composite parent, IManagedForm managedForm,
- FormToolkit toolkit, FacesConfigMasterDetailPage page) {
- super(parent, managedForm, toolkit, page, null, null);
- getSection().setText(EditorMessages.ComponentMasterSection_Name);
- getSection().setDescription(
- EditorMessages.ComponentMasterSection_Description);
- }
-
- /**
- * Config the table viwer, set a filter for it, only the object of
- * ComponentType will be selected.
- */
- protected void configViewer(StructuredViewer structuredViewer) {
- super.configViewer(structuredViewer);
- structuredViewer.addFilter(new ViewerFilter() {
- public boolean select(Viewer viewer, Object parentElement,
- Object element) {
- return FacesConfigPackage.eINSTANCE.getComponentType()
- .isInstance(element);
- }
- });
-
- }
-
- /**
- * Create a new component.
- */
- protected void addButtonSelected(SelectionEvent e) {
- ComponentType component = FacesConfigFactory.eINSTANCE
- .createComponentType();
-
- Command command = AddCommand.create(getEditingDomain(),
- this.getInput(), FacesConfigPackage.eINSTANCE
- .getFacesConfigType_Component(), component);
-
- if (command.canExecute()) {
- getEditingDomain().getCommandStack().execute(command);
- IStructuredSelection selection = new StructuredSelection(component);
- getStructuredViewer().refresh();
- getStructuredViewer().setSelection(selection);
- }
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/ConverterGeneralSection.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/ConverterGeneralSection.java
deleted file mode 100644
index 0e74050..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/ConverterGeneralSection.java
+++ /dev/null
@@ -1,490 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui.section;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.emf.common.command.Command;
-import org.eclipse.emf.common.command.CompoundCommand;
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.impl.AdapterImpl;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.emf.edit.command.AddCommand;
-import org.eclipse.emf.edit.command.SetCommand;
-import org.eclipse.emf.edit.domain.EditingDomain;
-import org.eclipse.jst.jsf.common.ui.internal.dialogfield.ClassButtonDialogField;
-import org.eclipse.jst.jsf.common.ui.internal.dialogfield.DialogField;
-import org.eclipse.jst.jsf.common.ui.internal.dialogfield.IDialogFieldApplyListener;
-import org.eclipse.jst.jsf.common.ui.internal.dialogfield.LayoutUtil;
-import org.eclipse.jst.jsf.common.ui.internal.dialogfield.StringDialogField;
-import org.eclipse.jst.jsf.facesconfig.emf.ConverterClassType;
-import org.eclipse.jst.jsf.facesconfig.emf.ConverterForClassType;
-import org.eclipse.jst.jsf.facesconfig.emf.ConverterIdType;
-import org.eclipse.jst.jsf.facesconfig.emf.ConverterType;
-import org.eclipse.jst.jsf.facesconfig.emf.DescriptionType;
-import org.eclipse.jst.jsf.facesconfig.emf.DisplayNameType;
-import org.eclipse.jst.jsf.facesconfig.emf.FacesConfigFactory;
-import org.eclipse.jst.jsf.facesconfig.emf.FacesConfigPackage;
-import org.eclipse.jst.jsf.facesconfig.ui.EditorMessages;
-import org.eclipse.jst.jsf.facesconfig.ui.IFacesConfigConstants;
-import org.eclipse.jst.jsf.facesconfig.ui.page.IFacesConfigPage;
-import org.eclipse.jst.jsf.facesconfig.ui.util.ModelUtil;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.forms.IManagedForm;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-
-/**
- * @author Bryan Yang
- *
- */
-public class ConverterGeneralSection extends AbstractFacesConfigSection {
-
- private StringDialogField displayNameField;
-
- private StringDialogField descriptionField;
-
- private StringDialogField converterIdField;
-
- private ClassButtonDialogField converterForClassField;
-
- private ClassButtonDialogField converterClassField;
-
- private ConverterGeneralAdapter converterGeneralAdapter;
-
- /**
- *
- * @param parent
- * @param managedForm
- * @param page
- * @param toolkit
- */
- public ConverterGeneralSection(Composite parent, IManagedForm managedForm,
- IFacesConfigPage page, FormToolkit toolkit) {
- super(parent, managedForm, page, toolkit, null, null);
- getSection()
- .setText(EditorMessages.ConverterGeneralSection_Name);
- getSection().setDescription(
- EditorMessages.ConverterGeneralSection_Description);
- }
-
- /**
- *
- */
- protected void createContents(Composite container, FormToolkit toolkit) {
- int numberOfColumns = 4;
- GridLayout layout = new GridLayout(numberOfColumns, false);
- container.setLayout(layout);
- GridData td = new GridData(GridData.FILL_HORIZONTAL);
- container.setLayoutData(td);
-
- toolkit.paintBordersFor(container);
- displayNameField = new StringDialogField();
- displayNameField
- .setLabelText(EditorMessages.ConverterGeneralSection_Label_DisplayName);
- displayNameField.doFillIntoGrid(toolkit, container, numberOfColumns);
-
- displayNameField
- .setDialogFieldApplyListener(new IDialogFieldApplyListener() {
-
- public void dialogFieldApplied(DialogField field) {
- String newDisplayNameValue = ((StringDialogField) field)
- .getText().trim();
- Command cmd = null;
- ConverterType Converter = (ConverterType) getInput();
- EditingDomain editingDomain = getEditingDomain();
- if (Converter.getDisplayName().size() > 0) {
- DisplayNameType displayName = (DisplayNameType) Converter
- .getDisplayName().get(0);
- cmd = SetCommand.create(editingDomain, displayName,
- FacesConfigPackage.eINSTANCE
- .getDisplayNameType_TextContent(),
- newDisplayNameValue);
- } else {
- DisplayNameType displayNameType = FacesConfigFactory.eINSTANCE
- .createDisplayNameType();
- displayNameType.setTextContent(newDisplayNameValue);
-
- displayNameType.eAdapters().add(
- getConverterGeneralAdapter());
- cmd = AddCommand.create(editingDomain, Converter,
- FacesConfigPackage.eINSTANCE
- .getConverterType_DisplayName(),
- displayNameType);
- }
- if (cmd.canExecute()) {
- editingDomain.getCommandStack().execute(cmd);
- }
- }
-
- });
-
- descriptionField = new StringDialogField(2);
- descriptionField
- .setLabelText(EditorMessages.ConverterGeneralSection_Label_Description);
- descriptionField.doFillIntoGrid(toolkit, container, numberOfColumns);
-
- descriptionField
- .setDialogFieldApplyListener(new IDialogFieldApplyListener() {
- public void dialogFieldApplied(DialogField field) {
- String newDescriptionValue = ((StringDialogField) field)
- .getText().trim();
-
- newDescriptionValue = ModelUtil
- .escapeEntities(newDescriptionValue);
- Command cmd = null;
- ConverterType Converter = (ConverterType) getInput();
- EditingDomain editingDomain = getEditingDomain();
- if (Converter.getDescription().size() > 0) {
- DescriptionType description = (DescriptionType) Converter
- .getDescription().get(0);
- cmd = SetCommand.create(editingDomain, description,
- FacesConfigPackage.eINSTANCE
- .getDescriptionType_TextContent(),
- newDescriptionValue);
- } else {
- DescriptionType description = FacesConfigFactory.eINSTANCE
- .createDescriptionType();
- description.setTextContent(newDescriptionValue);
-
- description.eAdapters().add(
- getConverterGeneralAdapter());
- cmd = AddCommand.create(editingDomain, Converter,
- FacesConfigPackage.eINSTANCE
- .getConverterType_Description(),
- description);
- }
- if (cmd.canExecute()) {
- editingDomain.getCommandStack().execute(cmd);
- }
- }
- });
-
- converterIdField = new StringDialogField();
- // converterIdField.setRequired(true);
- converterIdField
- .setLabelText(EditorMessages.ConverterGeneralSection_Label_ConverterID);
- converterIdField.doFillIntoGrid(toolkit, container, numberOfColumns);
- converterIdField
- .setDialogFieldApplyListener(new IDialogFieldApplyListener() {
- public void dialogFieldApplied(DialogField field) {
- ConverterIdType converterIdType = FacesConfigFactory.eINSTANCE
- .createConverterIdType();
-
- converterIdType
- .setTextContent(((StringDialogField) field)
- .getText());
-
- EditingDomain editingDomain = getEditingDomain();
- List commands = new ArrayList(2);
- Command cmd1 = SetCommand.create(editingDomain,
- getInput(), FacesConfigPackage.eINSTANCE
- .getConverterType_ConverterForClass(),
- SetCommand.UNSET_VALUE);
- commands.add(cmd1);
- Command cmd2 = SetCommand.create(editingDomain,
- getInput(), FacesConfigPackage.eINSTANCE
- .getConverterType_ConverterId(),
- converterIdType);
- commands.add(cmd2);
- Command command = new CompoundCommand(commands);
- if (editingDomain != null) {
- if (command.canExecute()) {
- editingDomain.getCommandStack()
- .execute(command);
- refresh();
- }
- }
- }
- });
-
- converterForClassField = new ClassButtonDialogField(null);
- // converterForClassField.setRequired(true);
- converterForClassField
- .setLabelText(EditorMessages.ConverterGeneralSection_Label_ConverterForClass);
- converterForClassField.setProject((IProject) getPage().getEditor()
- .getAdapter(IProject.class));
- converterForClassField.doFillIntoGrid(toolkit, container,
- numberOfColumns);
- LayoutUtil.setHorizontalGrabbing(converterForClassField.getTextControl(
- toolkit, container));
-
- converterForClassField
- .setDialogFieldApplyListener(new IDialogFieldApplyListener() {
- public void dialogFieldApplied(DialogField field) {
-
- ConverterForClassType converterForClass = FacesConfigFactory.eINSTANCE
- .createConverterForClassType();
- converterForClass
- .setTextContent(((StringDialogField) field)
- .getText());
- EditingDomain editingDomain = getEditingDomain();
- List commands = new ArrayList(2);
- Command cmd1 = SetCommand.create(editingDomain,
- getInput(), FacesConfigPackage.eINSTANCE
- .getConverterType_ConverterId(),
- SetCommand.UNSET_VALUE);
- commands.add(cmd1);
- Command cmd2 = SetCommand.create(editingDomain,
- getInput(), FacesConfigPackage.eINSTANCE
- .getConverterType_ConverterForClass(),
- converterForClass);
- commands.add(cmd2);
- Command command = new CompoundCommand(commands);
- if (editingDomain != null) {
- if (command.canExecute()) {
- editingDomain.getCommandStack()
- .execute(command);
- refresh();
- }
- }
-
- }
- });
-
- converterClassField = new ClassButtonDialogField(null);
- // converterClassField.setRequired(true);
- converterClassField
- .setLabelText(EditorMessages.ConverterGeneralSection_Label_ConverterClass);
- converterClassField.setProject((IProject) getPage().getEditor()
- .getAdapter(IProject.class));
- converterClassField.doFillIntoGrid(toolkit, container, numberOfColumns);
- LayoutUtil.setHorizontalGrabbing(converterClassField.getTextControl(
- toolkit, container));
-
- converterClassField
- .setDialogFieldApplyListener(new IDialogFieldApplyListener() {
- public void dialogFieldApplied(DialogField field) {
-
- ConverterClassType ConverterClass = FacesConfigFactory.eINSTANCE
- .createConverterClassType();
- ConverterClass
- .setTextContent(((StringDialogField) field)
- .getText());
- EditingDomain editingDomain = getEditingDomain();
- if (editingDomain != null) {
- Command command = SetCommand.create(editingDomain,
- getInput(), FacesConfigPackage.eINSTANCE
- .getConverterType_ConverterClass(),
- ConverterClass);
- if (command.canExecute()) {
- editingDomain.getCommandStack()
- .execute(command);
- }
- }
-
- }
- });
- converterClassField
- .setInterface(IFacesConfigConstants.CONVERTER_INTERFACE);
- }
-
- /**
- *
- */
- public void refreshAll() {
- refresh();
- }
-
- /**
- *
- */
- public void refresh() {
- super.refresh();
- Object input = this.getInput();
- if (input instanceof ConverterType) {
- final ConverterType converter = (ConverterType) input;
- refreshControls(converter);
- }
- }
-
- private void refreshControls(ConverterType converter) {
- if (converter.getDisplayName().size() > 0) {
- DisplayNameType displayName = (DisplayNameType) converter
- .getDisplayName().get(0);
- displayNameField.setTextWithoutUpdate(displayName
- .getTextContent());
- } else {
- displayNameField.setTextWithoutUpdate(""); //$NON-NLS-1$
- }
-
- if (converter.getDescription().size() > 0) {
- DescriptionType description = (DescriptionType) converter
- .getDescription().get(0);
- String descriptionString = description.getTextContent();
- descriptionString = ModelUtil
- .unEscapeEntities(descriptionString);
- descriptionField.setTextWithoutUpdate(descriptionString);
- } else {
- descriptionField.setTextWithoutUpdate(""); //$NON-NLS-1$
- }
-
- if (converter.getConverterId() != null) {
- converterIdField.setTextWithoutUpdate(converter
- .getConverterId().getTextContent());
- } else {
- converterIdField.setTextWithoutUpdate(""); //$NON-NLS-1$
- }
-
- if (converter.getConverterForClass() != null) {
- converterForClassField.setTextWithoutUpdate(converter
- .getConverterForClass().getTextContent());
- } else {
- converterForClassField.setTextWithoutUpdate(""); //$NON-NLS-1$
- }
-
- if (converter.getConverterClass() != null) {
- converterClassField.setTextWithoutUpdate(converter
- .getConverterClass().getTextContent());
- } else {
- converterClassField.setTextWithoutUpdate(""); //$NON-NLS-1$
- }
- }
- /**
- * Add ConverterGeneralAdapter onto <converter> and the first <display-name>
- * and <description> elements.
- */
- protected void addAdaptersOntoInput(Object newInput) {
- ConverterType converter = (ConverterType) newInput;
- if (EcoreUtil.getExistingAdapter(converter,
- ConverterGeneralSection.class) == null) {
-
- converter.eAdapters().add(getConverterGeneralAdapter());
- }
-
- if (converter.getDisplayName().size() > 0) {
- DisplayNameType displayName = (DisplayNameType) converter
- .getDisplayName().get(0);
- if (EcoreUtil.getExistingAdapter(displayName,
- ConverterGeneralSection.class) == null) {
-
- displayName.eAdapters().add(getConverterGeneralAdapter());
- }
- }
-
- if (converter.getDescription().size() > 0) {
- DescriptionType description = (DescriptionType) converter
- .getDescription().get(0);
- if (EcoreUtil.getExistingAdapter(description,
- ConverterGeneralSection.class) == null) {
-
- description.eAdapters().add(getConverterGeneralAdapter());
- }
- }
- }
-
- /**
- * Remove ConverterGeneralAdapter from <converter> and the first
- * <display-name> and <description> elements.
- */
- protected void removeAdaptersFromInput(Object oldInput) {
- ConverterType converter = (ConverterType) oldInput;
- if (EcoreUtil.getExistingAdapter(converter,
- ConverterGeneralSection.class) != null) {
- converter.eAdapters().remove(getConverterGeneralAdapter());
- }
- if (converter.getDisplayName().size() > 0) {
- DisplayNameType displayName = (DisplayNameType) converter
- .getDisplayName().get(0);
- if (EcoreUtil.getExistingAdapter(displayName,
- ConverterGeneralSection.class) != null) {
-
- displayName.eAdapters().remove(getConverterGeneralAdapter());
- }
- }
-
- if (converter.getDescription().size() > 0) {
- DescriptionType description = (DescriptionType) converter
- .getDescription().get(0);
- if (EcoreUtil.getExistingAdapter(description,
- ConverterGeneralSection.class) != null) {
-
- description.eAdapters().remove(getConverterGeneralAdapter());
- }
- }
- }
-
- /**
- *
- * @return
- */
- private Adapter getConverterGeneralAdapter() {
-
- if (converterGeneralAdapter == null) {
- converterGeneralAdapter = new ConverterGeneralAdapter();
- }
- return converterGeneralAdapter;
- }
-
- /**
- * The adapter that will be added onto <converter> element, to listen the
- * events of the children that are displayed in this section, notify the
- * section to refresh.
- *
- * @author sfshi
- *
- */
- class ConverterGeneralAdapter extends AdapterImpl {
-
- public boolean isAdapterForType(Object type) {
- if (type == ConverterGeneralSection.class)
- return true;
- return false;
- }
-
- public void notifyChanged(Notification msg) {
-
- if (msg.getEventType() == Notification.ADD
- || msg.getEventType() == Notification.REMOVE
- || msg.getEventType() == Notification.SET) {
- if (msg.getFeature() == FacesConfigPackage.eINSTANCE
- .getConverterType_ConverterId()
- || msg.getFeature() == FacesConfigPackage.eINSTANCE
- .getConverterType_ConverterClass()
- || msg.getFeature() == FacesConfigPackage.eINSTANCE
- .getConverterType_ConverterForClass()
- || msg.getFeature() == FacesConfigPackage.eINSTANCE
- .getConverterType_Description()
- || msg.getFeature() == FacesConfigPackage.eINSTANCE
- .getConverterType_DisplayName()) {
- if (Thread.currentThread() == PlatformUI.getWorkbench().getDisplay().getThread()) {
- refresh();
- } else {
- PlatformUI.getWorkbench().getDisplay().asyncExec(new Runnable() {
- public void run() {
- refresh();
- }
- });
- }
- } else if (msg.getFeature() == FacesConfigPackage.eINSTANCE
- .getDisplayNameType_TextContent()
- || msg.getFeature() == FacesConfigPackage.eINSTANCE
- .getDescriptionType_TextContent()) {
- if (Thread.currentThread() == PlatformUI.getWorkbench().getDisplay().getThread()) {
- refresh();
- } else {
- PlatformUI.getWorkbench().getDisplay().asyncExec(new Runnable() {
- public void run() {
- refresh();
- }
- });
- }
- }
- }
- }
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/ConverterMasterSection.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/ConverterMasterSection.java
deleted file mode 100644
index 4a84924..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/ConverterMasterSection.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui.section;
-
-import org.eclipse.emf.common.command.Command;
-import org.eclipse.emf.edit.command.AddCommand;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.viewers.StructuredViewer;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerFilter;
-import org.eclipse.jst.jsf.facesconfig.emf.ConverterType;
-import org.eclipse.jst.jsf.facesconfig.emf.FacesConfigFactory;
-import org.eclipse.jst.jsf.facesconfig.emf.FacesConfigPackage;
-import org.eclipse.jst.jsf.facesconfig.ui.EditorMessages;
-import org.eclipse.jst.jsf.facesconfig.ui.page.FacesConfigMasterDetailPage;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.forms.IManagedForm;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-
-/**
- * @author Bryan Yang
- *
- */
-public class ConverterMasterSection extends FacesConfigMasterSection {
-
- /**
- *
- * @param parent
- * @param managedForm
- * @param toolkit
- * @param page
- */
- public ConverterMasterSection(Composite parent, IManagedForm managedForm,
- FormToolkit toolkit, FacesConfigMasterDetailPage page) {
- super(parent, managedForm, toolkit, page, null, null);
- getSection().setText(EditorMessages.ConverterMasterSection_Name);
- getSection().setDescription(
- EditorMessages.ConverterMasterSection_Description);
- }
-
- /**
- * Config the table viwer, set a filter for it, only the object of
- * ConverterType will be selected.
- */
- protected void configViewer(StructuredViewer structuredViewer) {
- super.configViewer(structuredViewer);
- structuredViewer.addFilter(new ViewerFilter() {
- public boolean select(Viewer viewer, Object parentElement,
- Object element) {
- return FacesConfigPackage.eINSTANCE.getConverterType()
- .isInstance(element);
- }
- });
-
- }
-
- /**
- * Create a new Converter.
- */
- protected void addButtonSelected(SelectionEvent e) {
- ConverterType Converter = FacesConfigFactory.eINSTANCE
- .createConverterType();
-
- Command command = AddCommand.create(getEditingDomain(),
- this.getInput(), FacesConfigPackage.eINSTANCE
- .getFacesConfigType_Converter(), Converter);
-
- if (command.canExecute()) {
- getEditingDomain().getCommandStack().execute(command);
- IStructuredSelection selection = new StructuredSelection(Converter);
- getStructuredViewer().refresh();
- getStructuredViewer().setSelection(selection);
- }
- }
-
-}
\ No newline at end of file
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/FacesConfigMasterSection.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/FacesConfigMasterSection.java
deleted file mode 100644
index 91b11c7..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/FacesConfigMasterSection.java
+++ /dev/null
@@ -1,325 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui.section;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.emf.common.command.Command;
-import org.eclipse.emf.common.command.CompoundCommand;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.edit.command.RemoveCommand;
-import org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider;
-import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.viewers.StructuredViewer;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jst.jsf.facesconfig.ui.EditorMessages;
-import org.eclipse.jst.jsf.facesconfig.ui.page.FacesConfigMasterDetailPage;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.forms.IManagedForm;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-
-/**
- * An default implementation of AbstractFacesConfigSection for Master Section.
- *
- * @author sfshi
- *
- */
-public abstract class FacesConfigMasterSection extends AbstractFacesConfigSection {
-
- private StructuredViewer structuredViewer;
-
- private Button removeButton;
-
- /**
- *
- * @param parent
- * @param managedForm
- * @param toolkit
- * @param page
- * @param helpContextId
- * @param helpTooltip
- */
- public FacesConfigMasterSection(Composite parent, IManagedForm managedForm,
- FormToolkit toolkit, FacesConfigMasterDetailPage page,
- String helpContextId, String helpTooltip) {
- super(parent, managedForm, page, toolkit, helpContextId, helpTooltip);
- }
-
- public void dispose() {
- structuredViewer.removeSelectionChangedListener(this);
- super.dispose();
- }
-
- /**
- *
- */
- protected void createContents(Composite container, FormToolkit toolkit) {
- GridLayout layout = new GridLayout();
- layout.numColumns = 2;
- layout.marginWidth = layout.marginHeight = 5;
- container.setLayout(layout);
- structuredViewer = createViewer(container, toolkit);
- structuredViewer.addSelectionChangedListener(this);
- createOperationSection(container, toolkit);
- }
-
- /**
- * Create the structured viewer, set up content & label provider for it.
- * Defaultly create a tableviewer.
- *
- * @param parent
- * @param toolkit
- * @return the structured viewer
- */
- protected StructuredViewer createViewer(Composite parent,
- FormToolkit toolkit) {
- Composite tableContainer = toolkit.createComposite(parent);
- toolkit.paintBordersFor(tableContainer);
-
- GridData gd = new GridData(GridData.FILL_BOTH);
- gd.heightHint = 200;
- tableContainer.setLayoutData(gd);
- GridLayout layout = new GridLayout();
- tableContainer.setLayout(layout);
-
- TableViewer tableViewer = new TableViewer(tableContainer, SWT.SINGLE
- | SWT.H_SCROLL | SWT.V_SCROLL | SWT.BORDER);
- gd = new GridData(GridData.FILL_BOTH);
- tableViewer.getControl().setLayoutData(gd);
-
- tableViewer.setContentProvider(new AdapterFactoryContentProvider(
- getAdapterFactory()));
- tableViewer.setLabelProvider(new AdapterFactoryLabelProvider(
- getAdapterFactory()));
-
- configViewer(tableViewer);
-
- return tableViewer;
- }
-
- /**
- * Config the viewer, such as set a filter and so on. Sub classes should
- * override this method to add filter.
- *
- * @param viewer
- */
- protected void configViewer(StructuredViewer viewer) {
- // do nothing; subs may override
- }
-
- /**
- * Defaultly we create a "New" button and a "Remove" button. Sub classes can
- * overwrite this method if need other functions.
- *
- * @param parent
- * @param toolkit
- */
- protected void createOperationSection(Composite parent, FormToolkit toolkit) {
- Composite operationContainer = toolkit.createComposite(parent);
- GridData gd = new GridData(GridData.FILL_VERTICAL);
- operationContainer.setLayoutData(gd);
- GridLayout layout = new GridLayout();
-
- operationContainer.setLayout(layout);
-
- Button addButton = toolkit.createButton(operationContainer,
- EditorMessages.UI_Button_Add, SWT.PUSH);
- gd = new GridData(GridData.FILL_HORIZONTAL
- | GridData.VERTICAL_ALIGN_BEGINNING);
- gd.grabExcessHorizontalSpace = false;
- addButton.setLayoutData(gd);
-
- addButton.addSelectionListener(new SelectionAdapter() {
- public void widgetSelected(SelectionEvent e) {
- addButtonSelected(e);
- }
- });
-
- setRemoveButton(toolkit.createButton(operationContainer,
- EditorMessages.UI_Button_Remove, SWT.PUSH));
-
- gd = new GridData(GridData.FILL_HORIZONTAL
- | GridData.VERTICAL_ALIGN_BEGINNING);
- gd.grabExcessHorizontalSpace = false;
- getRemoveButton().setLayoutData(gd);
- getRemoveButton().addSelectionListener(new SelectionAdapter() {
- public void widgetSelected(SelectionEvent e) {
- removeButtonSelected(e);
- }
- });
- }
-
- /**
- *
- * @param e
- */
- protected abstract void addButtonSelected(SelectionEvent e);
-
- /**
- *
- * @param e
- */
- protected void removeButtonSelected(SelectionEvent e) {
-
- IStructuredSelection ssel = StructuredSelection.EMPTY;
- ISelection selection = getSelection();
- if (selection instanceof IStructuredSelection) {
- ssel = (IStructuredSelection) selection;
- }
-
- if (!ssel.isEmpty()) {
- List commands = new ArrayList(ssel.size());
- for (Iterator iter = ssel.iterator(); iter.hasNext();) {
- EObject element = (EObject) iter.next();
- Command command = RemoveCommand.create(getEditingDomain(),
- element);
- commands.add(command);
- }
-
- CompoundCommand command = new CompoundCommand(commands);
- if (command.canExecute()) {
- getEditingDomain().getCommandStack().execute(command);
- }
- }
-
- }
-
- /**
- *
- * update the buttons' enable state.
- */
- protected void updateButtons() {
- IStructuredSelection ssel = (IStructuredSelection) structuredViewer
- .getSelection();
-
- getRemoveButton().setEnabled(!ssel.isEmpty());
- }
-
- /**
- *
- */
- public ISelection getSelection() {
- return structuredViewer.getSelection();
- }
-
- /**
- *
- */
- public void setSelection(ISelection selection) {
- structuredViewer.setSelection(selection);
- }
-
- /**
- * refresh the display of this section.
- */
- public void refresh() {
- super.refresh();
- structuredViewer.refresh();
- updateButtons();
- }
-
- /**
- *
- */
- public void refreshAll() {
- // master section refresh all:
- setViewerInput(getInput());
- updateButtons();
-
- // detial sections refresh:
- // fire an event to the detail sections, let them
- // refresh.
- selectionChanged(null);
- }
-
- /**
- * set the structuredViewer's input
- *
- * @param input
- */
- private void setViewerInput(Object input) {
- structuredViewer.setInput(input);
- }
-
- /**
- *
- */
- protected void expansionStateChanged(boolean expanded) {
- if (expanded) {
- if (structuredViewer.getInput() == null) {
- refreshAll();
- }
- structuredViewer.refresh(true);
- structuredViewer.setSelection(structuredViewer.getSelection());
- } else {
- structuredViewer.setSelection(null);
- }
- super.expansionStateChanged(expanded);
- }
-
- /**
- *
- */
- protected void expansionStateChanging(boolean expanding) {
- if (!expanding) {
- GridData gd = new GridData(GridData.FILL_HORIZONTAL);
- this.getSection().setLayoutData(gd);
- } else {
- ((FacesConfigMasterDetailPage) getPage()).closeOtherSections(this);
-
- GridData gd = new GridData(GridData.FILL_BOTH);
- this.getSection().setLayoutData(gd);
- }
-
- super.expansionStateChanging(expanding);
- }
-
- /**
- * get the viewer.
- *
- * @return the viewer
- */
- public StructuredViewer getStructuredViewer() {
- return structuredViewer;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.jsf.facesconfig.ui.section.AbstractFacesConfigSection#selectionChanged(org.eclipse.jface.viewers.SelectionChangedEvent)
- */
- public void selectionChanged(SelectionChangedEvent event) {
- super.selectionChanged(event);
- updateButtons();
- }
-
- private void setRemoveButton(Button removeButton) {
- this.removeButton = removeButton;
- }
-
- /**
- * @return the remove button
- */
- protected Button getRemoveButton() {
- return removeButton;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/FacetSection.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/FacetSection.java
deleted file mode 100644
index 8ec7fb0..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/FacetSection.java
+++ /dev/null
@@ -1,455 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui.section;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.runtime.Assert;
-import org.eclipse.emf.common.command.Command;
-import org.eclipse.emf.common.command.CompoundCommand;
-import org.eclipse.emf.edit.command.AddCommand;
-import org.eclipse.emf.edit.command.RemoveCommand;
-import org.eclipse.emf.edit.command.SetCommand;
-import org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider;
-import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.viewers.ColumnWeightData;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.TableLayout;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerFilter;
-import org.eclipse.jst.jsf.facesconfig.emf.DescriptionType;
-import org.eclipse.jst.jsf.facesconfig.emf.DisplayNameType;
-import org.eclipse.jst.jsf.facesconfig.emf.FacesConfigFactory;
-import org.eclipse.jst.jsf.facesconfig.emf.FacesConfigPackage;
-import org.eclipse.jst.jsf.facesconfig.emf.FacetNameType;
-import org.eclipse.jst.jsf.facesconfig.emf.FacetType;
-import org.eclipse.jst.jsf.facesconfig.ui.EditorPlugin;
-import org.eclipse.jst.jsf.facesconfig.ui.EditorMessages;
-import org.eclipse.jst.jsf.facesconfig.ui.dialog.AddEditFacetDialog;
-import org.eclipse.jst.jsf.facesconfig.ui.page.IFacesConfigPage;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.MouseAdapter;
-import org.eclipse.swt.events.MouseEvent;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.TableColumn;
-import org.eclipse.ui.forms.IManagedForm;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-
-/**
- * Section for facets
- *
- */
-public class FacetSection extends AbstractFacesConfigSection {
-
- private static final int TABLE_DEFAULT_HEIGHT = 160;
-
- private TableViewer tableViewer;
-
- private Button removeButton;
-
- private Button editButton;
-
- /**
- *
- * @param parent
- * @param managedForm
- * @param page
- * @param toolkit
- */
- public FacetSection(Composite parent, IManagedForm managedForm,
- IFacesConfigPage page, FormToolkit toolkit) {
- super(parent, managedForm, page, toolkit, null, null);
- this.getSection().setText(EditorMessages.FacetSection_Name);
- this.getSection().setDescription(
- EditorMessages.FacetSection_Description);
-
- }
-
- /**
- *
- */
- protected void createContents(Composite container, FormToolkit toolkit) {
- GridLayout gl = new GridLayout();
- gl.horizontalSpacing = 0;
- gl.marginWidth = 0;
- gl.numColumns = 2;
- container.setLayout(gl);
- GridData td = new GridData(GridData.FILL_BOTH);
- container.setLayoutData(td);
-
- toolkit.paintBordersFor(container);
-
- Composite facetSection = toolkit.createComposite(container);
- GridLayout gl2 = new GridLayout();
- gl2.horizontalSpacing = 0;
- gl2.marginWidth = 0;
- gl2.numColumns = 2;
- facetSection.setLayout(gl2);
- GridData gd = new GridData(GridData.FILL_BOTH
- | GridData.VERTICAL_ALIGN_BEGINNING);
- facetSection.setLayoutData(gd);
-
- createTableSection(facetSection, toolkit);
- createButtonsSection(facetSection, toolkit);
-
- }
-
- /**
- * create facet table section
- *
- * @param container
- * @param toolkit
- */
- private void createTableSection(Composite container, FormToolkit toolkit) {
- Composite tableContainer = toolkit.createComposite(container);
- GridData gd = new GridData(GridData.FILL_BOTH
- | GridData.GRAB_HORIZONTAL);
- tableContainer.setLayoutData(gd);
- toolkit.paintBordersFor(tableContainer);
-
- GridLayout gl = new GridLayout();
- tableContainer.setLayout(gl);
-
- Table table = new Table(tableContainer, SWT.H_SCROLL | SWT.V_SCROLL
- | SWT.FULL_SELECTION | SWT.BORDER);
- gd = new GridData(GridData.FILL_BOTH);
- gd.horizontalSpan = 1;
- gd.heightHint = TABLE_DEFAULT_HEIGHT;
- table.setLayoutData(gd);
-
- table.setHeaderVisible(true);
- table.setLinesVisible(true);
- TableLayout layout = new TableLayout();
- table.setLayout(layout);
-
- TableColumn facetNameCol = new TableColumn(table, SWT.NONE);
- layout.addColumnData(new ColumnWeightData(1, true));
- facetNameCol
- .setText(EditorMessages.FacetSection_Table_FacetNameColumn);
- TableColumn displayNameCol = new TableColumn(table, SWT.NONE);
- layout.addColumnData(new ColumnWeightData(1, true));
- displayNameCol
- .setText(EditorMessages.FacetSection_Table_DisplayNameColumn);
-
- TableColumn descriptionCol = new TableColumn(table, SWT.NONE);
- layout.addColumnData(new ColumnWeightData(1, true));
- descriptionCol
- .setText(EditorMessages.FacetSection_Table_DescriptionColumn);
-
- table.addSelectionListener(new SelectionAdapter() {
- public void widgetSelected(SelectionEvent e) {
- updateButtons();
- }
- });
-
- table.addMouseListener(new MouseAdapter() {
- public void mouseDoubleClick(MouseEvent e) {
- if (((IStructuredSelection) tableViewer.getSelection()).size() > 0)
- editButtonSelected();
- }
- });
-
- tableViewer = new TableViewer(table);
- tableViewer.setContentProvider(new AdapterFactoryContentProvider(
- getAdapterFactory()));
- tableViewer.setLabelProvider(new AdapterFactoryLabelProvider(
- getAdapterFactory()));
-
- tableViewer.addFilter(new ViewerFilter() {
- public boolean select(Viewer viewer, Object parentElement,
- Object element) {
- return FacesConfigPackage.eINSTANCE.getFacetType().isInstance(
- element);
- }
- });
-
- tableViewer.addSelectionChangedListener(this);
- }
-
- /**
- * create buttons
- *
- * @param container
- * @param toolkit
- */
- private void createButtonsSection(Composite container, FormToolkit toolkit) {
- // create operation buttons's container
- Composite operationContainer = toolkit.createComposite(container);
- GridData gd = new GridData(GridData.FILL_VERTICAL
- | GridData.VERTICAL_ALIGN_BEGINNING);
- operationContainer.setLayoutData(gd);
- GridLayout gl = new GridLayout();
- operationContainer.setLayout(gl);
-
- Button addButton = toolkit.createButton(operationContainer,
- EditorMessages.UI_Button_Add_more,
- SWT.PUSH);
- gd = new GridData(GridData.FILL_HORIZONTAL
- | GridData.VERTICAL_ALIGN_BEGINNING);
- gd.grabExcessHorizontalSpace = false;
- addButton.setLayoutData(gd);
-
- editButton = toolkit.createButton(operationContainer,
- EditorMessages.UI_Button_Edit_more,
- SWT.PUSH);
- gd = new GridData(GridData.FILL_HORIZONTAL
- | GridData.VERTICAL_ALIGN_BEGINNING);
- gd.grabExcessHorizontalSpace = false;
- editButton.setLayoutData(gd);
-
- removeButton = toolkit.createButton(operationContainer,
- EditorMessages.UI_Button_Remove,
- SWT.PUSH);
- gd = new GridData(GridData.FILL_HORIZONTAL
- | GridData.VERTICAL_ALIGN_BEGINNING);
- gd.grabExcessHorizontalSpace = false;
- removeButton.setLayoutData(gd);
-
- addButton.addSelectionListener(new SelectionAdapter() {
-
- public void widgetSelected(SelectionEvent e) {
- addButtonSelected();
- }
- });
-
- editButton.addSelectionListener(new SelectionAdapter() {
-
- public void widgetSelected(SelectionEvent e) {
- editButtonSelected();
- }
- });
- removeButton.addSelectionListener(new SelectionAdapter() {
-
- public void widgetSelected(SelectionEvent e) {
- removeButtonSelected();
- }
- });
- }
-
- /**
- * refresh the table viewer and update buttons.
- */
- public void refresh() {
- super.refresh();
- tableViewer.refresh();
- updateButtons();
- }
-
- public void refreshAll() {
- tableViewer.setInput(getInput());
- updateButtons();
- }
-
- /**
- * Update the buttons' enable status.
- */
- private void updateButtons() {
- if (((IStructuredSelection) tableViewer.getSelection()).size() > 0) {
- editButton.setEnabled(true);
- removeButton.setEnabled(true);
- } else {
- editButton.setEnabled(false);
- removeButton.setEnabled(false);
- }
- }
-
- /**
- * add a facet.
- *
- */
- private void addButtonSelected() {
-
- Shell shell = EditorPlugin.getActiveShell();
-
- AddEditFacetDialog dialog = new AddEditFacetDialog(shell, true);
- if (dialog.open() == Dialog.OK) {
-
- String newFacetName = dialog.getFacetName();
- String newDisplayName = dialog.getDisplayName();
- String newDescription = dialog.getDescription();
-
- FacetType newFacet = FacesConfigFactory.eINSTANCE.createFacetType();
- if (newFacetName.length() > 0) {
- FacetNameType facetNameType = FacesConfigFactory.eINSTANCE
- .createFacetNameType();
- facetNameType.setTextContent(newFacetName);
- newFacet.setFacetName(facetNameType);
- }
-
- if (newDisplayName.length() > 0) {
- DisplayNameType displayNameType = FacesConfigFactory.eINSTANCE
- .createDisplayNameType();
- displayNameType.setTextContent(newDisplayName);
- newFacet.getDisplayName().add(displayNameType);
- }
-
- if (newDescription.length() > 0) {
- DescriptionType descriptionType = FacesConfigFactory.eINSTANCE
- .createDescriptionType();
- descriptionType.setTextContent(newDescription);
- newFacet.getDescription().add(descriptionType);
- }
-
- Command addCommand = AddCommand.create(this.getEditingDomain(),
- getInput(), FacesConfigPackage.eINSTANCE
- .getComponentType_Facet(), newFacet);
- if (addCommand.canExecute()) {
- this.getEditingDomain().getCommandStack().execute(addCommand);
-
- }
- }
-
- }
-
- /**
- * edit a facet.
- *
- */
- private void editButtonSelected() {
- FacetType facet = (FacetType) ((IStructuredSelection) tableViewer
- .getSelection()).getFirstElement();
-
- Assert.isNotNull(facet);
-
- Shell shell = EditorPlugin.getActiveShell();
-
- AddEditFacetDialog dialog = new AddEditFacetDialog(shell, false);
- if (facet.getFacetName() != null)
- dialog.setFacetName(facet.getFacetName().getTextContent());
-
- if (facet.getDisplayName().size() > 0) {
- dialog.setDisplayName(((DisplayNameType) facet.getDisplayName()
- .get(0)).getTextContent());
- }
-
- if (facet.getDescription().size() > 0) {
- dialog.setDescription(((DescriptionType) facet.getDescription()
- .get(0)).getTextContent());
- }
-
- if (dialog.open() == Dialog.OK) {
- List commands = new ArrayList(3);
-
- String newFacetName = dialog.getFacetName();
- String newDisplayName = dialog.getDisplayName();
- String newDescription = dialog.getDescription();
- if (facet.getFacetName() != null) {
- Command cmd1 = SetCommand.create(getEditingDomain(), facet
- .getFacetName(), FacesConfigPackage.eINSTANCE
- .getFacetNameType_TextContent(), newFacetName);
- commands.add(cmd1);
- } else if (newFacetName.length() > 0) {
- FacetNameType newFacetNameType = FacesConfigFactory.eINSTANCE
- .createFacetNameType();
- newFacetNameType.setTextContent(newFacetName);
- Command cmd2 = AddCommand.create(getEditingDomain(), facet,
- FacesConfigPackage.eINSTANCE.getFacetType_FacetName(),
- newFacetNameType);
- commands.add(cmd2);
- }
-
- if (facet.getDisplayName().size() > 0) {
- DisplayNameType displayNameType = (DisplayNameType) facet
- .getDisplayName().get(0);
- Command cmd3 = SetCommand.create(this.getEditingDomain(),
- displayNameType, FacesConfigPackage.eINSTANCE
- .getDisplayNameType_TextContent(),
- newDisplayName);
- commands.add(cmd3);
- } else if (newDisplayName.length() > 0) {
- DisplayNameType newDisplayNameType = FacesConfigFactory.eINSTANCE
- .createDisplayNameType();
- newDisplayNameType.setTextContent(newDisplayName);
- Command cmd4 = AddCommand
- .create(this.getEditingDomain(), facet,
- FacesConfigPackage.eINSTANCE
- .getFacetType_DisplayName(),
- newDisplayNameType);
- commands.add(cmd4);
- }
-
- if (facet.getDescription().size() > 0) {
- DescriptionType descriptionType = (DescriptionType) facet
- .getDescription().get(0);
- Command cmd5 = SetCommand.create(this.getEditingDomain(),
- descriptionType, FacesConfigPackage.eINSTANCE
- .getDescriptionType_TextContent(),
- newDescription);
- commands.add(cmd5);
- } else if (newDescription.length() > 0) {
- DescriptionType newDescriptionType = FacesConfigFactory.eINSTANCE
- .createDescriptionType();
- newDescriptionType.setTextContent(newDescription);
- Command cmd6 = AddCommand
- .create(this.getEditingDomain(), facet,
- FacesConfigPackage.eINSTANCE
- .getFacetType_Description(),
- newDescriptionType);
- commands.add(cmd6);
- }
-
- CompoundCommand command = new CompoundCommand(commands);
- if (command.canExecute()) {
- getEditingDomain().getCommandStack().execute(command);
- tableViewer.refresh(facet);
- }
- }
-
- }
-
- /**
- * remove a facet.
- *
- */
- private void removeButtonSelected() {
- FacetType facet = (FacetType) ((IStructuredSelection) tableViewer
- .getSelection()).getFirstElement();
-
- Assert.isNotNull(facet);
- Command removeCommand = RemoveCommand.create(this.getEditingDomain(),
- getInput(), FacesConfigPackage.eINSTANCE
- .getComponentType_Facet(), facet);
-
- if (removeCommand.canExecute()) {
- this.getEditingDomain().getCommandStack().execute(removeCommand);
- refreshAll();
- }
-
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.viewers.ISelectionProvider#getSelection()
- */
- public ISelection getSelection() {
- return tableViewer.getSelection();
- }
-
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.viewers.ISelectionProvider#setSelection(org.eclipse.jface.viewers.ISelection)
- */
- public void setSelection(ISelection selection) {
-
- tableViewer.setSelection(selection);
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/FactorySection.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/FactorySection.java
deleted file mode 100644
index 2ffe62a..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/FactorySection.java
+++ /dev/null
@@ -1,169 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui.section;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.emf.common.command.Command;
-import org.eclipse.emf.common.command.CompoundCommand;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.edit.command.AddCommand;
-import org.eclipse.jdt.ui.IJavaElementSearchConstants;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerFilter;
-import org.eclipse.jst.jsf.facesconfig.emf.FacesConfigFactory;
-import org.eclipse.jst.jsf.facesconfig.emf.FactoryType;
-import org.eclipse.jst.jsf.facesconfig.ui.dialog.DialogUtil;
-import org.eclipse.jst.jsf.facesconfig.ui.page.IFacesConfigPage;
-import org.eclipse.jst.jsf.facesconfig.ui.page.OthersPage;
-import org.eclipse.jst.jsf.facesconfig.ui.util.ModelUtil;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.forms.IManagedForm;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-
-/**
- * @author Zhi-peng Zhang, sfshi
- * @version
- */
-public class FactorySection extends OthersPageBaseSection {
- /** The Eclass object this Section operated */
- private EClass factoryChildClass;
-
- /**
- *
- * @param factoryChildClass
- * @param parent
- * @param managedForm
- * @param page
- * @param toolkit
- * @param helpContextId
- * @param helpTooltip
- */
- public FactorySection(EClass factoryChildClass, Composite parent,
- IManagedForm managedForm, IFacesConfigPage page,
- FormToolkit toolkit, String helpContextId, String helpTooltip) {
- super(parent, managedForm, page, toolkit, helpContextId, helpTooltip);
- this.factoryChildClass = factoryChildClass;
- }
-
- /**
- *
- * @param factoryChildClass
- * @param parent
- * @param managedForm
- * @param page
- * @param toolkit
- */
- public FactorySection(EClass factoryChildClass, Composite parent,
- IManagedForm managedForm, IFacesConfigPage page, FormToolkit toolkit) {
- this(factoryChildClass, parent, managedForm, page, toolkit, null, null);
- }
-
- /**
- * @return an new object which is instance of <code>factoryChildClass</code>.
- */
- public EObject createFactoryChildObject() {
- String superType = ModelUtil.getSuperType(factoryChildClass);
- IProject project = (IProject) this.getPage().getEditor().getAdapter(
- IProject.class);
- String result = DialogUtil.openClassDialog(getSection().getShell(),
- project, superType,
- IJavaElementSearchConstants.CONSIDER_ALL_TYPES);
-
- if (result != null) {
- EObject component = FacesConfigFactory.eINSTANCE
- .create(factoryChildClass);
- // set the text content value.
- EStructuralFeature feature = factoryChildClass
- .getEStructuralFeatures().get(0);
- component.eSet(feature, result);
- return component;
- }
- return null;
- }
-
- /**
- * Set the <factory> element as the structuredViewer's input.
- *
- * @param input
- */
- protected void setViewerInput(Object input) {
- if (input instanceof FactoryType) {
- tableViewer.setInput(input);
- } else
- tableViewer.setInput(null);
- }
-
- /**
- * Add a filter on the table viewer. Only the elements that is a instance of
- * <code>factoryChildClass</code> could be selected.
- */
- protected void configTableViewer(TableViewer tableViewer1) {
- tableViewer1.addFilter(new ViewerFilter() {
- public boolean select(Viewer viewer, Object parentElement,
- Object element) {
- return factoryChildClass.isInstance(element);
- }
- });
- }
-
- /**
- * Perform some actions to create new child object and append it to the
- * <factory> element.
- */
- void addButtonSelected(SelectionEvent e) {
- /** Create a new object which is instance of factoryChildClass. */
- EObject obj = createFactoryChildObject();
- if (obj != null) {
- boolean needRefreshAll = false;
- Command command = null;
- if (getInput() instanceof FactoryType) {
- /**
- * The input is a <factory> element and not null, append the new
- * object to it.
- */
- FactoryType factory = (FactoryType) getInput();
- command = AddCommand.create(getEditingDomain(), factory, null,
- obj);
- } else {
- /**
- * The input is null, create a <factory> element and append it
- * to <faces-config>.
- */
- needRefreshAll = true;
- List list = new ArrayList(2);
- FactoryType factory = FacesConfigFactory.eINSTANCE
- .createFactoryType();
- Command cmd1 = AddCommand.create(getEditingDomain(), factory,
- null, obj);
- list.add(cmd1);
- Command cmd2 = AddCommand.create(getEditingDomain(), this
- .getPage().getInput(), null, factory);
- list.add(cmd2);
- command = new CompoundCommand(list);
- }
-
- if (command.canExecute()) {
- getEditingDomain().getCommandStack().execute(command);
- if (needRefreshAll)
- ((OthersPage) this.getPage()).resetFactoryInput();
- }
- }
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/IDialogFieldGroup.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/IDialogFieldGroup.java
deleted file mode 100644
index 5c5b7c5..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/IDialogFieldGroup.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui.section;
-
-/**
- * This interface is used to build relation between model SSEModel and
- * controller DialogFieldGroup
- *
- * @author Xiao-guang Zhang
- * @version
- */
-public interface IDialogFieldGroup {
- /**
- * set the input of this section
- *
- * @param newInput
- */
- void setInput(Object newInput);
-
- /**
- * @return the input of this section
- */
- Object getInput();
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/IFacesConfigSection.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/IFacesConfigSection.java
deleted file mode 100644
index 4fb65dc..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/IFacesConfigSection.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui.section;
-
-
-/**
- * Section interface to build relation between model and adapter
- *
- * @author sfshi
- *
- */
-public interface IFacesConfigSection {
- /**
- * set the input of this section
- *
- * @param newInput
- */
- void setInput(Object newInput);
-
- /**
- * @return the input of this section
- */
- Object getInput();
-
- /**
- * initialize current section based on the input
- *
- */
- void initialize();
-
- /**
- * clear all section's contents.
- *
- */
- void clearAll();
-
- /**
- * refresh the needed parts of the section
- *
- */
- void refresh();
-
- /**
- * refresh all parts of the section
- *
- */
- void refreshAll();
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/InitializationSection.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/InitializationSection.java
deleted file mode 100644
index 2029efa..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/InitializationSection.java
+++ /dev/null
@@ -1,363 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.jsf.facesconfig.ui.section;
-
-import org.eclipse.emf.common.command.Command;
-import org.eclipse.emf.edit.command.SetCommand;
-import org.eclipse.jst.jsf.common.ui.internal.dialogfield.DialogField;
-import org.eclipse.jst.jsf.common.ui.internal.dialogfield.IDialogFieldApplyListener;
-import org.eclipse.jst.jsf.common.ui.internal.dialogfield.RadiosDialogField;
-import org.eclipse.jst.jsf.facesconfig.emf.FacesConfigPackage;
-import org.eclipse.jst.jsf.facesconfig.emf.ManagedBeanType;
-import org.eclipse.jst.jsf.facesconfig.ui.EditorMessages;
-import org.eclipse.jst.jsf.facesconfig.ui.EditorPlugin;
-import org.eclipse.jst.jsf.facesconfig.ui.IFacesConfigConstants;
-import org.eclipse.jst.jsf.facesconfig.ui.page.IFacesConfigPage;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.forms.IManagedForm;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-import org.eclipse.ui.part.PageBook;
-
-/**
- * This section handles managed bean's initialization, including general class
- * type, map and list type managed bean.
- *
- * @author Xiao-guang Zhang, sfshi
- */
-public class InitializationSection extends AbstractFacesConfigSection {
- private static final String MANAGEDBEAN_GENERAL_CLASS = EditorMessages.InitializationSection_ClassType_General;
-
- private static final String MANAGEDBEAN_MAP = EditorMessages.InitializationSection_ClassType_Map;
-
- private static final String MANAGEDBEAN_LIST = EditorMessages.InitializationSection_ClassType_List;
-
- /** property initiliazation container composite */
- private Composite propertySection;
-
- /** property initiliazation DialogFieldGroup */
- private ManagedPropertyEditGroup managedPropertyGroup;
-
- /** map entries initiliazation container composite */
- private Composite mapSection;
-
- /** map entries initiliazation DialogFieldGroup */
- private MapEntriesEditGroup mapEntryGroup;
-
- /** list entries initiliazation container composite */
- private Composite listSection;
-
- /** list entries initiliazation DialogFieldGroup */
- private ListEntriesEditGroup listEntryGroup;
-
- /** the PageBook control for three kinds of managed bean */
- private PageBook pageBook;
-
- /** RadiosDialogField for three kinds of managed bean */
- private RadiosDialogField beanTypeField;
-
- /** current pages selection */
- private int currentPageIndex = 0;
-
- /**
- * @param parent
- * @param managedForm
- * @param page
- * @param toolkit
- */
- public InitializationSection(Composite parent, IManagedForm managedForm,
- IFacesConfigPage page, FormToolkit toolkit) {
- super(parent, managedForm, page, toolkit, null, null);
- getSection().setText(EditorMessages.InitializationSection_Name);
- getSection().setDescription(
- EditorMessages.InitializationSection_Description);
-
- }
-
- /*
- * (non-Javadoc)
- *
- * @see com.sybase.stf.jmt.editors.pageflow.managedbean.sections.BaseSectionPart#createClient(org.eclipse.swt.widgets.Composite,
- * org.eclipse.ui.forms.widgets.FormToolkit)
- */
- protected void createContents(Composite container, FormToolkit toolkit) {
- int numberOfColumns = 3;
- GridLayout gl = new GridLayout(numberOfColumns, false);
- gl.horizontalSpacing = 0;
- gl.marginWidth = 0;
- container.setLayout(gl);
- toolkit.paintBordersFor(container);
-
- createBeanTypeEntry(container, toolkit, numberOfColumns);
- createInitializationEntry(container, toolkit, numberOfColumns);
- }
-
- /**
- * create the bean type selection section
- *
- * @param container
- * @param toolkit
- */
- private void createBeanTypeEntry(Composite container, FormToolkit toolkit,
- int numberOfColumns) {
- beanTypeField = new RadiosDialogField();
- String[] items = { MANAGEDBEAN_GENERAL_CLASS, MANAGEDBEAN_MAP,
- MANAGEDBEAN_LIST };
- beanTypeField
- .setLabelText(EditorMessages.InitializationSection_ClassType);
- beanTypeField.setItems(items);
- beanTypeField.doFillIntoGrid(toolkit, container, numberOfColumns);
- beanTypeField
- .setDialogFieldApplyListener(new IDialogFieldApplyListener() {
- public void dialogFieldApplied(DialogField field) {
- RadiosDialogField beanTypeField1 = (RadiosDialogField) field;
-
- boolean bChangedSuccess = false;
- if (beanTypeField1.getSelectedIndex() == 0) {
- bChangedSuccess = switchPage(
- IFacesConfigConstants.MANAGED_PROPERTY,
- false);
- } else if (beanTypeField1.getSelectedIndex() == 1) {
- bChangedSuccess = switchPage(
- IFacesConfigConstants.MAP_ENTRIES, false);
- } else if (beanTypeField1.getSelectedIndex() == 2) {
- bChangedSuccess = switchPage(
- IFacesConfigConstants.LIST_ENTRIES, false);
- }
-
- if (bChangedSuccess) {
- currentPageIndex = beanTypeField1.getSelectedIndex();
- } else {
- beanTypeField1.setSelectedIndexWithoutUpdate(-1);
- beanTypeField1
- .setSelectedIndexWithoutUpdate(currentPageIndex);
- }
- }
- });
- }
-
- /**
- * switch to general property, map-entries, or list-entries group If
- * bForceClear equals to true, the others page will be cleared without user
- * confirmation. if bForceClear equals to false, the confirmation dialog
- * will pop up and let user determine whether this page is cleared or not.
- *
- * @param pageID -
- * IFacesConfigConstants.MANAGED_PROPERTY,
- * MAP_ENTRIES,LIST_ENTRIES
- * @param bForceClearOthers -
- * Force to clear other pages.
- */
- private boolean switchPage(String pageID, boolean bForceClearOthers) {
- if (pageID == IFacesConfigConstants.MANAGED_PROPERTY) {
- if (clearPage(IFacesConfigConstants.MAP_ENTRIES, bForceClearOthers)
- && clearPage(IFacesConfigConstants.LIST_ENTRIES,
- bForceClearOthers)) {
- managedPropertyGroup.refreshAll();
- pageBook.showPage(propertySection);
- // FIXME: there should be some other methods to resize the whole
- // section.
- InitializationSection.this.getSection().setExpanded(false);
- InitializationSection.this.getSection().setExpanded(true);
- return true;
- }
- } else if (pageID == IFacesConfigConstants.MAP_ENTRIES) {
- if (clearPage(IFacesConfigConstants.MANAGED_PROPERTY,
- bForceClearOthers)
- && clearPage(IFacesConfigConstants.LIST_ENTRIES,
- bForceClearOthers)) {
- mapEntryGroup.refreshAll();
- pageBook.showPage(mapSection);
- // FIXME: there should be some other methods to resize the whole
- // section.
- InitializationSection.this.getSection().setExpanded(false);
- InitializationSection.this.getSection().setExpanded(true);
- return true;
- }
- } else if (pageID == IFacesConfigConstants.LIST_ENTRIES) {
- if (clearPage(IFacesConfigConstants.MANAGED_PROPERTY,
- bForceClearOthers)
- && clearPage(IFacesConfigConstants.MAP_ENTRIES,
- bForceClearOthers)) {
- listEntryGroup.refreshAll();
- pageBook.showPage(listSection);
- // FIXME: there should be some other methods to resize the whole
- // section.
- InitializationSection.this.getSection().setExpanded(false);
- InitializationSection.this.getSection().setExpanded(true);
- return true;
- }
- }
- return false;
- }
-
- /**
- * clear one specified page according to pageID if bForceClear equals to
- * false, the confirmation dialog will pop up and let user determine whether
- * this page is cleared or not.
- *
- * @param pageID -
- * IFacesConfigConstants.MANAGED_PROPERTY,
- * MAP_ENTRIES,LIST_ENTRIES
- * @param bForceClear -
- * force to clear current page.
- * @return
- */
- private boolean clearPage(String pageID, boolean bForceClear) {
- ManagedBeanType managedBean = (ManagedBeanType) getInput();
-
- if (pageID == IFacesConfigConstants.MANAGED_PROPERTY) {
- if (managedBean.getManagedProperty().size() == 0) {
- return true;
- }
-
- if (bForceClear
- || EditorPlugin
- .getAlerts()
- .confirm(
- "ManagedBeanInitializationSection.Remove.Title", //$NON-NLS-1$
- "ManagedBeanInitializationSection.RemoveManagedProperty")) { //$NON-NLS-1$
- Command cmd = SetCommand.create(this.getEditingDomain(),
- managedBean, FacesConfigPackage.eINSTANCE
- .getManagedBeanType_ManagedProperty(),
- SetCommand.UNSET_VALUE);
- if (cmd.canExecute()) {
- getEditingDomain().getCommandStack().execute(cmd);
- return true;
- }
-
- return false;
- }
- } else if (pageID == IFacesConfigConstants.MAP_ENTRIES) {
- if (managedBean.getMapEntries() == null) {
- return true;
- }
-
- if (bForceClear
- || EditorPlugin
- .getAlerts()
- .confirm(
- "ManagedBeanInitializationSection.Remove.Title", //$NON-NLS-1$
- "ManagedBeanInitializationSection.RemoveMapEntries")) { //$NON-NLS-1$
- Command cmd = SetCommand.create(this.getEditingDomain(),
- managedBean, FacesConfigPackage.eINSTANCE
- .getManagedBeanType_MapEntries(),
- SetCommand.UNSET_VALUE);
- if (cmd.canExecute()) {
- getEditingDomain().getCommandStack().execute(cmd);
- return true;
- }
- }
- } else if (pageID == IFacesConfigConstants.LIST_ENTRIES) {
- if (managedBean.getListEntries() == null) {
- return true;
- }
-
- if (bForceClear
- || EditorPlugin
- .getAlerts()
- .confirm(
- "ManagedBeanInitializationSection.Remove.Title", //$NON-NLS-1$
- "ManagedBeanInitializationSection.RemoveListEntries")) { //$NON-NLS-1$
- Command cmd = SetCommand.create(this.getEditingDomain(),
- managedBean, FacesConfigPackage.eINSTANCE
- .getManagedBeanType_ListEntries(),
- SetCommand.UNSET_VALUE);
- if (cmd.canExecute()) {
- getEditingDomain().getCommandStack().execute(cmd);
- return true;
- }
- }
- }
-
- return false;
- }
-
- /**
- * create property initialization section
- *
- * @param container
- * @param toolkit
- */
- private void createInitializationEntry(Composite container,
- FormToolkit toolkit, int numberOfColumns) {
- pageBook = new PageBook(container, SWT.NONE);
- GridData gd = new GridData(GridData.FILL_BOTH);
- gd.horizontalSpan = numberOfColumns;
- pageBook.setLayoutData(gd);
- toolkit.paintBordersFor(pageBook);
-
- managedPropertyGroup = new ManagedPropertyEditGroup(this);
- managedPropertyGroup.initialize();
- managedPropertyGroup.addSelectionChangedListener(this);
-
- mapEntryGroup = new MapEntriesEditGroup(this);
- mapEntryGroup.initialize();
- mapEntryGroup.addSelectionChangedListener(this);
-
- listEntryGroup = new ListEntriesEditGroup(this);
- listEntryGroup.initialize();
- listEntryGroup.addSelectionChangedListener(this);
-
- propertySection = toolkit.createComposite(pageBook);
- GridLayout gl = new GridLayout();
- gl.horizontalSpacing = 0;
- gl.marginWidth = 0;
- propertySection.setLayout(gl);
- gd = new GridData(GridData.FILL_BOTH);
- propertySection.setLayoutData(gd);
- managedPropertyGroup.layoutDialogFields(toolkit, propertySection);
-
- mapSection = toolkit.createComposite(pageBook);
- mapEntryGroup.layoutDialogFields(toolkit, mapSection);
-
- listSection = toolkit.createComposite(pageBook);
- listEntryGroup.layoutDialogFields(toolkit, listSection);
-
- pageBook.showPage(propertySection);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see com.sybase.stf.jmt.editors.pageflow.managedbean.sections.ISSESection#setInput(java.lang.Object)
- */
- public void setInput(Object newInput) {
- super.setInput(newInput);
- refreshAll();
- }
-
- public void refreshAll() {
- if (getInput() instanceof ManagedBeanType) {
- ManagedBeanType managedBean = (ManagedBeanType) getInput();
- managedPropertyGroup.setInput(managedBean);
- mapEntryGroup.setInput(managedBean);
- listEntryGroup.setInput(managedBean);
- if (managedBean.getManagedProperty().size() > 0) {
- beanTypeField.setSelectedIndexWithoutUpdate(-1);
- beanTypeField.setSelectedIndex(0);
- } else if (managedBean.getMapEntries() != null) {
- beanTypeField.setSelectedIndexWithoutUpdate(-1);
- beanTypeField.setSelectedIndex(1);
- } else if (managedBean.getListEntries() != null) {
- beanTypeField.setSelectedIndexWithoutUpdate(-1);
- beanTypeField.setSelectedIndex(2);
- } else {
- beanTypeField.setSelectedIndexWithoutUpdate(-1);
- beanTypeField.setSelectedIndex(0);
- }
- }
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/LifecycleSection.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/LifecycleSection.java
deleted file mode 100644
index 50e529c..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/LifecycleSection.java
+++ /dev/null
@@ -1,159 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui.section;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.emf.common.command.Command;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.edit.command.AddCommand;
-import org.eclipse.jdt.ui.IJavaElementSearchConstants;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerFilter;
-import org.eclipse.jst.jsf.facesconfig.emf.FacesConfigFactory;
-import org.eclipse.jst.jsf.facesconfig.emf.LifecycleType;
-import org.eclipse.jst.jsf.facesconfig.ui.dialog.DialogUtil;
-import org.eclipse.jst.jsf.facesconfig.ui.page.IFacesConfigPage;
-import org.eclipse.jst.jsf.facesconfig.ui.page.OthersPage;
-import org.eclipse.jst.jsf.facesconfig.ui.util.ModelUtil;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.forms.IManagedForm;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-
-/**
- * @author Zhi-peng Zhang
- * @version
- */
-public class LifecycleSection extends OthersPageBaseSection {
-
- /**
- * The Eclass object this Section operated. Since lifecycle only has one
- * type child: phase-listener, so this object should always equals
- * <code>FacesConfigPackage.eINSTANCE
- .getPhaseListenerType()</code>.
- */
- private EClass lifecycleChildClass;
-
- /**
- *
- * @param lifecycleChildClass
- * @param parent
- * @param managedForm
- * @param page
- * @param toolkit
- * @param helpContextId
- * @param helpTooltip
- */
- public LifecycleSection(EClass lifecycleChildClass, Composite parent,
- IManagedForm managedForm, IFacesConfigPage page,
- FormToolkit toolkit, String helpContextId, String helpTooltip) {
- super(parent, managedForm, page, toolkit, helpContextId, helpTooltip);
- this.lifecycleChildClass = lifecycleChildClass;
- }
-
- /**
- *
- * @param lifecycleChildClass
- * @param parent
- * @param managedForm
- * @param page
- * @param toolkit
- */
- public LifecycleSection(EClass lifecycleChildClass, Composite parent,
- IManagedForm managedForm, IFacesConfigPage page, FormToolkit toolkit) {
- this(lifecycleChildClass, parent, managedForm, page, toolkit, null,
- null);
- }
-
- /**
- * @return the lifecycle child
- */
- public EObject createLifecycleChildObject() {
- String superType = ModelUtil.getSuperType(lifecycleChildClass);
- IProject project = (IProject) this.getPage().getEditor().getAdapter(
- IProject.class);
- String result = DialogUtil.openClassDialog(getSection().getShell(),
- project, superType,
- IJavaElementSearchConstants.CONSIDER_ALL_TYPES);
-
- if (result != null) {
- EObject component = FacesConfigFactory.eINSTANCE
- .create(lifecycleChildClass);
- EStructuralFeature feature = lifecycleChildClass
- .getEStructuralFeatures().get(0);
- component.eSet(feature, result);
- return component;
- }
- return null;
- }
-
- /**
- * Set the <lifecycle> element as the structuredViewer's input.
- *
- * @param input
- */
- protected void setViewerInput(Object input) {
- if (input instanceof LifecycleType) {
- tableViewer.setInput(input);
- } else
- tableViewer.setInput(null);
- }
-
- /**
- * Add a filter on the table viewer. Only the elements that is a instance of
- * <code>lifecycleChildClass</code> could be selected.
- */
- protected void configTableViewer(TableViewer tableViewer1) {
- tableViewer1.addFilter(new ViewerFilter() {
- public boolean select(Viewer viewer, Object parentElement,
- Object element) {
- return lifecycleChildClass.isInstance(element);
- }
- });
- }
-
- /**
- * Perform some actions to create new child object and append it to the
- * <lifecycle> element.
- */
- void addButtonSelected(SelectionEvent e) {
- EObject obj = createLifecycleChildObject();
- if (obj != null) {
-
- boolean needRefreshAll = false;
- Command command = null;
- if (getInput() instanceof LifecycleType) {
- LifecycleType lifeCycle = (LifecycleType) getInput();
- command = AddCommand.create(getEditingDomain(), lifeCycle,
- null, obj);
- } else {
- needRefreshAll = true;
- LifecycleType lifeCycle = FacesConfigFactory.eINSTANCE
- .createLifecycleType();
- lifeCycle.getPhaseListener().add(obj);
- command = AddCommand.create(getEditingDomain(), this.getPage()
- .getInput(), null, lifeCycle);
- }
-
- if (command.canExecute()) {
- getEditingDomain().getCommandStack().execute(command);
- if (needRefreshAll)
- ((OthersPage) this.getPage()).resetLifecycleInput();
- }
- }
-
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/ListEntriesEditGroup.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/ListEntriesEditGroup.java
deleted file mode 100644
index 3a1d0ef..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/ListEntriesEditGroup.java
+++ /dev/null
@@ -1,626 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui.section;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.emf.common.command.Command;
-import org.eclipse.emf.common.command.CompoundCommand;
-import org.eclipse.emf.edit.command.AddCommand;
-import org.eclipse.emf.edit.command.RemoveCommand;
-import org.eclipse.emf.edit.command.SetCommand;
-import org.eclipse.emf.edit.domain.EditingDomain;
-import org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider;
-import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.viewers.ColumnWeightData;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.ISelectionProvider;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.TableLayout;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerFilter;
-import org.eclipse.jst.jsf.common.ui.internal.dialogfield.ClassButtonDialogField;
-import org.eclipse.jst.jsf.common.ui.internal.dialogfield.DialogField;
-import org.eclipse.jst.jsf.common.ui.internal.dialogfield.DialogFieldBase;
-import org.eclipse.jst.jsf.common.ui.internal.dialogfield.DialogFieldGroup;
-import org.eclipse.jst.jsf.common.ui.internal.dialogfield.IDialogFieldApplyListener;
-import org.eclipse.jst.jsf.common.ui.internal.dialogfield.LayoutUtil;
-import org.eclipse.jst.jsf.common.ui.internal.guiutils.SWTUtils;
-import org.eclipse.jst.jsf.facesconfig.emf.FacesConfigFactory;
-import org.eclipse.jst.jsf.facesconfig.emf.FacesConfigPackage;
-import org.eclipse.jst.jsf.facesconfig.emf.ListEntriesType;
-import org.eclipse.jst.jsf.facesconfig.emf.ManagedBeanType;
-import org.eclipse.jst.jsf.facesconfig.emf.NullValueType;
-import org.eclipse.jst.jsf.facesconfig.emf.ValueClassType;
-import org.eclipse.jst.jsf.facesconfig.emf.ValueType;
-import org.eclipse.jst.jsf.facesconfig.ui.EditorMessages;
-import org.eclipse.jst.jsf.facesconfig.ui.EditorPlugin;
-import org.eclipse.jst.jsf.facesconfig.ui.dialog.EditValueDialog;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.MouseAdapter;
-import org.eclipse.swt.events.MouseEvent;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.TableColumn;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-
-/**
- * ListEntries editing DialogFieldGroup
- *
- * @author Xiao-guang Zhang, sfshi
- * @version
- */
-public class ListEntriesEditGroup extends DialogFieldGroup implements
- IDialogFieldGroup, ISelectionProvider, ISelectionChangedListener {
-
- private ClassButtonDialogField valueClassField;
-
- private static final int TABLE_DEFAULT_HEIGHT = 160;
-
- private IProject currentProject;
-
- private TableViewer tableViewer;
-
- private Button removeButton;
-
- private Button editButton;
-
- private ManagedBeanType managedBean;
-
- private AbstractFacesConfigSection section;
-
- private List selectionChangedListeners = new ArrayList();
-
- /**
- * @param section
- */
- public ListEntriesEditGroup(AbstractFacesConfigSection section) {
- super();
- this.section = section;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.jsf.facesconfig.ui.common.dialogfield.DialogFieldGroup#initialize()
- */
- public void initialize() {
- // TODO: initialize?
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.jsf.facesconfig.ui.common.dialogfield.DialogFieldGroup#refreshData()
- */
- public void refreshData() {
- // TODO: initialize?
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.jsf.facesconfig.ui.common.dialogfield.DialogFieldGroup#layoutDialogFields(org.eclipse.ui.forms.widgets.FormToolkit,
- * org.eclipse.swt.widgets.Composite)
- */
- public void layoutDialogFields(FormToolkit toolkit, Composite parent) {
- GridData data = new GridData(GridData.FILL_BOTH);
- parent.setLayoutData(data);
-
- GridLayout gl = new GridLayout();
- gl.verticalSpacing = 0;
- gl.marginHeight = 0;
- parent.setLayout(gl);
-
- layoutListTypeSelectionSection(toolkit, parent);
-
- createAndLayoutListValueSection(toolkit, parent);
- }
-
- /**
- *
- */
- private void layoutListTypeSelectionSection(FormToolkit toolkit,
- Composite container) {
- Composite typeSelectionSection = null;
- if (toolkit != null) {
- typeSelectionSection = toolkit.createComposite(container);
- toolkit.paintBordersFor(typeSelectionSection);
- } else {
- typeSelectionSection = SWTUtils
- .createComposite(container, SWT.NONE);
- }
-
- GridData gd = new GridData(GridData.FILL_HORIZONTAL);
- typeSelectionSection.setLayoutData(gd);
-
- int numberOfColumns = 4;
- GridLayout gl = new GridLayout(numberOfColumns, false);
- typeSelectionSection.setLayout(gl);
- valueClassField = new ClassButtonDialogField(getProject());
-
- valueClassField
- .setLabelText(EditorMessages.InitializationSection_MapType_ValueClass);
- valueClassField
- .setDialogFieldApplyListener(new IDialogFieldApplyListener() {
-
- public void dialogFieldApplied(DialogField field) {
- ManagedBeanType managedBean_ = (ManagedBeanType) getInput();
- String className = ((ClassButtonDialogField) field)
- .getText();
- ValueClassType valueClass = FacesConfigFactory.eINSTANCE
- .createValueClassType();
- valueClass.setTextContent(className);
- EditingDomain editingDomain = section
- .getEditingDomain();
- Command cmd;
- boolean isNew;
- if (managedBean_.getListEntries() == null) {
- isNew = true;
- ListEntriesType listEntries = FacesConfigFactory.eINSTANCE
- .createListEntriesType();
- listEntries.setValueClass(valueClass);
- cmd = SetCommand.create(editingDomain, managedBean_,
- FacesConfigPackage.eINSTANCE
- .getManagedBeanType_ListEntries(),
- listEntries);
- } else {
- isNew = false;
- ListEntriesType listEntries = managedBean_
- .getListEntries();
- cmd = SetCommand.create(editingDomain, listEntries,
- FacesConfigPackage.eINSTANCE
- .getListEntriesType_ValueClass(),
- valueClass);
- }
-
- if (cmd.canExecute()) {
- editingDomain.getCommandStack().execute(cmd);
- if (isNew)
- refreshAll();
- }
-
- }
- });
- valueClassField.doFillIntoGrid(toolkit, typeSelectionSection,
- numberOfColumns);
- LayoutUtil.setHorizontalGrabbing(valueClassField.getTextControl(
- toolkit, container));
- }
-
- /**
- * @param toolkit
- * @param parent
- */
- private void createAndLayoutListValueSection(FormToolkit toolkit,
- Composite parent) {
- Composite listValueSection = null;
- if (toolkit != null) {
- listValueSection = toolkit.createComposite(parent);
- toolkit.paintBordersFor(listValueSection);
- } else {
- listValueSection = SWTUtils.createComposite(parent, SWT.NONE);
- }
-
- GridData gd = new GridData(GridData.FILL_BOTH);
- listValueSection.setLayoutData(gd);
-
- int numberOfColumns = 3;
- GridLayout gl = new GridLayout(numberOfColumns, false);
- listValueSection.setLayout(gl);
- DialogFieldBase valuesTitle = new DialogFieldBase();
- valuesTitle
- .setLabelText(EditorMessages.InitializationSection_MapTable_Title);
- valuesTitle.doFillIntoGrid(toolkit, listValueSection, numberOfColumns);
-
- // list's value table
- Table listTable;
- if (toolkit == null) {
- listTable = new Table(listValueSection, SWT.H_SCROLL | SWT.V_SCROLL
- | SWT.FULL_SELECTION | SWT.BORDER);
- } else {
- listTable = new Table(listValueSection, SWT.H_SCROLL | SWT.V_SCROLL
- | SWT.FULL_SELECTION | SWT.BORDER);
- }
-
- listTable.addSelectionListener(new SelectionListener() {
- public void widgetSelected(SelectionEvent e) {
- updateButtons();
- }
-
- public void widgetDefaultSelected(SelectionEvent e) {
- updateButtons();
- }
-
- });
- gd = new GridData(GridData.FILL_BOTH);
- gd.horizontalSpan = 1;
- gd.heightHint = TABLE_DEFAULT_HEIGHT;
- listTable.setLayoutData(gd);
- listTable.setHeaderVisible(true);
- listTable.setLinesVisible(true);
- TableLayout layout = new TableLayout();
- layout.addColumnData(new ColumnWeightData(1, true));
- listTable.setLayout(layout);
- TableColumn valueCol = new TableColumn(listTable, SWT.NONE);
- layout.addColumnData(new ColumnWeightData(1, true));
- valueCol
- .setText(EditorMessages.InitializationSection_MapTable_Value);
- valueCol.setResizable(true);
-
- listTable.addMouseListener(new MouseAdapter() {
- public void mouseDoubleClick(MouseEvent e) {
- if (((IStructuredSelection) tableViewer.getSelection()).size() > 0)
- editButtonSelected();
- }
- });
- tableViewer = new TableViewer(listTable);
- tableViewer.setContentProvider(new AdapterFactoryContentProvider(
- section.getAdapterFactory()));
- tableViewer.setLabelProvider(new AdapterFactoryLabelProvider(section
- .getAdapterFactory()));
-
- tableViewer.addFilter(new ViewerFilter() {
- public boolean select(Viewer viewer, Object parentElement,
- Object element) {
- return FacesConfigPackage.eINSTANCE.getValueType().isInstance(
- element)
- || FacesConfigPackage.eINSTANCE.getNullValueType()
- .isInstance(element);
- }
- });
- tableViewer.addSelectionChangedListener(this);
-
- Composite operationContainer = null;
- if (toolkit != null) {
- operationContainer = toolkit.createComposite(listValueSection);
- } else {
- operationContainer = SWTUtils.createComposite(listValueSection,
- SWT.NONE);
- }
- gd = new GridData(GridData.FILL_VERTICAL);
- operationContainer.setLayoutData(gd);
- gl = new GridLayout();
- operationContainer.setLayout(gl);
-
- Button addButton = null;
- if (toolkit != null) {
- addButton = toolkit.createButton(operationContainer,
- EditorMessages.UI_Button_Add_more,
- SWT.PUSH);
- } else {
- addButton = SWTUtils.createPushButton(operationContainer,
- EditorMessages.UI_Button_Add_more);
- }
- gd = new GridData(GridData.FILL_HORIZONTAL
- | GridData.VERTICAL_ALIGN_BEGINNING);
- gd.grabExcessHorizontalSpace = false;
- addButton.setLayoutData(gd);
-
- editButton = null;
- if (toolkit != null) {
- editButton = toolkit.createButton(operationContainer,
- EditorMessages.UI_Button_Edit_more, SWT.PUSH);
- } else {
- editButton = SWTUtils.createPushButton(operationContainer,
- EditorMessages.UI_Button_Edit_more);
- }
-
- gd = new GridData(GridData.FILL_HORIZONTAL
- | GridData.VERTICAL_ALIGN_BEGINNING);
- gd.grabExcessHorizontalSpace = false;
- editButton.setLayoutData(gd);
-
- removeButton = null;
- if (toolkit != null) {
- removeButton = toolkit.createButton(operationContainer,
- EditorMessages.UI_Button_Remove,
- SWT.PUSH);
- } else {
- removeButton = SWTUtils.createPushButton(operationContainer,
- EditorMessages.UI_Button_Remove);
- }
-
- gd = new GridData(GridData.FILL_HORIZONTAL
- | GridData.VERTICAL_ALIGN_BEGINNING);
- gd.grabExcessHorizontalSpace = false;
- removeButton.setLayoutData(gd);
-
- addButton.addSelectionListener(new SelectionAdapter() {
-
- public void widgetSelected(SelectionEvent e) {
- addButtonSelected();
- }
-
- });
-
- editButton.addSelectionListener(new SelectionAdapter() {
-
- public void widgetSelected(SelectionEvent e) {
- editButtonSelected();
- }
- });
- removeButton.addSelectionListener(new SelectionAdapter() {
-
- public void widgetSelected(SelectionEvent e) {
- removeButtonSelected();
- }
- });
- }
-
- private void addButtonSelected() {
- EditValueDialog dialog = new EditValueDialog(EditorPlugin
- .getActiveShell(), true, false, null);
- if (dialog.open() == Dialog.OK) {
-
- EditingDomain editingDomain = section.getEditingDomain();
- if (this.managedBean.getListEntries() == null) {
- ListEntriesType listEntries = FacesConfigFactory.eINSTANCE
- .createListEntriesType();
- if (dialog.isNullValue()) {
- NullValueType nullValue = FacesConfigFactory.eINSTANCE
- .createNullValueType();
- listEntries.getNullValue().add(nullValue);
- } else {
- ValueType value = FacesConfigFactory.eINSTANCE
- .createValueType();
- value.setTextContent((String) dialog.getResultData());
- listEntries.getValue().add(value);
- }
-
- Command cmd1 = SetCommand.create(editingDomain, managedBean,
- FacesConfigPackage.eINSTANCE
- .getManagedBeanType_ListEntries(), listEntries);
- if (cmd1.canExecute()) {
- editingDomain.getCommandStack().execute(cmd1);
- refreshAll();
- }
- } else {
- ListEntriesType listEntries = managedBean.getListEntries();
- Command cmd;
- if (dialog.isNullValue()) {
- NullValueType nullValue = FacesConfigFactory.eINSTANCE
- .createNullValueType();
- cmd = AddCommand.create(editingDomain, listEntries,
- FacesConfigPackage.eINSTANCE
- .getListEntriesType_NullValue(), nullValue);
- } else {
- ValueType value = FacesConfigFactory.eINSTANCE
- .createValueType();
- value.setTextContent((String) dialog.getResultData());
- cmd = AddCommand.create(editingDomain, listEntries,
- FacesConfigPackage.eINSTANCE
- .getListEntriesType_Value(), value);
- }
- if (cmd.canExecute()) {
- editingDomain.getCommandStack().execute(cmd);
- }
- }
-
- }
- }
-
- private void editButtonSelected() {
- Object select = ((IStructuredSelection) tableViewer.getSelection())
- .getFirstElement();
- boolean isNullValue;
- String valueText = null;
- if (select instanceof NullValueType)
- isNullValue = true;
- else {
- isNullValue = false;
- valueText = ((ValueType) select).getTextContent();
- }
- ListEntriesType listEntries = managedBean.getListEntries();
- EditValueDialog dialog = new EditValueDialog(EditorPlugin
- .getActiveShell(), true, isNullValue, valueText);
- if (dialog.open() == Dialog.OK) {
- EditingDomain editingDomain = section.getEditingDomain();
- Command cmd = null;
- if (isNullValue && !dialog.isNullValue()) {
- List commands = new ArrayList();
- Command cmd1 = RemoveCommand.create(editingDomain, listEntries,
- FacesConfigPackage.eINSTANCE
- .getListEntriesType_NullValue(), select);
- commands.add(cmd1);
-
- // listEntries.getNullValue().remove(select);
- ValueType value = FacesConfigFactory.eINSTANCE
- .createValueType();
- value.setTextContent((String) dialog.getResultData());
- Command cmd2 = AddCommand
- .create(editingDomain, listEntries,
- FacesConfigPackage.eINSTANCE
- .getListEntriesType_Value(), value);
- commands.add(cmd2);
- cmd = new CompoundCommand(commands);
- } else if (!isNullValue && dialog.isNullValue()) {
- List commands = new ArrayList();
- Command cmd1 = RemoveCommand
- .create(editingDomain, listEntries,
- FacesConfigPackage.eINSTANCE
- .getListEntriesType_Value(), select);
- commands.add(cmd1);
- NullValueType nullValue = FacesConfigFactory.eINSTANCE
- .createNullValueType();
- Command cmd2 = AddCommand.create(editingDomain, listEntries,
- FacesConfigPackage.eINSTANCE
- .getListEntriesType_NullValue(), nullValue);
- commands.add(cmd2);
- cmd = new CompoundCommand(commands);
- } else if (!isNullValue && !dialog.isNullValue()) {
- cmd = SetCommand
- .create(editingDomain, select,
- FacesConfigPackage.eINSTANCE
- .getValueType_TextContent(), dialog
- .getResultData());
- }
-
- if (cmd != null && cmd.canExecute()) {
- editingDomain.getCommandStack().execute(cmd);
- }
- }
- }
-
- private void removeButtonSelected() {
- Object select = ((IStructuredSelection) tableViewer.getSelection())
- .getFirstElement();
- ListEntriesType listEntries = managedBean.getListEntries();
- EditingDomain editingDomain = section.getEditingDomain();
- Command cmd;
- if (select instanceof NullValueType) {
- cmd = RemoveCommand
- .create(editingDomain, listEntries,
- FacesConfigPackage.eINSTANCE
- .getListEntriesType_NullValue(), select);
- } else {
- cmd = RemoveCommand.create(editingDomain, listEntries,
- FacesConfigPackage.eINSTANCE.getListEntriesType_Value(),
- select);
- }
- if (cmd.canExecute()) {
- editingDomain.getCommandStack().execute(cmd);
- }
- }
-
- /*
- * (non-Javadoc)
- *
- * @see com.sybase.stf.jmt.editors.pageflow.managedbean.sections.wizards.IDialogFieldGroup#setInput(java.lang.Object)
- */
- public void setInput(Object newInput) {
- if (newInput != null && newInput instanceof ManagedBeanType) {
- managedBean = (ManagedBeanType) newInput;
- if (managedBean.getListEntries() != null)
- refreshAll();
- }
-
- }
-
- /**
- *
- */
- public void refreshAll() {
- if (managedBean.getListEntries() != null
- && managedBean.getListEntries().getValueClass() != null) {
- this.valueClassField.setTextWithoutUpdate(managedBean
- .getListEntries().getValueClass().getTextContent());
- } else {
- valueClassField.setTextWithoutUpdate(null);
- }
- tableViewer.setInput(((ManagedBeanType) getInput()).getListEntries());
- updateButtons();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see com.sybase.stf.jmt.editors.pageflow.managedbean.sections.wizards.IDialogFieldGroup#getInput()
- */
- public Object getInput() {
- return managedBean;
- }
-
- private IProject getProject() {
- if (currentProject == null) {
- currentProject = (IProject) section.getPage().getEditor()
- .getAdapter(IProject.class);
- }
- return currentProject;
- }
-
- private void updateButtons() {
- if (((IStructuredSelection) tableViewer.getSelection()).size() > 0) {
- editButton.setEnabled(true);
- removeButton.setEnabled(true);
- } else {
- editButton.setEnabled(false);
- removeButton.setEnabled(false);
- }
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.jsf.facesconfig.ui.common.dialogfield.DialogFieldGroup#validateDialogFields()
- */
- public IStatus[] validateDialogFields() {
- return null;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.ISelectionProvider#addSelectionChangedListener(org.eclipse.jface.viewers.ISelectionChangedListener)
- */
- public void addSelectionChangedListener(ISelectionChangedListener listener) {
- selectionChangedListeners.add(listener);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.ISelectionProvider#getSelection()
- */
- public ISelection getSelection() {
- return null;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.ISelectionProvider#removeSelectionChangedListener(org.eclipse.jface.viewers.ISelectionChangedListener)
- */
- public void removeSelectionChangedListener(
- ISelectionChangedListener listener) {
- selectionChangedListeners.remove(listener);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.ISelectionProvider#setSelection(org.eclipse.jface.viewers.ISelection)
- */
- public void setSelection(ISelection selection) {
- // do nothing
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.ISelectionChangedListener#selectionChanged(org.eclipse.jface.viewers.SelectionChangedEvent)
- */
- public void selectionChanged(SelectionChangedEvent event) {
- for (Iterator listeners = selectionChangedListeners.iterator(); listeners
- .hasNext();) {
- ISelectionChangedListener listener = (ISelectionChangedListener) listeners
- .next();
- listener.selectionChanged(new SelectionChangedEvent(this, event
- .getSelection()));
- }
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/LocaleConfigSection.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/LocaleConfigSection.java
deleted file mode 100644
index 3ac917a..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/LocaleConfigSection.java
+++ /dev/null
@@ -1,421 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui.section;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.emf.common.command.Command;
-import org.eclipse.emf.common.command.CompoundCommand;
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.impl.AdapterImpl;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.emf.edit.command.AddCommand;
-import org.eclipse.emf.edit.command.RemoveCommand;
-import org.eclipse.emf.edit.command.SetCommand;
-import org.eclipse.jface.viewers.CheckStateChangedEvent;
-import org.eclipse.jface.viewers.CheckboxTableViewer;
-import org.eclipse.jface.viewers.ICheckStateListener;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerFilter;
-import org.eclipse.jface.viewers.ViewerSorter;
-import org.eclipse.jst.jsf.facesconfig.emf.ApplicationType;
-import org.eclipse.jst.jsf.facesconfig.emf.DefaultLocaleType;
-import org.eclipse.jst.jsf.facesconfig.emf.FacesConfigFactory;
-import org.eclipse.jst.jsf.facesconfig.emf.FacesConfigPackage;
-import org.eclipse.jst.jsf.facesconfig.emf.LocaleConfigType;
-import org.eclipse.jst.jsf.facesconfig.emf.SupportedLocaleType;
-import org.eclipse.jst.jsf.facesconfig.ui.dialog.DialogUtil;
-import org.eclipse.jst.jsf.facesconfig.ui.page.IFacesConfigPage;
-import org.eclipse.jst.jsf.facesconfig.ui.page.OthersPage;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.forms.IManagedForm;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-
-/**
- * @author Zhi-peng Zhang, sfshi
- * @version
- */
-public class LocaleConfigSection extends ApplicationSection implements
- ICheckStateListener {
- private LocaleConfigAdapter _localeConfigAdapter;
-
- /**
- *
- * @param componentClass
- * @param parent
- * @param managedForm
- * @param page
- * @param toolkit
- * @param helpContextId
- * @param helpTooltip
- */
- public LocaleConfigSection(EClass componentClass, Composite parent,
- IManagedForm managedForm, IFacesConfigPage page,
- FormToolkit toolkit, String helpContextId, String helpTooltip) {
- super(componentClass, parent, managedForm, page, toolkit,
- helpContextId, helpTooltip);
- }
-
- /**
- *
- * @param componentClass
- * @param parent
- * @param managedForm
- * @param page
- * @param toolkit
- */
- public LocaleConfigSection(EClass componentClass, Composite parent,
- IManagedForm managedForm, IFacesConfigPage page, FormToolkit toolkit) {
- this(componentClass, parent, managedForm, page, toolkit, null, null);
- }
-
- public void dispose() {
- ((CheckboxTableViewer)tableViewer).removeCheckStateListener(this);
- super.dispose();
- }
- /**
- * create a CheckboxTableViewer for this section.
- */
- protected TableViewer createTableViewer(Composite parent) {
- CheckboxTableViewer tableViewer1 = CheckboxTableViewer.newCheckList(
- parent, SWT.MULTI | SWT.H_SCROLL | SWT.V_SCROLL | SWT.BORDER);
- tableViewer1.addCheckStateListener(this);
- tableViewer1.setSorter(new ViewerSorter());
- return tableViewer1;
- }
-
- /**
- * Add a filter for this table viewer, only <supported-locale> and
- * <default-locale> elements would be listed.
- */
- protected void configTableViewer(TableViewer tableViewer1) {
- tableViewer1.addFilter(new ViewerFilter() {
- public boolean select(Viewer viewer, Object parentElement,
- Object element) {
- return FacesConfigPackage.eINSTANCE.getSupportedLocaleType()
- .isInstance(element)
- || FacesConfigPackage.eINSTANCE.getDefaultLocaleType()
- .isInstance(element);
- }
- });
- }
-
- /**
- * Pop up a dialog for user to select a locale string, then create a
- * <supported-locale> element with the string as value.
- *
- * @return the supported locale object
- */
- public SupportedLocaleType createSupportedLocaleObject() {
- ArrayList locales = new ArrayList();
-
- /**
- * Compute the locales that already declared in this <locale-config>
- * element. If user select a locale that already declared, then a
- * warning message will be shown in the dialog.
- */
-
- if (getInput() instanceof ApplicationType
- && ((ApplicationType) getInput()).getLocaleConfig().size() > 0) {
- LocaleConfigType localeConfigType = (LocaleConfigType) ((ApplicationType) getInput())
- .getLocaleConfig().get(0);
- if (localeConfigType.getDefaultLocale() != null) {
- String locale = localeConfigType.getDefaultLocale()
- .getTextContent();
- if (locale != null) {
- locales.add(locale);
- }
- }
- List list = localeConfigType.getSupportedLocale();
- for (int i = 0, n = list.size(); i < n; i++) {
- String locale = ((SupportedLocaleType) list.get(i))
- .getTextContent();
- if (locale != null) {
- locales.add(locale);
- }
- }
- }
- String result = DialogUtil.openLocaleDialog(getSection().getShell(),
- locales);
- if (result != null) {
- SupportedLocaleType component = FacesConfigFactory.eINSTANCE
- .createSupportedLocaleType();
- component.setTextContent(result);
- return component;
- }
- return null;
- }
-
- /**
- * When user click "Add" button on this section, pop up a dialog to create a
- * <supported-locale> element, then add it onto <locale-config> element, if
- * the <locale-config> or <application> doesn't exist, create them together.
- */
- void addButtonSelected(SelectionEvent e) {
- SupportedLocaleType obj = createSupportedLocaleObject();
- if (obj != null) {
-
- boolean needRefreshAll = false;
- Command command = null;
-
- if (getInput() instanceof ApplicationType) {
- /** the <application> element exists. */
- ApplicationType application = (ApplicationType) getInput();
- if (application.getLocaleConfig().size() > 0) {
- /** the <locale-config> element exists. */
- LocaleConfigType localeConfig = (LocaleConfigType) application
- .getLocaleConfig().get(0);
- command = AddCommand.create(this.getEditingDomain(),
- localeConfig, null, obj);
- } else {
- /** the <locale-config> element doesn't exist, create it. */
- LocaleConfigType localeConfig = FacesConfigFactory.eINSTANCE
- .createLocaleConfigType();
- localeConfig.getSupportedLocale().add(obj);
- command = AddCommand.create(getEditingDomain(),
- application, null, localeConfig);
- }
- } else {
- /**
- * the <application> element doesn't exist, then create it,
- * after execute, reset the input for all the application
- * sections.
- */
- needRefreshAll = true;
- ApplicationType application = FacesConfigFactory.eINSTANCE
- .createApplicationType();
- LocaleConfigType localeConfig = FacesConfigFactory.eINSTANCE
- .createLocaleConfigType();
- localeConfig.getSupportedLocale().add(obj);
- application.getLocaleConfig().add(localeConfig);
- command = AddCommand.create(getEditingDomain(), this.getPage()
- .getInput(), null, application);
- }
-
- if (command.canExecute()) {
- getEditingDomain().getCommandStack().execute(command);
- if (needRefreshAll)
- /** reset input for all the application sections. */
- ((OthersPage) this.getPage()).resetApplicationInput();
- }
- }
-
- }
-
- /**
- * when user click on the CheckboxTableViewer, perform some actions to
- * set/unset <default-locale> and <supported-locale> elements.
- *
- * If an item is selected, that means it's a <default-locale>, otherwise
- * it's a <supported-locale>.
- *
- * @see org.eclipse.jface.viewers.ICheckStateListener#checkStateChanged(org.eclipse.jface.viewers.CheckStateChangedEvent)
- */
- public void checkStateChanged(CheckStateChangedEvent event) {
- boolean checked = event.getChecked();
-
- if (event.getElement() == null) {
- return;
- }
-
- EObject node = (EObject) event.getElement();
- LocaleConfigType localeConfigType = (LocaleConfigType) ((ApplicationType) getInput())
- .getLocaleConfig().get(0);
- CompoundCommand compoundCommand = new CompoundCommand();
-
- if (checked) {
- /** user checked one item, going to set it as <default-locale>. */
- if (localeConfigType.getDefaultLocale() != null) {
- /**
- * Change the <default-locale> value to <supported-locale>.
- */
- Command command = RemoveCommand.create(getEditingDomain(),
- localeConfigType, null, localeConfigType
- .getDefaultLocale());
-
- compoundCommand.append(command);
-
- SupportedLocaleType supportedLocale = FacesConfigFactory.eINSTANCE
- .createSupportedLocaleType();
- supportedLocale.setTextContent(localeConfigType
- .getDefaultLocale().getTextContent());
- command = AddCommand.create(getEditingDomain(),
- localeConfigType, FacesConfigPackage.eINSTANCE
- .getLocaleConfigType_SupportedLocale(),
- supportedLocale);
- compoundCommand.append(command);
- }
-
- /**
- * Change the selected item from <supported-locale> to
- * <default-locale>
- */
- SupportedLocaleType supportedLocale = (SupportedLocaleType) node;
- Command command = RemoveCommand.create(getEditingDomain(),
- localeConfigType, FacesConfigPackage.eINSTANCE
- .getLocaleConfigType_SupportedLocale(),
- supportedLocale);
- compoundCommand.append(command);
-
- DefaultLocaleType defaultLocale = FacesConfigFactory.eINSTANCE
- .createDefaultLocaleType();
- defaultLocale.setTextContent(supportedLocale.getTextContent());
- command = SetCommand
- .create(getEditingDomain(), localeConfigType,
- FacesConfigPackage.eINSTANCE
- .getLocaleConfigType_DefaultLocale(),
- defaultLocale);
- compoundCommand.append(command);
-
- } else {
- /**
- * User unchecked one item, going to change it from <default-locale>
- * to <supported-locale>.
- */
- DefaultLocaleType defaultLocale = (DefaultLocaleType) node;
- Command command = RemoveCommand.create(getEditingDomain(),
- localeConfigType, null, defaultLocale);
- compoundCommand.append(command);
-
- SupportedLocaleType supportedLocale = FacesConfigFactory.eINSTANCE
- .createSupportedLocaleType();
- supportedLocale.setTextContent(defaultLocale.getTextContent());
- command = AddCommand.create(getEditingDomain(), localeConfigType,
- null, supportedLocale);
- compoundCommand.append(command);
- }
-
- if (compoundCommand.canExecute()) {
- getEditingDomain().getCommandStack().execute(compoundCommand);
- this.refresh();
- setTableViewerCheckedState();
- }
- }
-
- /**
- * Set the checked state for items in the checkbox table viewer. This method
- * could be used for refresh the checked state of the table viewer.
- */
- private void setTableViewerCheckedState() {
- if (getInput() instanceof ApplicationType) {
- ApplicationType application = (ApplicationType) getInput();
- if (application.getLocaleConfig().size() > 0) {
-
- LocaleConfigType localeConfigType = (LocaleConfigType) application
- .getLocaleConfig().get(0);
- if (localeConfigType.getDefaultLocale() != null) {
- ((CheckboxTableViewer) getTableViewer()).setChecked(
- localeConfigType.getDefaultLocale(), true);
- }
- }
- }
- }
-
- @Override
- protected void addAdaptersOntoInput(Object input) {
- super.addAdaptersOntoInput(input);
- if (input != null && input instanceof ApplicationType) {
- ApplicationType application = (ApplicationType) input;
- if (EcoreUtil.getExistingAdapter(application,
- LocaleConfigSection.class) == null) {
- application.eAdapters().add(getLocaleConfigAdapter());
- }
- }
- }
-
- private Adapter getLocaleConfigAdapter() {
- if (_localeConfigAdapter == null) {
- _localeConfigAdapter = new LocaleConfigAdapter();
- }
- return _localeConfigAdapter;
- }
-
- @Override
- protected void removeAdaptersFromInput(Object input) {
- if (input != null && input instanceof ApplicationType && _localeConfigAdapter != null) {
- ApplicationType application = (ApplicationType) input;
- application.eAdapters().remove(_localeConfigAdapter);
- }
- super.removeAdaptersFromInput(input);
- }
-
- /**
- * set the structuredViewer's input. Set the first LocaleConfig as input.
- *
- * @param input
- */
- protected void setViewerInput(Object input) {
- if (input instanceof ApplicationType) {
- ApplicationType application = (ApplicationType) input;
- if (application.getLocaleConfig().size() > 0) {
- tableViewer.setInput(application.getLocaleConfig().get(0));
- } else
- tableViewer.setInput(null);
- } else
- tableViewer.setInput(null);
-
- }
-
- public void refreshAll() {
- super.refreshAll();
- setTableViewerCheckedState();
- }
-
- /**
- * A listener that is be adapted on the input <application> element, to
- * listen the event that the first <locale-config> being created and
- * removed, then reset the input of the tabel viewer.
- *
- * @author sfshi
- *
- */
- class LocaleConfigAdapter extends AdapterImpl {
- public boolean isAdapterForType(Object type) {
- if (type == LocaleConfigSection.class)
- return true;
- return false;
- }
-
- public void notifyChanged(Notification msg) {
- if (msg.getEventType() == Notification.ADD
- || msg.getEventType() == Notification.REMOVE) {
- if (msg.getFeature() == FacesConfigPackage.eINSTANCE
- .getApplicationType_LocaleConfig()) {
- /**
- * a <locale-config> was created or removed, notify this
- * section to reset it's input.
- */
-
- if (Thread.currentThread() == PlatformUI.getWorkbench().getDisplay().getThread()) {
- setInput(getInput());
- } else {
- PlatformUI.getWorkbench().getDisplay().asyncExec(new Runnable() {
- public void run() {
- setInput(getInput());
- }
- });
- }
-
- }
- }
- }
-
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/ManagedBeanGeneralSection.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/ManagedBeanGeneralSection.java
deleted file mode 100644
index 6df0d53..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/ManagedBeanGeneralSection.java
+++ /dev/null
@@ -1,330 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui.section;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.emf.common.command.Command;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.impl.AdapterImpl;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.emf.edit.command.SetCommand;
-import org.eclipse.jst.jsf.common.ui.internal.dialogfield.ClassButtonDialogField;
-import org.eclipse.jst.jsf.common.ui.internal.dialogfield.ComboDialogField;
-import org.eclipse.jst.jsf.common.ui.internal.dialogfield.DialogField;
-import org.eclipse.jst.jsf.common.ui.internal.dialogfield.IDialogFieldApplyListener;
-import org.eclipse.jst.jsf.common.ui.internal.dialogfield.IDialogFieldChangeListener;
-import org.eclipse.jst.jsf.common.ui.internal.dialogfield.LayoutUtil;
-import org.eclipse.jst.jsf.common.ui.internal.dialogfield.StringDialogField;
-import org.eclipse.jst.jsf.facesconfig.emf.FacesConfigFactory;
-import org.eclipse.jst.jsf.facesconfig.emf.FacesConfigPackage;
-import org.eclipse.jst.jsf.facesconfig.emf.ManagedBeanClassType;
-import org.eclipse.jst.jsf.facesconfig.emf.ManagedBeanNameType;
-import org.eclipse.jst.jsf.facesconfig.emf.ManagedBeanScopeType;
-import org.eclipse.jst.jsf.facesconfig.emf.ManagedBeanType;
-import org.eclipse.jst.jsf.facesconfig.ui.EditorMessages;
-import org.eclipse.jst.jsf.facesconfig.ui.IFacesConfigConstants;
-import org.eclipse.jst.jsf.facesconfig.ui.page.IFacesConfigPage;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.forms.IManagedForm;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-
-/**
- *
- * @author sfshi
- *
- */
-public class ManagedBeanGeneralSection extends AbstractFacesConfigSection {
-
- private StringDialogField mbNameField;
-
- private ClassButtonDialogField mbClassField;
-
- private ComboDialogField mbScopeField;
-
- private ManagedBeanGeneralSectionAdapter managedBeanGeneralSectionAdapter;
-
- /**
- *
- * @param parent
- * @param managedForm
- * @param page
- * @param toolkit
- */
- public ManagedBeanGeneralSection(Composite parent,
- IManagedForm managedForm, IFacesConfigPage page, FormToolkit toolkit) {
- super(parent, managedForm, page, toolkit, null, null);
- getSection().setText(
- EditorMessages.ManagedBeanGeneralSection_Name);
- getSection().setDescription(
- EditorMessages.ManagedBeanGeneralSection_Desc);
- }
-
- protected void createContents(Composite container, FormToolkit toolkit) {
- int numberOfColumns = 4;
- GridLayout layout = new GridLayout(numberOfColumns, false);
- container.setLayout(layout);
-
- toolkit.paintBordersFor(container);
-
- createMBNameEntry(container, toolkit, numberOfColumns);
-
- createMBClassEntry(container, toolkit, numberOfColumns);
-
- createMBScopeEntry(container, toolkit, numberOfColumns);
-
- }
-
- /**
- * create managed bean's name editing field
- *
- * @param container
- * @param toolkit
- */
- private void createMBNameEntry(Composite container, FormToolkit toolkit,
- int numberOfColumns) {
- mbNameField = new StringDialogField();
- mbNameField
- .setLabelText(EditorMessages.ManagedBeanGeneralSection_ManagedBeanName);
- mbNameField.doFillIntoGrid(toolkit, container, numberOfColumns);
- LayoutUtil.setHorizontalGrabbing(mbNameField.getTextControl(toolkit,
- container));
- mbNameField
- .setDialogFieldApplyListener(new IDialogFieldApplyListener() {
- public void dialogFieldApplied(DialogField field) {
- String mbNameValue = ((StringDialogField) field)
- .getText();
- Command cmd = null;
- ManagedBeanType managedBean = (ManagedBeanType) getInput();
- // if (managedBean.getManagedBeanName() != null) {
- // cmd = SetCommand
- // .create(
- // getEditingDomain(),
- // managedBean.getManagedBeanName(),
- // FacesConfigPackage.eINSTANCE
- // .getManagedBeanNameType_TextContent(),
- // mbNameValue);
- // } else {
- ManagedBeanNameType newManagedBeanName = FacesConfigFactory.eINSTANCE
- .createManagedBeanNameType();
- newManagedBeanName.setTextContent(mbNameValue);
- cmd = SetCommand.create(getEditingDomain(),
- managedBean, FacesConfigPackage.eINSTANCE
- .getManagedBeanType_ManagedBeanName(),
- newManagedBeanName);
- // }
- if (cmd.canExecute()) {
- getEditingDomain().getCommandStack().execute(cmd);
- }
- }
- });
- }
-
- /**
- * create managed bean's class field.
- *
- * @param container
- * @param toolkit
- */
- private void createMBClassEntry(final Composite container,
- final FormToolkit toolkit, int numberOfColumns) {
- mbClassField = new ClassButtonDialogField(null);
- mbClassField
- .setLabelText(EditorMessages.ManagedBeanGeneralSection_ManagedBeanClass);
- mbClassField.setProject((IProject) getPage().getEditor().getAdapter(
- IProject.class));
- mbClassField.doFillIntoGrid(toolkit, container, numberOfColumns);
- LayoutUtil.setHorizontalGrabbing(mbClassField.getTextControl(toolkit,
- container));
-
- mbClassField
- .setDialogFieldApplyListener(new IDialogFieldApplyListener() {
- public void dialogFieldApplied(DialogField field) {
- String newValue = ((StringDialogField) field).getText();
- Command cmd = null;
- ManagedBeanType managedBean = (ManagedBeanType) getInput();
- // if (managedBean.getManagedBeanClass() != null) {
- // cmd = SetCommand
- // .create(
- // getEditingDomain(),
- // managedBean.getManagedBeanClass(),
- // FacesConfigPackage.eINSTANCE
- // .getManagedBeanClassType_TextContent(),
- // newValue);
- // } else {
- ManagedBeanClassType newManagedBeanClass = FacesConfigFactory.eINSTANCE
- .createManagedBeanClassType();
- newManagedBeanClass.setTextContent(newValue);
- cmd = SetCommand.create(getEditingDomain(),
- managedBean, FacesConfigPackage.eINSTANCE
- .getManagedBeanType_ManagedBeanClass(),
- newManagedBeanClass);
- // }
- if (cmd.canExecute()) {
- getEditingDomain().getCommandStack().execute(cmd);
- }
- }
- });
- }
-
- /**
- * create managed bean's scope field
- *
- * @param container
- * @param toolkit
- */
- private void createMBScopeEntry(Composite container, FormToolkit toolkit,
- int numberOfColumns) {
- mbScopeField = new ComboDialogField(SWT.DROP_DOWN | SWT.READ_ONLY | SWT.BORDER);
- mbScopeField
- .setLabelText(EditorMessages.ManagedBeanGeneralSection_ManagedBeanScope);
- mbScopeField.doFillIntoGrid(toolkit, container, numberOfColumns);
- LayoutUtil.setHorizontalGrabbing(mbScopeField.getComboControl(toolkit,
- container));
-
- mbScopeField.setItems(ManagedBeanScopeTreeItem.scopeItems);
-
- mbScopeField
- .setDialogFieldChangeListener(new IDialogFieldChangeListener() {
- public void dialogFieldChanged(DialogField field) {
- String newValue = ((ComboDialogField) field).getText();
- Command cmd = null;
- ManagedBeanType managedBean = (ManagedBeanType) getInput();
- // if (managedBean.getManagedBeanScope() != null) {
- // cmd = SetCommand
- // .create(
- // getEditingDomain(),
- // managedBean.getManagedBeanScope(),
- // FacesConfigPackage.eINSTANCE
- // .getManagedBeanScopeType_TextContent(),
- // newValue);
- // } else {
- ManagedBeanScopeType newManagedBeanScope = FacesConfigFactory.eINSTANCE
- .createManagedBeanScopeType();
- newManagedBeanScope.setTextContent(newValue);
- cmd = SetCommand.create(getEditingDomain(),
- managedBean, FacesConfigPackage.eINSTANCE
- .getManagedBeanType_ManagedBeanScope(),
- newManagedBeanScope);
- // }
- if (cmd.canExecute()) {
- getEditingDomain().getCommandStack().execute(cmd);
- }
- }
- });
- }
-
- public void refreshAll() {
- refresh();
- }
-
- /**
- *
- */
- public void refresh() {
- super.refresh();
- Object input = this.getInput();
- if (input instanceof ManagedBeanType) {
- final ManagedBeanType component = (ManagedBeanType) input;
- refreshControls(component);
- }
- }
-
- private void refreshControls(ManagedBeanType component) {
- if (component.getManagedBeanName() != null) {
- mbNameField.setTextWithoutUpdate(component.getManagedBeanName()
- .getTextContent());
- } else {
- mbNameField.setTextWithoutUpdate(""); //$NON-NLS-1$
- }
-
- if (component.getManagedBeanClass() != null) {
- mbClassField.setTextWithoutUpdate(component
- .getManagedBeanClass().getTextContent());
- } else {
- mbClassField.setTextWithoutUpdate(""); //$NON-NLS-1$
- }
-
- if (component.getManagedBeanScope() != null) {
- mbScopeField.setTextWithoutUpdate(component
- .getManagedBeanScope().getTextContent());
- } else {
- // defaultly set it's scope to "session";
- mbScopeField
- .setTextWithoutUpdate(IFacesConfigConstants.MANAGED_BEAN_SCOPE_SESSION);
- }
-
- }
- protected void addAdaptersOntoInput(Object newInput) {
- super.addAdaptersOntoInput(newInput);
- ManagedBeanType managedBean = (ManagedBeanType) newInput;
- if (EcoreUtil.getExistingAdapter(managedBean,
- ManagedBeanGeneralSection.class) == null) {
- managedBean.eAdapters().add(getManagedBeanGeneralSectionAdatper());
- }
-
- }
-
- protected void removeAdaptersFromInput(Object oldInput) {
- super.removeAdaptersFromInput(oldInput);
- ManagedBeanType managedBean = (ManagedBeanType) oldInput;
- if (EcoreUtil.getExistingAdapter(managedBean,
- ManagedBeanGeneralSection.class) != null) {
- managedBean.eAdapters().remove(
- getManagedBeanGeneralSectionAdatper());
- }
- }
-
- private ManagedBeanGeneralSectionAdapter getManagedBeanGeneralSectionAdatper() {
- if (managedBeanGeneralSectionAdapter == null) {
- managedBeanGeneralSectionAdapter = new ManagedBeanGeneralSectionAdapter();
- }
- return managedBeanGeneralSectionAdapter;
- }
-
- class ManagedBeanGeneralSectionAdapter extends AdapterImpl {
-
- public boolean isAdapterForType(Object type) {
-
- if (type == ManagedBeanGeneralSection.class)
- return true;
- return false;
- }
-
- public void notifyChanged(Notification msg) {
- if (msg.getEventType() == Notification.ADD
- || msg.getEventType() == Notification.REMOVE
- || msg.getEventType() == Notification.SET) {
- if (msg.getFeature() == FacesConfigPackage.eINSTANCE
- .getManagedBeanType_ManagedBeanName()
- || msg.getFeature() == FacesConfigPackage.eINSTANCE
- .getManagedBeanType_ManagedBeanClass()
- || msg.getFeature() == FacesConfigPackage.eINSTANCE
- .getManagedBeanType_ManagedBeanScope()) {
- if (Thread.currentThread() == PlatformUI.getWorkbench().getDisplay().getThread()) {
- refresh();
- } else {
- PlatformUI.getWorkbench().getDisplay().asyncExec(new Runnable() {
- public void run() {
- refresh();
- }
- });
- }
- }
- }
- }
-
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/ManagedBeanMasterSection.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/ManagedBeanMasterSection.java
deleted file mode 100644
index 5d67eb7..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/ManagedBeanMasterSection.java
+++ /dev/null
@@ -1,375 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui.section;
-
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.emf.common.command.Command;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.impl.AdapterImpl;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.emf.edit.command.AddCommand;
-import org.eclipse.emf.edit.command.RemoveCommand;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.viewers.StructuredViewer;
-import org.eclipse.jface.viewers.TreeViewer;
-import org.eclipse.jface.window.Window;
-import org.eclipse.jface.wizard.WizardDialog;
-import org.eclipse.jst.jsf.facesconfig.emf.DescriptionType;
-import org.eclipse.jst.jsf.facesconfig.emf.FacesConfigFactory;
-import org.eclipse.jst.jsf.facesconfig.emf.FacesConfigPackage;
-import org.eclipse.jst.jsf.facesconfig.emf.FacesConfigType;
-import org.eclipse.jst.jsf.facesconfig.emf.ManagedBeanClassType;
-import org.eclipse.jst.jsf.facesconfig.emf.ManagedBeanNameType;
-import org.eclipse.jst.jsf.facesconfig.emf.ManagedBeanScopeType;
-import org.eclipse.jst.jsf.facesconfig.emf.ManagedBeanType;
-import org.eclipse.jst.jsf.facesconfig.ui.EditorMessages;
-import org.eclipse.jst.jsf.facesconfig.ui.EditorPlugin;
-import org.eclipse.jst.jsf.facesconfig.ui.page.FacesConfigMasterDetailPage;
-import org.eclipse.jst.jsf.facesconfig.ui.provider.ManagedBeanContentProvider;
-import org.eclipse.jst.jsf.facesconfig.ui.provider.ManagedBeanLabelProvider;
-import org.eclipse.jst.jsf.facesconfig.ui.wizard.NewManagedBeanWizard;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.forms.IManagedForm;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-
-/**
- * @author sfshi
- */
-public class ManagedBeanMasterSection extends FacesConfigMasterSection {
-
- private ManagedBeanMasterSectionAdapter managedBeanMasterSectionAdapter;
-
- /**
- * @param parent
- * @param managedForm
- * @param toolkit
- * @param page
- */
- public ManagedBeanMasterSection(Composite parent, IManagedForm managedForm,
- FormToolkit toolkit, FacesConfigMasterDetailPage page) {
- super(parent, managedForm, toolkit, page, null, null);
- getSection().setText(EditorMessages.ManagedBeanMasterSection_Name);
- getSection().setDescription(
- EditorMessages.ManagedBeanMasterSection_Description);
- }
-
- protected StructuredViewer createViewer(Composite parent,
- FormToolkit toolkit) {
- Composite treeContainer = toolkit.createComposite(parent);
- toolkit.paintBordersFor(treeContainer);
-
- GridData gd = new GridData(GridData.FILL_BOTH);
- treeContainer.setLayoutData(gd);
- GridLayout layout = new GridLayout();
- treeContainer.setLayout(layout);
-
- // Create tree viewer
- TreeViewer treeViewer = new TreeViewer(treeContainer, SWT.SINGLE
- | SWT.H_SCROLL | SWT.V_SCROLL | SWT.BORDER);
- gd = new GridData(GridData.FILL_BOTH);
- treeViewer.getControl().setLayoutData(gd);
-
- treeViewer.setContentProvider(new ManagedBeanContentProvider());
- treeViewer.setLabelProvider(new ManagedBeanLabelProvider());
- treeViewer.addSelectionChangedListener(this);
-
- treeViewer.setAutoExpandLevel(3);
- return treeViewer;
- }
-
- protected void addButtonSelected(SelectionEvent e) {
- IProject project = (IProject) this.getPage().getEditor().getAdapter(
- IProject.class);
-
- NewManagedBeanWizard wizard = new NewManagedBeanWizard(project);
- IStructuredSelection selection = (IStructuredSelection) this
- .getSelection();
- if (selection.getFirstElement() instanceof ManagedBeanScopeTreeItem) {
- // if user is selecting a scope tree item, then use this scope as
- // the default scope for the new managed bean.
- ManagedBeanScopeTreeItem scopeTreeItem = (ManagedBeanScopeTreeItem) selection
- .getFirstElement();
- wizard.setDefaultScope(scopeTreeItem.getScope());
- }
-
- wizard.setForcePreviousAndNextButtons(true);
-
- Shell shell = EditorPlugin.getActiveShell();
- WizardDialog wizardDialog = new WizardDialog(shell, wizard);
- wizardDialog.create();
- wizardDialog.setBlockOnOpen(true);
- if (wizardDialog.open() == Window.OK) {
- ManagedBeanType managedBean = FacesConfigFactory.eINSTANCE
- .createManagedBeanType();
-
- ManagedBeanNameType name = FacesConfigFactory.eINSTANCE
- .createManagedBeanNameType();
- name.setTextContent(wizard.getManagedBeanName());
- managedBean.setManagedBeanName(name);
-
- ManagedBeanClassType clazz = FacesConfigFactory.eINSTANCE
- .createManagedBeanClassType();
- clazz.setTextContent(wizard.getManagedBeanClass());
- managedBean.setManagedBeanClass(clazz);
-
- ManagedBeanScopeType scope = FacesConfigFactory.eINSTANCE
- .createManagedBeanScopeType();
- scope.setTextContent(wizard.getManagedBeanScope());
- managedBean.setManagedBeanScope(scope);
-
- String desc = wizard.getManagedBeanDescription();
- if (desc != null && desc.trim().length() > 0) {
- DescriptionType description = FacesConfigFactory.eINSTANCE
- .createDescriptionType();
- description.setTextContent(wizard.getManagedBeanDescription());
- managedBean.getDescription().add(description);
- }
-
- Command cmd = AddCommand.create(getEditingDomain(), getInput(),
- null, managedBean);
- if (cmd.canExecute()) {
- this.getEditingDomain().getCommandStack().execute(cmd);
- }
- }
-
- }
-
- protected void removeButtonSelected(SelectionEvent e) {
- IStructuredSelection ssel = StructuredSelection.EMPTY;
- ISelection selection = getSelection();
- if (selection instanceof IStructuredSelection) {
- ssel = (IStructuredSelection) selection;
- }
-
- if (!ssel.isEmpty()) {
- if (ssel.getFirstElement() instanceof ManagedBeanType) {
- ManagedBeanType element = (ManagedBeanType) ssel
- .getFirstElement();
- Command command = RemoveCommand.create(getEditingDomain(), this
- .getInput(), FacesConfigPackage.eINSTANCE
- .getFacesConfigType_ManagedBean(), element);
- if (command.canExecute()) {
- getEditingDomain().getCommandStack().execute(command);
- }
- }
- }
- }
-
- protected void updateButtons() {
- IStructuredSelection ssel = (IStructuredSelection) getStructuredViewer()
- .getSelection();
- boolean isRemoveEnable = false;
- if (!ssel.isEmpty()) {
- Object s1 = ssel.getFirstElement();
- if (s1 instanceof ManagedBeanType) {
- isRemoveEnable = true;
- }
- }
- getRemoveButton().setEnabled(isRemoveEnable);
- }
-
- /**
- * Override the super method to ignore the selection on ScopeTreeItem.
- */
- public void selectionChanged(SelectionChangedEvent event) {
-
- if (event != null
- && event.getSelection() != null
- && ((IStructuredSelection) event.getSelection())
- .getFirstElement() instanceof ManagedBeanScopeTreeItem) {
-
- event = new SelectionChangedEvent(this, StructuredSelection.EMPTY);
- }
- super.selectionChanged(event);
- updateButtons();
-
- }
-
- protected void addAdaptersOntoInput(Object newInput) {
- super.addAdaptersOntoInput(newInput);
-
- FacesConfigType facesConfig = (FacesConfigType) newInput;
- if (EcoreUtil.getExistingAdapter(facesConfig,
- ManagedBeanMasterSection.class) == null) {
-
- facesConfig.eAdapters().add(getManagedBeanMasterSectionAdapter());
- }
-
- List managedbeans = facesConfig.getManagedBean();
- for (Iterator it = managedbeans.iterator(); it.hasNext();) {
- ManagedBeanType managedbean = (ManagedBeanType) it.next();
- if (EcoreUtil.getExistingAdapter(managedbean,
- ManagedBeanMasterSection.class) == null) {
-
- managedbean.eAdapters().add(
- getManagedBeanMasterSectionAdapter());
- }
- }
- }
-
- protected void removeAdaptersFromInput(Object oldInput) {
- FacesConfigType facesConfig = (FacesConfigType) oldInput;
- if (EcoreUtil.getExistingAdapter(facesConfig,
- ManagedBeanMasterSection.class) != null) {
-
- facesConfig.eAdapters()
- .remove(getManagedBeanMasterSectionAdapter());
- }
-
- List managedbeans = facesConfig.getManagedBean();
- for (Iterator it = managedbeans.iterator(); it.hasNext();) {
- ManagedBeanType managedbean = (ManagedBeanType) it.next();
- if (EcoreUtil.getExistingAdapter(managedbean,
- ManagedBeanMasterSection.class) != null) {
-
- managedbean.eAdapters().remove(
- getManagedBeanMasterSectionAdapter());
- }
- }
- super.removeAdaptersFromInput(oldInput);
- }
-
- private ManagedBeanMasterSectionAdapter getManagedBeanMasterSectionAdapter() {
- if (managedBeanMasterSectionAdapter == null) {
- managedBeanMasterSectionAdapter = new ManagedBeanMasterSectionAdapter();
- }
- return managedBeanMasterSectionAdapter;
- }
-
- class ManagedBeanMasterSectionAdapter extends AdapterImpl {
-
- public boolean isAdapterForType(Object type) {
- if (type == ManagedBeanMasterSection.class)
- return true;
- return false;
- }
-
- public void notifyChanged(Notification msg) {
- super.notifyChanged(msg);
-
- if (msg.getFeature() == FacesConfigPackage.eINSTANCE
- .getFacesConfigType_ManagedBean()) {
- if (msg.getEventType() == Notification.ADD) {
- final EObject mbean = (EObject) msg.getNewValue();
- if (EcoreUtil.getExistingAdapter(mbean,
- ManagedBeanMasterSection.class) == null) {
-
- mbean.eAdapters().add(
- getManagedBeanMasterSectionAdapter());
- }
- if (Thread.currentThread() == PlatformUI.getWorkbench().getDisplay().getThread()) {
- getStructuredViewer().refresh(true);
- IStructuredSelection selection = new StructuredSelection(
- mbean);
- getStructuredViewer().setSelection(selection);
- } else {
- PlatformUI.getWorkbench().getDisplay().asyncExec(new Runnable() {
- public void run() {
- getStructuredViewer().refresh(true);
- IStructuredSelection selection = new StructuredSelection(
- mbean);
- getStructuredViewer().setSelection(selection);
- }
- });
- }
- } else if (msg.getEventType() == Notification.REMOVE) {
- final EObject mbean = (EObject) msg.getOldValue();
- if (Thread.currentThread() == PlatformUI.getWorkbench().getDisplay().getThread()) {
- getStructuredViewer().refresh(true);
- if (EcoreUtil.getExistingAdapter(mbean,
- ManagedBeanMasterSection.class) == null) {
-
- mbean.eAdapters().remove(
- getManagedBeanMasterSectionAdapter());
- }
- } else {
- PlatformUI.getWorkbench().getDisplay().asyncExec(new Runnable() {
- public void run() {
- getStructuredViewer().refresh(true);
- if (EcoreUtil.getExistingAdapter(mbean,
- ManagedBeanMasterSection.class) == null) {
-
- mbean.eAdapters().remove(
- getManagedBeanMasterSectionAdapter());
- }
- }
- });
- }
-
- } else if (msg.getEventType() == Notification.SET) {
- final Object mbean = msg.getNewValue();
- if (Thread.currentThread() == PlatformUI.getWorkbench().getDisplay().getThread()) {
- getStructuredViewer().refresh(mbean, true);
- } else {
- PlatformUI.getWorkbench().getDisplay().asyncExec(new Runnable() {
- public void run() {
- getStructuredViewer().refresh(mbean, true);
- }
- });
- }
- }
-
- if (msg.getFeature() == FacesConfigPackage.eINSTANCE
- .getManagedBeanType_ManagedBeanClass()
- || msg.getFeature() == FacesConfigPackage.eINSTANCE
- .getManagedBeanType_ManagedBeanName()) {
-
- final Object bean = msg.getNotifier();
- if (Thread.currentThread() == PlatformUI.getWorkbench().getDisplay().getThread()) {
- getStructuredViewer().refresh(bean, true);
- } else {
- PlatformUI.getWorkbench().getDisplay().asyncExec(new Runnable() {
- public void run() {
- getStructuredViewer().refresh(bean, true);
- }
- });
- }
-
-
- } else if (msg.getFeature() == FacesConfigPackage.eINSTANCE
- .getManagedBeanType_ManagedBeanScope()) {
-
- final Object mbean = msg.getNotifier();
- if (Thread.currentThread() == PlatformUI.getWorkbench().getDisplay().getThread()) {
- getStructuredViewer().refresh();
- IStructuredSelection selection = new StructuredSelection(
- mbean);
- getStructuredViewer().setSelection(selection);
- } else {
- PlatformUI.getWorkbench().getDisplay().asyncExec(new Runnable() {
- public void run() {
- getStructuredViewer().refresh();
- IStructuredSelection selection = new StructuredSelection(
- mbean);
- getStructuredViewer().setSelection(selection);
- }
- });
- }
- }
- }
- }
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/ManagedBeanScopeTreeItem.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/ManagedBeanScopeTreeItem.java
deleted file mode 100644
index 4101d9e..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/ManagedBeanScopeTreeItem.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui.section;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.jst.jsf.facesconfig.emf.FacesConfigType;
-import org.eclipse.jst.jsf.facesconfig.emf.ManagedBeanType;
-import org.eclipse.jst.jsf.facesconfig.ui.IFacesConfigConstants;
-
-/**
- * @author Xiao-guang Zhang, sfshi
- * @version
- */
-public class ManagedBeanScopeTreeItem {
-
- /**
- * Possible values for bean scope
- */
- public static final String[] scopeItems = {
- IFacesConfigConstants.MANAGED_BEAN_SCOPE_SESSION,
- IFacesConfigConstants.MANAGED_BEAN_SCOPE_REQUEST,
- IFacesConfigConstants.MANAGED_BEAN_SCOPE_APPLICATION,
- IFacesConfigConstants.MANAGED_BEAN_SCOPE_NONE };
-
- private String scope;
-
- private FacesConfigType facesConfig;
-
- /**
- *
- * @param managedBeanScope
- * @param facesConfig
- */
- public ManagedBeanScopeTreeItem(String managedBeanScope,
- FacesConfigType facesConfig) {
- super();
- this.scope = managedBeanScope;
-
- this.facesConfig = facesConfig;
- }
-
- /**
- * @return the parent object
- */
- public Object getParent() {
- return facesConfig;
- }
-
- /**
- * @return true if this node has children
- */
- public boolean hasChildren() {
- return !getChildren().isEmpty();
- }
-
- /**
- * @return the scope
- */
- public String getScope() {
- return scope;
- }
-
- /**
- * @return the list of children. List may be empty.
- */
- public List getChildren() {
- List result = new ArrayList();
- List managedBeans = facesConfig.getManagedBean();
- for (Iterator it = managedBeans.iterator(); it.hasNext();) {
- ManagedBeanType managedBean = (ManagedBeanType) it.next();
-
- if (managedBean.getManagedBeanScope() != null) {
- if (scope.equals(managedBean.getManagedBeanScope()
- .getTextContent())) {
- result.add(managedBean);
- }
- }
- }
-
- return result;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/ManagedPropertyEditGroup.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/ManagedPropertyEditGroup.java
deleted file mode 100644
index c0112a1..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/ManagedPropertyEditGroup.java
+++ /dev/null
@@ -1,575 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui.section;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.runtime.Assert;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.emf.common.command.Command;
-import org.eclipse.emf.common.command.CompoundCommand;
-import org.eclipse.emf.edit.command.AddCommand;
-import org.eclipse.emf.edit.command.RemoveCommand;
-import org.eclipse.emf.edit.command.SetCommand;
-import org.eclipse.emf.edit.domain.EditingDomain;
-import org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider;
-import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.viewers.ColumnWeightData;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.ISelectionProvider;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.TableLayout;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerFilter;
-import org.eclipse.jst.jsf.common.ui.internal.dialogfield.DialogFieldGroup;
-import org.eclipse.jst.jsf.facesconfig.emf.FacesConfigFactory;
-import org.eclipse.jst.jsf.facesconfig.emf.FacesConfigPackage;
-import org.eclipse.jst.jsf.facesconfig.emf.ListEntriesType;
-import org.eclipse.jst.jsf.facesconfig.emf.ManagedBeanType;
-import org.eclipse.jst.jsf.facesconfig.emf.ManagedPropertyType;
-import org.eclipse.jst.jsf.facesconfig.emf.MapEntriesType;
-import org.eclipse.jst.jsf.facesconfig.emf.NullValueType;
-import org.eclipse.jst.jsf.facesconfig.emf.PropertyClassType;
-import org.eclipse.jst.jsf.facesconfig.emf.PropertyNameType;
-import org.eclipse.jst.jsf.facesconfig.emf.ValueType;
-import org.eclipse.jst.jsf.facesconfig.ui.EditorMessages;
-import org.eclipse.jst.jsf.facesconfig.ui.EditorPlugin;
-import org.eclipse.jst.jsf.facesconfig.ui.IFacesConfigConstants;
-import org.eclipse.jst.jsf.facesconfig.ui.dialog.AddEditManagedPropertyDialog;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.MouseAdapter;
-import org.eclipse.swt.events.MouseEvent;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.TableColumn;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-
-/**
- * @author sfshi
- * @version
- */
-public class ManagedPropertyEditGroup extends DialogFieldGroup implements
- IDialogFieldGroup, ISelectionProvider, ISelectionChangedListener {
-
- private TableViewer tableViewer;
-
- private static final int TABLE_DEFAULT_HEIGHT = 160;
-
- private Button removeButton;
-
- private Button editButton;
-
- private ManagedBeanType managedBean;
-
- private AbstractFacesConfigSection section;
-
- private List selectionChangedListeners = new ArrayList();
-
- /**
- * @param section
- *
- */
- public ManagedPropertyEditGroup(AbstractFacesConfigSection section) {
- super();
- this.section = section;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.jsf.facesconfig.ui.common.dialogfield.DialogFieldGroup#initialize()
- */
- public void initialize() {
- // do nothing
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.jsf.facesconfig.ui.common.dialogfield.DialogFieldGroup#refreshData()
- */
- public void refreshData() {
- refresh();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.jsf.facesconfig.ui.common.dialogfield.DialogFieldGroup#layoutDialogFields(org.eclipse.ui.forms.widgets.FormToolkit,
- * org.eclipse.swt.widgets.Composite)
- */
- public void layoutDialogFields(FormToolkit toolkit, Composite parent) {
- createGeneralClassPage(parent, toolkit);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.jsf.facesconfig.ui.common.dialogfield.DialogFieldGroup#validateDialogFields()
- */
- public IStatus[] validateDialogFields() {
- return null;
- }
-
- /**
- * create general class initialization section
- *
- * @param container
- * @param toolkit
- */
- private void createGeneralClassPage(Composite container, FormToolkit toolkit) {
- Composite generalSection = toolkit.createComposite(container);
- generalSection.setLayoutData(new GridData(GridData.FILL_BOTH));
- toolkit.paintBordersFor(generalSection);
-
- GridLayout gl = new GridLayout();
- gl.horizontalSpacing = 0;
- gl.marginWidth = 0;
- gl.numColumns = 2;
- generalSection.setLayout(gl);
-
- createTableSection(generalSection, toolkit);
-
- createButtonsSection(generalSection, toolkit);
- }
-
- /**
- * create proeprty table section
- *
- * @param container
- * @param toolkit
- */
- private void createTableSection(Composite container, FormToolkit toolkit) {
- // create property container
- Composite propertyContainer = toolkit.createComposite(container);
- GridData gd = new GridData(GridData.FILL_BOTH
- | GridData.GRAB_HORIZONTAL);
- propertyContainer.setLayoutData(gd);
- toolkit.paintBordersFor(propertyContainer);
-
- GridLayout gl = new GridLayout();
- propertyContainer.setLayout(gl);
-
- // Create property table
- Table table = new Table(propertyContainer, SWT.H_SCROLL | SWT.V_SCROLL
- | SWT.FULL_SELECTION | SWT.BORDER);
- TableLayout layout = new TableLayout();
- table.setLayout(layout);
- gd = new GridData(GridData.FILL_BOTH);
- gd.horizontalSpan = 1;
- gd.heightHint = TABLE_DEFAULT_HEIGHT;
- table.setLayoutData(gd);
-
- table.setHeaderVisible(true);
- table.setLinesVisible(true);
- TableColumn propertyCol = new TableColumn(table, SWT.NONE);
- layout.addColumnData(new ColumnWeightData(1, true));
- propertyCol
- .setText(EditorMessages.InitializationSection_PropertyTable_Name);
- propertyCol.setResizable(true);
-
- TableColumn classCol = new TableColumn(table, SWT.NONE);
- layout.addColumnData(new ColumnWeightData(1, true));
- classCol
- .setText(EditorMessages.InitializationSection_PropertyTable_Class);
- classCol.setResizable(true);
-
- TableColumn valueCol = new TableColumn(table, SWT.NONE);
- layout.addColumnData(new ColumnWeightData(1, true));
- valueCol
- .setText(EditorMessages.InitializationSection_PropertyTable_Value);
- valueCol.setResizable(true);
-
- table.addSelectionListener(new SelectionAdapter() {
- public void widgetSelected(SelectionEvent e) {
- updateButtons();
- }
- });
-
- table.addMouseListener(new MouseAdapter() {
- public void mouseDoubleClick(MouseEvent e) {
- if (((IStructuredSelection) tableViewer.getSelection()).size() > 0)
- editButtonSelected();
- }
- });
-
- tableViewer = new TableViewer(table);
- tableViewer.setContentProvider(new AdapterFactoryContentProvider(
- section.getAdapterFactory()));
- tableViewer.setLabelProvider(new AdapterFactoryLabelProvider(section
- .getAdapterFactory()));
-
- tableViewer.addFilter(new ViewerFilter() {
- public boolean select(Viewer viewer, Object parentElement,
- Object element) {
- return FacesConfigPackage.eINSTANCE.getManagedPropertyType()
- .isInstance(element);
- }
- });
-
- tableViewer.addSelectionChangedListener(this);
- }
-
- /**
- * Update the buttons' enable and disable status
- */
- private void updateButtons() {
- if (((IStructuredSelection) tableViewer.getSelection()).size() > 0) {
- editButton.setEnabled(true);
- removeButton.setEnabled(true);
- } else {
- editButton.setEnabled(false);
- removeButton.setEnabled(false);
- }
- }
-
- /**
- * create property's editing buttons
- *
- * @param container
- * @param toolkit
- */
- private void createButtonsSection(Composite container, FormToolkit toolkit) {
- // create operation buttons's container
- Composite operationContainer = toolkit.createComposite(container);
- GridData gd = new GridData(GridData.FILL_VERTICAL
- | GridData.VERTICAL_ALIGN_BEGINNING);
- operationContainer.setLayoutData(gd);
- GridLayout gl = new GridLayout();
- operationContainer.setLayout(gl);
-
- // create list operation buttons
- Button addButton = toolkit.createButton(operationContainer,
- EditorMessages.UI_Button_Add_more, SWT.PUSH);
- gd = new GridData(GridData.FILL_HORIZONTAL
- | GridData.VERTICAL_ALIGN_BEGINNING);
- gd.grabExcessHorizontalSpace = false;
- addButton.setLayoutData(gd);
-
- editButton = toolkit.createButton(operationContainer,
- EditorMessages.UI_Button_Edit_more,
- SWT.PUSH);
- gd = new GridData(GridData.FILL_HORIZONTAL
- | GridData.VERTICAL_ALIGN_BEGINNING);
- gd.grabExcessHorizontalSpace = false;
- editButton.setLayoutData(gd);
-
- removeButton = toolkit.createButton(operationContainer,
- EditorMessages.UI_Button_Remove,
- SWT.PUSH);
- gd = new GridData(GridData.FILL_HORIZONTAL
- | GridData.VERTICAL_ALIGN_BEGINNING);
- gd.grabExcessHorizontalSpace = false;
- removeButton.setLayoutData(gd);
-
- addButton.addSelectionListener(new SelectionAdapter() {
-
- public void widgetSelected(SelectionEvent e) {
- addButtonSelected();
- }
-
- });
-
- editButton.addSelectionListener(new SelectionAdapter() {
-
- public void widgetSelected(SelectionEvent e) {
- editButtonSelected();
- }
- });
- removeButton.addSelectionListener(new SelectionAdapter() {
-
- public void widgetSelected(SelectionEvent e) {
- removeButtonSelected();
- }
- });
-
- }
-
- private void addButtonSelected() {
- Shell shell = EditorPlugin.getActiveShell();
-
- AddEditManagedPropertyDialog dialog = new AddEditManagedPropertyDialog(
- shell, managedBean, section);
- if (dialog.open() == Dialog.OK) {
-
- ManagedPropertyType managedProperty = createManagedPropertyFromDialog(dialog);
- Command addCommand = AddCommand.create(this.getEditingDomain(),
- getInput(), FacesConfigPackage.eINSTANCE
- .getManagedBeanType_ManagedProperty(),
- managedProperty);
- if (addCommand.canExecute()) {
- this.getEditingDomain().getCommandStack().execute(addCommand);
-
- }
- }
-
- }
-
- private void editButtonSelected() {
- ManagedPropertyType managedProperty = (ManagedPropertyType) ((IStructuredSelection) tableViewer
- .getSelection()).getFirstElement();
- Shell shell = EditorPlugin.getActiveShell();
- AddEditManagedPropertyDialog dialog = new AddEditManagedPropertyDialog(
- shell, managedProperty, section);
- if (dialog.open() == Dialog.OK) {
- List commands = new ArrayList();
- String propertyName = dialog.getPropertyName();
- String propertyClass = dialog.getPropertyClass();
- PropertyNameType propertyNameType = FacesConfigFactory.eINSTANCE
- .createPropertyNameType();
- propertyNameType.setTextContent(propertyName);
- Command cmd1 = SetCommand.create(this.getEditingDomain(),
- managedProperty, FacesConfigPackage.eINSTANCE
- .getManagedPropertyType_PropertyName(),
- propertyNameType);
- commands.add(cmd1);
-
- PropertyClassType propertyClassType = FacesConfigFactory.eINSTANCE
- .createPropertyClassType();
- propertyClassType.setTextContent(propertyClass);
- Command cmd2 = SetCommand.create(this.getEditingDomain(),
- managedProperty, FacesConfigPackage.eINSTANCE
- .getManagedPropertyType_PropertyClass(),
- propertyClassType);
- commands.add(cmd2);
-
- // remove value, null-value, map-entries and list-entries element:
- if (managedProperty.getNullValue() != null) {
- Command rmCmd = SetCommand.create(this.getEditingDomain(),
- managedProperty, FacesConfigPackage.eINSTANCE
- .getManagedPropertyType_NullValue(),
- SetCommand.UNSET_VALUE);
- commands.add(rmCmd);
- }
- if (managedProperty.getListEntries() != null) {
- Command rmCmd = SetCommand.create(this.getEditingDomain(),
- managedProperty, FacesConfigPackage.eINSTANCE
- .getManagedPropertyType_ListEntries(),
- SetCommand.UNSET_VALUE);
- commands.add(rmCmd);
- }
- if (managedProperty.getValue() != null) {
- Command rmCmd = SetCommand.create(this.getEditingDomain(),
- managedProperty, FacesConfigPackage.eINSTANCE
- .getManagedPropertyType_Value(),
- SetCommand.UNSET_VALUE);
- commands.add(rmCmd);
- }
- if (managedProperty.getMapEntries() != null) {
- Command rmCmd = SetCommand.create(this.getEditingDomain(),
- managedProperty, FacesConfigPackage.eINSTANCE
- .getManagedPropertyType_MapEntries(),
- SetCommand.UNSET_VALUE);
- commands.add(rmCmd);
- }
-
- Object valueObject = dialog.getValueObject();
- if (valueObject != null) {
- String valueType = dialog.getValueType();
- if (valueType.equals(IFacesConfigConstants.VALUE)) {
-
- ValueType value = FacesConfigFactory.eINSTANCE
- .createValueType();
- value.setTextContent((String) valueObject);
- managedProperty.setValue(value);
- Command cmd3 = SetCommand.create(this.getEditingDomain(),
- managedProperty, FacesConfigPackage.eINSTANCE
- .getManagedPropertyType_Value(), value);
- commands.add(cmd3);
-
- } else if (valueType.equals(IFacesConfigConstants.MAP_ENTRIES)) {
-
- MapEntriesType mapEntriesType = (MapEntriesType) valueObject;
- Command cmd3 = SetCommand.create(this.getEditingDomain(),
- managedProperty, FacesConfigPackage.eINSTANCE
- .getManagedPropertyType_MapEntries(),
- mapEntriesType);
- commands.add(cmd3);
- } else if (valueType.equals(IFacesConfigConstants.LIST_ENTRIES)) {
-
- ListEntriesType listEntriesType = (ListEntriesType) valueObject;
- Command cmd3 = SetCommand.create(this.getEditingDomain(),
- managedProperty, FacesConfigPackage.eINSTANCE
- .getManagedPropertyType_ListEntries(),
- listEntriesType);
- commands.add(cmd3);
- } else if (valueType.equals(IFacesConfigConstants.NULL_VALUE)) {
-
- NullValueType nullValue = (NullValueType) valueObject;
- Command cmd3 = SetCommand.create(this.getEditingDomain(),
- managedProperty, FacesConfigPackage.eINSTANCE
- .getManagedPropertyType_NullValue(),
- nullValue);
- commands.add(cmd3);
- }
- }
- CompoundCommand command = new CompoundCommand(commands);
- if (command.canExecute()) {
- getEditingDomain().getCommandStack().execute(command);
- }
- }
- }
-
- private ManagedPropertyType createManagedPropertyFromDialog(
- AddEditManagedPropertyDialog dialog) {
-
- String propertyName = dialog.getPropertyName();
- String propertyClass = dialog.getPropertyClass();
-
- ManagedPropertyType managedProperty = FacesConfigFactory.eINSTANCE
- .createManagedPropertyType();
- PropertyNameType propertyNameType = FacesConfigFactory.eINSTANCE
- .createPropertyNameType();
- propertyNameType.setTextContent(propertyName);
- PropertyClassType propertyClassType = FacesConfigFactory.eINSTANCE
- .createPropertyClassType();
- propertyClassType.setTextContent(propertyClass);
- managedProperty.setPropertyName(propertyNameType);
- managedProperty.setPropertyClass(propertyClassType);
-
- Object valueObject = dialog.getValueObject();
- if (valueObject != null) {
- String valueType = dialog.getValueType();
- if (valueType.equals(IFacesConfigConstants.VALUE)) {
- ValueType value = FacesConfigFactory.eINSTANCE
- .createValueType();
- value.setTextContent((String) valueObject);
- managedProperty.setValue(value);
- } else if (valueType.equals(IFacesConfigConstants.MAP_ENTRIES)) {
- MapEntriesType mapEntriesType = (MapEntriesType) dialog
- .getValueObject();
- managedProperty.setMapEntries(mapEntriesType);
- } else if (valueType.equals(IFacesConfigConstants.LIST_ENTRIES)) {
- ListEntriesType listEntriesType = (ListEntriesType) dialog
- .getValueObject();
- managedProperty.setListEntries(listEntriesType);
- } else if (valueType.equals(IFacesConfigConstants.NULL_VALUE)) {
- NullValueType nullValue = (NullValueType) dialog
- .getValueObject();
- managedProperty.setNullValue(nullValue);
- }
- }
- return managedProperty;
- }
-
- private void removeButtonSelected() {
- ManagedPropertyType managedProperty = (ManagedPropertyType) ((IStructuredSelection) tableViewer
- .getSelection()).getFirstElement();
- Assert.isNotNull(managedProperty);
-
- Command removeCommand = RemoveCommand.create(this.getEditingDomain(),
- this.getInput(), FacesConfigPackage.eINSTANCE
- .getManagedBeanType_ManagedProperty(), managedProperty);
-
- if (removeCommand.canExecute()) {
- this.getEditingDomain().getCommandStack().execute(removeCommand);
- refreshAll();
- }
- }
-
- public void setInput(Object newInput) {
- if (newInput != null && newInput instanceof ManagedBeanType) {
- managedBean = (ManagedBeanType) newInput;
- refreshAll();
- }
- }
-
- /**
- *
- */
- public void refreshAll() {
- tableViewer.setInput(getInput());
- updateButtons();
-
- }
-
- /**
- *
- */
- public void refresh() {
- tableViewer.refresh();
- updateButtons();
- }
-
- public Object getInput() {
- return managedBean;
- }
-
- private EditingDomain getEditingDomain() {
- return section.getEditingDomain();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.ISelectionProvider#addSelectionChangedListener(org.eclipse.jface.viewers.ISelectionChangedListener)
- */
- public void addSelectionChangedListener(ISelectionChangedListener listener) {
- selectionChangedListeners.add(listener);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.ISelectionProvider#getSelection()
- */
- public ISelection getSelection() {
- return null;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.ISelectionProvider#removeSelectionChangedListener(org.eclipse.jface.viewers.ISelectionChangedListener)
- */
- public void removeSelectionChangedListener(
- ISelectionChangedListener listener) {
- selectionChangedListeners.remove(listener);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.ISelectionProvider#setSelection(org.eclipse.jface.viewers.ISelection)
- */
- public void setSelection(ISelection selection) {
- // do nothing
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.ISelectionChangedListener#selectionChanged(org.eclipse.jface.viewers.SelectionChangedEvent)
- */
- public void selectionChanged(SelectionChangedEvent event) {
- for (Iterator listeners = selectionChangedListeners.iterator(); listeners
- .hasNext();) {
- ISelectionChangedListener listener = (ISelectionChangedListener) listeners
- .next();
- listener.selectionChanged(new SelectionChangedEvent(this, event
- .getSelection()));
- }
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/MapEntriesEditGroup.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/MapEntriesEditGroup.java
deleted file mode 100644
index e5a41b2..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/MapEntriesEditGroup.java
+++ /dev/null
@@ -1,692 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui.section;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.emf.common.command.Command;
-import org.eclipse.emf.common.command.CompoundCommand;
-import org.eclipse.emf.edit.command.AddCommand;
-import org.eclipse.emf.edit.command.RemoveCommand;
-import org.eclipse.emf.edit.command.SetCommand;
-import org.eclipse.emf.edit.domain.EditingDomain;
-import org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider;
-import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.viewers.ColumnWeightData;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.ISelectionProvider;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.TableLayout;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerFilter;
-import org.eclipse.jst.jsf.common.ui.internal.dialogfield.ClassButtonDialogField;
-import org.eclipse.jst.jsf.common.ui.internal.dialogfield.DialogField;
-import org.eclipse.jst.jsf.common.ui.internal.dialogfield.DialogFieldBase;
-import org.eclipse.jst.jsf.common.ui.internal.dialogfield.DialogFieldGroup;
-import org.eclipse.jst.jsf.common.ui.internal.dialogfield.IDialogFieldApplyListener;
-import org.eclipse.jst.jsf.common.ui.internal.dialogfield.LayoutUtil;
-import org.eclipse.jst.jsf.common.ui.internal.guiutils.SWTUtils;
-import org.eclipse.jst.jsf.facesconfig.emf.FacesConfigFactory;
-import org.eclipse.jst.jsf.facesconfig.emf.FacesConfigPackage;
-import org.eclipse.jst.jsf.facesconfig.emf.KeyClassType;
-import org.eclipse.jst.jsf.facesconfig.emf.KeyType;
-import org.eclipse.jst.jsf.facesconfig.emf.ManagedBeanType;
-import org.eclipse.jst.jsf.facesconfig.emf.MapEntriesType;
-import org.eclipse.jst.jsf.facesconfig.emf.MapEntryType;
-import org.eclipse.jst.jsf.facesconfig.emf.NullValueType;
-import org.eclipse.jst.jsf.facesconfig.emf.ValueClassType;
-import org.eclipse.jst.jsf.facesconfig.emf.ValueType;
-import org.eclipse.jst.jsf.facesconfig.ui.EditorMessages;
-import org.eclipse.jst.jsf.facesconfig.ui.EditorPlugin;
-import org.eclipse.jst.jsf.facesconfig.ui.dialog.AddEditMapEntryDialog;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.MouseAdapter;
-import org.eclipse.swt.events.MouseEvent;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.TableColumn;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-
-/**
- * MapEntries Editing DialogFieldGroup
- *
- * @author sfshi
- * @version
- */
-public class MapEntriesEditGroup extends DialogFieldGroup implements
- IDialogFieldGroup, ISelectionProvider, ISelectionChangedListener {
- private ClassButtonDialogField keyClassField;
-
- private ClassButtonDialogField valueClassField;
-
- private TableViewer tableViewer;
-
- private static final int TABLE_DEFAULT_HEIGHT = 160;
-
- private IProject currentProject;
-
- private Button removeButton;
-
- private Button editButton;
-
- private ManagedBeanType managedBean;
-
- private AbstractFacesConfigSection section;
-
- private List selectionChangedListeners = new ArrayList();
-
- /**
- * @param section
- */
- public MapEntriesEditGroup(AbstractFacesConfigSection section) {
- super();
- this.section = section;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.jsf.facesconfig.ui.common.dialogfield.DialogFieldGroup#initialize()
- */
- public void initialize() {
- // TODO: initialize?
- }
-
- private void updateButtons() {
- if (((IStructuredSelection) tableViewer.getSelection()).size() > 0) {
- editButton.setEnabled(true);
- removeButton.setEnabled(true);
- } else {
- editButton.setEnabled(false);
- removeButton.setEnabled(false);
- }
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.jsf.facesconfig.ui.common.dialogfield.DialogFieldGroup#layoutDialogFields(org.eclipse.ui.forms.widgets.FormToolkit,
- * org.eclipse.swt.widgets.Composite)
- */
- public void layoutDialogFields(FormToolkit toolkit, Composite parent) {
- GridData data = new GridData(GridData.FILL_BOTH);
- parent.setLayoutData(data);
-
- GridLayout gl = new GridLayout();
- gl.verticalSpacing = 0;
- gl.marginHeight = 0;
- parent.setLayout(gl);
-
- layoutMapTypeSelectionSection(toolkit, parent);
-
- createAndLayoutMapValueSection(toolkit, parent);
- }
-
- /**
- *
- */
- private void layoutMapTypeSelectionSection(FormToolkit toolkit,
- Composite container) {
-
- Composite typeSelectionSection = null;
- if (toolkit != null) {
- typeSelectionSection = toolkit.createComposite(container);
- toolkit.paintBordersFor(typeSelectionSection);
- } else {
- typeSelectionSection = SWTUtils
- .createComposite(container, SWT.NONE);
- }
-
- GridData gd = new GridData(GridData.FILL_HORIZONTAL);
- typeSelectionSection.setLayoutData(gd);
-
- int numberOfColumns = 4;
- GridLayout gl = new GridLayout(numberOfColumns, false);
- typeSelectionSection.setLayout(gl);
- keyClassField = new ClassButtonDialogField(getProject());
- keyClassField
- .setLabelText(EditorMessages.InitializationSection_MapType_KeyClass);
- keyClassField
- .setDialogFieldApplyListener(new IDialogFieldApplyListener() {
-
- public void dialogFieldApplied(DialogField field) {
- ManagedBeanType managedBean1 = (ManagedBeanType) getInput();
- String className = ((ClassButtonDialogField) field)
- .getText();
- KeyClassType keyClass = FacesConfigFactory.eINSTANCE
- .createKeyClassType();
- keyClass.setTextContent(className);
- EditingDomain editingDomain = section
- .getEditingDomain();
- Command cmd;
- boolean isNew;
- if (managedBean1.getMapEntries() == null) {
- isNew = true;
- MapEntriesType mapEntries = FacesConfigFactory.eINSTANCE
- .createMapEntriesType();
- mapEntries.setKeyClass(keyClass);
- cmd = SetCommand.create(editingDomain, managedBean1,
- FacesConfigPackage.eINSTANCE
- .getManagedBeanType_MapEntries(),
- mapEntries);
- } else {
- isNew = false;
- cmd = SetCommand.create(editingDomain, managedBean1
- .getMapEntries(),
- FacesConfigPackage.eINSTANCE
- .getMapEntriesType_KeyClass(),
- keyClass);
- }
-
- if (cmd.canExecute()) {
- editingDomain.getCommandStack().execute(cmd);
- if (isNew)
- refreshAll();
- }
-
- }
- });
-
- valueClassField = new ClassButtonDialogField(getProject());
-
- valueClassField
- .setLabelText(EditorMessages.InitializationSection_MapType_ValueClass);
- valueClassField
- .setDialogFieldApplyListener(new IDialogFieldApplyListener() {
-
- public void dialogFieldApplied(DialogField field) {
- ManagedBeanType managedBean1 = (ManagedBeanType) getInput();
- String className = ((ClassButtonDialogField) field)
- .getText();
- ValueClassType valueClass = FacesConfigFactory.eINSTANCE
- .createValueClassType();
- valueClass.setTextContent(className);
- EditingDomain editingDomain = section
- .getEditingDomain();
- Command cmd;
- boolean isNew;
- if (managedBean1.getMapEntries() == null) {
- isNew = true;
- MapEntriesType mapEntries = FacesConfigFactory.eINSTANCE
- .createMapEntriesType();
- mapEntries.setValueClass(valueClass);
- cmd = SetCommand.create(editingDomain, managedBean1,
- FacesConfigPackage.eINSTANCE
- .getManagedBeanType_MapEntries(),
- mapEntries);
- } else {
- isNew = false;
- cmd = SetCommand.create(editingDomain, managedBean1
- .getMapEntries(),
- FacesConfigPackage.eINSTANCE
- .getMapEntriesType_ValueClass(),
- valueClass);
- }
-
- if (cmd.canExecute()) {
- editingDomain.getCommandStack().execute(cmd);
- if (isNew)
- refreshAll();
- }
-
- }
- });
-
- keyClassField.doFillIntoGrid(toolkit, typeSelectionSection,
- numberOfColumns);
- LayoutUtil.setHorizontalGrabbing(keyClassField.getTextControl(toolkit,
- container));
-
- valueClassField.doFillIntoGrid(toolkit, typeSelectionSection,
- numberOfColumns);
- }
-
- /**
- * @param toolkit
- * @param parent
- */
- private void createAndLayoutMapValueSection(FormToolkit toolkit,
- Composite parent) {
- Composite mapValueSection = null;
- if (toolkit != null) {
- mapValueSection = toolkit.createComposite(parent);
- toolkit.paintBordersFor(mapValueSection);
- } else {
- mapValueSection = SWTUtils.createComposite(parent, SWT.NONE);
- }
-
- GridData gd = new GridData(GridData.FILL_BOTH);
- mapValueSection.setLayoutData(gd);
-
- int numberOfColumns = 3;
- GridLayout gl = new GridLayout(numberOfColumns, false);
- mapValueSection.setLayout(gl);
- DialogField valuesTitle = new DialogFieldBase();
- valuesTitle
- .setLabelText(EditorMessages.InitializationSection_MapTable_Title);
-
- valuesTitle.doFillIntoGrid(toolkit, mapValueSection, numberOfColumns);
- Table table;
- if (toolkit == null) {
- table = new Table(mapValueSection, SWT.FULL_SELECTION
- | SWT.H_SCROLL | SWT.V_SCROLL | SWT.BORDER);
- } else {
- table = new Table(mapValueSection, SWT.H_SCROLL | SWT.V_SCROLL
- | SWT.FULL_SELECTION | SWT.BORDER);
- }
-
- table.addSelectionListener(new SelectionAdapter() {
-
- public void widgetSelected(SelectionEvent e) {
- updateButtons();
-
- }
- });
- gd = new GridData(GridData.FILL_BOTH);
- gd.horizontalSpan = 1;
- gd.heightHint = TABLE_DEFAULT_HEIGHT;
- table.setLayoutData(gd);
- table.setHeaderVisible(true);
- table.setLinesVisible(true);
- TableLayout layout = new TableLayout();
- table.setLayout(layout);
-
- TableColumn keyCol = new TableColumn(table, SWT.NONE);
- keyCol.setText(EditorMessages.InitializationSection_MapTable_Key);
- layout.addColumnData(new ColumnWeightData(1, true));
- keyCol.setResizable(true);
-
- TableColumn valueCol = new TableColumn(table, SWT.NONE);
- layout.addColumnData(new ColumnWeightData(1, true));
- valueCol.setText(EditorMessages.InitializationSection_MapTable_Value);
- valueCol.setResizable(true);
- table.addMouseListener(new MouseAdapter() {
- public void mouseDoubleClick(MouseEvent e) {
- if (((IStructuredSelection) tableViewer.getSelection()).size() > 0)
- editButtonSelected();
- }
- });
- tableViewer = new TableViewer(table);
- tableViewer.setContentProvider(new AdapterFactoryContentProvider(
- section.getAdapterFactory()));
- tableViewer.setLabelProvider(new AdapterFactoryLabelProvider(section
- .getAdapterFactory()));
-
- tableViewer.addFilter(new ViewerFilter() {
- public boolean select(Viewer viewer, Object parentElement,
- Object element) {
- return FacesConfigPackage.eINSTANCE.getMapEntryType()
- .isInstance(element);
- }
- });
-
- tableViewer.addSelectionChangedListener(this);
-
- Composite operationContainer = null;
- if (toolkit != null) {
- operationContainer = toolkit.createComposite(mapValueSection);
- } else {
- operationContainer = SWTUtils.createComposite(mapValueSection,
- SWT.NONE);
- }
- gd = new GridData(GridData.FILL_VERTICAL);
- operationContainer.setLayoutData(gd);
- gl = new GridLayout();
- operationContainer.setLayout(gl);
-
- Button addButton = null;
- if (toolkit != null) {
- addButton = toolkit.createButton(operationContainer,
- EditorMessages.UI_Button_Add_more,
- SWT.PUSH);
- } else {
- addButton = SWTUtils.createPushButton(operationContainer,
- EditorMessages.UI_Button_Add_more);
- }
- gd = new GridData(GridData.FILL_HORIZONTAL
- | GridData.VERTICAL_ALIGN_BEGINNING);
- gd.grabExcessHorizontalSpace = false;
- addButton.setLayoutData(gd);
-
- if (toolkit != null) {
- editButton = toolkit.createButton(operationContainer,
- EditorMessages.UI_Button_Edit_more, SWT.PUSH);
- } else {
- editButton = SWTUtils.createPushButton(operationContainer,
- EditorMessages.UI_Button_Edit_more);
- }
- gd = new GridData(GridData.FILL_HORIZONTAL
- | GridData.VERTICAL_ALIGN_BEGINNING);
- gd.grabExcessHorizontalSpace = false;
- editButton.setLayoutData(gd);
-
- if (toolkit != null) {
- removeButton = toolkit.createButton(operationContainer,
- EditorMessages.UI_Button_Remove,
- SWT.PUSH);
- } else {
- removeButton = SWTUtils.createPushButton(operationContainer,
- EditorMessages.UI_Button_Remove);
- }
- gd = new GridData(GridData.FILL_HORIZONTAL
- | GridData.VERTICAL_ALIGN_BEGINNING);
- gd.grabExcessHorizontalSpace = false;
- removeButton.setLayoutData(gd);
- addButton.addSelectionListener(new SelectionAdapter() {
-
- public void widgetSelected(SelectionEvent e) {
- addButtonSelected();
- }
-
- });
-
- editButton.addSelectionListener(new SelectionAdapter() {
-
- public void widgetSelected(SelectionEvent e) {
- editButtonSelected();
- }
- });
- removeButton.addSelectionListener(new SelectionAdapter() {
-
- public void widgetSelected(SelectionEvent e) {
- removeButtonSelected();
- }
- });
- }
-
- private void addButtonSelected() {
- AddEditMapEntryDialog dialog = new AddEditMapEntryDialog(EditorPlugin
- .getActiveShell(), true);
- if (dialog.open() == Dialog.OK) {
- MapEntryType mapEntry = FacesConfigFactory.eINSTANCE
- .createMapEntryType();
- if (dialog.getKey() != null) {
- KeyType key = FacesConfigFactory.eINSTANCE.createKeyType();
- key.setTextContent(dialog.getKey());
- mapEntry.setKey(key);
- }
- if (dialog.isNullValue()) {
- NullValueType nullValue = FacesConfigFactory.eINSTANCE
- .createNullValueType();
- mapEntry.setNullValue(nullValue);
- } else {
- ValueType value = FacesConfigFactory.eINSTANCE
- .createValueType();
- value.setTextContent(dialog.getValue());
- mapEntry.setValue(value);
- }
-
- EditingDomain editingDomain = section.getEditingDomain();
- Command command;
- boolean isNewMapEntries = false;
- if (managedBean.getMapEntries() == null) {
- MapEntriesType mapEntriesType = FacesConfigFactory.eINSTANCE
- .createMapEntriesType();
- mapEntriesType.getMapEntry().add(mapEntry);
- command = SetCommand.create(editingDomain, managedBean,
- FacesConfigPackage.eINSTANCE
- .getManagedBeanType_MapEntries(),
- mapEntriesType);
- isNewMapEntries = true;
- } else {
- MapEntriesType mapEntries = managedBean.getMapEntries();
-
- command = AddCommand.create(editingDomain, mapEntries,
- FacesConfigPackage.eINSTANCE
- .getMapEntriesType_MapEntry(), mapEntry);
- }
-
- if (command.canExecute()) {
- editingDomain.getCommandStack().execute(command);
- if (isNewMapEntries)
- refreshAll();
- }
-
- }
- }
-
- private void editButtonSelected() {
- if (tableViewer.getSelection() == null
- || ((IStructuredSelection) tableViewer.getSelection())
- .isEmpty()) {
- return;
- }
- MapEntryType mapEntry = (MapEntryType) ((IStructuredSelection) tableViewer
- .getSelection()).getFirstElement();
- AddEditMapEntryDialog dialog = new AddEditMapEntryDialog(EditorPlugin
- .getActiveShell(), false);
- if (mapEntry.getKey() != null)
- dialog.setKey(mapEntry.getKey().getTextContent());
- if (mapEntry.getNullValue() != null)
- dialog.setNullValue(true);
- else if (mapEntry.getValue() != null)
- dialog.setValue(mapEntry.getValue().getTextContent());
-
- if (dialog.open() == Dialog.OK) {
- EditingDomain editingDomain = section.getEditingDomain();
- List commands = new ArrayList();
-
- if (mapEntry.getKey() != null) {
- Command cmd1 = SetCommand.create(editingDomain, mapEntry
- .getKey(), FacesConfigPackage.eINSTANCE
- .getKeyType_TextContent(), dialog.getKey());
- commands.add(cmd1);
-
- } else {
- KeyType keyType = FacesConfigFactory.eINSTANCE.createKeyType();
- keyType.setTextContent(dialog.getKey());
- Command cmd2 = SetCommand.create(editingDomain, mapEntry,
- FacesConfigPackage.eINSTANCE.getMapEntryType_Key(),
- keyType);
- commands.add(cmd2);
- }
-
- if (dialog.isNullValue()) {
- if (mapEntry.getValue() != null) {
- Command cmd3 = SetCommand.create(editingDomain, mapEntry,
- FacesConfigPackage.eINSTANCE
- .getMapEntryType_Value(),
- SetCommand.UNSET_VALUE);
- commands.add(cmd3);
- }
- Command cmd4 = SetCommand.create(editingDomain, mapEntry,
- FacesConfigPackage.eINSTANCE
- .getMapEntryType_NullValue(),
- FacesConfigFactory.eINSTANCE.createNullValueType());
-
- commands.add(cmd4);
- } else {
- if (mapEntry.getNullValue() != null) {
- Command cmd5 = SetCommand.create(editingDomain, mapEntry,
- FacesConfigPackage.eINSTANCE
- .getMapEntryType_NullValue(),
- SetCommand.UNSET_VALUE);
- commands.add(cmd5);
- }
-
- if (mapEntry.getValue() != null) {
- Command cmd6 = SetCommand.create(editingDomain, mapEntry
- .getValue(), FacesConfigPackage.eINSTANCE
- .getValueType_TextContent(), dialog.getValue());
- commands.add(cmd6);
- } else {
- ValueType value = FacesConfigFactory.eINSTANCE
- .createValueType();
- value.setTextContent(dialog.getValue());
- Command cmd7 = SetCommand.create(editingDomain, mapEntry,
- FacesConfigPackage.eINSTANCE
- .getMapEntryType_Value(), value);
- commands.add(cmd7);
- }
-
- }
-
- Command command = new CompoundCommand(commands);
- if (command.canExecute()) {
- editingDomain.getCommandStack().execute(command);
- tableViewer.refresh(mapEntry);
- }
-
- }
-
- }
-
- private void removeButtonSelected() {
-
- MapEntryType mapEntry = (MapEntryType) ((IStructuredSelection) tableViewer
- .getSelection()).getFirstElement();
- EditingDomain editingDomain = section.getEditingDomain();
- Command cmd = RemoveCommand.create(editingDomain, mapEntry);
- if (cmd.canExecute()) {
- editingDomain.getCommandStack().execute(cmd);
- refresh();
- }
- }
-
- /**
- * get the project according to current xml node.
- *
- * @return
- */
- private IProject getProject() {
- if (currentProject == null) {
- currentProject = (IProject) section.getPage().getEditor()
- .getAdapter(IProject.class);
- }
- return currentProject;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.jsf.facesconfig.ui.common.dialogfield.DialogFieldGroup#validateDialogFields()
- */
- public IStatus[] validateDialogFields() {
- return null;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.jsf.facesconfig.ui.section.IDialogFieldGroup#setInput(java.lang.Object)
- */
- public void setInput(Object newInput) {
- if (newInput != null && newInput instanceof ManagedBeanType) {
- managedBean = (ManagedBeanType) newInput;
- if (managedBean.getMapEntries() != null)
- refreshAll();
- }
- }
-
- /*package*/ void refreshAll() {
- if (managedBean.getMapEntries() != null
- && managedBean.getMapEntries().getKeyClass() != null) {
- this.keyClassField.setTextWithoutUpdate(managedBean.getMapEntries()
- .getKeyClass().getTextContent());
- } else {
- this.keyClassField.setTextWithoutUpdate(null);
- }
-
- if (managedBean.getMapEntries() != null
- && managedBean.getMapEntries().getValueClass() != null) {
- this.valueClassField.setTextWithoutUpdate(managedBean
- .getMapEntries().getValueClass().getTextContent());
- } else {
- this.valueClassField.setTextWithoutUpdate(null);
- }
-
- tableViewer.setInput(((ManagedBeanType) getInput()).getMapEntries());
- updateButtons();
- }
-
- public Object getInput() {
- return this.managedBean;
- }
-
- public void refreshData() {
- refresh();
-
- }
-
- /**
- *
- */
- public void refresh() {
- tableViewer.refresh();
- updateButtons();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.ISelectionProvider#addSelectionChangedListener(org.eclipse.jface.viewers.ISelectionChangedListener)
- */
- public void addSelectionChangedListener(ISelectionChangedListener listener) {
- selectionChangedListeners.add(listener);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.ISelectionProvider#getSelection()
- */
- public ISelection getSelection() {
- return null;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.ISelectionProvider#removeSelectionChangedListener(org.eclipse.jface.viewers.ISelectionChangedListener)
- */
- public void removeSelectionChangedListener(
- ISelectionChangedListener listener) {
- selectionChangedListeners.remove(listener);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.ISelectionProvider#setSelection(org.eclipse.jface.viewers.ISelection)
- */
- public void setSelection(ISelection selection) {
- // do nothing
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.ISelectionChangedListener#selectionChanged(org.eclipse.jface.viewers.SelectionChangedEvent)
- */
- public void selectionChanged(SelectionChangedEvent event) {
- for (Iterator listeners = selectionChangedListeners.iterator(); listeners
- .hasNext();) {
- ISelectionChangedListener listener = (ISelectionChangedListener) listeners
- .next();
- listener.selectionChanged(new SelectionChangedEvent(this, event
- .getSelection()));
- }
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/OthersPageBaseSection.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/OthersPageBaseSection.java
deleted file mode 100644
index 4eeca69..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/OthersPageBaseSection.java
+++ /dev/null
@@ -1,320 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui.section;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.emf.common.command.Command;
-import org.eclipse.emf.common.command.CompoundCommand;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.edit.command.RemoveCommand;
-import org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider;
-import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jst.jsf.facesconfig.ui.EditorMessages;
-import org.eclipse.jst.jsf.facesconfig.ui.page.IFacesConfigPage;
-import org.eclipse.jst.jsf.facesconfig.ui.page.OthersPage;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.forms.IManagedForm;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-
-/**
- * @author Zhi-peng Zhang
- * @version
- */
-/**
- * The base class for the Sections in Others Page.
- */
-public abstract class OthersPageBaseSection extends AbstractFacesConfigSection {
-
- /**
- * Table viewer for all sections based on this calss
- */
- protected TableViewer tableViewer;
-
- private Button removeButton;
-
- /**
- *
- * @param parent
- * @param managedForm
- * @param page
- * @param toolkit
- * @param helpContextId
- * @param helpTooltip
- */
- public OthersPageBaseSection(Composite parent, IManagedForm managedForm,
- IFacesConfigPage page, FormToolkit toolkit, String helpContextId,
- String helpTooltip) {
- super(parent, managedForm, page, toolkit, helpContextId, helpTooltip);
- }
-
- /**
- * @param parent
- * @param managedForm
- * @param page
- * @param toolkit
- */
- public OthersPageBaseSection(Composite parent, IManagedForm managedForm,
- IFacesConfigPage page, FormToolkit toolkit) {
- this(parent, managedForm, page, toolkit, null, null);
- }
-
- public void dispose() {
- tableViewer.removeSelectionChangedListener(this);
- tableViewer = null;
- super.dispose();
- }
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.jsf.facesconfig.ui.section.AbstractFacesConfigSection#createContents(org.eclipse.swt.widgets.Composite,
- * org.eclipse.ui.forms.widgets.FormToolkit)
- */
- protected void createContents(Composite container, FormToolkit toolkit) {
- GridLayout layout = new GridLayout();
- layout.numColumns = 2;
- layout.marginWidth = layout.marginHeight = 5;
- container.setLayout(layout);
- createViewer(container, toolkit);
- createOperationSection(container, toolkit);
- }
-
- /**
- * create TableViewer for this section. sub-class may override it to return
- * a new type tableViewer. for example CheckboxTableViewer.
- *
- * @param parent
- * @return the table viewer for this section
- */
- protected TableViewer createTableViewer(Composite parent) {
- return new TableViewer(parent, SWT.SINGLE | SWT.H_SCROLL | SWT.V_SCROLL
- | SWT.BORDER);
- }
-
- /**
- * Config the viewer, such as set a filter and so on. Sub classes should
- * override this method to add filter.
- *
- * @param tableViewer1
- */
- protected abstract void configTableViewer(TableViewer tableViewer1);
-
- /**
- *
- * @param parent
- * @param toolkit
- */
- protected void createViewer(Composite parent, FormToolkit toolkit) {
- Composite tableContainer = toolkit.createComposite(parent);
- toolkit.paintBordersFor(tableContainer);
-
- GridData gd = new GridData(GridData.FILL_BOTH);
- gd.heightHint = 200;
- tableContainer.setLayoutData(gd);
- tableContainer.setLayout(new GridLayout());
-
- tableViewer = createTableViewer(tableContainer);
- tableViewer.getControl()
- .setLayoutData(new GridData(GridData.FILL_BOTH));
- tableViewer.setContentProvider(new AdapterFactoryContentProvider(
- getAdapterFactory()));
- tableViewer.setLabelProvider(new AdapterFactoryLabelProvider(
- getAdapterFactory()));
- configTableViewer(tableViewer);
-
- tableViewer.addSelectionChangedListener(this);
- }
-
- /**
- *
- * @param parent
- * @param toolkit
- */
- protected void createOperationSection(Composite parent, FormToolkit toolkit) {
- Composite operationContainer = toolkit.createComposite(parent);
- operationContainer.setLayoutData(new GridData(GridData.FILL_VERTICAL));
-
- operationContainer.setLayout(new GridLayout());
-
- Button addButton = toolkit.createButton(operationContainer,
- EditorMessages.UI_Button_Add, SWT.PUSH);
- GridData gd = new GridData(GridData.FILL_HORIZONTAL
- | GridData.VERTICAL_ALIGN_BEGINNING);
- gd.grabExcessHorizontalSpace = false;
- addButton.setLayoutData(gd);
-
- addButton.addSelectionListener(new SelectionListener() {
- public void widgetSelected(SelectionEvent e) {
- addButtonSelected(e);
- }
-
- public void widgetDefaultSelected(SelectionEvent e) {
- addButtonSelected(e);
- }
- });
-
- setRemoveButton(toolkit.createButton(operationContainer,
- EditorMessages.UI_Button_Remove, SWT.PUSH));
-
- getRemoveButton().setEnabled(true);
- gd = new GridData(GridData.FILL_HORIZONTAL
- | GridData.VERTICAL_ALIGN_BEGINNING);
- gd.grabExcessHorizontalSpace = false;
- getRemoveButton().setLayoutData(gd);
- getRemoveButton().addSelectionListener(new SelectionListener() {
- public void widgetSelected(SelectionEvent e) {
- removeButtonSelected(e);
- }
-
- public void widgetDefaultSelected(SelectionEvent e) {
- removeButtonSelected(e);
- }
- });
- }
-
-
- abstract void addButtonSelected(SelectionEvent e);
-
- /**
- * Respond to selection of the remove button
- * @param e
- */
- protected void removeButtonSelected(SelectionEvent e) {
- IStructuredSelection ssel = StructuredSelection.EMPTY;
- ISelection selection = getSelection();
- if (selection instanceof IStructuredSelection) {
- ssel = (IStructuredSelection) selection;
- }
-
- if (!ssel.isEmpty()) {
- List commands = new ArrayList(ssel.size());
- for (Iterator iter = ssel.iterator(); iter.hasNext();) {
- EObject element = (EObject) iter.next();
- if (element.eContainer().eContents().size() == 1) {
- // if the parent only have this one child, then remove it
- // together.
- element = element.eContainer();
- }
- Command command = RemoveCommand.create(getEditingDomain(),
- element);
- commands.add(command);
-
- }
-
- CompoundCommand command = new CompoundCommand(commands);
- if (command.canExecute()) {
- getEditingDomain().getCommandStack().execute(command);
- }
- }
- }
-
- public ISelection getSelection() {
- return tableViewer.getSelection();
- }
-
- /**
- * update all buttons with the current selection
- */
- protected void updateButtons() {
- if (!getRemoveButton().isDisposed()) {
- IStructuredSelection ssel = (IStructuredSelection) getSelection();
- getRemoveButton().setEnabled(!ssel.isEmpty());
- }
- }
-
- public void refresh() {
- super.refresh();
- tableViewer.refresh();
- updateButtons();
- }
-
- public void setSelection(ISelection selection) {
- tableViewer.setSelection(selection);
- }
-
- /**
- * @return Returns the tableViewer.
- */
- public TableViewer getTableViewer() {
- return tableViewer;
- }
-
- public void refreshAll() {
- setViewerInput(getInput());
- updateButtons();
- }
-
- /**
- * set the structuredViewer's input
- *
- * @param input
- */
- abstract protected void setViewerInput(Object input);
-
- public void expansionStateChanged(boolean expanded) {
- if (expanded) {
- if (tableViewer.getInput() == null) {
- refreshAll();
- }
- tableViewer.setSelection(tableViewer.getSelection());
- } else {
- tableViewer.setSelection(null);
- }
- super.expansionStateChanged(expanded);
- }
-
- protected void expansionStateChanging(boolean expanding) {
- if (!expanding) {
- GridData gd = new GridData(GridData.FILL_HORIZONTAL);
- this.getSection().setLayoutData(gd);
- } else {
- ((OthersPage) getPage()).closeOtherSections(this);
-
- GridData gd = new GridData(GridData.FILL_BOTH);
- this.getSection().setLayoutData(gd);
- }
-
- super.expansionStateChanging(expanding);
- }
-
- public void selectionChanged(SelectionChangedEvent event) {
- super.selectionChanged(event);
- updateButtons();
- }
-
- /**
- * @param removeButton
- */
- protected void setRemoveButton(Button removeButton) {
- this.removeButton = removeButton;
- }
-
- /**
- * @return the button widget
- */
- protected Button getRemoveButton() {
- return removeButton;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/OverviewComponentsSection.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/OverviewComponentsSection.java
deleted file mode 100644
index 4ef59aa..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/OverviewComponentsSection.java
+++ /dev/null
@@ -1,107 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui.section;
-
-import org.eclipse.jface.viewers.ColumnWeightData;
-import org.eclipse.jface.viewers.TableLayout;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerFilter;
-import org.eclipse.jst.jsf.facesconfig.emf.FacesConfigPackage;
-import org.eclipse.jst.jsf.facesconfig.ui.EditorMessages;
-import org.eclipse.jst.jsf.facesconfig.ui.page.ComponentsPage;
-import org.eclipse.jst.jsf.facesconfig.ui.page.IFacesConfigPage;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.TableColumn;
-import org.eclipse.ui.forms.IManagedForm;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-
-/**
- * @author sfshi
- * @version
- */
-public class OverviewComponentsSection extends AbstractOverviewSection {
-
- /**
- *
- * @param parent
- * @param managedForm
- * @param page
- * @param toolkit
- */
- public OverviewComponentsSection(Composite parent,
- IManagedForm managedForm, IFacesConfigPage page, FormToolkit toolkit) {
- super(parent, managedForm, page, toolkit, ComponentsPage.PAGE_ID,
- EditorMessages.OverviewPage_ComponentsSection_name,
- EditorMessages.OverviewPage_ComponentsSection_description,
- null, null);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.jsf.facesconfig.ui.section.AbstractOverviewSection#configTableViewer(org.eclipse.jface.viewers.TableViewer)
- */
- protected void configTableViewer(TableViewer tableViewer1) {
- tableViewer1.addFilter(new ViewerFilter() {
- public boolean select(Viewer viewer, Object parentElement,
- Object element) {
- return FacesConfigPackage.eINSTANCE.getComponentType()
- .isInstance(element)
- || FacesConfigPackage.eINSTANCE.getConverterType()
- .isInstance(element)
- || FacesConfigPackage.eINSTANCE.getRenderKitType()
- .isInstance(element)
- || FacesConfigPackage.eINSTANCE.getValidatorType()
- .isInstance(element);
- }
- });
-
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.jsf.facesconfig.ui.section.AbstractOverviewSection#createTable(org.eclipse.swt.widgets.Composite)
- */
- protected Table createTable(Composite container) {
- Table table = new Table(container, SWT.H_SCROLL | SWT.V_SCROLL
- | SWT.FULL_SELECTION | SWT.BORDER);
-
- GridData gd = new GridData(GridData.FILL_BOTH);
- gd.horizontalSpan = 1;
- gd.heightHint = 100;
- table.setLayoutData(gd);
-
- table.setLinesVisible(true);
- table.setHeaderVisible(true);
- TableLayout tablelayout = new TableLayout();
- table.setLayout(tablelayout);
-
- TableColumn typecol = new TableColumn(table, SWT.LEFT);
- tablelayout.addColumnData(new ColumnWeightData(1, true));
- typecol
- .setText(EditorMessages.OverviewPage_ComponentsSection_table_namecol);
- typecol.setResizable(true);
-
- TableColumn namecol = new TableColumn(table, SWT.LEFT);
- tablelayout.addColumnData(new ColumnWeightData(1, true));
- namecol
- .setText(EditorMessages.OverviewPage_ComponentsSection_table_typecol);
- namecol.setResizable(true);
-
- return table;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/OverviewGeneralSection.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/OverviewGeneralSection.java
deleted file mode 100644
index 8de1c9e..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/OverviewGeneralSection.java
+++ /dev/null
@@ -1,116 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui.section;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jst.jsf.facesconfig.ui.EditorMessages;
-import org.eclipse.jst.jsf.facesconfig.ui.page.IFacesConfigPage;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.forms.IManagedForm;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-import org.eclipse.ui.part.FileEditorInput;
-
-/**
- * @author jchoi, Xiao-guang Zhang
- * @version
- */
-public class OverviewGeneralSection extends AbstractFacesConfigSection {
-
- private Text versionText;
-
- /**
- * @param parent
- * @param managedForm
- * @param page
- * @param toolkit
- */
- public OverviewGeneralSection(Composite parent, IManagedForm managedForm,
- IFacesConfigPage page, FormToolkit toolkit) {
- super(parent, managedForm, page, toolkit, null, null);
-
- getSection().setText(
- EditorMessages.OverviewPage_GeneralSection_name);
- getSection().setDescription(
- EditorMessages.OverviewPage_GeneralSection_description);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.update.ui.forms.internal.FormSection#createClient(org.eclipse.swt.widgets.Composite,
- * org.eclipse.update.ui.forms.internal.FormWidgetFactory)
- */
- public void createContents(Composite container, FormToolkit toolkit) {
- GridLayout layout = new GridLayout();
- layout.numColumns = 2;
- container.setLayout(layout);
-
- IEditorInput editorInput = this.getPage().getEditor().getEditorInput();
-
- toolkit.createLabel(container,
- EditorMessages.OverviewPage_GeneralSection_label_name);
- Text typeText = toolkit.createText(container, ((FileEditorInput)editorInput).getName());
- typeText.setEditable(false);
- GridData data = new GridData(GridData.FILL_HORIZONTAL);
- typeText.setLayoutData(data);
-
- toolkit.createLabel(container,
- EditorMessages.OverviewPage_GeneralSection_label_version);
- versionText = toolkit.createText(container, ""); //$NON-NLS-1$
- versionText.setLayoutData(data);
- versionText.setEditable(false);
-
- // set the service type description
- data = new GridData(GridData.FILL_HORIZONTAL);
- versionText.setLayoutData(data);
-
- GridData gd = new GridData(GridData.FILL_HORIZONTAL);
- gd.horizontalSpan = 2;
- Label sep = toolkit.createSeparator(container, SWT.HORIZONTAL);
- sep.setLayoutData(gd);
- toolkit.paintBordersFor(container);
-
- // return container;
- }
-
- public void refreshAll() {
- if (getInput() == null || !(getInput() instanceof EObject)) {
- return;
- }
-
-// FacesConfigType facesConfig = (FacesConfigType)getInput();
- // TODO get the version and display it.
- // String version = FacesConfigUtil
- // .getFacesConfigVersion((IDOMModel) getInput());
- //
- // if (null == version) {
- // Document document = ((IDOMModel) getInput()).getDocument();
- // DocumentType doctype = document.getDoctype();
- // if (doctype != null) {
- // String pid = doctype.getPublicId();
- // version = pid.substring(PUBLIC_ID.length() + 1);
- // version = version.substring(version.indexOf(VERSION_PREFIX)
- // + VERSION_PREFIX.length() + 1, version.indexOf("//"));
- // }
- // if (null == version) {
- // version = "";
- // }
- // }
- // versionText.setText(version);
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/OverviewManagedBeanSection.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/OverviewManagedBeanSection.java
deleted file mode 100644
index c066246..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/OverviewManagedBeanSection.java
+++ /dev/null
@@ -1,109 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui.section;
-
-import org.eclipse.jface.viewers.ColumnWeightData;
-import org.eclipse.jface.viewers.TableLayout;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerFilter;
-import org.eclipse.jst.jsf.facesconfig.emf.FacesConfigPackage;
-import org.eclipse.jst.jsf.facesconfig.ui.EditorMessages;
-import org.eclipse.jst.jsf.facesconfig.ui.page.IFacesConfigPage;
-import org.eclipse.jst.jsf.facesconfig.ui.page.ManagedBeanPage;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.TableColumn;
-import org.eclipse.ui.forms.IManagedForm;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-
-/**
- * @author sfshi
- * @version
- */
-public class OverviewManagedBeanSection extends AbstractOverviewSection {
-
-
- /**
- *
- * @param parent
- * @param managedForm
- * @param page
- * @param toolkit
- */
- public OverviewManagedBeanSection(Composite parent,
- IManagedForm managedForm, IFacesConfigPage page, FormToolkit toolkit) {
- super(parent, managedForm, page, toolkit, ManagedBeanPage.PAGE_ID,
- EditorMessages.OverviewPage_ManagedBeanSection_name,
- EditorMessages.OverviewPage_ManagedBeanSection_description,
- null, null);
-
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.jsf.facesconfig.ui.section.AbstractOverviewSection#configTableViewer(org.eclipse.jface.viewers.TableViewer)
- */
- protected void configTableViewer(TableViewer tableViewer1) {
- tableViewer1.addFilter(new ViewerFilter() {
- public boolean select(Viewer viewer, Object parentElement,
- Object element) {
- return FacesConfigPackage.eINSTANCE.getManagedBeanType()
- .isInstance(element);
- }
- });
-
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.jsf.facesconfig.ui.section.AbstractOverviewSection#createTable()
- */
- protected Table createTable(Composite container) {
- Table table = new Table(container, SWT.H_SCROLL | SWT.V_SCROLL
- | SWT.FULL_SELECTION | SWT.BORDER);
-
- GridData gd = new GridData(GridData.FILL_BOTH);
- gd.horizontalSpan = 1;
- gd.heightHint = 100;
- table.setLayoutData(gd);
-
- table.setLinesVisible(true);
- table.setHeaderVisible(true);
- TableLayout tablelayout = new TableLayout();
- table.setLayout(tablelayout);
-
- TableColumn namecol = new TableColumn(table, SWT.LEFT);
- namecol
- .setText(EditorMessages.OverviewPage_ManagedBeanSection_table_namecol);
- tablelayout.addColumnData(new ColumnWeightData(1, true));
- namecol.setResizable(true);
-
- TableColumn scopecol = new TableColumn(table, SWT.LEFT);
- scopecol
- .setText(EditorMessages.OverviewPage_ManagedBeanSection_table_scopecol);
- tablelayout.addColumnData(new ColumnWeightData(1, true));
- scopecol.setResizable(true);
-
- TableColumn classcol = new TableColumn(table, SWT.LEFT);
- classcol
- .setText(EditorMessages.OverviewPage_ManagedBeanSection_table_classcol);
- tablelayout.addColumnData(new ColumnWeightData(1, true));
- classcol.setResizable(true);
-
- return table;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/OverviewNavigationSection.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/OverviewNavigationSection.java
deleted file mode 100644
index ae4bd8a..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/OverviewNavigationSection.java
+++ /dev/null
@@ -1,403 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.jsf.facesconfig.ui.section;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.impl.AdapterImpl;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.jface.viewers.ColumnWeightData;
-import org.eclipse.jface.viewers.ILabelProviderListener;
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.jface.viewers.ITableLabelProvider;
-import org.eclipse.jface.viewers.TableLayout;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jst.jsf.facesconfig.emf.FacesConfigPackage;
-import org.eclipse.jst.jsf.facesconfig.emf.FacesConfigType;
-import org.eclipse.jst.jsf.facesconfig.emf.NavigationCaseType;
-import org.eclipse.jst.jsf.facesconfig.emf.NavigationRuleType;
-import org.eclipse.jst.jsf.facesconfig.ui.EditorMessages;
-import org.eclipse.jst.jsf.facesconfig.ui.page.IFacesConfigPage;
-import org.eclipse.jst.jsf.facesconfig.ui.pageflow.PageflowEditor;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.TableColumn;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.forms.IManagedForm;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-
-/**
- * @author sfshi
- *
- */
-public class OverviewNavigationSection extends AbstractOverviewSection {
-
- private static final int COLUMN_WITH = 70;
-
- private OverviewNavigationSectionAdapter overviewNavigationSectionAdapter;
-
- /**
- *
- * @param parent
- * @param managedForm
- * @param page
- * @param toolkit
- */
- public OverviewNavigationSection(Composite parent,
- IManagedForm managedForm, IFacesConfigPage page, FormToolkit toolkit) {
- super(parent, managedForm, page, toolkit, PageflowEditor.PAGE_ID,
- EditorMessages.OverviewPage_NavigationSection_name,
- EditorMessages.OverviewPage_NavigationSection_description,
- null, null);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.jsf.facesconfig.ui.section.AbstractOverviewSection#configTableViewer(org.eclipse.jface.viewers.TableViewer)
- */
- protected void configTableViewer(TableViewer tableViewer1) {
- tableViewer1.setContentProvider(new IStructuredContentProvider() {
-
- public Object[] getElements(Object inputElement) {
- List navigationCaseList = (List) inputElement;
- return navigationCaseList.toArray();
- }
-
- public void dispose() {
- // nothing to dispose
- }
-
- public void inputChanged(Viewer viewer, Object oldInput,
- Object newInput) {
- // do nothing
- }
- });
-
- tableViewer1.setLabelProvider(new ITableLabelProvider() {
-
- public Image getColumnImage(Object element, int columnIndex) {
- return null;
- }
-
- public String getColumnText(Object element, int columnIndex) {
- NavigationCaseType navigationCase = (NavigationCaseType) element;
- switch (columnIndex) {
-
- case 0:
- return ((NavigationRuleType) navigationCase.eContainer())
- .getFromViewId() == null ? "" //$NON-NLS-1$
- : ((NavigationRuleType) navigationCase.eContainer())
- .getFromViewId().getTextContent();
-
- case 1:
- return navigationCase.getFromOutcome() == null ? "" //$NON-NLS-1$
- : navigationCase.getFromOutcome().getTextContent();
-
- case 2:
- return navigationCase.getToViewId() == null ? "" //$NON-NLS-1$
- : navigationCase.getToViewId().getTextContent();
- }
- return null;
- }
-
- public void addListener(ILabelProviderListener listener) {
- // no listeners?
- }
-
- public void dispose() {
- // do nothing
- }
-
- public boolean isLabelProperty(Object element, String property) {
- return false;
- }
-
- public void removeListener(ILabelProviderListener listener) {
- // no listeners?
- }
- });
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.jsf.facesconfig.ui.section.AbstractOverviewSection#createTable(org.eclipse.swt.widgets.Composite)
- */
- protected Table createTable(Composite container) {
- Table table = new Table(container, SWT.H_SCROLL | SWT.V_SCROLL
- | SWT.FULL_SELECTION | SWT.BORDER | SWT.BORDER);
-
- GridData gd = new GridData(GridData.FILL_BOTH);
- gd.horizontalSpan = 1;
- gd.heightHint = 100;
- table.setLayoutData(gd);
-
- table.setLinesVisible(true);
- table.setHeaderVisible(true);
- TableLayout tablelayout = new TableLayout();
- table.setLayout(tablelayout);
-
- TableColumn column1 = new TableColumn(table, SWT.LEFT);
- column1
- .setText(EditorMessages.OverviewPage_NavigationSection_table_col1);
- // column1.setWidth(COLUMN_WITH);
- tablelayout.addColumnData(new ColumnWeightData(1, COLUMN_WITH, true));
- // tablelayout.addColumnData(new ColumnWeightData(1, true));
- column1.setResizable(true);
-
- TableColumn column2 = new TableColumn(table, SWT.LEFT);
- column2
- .setText(EditorMessages.OverviewPage_NavigationSection_table_col2);
- tablelayout.addColumnData(new ColumnWeightData(1, COLUMN_WITH, true));
- // tablelayout.addColumnData(new ColumnWeightData(1, true));
- column2.setResizable(true);
- // column2.setWidth(COLUMN_WITH);
-
- TableColumn column3 = new TableColumn(table, SWT.LEFT);
- column3
- .setText(EditorMessages.OverviewPage_NavigationSection_table_col3);
- tablelayout.addColumnData(new ColumnWeightData(1, COLUMN_WITH, true));
- // tablelayout.addColumnData(new ColumnWeightData(1, true));
- column3.setResizable(true);
- // column3.setWidth(COLUMN_WITH);
-
- return table;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.jsf.facesconfig.ui.section.IFacesConfigSection#refreshAll()
- */
- public void refreshAll() {
- List navigationCaseList = new ArrayList();
- if (getInput() instanceof FacesConfigType) {
- List navigationRules = ((FacesConfigType) getInput())
- .getNavigationRule();
- for (int i = 0, n = navigationRules.size(); i < n; i++) {
- NavigationRuleType navigationRule = (NavigationRuleType) navigationRules
- .get(i);
- navigationCaseList.addAll(navigationRule.getNavigationCase());
- }
- }
-
- tableViewer.setInput(navigationCaseList);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.jsf.facesconfig.ui.section.AbstractFacesConfigSection#addAdaptersOntoInput(java.lang.Object)
- */
- protected void addAdaptersOntoInput(Object newInput) {
- FacesConfigType facesConfig = (FacesConfigType) newInput;
- addOverviewNavigationSectionAdapter(facesConfig);
-
- for (Iterator it = facesConfig.getNavigationRule().iterator(); it
- .hasNext();) {
- NavigationRuleType navigationRule = (NavigationRuleType) it.next();
-
- addOverviewNavigationSectionAdapter(navigationRule);
-
- if (navigationRule.getFromViewId() != null) {
- addOverviewNavigationSectionAdapter(navigationRule
- .getFromViewId());
- }
-
- for (Iterator it2 = navigationRule.getNavigationCase().iterator(); it2
- .hasNext();) {
- NavigationCaseType navigationCase = (NavigationCaseType) it2
- .next();
- addOverviewNavigationSectionAdapter(navigationCase);
-
- if (navigationCase.getFromOutcome() != null) {
- addOverviewNavigationSectionAdapter(navigationCase
- .getFromOutcome());
- }
-
- if (navigationCase.getToViewId() != null) {
- addOverviewNavigationSectionAdapter(navigationCase
- .getToViewId());
- }
- }
- }
-
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.jsf.facesconfig.ui.section.AbstractFacesConfigSection#removeAdaptersFromInput(java.lang.Object)
- */
- protected void removeAdaptersFromInput(Object oldInput) {
- super.removeAdaptersFromInput(oldInput);
- FacesConfigType facesConfig = (FacesConfigType) oldInput;
- removeOverviewNavigationSectionAdapter(facesConfig);
-
- for (Iterator it = facesConfig.getNavigationRule().iterator(); it
- .hasNext();) {
- NavigationRuleType navigationRule = (NavigationRuleType) it.next();
-
- removeOverviewNavigationSectionAdapter(navigationRule);
-
- if (navigationRule.getFromViewId() != null) {
- removeOverviewNavigationSectionAdapter(navigationRule
- .getFromViewId());
- }
-
- for (Iterator it2 = navigationRule.getNavigationCase().iterator(); it2
- .hasNext();) {
- NavigationCaseType navigationCase = (NavigationCaseType) it2
- .next();
- removeOverviewNavigationSectionAdapter(navigationCase);
-
- if (navigationCase.getFromOutcome() != null) {
- removeOverviewNavigationSectionAdapter(navigationCase
- .getFromOutcome());
- }
-
- if (navigationCase.getToViewId() != null) {
- removeOverviewNavigationSectionAdapter(navigationCase
- .getToViewId());
- }
- }
- }
-
- }
-
- private void addOverviewNavigationSectionAdapter(EObject object) {
- if (EcoreUtil.getExistingAdapter(object,
- OverviewNavigationSection.class) == null) {
- object.eAdapters().add(getOverviewNavigationSectionAdapter());
- }
-
- }
-
- private void removeOverviewNavigationSectionAdapter(EObject object) {
- if (object != null && EcoreUtil.getExistingAdapter(object,
- OverviewNavigationSection.class) != null) {
- object.eAdapters().remove(getOverviewNavigationSectionAdapter());
- }
- }
-
- private OverviewNavigationSectionAdapter getOverviewNavigationSectionAdapter() {
- if (overviewNavigationSectionAdapter == null)
- overviewNavigationSectionAdapter = new OverviewNavigationSectionAdapter();
- return overviewNavigationSectionAdapter;
- }
-
- class OverviewNavigationSectionAdapter extends AdapterImpl {
-
- public boolean isAdapterForType(Object type) {
- if (type == OverviewNavigationSection.class)
- return true;
- return false;
- }
-
- public void notifyChanged(Notification msg) {
-
- if ((msg.getFeature() == FacesConfigPackage.eINSTANCE
- .getFacesConfigType_NavigationRule()
- || msg.getFeature() == FacesConfigPackage.eINSTANCE
- .getNavigationRuleType_NavigationCase()
- || msg.getFeature() == FacesConfigPackage.eINSTANCE
- .getNavigationRuleType_FromViewId() || msg
- .getFeature() == FacesConfigPackage.eINSTANCE
- .getFromViewIdType_TextContent())) {
- if (msg.getEventType() == Notification.ADD
- || msg.getEventType() == Notification.SET) {
- if (msg.getNewValue() instanceof EObject) {
- EObject newObject = (EObject) msg.getNewValue();
- addOverviewNavigationSectionAdapter(newObject);
- }
- }
- if (msg.getEventType() == Notification.ADD
- || msg.getEventType() == Notification.REMOVE
- || msg.getEventType() == Notification.SET)
- if (Thread.currentThread() == PlatformUI.getWorkbench().getDisplay().getThread()) {
- refreshAll();
- } else {
- PlatformUI.getWorkbench().getDisplay().asyncExec(new Runnable() {
- public void run() {
- refreshAll();
- }
- });
- }
- return;
- }
-
- if (msg.getFeature() == FacesConfigPackage.eINSTANCE
- .getNavigationCaseType_FromOutcome()
- || msg.getFeature() == FacesConfigPackage.eINSTANCE
- .getNavigationCaseType_ToViewId()) {
-
- if (msg.getEventType() == Notification.ADD
- || msg.getEventType() == Notification.SET) {
- if (msg.getNewValue() instanceof EObject) {
- EObject newObject = (EObject) msg.getNewValue();
- addOverviewNavigationSectionAdapter(newObject);
- }
- }
- if (msg.getEventType() == Notification.ADD
-
- || msg.getEventType() == Notification.REMOVE
- || msg.getEventType() == Notification.SET) {
-
- NavigationCaseType navigationCase = (NavigationCaseType) msg
- .getNotifier();
- refreshViewerOnUIThread(navigationCase);
- }
- return;
- }
-
- if (msg.getFeature() == FacesConfigPackage.eINSTANCE
- .getFromOutcomeType_TextContent()
- || msg.getFeature() == FacesConfigPackage.eINSTANCE
- .getToViewIdType_TextContent()) {
-
- if (msg.getEventType() == Notification.ADD
- || msg.getEventType() == Notification.REMOVE
- || msg.getEventType() == Notification.SET) {
- NavigationCaseType navigationCase = (NavigationCaseType) ((EObject) msg
- .getNotifier()).eContainer();
- refreshViewerOnUIThread(navigationCase);
- }
- return;
- }
-
- }
-
- private void refreshViewerOnUIThread(final NavigationCaseType navigationCase) {
- if (Thread.currentThread() == PlatformUI.getWorkbench().getDisplay().getThread()) {
- tableViewer.refresh(navigationCase);
- } else {
- PlatformUI.getWorkbench().getDisplay().asyncExec(new Runnable() {
- public void run() {
- tableViewer.refresh(navigationCase);
- }
- });
- }
-
- }
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/OverviewOthersSection.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/OverviewOthersSection.java
deleted file mode 100644
index a1179bc..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/OverviewOthersSection.java
+++ /dev/null
@@ -1,361 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.jsf.facesconfig.ui.section;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.impl.AdapterImpl;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider;
-import org.eclipse.jface.viewers.ColumnWeightData;
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.jface.viewers.TableLayout;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jst.jsf.facesconfig.emf.ApplicationType;
-import org.eclipse.jst.jsf.facesconfig.emf.FacesConfigPackage;
-import org.eclipse.jst.jsf.facesconfig.emf.FacesConfigType;
-import org.eclipse.jst.jsf.facesconfig.emf.FactoryType;
-import org.eclipse.jst.jsf.facesconfig.emf.LifecycleType;
-import org.eclipse.jst.jsf.facesconfig.ui.EditorMessages;
-import org.eclipse.jst.jsf.facesconfig.ui.page.IFacesConfigPage;
-import org.eclipse.jst.jsf.facesconfig.ui.page.OthersPage;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.TableColumn;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.forms.IManagedForm;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-
-/**
- * @author sfshi
- *
- */
-public class OverviewOthersSection extends AbstractOverviewSection {
-
- private static final int COLUMN_WITH = 100;
-
- private OverviewOthersSectionAdapter overviewOthersSectionAdapter;
-
- /**
- *
- * @param parent
- * @param managedForm
- * @param page
- * @param toolkit
- */
- public OverviewOthersSection(Composite parent, IManagedForm managedForm,
- IFacesConfigPage page, FormToolkit toolkit) {
- super(parent, managedForm, page, toolkit, OthersPage.PAGE_ID,
- EditorMessages.OverviewPage_OthersSection_name,
- EditorMessages.OverviewPage_OthersSection_description,
- null, null);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.jsf.facesconfig.ui.section.AbstractOverviewSection#configTableViewer(org.eclipse.jface.viewers.TableViewer)
- */
- protected void configTableViewer(TableViewer tableViewer1) {
- tableViewer1.setContentProvider(new IStructuredContentProvider() {
-
- public Object[] getElements(Object inputElement) {
- List othersNodesList = (List) inputElement;
- return othersNodesList.toArray();
- }
-
- public void dispose() {
- // do nothing
- }
-
- public void inputChanged(Viewer viewer, Object oldInput,
- Object newInput) {
- // do nothing
- }
- });
-
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.jsf.facesconfig.ui.section.AbstractOverviewSection#createTable(org.eclipse.swt.widgets.Composite)
- */
- protected Table createTable(Composite container) {
- Table table = new Table(container, SWT.H_SCROLL | SWT.V_SCROLL
- | SWT.FULL_SELECTION | SWT.BORDER);
-
- GridData gd = new GridData(GridData.FILL_BOTH);
- gd.horizontalSpan = 1;
- gd.heightHint = 100;
- table.setLayoutData(gd);
-
- table.setLinesVisible(true);
- table.setHeaderVisible(true);
- TableLayout tablelayout = new TableLayout();
- table.setLayout(tablelayout);
-
- TableColumn valuecol = new TableColumn(table, SWT.NONE);
- tablelayout.addColumnData(new ColumnWeightData(1, COLUMN_WITH, true));
- valuecol
- .setText(EditorMessages.OverviewPage_OthersSection_table_valuecol);
- valuecol.setResizable(true);
-
- TableColumn typecol = new TableColumn(table, SWT.NONE);
- tablelayout.addColumnData(new ColumnWeightData(1, COLUMN_WITH, true));
- typecol
- .setText(EditorMessages.OverviewPage_OthersSection_table_typecol);
- typecol.setResizable(true);
-
- return table;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.jsf.facesconfig.ui.section.AbstractOverviewSection#refreshAll()
- */
- public void refreshAll() {
- if(getSection() == null || getSection().isDisposed()) {
- return;
- }
- List othersNodesList = new ArrayList();
- if (getInput() instanceof FacesConfigType) {
- Object[] applicationNodes = null;
- Object[] factoryNodes = null;
- Object[] lifecycleNodes = null;
- FacesConfigType facesConfig = (FacesConfigType) getInput();
- IStructuredContentProvider contentProvider = new AdapterFactoryContentProvider(
- getAdapterFactory());
- if (facesConfig.getApplication().size() > 0) {
-
- ApplicationType application = (ApplicationType) facesConfig
- .getApplication().get(0);
- applicationNodes = contentProvider.getElements(application);
-
- }
-
- if (facesConfig.getFactory().size() > 0) {
- FactoryType factory = (FactoryType) facesConfig.getFactory()
- .get(0);
- factoryNodes = contentProvider.getElements(factory);
- }
-
- if (facesConfig.getLifecycle().size() > 0) {
- LifecycleType lifecycle = (LifecycleType) facesConfig
- .getLifecycle().get(0);
- lifecycleNodes = contentProvider.getElements(lifecycle);
- }
-
- if (applicationNodes != null) {
- for (int i = 0, n = applicationNodes.length; i < n; i++) {
- othersNodesList.add(applicationNodes[i]);
- }
- }
-
- if (factoryNodes != null) {
- for (int i = 0, n = factoryNodes.length; i < n; i++) {
- othersNodesList.add(factoryNodes[i]);
- }
- }
-
- if (lifecycleNodes != null) {
- for (int i = 0, n = lifecycleNodes.length; i < n; i++) {
- othersNodesList.add(lifecycleNodes[i]);
- }
- }
- }
-
- tableViewer.setInput(othersNodesList);
-
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.jsf.facesconfig.ui.section.AbstractFacesConfigSection#addAdaptersOntoInput(java.lang.Object)
- */
- protected void addAdaptersOntoInput(Object newInput) {
- FacesConfigType facesConfig = (FacesConfigType) newInput;
- addOverviewOthersSectionAdapter(facesConfig);
- IStructuredContentProvider contentProvider = new AdapterFactoryContentProvider(
- getAdapterFactory());
- if (facesConfig.getApplication().size() > 0) {
- ApplicationType application = (ApplicationType) facesConfig
- .getApplication().get(0);
- addOverviewOthersSectionAdapter(application);
-
- Object[] applicationNodes = contentProvider
- .getElements(application);
- for (int i = 0, n = applicationNodes.length; i < n; i++) {
- addOverviewOthersSectionAdapter((EObject) applicationNodes[i]);
- }
-
- }
-
- if (facesConfig.getFactory().size() > 0) {
- FactoryType factory = (FactoryType) facesConfig.getFactory().get(0);
- addOverviewOthersSectionAdapter(factory);
-
- Object[] factoryNodes = contentProvider.getElements(factory);
- for (int i = 0, n = factoryNodes.length; i < n; i++) {
- addOverviewOthersSectionAdapter((EObject) factoryNodes[i]);
- }
-
- }
-
- if (facesConfig.getLifecycle().size() > 0) {
- LifecycleType lifecycle = (LifecycleType) facesConfig
- .getLifecycle().get(0);
- addOverviewOthersSectionAdapter(lifecycle);
-
- Object[] lifecycleNodes = contentProvider.getElements(lifecycle);
- for (int i = 0, n = lifecycleNodes.length; i < n; i++) {
- addOverviewOthersSectionAdapter((EObject) lifecycleNodes[i]);
- }
-
- }
-
- }
-
- private void addOverviewOthersSectionAdapter(EObject object) {
- if (EcoreUtil.getExistingAdapter(object, OverviewOthersSection.class) == null) {
- object.eAdapters().add(getOverviewOthersSectionAdapter());
- }
-
- }
-
- private void removeOverviewOthersSectionAdapter(EObject object) {
- if (EcoreUtil.getExistingAdapter(object, OverviewOthersSection.class) != null) {
- object.eAdapters().remove(getOverviewOthersSectionAdapter());
- }
- }
-
- private OverviewOthersSectionAdapter getOverviewOthersSectionAdapter() {
- if (overviewOthersSectionAdapter == null) {
- overviewOthersSectionAdapter = new OverviewOthersSectionAdapter();
- }
-
- return overviewOthersSectionAdapter;
-
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.jsf.facesconfig.ui.section.AbstractFacesConfigSection#removeAdaptersFromInput(java.lang.Object)
- */
- protected void removeAdaptersFromInput(Object oldInput) {
-
- FacesConfigType facesConfig = (FacesConfigType) oldInput;
- removeOverviewOthersSectionAdapter(facesConfig);
- IStructuredContentProvider contentProvider = new AdapterFactoryContentProvider(
- getAdapterFactory());
- if (facesConfig.getApplication().size() > 0) {
- ApplicationType application = (ApplicationType) facesConfig
- .getApplication().get(0);
- removeOverviewOthersSectionAdapter(application);
-
- Object[] applicationNodes = contentProvider
- .getElements(application);
- for (int i = 0, n = applicationNodes.length; i < n; i++) {
- removeOverviewOthersSectionAdapter((EObject) applicationNodes[i]);
- }
-
- }
-
- if (facesConfig.getFactory().size() > 0) {
- FactoryType factory = (FactoryType) facesConfig.getFactory().get(0);
- removeOverviewOthersSectionAdapter(factory);
-
- Object[] factoryNodes = contentProvider.getElements(factory);
- for (int i = 0, n = factoryNodes.length; i < n; i++) {
- removeOverviewOthersSectionAdapter((EObject) factoryNodes[i]);
- }
-
- }
-
- if (facesConfig.getLifecycle().size() > 0) {
- LifecycleType lifecycle = (LifecycleType) facesConfig
- .getLifecycle().get(0);
- removeOverviewOthersSectionAdapter(lifecycle);
-
- Object[] lifecycleNodes = contentProvider.getElements(lifecycle);
- for (int i = 0, n = lifecycleNodes.length; i < n; i++) {
- removeOverviewOthersSectionAdapter((EObject) lifecycleNodes[i]);
- }
-
- }
-
- }
-
- class OverviewOthersSectionAdapter extends AdapterImpl {
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.emf.common.notify.impl.AdapterImpl#isAdapterForType(java.lang.Object)
- */
- public boolean isAdapterForType(Object type) {
- if (type == OverviewOthersSection.class)
- return true;
- return false;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.emf.common.notify.impl.AdapterImpl#notifyChanged(org.eclipse.emf.common.notify.Notification)
- */
- public void notifyChanged(Notification msg) {
- if (msg.getFeature() == FacesConfigPackage.eINSTANCE
- .getFacesConfigType_Application()
- || msg.getFeature() == FacesConfigPackage.eINSTANCE
- .getFacesConfigType_Factory()
- || msg.getFeature() == FacesConfigPackage.eINSTANCE
- .getFacesConfigType_Lifecycle()
- || msg.getNotifier() instanceof ApplicationType
- || msg.getNotifier() instanceof FactoryType
- || msg.getNotifier() instanceof LifecycleType) {
-
- if (msg.getEventType() == Notification.ADD) {
- EObject newObject = (EObject) msg.getNewValue();
- if (newObject != null) {
- addOverviewOthersSectionAdapter(newObject);
- }
- }
-
- if (msg.getEventType() == Notification.ADD
- || msg.getEventType() == Notification.REMOVE
- || msg.getEventType() == Notification.SET) {
-
- if (Thread.currentThread() == PlatformUI.getWorkbench().getDisplay().getThread()) {
- refreshAll();
- } else {
- PlatformUI.getWorkbench().getDisplay().asyncExec(new Runnable() {
- public void run() {
- refreshAll();
- }
- });
- }
- }
- }
- }
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/PropertySection.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/PropertySection.java
deleted file mode 100644
index e3ca1a1..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/PropertySection.java
+++ /dev/null
@@ -1,505 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui.section;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.Assert;
-import org.eclipse.emf.common.command.Command;
-import org.eclipse.emf.common.command.CompoundCommand;
-import org.eclipse.emf.edit.command.AddCommand;
-import org.eclipse.emf.edit.command.RemoveCommand;
-import org.eclipse.emf.edit.command.SetCommand;
-import org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider;
-import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.viewers.ColumnWeightData;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.TableLayout;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerFilter;
-import org.eclipse.jst.jsf.facesconfig.emf.DefaultValueType;
-import org.eclipse.jst.jsf.facesconfig.emf.FacesConfigFactory;
-import org.eclipse.jst.jsf.facesconfig.emf.FacesConfigPackage;
-import org.eclipse.jst.jsf.facesconfig.emf.PropertyClassType;
-import org.eclipse.jst.jsf.facesconfig.emf.PropertyNameType;
-import org.eclipse.jst.jsf.facesconfig.emf.PropertyType;
-import org.eclipse.jst.jsf.facesconfig.emf.SuggestedValueType;
-import org.eclipse.jst.jsf.facesconfig.ui.EditorPlugin;
-import org.eclipse.jst.jsf.facesconfig.ui.EditorMessages;
-import org.eclipse.jst.jsf.facesconfig.ui.dialog.AddEditPropertyDialog;
-import org.eclipse.jst.jsf.facesconfig.ui.page.IFacesConfigPage;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.MouseAdapter;
-import org.eclipse.swt.events.MouseEvent;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.TableColumn;
-import org.eclipse.ui.forms.IManagedForm;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-
-/**
- * Section for properties
- *
- */
-public class PropertySection extends AbstractFacesConfigSection {
-
- private static final int TABLE_DEFAULT_HEIGHT = 160;
-
- private TableViewer tableViewer;
-
- private Button removeButton;
-
- private Button editButton;
-
- /**
- *
- * @param parent
- * @param managedForm
- * @param page
- * @param toolkit
- */
- public PropertySection(Composite parent, IManagedForm managedForm,
- IFacesConfigPage page, FormToolkit toolkit) {
- super(parent, managedForm, page, toolkit, null, null);
- this.getSection().setText(EditorMessages.PropertySection_Name);
- this.getSection().setDescription(
- EditorMessages.PropertySection_Description);
-
- }
-
- /**
- * @param container
- * @param toolkit
- */
- protected void createContents(Composite container, FormToolkit toolkit) {
- GridLayout gl = new GridLayout();
- gl.horizontalSpacing = 0;
- gl.marginWidth = 0;
- gl.numColumns = 2;
- container.setLayout(gl);
- GridData td = new GridData(GridData.FILL_BOTH);
- container.setLayoutData(td);
-
- toolkit.paintBordersFor(container);
-
- Composite propertySection = toolkit.createComposite(container);
- GridLayout gl2 = new GridLayout();
- gl2.horizontalSpacing = 0;
- gl2.verticalSpacing = 0;
- gl2.marginWidth = 0;
- gl2.marginHeight = 0;
- gl2.numColumns = 2;
- propertySection.setLayout(gl2);
- GridData gd = new GridData(GridData.FILL_BOTH
- | GridData.VERTICAL_ALIGN_BEGINNING);
- propertySection.setLayoutData(gd);
-
- createTableSection(propertySection, toolkit);
- createButtonsSection(propertySection, toolkit);
-
- }
-
- /**
- * create table section
- *
- * @param container
- * @param toolkit
- */
- private void createTableSection(Composite container, FormToolkit toolkit) {
- Composite tableContainer = toolkit.createComposite(container);
- GridData gd = new GridData(GridData.FILL_BOTH
- | GridData.GRAB_HORIZONTAL);
- tableContainer.setLayoutData(gd);
- toolkit.paintBordersFor(tableContainer);
-
- GridLayout gl = new GridLayout();
- tableContainer.setLayout(gl);
-
- Table table = new Table(tableContainer, SWT.H_SCROLL | SWT.V_SCROLL
- | SWT.FULL_SELECTION | SWT.BORDER);
- gd = new GridData(GridData.FILL_BOTH);
- gd.horizontalSpan = 1;
- gd.heightHint = TABLE_DEFAULT_HEIGHT;
- table.setLayoutData(gd);
-
- table.setHeaderVisible(true);
- table.setLinesVisible(true);
- TableLayout layout = new TableLayout();
- table.setLayout(layout);
-
- TableColumn nameCol = new TableColumn(table, SWT.NONE);
- layout.addColumnData(new ColumnWeightData(1, true));
- nameCol.setText(EditorMessages.PropertySection_Table_NameColumn);
-
- TableColumn classCol = new TableColumn(table, SWT.NONE);
- layout.addColumnData(new ColumnWeightData(1, true));
- classCol
- .setText(EditorMessages.PropertySection_Table_ClassColumn);
-
- TableColumn valueCol = new TableColumn(table, SWT.NONE);
- layout.addColumnData(new ColumnWeightData(1, true));
- valueCol
- .setText(EditorMessages.PropertySection_Table_DefaultValueColumn);
-
- TableColumn suggestedValueCol = new TableColumn(table, SWT.NONE);
- layout.addColumnData(new ColumnWeightData(1, true));
- suggestedValueCol
- .setText(EditorMessages.PropertySection_Table_SuggestedValueColumn);
-
- table.addSelectionListener(new SelectionAdapter() {
- public void widgetSelected(SelectionEvent e) {
- updateButtons();
- }
- });
-
- table.addMouseListener(new MouseAdapter() {
- public void mouseDoubleClick(MouseEvent e) {
- if (((IStructuredSelection) tableViewer.getSelection()).size() > 0)
- editButtonSelected();
- }
- });
-
- tableViewer = new TableViewer(table);
- tableViewer.setContentProvider(new AdapterFactoryContentProvider(
- getAdapterFactory()));
- tableViewer.setLabelProvider(new AdapterFactoryLabelProvider(
- getAdapterFactory()));
-
- tableViewer.addFilter(new ViewerFilter() {
- public boolean select(Viewer viewer, Object parentElement,
- Object element) {
- return FacesConfigPackage.eINSTANCE.getPropertyType()
- .isInstance(element);
- }
- });
- tableViewer.addSelectionChangedListener(this);
- }
-
- /**
- * Update the buttons' enable and disable status
- */
- private void updateButtons() {
- if (((IStructuredSelection) tableViewer.getSelection()).size() > 0) {
- editButton.setEnabled(true);
- removeButton.setEnabled(true);
- } else {
- editButton.setEnabled(false);
- removeButton.setEnabled(false);
- }
- }
-
- /**
- * create property's editing buttons
- *
- * @param container
- * @param toolkit
- */
- private void createButtonsSection(Composite container, FormToolkit toolkit) {
- // create operation buttons's container
- Composite operationContainer = toolkit.createComposite(container);
- GridData gd = new GridData(GridData.FILL_VERTICAL
- | GridData.VERTICAL_ALIGN_BEGINNING);
- operationContainer.setLayoutData(gd);
- GridLayout gl = new GridLayout();
- operationContainer.setLayout(gl);
-
- Button addButton = toolkit.createButton(operationContainer,
- EditorMessages.UI_Button_Add_more,
- SWT.PUSH);
- gd = new GridData(GridData.FILL_HORIZONTAL
- | GridData.VERTICAL_ALIGN_BEGINNING);
- gd.grabExcessHorizontalSpace = false;
- addButton.setLayoutData(gd);
-
- editButton = toolkit.createButton(operationContainer,
- EditorMessages.UI_Button_Edit_more,
- SWT.PUSH);
- gd = new GridData(GridData.FILL_HORIZONTAL
- | GridData.VERTICAL_ALIGN_BEGINNING);
- gd.grabExcessHorizontalSpace = false;
- editButton.setLayoutData(gd);
-
- removeButton = toolkit.createButton(operationContainer,
- EditorMessages.UI_Button_Remove,
- SWT.PUSH);
- gd = new GridData(GridData.FILL_HORIZONTAL
- | GridData.VERTICAL_ALIGN_BEGINNING);
- gd.grabExcessHorizontalSpace = false;
- removeButton.setLayoutData(gd);
-
- addButton.addSelectionListener(new SelectionAdapter() {
-
- public void widgetSelected(SelectionEvent e) {
- addButtonSelected();
- }
-
- });
-
- editButton.addSelectionListener(new SelectionAdapter() {
-
- public void widgetSelected(SelectionEvent e) {
- editButtonSelected();
- }
-
- });
- removeButton.addSelectionListener(new SelectionAdapter() {
-
- public void widgetSelected(SelectionEvent e) {
- removeButtonSelected();
- }
-
- });
- }
-
- /**
- * refresh the table viewer and update buttons.
- */
- public void refresh() {
- super.refresh();
- tableViewer.refresh();
- updateButtons();
- }
-
- /**
- *
- */
- public void refreshAll() {
- tableViewer.setInput(getInput());
- updateButtons();
-
- }
-
- /**
- * add a property.
- *
- */
- private void addButtonSelected() {
-
- Shell shell = EditorPlugin.getActiveShell();
-
- AddEditPropertyDialog dialog = new AddEditPropertyDialog(shell, true);
- dialog.setProject((IProject) getPage().getEditor().getAdapter(
- IProject.class));
- if (dialog.open() == Dialog.OK) {
-
- PropertyType newProperty = FacesConfigFactory.eINSTANCE
- .createPropertyType();
-
- if (dialog.getPropertyName().length() > 0) {
- PropertyNameType propertyNameType = FacesConfigFactory.eINSTANCE
- .createPropertyNameType();
- propertyNameType.setTextContent(dialog.getPropertyName());
- newProperty.setPropertyName(propertyNameType);
- }
-
- if (dialog.getPropertyClass().length() > 0) {
- PropertyClassType propertyClassType = FacesConfigFactory.eINSTANCE
- .createPropertyClassType();
- propertyClassType.setTextContent(dialog.getPropertyClass());
- newProperty.setPropertyClass(propertyClassType);
- }
-
- if (dialog.getDefaultValue().length() > 0) {
- DefaultValueType defaultValueType = FacesConfigFactory.eINSTANCE
- .createDefaultValueType();
- defaultValueType.setTextContent(dialog.getDefaultValue());
- newProperty.setDefaultValue(defaultValueType);
- }
-
- if (dialog.getSuggestedValue().length() > 0) {
- SuggestedValueType suggestedValueType = FacesConfigFactory.eINSTANCE
- .createSuggestedValueType();
- suggestedValueType.setTextContent(dialog.getSuggestedValue());
- newProperty.setSuggestedValue(suggestedValueType);
- }
-
- Command addCommand = AddCommand.create(this.getEditingDomain(),
- getInput(), null, newProperty);
- if (addCommand.canExecute()) {
- this.getEditingDomain().getCommandStack().execute(addCommand);
-
- }
- }
-
- }
-
- /**
- * edit a property.
- *
- */
- private void editButtonSelected() {
-
- PropertyType property = (PropertyType) ((IStructuredSelection) tableViewer
- .getSelection()).getFirstElement();
-
- Assert.isNotNull(property);
-
- Shell shell = EditorPlugin.getActiveShell();
-
- AddEditPropertyDialog dialog = new AddEditPropertyDialog(shell, false);
- dialog.setProject((IProject) getPage().getEditor().getAdapter(
- IProject.class));
- if (property.getPropertyName() != null) {
- dialog.setPropertyName(property.getPropertyName().getTextContent());
- }
-
- if (property.getPropertyClass() != null) {
- dialog.setPropertyClass(property.getPropertyClass()
- .getTextContent());
- }
-
- if (property.getDefaultValue() != null) {
- dialog.setDefaultValue(property.getDefaultValue().getTextContent());
- }
-
- if (property.getSuggestedValue() != null) {
- dialog.setSuggestedValue(property.getSuggestedValue()
- .getTextContent());
- }
-
- if (dialog.open() == Dialog.OK) {
- List commands = new ArrayList(4);
-
- if (property.getPropertyName() != null) {
- Command cmd1 = SetCommand.create(this.getEditingDomain(),
- property.getPropertyName(),
- FacesConfigPackage.eINSTANCE
- .getPropertyNameType_TextContent(), dialog
- .getPropertyName());
- commands.add(cmd1);
- } else if (dialog.getPropertyName().length() > 0) {
- PropertyNameType propertyNameType = FacesConfigFactory.eINSTANCE
- .createPropertyNameType();
- propertyNameType.setTextContent(dialog.getPropertyName());
-
- Command cmd2 = AddCommand.create(this.getEditingDomain(),
- property, FacesConfigPackage.eINSTANCE
- .getPropertyType_PropertyName(),
- propertyNameType);
- commands.add(cmd2);
- }
-
- if (property.getPropertyClass() != null) {
- Command cmd3 = SetCommand.create(this.getEditingDomain(),
- property.getPropertyClass(),
- FacesConfigPackage.eINSTANCE
- .getPropertyClassType_TextContent(), dialog
- .getPropertyClass());
- commands.add(cmd3);
- } else if (dialog.getPropertyClass().length() > 0) {
- PropertyClassType propertyClassType = FacesConfigFactory.eINSTANCE
- .createPropertyClassType();
- propertyClassType.setTextContent(dialog.getPropertyClass());
-
- Command cmd4 = AddCommand.create(this.getEditingDomain(),
- property, FacesConfigPackage.eINSTANCE
- .getPropertyType_PropertyClass(),
- propertyClassType);
- commands.add(cmd4);
- }
-
- if (property.getDefaultValue() != null) {
- Command cmd5 = SetCommand.create(this.getEditingDomain(),
- property.getDefaultValue(),
- FacesConfigPackage.eINSTANCE
- .getDefaultValueType_TextContent(), dialog
- .getDefaultValue());
- commands.add(cmd5);
-
- } else if (dialog.getDefaultValue().length() > 0) {
- DefaultValueType defaultValueType = FacesConfigFactory.eINSTANCE
- .createDefaultValueType();
- defaultValueType.setTextContent(dialog.getDefaultValue());
- Command cmd6 = AddCommand.create(this.getEditingDomain(),
- property, FacesConfigPackage.eINSTANCE
- .getPropertyType_DefaultValue(),
- defaultValueType);
- commands.add(cmd6);
- }
-
- if (property.getSuggestedValue() != null) {
- Command cmd7 = SetCommand.create(this.getEditingDomain(),
- property.getSuggestedValue(),
- FacesConfigPackage.eINSTANCE
- .getSuggestedValueType_TextContent(), dialog
- .getSuggestedValue());
- commands.add(cmd7);
- } else if (dialog.getSuggestedValue().length() > 0) {
- SuggestedValueType suggestedValueType = FacesConfigFactory.eINSTANCE
- .createSuggestedValueType();
- suggestedValueType.setTextContent(dialog.getSuggestedValue());
- Command cmd8 = AddCommand.create(this.getEditingDomain(),
- property, FacesConfigPackage.eINSTANCE
- .getPropertyType_SuggestedValue(),
- suggestedValueType);
- commands.add(cmd8);
- }
-
- CompoundCommand command = new CompoundCommand(commands);
- if (command.canExecute()) {
- this.getEditingDomain().getCommandStack().execute(command);
- tableViewer.refresh(property);
-
- }
- }
-
- }
-
- /**
- * remove a property.
- *
- */
- private void removeButtonSelected() {
- PropertyType property = (PropertyType) ((IStructuredSelection) tableViewer
- .getSelection()).getFirstElement();
-
- Assert.isNotNull(property);
-
- Command removeCommand = RemoveCommand.create(this.getEditingDomain(),
- getInput(), null, property);
-
- if (removeCommand.canExecute()) {
- this.getEditingDomain().getCommandStack().execute(removeCommand);
- refreshAll();
- }
-
- }
-
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.viewers.ISelectionProvider#getSelection()
- */
- public ISelection getSelection() {
- return tableViewer.getSelection();
- }
-
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.viewers.ISelectionProvider#setSelection(org.eclipse.jface.viewers.ISelection)
- */
- public void setSelection(ISelection selection) {
-
- tableViewer.setSelection(selection);
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/RendererSection.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/RendererSection.java
deleted file mode 100644
index 0d16483..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/RendererSection.java
+++ /dev/null
@@ -1,531 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui.section;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.Assert;
-import org.eclipse.emf.common.command.Command;
-import org.eclipse.emf.common.command.CompoundCommand;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.edit.command.AddCommand;
-import org.eclipse.emf.edit.command.RemoveCommand;
-import org.eclipse.emf.edit.command.SetCommand;
-import org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider;
-import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.viewers.ColumnWeightData;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.TableLayout;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerFilter;
-import org.eclipse.jst.jsf.facesconfig.emf.ComponentFamilyType;
-import org.eclipse.jst.jsf.facesconfig.emf.DisplayNameType;
-import org.eclipse.jst.jsf.facesconfig.emf.FacesConfigFactory;
-import org.eclipse.jst.jsf.facesconfig.emf.FacesConfigPackage;
-import org.eclipse.jst.jsf.facesconfig.emf.RenderKitType;
-import org.eclipse.jst.jsf.facesconfig.emf.RendererClassType;
-import org.eclipse.jst.jsf.facesconfig.emf.RendererType;
-import org.eclipse.jst.jsf.facesconfig.emf.RendererTypeType;
-import org.eclipse.jst.jsf.facesconfig.ui.EditorPlugin;
-import org.eclipse.jst.jsf.facesconfig.ui.EditorMessages;
-import org.eclipse.jst.jsf.facesconfig.ui.dialog.AddEditRendererDialog;
-import org.eclipse.jst.jsf.facesconfig.ui.page.IFacesConfigPage;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.MouseAdapter;
-import org.eclipse.swt.events.MouseEvent;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.TableColumn;
-import org.eclipse.ui.forms.IManagedForm;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-
-/**
- * @author Bryan Yang
- *
- */
-public class RendererSection extends AbstractFacesConfigSection {
-
- private static final int TABLE_DEFAULT_HEIGHT = 160;
-
- private TableViewer tableViewer;
-
- private Button removeButton;
-
- private Button editButton;
-
- /**
- *
- * @param parent
- * @param managedForm
- * @param page
- * @param toolkit
- */
- public RendererSection(Composite parent, IManagedForm managedForm,
- IFacesConfigPage page, FormToolkit toolkit) {
- super(parent, managedForm, page, toolkit, null, null);
- this.getSection().setText(EditorMessages.RendererSection_Name);
- this.getSection().setDescription(
- EditorMessages.RendererSection_Description);
-
- }
-
- /**
- *
- */
- protected void createContents(Composite container, FormToolkit toolkit) {
- GridLayout gl = new GridLayout();
- gl.horizontalSpacing = 0;
- gl.marginWidth = 0;
- gl.numColumns = 2;
- container.setLayout(gl);
- GridData td = new GridData(GridData.FILL_BOTH);
- container.setLayoutData(td);
-
- toolkit.paintBordersFor(container);
-
- Composite RendererSection = toolkit.createComposite(container);
- GridLayout gl2 = new GridLayout();
- gl2.horizontalSpacing = 0;
- gl2.verticalSpacing = 0;
- gl2.marginWidth = 0;
- gl2.marginHeight = 0;
- gl2.numColumns = 2;
- RendererSection.setLayout(gl2);
- GridData gd = new GridData(GridData.FILL_BOTH
- | GridData.VERTICAL_ALIGN_BEGINNING);
- RendererSection.setLayoutData(gd);
-
- createTableSection(RendererSection, toolkit);
- createButtonsSection(RendererSection, toolkit);
-
- }
-
- /**
- * create table section
- *
- * @param container
- * @param toolkit
- */
- private void createTableSection(Composite container, FormToolkit toolkit) {
- Composite tableContainer = toolkit.createComposite(container);
- GridData gd = new GridData(GridData.FILL_BOTH
- | GridData.GRAB_HORIZONTAL);
- tableContainer.setLayoutData(gd);
- toolkit.paintBordersFor(tableContainer);
-
- GridLayout gl = new GridLayout();
- tableContainer.setLayout(gl);
-
- Table table = new Table(tableContainer, SWT.H_SCROLL | SWT.V_SCROLL
- | SWT.FULL_SELECTION | SWT.BORDER);
- gd = new GridData(GridData.FILL_BOTH);
- gd.horizontalSpan = 1;
- gd.heightHint = TABLE_DEFAULT_HEIGHT;
- table.setLayoutData(gd);
-
- table.setHeaderVisible(true);
- table.setLinesVisible(true);
- TableLayout layout = new TableLayout();
- table.setLayout(layout);
-
- TableColumn nameCol = new TableColumn(table, SWT.NONE);
- layout.addColumnData(new ColumnWeightData(1, true));
- nameCol.setText(EditorMessages.RendererSection_Table_NameColumn);
-
- TableColumn valueCol = new TableColumn(table, SWT.NONE);
- layout.addColumnData(new ColumnWeightData(1, true));
- valueCol
- .setText(EditorMessages.RendererSection_Table_ComponentFamilyColumn);
-
- TableColumn suggestedValueCol = new TableColumn(table, SWT.NONE);
- layout.addColumnData(new ColumnWeightData(1, true));
- suggestedValueCol
- .setText(EditorMessages.RendererSection_Table_TypeColumn);
-
- TableColumn classCol = new TableColumn(table, SWT.NONE);
- layout.addColumnData(new ColumnWeightData(1, true));
- classCol.setText(EditorMessages.RendererSection_Table_ClassColumn);
-
- table.addSelectionListener(new SelectionAdapter() {
- public void widgetSelected(SelectionEvent e) {
- updateButtons();
- }
- });
-
- table.addMouseListener(new MouseAdapter() {
- public void mouseDoubleClick(MouseEvent e) {
- if (((IStructuredSelection) tableViewer.getSelection()).size() > 0)
- editButtonSelected();
- }
- });
-
- tableViewer = new TableViewer(table);
- tableViewer.setContentProvider(new AdapterFactoryContentProvider(
- getAdapterFactory()));
- tableViewer.setLabelProvider(new AdapterFactoryLabelProvider(
- getAdapterFactory()));
-
- tableViewer.addFilter(new ViewerFilter() {
- public boolean select(Viewer viewer, Object parentElement,
- Object element) {
- return FacesConfigPackage.eINSTANCE.getRendererType()
- .isInstance(element);
- }
- });
-
- tableViewer.addSelectionChangedListener(this);
- }
-
- /**
- * Update the buttons' enable and disable status
- */
- private void updateButtons() {
- if (((IStructuredSelection) tableViewer.getSelection()).size() > 0) {
- editButton.setEnabled(true);
- removeButton.setEnabled(true);
- } else {
- editButton.setEnabled(false);
- removeButton.setEnabled(false);
- }
- }
-
- /**
- * create buttons
- *
- * @param container
- * @param toolkit
- */
- private void createButtonsSection(Composite container, FormToolkit toolkit) {
- // create operation buttons's container
- Composite operationContainer = toolkit.createComposite(container);
- GridData gd = new GridData(GridData.FILL_VERTICAL
- | GridData.VERTICAL_ALIGN_BEGINNING);
- operationContainer.setLayoutData(gd);
- GridLayout gl = new GridLayout();
- operationContainer.setLayout(gl);
-
- Button addButton = toolkit.createButton(operationContainer,
- EditorMessages.UI_Button_Add_more,
- SWT.PUSH);
- gd = new GridData(GridData.FILL_HORIZONTAL
- | GridData.VERTICAL_ALIGN_BEGINNING);
- gd.grabExcessHorizontalSpace = false;
- addButton.setLayoutData(gd);
-
- editButton = toolkit.createButton(operationContainer,
- EditorMessages.UI_Button_Edit_more,
- SWT.PUSH);
- gd = new GridData(GridData.FILL_HORIZONTAL
- | GridData.VERTICAL_ALIGN_BEGINNING);
- gd.grabExcessHorizontalSpace = false;
- editButton.setLayoutData(gd);
-
- removeButton = toolkit.createButton(operationContainer,
- EditorMessages.UI_Button_Remove,
- SWT.PUSH);
- gd = new GridData(GridData.FILL_HORIZONTAL
- | GridData.VERTICAL_ALIGN_BEGINNING);
- gd.grabExcessHorizontalSpace = false;
- removeButton.setLayoutData(gd);
-
- addButton.addSelectionListener(new SelectionAdapter() {
-
- public void widgetSelected(SelectionEvent e) {
- addButtonSelected();
- }
-
- });
-
- editButton.addSelectionListener(new SelectionAdapter() {
-
- public void widgetSelected(SelectionEvent e) {
- editButtonSelected();
- }
-
- });
- removeButton.addSelectionListener(new SelectionAdapter() {
-
- public void widgetSelected(SelectionEvent e) {
- removeButtonSelected();
- }
-
- });
- }
-
- /**
- *
- * @return
- */
- private EReference getEReference() {
- EReference reference = null;
- if (getInput() instanceof RenderKitType) {
- reference = FacesConfigPackage.eINSTANCE
- .getRenderKitType_Renderer();
- }
- return reference;
- }
-
-
- /**
- *
- */
- public void refreshAll() {
- tableViewer.setInput(getInput());
- updateButtons();
-
- }
-
- /**
- *
- */
- public void refresh() {
- super.refresh();
- tableViewer.refresh();
- updateButtons();
- }
-
- /**
- * add an Renderer.
- *
- */
- private void addButtonSelected() {
- Shell shell = EditorPlugin.getActiveShell();
-
- AddEditRendererDialog dialog = new AddEditRendererDialog(shell, this
- .getPage(), true);
- dialog.setProject((IProject) getPage().getEditor().getAdapter(
- IProject.class));
- if (dialog.open() == Dialog.OK) {
-
- // RendererType newRenderer = dialog.getResult();
- RendererType newRenderer = FacesConfigFactory.eINSTANCE
- .createRendererType();
-
- if (dialog.getRendererName().length() > 0) {
- DisplayNameType diaplayName = FacesConfigFactory.eINSTANCE
- .createDisplayNameType();
- diaplayName.setTextContent(dialog.getRendererName());
- newRenderer.getDisplayName().add(diaplayName);
- }
-
- if (dialog.getRendererClass().length() > 0) {
- RendererClassType RendererClassType = FacesConfigFactory.eINSTANCE
- .createRendererClassType();
- RendererClassType.setTextContent(dialog.getRendererClass());
- newRenderer.setRendererClass(RendererClassType);
- }
-
- if (dialog.getComponentFamily().length() > 0) {
- ComponentFamilyType componentFamilyType = FacesConfigFactory.eINSTANCE
- .createComponentFamilyType();
- componentFamilyType.setTextContent(dialog.getComponentFamily());
- newRenderer.setComponentFamily(componentFamilyType);
- }
-
- if (dialog.getRendererType().length() > 0) {
- RendererTypeType rendererType = FacesConfigFactory.eINSTANCE
- .createRendererTypeType();
- rendererType.setTextContent(dialog.getRendererType());
- newRenderer.setRendererType(rendererType);
- }
-
- Command addCommand = AddCommand.create(this.getEditingDomain(),
- getInput(), getEReference(), newRenderer);
- if (addCommand.canExecute()) {
- this.getEditingDomain().getCommandStack().execute(addCommand);
-
- }
- }
-
- }
-
- /**
- * edit an Renderer.
- *
- */
- private void editButtonSelected() {
-
- RendererType renderer = (RendererType) ((IStructuredSelection) tableViewer
- .getSelection()).getFirstElement();
-
- Assert.isNotNull(renderer);
-
- Shell shell = EditorPlugin.getActiveShell();
-
- AddEditRendererDialog dialog = new AddEditRendererDialog(shell, this
- .getPage(), false);
- dialog.setProject((IProject) getPage().getEditor().getAdapter(
- IProject.class));
- if (renderer.getDisplayName() != null
- && renderer.getDisplayName().size() > 0) {
- String name = ((DisplayNameType) (renderer.getDisplayName().get(0)))
- .getTextContent();
- if (name == null) {
- name = ""; //$NON-NLS-1$
- }
- dialog.setRendererName(name);
- }
-
- if (renderer.getRendererClass() != null) {
- dialog.setRendererClass(renderer.getRendererClass()
- .getTextContent());
- }
-
- if (renderer.getComponentFamily() != null) {
- dialog.setComponentFamily(renderer.getComponentFamily()
- .getTextContent());
- }
-
- if (renderer.getRendererType() != null) {
- dialog.setRendererType(renderer.getRendererType().getTextContent());
- }
-
- if (dialog.open() == Dialog.OK) {
- List commands = new ArrayList(4);
-
- if (renderer.getDisplayName() != null
- && renderer.getDisplayName().size() > 0) {
- DisplayNameType diaplayName = FacesConfigFactory.eINSTANCE
- .createDisplayNameType();
- diaplayName.setTextContent(dialog.getRendererName());
-
- Command cmd1 = SetCommand.create(this.getEditingDomain(),
- renderer.getDisplayName().get(0),
- FacesConfigPackage.eINSTANCE
- .getRendererType_DisplayName(), diaplayName);
- commands.add(cmd1);
- } else if (dialog.getRendererName().length() > 0) {
- DisplayNameType displayName = FacesConfigFactory.eINSTANCE
- .createDisplayNameType();
- displayName.setTextContent(dialog.getRendererName());
-
- EList dl = renderer.getDisplayName();
- dl.add(displayName);
- Command cmd2 = AddCommand.create(this.getEditingDomain(),
- renderer.getDisplayName(), FacesConfigPackage.eINSTANCE
- .getRendererType_DisplayName(), dl);
- commands.add(cmd2);
- }
-
- if (renderer.getRendererClass() != null) {
- Command cmd3 = SetCommand.create(this.getEditingDomain(),
- renderer.getRendererClass(),
- FacesConfigPackage.eINSTANCE
- .getRendererClassType_TextContent(), dialog
- .getRendererClass());
- commands.add(cmd3);
- } else if (dialog.getRendererClass().length() > 0) {
- RendererClassType RendererClassType = FacesConfigFactory.eINSTANCE
- .createRendererClassType();
- RendererClassType.setTextContent(dialog.getRendererClass());
-
- Command cmd4 = AddCommand.create(this.getEditingDomain(),
- renderer, FacesConfigPackage.eINSTANCE
- .getRendererType_RendererClass(),
- RendererClassType);
- commands.add(cmd4);
- }
-
- if (renderer.getComponentFamily() != null) {
- Command cmd5 = SetCommand.create(this.getEditingDomain(),
- renderer.getComponentFamily(),
- FacesConfigPackage.eINSTANCE
- .getDefaultValueType_TextContent(), dialog
- .getComponentFamily());
- commands.add(cmd5);
-
- } else if (dialog.getComponentFamily().length() > 0) {
- ComponentFamilyType componentFamily = FacesConfigFactory.eINSTANCE
- .createComponentFamilyType();
- componentFamily.setTextContent(dialog.getComponentFamily());
- Command cmd6 = AddCommand.create(this.getEditingDomain(),
- renderer, FacesConfigPackage.eINSTANCE
- .getRendererType_ComponentFamily(),
- componentFamily);
- commands.add(cmd6);
- }
-
- if (renderer.getRendererType() != null) {
- Command cmd7 = SetCommand.create(this.getEditingDomain(),
- renderer.getRendererType(),
- FacesConfigPackage.eINSTANCE
- .getSuggestedValueType_TextContent(), dialog
- .getRendererType());
- commands.add(cmd7);
- } else if (dialog.getRendererType().length() > 0) {
- RendererTypeType rendererType = FacesConfigFactory.eINSTANCE
- .createRendererTypeType();
- rendererType.setTextContent(dialog.getRendererType());
- Command cmd8 = AddCommand.create(this.getEditingDomain(),
- renderer, FacesConfigPackage.eINSTANCE
- .getRendererType_RendererType(), rendererType);
- commands.add(cmd8);
- }
-
- CompoundCommand command = new CompoundCommand(commands);
- if (command.canExecute()) {
- this.getEditingDomain().getCommandStack().execute(command);
- tableViewer.refresh(renderer);
-
- }
- }
-
- }
-
- /**
- * remove an Renderer.
- *
- */
- private void removeButtonSelected() {
- RendererType Renderer = (RendererType) ((IStructuredSelection) tableViewer
- .getSelection()).getFirstElement();
-
- Assert.isNotNull(Renderer);
-
- Command removeCommand = RemoveCommand.create(this.getEditingDomain(),
- getInput(), getEReference(), Renderer);
-
- if (removeCommand.canExecute()) {
- this.getEditingDomain().getCommandStack().execute(removeCommand);
- refreshAll();
- }
-
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.viewers.ISelectionProvider#getSelection()
- */
- public ISelection getSelection() {
- return tableViewer.getSelection();
- }
-
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.viewers.ISelectionProvider#setSelection(org.eclipse.jface.viewers.ISelection)
- */
- public void setSelection(ISelection selection) {
-
- tableViewer.setSelection(selection);
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/RenderkitGeneralSection.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/RenderkitGeneralSection.java
deleted file mode 100644
index 58e83e7..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/RenderkitGeneralSection.java
+++ /dev/null
@@ -1,416 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui.section;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.emf.common.command.Command;
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.impl.AdapterImpl;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.emf.edit.command.AddCommand;
-import org.eclipse.emf.edit.command.SetCommand;
-import org.eclipse.emf.edit.domain.EditingDomain;
-import org.eclipse.jst.jsf.common.ui.internal.dialogfield.ClassButtonDialogField;
-import org.eclipse.jst.jsf.common.ui.internal.dialogfield.DialogField;
-import org.eclipse.jst.jsf.common.ui.internal.dialogfield.IDialogFieldApplyListener;
-import org.eclipse.jst.jsf.common.ui.internal.dialogfield.LayoutUtil;
-import org.eclipse.jst.jsf.common.ui.internal.dialogfield.StringDialogField;
-import org.eclipse.jst.jsf.facesconfig.emf.DescriptionType;
-import org.eclipse.jst.jsf.facesconfig.emf.DisplayNameType;
-import org.eclipse.jst.jsf.facesconfig.emf.FacesConfigFactory;
-import org.eclipse.jst.jsf.facesconfig.emf.FacesConfigPackage;
-import org.eclipse.jst.jsf.facesconfig.emf.RenderKitClassType;
-import org.eclipse.jst.jsf.facesconfig.emf.RenderKitIdType;
-import org.eclipse.jst.jsf.facesconfig.emf.RenderKitType;
-import org.eclipse.jst.jsf.facesconfig.ui.EditorMessages;
-import org.eclipse.jst.jsf.facesconfig.ui.IFacesConfigConstants;
-import org.eclipse.jst.jsf.facesconfig.ui.page.IFacesConfigPage;
-import org.eclipse.jst.jsf.facesconfig.ui.util.ModelUtil;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.forms.IManagedForm;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-
-/**
- * @author Bryan Yang
- *
- */
-public class RenderkitGeneralSection extends AbstractFacesConfigSection {
-
- private StringDialogField displayNameField;
-
- private StringDialogField descriptionField;
-
- private StringDialogField renderkitIdField;
-
- private ClassButtonDialogField renderkitClassField;
-
- private RenderKitGeneralAdapter renderKitGeneralAdapter;
-
- /**
- *
- * @param parent
- * @param managedForm
- * @param page
- * @param toolkit
- */
- public RenderkitGeneralSection(Composite parent, IManagedForm managedForm,
- IFacesConfigPage page, FormToolkit toolkit) {
- super(parent, managedForm, page, toolkit, null, null);
- getSection()
- .setText(EditorMessages.RenderKitGeneralSection_Name);
- getSection().setDescription(
- EditorMessages.RenderKitGeneralSection_Description);
- }
-
- /**
- *
- */
- protected void createContents(Composite container, FormToolkit toolkit) {
- int numberOfColumns = 4;
- GridLayout layout = new GridLayout(numberOfColumns, false);
- container.setLayout(layout);
- GridData td = new GridData(GridData.FILL_HORIZONTAL);
- container.setLayoutData(td);
-
- toolkit.paintBordersFor(container);
- displayNameField = new StringDialogField();
- displayNameField
- .setLabelText(EditorMessages.RenderKitGeneralSection_Label_DisplayName);
- displayNameField.doFillIntoGrid(toolkit, container, numberOfColumns);
-
- displayNameField
- .setDialogFieldApplyListener(new IDialogFieldApplyListener() {
-
- public void dialogFieldApplied(DialogField field) {
- String newDisplayNameValue = ((StringDialogField) field)
- .getText().trim();
- Command cmd = null;
- RenderKitType Renderkit = (RenderKitType) getInput();
- EditingDomain editingDomain = getEditingDomain();
- if (Renderkit.getDisplayName().size() > 0) {
- DisplayNameType displayName = (DisplayNameType) Renderkit
- .getDisplayName().get(0);
- cmd = SetCommand.create(editingDomain, displayName,
- FacesConfigPackage.eINSTANCE
- .getDisplayNameType_TextContent(),
- newDisplayNameValue);
- } else {
- DisplayNameType displayNameType = FacesConfigFactory.eINSTANCE
- .createDisplayNameType();
- displayNameType.setTextContent(newDisplayNameValue);
- displayNameType.eAdapters().add(
- getRenderKitGeneralAdapter());
-
- cmd = AddCommand.create(editingDomain, Renderkit,
- FacesConfigPackage.eINSTANCE
- .getRenderKitType_DisplayName(),
- displayNameType);
- }
- if (cmd.canExecute()) {
- editingDomain.getCommandStack().execute(cmd);
- }
- }
-
- });
-
- descriptionField = new StringDialogField(2);
- descriptionField
- .setLabelText(EditorMessages.RenderKitGeneralSection_Label_Description);
- descriptionField.doFillIntoGrid(toolkit, container, numberOfColumns);
-
- descriptionField
- .setDialogFieldApplyListener(new IDialogFieldApplyListener() {
- public void dialogFieldApplied(DialogField field) {
- String newDescriptionValue = ((StringDialogField) field)
- .getText().trim();
- newDescriptionValue = ModelUtil
- .escapeEntities(newDescriptionValue);
- Command cmd = null;
- RenderKitType Renderkit = (RenderKitType) getInput();
- EditingDomain editingDomain = getEditingDomain();
- if (Renderkit.getDescription().size() > 0) {
- DescriptionType description = (DescriptionType) Renderkit
- .getDescription().get(0);
- cmd = SetCommand.create(editingDomain, description,
- FacesConfigPackage.eINSTANCE
- .getDescriptionType_TextContent(),
- newDescriptionValue);
- } else {
- DescriptionType description = FacesConfigFactory.eINSTANCE
- .createDescriptionType();
- description.setTextContent(newDescriptionValue);
- description.eAdapters().add(
- getRenderKitGeneralAdapter());
-
- cmd = AddCommand.create(editingDomain, Renderkit,
- FacesConfigPackage.eINSTANCE
- .getRenderKitType_Description(),
- description);
- }
- if (cmd.canExecute()) {
- editingDomain.getCommandStack().execute(cmd);
- }
- }
- });
-
- renderkitIdField = new StringDialogField();
- // renderkitIdField.setRequired(true);
- renderkitIdField
- .setLabelText(EditorMessages.RenderKitGeneralSection_Label_RenderKitID);
- renderkitIdField.doFillIntoGrid(toolkit, container, numberOfColumns);
- renderkitIdField
- .setDialogFieldApplyListener(new IDialogFieldApplyListener() {
- public void dialogFieldApplied(DialogField field) {
- RenderKitIdType RenderkitId = FacesConfigFactory.eINSTANCE
- .createRenderKitIdType();
- RenderkitId.setTextContent(((StringDialogField) field)
- .getText());
-
- EditingDomain editingDomain = getEditingDomain();
- if (editingDomain != null) {
- Command command = SetCommand.create(editingDomain,
- getInput(), FacesConfigPackage.eINSTANCE
- .getRenderKitType_RenderKitId(),
- RenderkitId);
- if (command.canExecute()) {
- editingDomain.getCommandStack()
- .execute(command);
- }
- }
- }
- });
-
- renderkitClassField = new ClassButtonDialogField(null);
- // renderkitClassField.setRequired(true);
- renderkitClassField
- .setLabelText(EditorMessages.RenderKitGeneralSection_Label_RenderKitClass);
- renderkitClassField.doFillIntoGrid(toolkit, container, numberOfColumns);
- renderkitClassField.setProject((IProject) getPage().getEditor()
- .getAdapter(IProject.class));
- LayoutUtil.setHorizontalGrabbing(renderkitClassField.getTextControl(
- toolkit, container));
-
- renderkitClassField
- .setDialogFieldApplyListener(new IDialogFieldApplyListener() {
- public void dialogFieldApplied(DialogField field) {
-
- RenderKitClassType RenderkitClass = FacesConfigFactory.eINSTANCE
- .createRenderKitClassType();
- RenderkitClass
- .setTextContent(((StringDialogField) field)
- .getText());
- EditingDomain editingDomain = getEditingDomain();
- if (editingDomain != null) {
- Command command = SetCommand.create(editingDomain,
- getInput(), FacesConfigPackage.eINSTANCE
- .getRenderKitType_RenderKitClass(),
- RenderkitClass);
- if (command.canExecute()) {
- editingDomain.getCommandStack()
- .execute(command);
- }
- }
-
- }
- });
- renderkitClassField
- .setSuperClassName(IFacesConfigConstants.RENDER_KIT_SUPER_CLASS);
- }
-
- /**
- *
- */
- public void refreshAll() {
- refresh();
- }
-
- /**
- *
- */
- public void refresh() {
- super.refresh();
- Object input = this.getInput();
- if (input instanceof RenderKitType) {
- final RenderKitType renderkit = (RenderKitType) input;
- refreshControls(renderkit);
- }
- }
-
- private void refreshControls(RenderKitType renderkit) {
- if (renderkit.getDisplayName().size() > 0) {
- DisplayNameType displayName = (DisplayNameType) renderkit
- .getDisplayName().get(0);
- displayNameField.setTextWithoutUpdate(displayName
- .getTextContent());
- } else {
- displayNameField.setTextWithoutUpdate(""); //$NON-NLS-1$
- }
-
- if (renderkit.getDescription().size() > 0) {
- DescriptionType description = (DescriptionType) renderkit
- .getDescription().get(0);
- String descriptionString = description.getTextContent();
- descriptionString = ModelUtil
- .unEscapeEntities(descriptionString);
- descriptionField.setTextWithoutUpdate(descriptionString);
- } else {
- descriptionField.setTextWithoutUpdate(""); //$NON-NLS-1$
- }
-
- if (renderkit.getRenderKitId() != null) {
- renderkitIdField.setTextWithoutUpdate(renderkit
- .getRenderKitId().getTextContent());
- } else {
- renderkitIdField.setTextWithoutUpdate(""); //$NON-NLS-1$
- }
-
- if (renderkit.getRenderKitClass() != null) {
- renderkitClassField.setTextWithoutUpdate(renderkit
- .getRenderKitClass().getTextContent());
- } else {
- renderkitClassField.setTextWithoutUpdate(""); //$NON-NLS-1$
- }
-
- }
- /**
- * Add RenderKitGeneralAdapter onto <render-kit> and the first
- * <display-name> and <description> elements.
- */
- protected void addAdaptersOntoInput(Object newInput) {
- RenderKitType renderkit = (RenderKitType) newInput;
- if (EcoreUtil.getExistingAdapter(renderkit,
- RenderkitGeneralSection.class) == null) {
-
- renderkit.eAdapters().add(getRenderKitGeneralAdapter());
- }
-
- if (renderkit.getDisplayName().size() > 0) {
- DisplayNameType displayName = (DisplayNameType) renderkit
- .getDisplayName().get(0);
- if (EcoreUtil.getExistingAdapter(displayName,
- RenderkitGeneralSection.class) == null) {
-
- displayName.eAdapters().add(getRenderKitGeneralAdapter());
- }
- }
-
- if (renderkit.getDescription().size() > 0) {
- DescriptionType description = (DescriptionType) renderkit
- .getDescription().get(0);
- if (EcoreUtil.getExistingAdapter(description,
- RenderkitGeneralSection.class) == null) {
-
- description.eAdapters().add(getRenderKitGeneralAdapter());
- }
- }
- }
-
- /**
- * Remove RenderKitGeneralAdapter from <render-kit> and the first
- * <display-name> and <description> elements.
- */
- protected void removeAdaptersFromInput(Object oldInput) {
- RenderKitType renderkit = (RenderKitType) oldInput;
- if (EcoreUtil.getExistingAdapter(renderkit,
- RenderkitGeneralSection.class) != null) {
- renderkit.eAdapters().remove(getRenderKitGeneralAdapter());
- }
- if (renderkit.getDisplayName().size() > 0) {
- DisplayNameType displayName = (DisplayNameType) renderkit
- .getDisplayName().get(0);
- if (EcoreUtil.getExistingAdapter(displayName,
- RenderkitGeneralSection.class) != null) {
-
- displayName.eAdapters().remove(getRenderKitGeneralAdapter());
- }
- }
-
- if (renderkit.getDescription().size() > 0) {
- DescriptionType description = (DescriptionType) renderkit
- .getDescription().get(0);
- if (EcoreUtil.getExistingAdapter(description,
- RenderkitGeneralSection.class) != null) {
-
- description.eAdapters().remove(getRenderKitGeneralAdapter());
- }
- }
- }
-
- /**
- *
- * @return
- */
- private Adapter getRenderKitGeneralAdapter() {
-
- if (renderKitGeneralAdapter == null) {
- renderKitGeneralAdapter = new RenderKitGeneralAdapter();
- }
- return renderKitGeneralAdapter;
- }
-
- /**
- * The adapter that will be added onto <render-kit> element, to listen the
- * events of the children that are displayed in this section, notify the
- * section to refresh.
- *
- * @author sfshi
- *
- */
- class RenderKitGeneralAdapter extends AdapterImpl {
-
- public boolean isAdapterForType(Object type) {
- if (type == RenderkitGeneralSection.class)
- return true;
- return false;
- }
-
- public void notifyChanged(Notification msg) {
-
- if (msg.getEventType() == Notification.ADD
- || msg.getEventType() == Notification.REMOVE
- || msg.getEventType() == Notification.SET) {
- if (msg.getFeature() == FacesConfigPackage.eINSTANCE
- .getRenderKitType_RenderKitId()
- || msg.getFeature() == FacesConfigPackage.eINSTANCE
- .getRenderKitType_RenderKitClass()
- || msg.getFeature() == FacesConfigPackage.eINSTANCE
- .getRenderKitType_Description()
- || msg.getFeature() == FacesConfigPackage.eINSTANCE
- .getRenderKitType_DisplayName()) {
- refreshInUIThread();
- } else if (msg.getFeature() == FacesConfigPackage.eINSTANCE
- .getDisplayNameType_TextContent()
- || msg.getFeature() == FacesConfigPackage.eINSTANCE
- .getDescriptionType_TextContent()) {
- refreshInUIThread();
- }
- }
- }
-
- private void refreshInUIThread() {
- if (Thread.currentThread() == PlatformUI.getWorkbench().getDisplay().getThread()) {
- refresh();
- } else {
- PlatformUI.getWorkbench().getDisplay().asyncExec(new Runnable() {
- public void run() {
- refresh();
- }
- });
- }
- }
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/RenderkitMasterSection.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/RenderkitMasterSection.java
deleted file mode 100644
index 513426c..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/RenderkitMasterSection.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui.section;
-
-import org.eclipse.emf.common.command.Command;
-import org.eclipse.emf.edit.command.AddCommand;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.viewers.StructuredViewer;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerFilter;
-import org.eclipse.jst.jsf.facesconfig.emf.FacesConfigFactory;
-import org.eclipse.jst.jsf.facesconfig.emf.FacesConfigPackage;
-import org.eclipse.jst.jsf.facesconfig.emf.RenderKitType;
-import org.eclipse.jst.jsf.facesconfig.ui.EditorMessages;
-import org.eclipse.jst.jsf.facesconfig.ui.page.FacesConfigMasterDetailPage;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.forms.IManagedForm;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-
-/**
- * @author Bryan Yang
- *
- */
-public class RenderkitMasterSection extends FacesConfigMasterSection {
-
- /**
- *
- * @param parent
- * @param managedForm
- * @param toolkit
- * @param page
- */
- public RenderkitMasterSection(Composite parent, IManagedForm managedForm,
- FormToolkit toolkit, FacesConfigMasterDetailPage page) {
- super(parent, managedForm, toolkit, page, null, null);
- getSection().setText(EditorMessages.RenderKitMasterSection_Name);
- getSection().setDescription(
- EditorMessages.RenderKitMasterSection_Description);
- }
-
- /**
- * Config the table viwer, set a filter for it, only the object of
- * RenderKitType will be selected.
- */
- protected void configViewer(StructuredViewer structuredViewer) {
- super.configViewer(structuredViewer);
- structuredViewer.addFilter(new ViewerFilter() {
- public boolean select(Viewer viewer, Object parentElement,
- Object element) {
- return FacesConfigPackage.eINSTANCE.getRenderKitType()
- .isInstance(element);
- }
- });
-
- }
-
- /**
- * Create a new render kit.
- */
- protected void addButtonSelected(SelectionEvent e) {
- RenderKitType Renderkit = FacesConfigFactory.eINSTANCE
- .createRenderKitType();
-
- Command command = AddCommand.create(getEditingDomain(),
- this.getInput(), FacesConfigPackage.eINSTANCE
- .getFacesConfigType_RenderKit(), Renderkit);
-
- if (command.canExecute()) {
- getEditingDomain().getCommandStack().execute(command);
- IStructuredSelection selection = new StructuredSelection(Renderkit);
- getStructuredViewer().refresh();
- getStructuredViewer().setSelection(selection);
- }
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/ValidatorGeneralSection.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/ValidatorGeneralSection.java
deleted file mode 100644
index 3b478ec..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/ValidatorGeneralSection.java
+++ /dev/null
@@ -1,416 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui.section;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.emf.common.command.Command;
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.impl.AdapterImpl;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.emf.edit.command.AddCommand;
-import org.eclipse.emf.edit.command.SetCommand;
-import org.eclipse.emf.edit.domain.EditingDomain;
-import org.eclipse.jst.jsf.common.ui.internal.dialogfield.ClassButtonDialogField;
-import org.eclipse.jst.jsf.common.ui.internal.dialogfield.DialogField;
-import org.eclipse.jst.jsf.common.ui.internal.dialogfield.IDialogFieldApplyListener;
-import org.eclipse.jst.jsf.common.ui.internal.dialogfield.LayoutUtil;
-import org.eclipse.jst.jsf.common.ui.internal.dialogfield.StringDialogField;
-import org.eclipse.jst.jsf.facesconfig.emf.DescriptionType;
-import org.eclipse.jst.jsf.facesconfig.emf.DisplayNameType;
-import org.eclipse.jst.jsf.facesconfig.emf.FacesConfigFactory;
-import org.eclipse.jst.jsf.facesconfig.emf.FacesConfigPackage;
-import org.eclipse.jst.jsf.facesconfig.emf.ValidatorClassType;
-import org.eclipse.jst.jsf.facesconfig.emf.ValidatorIdType;
-import org.eclipse.jst.jsf.facesconfig.emf.ValidatorType;
-import org.eclipse.jst.jsf.facesconfig.ui.EditorMessages;
-import org.eclipse.jst.jsf.facesconfig.ui.IFacesConfigConstants;
-import org.eclipse.jst.jsf.facesconfig.ui.page.IFacesConfigPage;
-import org.eclipse.jst.jsf.facesconfig.ui.util.ModelUtil;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.forms.IManagedForm;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-
-/**
- * @author Bryan Yang
- *
- */
-public class ValidatorGeneralSection extends AbstractFacesConfigSection {
-
- private StringDialogField displayNameField;
-
- private StringDialogField descriptionField;
-
- private StringDialogField validatorIDField;
-
- private ClassButtonDialogField validatorClassField;
-
- private ValidatorGeneralAdapter validatorGeneralAdapter;
-
- /**
- *
- * @param parent
- * @param managedForm
- * @param page
- * @param toolkit
- */
- public ValidatorGeneralSection(Composite parent, IManagedForm managedForm,
- IFacesConfigPage page, FormToolkit toolkit) {
- super(parent, managedForm, page, toolkit, null, null);
- getSection()
- .setText(EditorMessages.ValidatorGeneralSection_Name);
- getSection().setDescription(
- EditorMessages.ValidatorGeneralSection_Description);
- }
-
- /**
- *
- */
- protected void createContents(Composite container, FormToolkit toolkit) {
- int numberOfColumns = 4;
- GridLayout layout = new GridLayout(numberOfColumns, false);
- container.setLayout(layout);
- GridData td = new GridData(GridData.FILL_HORIZONTAL);
- container.setLayoutData(td);
-
- toolkit.paintBordersFor(container);
- displayNameField = new StringDialogField();
- displayNameField
- .setLabelText(EditorMessages.ValidatorGeneralSection_Label_DisplayName);
- displayNameField.doFillIntoGrid(toolkit, container, numberOfColumns);
-
- displayNameField
- .setDialogFieldApplyListener(new IDialogFieldApplyListener() {
-
- public void dialogFieldApplied(DialogField field) {
- String newDisplayNameValue = ((StringDialogField) field)
- .getText().trim();
- Command cmd = null;
- ValidatorType validator = (ValidatorType) getInput();
- EditingDomain editingDomain = getEditingDomain();
- if (validator.getDisplayName().size() > 0) {
- DisplayNameType displayName = (DisplayNameType) validator
- .getDisplayName().get(0);
- cmd = SetCommand.create(editingDomain, displayName,
- FacesConfigPackage.eINSTANCE
- .getDisplayNameType_TextContent(),
- newDisplayNameValue);
- } else {
- DisplayNameType displayNameType = FacesConfigFactory.eINSTANCE
- .createDisplayNameType();
- displayNameType.setTextContent(newDisplayNameValue);
- displayNameType.eAdapters().add(
- getValidatorGeneralAdapter());
-
- cmd = AddCommand.create(editingDomain, validator,
- FacesConfigPackage.eINSTANCE
- .getValidatorType_DisplayName(),
- displayNameType);
- }
- if (cmd.canExecute()) {
- editingDomain.getCommandStack().execute(cmd);
- }
- }
-
- });
-
- descriptionField = new StringDialogField(2);
- descriptionField
- .setLabelText(EditorMessages.ValidatorGeneralSection_Label_Description);
- descriptionField.doFillIntoGrid(toolkit, container, numberOfColumns);
-
- descriptionField
- .setDialogFieldApplyListener(new IDialogFieldApplyListener() {
- public void dialogFieldApplied(DialogField field) {
- String newDescriptionValue = ((StringDialogField) field)
- .getText().trim();
- newDescriptionValue = ModelUtil
- .escapeEntities(newDescriptionValue);
- Command cmd = null;
- ValidatorType validator = (ValidatorType) getInput();
- EditingDomain editingDomain = getEditingDomain();
- if (validator.getDescription().size() > 0) {
- DescriptionType description = (DescriptionType) validator
- .getDescription().get(0);
- cmd = SetCommand.create(editingDomain, description,
- FacesConfigPackage.eINSTANCE
- .getDescriptionType_TextContent(),
- newDescriptionValue);
- } else {
- DescriptionType description = FacesConfigFactory.eINSTANCE
- .createDescriptionType();
- description.setTextContent(newDescriptionValue);
- description.eAdapters().add(
- getValidatorGeneralAdapter());
-
- cmd = AddCommand.create(editingDomain, validator,
- FacesConfigPackage.eINSTANCE
- .getValidatorType_Description(),
- description);
- }
- if (cmd.canExecute()) {
- editingDomain.getCommandStack().execute(cmd);
- }
- }
- });
-
- validatorIDField = new StringDialogField();
- // validatorIDField.setRequired(true);
- validatorIDField
- .setLabelText(EditorMessages.ValidatorGeneralSection_Label_ValidatorID);
- validatorIDField.doFillIntoGrid(toolkit, container, numberOfColumns);
- validatorIDField
- .setDialogFieldApplyListener(new IDialogFieldApplyListener() {
- public void dialogFieldApplied(DialogField field) {
- ValidatorIdType ValidatorType = FacesConfigFactory.eINSTANCE
- .createValidatorIdType();
- ValidatorType
- .setTextContent(((StringDialogField) field)
- .getText());
-
- EditingDomain editingDomain = getEditingDomain();
- if (editingDomain != null) {
- Command command = SetCommand.create(editingDomain,
- getInput(), FacesConfigPackage.eINSTANCE
- .getValidatorType_ValidatorId(),
- ValidatorType);
- if (command.canExecute()) {
- editingDomain.getCommandStack()
- .execute(command);
- }
- }
- }
- });
-
- validatorClassField = new ClassButtonDialogField(null);
- // validatorClassField.setRequired(true);
- validatorClassField
- .setLabelText(EditorMessages.ValidatorGeneralSection_Label_ValidatorClass);
- validatorClassField.setProject((IProject) getPage().getEditor()
- .getAdapter(IProject.class));
- validatorClassField.doFillIntoGrid(toolkit, container, numberOfColumns);
- LayoutUtil.setHorizontalGrabbing(validatorClassField.getTextControl(
- toolkit, container));
-
- validatorClassField
- .setDialogFieldApplyListener(new IDialogFieldApplyListener() {
- public void dialogFieldApplied(DialogField field) {
-
- ValidatorClassType ValidatorClass = FacesConfigFactory.eINSTANCE
- .createValidatorClassType();
- ValidatorClass
- .setTextContent(((StringDialogField) field)
- .getText());
- EditingDomain editingDomain = getEditingDomain();
- if (editingDomain != null) {
- Command command = SetCommand.create(editingDomain,
- getInput(), FacesConfigPackage.eINSTANCE
- .getValidatorType_ValidatorClass(),
- ValidatorClass);
- if (command.canExecute()) {
- editingDomain.getCommandStack()
- .execute(command);
- }
- }
-
- }
- });
- validatorClassField
- .setInterface(IFacesConfigConstants.VALIDATOR_INTERFACE);
- }
-
- /**
- *
- */
- public void refreshAll() {
- refresh();
- }
-
- /**
- *
- */
- public void refresh() {
- super.refresh();
- Object input = this.getInput();
- if (input instanceof ValidatorType) {
- final ValidatorType validator = (ValidatorType) input;
- refreshControls(validator);
- }
- }
-
- private void refreshControls(final ValidatorType validator) {
- if (validator.getDisplayName().size() > 0) {
- DisplayNameType displayName = (DisplayNameType) validator
- .getDisplayName().get(0);
- displayNameField.setTextWithoutUpdate(displayName
- .getTextContent());
- } else {
- displayNameField.setTextWithoutUpdate(""); //$NON-NLS-1$
- }
-
- if (validator.getDescription().size() > 0) {
- DescriptionType description = (DescriptionType) validator
- .getDescription().get(0);
- String descriptionString = description.getTextContent();
- descriptionString = ModelUtil
- .unEscapeEntities(descriptionString);
- descriptionField.setTextWithoutUpdate(descriptionString);
- } else {
- descriptionField.setTextWithoutUpdate(""); //$NON-NLS-1$
- }
-
- if (validator.getValidatorId() != null) {
- validatorIDField.setTextWithoutUpdate(validator
- .getValidatorId().getTextContent());
- } else {
- validatorIDField.setTextWithoutUpdate(""); //$NON-NLS-1$
- }
-
- if (validator.getValidatorClass() != null) {
- validatorClassField.setTextWithoutUpdate(validator
- .getValidatorClass().getTextContent());
- } else {
- validatorClassField.setTextWithoutUpdate(""); //$NON-NLS-1$
- }
-
- }
-
- /**
- * Add ValidatorGeneralAdapter onto <validator> and the first <display-name>
- * and <description> elements.
- */
- protected void addAdaptersOntoInput(Object newInput) {
- ValidatorType validator = (ValidatorType) newInput;
- if (EcoreUtil.getExistingAdapter(validator,
- ValidatorGeneralSection.class) == null) {
-
- validator.eAdapters().add(getValidatorGeneralAdapter());
- }
-
- if (validator.getDisplayName().size() > 0) {
- DisplayNameType displayName = (DisplayNameType) validator
- .getDisplayName().get(0);
- if (EcoreUtil.getExistingAdapter(displayName,
- ValidatorGeneralSection.class) == null) {
-
- displayName.eAdapters().add(getValidatorGeneralAdapter());
- }
- }
-
- if (validator.getDescription().size() > 0) {
- DescriptionType description = (DescriptionType) validator
- .getDescription().get(0);
- if (EcoreUtil.getExistingAdapter(description,
- ValidatorGeneralSection.class) == null) {
-
- description.eAdapters().add(getValidatorGeneralAdapter());
- }
- }
- }
-
- /**
- * Remove ValidatorGeneralAdapter from <validator> and the first
- * <display-name> and <description> elements.
- */
- protected void removeAdaptersFromInput(Object oldInput) {
- ValidatorType validator = (ValidatorType) oldInput;
- if (EcoreUtil.getExistingAdapter(validator,
- ValidatorGeneralSection.class) != null) {
- validator.eAdapters().remove(getValidatorGeneralAdapter());
- }
- if (validator.getDisplayName().size() > 0) {
- DisplayNameType displayName = (DisplayNameType) validator
- .getDisplayName().get(0);
- if (EcoreUtil.getExistingAdapter(displayName,
- ValidatorGeneralSection.class) != null) {
-
- displayName.eAdapters().remove(getValidatorGeneralAdapter());
- }
- }
-
- if (validator.getDescription().size() > 0) {
- DescriptionType description = (DescriptionType) validator
- .getDescription().get(0);
- if (EcoreUtil.getExistingAdapter(description,
- ValidatorGeneralSection.class) != null) {
-
- description.eAdapters().remove(getValidatorGeneralAdapter());
- }
- }
- }
-
- /**
- *
- * @return
- */
- private Adapter getValidatorGeneralAdapter() {
-
- if (validatorGeneralAdapter == null) {
- validatorGeneralAdapter = new ValidatorGeneralAdapter();
- }
- return validatorGeneralAdapter;
- }
-
- /**
- * The adapter that will be added onto <validator> element, to listen the
- * events of the children that are displayed in this section, notify the
- * section to refresh.
- *
- * @author sfshi
- *
- */
- class ValidatorGeneralAdapter extends AdapterImpl {
-
- public boolean isAdapterForType(Object type) {
- if (type == ValidatorGeneralSection.class)
- return true;
- return false;
- }
-
- public void notifyChanged(Notification msg) {
-
- if (msg.getEventType() == Notification.ADD
- || msg.getEventType() == Notification.REMOVE
- || msg.getEventType() == Notification.SET) {
- if (msg.getFeature() == FacesConfigPackage.eINSTANCE
- .getValidatorType_ValidatorId()
- || msg.getFeature() == FacesConfigPackage.eINSTANCE
- .getValidatorType_ValidatorClass()
- || msg.getFeature() == FacesConfigPackage.eINSTANCE
- .getValidatorType_Description()
- || msg.getFeature() == FacesConfigPackage.eINSTANCE
- .getValidatorType_DisplayName()) {
- refreshInUIThread();
- } else if (msg.getFeature() == FacesConfigPackage.eINSTANCE
- .getDisplayNameType_TextContent()
- || msg.getFeature() == FacesConfigPackage.eINSTANCE
- .getDescriptionType_TextContent()) {
- refreshInUIThread();
- }
- }
- }
- private void refreshInUIThread() {
- if (Thread.currentThread() == PlatformUI.getWorkbench().getDisplay().getThread()) {
- refresh();
- } else {
- PlatformUI.getWorkbench().getDisplay().asyncExec(new Runnable() {
- public void run() {
- refresh();
- }
- });
- }
- }
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/ValidatorMasterSection.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/ValidatorMasterSection.java
deleted file mode 100644
index 89f3298..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/ValidatorMasterSection.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui.section;
-
-import org.eclipse.emf.common.command.Command;
-import org.eclipse.emf.edit.command.AddCommand;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.viewers.StructuredViewer;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerFilter;
-import org.eclipse.jst.jsf.facesconfig.emf.FacesConfigFactory;
-import org.eclipse.jst.jsf.facesconfig.emf.FacesConfigPackage;
-import org.eclipse.jst.jsf.facesconfig.emf.ValidatorType;
-import org.eclipse.jst.jsf.facesconfig.ui.EditorMessages;
-import org.eclipse.jst.jsf.facesconfig.ui.page.FacesConfigMasterDetailPage;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.forms.IManagedForm;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-
-/**
- * @author Bryan Yang
- *
- */
-public class ValidatorMasterSection extends FacesConfigMasterSection {
-
- /**
- *
- * @param parent
- * @param managedForm
- * @param toolkit
- * @param page
- */
- public ValidatorMasterSection(Composite parent, IManagedForm managedForm,
- FormToolkit toolkit, FacesConfigMasterDetailPage page) {
- super(parent, managedForm, toolkit, page, null, null);
- getSection().setText(EditorMessages.ValidatorMasterSection_Name);
- getSection().setDescription(
- EditorMessages.ValidatorMasterSection_Description);
- }
-
- /**
- * Config the table viwer, set a filter for it, only the object of
- * ValidatorType will be selected.
- */
- protected void configViewer(StructuredViewer structuredViewer) {
- super.configViewer(structuredViewer);
- structuredViewer.addFilter(new ViewerFilter() {
- public boolean select(Viewer viewer, Object parentElement,
- Object element) {
- return FacesConfigPackage.eINSTANCE.getValidatorType()
- .isInstance(element);
- }
- });
-
- }
-
- /**
- * Create a new Validator.
- */
- protected void addButtonSelected(SelectionEvent e) {
- ValidatorType Validator = FacesConfigFactory.eINSTANCE
- .createValidatorType();
-
- Command command = AddCommand.create(getEditingDomain(),
- this.getInput(), FacesConfigPackage.eINSTANCE
- .getFacesConfigType_Validator(), Validator);
-
- if (command.canExecute()) {
- getEditingDomain().getCommandStack().execute(command);
- IStructuredSelection selection = new StructuredSelection(Validator);
- getStructuredViewer().refresh();
- getStructuredViewer().setSelection(selection);
- }
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/util/JavaBeanProperty.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/util/JavaBeanProperty.java
deleted file mode 100644
index fcd01ca..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/util/JavaBeanProperty.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui.util;
-
-import org.eclipse.jdt.core.IMethod;
-
-/**
- * This class is used to encapsulate the property following the java bean's
- * spec.
- *
- * @author xgzhang
- * @version
- */
-public class JavaBeanProperty {
- private String name;
-
- private String qualifiedType;
-
- private String signatureType;
-
- private IMethod getterMethod;
-
- private IMethod setterMethod;
-
- /**
- * @param name
- * @param signatureType
- * @param getterMethod
- * @param setterMethod
- */
- public JavaBeanProperty(String name, String signatureType,
- IMethod getterMethod, IMethod setterMethod) {
- this.name = name;
- this.signatureType = signatureType;
-
- this.getterMethod = getterMethod;
- this.setterMethod = setterMethod;
- }
-
- /**
- * @return Returns the name.
- */
- public String getName() {
- return name;
- }
-
- /**
- * @return Returns the setterMethod.
- */
- public IMethod getSetterMethod() {
- return setterMethod;
- }
-
- /**
- * @return Returns the setterMethod.
- */
- public IMethod getGetterMethod() {
- return getterMethod;
- }
-
- /**
- * @return Returns the type.
- */
- public String getQualifiedType() {
- if (qualifiedType == null) {
- IMethod getterSetterMethod = getterMethod != null ? getterMethod
- : setterMethod;
-
- qualifiedType = JavaClassUtils.getQualifiedTypeNameInTypeHierarchy(
- getterSetterMethod.getDeclaringType(), signatureType);
- }
- return qualifiedType;
- }
-
- /**
- * @return Returns the signatureType.
- */
- public String getSignatureType() {
- return signatureType;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/util/JavaBeanUtils.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/util/JavaBeanUtils.java
deleted file mode 100644
index 83c36cf..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/util/JavaBeanUtils.java
+++ /dev/null
@@ -1,775 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui.util;
-
-import java.beans.Introspector;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.ITypeHierarchy;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.core.Signature;
-import org.eclipse.jst.jsf.common.ui.internal.utils.JavaModelUtil;
-
-/**
- * This utility class is used to access java bean class, e.g., get java bean's
- * property
- *
- * @author xgzhang
- * @version
- */
-public final class JavaBeanUtils {
- /**
- * fully qualified name of a List
- */
- private static final String JAVA_UTIL_LIST = "java.util.List"; //$NON-NLS-1$
-
- /**
- * fully qualifed name of a Map
- */
- private static final String JAVA_UTIL_MAP = "java.util.Map"; //$NON-NLS-1$
-
- /**
- *
- */
- private JavaBeanUtils() {
- super();
- }
-
- /**
- * get the getter method according to property name
- *
- * @param type
- * @param propertyName
- * @return - can be <b>null</b>, if not found
- * @throws JavaModelException
- * @throws JavaModelException
- */
- private static IMethod getPropertyGetterMethod(IType type,
- String propertyName) {
- if (type == null || !type.exists() || propertyName == null) {
- return null;
- }
- IMethod getterMethod = null;
-
- String methodBaseName = null;
- // Uppercase 1st letter
- if (propertyName.length() == 1) {
- methodBaseName = propertyName.substring(0, 1).toUpperCase();
- } else {
- methodBaseName = propertyName.substring(0, 1).toUpperCase()
- + propertyName.substring(1);
- }
-
- String getterMethodName = "get" + methodBaseName; //$NON-NLS-1$
-
- getterMethod = type.getMethod(getterMethodName, null);
- if (getterMethod == null || !getterMethod.exists()
- || !JavaClassUtils.isPublicMethod(getterMethod)) {
- getterMethodName = "is" + methodBaseName; //$NON-NLS-1$
- getterMethod = type.getMethod(getterMethodName, null);
-
- if (getterMethod == null || !getterMethod.exists()
- || !JavaClassUtils.isPublicMethod(getterMethod)) {
- getterMethod = null;
- }
- }
- return getterMethod;
- }
-
- /**
- * get the getter method in the type hierarchy according to property name
- *
- * @param type
- * @param propertyName
- * @return - can be <b>null</b>, if not found
- * @throws JavaModelException
- * @throws JavaModelException
- */
- private static IMethod getPropertyGetterMethodInTypeHierarchy(IType type,
- String propertyName) throws JavaModelException {
- if (type == null || !type.exists() || propertyName == null) {
- return null;
- }
- IMethod getterMethod = null;
-
- getterMethod = getPropertyGetterMethod(type, propertyName);
-
- if (getterMethod == null) {
- ITypeHierarchy typeHierarchy = null;
- typeHierarchy = type.newSupertypeHierarchy(null);
-
- if (typeHierarchy == null) {
- return null;
- }
-
- IType[] superTypes = typeHierarchy.getAllSuperclasses(type);
-
- if (superTypes == null || superTypes.length == 0) {
- return null;
- }
- for (int i = 0; i < superTypes.length; i++) {
- if (!superTypes[i].getFullyQualifiedName().equals(
- "java.lang.Object")) { //$NON-NLS-1$
- getterMethod = getPropertyGetterMethod(superTypes[i],
- propertyName);
- if (getterMethod != null) {
- break;
- }
- }
- }
- }
- return getterMethod;
- }
-
- /**
- * get the setter method in the type hierarchy according to property name
- *
- * @param type
- * @param propertyName
- * @return - can be <b>null</b>, if not found
- * @throws JavaModelException
- */
- private static IMethod getPropertySetterMethodInTypeHierarchy(IType type,
- String propertyName) throws JavaModelException {
- if (type == null || !type.exists() || propertyName == null) {
- return null;
- }
- IMethod setterMethod = null;
-
- setterMethod = getPropertySetterMethod(type, propertyName);
-
- if (setterMethod == null) {
- ITypeHierarchy typeHierarchy = null;
- typeHierarchy = type.newSupertypeHierarchy(null);
-
- if (typeHierarchy == null) {
- return null;
- }
-
- IType[] superTypes = typeHierarchy.getAllSuperclasses(type);
-
- if (superTypes == null || superTypes.length == 0) {
- return null;
- }
- for (int i = 0; i < superTypes.length; i++) {
- if (!superTypes[i].getFullyQualifiedName().equals(
- "java.lang.Object")) { //$NON-NLS-1$
- setterMethod = getPropertySetterMethod(superTypes[i],
- propertyName);
- if (setterMethod != null) {
- break;
- }
- }
- }
- }
-
- return setterMethod;
- }
-
- /**
- * get the setter method according to property name
- *
- * @param type
- * @param propertyName
- * @return - can be <b>null</b>, if not found
- * @throws JavaModelException
- */
- private static IMethod getPropertySetterMethod(IType type,
- String propertyName) throws JavaModelException {
- if (type == null || !type.exists() || propertyName == null) {
- return null;
- }
- IMethod setterMethod = null;
-
- String methodBaseName = null;
- // Uppercase 1st letter
- if (propertyName.length() == 1) {
- methodBaseName = propertyName.substring(0, 1).toUpperCase();
- } else {
- methodBaseName = propertyName.substring(0, 1).toUpperCase()
- + propertyName.substring(1);
- }
-
- String setterMethodName = "set" + methodBaseName; //$NON-NLS-1$
-
- IMethod[] methods = null;
-
- methods = type.getMethods();
-
- if (methods == null || methods.length == 0) {
- return null;
- }
-
- for (int i = 0; i < methods.length; i++) {
- if (methods[i].getElementName().equals(setterMethodName)) {
- if (methods[i] == null || !methods[i].exists()
- || !JavaClassUtils.isPublicMethod(methods[i])) {
- continue;
- }
-
- // Method must return void
- String returnType = methods[i].getReturnType();
- if (!returnType.equals(Signature.SIG_VOID)) {
- continue;
- }
-
- String params[] = methods[i].getParameterTypes();
- // method must have only one argument
- if (params.length != 1) {
- continue;
- }
- setterMethod = methods[i];
- }
- }
-
- return setterMethod;
- }
-
- /**
- * Check whether the propertyName is bean's property or not.
- *
- * @param baseType
- * @param propertyName
- *
- * @return - True means the property name is valid bean's property,
- * otherwise, not.
- *
- */
- public static boolean isBeanProperty(IType baseType, String propertyName)
- {
- if (baseType == null || !baseType.exists() || propertyName == null) {
- return false;
- }
-
- return (getBeanPropertyType(baseType, propertyName) != null);
- }
-
- /**
- * get the bean's property type
- *
- * @param baseType
- * @param propertyName
- * @return - can be <b>null</b>, if not found
- *
- */
- public static IType getBeanPropertyType(IType baseType, String propertyName) {
- if (baseType == null || !baseType.exists() || propertyName == null) {
- return null;
- }
-
- String typeSignature = null;
- IMethod getterMethod = null;
- IMethod setterMethod = null;
-
- IType declaredType = baseType;
- try {
- getterMethod = getPropertyGetterMethodInTypeHierarchy(baseType,
- propertyName);
- setterMethod = getPropertySetterMethodInTypeHierarchy(baseType,
- propertyName);
- } catch (JavaModelException e1) {
- // Need not any error handling.
- }
-
- if (getterMethod != null && setterMethod == null) {
- declaredType = getterMethod.getDeclaringType();
- try {
- typeSignature = getterMethod.getReturnType();
- } catch (JavaModelException e2) {
- // Need not any error handling.
- }
- } else if (setterMethod != null && getterMethod == null) {
- declaredType = setterMethod.getDeclaringType();
- typeSignature = setterMethod.getParameterTypes()[0];
- } else if (setterMethod != null && getterMethod != null) {
- declaredType = getterMethod.getDeclaringType();
- try {
- // FIXME: should check the type hierachy
- if (getterMethod.getReturnType().equals(
- setterMethod.getParameterTypes()[0])) {
- typeSignature = getterMethod.getReturnType();
- }
- } catch (JavaModelException e2) {
- // Need not any error handling.
- }
- }
-
- if (typeSignature == null) {
- return null;
- }
-
- IType type = null;
-
- try {
- String typeName = JavaModelUtil.getResolvedTypeName(typeSignature,
- declaredType);
- if (typeName != null) {
- type = baseType.getJavaProject().findType(typeName);
- }
- } catch (JavaModelException e) {
- // Need not any error handling.
- }
- return type;
- }
-
- /**
- * get the bean's property's getter and setter methods.
- *
- * @param baseType
- * @param propertyName
- * @return - IMethod[], the first is getter and the second is setter method,
- * however, both of them can be null.
- */
- public static IMethod[] getBeanPropertyMethods(IType baseType,
- String propertyName) {
- if (baseType == null || !baseType.exists() || propertyName == null) {
- return null;
- }
-
- IMethod[] methods = new IMethod[2];
-
- IMethod getterMethod = null;
- IMethod setterMethod = null;
- try {
- getterMethod = getPropertyGetterMethodInTypeHierarchy(baseType,
- propertyName);
-
- setterMethod = getPropertySetterMethodInTypeHierarchy(baseType,
- propertyName);
- } catch (JavaModelException e) {
- // Need not any error handling.
- }
-
- if (getterMethod != null && setterMethod == null) {
- methods[0] = getterMethod;
- } else if (setterMethod != null && getterMethod == null) {
- methods[1] = setterMethod;
- } else if (setterMethod != null && getterMethod != null) {
- try {
- // FIXME: should check the type hierachy
- if (getterMethod.getReturnType().equals(
- setterMethod.getParameterTypes()[0])) {
- methods[0] = getterMethod;
- methods[1] = setterMethod;
- }
- } catch (JavaModelException e1) {
- // Need not any error handling.
- }
- }
-
- return methods;
- }
-
- /**
- * check whether the type implements <code>java.util.List</code>
- *
- * @param type
- * @return - True if the type is the sub class of
- * <code>java.util.List</code>, otherwise, not.
- */
- public static boolean isListType(IType type) {
- if (type == null) {
- return false;
- }
- if (type.getFullyQualifiedName().equalsIgnoreCase(JAVA_UTIL_LIST)) {
- return true;
- }
-
- return JavaClassUtils.isSubClassOf(type.getJavaProject(), type
- .getFullyQualifiedName(), JAVA_UTIL_LIST);
- }
-
- /**
- * check whether the type implements <code>java.util.Map</code>
- *
- * @param type
- * @return - True if the type is the sub class of <code>java.uitl.Map</code>,
- * otherwise, not.
- */
- public static boolean isMapType(IType type) {
- if (type == null) {
- return false;
- }
- if (type.getFullyQualifiedName().equalsIgnoreCase(JAVA_UTIL_MAP)) {
- return true;
- }
-
- return JavaClassUtils.isSubClassOf(type.getJavaProject(), type
- .getFullyQualifiedName(), JAVA_UTIL_MAP);
- }
-
- /**
- * Test for method inclusion in bindings list.
- * <p>
- * This test has the following conditions:
- * </p>
- * <ul>
- * <li>method starts with <code>get</code></li>
- * <li>method has no arguments</li>
- * <li>method does not return void</li>
- * </ul>
- *
- * @param method -
- * the IMethod to examine
- * @return boolean - true, if method satisfies the condition test
- */
- public static boolean isGetterMethod(IMethod method) {
- try {
- if (!JavaClassUtils.isPublicMethod(method)) {
- return false;
- }
- String params[] = method.getParameterTypes();
- // Has no arguments
- if (params.length > 0) {
- return false;
- }
-
- // Starts with "get"
- if (!(method.getElementName().startsWith("get") || method.getElementName().startsWith("is"))) //$NON-NLS-1$ //$NON-NLS-2$
- {
- return false;
- }
- // Does not return void
- String rtn = method.getReturnType();
- if (!rtn.equals(Signature.SIG_VOID)) {
- return true;
- }
- } catch (JavaModelException e) {
- // Need not any error handling.
- }
- return false;
- }
-
- /**
- * Test for method inclusion in bindings list.
- * <p>
- * This test has the following conditions:
- * </p>
- * <ul>
- * <li>method starts with <code>set</code></li>
- * <li>method returns void</li>
- * </ul>
- *
- * @param method -
- * the IMethod to examine
- * @return boolean - true, if method satisfies the condition test
- */
- public static boolean isSetterMethod(IMethod method) {
- try {
- if (!JavaClassUtils.isPublicMethod(method)) {
- return false;
- }
- // Starts with "set"
- if (!method.getElementName().startsWith("set")) //$NON-NLS-1$
- {
- return false;
- }
-
- // the parameter's number should be one.
- if (method.getParameterTypes().length != 1) {
- return false;
- }
- // Returns void
- String rtn = method.getReturnType();
- if (rtn.equals(Signature.SIG_VOID)) {
- return true;
- }
- } catch (JavaModelException e) {
- // Need not any error handling.
- }
- return false;
- }
-
- /**
- * set the first character into low case.
- *
- * @param str
- * @return str with the first char lower cased
- */
- public static String toLowCaseFirstChar(String str) {
- // change the first alphabet to lowcase.
- if (str != null && str.length() > 0) {
- if (str.length() == 1) {
- str = str.toLowerCase();
- } else {
- str = str.substring(0, 1).toLowerCase() + str.substring(1);
- }
- }
- return str;
- }
-
- /**
- * set the first character into low case.
- *
- * @param str
- * @return str with the first char upper-cased
- */
- public static String toUpperCaseFirstChar(String str) {
- // change the first alphabet to lowcase.
- if (str != null && str.length() > 0) {
- if (str.length() == 1) {
- str = str.toUpperCase();
- } else {
- str = str.substring(0, 1).toUpperCase() + str.substring(1);
- }
- }
- return str;
- }
-
- /**
- * get property name from getter method.
- *
- * @param method
- * @return - can be <b>null</b>, if the method is not a valid getter method
- */
- public static String getPropertyNameFromGetterMethod(IMethod method) {
- if (!isGetterMethod(method)) {
- return null;
- }
- String methodName = method.getElementName();
- String propertyName = null;
- // Starts with "get"
- if (methodName.startsWith("get") && methodName.length() > 3) { //$NON-NLS-1$
- propertyName = methodName.substring(3);
- } else if (methodName.startsWith("is") && methodName.length() > 2) // Starts //$NON-NLS-1$
- // with
- // "is"
- {
- propertyName = methodName.substring(2);
- }
- propertyName = Introspector.decapitalize(propertyName);
- return propertyName;
- }
-
- /**
- * get property name from setter class.
- *
- * @param method
- * @return - can be <b>null</b>, if the method is not a valid setter method
- */
- public static String getPropertyNameFromSetterMethod(IMethod method) {
- if (!isSetterMethod(method)) {
- return null;
- }
- String methodName = method.getElementName();
- String propertyName = null;
- // Starts with "get"
- if (methodName.startsWith("set") && methodName.length() > 3) { //$NON-NLS-1$
- propertyName = methodName.substring(3);
- }
- propertyName = Introspector.decapitalize(propertyName);
- return propertyName;
- }
-
- /**
- * get the method with the same parameters
- *
- * @param methods
- * @param visitedMethods
- * @param foundMethod
- * @param foundMethodName
- * @param foundParamTypes
- * @return
- */
- private static IMethod getMethodWithSameParamters(IMethod[] methods,
- Map visitedMethods, IMethod foundMethod, String foundMethodName,
- String[] foundParamTypes) {
- // get all qualified type name for the found method's parameters.
- String[] foundParamQulifiedTypeNames = null;
- if (foundParamTypes != null && foundParamTypes.length > 0) {
- foundParamQulifiedTypeNames = new String[foundParamTypes.length];
- for (int i = 0; i < foundParamTypes.length; i++) {
- foundParamQulifiedTypeNames[i] = JavaClassUtils
- .getQualifiedTypeNameInTypeHierarchy(foundMethod
- .getDeclaringType(), foundParamTypes[i]);
- }
- }
- for (int i = 0; i < methods.length; i++) {
- if (visitedMethods.get(methods[i]) != null) {
- continue;
- }
-
- if (!methods[i].getElementName().equals(foundMethodName)) {
- continue;
- }
- if (methods[i].getParameterTypes() == null
- && foundParamTypes == null) {
- return methods[i];
- } else if (methods[i].getParameterTypes() != null
- && foundParamTypes != null
- && foundParamTypes.length == methods[i].getParameterTypes().length) {
- boolean bSameParams = true;
- String[] methodParamTypes = methods[i].getParameterTypes();
- for (int j = 0; j < foundParamQulifiedTypeNames.length; j++) {
- String methodParamQualifiedTypeName = JavaClassUtils
- .getQualifiedTypeNameInTypeHierarchy(methods[i]
- .getDeclaringType(), methodParamTypes[j]);
- // if the qualified type name is not same or not subclass or
- // supper class between each other.
- if (!methodParamQualifiedTypeName
- .equals(foundParamQulifiedTypeNames[j])
- && !JavaClassUtils.isSubClassOf(methods[i]
- .getJavaProject(),
- methodParamQualifiedTypeName,
- foundParamQulifiedTypeNames[j])
- && !JavaClassUtils.isSubClassOf(methods[i]
- .getJavaProject(),
- foundParamQulifiedTypeNames[j],
- methodParamQualifiedTypeName)) {
- bSameParams = false;
- break;
- }
- }
- if (bSameParams) {
- return methods[i];
- }
- }
- }
- return null;
- }
-
- /**
- * Creates an array of bean properties
- *
- *
- * @param classType
- * @return it can be <b>null</b>, if property is not found.
- */
- public static JavaBeanProperty[] getBeanProperties(IType classType) {
- IMethod[] methods;
- try {
- methods = JavaClassUtils.getMethods(classType);
- } catch (JavaModelException e2) {
- return null;
- }
-
- return getBeanProperties(classType, methods);
- }
-
- /**
- * Creates an array of bean properties
- *
- * @param type
- * @param methods
- *
- * @return - the array of java bean properties.
- */
- public static JavaBeanProperty[] getBeanProperties(IType type,
- IMethod[] methods) {
- if (methods == null || methods.length == 0) {
- return null;
- }
-
- List properties = new ArrayList();
- Map visitedMethods = new HashMap();
- for (int m = 0; m < methods.length; m++) {
- String propertyName = null;
- // if a property's getter method or setter method already visited,
- // just skip it.
- if (visitedMethods.get(methods[m]) != null) {
- continue;
- }
-
- visitedMethods.put(methods[m], methods[m]);
-
- // Check getter firstly
- propertyName = JavaBeanUtils
- .getPropertyNameFromGetterMethod(methods[m]);
-
- if (propertyName != null && propertyName.length() > 0)
- {
- String setterMethodName = "set" //$NON-NLS-1$
- + JavaBeanUtils.toUpperCaseFirstChar(propertyName);
-
- String getterReturnType = null;
- try {
- getterReturnType = methods[m].getReturnType();
- } catch (JavaModelException e1) {
- continue;
- }
- IMethod setterMethod = getMethodWithSameParamters(methods,
- visitedMethods, methods[m], setterMethodName,
- new String[] { getterReturnType });
- if (setterMethod != null && setterMethod.exists()) {
- visitedMethods.put(setterMethod, setterMethod);
- }
-
- properties.add(new JavaBeanProperty(propertyName,
- getterReturnType, methods[m], setterMethod));
- continue;
- }
-
- // Check setter secondly.
- propertyName = JavaBeanUtils
- .getPropertyNameFromSetterMethod(methods[m]);
-
- if (propertyName != null && propertyName.length() > 0)
- {
- // first form of getter method, "get..."
- String getterMethodName = "get" //$NON-NLS-1$
- + JavaBeanUtils.toUpperCaseFirstChar(propertyName);
- IMethod getterMethod = getMethodWithSameParamters(methods,
- visitedMethods, methods[m], getterMethodName, null);
-
- if (getterMethod != null && getterMethod.exists()) {
- try {
- if (getterMethod.getReturnType().equals(
- methods[m].getParameterTypes()[0])) {
- visitedMethods.put(getterMethod, getterMethod);
- }
- } catch (JavaModelException e) {
- // need not error logging
- }
- } else {
- // another form of getter method, "is...".
- getterMethodName = "is" //$NON-NLS-1$
- + JavaBeanUtils.toUpperCaseFirstChar(propertyName);
- getterMethod = getMethodWithSameParamters(methods,
- visitedMethods, methods[m], getterMethodName, null);
- try {
- if (getterMethod != null
- && getterMethod.exists()
- && getterMethod.getReturnType().equals(
- methods[m].getParameterTypes()[0])) {
- visitedMethods.put(getterMethod, getterMethod);
- }
- } catch (JavaModelException e) {
- // need not error logging
- }
- }
-
- properties.add(new JavaBeanProperty(propertyName, methods[m]
- .getParameterTypes()[0], getterMethod, methods[m]));
- continue;
- }
- }
-
- JavaBeanProperty[] propertyArray = (JavaBeanProperty[]) properties
- .toArray(new JavaBeanProperty[properties.size()]);
-
- Arrays.sort(propertyArray, new Comparator() {
- public int compare(Object o1, Object o2) {
- String name1 = ((JavaBeanProperty) o1).getName();
- String name2 = ((JavaBeanProperty) o2).getName();
- return name1.compareTo(name2);
- }
- });
- return propertyArray;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/util/JavaClassUtils.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/util/JavaClassUtils.java
deleted file mode 100644
index 6d24899..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/util/JavaClassUtils.java
+++ /dev/null
@@ -1,529 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.jsf.facesconfig.ui.util;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Comparator;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jdt.core.Flags;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.IPackageDeclaration;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.ITypeHierarchy;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.core.Signature;
-import org.eclipse.jdt.ui.JavaUI;
-import org.eclipse.jst.jsf.common.ui.IFileFolderConstants;
-import org.eclipse.jst.jsf.common.ui.internal.utils.JavaModelUtil;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.PartInitException;
-
-/**
- * This utility class defines typical operations on java class, such as check
- * public constructor, and check type is primitive or not, etc.
- *
- * @author Jane Cantz, Xiao-guang Zhang
- */
-public class JavaClassUtils {
- /**
- * Determines if a string contains any illegal characters
- *
- * @param text -
- * the string to test
- * @return boolean - true if an illegal character is found, otherwise false
- */
- public static boolean hasIllegalCharacters(String text) {
- if (text.length() == 0
- || !Character.isJavaIdentifierStart(text.charAt(0))) {
- return true;
- }
- for (int i = 1; i < text.length(); i++) {
- if (!Character.isJavaIdentifierPart(text.charAt(i))) {
- return true;
- }
- }
- return false;
- }
-
- /**
- * Test for constructor.
- * <p>
- * This test determines if the class has any constructors
- * </p>
- *
- * @param methods -
- * the IMethod array to examine
- * @return boolean - true, if method has no constructors
- */
- public static boolean hasNoConstructor(IMethod[] methods) {
- for (int m = 0; m < methods.length; m++) {
- try {
- if (methods[m].isConstructor()) {
- return false;
- }
- } catch (JavaModelException e) {
- // suppress: this is possible; fall through
- }
- }
- return true;
- }
-
- /**
- * check whether the method is public or not.
- *
- * @param method
- * @return true if method is public
- */
- public static boolean isPublicMethod(IMethod method) {
- int accessFlags = 0;
-
- try {
- accessFlags = method.getFlags();
- } catch (JavaModelException e) {
- return false;
- }
-
- boolean isPublic = Flags.isPublic(accessFlags);
- if ((!Flags.isPrivate(accessFlags))
- && (!Flags.isProtected(accessFlags))
- && (!Flags.isPublic(accessFlags))) {
- // No specific modifier was set, so assume to be public
- isPublic = true;
- }
- if (!isPublic) {
- return false;
- }
- return true;
- }
-
- /**
- * Test for constructor.
- * <p>
- * This test has the following conditions:
- * </p>
- * <ul>
- * <li>method takes 0 arguments and the method name is the class name:
- * <ul>
- * <li>takes 0 arguments</li>
- * <li>the method name is the class name</li>
- * <li>the method returns void</code></li>
- * </ul>
- * </li>
- * </ul>
- *
- * @param methods -
- * the IMethod array to examine
- * @return boolean - true, if method is a constructor
- */
- public static boolean hasPublicConstructor(IMethod[] methods) {
- for (int m = 0; m < methods.length; m++) {
- try {
- if (methods[m].isConstructor() && isPublicMethod(methods[m])) {
- // Constructor must have the following 0 arguments
- String[] params = methods[m].getParameterTypes();
- if (params.length == 0) {
- // And must return a void
- String rtn = methods[m].getReturnType();
- if (rtn.equals(Signature.SIG_VOID)) {
- return true;
- }
- break;
- }
- }
- } catch (JavaModelException e) {
- // Nothing to do.
- }
- }
- return false;
- }
-
- /**
- * Determines if a datatype is primitive type or part of java.lang or
- * java.util package. If not, it is considered to be a bean reference
- *
- * @param classType -
- * the parent class compilation unit
- * @param signatureName -
- * the datatype of the property
- * @return boolean - true, if the datatype is primitive or part of java.lang
- * or java.util package
- */
- public static boolean isPrimitiveType(IType classType, String signatureName) {
- while (signatureName.startsWith("[")) { //$NON-NLS-1$
- signatureName = signatureName.substring(1);
- }
- int kind = Signature.getTypeSignatureKind(signatureName);
- if (kind == Signature.BASE_TYPE_SIGNATURE
- || signatureName.equals(Signature.SIG_VOID)) {
- // These are true primitive types
- return true;
- }
-
- String qualifiedName = getQualifiedTypeNameInTypeHierarchy(classType,
- signatureName);
-
- if ((qualifiedName.startsWith("java.lang")) || (qualifiedName.startsWith("java.util"))) //$NON-NLS-1$ //$NON-NLS-2$
- {
- return true;
- }
- return false;
- }
-
- /**
- * get the type from the input class name
- *
- * @param project
- * @param className
- * @return - can be null.
- */
- public static IType getType(IProject project, String className) {
- if (project == null) {
- return null;
- }
- IType cunit = null;
- if (className.length() > 0) {
-
- IJavaProject jProject = JavaCore.create(project);
- try {
- cunit = jProject.findType(className);
- } catch (JavaModelException e) {
- // suppress: fall-through and return null
- }
- }
- return cunit;
- }
-
- /**
- * open the type in the editor.
- *
- * @param type
- * @return true if the type could opened in an editor
- */
- public static boolean openType(IType type) {
- if (type == null || !type.exists()) {
- return false;
- }
-
- try {
- IEditorPart editorPart = JavaUI.openInEditor(type
- .getPrimaryElement());
- if (editorPart != null) {
- JavaUI.revealInEditor(editorPart, type.getPrimaryElement());
- return true;
- }
- } catch (PartInitException e) {
- // ignore this error.
- } catch (JavaModelException e) {
- // ignore this error.
- }
- return false;
- }
-
- /**
- * get package name from java source file
- *
- * @param javaFile
- * @return - can be null.
- */
- public static String getPackageName(IFile javaFile) {
- if (javaFile == null) {
- return null;
- }
- String ext = "." + javaFile.getFileExtension(); //$NON-NLS-1$
- // See if the file is a java file
- if (!ext.equalsIgnoreCase(IFileFolderConstants.EXT_JAVA)) {
- return null;
- }
- String packagename = new String();
- ICompilationUnit cunit = JavaCore.createCompilationUnitFrom(javaFile);
- try {
- IPackageDeclaration[] packages = cunit.getPackageDeclarations();
- if (packages.length == 0) {
- packagename = new String();
- } else {
- packagename = packages[0].getElementName();
- }
- } catch (JavaModelException jme) {
- // suppress: fall-through and return an empty string?? TODO:?
- }
- return packagename;
- }
-
- /**
- * copy the array to the list.
- *
- * @param methodList
- * @param methods
- */
- private static void copyToMethodList(List methodList, IMethod[] methods) {
- if (methods != null && methods.length > 0) {
- for (int i = 0; i < methods.length; i++) {
- if (!isDuplicateMethod(methodList, methods[i])) {
- methodList.add(methods[i]);
- }
- }
- }
- }
-
- /**
- * check whether this method is duplicated or not in the existing method
- * list.
- *
- * @param methodList
- * @param method
- * @return
- */
- private static boolean isDuplicateMethod(List methodList, IMethod method) {
- if (method == null || !method.exists()) {
- return false;
- }
-
- String[] paramTypes = method.getParameterTypes();
- String methodName = method.getElementName();
-
- for (Iterator iter = methodList.iterator(); iter.hasNext();) {
- IMethod existedMethod = (IMethod) iter.next();
- if (isSameMethodSignature(methodName, paramTypes, existedMethod)) {
- return true;
- }
- }
- return false;
- }
-
- /**
- * Tests if a method equals to the given signature. Parameter types are only
- * compared by the simple name, no resolving for the fully qualified type
- * name is done. Constructors are only compared by parameters, not the name.
- *
- * @param name
- * Name of the method
- * @param paramTypes
- * The type signatures of the parameters e.g.
- * <code>{"QString;","I"}</code>
- * @param curr
- * @return Returns <code>true</code> if the method has the given name and
- * parameter types and constructor state.
- */
- public static boolean isSameMethodSignature(String name,
- String[] paramTypes, IMethod curr) {
- if (name.equals(curr.getElementName())) {
- String[] currParamTypes = curr.getParameterTypes();
- if (paramTypes.length == currParamTypes.length) {
- for (int i = 0; i < paramTypes.length; i++) {
- String t1 = Signature.getSimpleName(Signature
- .toString(paramTypes[i]));
- String t2 = Signature.getSimpleName(Signature
- .toString(currParamTypes[i]));
- if (!t1.equals(t2)) {
- return false;
- }
- }
- return true;
- }
- }
- return false;
- }
-
- /**
- * get methods for the class Type including its super class
- *
- * @param classType
- * @return - can be null
- * @throws JavaModelException
- */
- public static IMethod[] getMethods(IType classType)
- throws JavaModelException {
- if (classType == null) {
- return null;
- }
- List methodList = new ArrayList();
- IMethod[] methods = classType.getMethods();
- copyToMethodList(methodList, methods);
-
- ITypeHierarchy typeHierarchy = classType.newSupertypeHierarchy(null);
-
- if (typeHierarchy != null) {
- IType[] superTypes = typeHierarchy.getAllSuperclasses(classType);
-
- if (superTypes != null && superTypes.length > 0) {
- for (int i = 0; i < superTypes.length; i++) {
- if (!superTypes[i].getFullyQualifiedName().equals(
- "java.lang.Object")) { //$NON-NLS-1$
- methods = superTypes[i].getMethods();
-
- copyToMethodList(methodList, methods);
- }
- }
- }
- }
-
- if (methodList != null && methodList.size() > 0) {
- IMethod[] validMethods = (IMethod[]) methodList
- .toArray(new IMethod[methodList.size()]);
-
- Arrays.sort(validMethods, new Comparator() {
- public int compare(Object o1, Object o2) {
- String name1 = ((IMethod) o1).getElementName();
- String name2 = ((IMethod) o2).getElementName();
- return name1.compareTo(name2);
- }
- });
- return validMethods;
- }
- return null;
- }
-
- /**
- * resolve and get the qualified name for the incomplete typename
- *
- * @param classType
- * @param signatureName
- * @return - at least equal to Signature.toString(signatureName).
- */
- public static String getQualifiedTypeNameInTypeHierarchy(IType classType,
- String signatureName) {
- int arrayNum = 0;
- while (signatureName.startsWith("[")) { //$NON-NLS-1$
- arrayNum++;
- signatureName = signatureName.substring(1);
- }
-
- String qualifiedTypeName = Signature.toString(signatureName);
- int kind = Signature.getTypeSignatureKind(signatureName);
- if (kind == Signature.BASE_TYPE_SIGNATURE
- || signatureName.equals(Signature.SIG_VOID)) {
- // Add back array identifiers
- while (arrayNum > 0) {
- qualifiedTypeName = qualifiedTypeName + "[]"; //$NON-NLS-1$
- arrayNum--;
- }
- return qualifiedTypeName;
- }
-
- String typeName = Signature.toString(signatureName);
-
- String foundName = getQualifiedTypeName(classType, typeName);
- // if found in current type
- if (foundName != null) {
- qualifiedTypeName = foundName;
- } else // else found in the type hierachy.
- {
- ITypeHierarchy typeHierarchy = null;
- try {
- typeHierarchy = classType.newSupertypeHierarchy(null);
- } catch (JavaModelException e) {
- // Nothing to do.
- }
- if (typeHierarchy != null) {
- IType[] superTypes = typeHierarchy.getAllSupertypes(classType);
-
- if (superTypes != null && superTypes.length > 0) {
- for (int i = 0; i < superTypes.length; i++) {
- if (!superTypes[i].getFullyQualifiedName().equals(
- "java.lang.Object")) { //$NON-NLS-1$
- foundName = getQualifiedTypeName(superTypes[i],
- typeName);
- if (foundName != null) {
- qualifiedTypeName = foundName;
- break;
- }
- }
- }
- }
- }
- }
-
- // Add back array identifiers
- while (arrayNum > 0) {
- qualifiedTypeName = qualifiedTypeName + "[]"; //$NON-NLS-1$
- arrayNum--;
- }
- return qualifiedTypeName;
- }
-
- /**
- * resolve and get the qualified name for the incomplete typename
- *
- * @param classType
- * @param typeName
- * @return can be null.
- */
- public static String getQualifiedTypeName(IType classType, String typeName) {
- String qualifiedTypeName = null;
-
- try {
- String[][] resolvedNames = classType.resolveType(typeName);
- if (resolvedNames != null && resolvedNames.length > 0) {
- qualifiedTypeName = JavaModelUtil.concatenateName(
- resolvedNames[0][0], resolvedNames[0][1]);
- }
- } catch (JavaModelException e1) {
- // Nothing to do.
- }
-
- return qualifiedTypeName;
- }
-
- /**
- * check whether subclass is sub class of supperclass
- *
- * @param jProject
- * @param subClass -
- * fully qualified name of sub class
- * @param superClass -
- * fully qualified name of super class
- *
- * @return true if subClass is a sub of superClass
- */
- public static boolean isSubClassOf(IJavaProject jProject, String subClass,
- String superClass) {
- if (jProject == null || subClass == null || superClass == null) {
- return false;
- }
-
- try {
- IType subClassType = jProject.findType(subClass);
-
- if (subClassType != null) {
- ITypeHierarchy typeHierarchy = null;
- try {
- typeHierarchy = subClassType.newSupertypeHierarchy(null);
- } catch (JavaModelException e) {
- // Nothing to do.
- }
- IType[] superTypes = typeHierarchy
- .getAllSupertypes(subClassType);
-
- if (superTypes != null && superTypes.length > 0) {
- for (int i = 0; i < superTypes.length; i++) {
- if (superTypes[i].getFullyQualifiedName().equals(
- superClass)) {
- return true;
- }
- }
- }
- }
- } catch (JavaModelException e) {
- // Nothing to do.
- }
- return false;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/util/ManagedBeanUtil.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/util/ManagedBeanUtil.java
deleted file mode 100644
index 337fe22..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/util/ManagedBeanUtil.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.jsf.facesconfig.ui.util;
-
-import java.util.List;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jst.jsf.core.jsfappconfig.internal.IJSFAppConfigManager;
-import org.eclipse.jst.jsf.core.jsfappconfig.internal.JSFAppConfigManagerFactory;
-import org.eclipse.jst.jsf.facesconfig.emf.ManagedBeanType;
-
-/**
- *
- * @author sfshi
- *
- */
-public class ManagedBeanUtil {
-
- /**
- * Determines if the new bean to be added is already a member of the
- * configuration set.
- * @param project
- *
- * @param beanName -
- * The name of the bean being added
- * @return int - 0 if bean doesn't exist, otherwise the choice from the
- * Duplicate Bean dialog
- */
- public static boolean isBeanDuplicate(final IProject project, final String beanName)
- {
- final IJSFAppConfigManager appCfgMgr = JSFAppConfigManagerFactory.getJSFAppConfigManagerInstance(project);
-
- if (appCfgMgr != null)
- {
- final List<ManagedBeanType> beans = appCfgMgr.getManagedBeans();
-
- // Iterate through the bean list
- for (final ManagedBeanType mbti : beans) {
- if (mbti.getManagedBeanName() != null) {
- final String name = mbti.getManagedBeanName()
- .getTextContent();
- if (name != null && name.equals(beanName)) {
- return true;
- }
- }
- }
-
- }
- return false;
- }
-
- /**
- * get the default managed bean name in the current project according to
- * reference name
- *
- * @param project -
- * current project
- * @param refName -
- * seed reference name
- * @return String - default managed bean name
- */
- public static String getDefaultManagedBeanName(final IProject project,
- final String refName) {
- String defaultName = refName;
-
- int newRefNameIndex = 1;
- while (isBeanDuplicate(project, defaultName)) {
- defaultName = refName + newRefNameIndex;
- newRefNameIndex++;
- }
- return defaultName;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/util/ModelUtil.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/util/ModelUtil.java
deleted file mode 100644
index a468136..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/util/ModelUtil.java
+++ /dev/null
@@ -1,189 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui.util;
-
-import org.eclipse.jst.jsf.facesconfig.emf.FacesConfigPackage;
-import org.eclipse.jst.jsf.facesconfig.ui.IFacesConfigConstants;
-
-/**
- * @author Zhi-peng Zhang
- * @version
- */
-public class ModelUtil {
-
- private static final String ENTITY_NEWLINE = "
"; //$NON-NLS-1$
- private static final String ENTITY_TAB = "	"; //$NON-NLS-1$
- private static final String ENTITY_CARRIAGE_RETURN = "
"; //$NON-NLS-1$
- private static final String ENTITY_AMPERSAND = "&"; //$NON-NLS-1$
- private static final String ENTITY_DOUBLE_QUOTE = """; //$NON-NLS-1$
- private static final String ENTITY_SINGLE_QUOTE = "'"; //$NON-NLS-1$
- private static final String ENTITY_GREATER_THAN = ">"; //$NON-NLS-1$
- private static final String ENTITY_LESS_THAN = "<"; //$NON-NLS-1$
-
- /**
- * Get the super class's name of certain element. For example, a class for
- * <action-listener> should implement interface
- * "javax.faces.event.ActionListener".
- *
- *
- *
- * @param key
- * the EClass object of the application child.
- * @return the expected super type for a particular element
- * TODO: could make common with the faces-config validator
- */
- public static String getSuperType(Object key) {
- if (key == FacesConfigPackage.eINSTANCE.getActionListenerType()) {
- return IFacesConfigConstants.ACTION_LISTENER_INTERFACE;
- }
- if (key == FacesConfigPackage.eINSTANCE.getNavigationHandlerType()) {
- return IFacesConfigConstants.NAVIGATION_HANDLE_SUPER_CLASS;
- }
- if (key == FacesConfigPackage.eINSTANCE.getPropertyResolverType()) {
- return IFacesConfigConstants.PROPERTY_RESOLVER_SUPER_CLASS;
- }
- if (key == FacesConfigPackage.eINSTANCE.getStateManagerType()) {
- return IFacesConfigConstants.STATE_MANAGER_SUPER_CLASS;
- }
- if (key == FacesConfigPackage.eINSTANCE.getVariableResolverType()) {
- return IFacesConfigConstants.VARIABLE_RESOLVER_SUPER_CLASS;
- }
- if (key == FacesConfigPackage.eINSTANCE.getViewHandlerType()) {
- return IFacesConfigConstants.VIEW_HANDLER_SUPER_CLASS;
- }
-
- if (key == FacesConfigPackage.eINSTANCE.getApplicationFactoryType()) {
- return IFacesConfigConstants.APPLICATION_FACTORY_SUPER_CLASS;
- }
- if (key == FacesConfigPackage.eINSTANCE.getFacesContextFactoryType()) {
- return IFacesConfigConstants.FACES_CONTEXT_FACTORY_SUPER_CLASS;
- }
- if (key == FacesConfigPackage.eINSTANCE.getLifecycleFactoryType()) {
- return IFacesConfigConstants.LIFECYCLE_FACTORY_SUPER_CLASS;
- }
- if (key == FacesConfigPackage.eINSTANCE.getRenderKitFactoryType()) {
- return IFacesConfigConstants.RENDER_KIT_FACTORY_SUPER_CLASS;
- }
-
- if (key == FacesConfigPackage.eINSTANCE.getPhaseListenerType()) {
- return IFacesConfigConstants.PHASE_LISTENER_INTERFACE;
- }
-
- return null;
- }
-
-
- /**
- * This will take the three pre-defined entities in XML 1.0 (used
- * specifically in XML elements) and convert their character representation
- * to the appropriate entity reference, suitable for XML element content.
- *
- * @param str
- * <code>String</code> input to escape.
- * @return <code>String</code> with escaped content.
- */
- public static String escapeEntities(String str) {
- if (isEmptyString(str)) {
- return ""; //$NON-NLS-1$
- }
-
- StringBuffer buffer;
- char ch;
- String entity;
-
- buffer = null;
- for (int i = 0, n = str.length(); i < n; i++) {
- ch = str.charAt(i);
- switch (ch) {
- case '<':
- entity = ENTITY_LESS_THAN;
- break;
- case '>':
- entity = ENTITY_GREATER_THAN;
- break;
- case '\'':
- entity = ENTITY_SINGLE_QUOTE;
- break;
- case '\"':
- entity = ENTITY_DOUBLE_QUOTE;
- break;
- case '&':
- entity = ENTITY_AMPERSAND;
- break;
- case '\r':
- entity = ENTITY_CARRIAGE_RETURN;
- break;
- case '\t':
- entity = ENTITY_TAB;
- break;
- case '\n':
- entity = ENTITY_NEWLINE;
- break;
- default:
- entity = null;
- break;
- }
- if (buffer == null) {
- if (entity != null) {
- // An entity occurred, so we'll have to use StringBuffer
- // (allocate room for it plus a few more entities).
- buffer = new StringBuffer(str.length() + 20);
- // Copy previous skipped characters and fall through
- // to pickup current character
- buffer.append(str.substring(0, i));
- buffer.append(entity);
- }
- } else {
- if (entity == null) {
- buffer.append(ch);
- } else {
- buffer.append(entity);
- }
- }
- }
-
- // If there were any entities, return the escaped characters
- // that we put in the StringBuffer. Otherwise, just return
- // the unmodified input string.
- return (buffer == null) ? str : buffer.toString();
- }
-
- /**
- * @param str
- * @return removes XML/HTML escaped characters from str.
- */
- public static String unEscapeEntities(String str) {
- if (isEmptyString(str)) {
- return ""; //$NON-NLS-1$
- }
-
- String result = new String(str);
-
- result = result.replaceAll(ENTITY_AMPERSAND, "&"); //$NON-NLS-1$
- result = result.replaceAll(ENTITY_LESS_THAN, "<"); //$NON-NLS-1$
- result = result.replaceAll(ENTITY_GREATER_THAN, ">"); //$NON-NLS-1$
- result = result.replaceAll(ENTITY_SINGLE_QUOTE, "\'"); //$NON-NLS-1$
- result = result.replaceAll(ENTITY_DOUBLE_QUOTE, "\""); //$NON-NLS-1$
- result = result.replaceAll(ENTITY_CARRIAGE_RETURN, "\r"); //$NON-NLS-1$
- result = result.replaceAll(ENTITY_TAB, "\t"); //$NON-NLS-1$
- result = result.replaceAll(ENTITY_NEWLINE, "\n"); //$NON-NLS-1$
-
- return result;
- }
-
- private static boolean isEmptyString(String value) {
- if (value == null || value.length() == 0) {
- return true;
- }
- return false;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/util/WebrootUtil.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/util/WebrootUtil.java
deleted file mode 100644
index 0f3ada6..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/util/WebrootUtil.java
+++ /dev/null
@@ -1,113 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui.util;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EObject;
-
-
-/**
- * This utility class is used to make a bridge between the relative path from
- * webroot and physical path in the project.
- *
- * @author Xiao-guang Zhang
- *
- */
-public class WebrootUtil extends
- org.eclipse.jst.jsf.common.ui.internal.utils.WebrootUtil {
-
- /**
- * get the the project path for webpath The project path is something like
- * "/projectname/webroot/filename.jsp", or "/projectname/webroot/folder".
- * The project information should be removed from project path, e.g,
- * "/filename.jsp" or "/folder/*";
- * @param model
- *
- * @param strPath -
- * the web path
- * @return - project path from "/projectname/webroot"
- */
- static public String getProjectPath(EObject model, String strPath) {
-
- IProject project = getProject(model);
-
- String strProjectPath = ""; //$NON-NLS-1$
- if (strPath != null) {
- IPath path = new Path(strPath);
- // jsp file
- if (path.getFileExtension() != null) {
- IPath webContentPath = getWebContentPath(project);
- if (webContentPath != null)
- strProjectPath = webContentPath.toString() + strPath;
-
- } else
- // jsp folder
- {
- strPath = new String(strPath.getBytes(), 0,
- strPath.length() - 1);
- IPath webContentPath = getWebContentPath(project);
- if (webContentPath != null)
- strProjectPath = webContentPath.toString() + strPath;
- }
- }
- return strProjectPath;
- }
-
- /**
- * @param model -
- * emf model
- * @return the current resource according to EMF model
- */
- static public IResource getResource(EObject model) {
- IResource resource = null;
-
- if (model != null && model.eResource() != null) {
- URI uri = model.eResource().getURI();
- IPath path = new Path(URI.decode(uri.devicePath()));
-
- // since the uri format is "platform:/resource/..."
- // we will remove the first part
- path = path.removeFirstSegments(1);
-
- IWorkspaceRoot workspaceRoot = ResourcesPlugin.getWorkspace()
- .getRoot();
- resource = workspaceRoot.findMember(path);
- }
-
- return resource;
- }
-
- /**
- * get the current project according to EMF model
- *
- * @param model -
- * emf model
- * @return the current project according to EMF model
- */
- static public IProject getProject(EObject model) {
- IProject project = null;
-
- IResource resource = getResource(model);
-
- if (resource != null) {
- project = resource.getProject();
- }
-
- return project;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/wizard/ISummaryDataSource.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/wizard/ISummaryDataSource.java
deleted file mode 100644
index ae1fa5e..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/wizard/ISummaryDataSource.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui.wizard;
-
-import java.util.List;
-
-/**
- * Specifies behavior for a datasource that client wizards use to communicate
- * summary information to summary page.
- *
- * @author plevin
- * @version 1.0
- */
-public interface ISummaryDataSource {
- /**
- * Returns key-value summary data.
- *
- * @return List - Summary data.
- */
- public List getSummaryData();
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/wizard/ManagedBeanClassSelectionPage.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/wizard/ManagedBeanClassSelectionPage.java
deleted file mode 100644
index c2306cf..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/wizard/ManagedBeanClassSelectionPage.java
+++ /dev/null
@@ -1,322 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others. All rights reserved. This
- * program and the accompanying materials are made available under the terms of
- * the Eclipse Public License v1.0 which accompanies this distribution, and is
- * available at http://www.eclipse.org/legal/epl-v10.html Contributors: Sybase,
- * Inc. - initial API and implementation
- ******************************************************************************/
-
-package org.eclipse.jst.jsf.facesconfig.ui.wizard;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaConventions;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.wizard.WizardPage;
-import org.eclipse.jst.jsf.common.ui.internal.dialogfield.ClassButtonDialogField;
-import org.eclipse.jst.jsf.common.ui.internal.dialogfield.DialogField;
-import org.eclipse.jst.jsf.common.ui.internal.dialogfield.IDialogFieldChangeListener;
-import org.eclipse.jst.jsf.common.ui.internal.dialogfield.LayoutUtil;
-import org.eclipse.jst.jsf.facesconfig.ui.EditorPlugin;
-import org.eclipse.jst.jsf.facesconfig.ui.util.JavaClassUtils;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.swt.widgets.Label;
-
-/**
- * This class used to select an existing java class or generate a new one.
- * However, the actural generated new java class is left to other pages.
- *
- * @author Xiao-guang Zhang
- */
-public class ManagedBeanClassSelectionPage extends WizardPage {
- private static final int HORIZONTAL_INDENT_DEFAULT = 25;
-
- /** the class name */
- private String className;
-
- /**
- * Search Section, including radio button, label, text and browser button.
- */
- private Button searchRadioButton;
-
- private ClassButtonDialogField classSearchDialogField;
-
- /** selected type */
- private IType searchedType;
-
- /** Generate radio button */
- private Button createRadioButton;
-
- private IProject currentProject;
-
- /**
- * Constructor.
- *
- * @param project
- * The project.
- */
- public ManagedBeanClassSelectionPage(IProject project) {
- super("JavaSelectionWizardPage"); //$NON-NLS-1$
-
- currentProject = project;
- setTitle(WizardMessages.JavaSelectionWizardPage_Title);
- setDescription(WizardMessages.JavaSelectionWizardPage_Description);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.dialogs.IDialogPage#createControl(org.eclipse.swt.widgets.Composite)
- */
- public void createControl(Composite parent) {
- Composite container = new Composite(parent, SWT.NULL);
- GridLayout layout = new GridLayout();
- layout.marginWidth = 10;
- layout.marginHeight = 5;
- container.setLayout(layout);
- container.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-
- final Group group = new Group(container, SWT.NONE);
-
- group.setLayout(new GridLayout());
-
- group.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-
- createSearchSection(group);
- createGenerateSection(group);
-
- setControl(container);
- Dialog.applyDialogFont(container);
- setPageComplete(classSearchDialogField.getText().length() > 0);
- EditorPlugin.getDefault().getWorkbench().getHelpSystem().setHelp(
- container,
- WizardMessages.JavaSelectionWizardPage_HelpContextID);
- }
-
- /**
- * enabled or disabled the search section including the labels and texts
- *
- * @param enabled -
- * enabled or disabled the search section
- */
- private void enableSearchSection(boolean enabled) {
- classSearchDialogField.setEnabled(enabled);
- }
-
- /**
- * Create the search section including the labels, texts, and browser
- * buttons
- *
- * @param parent -
- * parent composite control
- */
- private void createSearchSection(Composite parent) {
- searchRadioButton = new Button(parent, SWT.RADIO);
- // JavaSelectionWizardPage.Search = Using an existing Java class
- searchRadioButton
- .setText(WizardMessages.JavaSelectionWizardPage_Search);
- searchRadioButton.setSelection(true);
- searchRadioButton.addSelectionListener(new SelectionAdapter() {
- public void widgetSelected(SelectionEvent e) {
- createRadioButton.setSelection(!searchRadioButton
- .getSelection());
- enableSearchSection(searchRadioButton.getSelection());
- verifyComplete();
- }
- });
-
- Composite searchSection = new Composite(parent, SWT.NULL);
-
- classSearchDialogField = new ClassButtonDialogField(currentProject);
- classSearchDialogField.setHyperLink(null);
- int numberOfControls = classSearchDialogField.getNumberOfControls();
-
- GridLayout layout = new GridLayout();
- layout.numColumns = numberOfControls;
- layout.verticalSpacing = 9;
- searchSection.setLayout(layout);
- searchSection.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-
- classSearchDialogField.doFillIntoGrid(null, searchSection,
- numberOfControls);
-
- GridData gd = (GridData) classSearchDialogField.getLabelControl(null,
- searchSection).getLayoutData();
- gd.horizontalIndent = HORIZONTAL_INDENT_DEFAULT;
-
- // JavaSelectionWizardPage.Search.ClassName = Qulified class name:
- classSearchDialogField
- .setLabelText(WizardMessages.JavaSelectionWizardPage_Search_ClassName);
-
- LayoutUtil.setHorizontalGrabbing(classSearchDialogField.getTextControl(
- null, searchSection));
-
- classSearchDialogField
- .setDialogFieldChangeListener(new IDialogFieldChangeListener() {
- public void dialogFieldChanged(DialogField field) {
- className = classSearchDialogField.getText();
- verifyComplete();
- }
-
- });
-
- Label searchDesp = new Label(searchSection, SWT.NONE);
- searchDesp
- .setText(WizardMessages.JavaSelectionWizardPage_Search_Description);
-
- gd = new GridData();
- gd.horizontalSpan = numberOfControls;
- gd.horizontalIndent = HORIZONTAL_INDENT_DEFAULT;
- searchDesp.setLayoutData(gd);
- }
-
- /**
- * Create the generation section including the labels, texts, and browser
- * buttons
- *
- * @param parent -
- * parent composite control
- */
- private void createGenerateSection(Composite parent) {
- createRadioButton = new Button(parent, SWT.RADIO);
- createRadioButton
- .setText(WizardMessages.JavaSelectionWizardPage_Create);
- createRadioButton.addSelectionListener(new SelectionAdapter() {
- public void widgetSelected(SelectionEvent e) {
- searchRadioButton.setSelection(!createRadioButton
- .getSelection());
- enableSearchSection(!createRadioButton.getSelection());
- verifyComplete();
- }
- });
-
- Composite createSection = new Composite(parent, SWT.NULL);
- GridLayout layout = new GridLayout();
- layout.numColumns = 3;
- layout.verticalSpacing = 9;
- createSection.setLayout(layout);
- createSection.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-
- Label createDesp = new Label(createSection, SWT.NONE);
- createDesp
- .setText(WizardMessages.JavaSelectionWizardPage_Create_Description);
-
- GridData gd = new GridData();
- gd.horizontalIndent = HORIZONTAL_INDENT_DEFAULT;
- createDesp.setLayoutData(gd);
- }
-
- /**
- * create a new java class or not
- *
- * @return true if the create new java class radio button is selected
- */
- public boolean isCreateNewJavaClass() {
- return createRadioButton.getSelection();
- }
-
- /**
- * get the selected java type
- *
- * @return - type
- */
- public IType getSelectedType() {
- searchedType = JavaClassUtils.getType(currentProject,
- classSearchDialogField.getText());
-
- return searchedType;
- }
-
- /**
- * @return the class name
- */
- public String getClassName() {
- return className;
- }
-
- /**
- * validate the selected or input java type name
- *
- * @return
- */
- private IStatus validateJavaTypeName() {
- IStatus status = null;
- if (classSearchDialogField.getText().length() == 0) {
- status = new Status(
- IStatus.ERROR,
- EditorPlugin.getPluginId(),
- -1,
- NLS
- .bind(
- WizardMessages.JavaSelectionWizardPage_Error_ClassIsEmpty,
- classSearchDialogField.getText()), null);
- } else {
- // ensure the name follows the java conventsions.
- status = JavaConventions
- .validateJavaTypeName(classSearchDialogField.getText(), JavaCore.VERSION_1_3,JavaCore.VERSION_1_3);
- if (status.getSeverity() != IStatus.ERROR) {
- // ensure the input or selected type is defined in the current
- // project
- if (getSelectedType() == null) {
- status = new Status(
- IStatus.ERROR,
- EditorPlugin.getPluginId(),
- -1,
- NLS
- .bind(
- WizardMessages.JavaSelectionWizardPage_Error_ClassIsNotDefined,
- classSearchDialogField.getText()),
- null);
- }
- }
- }
- return status;
- }
-
- /**
- * verify and update the complete status
- */
- private void verifyComplete() {
- IStatus status = null;
-
- if (isCreateNewJavaClass()) {
- setPageComplete(true);
- setMessage(null);
- setErrorMessage(null);
- } else {
- if (searchRadioButton.getSelection()) {
- status = validateJavaTypeName();
- }
- String errorMessage = null;
- setPageComplete(status.getSeverity() != IStatus.ERROR);
-
- if (status.getSeverity() == IStatus.ERROR) {
- errorMessage = status.getMessage();
- }
-
- if (errorMessage != null) {
- setErrorMessage(errorMessage);
- } else {
- setErrorMessage(null);
- }
-
- if (status.getSeverity() != IStatus.OK) {
- setMessage(status.getMessage());
- } else {
- setMessage(null);
- }
- }
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/wizard/ManagedBeanPropertyPage.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/wizard/ManagedBeanPropertyPage.java
deleted file mode 100644
index cf221a0..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/wizard/ManagedBeanPropertyPage.java
+++ /dev/null
@@ -1,321 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others. All rights reserved. This
- * program and the accompanying materials are made available under the terms of
- * the Eclipse Public License v1.0 which accompanies this distribution, and is
- * available at http://www.eclipse.org/legal/epl-v10.html Contributors: Sybase,
- * Inc. - initial API and implementation
- ******************************************************************************/
-
-package org.eclipse.jst.jsf.facesconfig.ui.wizard;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jface.wizard.IWizardPage;
-import org.eclipse.jface.wizard.WizardPage;
-import org.eclipse.jst.jsf.common.ui.internal.guiutils.SWTUtils;
-import org.eclipse.jst.jsf.facesconfig.ui.EditorPlugin;
-import org.eclipse.jst.jsf.facesconfig.ui.IFacesConfigConstants;
-import org.eclipse.jst.jsf.facesconfig.ui.util.JavaClassUtils;
-import org.eclipse.jst.jsf.facesconfig.ui.util.ManagedBeanUtil;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Text;
-
-/**
- * ManangedBeanProperty wizard page used to show properties of the previous
- * selected java class, suade services. and set the default values for each
- * property.
- *
- * @author Xiao-guang Zhang, sfshi
- */
-public class ManagedBeanPropertyPage extends WizardPage implements ISummaryDataSource {
- /** Default height of description Text Control */
- private static final int DESCRIPTION_TEXT_HEIGHT = 60;
-
- private static final int DEFAULT_WIDTHHINT = 10;
-
- /** The Text control for managed bean instance name */
- private Text managedBeanNameText;
-
- /** The Combo control for Project Selection */
- private Combo scopeCombo;
-
- /** The Text control for managed bean's description */
- private Text managedBeanDescriptionText;
-
- private String helpID = null;
-
- private IProject currentProject;
-
- private String defaultScope;
-
- /**
- * @param defaultScope
- * the default scope, if be null, then use "session".
- * @param project
- */
- public ManagedBeanPropertyPage(String defaultScope, IProject project) {
- super("ManagedBeanPropertyWizardPage"); //$NON-NLS-1$);
-
- this.defaultScope = defaultScope;
- currentProject = project;
- setTitle(WizardMessages.ManagedBeanPropertyWizardPage_Title);
- setDescription(WizardMessages.ManagedBeanPropertyWizardPage_Description);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see WizardPage#createControl(Composite)
- */
- public void createControl(Composite parent) {
- initializeDialogUnits(parent);
-
- Composite container = new Composite(parent, SWT.NONE);
- GridLayout gl = new GridLayout();
- gl.numColumns = 1;
- container.setLayout(gl);
- GridData gridData = new GridData(GridData.FILL_BOTH);
- container.setLayoutData(gridData);
-
- createGeneralSection(container);
-
- setControl(container);
-
- setPageComplete(false);
-
- if (helpID != null) {
- EditorPlugin.getDefault().getWorkbench().getHelpSystem().setHelp(
- getControl(), helpID);
- }
- }
-
- /**
- * create managed bean 's configuration group
- *
- * @param container
- */
- private void createGeneralSection(Composite container) {
- Group generalSection = new Group(container, SWT.NONE);
-
- // ManagedBeanPropertyWizardPage.General = General
- generalSection
- .setText(WizardMessages.ManagedBeanPropertyWizardPage_General);
-
- GridLayout gl = new GridLayout();
- // gl.marginHeight = 20;
- gl.numColumns = 2;
- generalSection.setLayout(gl);
- GridData gridData = new GridData(GridData.FILL_HORIZONTAL);
- generalSection.setLayoutData(gridData);
-
- SWTUtils
- .createLabel(
- generalSection,
- WizardMessages.ManagedBeanPropertyWizardPage_ManagedBeanName,
- 1);
-
- managedBeanNameText = SWTUtils.createTextBox(generalSection, 1);
- GridData gd = new GridData(GridData.FILL_HORIZONTAL);
- gd.horizontalSpan = 1;
- gd.widthHint = DEFAULT_WIDTHHINT;
- managedBeanNameText.setLayoutData(gd);
-
- managedBeanNameText.addModifyListener(new ModifyListener() {
- public void modifyText(ModifyEvent e) {
- // dialogChanged();
- if (isValidManagedBeanName(true)) {
- setPageComplete(true);
- } else {
- setPageComplete(false);
- }
- }
- });
-
- SWTUtils
- .createLabel(
- generalSection,
- WizardMessages.ManagedBeanPropertyWizardPage_ManagedBeanScope,
- 1);
-
- String[] items = {
- IFacesConfigConstants.MANAGED_BEAN_SCOPE_APPLICATION,
- IFacesConfigConstants.MANAGED_BEAN_SCOPE_SESSION,
- IFacesConfigConstants.MANAGED_BEAN_SCOPE_REQUEST,
- IFacesConfigConstants.MANAGED_BEAN_SCOPE_NONE };
-
- scopeCombo = SWTUtils.createCombo(generalSection, items, 1);
- gd = new GridData(GridData.FILL_HORIZONTAL);
- gd.horizontalSpan = 1;
- gd.widthHint = DEFAULT_WIDTHHINT;
- scopeCombo.setLayoutData(gd);
-
- Label labelDesp = SWTUtils
- .createLabel(
- generalSection,
- WizardMessages.ManagedBeanPropertyWizardPage_ManagedBeanDescription,
- 1);
-
- gd = new GridData(GridData.VERTICAL_ALIGN_BEGINNING);
- labelDesp.setLayoutData(gd);
-
- managedBeanDescriptionText = SWTUtils.createTextBoxScrollable(
- generalSection, 1, -1, DESCRIPTION_TEXT_HEIGHT);
-
- }
-
- /**
- * Validates the managed bean Name entry
- *
- * @param reportError -
- * true, to report errors.
- * @return boolean - the valid state of the data entered
- */
- private boolean isValidManagedBeanName(boolean reportError) {
- if (managedBeanNameText.getText().length() == 0) {
- if (reportError) {
- setErrorMessage(WizardMessages.ManagedBeanPropertyWizardPage_Warning_MissingManagedBeanName);
- }
- return false;
- } else if (JavaClassUtils.hasIllegalCharacters(managedBeanNameText
- .getText())) {
- if (reportError) {
- setErrorMessage(WizardMessages.ManagedBeanPropertyWizardPage_Warning_InvalidManagedBeanName);
- }
- return false;
- } else {
- if (ManagedBeanUtil.isBeanDuplicate(currentProject,
- managedBeanNameText.getText())) {
- if (reportError) {
- setErrorMessage(WizardMessages.ManagedBeanPropertyWizardPage_Warning_DuplicateManagedBeanName);
- }
- return false;
- }
-
- }
-
- setErrorMessage(null);
- return true;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.wizard.IWizardPage#setPreviousPage(org.eclipse.jface.wizard.IWizardPage)
- */
- public void setPreviousPage(IWizardPage page) {
- super.setPreviousPage(page);
- initialize();
- }
-
- private void initialize() {
- if (defaultScope != null && defaultScope.length() > 0)
- scopeCombo.setText(defaultScope);
- else
- scopeCombo.setText("session"); //$NON-NLS-1$
-
- if (((NewManagedBeanWizard) getWizard()).getSuggestedBeanName() != null) {
- this.managedBeanNameText
- .setText(((NewManagedBeanWizard) getWizard())
- .getSuggestedBeanName());
- } else {
- String beanName;
- if (this.getPreviousPage() instanceof ManagedBeanClassSelectionPage) {
- beanName = ((ManagedBeanClassSelectionPage) this.getPreviousPage())
- .getClassName();
- } else {
- beanName = ((NewJavaClassPage) this.getPreviousPage())
- .getTypeName();
- }
- beanName = beanName.substring(beanName.lastIndexOf(".") + 1); //$NON-NLS-1$
- if (beanName != null && beanName.length() > 0) {
- beanName = (beanName.substring(0, 1)).toLowerCase()
- + (beanName.substring(1));
-
- beanName = ManagedBeanUtil.getDefaultManagedBeanName(
- currentProject, beanName);
-
- } else
- beanName = ""; //$NON-NLS-1$
- managedBeanNameText.setText(beanName);
- }
- }
-
- /**
- * Returns key-value summary data.
- *
- * @return List - Summary data.
- */
- public List getSummaryData() {
- List data = new ArrayList();
-
- data
- .add(new String[] {
- WizardMessages.NewJavaManagedBeanWizard_Summary_ManagedBeanName,
- getManagedBeanName() });
- data
- .add(new String[] {
- WizardMessages.NewJavaManagedBeanWizard_Summary_ManagedBeanScope,
- getManagedBeanScope() });
- data.add(new String[] {
- WizardMessages.NewJavaManagedBeanWizard_Summary_ClassName,
- getManagedBeanClass() });
-
- data
- .add(new String[] {
- WizardMessages.NewJavaManagedBeanWizard_Summary_Description,
- getManagedBeanDescription() });
- return data;
- }
-
- /**
- * @return the name of the managed bean
- */
- public String getManagedBeanName() {
- return this.managedBeanNameText.getText().trim();
- }
-
- /**
- * @return the managed bean class name
- */
- public String getManagedBeanClass() {
- if (this.getPreviousPage() instanceof ManagedBeanClassSelectionPage) {
- return ((ManagedBeanClassSelectionPage) this.getPreviousPage()).getClassName();
- } else if (this.getPreviousPage() instanceof NewJavaClassPage) {
- NewJavaClassPage newJavaClassPage = (NewJavaClassPage) this.getPreviousPage();
- StringBuffer buffer = new StringBuffer();
- if (newJavaClassPage.getPackageText() != null
- && newJavaClassPage.getPackageText().length() > 0) {
- buffer.append(newJavaClassPage.getPackageText());
- buffer.append("."); //$NON-NLS-1$
- }
- buffer.append(newJavaClassPage.getTypeName());
- return buffer.toString();
- }
-
- return "";//$NON-NLS-1$
- }
-
- /**
- * @return the managed bean scope
- */
- public String getManagedBeanScope() {
- return this.scopeCombo.getText().trim();
- }
-
- /**
- * @return the managed bean description
- */
- public String getManagedBeanDescription() {
- return this.managedBeanDescriptionText.getText().trim();
- }
-}
\ No newline at end of file
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/wizard/NewJavaClassPage.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/wizard/NewJavaClassPage.java
deleted file mode 100644
index 4cc972c..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/wizard/NewJavaClassPage.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.jsf.facesconfig.ui.wizard;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.wizard.IWizardPage;
-
-/**
- * Wizard page to create a new class.
- *
- * @author Xiao-guang Zhang
- *
- */
-public class NewJavaClassPage extends org.eclipse.jdt.ui.wizards.NewClassWizardPage
- implements ISummaryDataSource {
-
- private final IProject currentProject;
-
- /**
- * @param project
- */
- public NewJavaClassPage(IProject project) {
- super();
- currentProject = project;
- setPageComplete(false);
- }
-
- private void initialize() {
- if (getPackageFragmentRoot() == null
- || currentProject != getPackageFragmentRoot().getJavaProject()
- .getProject()) {
- IJavaProject jProject = JavaCore.create(currentProject);
- StructuredSelection selection = new StructuredSelection(jProject);
- init(selection);
- }
- }
-
- private boolean isSkipped() {
- if ((getPreviousPage() instanceof ManagedBeanClassSelectionPage)
- && !((ManagedBeanClassSelectionPage) getPreviousPage()).isCreateNewJavaClass())
- return true;
- return false;
- }
-
- public List getSummaryData() {
- List data = new ArrayList();
-
- if (!isSkipped()) {
- data
- .add(new String[] {
- WizardMessages.NewJavaManagedBeanWizard_Summary_SourceFolder,
- getPackageFragmentRootText(), });
-
- data
- .add(new String[] {
- WizardMessages.NewJavaManagedBeanWizard_Summary_PackageName,
- getPackageText(), });
-
- data
- .add(new String[] {
- WizardMessages.NewJavaManagedBeanWizard_Summary_TypeName,
- getTypeName() });
- }
- return data;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.wizard.IWizardPage#setPreviousPage(org.eclipse.jface.wizard.IWizardPage)
- */
- public void setPreviousPage(IWizardPage page) {
- super.setPreviousPage(page);
- initialize();
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/wizard/NewManagedBeanWizard.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/wizard/NewManagedBeanWizard.java
deleted file mode 100644
index 4226952..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/wizard/NewManagedBeanWizard.java
+++ /dev/null
@@ -1,229 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others. All rights reserved. This
- * program and the accompanying materials are made available under the terms of
- * the Eclipse Public License v1.0 which accompanies this distribution, and is
- * available at http://www.eclipse.org/legal/epl-v10.html Contributors: Sybase,
- * Inc. - initial API and implementation
- ******************************************************************************/
-
-package org.eclipse.jst.jsf.facesconfig.ui.wizard;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.jface.wizard.IWizardPage;
-import org.eclipse.jface.wizard.Wizard;
-import org.eclipse.jface.wizard.WizardPage;
-import org.eclipse.jst.jsf.common.ui.internal.logging.Logger;
-import org.eclipse.jst.jsf.facesconfig.ui.EditorPlugin;
-
-/**
- * The wizard for creating a managed bean on faces config model.
- *
- * @author Xiao-guang Zhang, sfshi
- */
-public class NewManagedBeanWizard extends Wizard implements ISummaryDataSource {
-
- /** log instance */
- private static final Logger log = EditorPlugin
- .getLogger(NewManagedBeanWizard.class);
-
- /**
- * The wizard page where user can select a Java class for the managed bean
- * to be created.
- */
- private ManagedBeanClassSelectionPage managedBeanClassSelectionPage;
-
- /**
- * The wizard page where user can create a new Java class for the managed
- * bean to be created.
- */
- private NewJavaClassPage newJavaClassPage;
-
- private ManagedBeanPropertyPage managedBeanPropertyPage;
-
- private String managedBeanName;
-
- private String managedBeanScope;
-
- private String managedBeanClass;
-
- private String managedBeanDescription;
-
- private IProject project;
-
- /**
- * the suggested name for the managed bean, if setted, then use it in
- * ManagedBeanPropertyWizardPage.
- */
- private String suggestedBeanName;
-
- private String defaultScope;
-
- /**
- * Constructor
- *
- * @param project
- * The project.
- */
- public NewManagedBeanWizard(IProject project) {
- super();
- setWindowTitle(WizardMessages.NewManagedBeanWizardBase_Title);
- this.project = project;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.jsf.facesconfig.ui.wizards.NewWizard#addPages()
- */
- public void addPages() {
- setDialogSettings(EditorPlugin.getDefault().getDialogSettings());
-
- // add java source selection page.
- managedBeanClassSelectionPage = new ManagedBeanClassSelectionPage(project);
- addPage(managedBeanClassSelectionPage);
-
- // add the class type page
- newJavaClassPage = new NewJavaClassPage(project);
- addPage(newJavaClassPage);
-
- managedBeanPropertyPage = new ManagedBeanPropertyPage(defaultScope, project);
- addPage(managedBeanPropertyPage);
-
- // // add the summary page
- SummaryPage summaryPage = new SummaryPage(this);
- addPage(summaryPage);
- summaryPage
- .setDescription(WizardMessages.NewJavaManagedBeanWizard_SummaryPage_Description);
- }
-
- /**
- * Skip the NewJavaClassPage when user select "Using an existing class" on the
- * ManagedBeanClassSelectionPage.
- */
- public IWizardPage getNextPage(IWizardPage page) {
- IWizardPage nextPage = super.getNextPage(page);
- if (page instanceof ManagedBeanClassSelectionPage
- && !((ManagedBeanClassSelectionPage) page).isCreateNewJavaClass()) {
- ((WizardPage) nextPage).setPageComplete(true);
- return getNextPage(nextPage);
- }
- return nextPage;
- }
-
- public boolean performFinish() {
-
- managedBeanName = managedBeanPropertyPage.getManagedBeanName();
- managedBeanClass = managedBeanPropertyPage.getManagedBeanClass();
- managedBeanScope = managedBeanPropertyPage.getManagedBeanScope();
- managedBeanDescription = managedBeanPropertyPage.getManagedBeanDescription();
- if (managedBeanClassSelectionPage.isCreateNewJavaClass())
- createNewJavaClass();
-
- return true;
- }
-
- /**
- * create a new java class according to current inputs in
- * NewClassWizardPage.
- */
- private void createNewJavaClass() {
- try {
- newJavaClassPage.createType(new NullProgressMonitor());
- } catch (CoreException e) {
- log.info("NewJavaManagedBeanWizard.Error.CreateType", e); //$NON-NLS-1$
-
- EditorPlugin.getAlerts().error(
- "NewJavaManagedBeanWizard.Alert.CreateType.Title", //$NON-NLS-1$
- "NewJavaManagedBeanWizard.Alert.CreateType.Description"); //$NON-NLS-1$
- return;
- } catch (InterruptedException e) {
- log.info("NewJavaManagedBeanWizard.Error.CreateType", e); //$NON-NLS-1$
- EditorPlugin.getAlerts().error(
- "NewJavaManagedBeanWizard.Alert.CreateType.Title", //$NON-NLS-1$
- "NewJavaManagedBeanWizard.Alert.CreateType.Description"); //$NON-NLS-1$
- return;
- }
- newJavaClassPage.getCreatedType();
- }
-
- /**
- * @return the suggested bean name
- */
- public String getSuggestedBeanName() {
- return suggestedBeanName;
- }
-
- /**
- * Set a name for the new managed bean, this name will be shown in the
- * ManagedBeanPropertyWizardPage. If don't set the name, then will get a
- * default bean name from the managed bean class name.
- *
- * @param suggestedBeanName
- */
- public void setSuggestedBeanName(String suggestedBeanName) {
- this.suggestedBeanName = suggestedBeanName;
- }
-
- /**
- * @return the default scope value
- */
- public String getDefaultScope() {
- return defaultScope;
- }
-
- /**
- * set a default scope value for this new managed bean.
- *
- * @param defaultScope
- */
- public void setDefaultScope(String defaultScope) {
- this.defaultScope = defaultScope;
- }
-
- /**
- * @return the class name
- */
- public String getManagedBeanClass() {
- return managedBeanClass;
- }
-
- /**
- * @return the bean description
- */
- public String getManagedBeanDescription() {
- return managedBeanDescription;
- }
-
- /**
- * @return the managed bean's symbolic name
- */
- public String getManagedBeanName() {
- return managedBeanName;
- }
-
- /**
- * @return the managed bean's scope
- */
- public String getManagedBeanScope() {
- return managedBeanScope;
- }
-
- public List getSummaryData() {
- List data = new ArrayList();
- IWizardPage[] pages = getPages();
-
- for (int i = 0; i < pages.length; i++) {
- if (pages[i] instanceof ISummaryDataSource) {
-
- data.addAll(((ISummaryDataSource) pages[i]).getSummaryData());
- }
- }
- return data;
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/wizard/SummaryPage.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/wizard/SummaryPage.java
deleted file mode 100644
index e917466..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/wizard/SummaryPage.java
+++ /dev/null
@@ -1,147 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 Sybase, Inc. and others. All rights reserved. This
- * program and the accompanying materials are made available under the terms of
- * the Eclipse Public License v1.0 which accompanies this distribution, and is
- * available at http://www.eclipse.org/legal/epl-v10.html Contributors: Sybase,
- * Inc. - initial API and implementation
- ******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui.wizard;
-
-import org.eclipse.jface.viewers.ColumnPixelData;
-import org.eclipse.jface.viewers.TableLayout;
-import org.eclipse.jface.wizard.WizardPage;
-import org.eclipse.jst.jsf.common.ui.internal.guiutils.SWTUtils;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.TableColumn;
-import org.eclipse.swt.widgets.TableItem;
-
-/**
- * Common wizard page used to summarize information entered in previous pages.
- *
- * @author plevin
- * @version 1.0
- */
-public class SummaryPage extends WizardPage
-{
- private static final String WIZARD_SUMMARY_PAGE = "WizardSummaryPage"; //$NON-NLS-1$
-
- /** The source of the summary items */
- private ISummaryDataSource source;
-
- /** The table control that displays the summary items */
- private Table table;
-
- /**
- * This Constructor creates the summary page
- */
- public SummaryPage()
- {
- super( WIZARD_SUMMARY_PAGE );
- setTitle( WizardMessages.WizardSummaryPage_Title_WizardSummary );
- setDescription( WizardMessages.WizardSummaryPage_Summary_SummaryDesc );
- }
-
- /**
- * This Constructor initializes the data source.
- *
- * @param source -
- * Summary data source
- */
- public SummaryPage( ISummaryDataSource source )
- {
- this();
- this.source = source;
- }
-
- /**
- * Determines if the wizard can enable the Next button
- *
- * @return boolean - the state of the Next button
- */
- public boolean canFlipToNextPage()
- {
- return false;
- }
-
- /**
- * Creates the page controls
- *
- * @param parent -
- * the wizard composite
- */
- public void createControl( Composite parent )
- {
-
- Composite composite = SWTUtils.createComposite( parent, 1 );
-
- table = new Table( composite, SWT.BORDER );
- table.setLayoutData( new GridData( GridData.FILL_BOTH ) );
- table.setHeaderVisible( true );
- table.setLinesVisible( true );
-
- TableLayout layout = new TableLayout();
- table.setLayout( layout );
-
- layout.addColumnData( new ColumnPixelData( 163 ) );
- layout.addColumnData( new ColumnPixelData( 350 ) );
-
- TableColumn keyCol = new TableColumn( table, SWT.NONE );
- keyCol.setText( WizardMessages.WizardSummaryPage_Label_Field );
-
- TableColumn valueCol = new TableColumn( table, SWT.NONE );
- valueCol
- .setText( WizardMessages.WizardSummaryPage_Label_Value );
-
- setControl( composite );
- setPageComplete( true );
- }
-
- /**
- * Populates the table with summary information.
- */
- public void loadSummaryData()
- {
- if ( source == null )
- {
- return;
- }
- Object[] data = source.getSummaryData().toArray();
- table.removeAll();
- for ( int i = 0; i < data.length; i++ )
- {
- TableItem item = new TableItem( table, SWT.NONE );
- item.setText( (String[]) data[i] );
- }
- return;
- }
-
- /**
- * Sets summary page data source.
- *
- * @param s -
- * Data source.
- */
- public void setSummaryDataSource( ISummaryDataSource s )
- {
- source = s;
- }
-
- /**
- * Populates the table with summary items when the page becomes visible.
- *
- * @param visible -
- * the visible state of the page
- */
- public void setVisible( boolean visible )
- {
- super.setVisible( visible );
-
- if ( visible == true )
- {
- loadSummaryData();
- }
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/wizard/WizardMessages.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/wizard/WizardMessages.java
deleted file mode 100644
index b128bfd..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/wizard/WizardMessages.java
+++ /dev/null
@@ -1,461 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2007 Oracle Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Oracle Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.facesconfig.ui.wizard;
-
-import org.eclipse.osgi.util.NLS;
-
-/**
- * Message bundle for wizards
- *
- */
-public final class WizardMessages extends NLS {
-
- private static final String BUNDLE_NAME = "org.eclipse.jst.jsf.facesconfig.ui.wizard.WizardMessages"; //$NON-NLS-1$
-
- private WizardMessages() {
- // Do not instantiate
- }
-
- static {
- NLS.initializeMessages(BUNDLE_NAME, WizardMessages.class);
- }
-
- /**
- * see WizardMessages.properties
- */
- public static String NewManagedBeanWizardBase_Type;
-
- /**
- * see WizardMessages.properties
- */
- public static String NewManagedBeanWizardBase_Description;
-
- /**
- * see WizardMessages.properties
- */
- public static String NewManagedBeanWizardBase_Title;
-
- /**
- * see WizardMessages.properties
- */
- public static String NewManagedBeanCreationWizard_Title;
-
- /**
- * see WizardMessages.properties
- */
- public static String IntroWizardPage_Title;
-
- /**
- * see WizardMessages.properties
- */
- public static String IntroWizardPage_Intro;
-
- /**
- * see WizardMessages.properties
- */
- public static String ManagedBeanWizardSelectionPage_Title;
-
- /**
- * see WizardMessages.properties
- */
- public static String ManagedBeanWizardSelectionPage_Description;
-
- /**
- * see WizardMessages.properties
- */
- public static String ManagedBeanWizardSelectionPage_Group;
-
- /**
- * see WizardMessages.properties
- */
- public static String ManagedBeanWizardSelectionPage_HelpContextID;
-
- /**
- * see WizardMessages.properties
- */
- public static String Registry_LoadWizard_Error;
-
- /**
- * see WizardMessages.properties
- */
- public static String NewWizard_Title_WizardDefault;
-
- /**
- * see WizardMessages.properties
- */
- public static String ManagedBeanPropertyWizardPage_Title;
-
- /**
- * see WizardMessages.properties
- */
- public static String ManagedBeanPropertyWizardPage_Description;
-
- /**
- * see WizardMessages.properties
- */
- public static String ManagedBeanPropertyWizardPage_General;
-
- /**
- * see WizardMessages.properties
- */
- public static String ManagedBeanPropertyWizardPage_ManagedBeanName;
-
- /**
- * see WizardMessages.properties
- */
- public static String ManagedBeanPropertyWizardPage_ManagedBeanScope;
-
- /**
- * see WizardMessages.properties
- */
- public static String ManagedBeanPropertyWizardPage_ManagedBeanDescription;
-
- /**
- * see WizardMessages.properties
- */
- public static String ManagedBeanPropertyWizardPage_ManagedBeanProperty;
-
- /**
- * see WizardMessages.properties
- */
- public static String ManagedBeanPropertyWizardPage_PropertyName;
-
- /**
- * see WizardMessages.properties
- */
- public static String ManagedBeanPropertyWizardPage_Type;
-
- /**
- * see WizardMessages.properties
- */
- public static String ManagedBeanPropertyWizardPage_Value;
-
- /**
- * see WizardMessages.properties
- */
- public static String ManagedBeanPropertyWizardPage_Button_Add;
-
- /**
- * see WizardMessages.properties
- */
- public static String ManagedBeanPropertyWizardPage_Button_Edit;
-
- /**
- * see WizardMessages.properties
- */
- public static String ManagedBeanPropertyWizardPage_Button_Remove;
-
- /**
- * see WizardMessages.properties
- */
- public static String ManagedBeanPropertyWizardPage_Warning_MissingManagedBeanName;
-
- /**
- * see WizardMessages.properties
- */
- public static String ManagedBeanPropertyWizardPage_Warning_InvalidManagedBeanName;
-
- /**
- * see WizardMessages.properties
- */
- public static String ManagedBeanPropertyWizardPage_Warning_DuplicateManagedBeanName;
-
- /**
- * see WizardMessages.properties
- */
- public static String ManagedBeanPropertyEditDialog_PropertyName;
-
- /**
- * see WizardMessages.properties
- */
- public static String ManagedBeanPropertyEditDialog_DataType;
-
- /**
- * see WizardMessages.properties
- */
- public static String ManagedBeanPropertyEditDialog_InitialValue;
-
- /**
- * see WizardMessages.properties
- */
- public static String ManagedBeanPropertyEditDialog_Title_NewPropertyEntry;
-
- /**
- * see WizardMessages.properties
- */
- public static String ManagedBeanPropertyEditDialog_Title_ExistingPropertyEntry;
-
- /**
- * see WizardMessages.properties
- */
- public static String FacesConfigSelectionWizardPage_Title;
-
- /**
- * see WizardMessages.properties
- */
- public static String FacesConfigSelectionWizardPage_Description;
-
- /**
- * see WizardMessages.properties
- */
- public static String FacesConfigSelectionWizardPage_Project;
-
- /**
- * see WizardMessages.properties
- */
- public static String FacesConfigSelectionWizardPage_FacesConfig;
-
- /**
- * see WizardMessages.properties
- */
- public static String FacesConfigSelectionWizardPage_FacesConfig_Browser;
-
- /**
- * see WizardMessages.properties
- */
- public static String FacesConfigSelectionWizardPage_Warning_MissingProjectName;
-
- /**
- * see WizardMessages.properties
- */
- public static String FacesConfigSelectionWizardPage_Warning_MissingFacesConfigName;
-
- /**
- * see WizardMessages.properties
- */
- public static String FacesConfigSelectionWizardPage_Warning_InvalidFacesConfigName;
-
- /**
- * see WizardMessages.properties
- */
- public static String FacesConfigSelectionWizardPage_Warning_InvalidFacesConfigContent;
-
- /**
- * see WizardMessages.properties
- */
- public static String FacesConfigSelectionWizardPage_Warning_FacesConfigNotDefinedInWebDotXML;
-
- /**
- * see WizardMessages.properties
- */
- public static String FacesConfigSelectionWizardPage_HelpContextID;
-
- /**
- * see WizardMessages.properties
- */
- public static String FacesConfigFileSelectionDialog_Title;
-
- /**
- * see WizardMessages.properties
- */
- public static String FacesConfigFileSelectionDialog_Description;
-
- /**
- * see WizardMessages.properties
- */
- public static String JavaSelectionWizardPage_Title;
-
- /**
- * see WizardMessages.properties
- */
- public static String JavaSelectionWizardPage_Description;
-
- /**
- * see WizardMessages.properties
- */
- public static String JavaSelectionWizardPage_Group;
-
- /**
- * see WizardMessages.properties
- */
- public static String JavaSelectionWizardPage_Search;
-
- /**
- * see WizardMessages.properties
- */
- public static String JavaSelectionWizardPage_Search_Description;
-
- /**
- * see WizardMessages.properties
- */
- public static String JavaSelectionWizardPage_Search_ClassName;
-
- /**
- * see WizardMessages.properties
- */
- public static String JavaSelectionWizardPage_Search_ClassName_Browse;
-
- /**
- * see WizardMessages.properties
- */
- public static String JavaSelectionWizardPage_Create;
-
- /**
- * see WizardMessages.properties
- */
- public static String JavaSelectionWizardPage_Create_Description;
-
- /**
- * see WizardMessages.properties
- */
- public static String JavaSelectionWizardPage_FindType;
-
- /**
- * see WizardMessages.properties
- */
- public static String JavaSelectionWizardPage_FindType_Filter;
-
- /**
- * see WizardMessages.properties
- */
- public static String JavaSelectionWizardPage_Error_ClassIsEmpty;
-
- /**
- * see WizardMessages.properties
- */
- public static String JavaSelectionWizardPage_Error_ClassIsNotDefined;
-
- /**
- * see WizardMessages.properties
- */
- public static String JavaSelectionWizardPage_HelpContextID;
-
- /**
- * see WizardMessages.properties
- */
- public static String NewJavaManagedBeanWizard_Summary_ProjectName;
-
- /**
- * see WizardMessages.properties
- */
- public static String NewJavaManagedBeanWizard_Summary_FacesConfigFileName;
-
- /**
- * see WizardMessages.properties
- */
- public static String NewJavaManagedBeanWizard_Summary_TypeName;
-
- /**
- * see WizardMessages.properties
- */
- public static String NewJavaManagedBeanWizard_Summary_PackageName;
-
- /**
- * see WizardMessages.properties
- */
- public static String NewJavaManagedBeanWizard_Summary_SourceFolder;
-
- /**
- * see WizardMessages.properties
- */
- public static String NewJavaManagedBeanWizard_Summary_ManagedBeanName;
-
- /**
- * see WizardMessages.properties
- */
- public static String NewJavaManagedBeanWizard_Summary_ManagedBeanScope;
-
- /**
- * see WizardMessages.properties
- */
- public static String NewJavaManagedBeanWizard_Summary_ClassName;
-
- /**
- * see WizardMessages.properties
- */
- public static String NewJavaManagedBeanWizard_Summary_Description;
-
- /**
- * see WizardMessages.properties
- */
- public static String NewJavaManagedBeanWizard_SummaryPage_Description;
-
- /**
- * see WizardMessages.properties
- */
- public static String NewJavaManagedBeanWizard_Task_CreateNewManagedBean;
-
- /**
- * see WizardMessages.properties
- */
- public static String NewJavaManagedBeanWizard_Task_CreateNewJavaClass;
-
- /**
- * see WizardMessages.properties
- */
- public static String DuplicateBeanWizard_Title;
-
- /**
- * see WizardMessages.properties
- */
- public static String DuplicateBeanPage_Title;
-
- /**
- * see WizardMessages.properties
- */
- public static String DuplicateBeanPage_Description;
-
- /**
- * see WizardMessages.properties
- */
- public static String DuplicateBeanGroup_Group_Label;
-
- /**
- * see WizardMessages.properties
- */
- public static String DuplicateBeanGroup_OverwriteButton_Text;
-
- /**
- * see WizardMessages.properties
- */
- public static String DuplicateBeanGroup_NewButton_Text;
-
- /**
- * see WizardMessages.properties
- */
- public static String DuplicateBeanGroup_NewNameDialogField_Label;
-
- /**
- * see WizardMessages.properties
- */
- public static String DuplicateBeanGroup_Error_EmptyManagedBeanName;
-
- /**
- * see WizardMessages.properties
- */
- public static String DuplicateBeanGroup_Error_InvalidManagedBeanName;
-
- /**
- * see WizardMessages.properties
- */
- public static String DuplicateBeanGroup_Error_DuplicatedManagedBeanName;
-
- /**
- * see WizardMessages.properties
- */
- public static String WizardSummaryPage_Title_WizardSummary;
-
- /**
- * see WizardMessages.properties
- */
- public static String WizardSummaryPage_Summary_SummaryDesc;
-
- /**
- * see WizardMessages.properties
- */
- public static String WizardSummaryPage_Label_Field;
-
- /**
- * see WizardMessages.properties
- */
- public static String WizardSummaryPage_Label_Value;
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/wizard/WizardMessages.properties b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/wizard/WizardMessages.properties
deleted file mode 100644
index e594ea8..0000000
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/wizard/WizardMessages.properties
+++ /dev/null
@@ -1,128 +0,0 @@
-###############################################################################
-# Copyright (c) 2001, 2007 Oracle Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# Oracle Corporation - initial API and implementation
-###############################################################################
-NewManagedBeanWizardBase_Type = ManagedBeanTypeName
-NewManagedBeanWizardBase_Description = ManagedBeanTypeDescription
-NewManagedBeanWizardBase_Title = New Managed Bean Wizard
-
-NewManagedBeanCreationWizard_Title = Create a Managed Bean
-
-IntroWizardPage_Title = Introduction Page
-IntroWizardPage_Intro = This wizard walks through the steps to create a managed bean.
-
-ManagedBeanWizardSelectionPage_Title = Managed Bean Selection Page
-ManagedBeanWizardSelectionPage_Description = Select a managed bean type to proceed
-ManagedBeanWizardSelectionPage_Group = Please select the managed bean type:
-ManagedBeanWizardSelectionPage_HelpContextID = com.sybase.stf.jmt.new_managedbean_wizard
-
-Registry_LoadWizard_Error = Error loading wizard element, couldn't initialize!
-####################################################
-# Resource message for NewWizard
-####################################################
-NewWizard_Title_WizardDefault = call setWindowTitle(String) in your wizard sub-class
-
-##################################################################
-# Resource message for NewJavaManagedBeanWizards and its' pages.
-##################################################################
-ManagedBeanPropertyWizardPage_Title = Managed Bean Configuration
-ManagedBeanPropertyWizardPage_Description = Set managed bean's name and scope, and create or update Managed Bean's properties, their types and default values.
-
-ManagedBeanPropertyWizardPage_General = General
-
-ManagedBeanPropertyWizardPage_ManagedBeanName = Name:
-ManagedBeanPropertyWizardPage_ManagedBeanScope = Scope:
-ManagedBeanPropertyWizardPage_ManagedBeanDescription = Description:
-
-ManagedBeanPropertyWizardPage_ManagedBeanProperty = Properties:
-ManagedBeanPropertyWizardPage_PropertyName = Property Name
-ManagedBeanPropertyWizardPage_Type = Property Type
-ManagedBeanPropertyWizardPage_Value = Value
-ManagedBeanPropertyWizardPage_Button_Add = Add...
-ManagedBeanPropertyWizardPage_Button_Edit = Edit...
-ManagedBeanPropertyWizardPage_Button_Remove = Remove
-
-ManagedBeanPropertyWizardPage_Warning_MissingManagedBeanName = Managed bean name must be entered!
-ManagedBeanPropertyWizardPage_Warning_InvalidManagedBeanName = Managed bean name is not valid!
-ManagedBeanPropertyWizardPage_Warning_DuplicateManagedBeanName = Managed bean name can not be duplicate!
-
-ManagedBeanPropertyEditDialog_PropertyName = Property name:
-ManagedBeanPropertyEditDialog_DataType = Data type:
-ManagedBeanPropertyEditDialog_InitialValue = Initial value:
-
-ManagedBeanPropertyEditDialog_Title_NewPropertyEntry = New Property Entry
-ManagedBeanPropertyEditDialog_Title_ExistingPropertyEntry = Existing Property Entry
-
-FacesConfigSelectionWizardPage_Title = Faces-Config File
-FacesConfigSelectionWizardPage_Description = Select an existing faces-config file, such as faces-config.xml, to save the new managed bean.
-
-FacesConfigSelectionWizardPage_Project = Project name:
-FacesConfigSelectionWizardPage_FacesConfig = Faces-Config file:
-FacesConfigSelectionWizardPage_FacesConfig_Browser = Browse...
-
-FacesConfigSelectionWizardPage_Warning_MissingProjectName = Project name must be entered!
-FacesConfigSelectionWizardPage_Warning_MissingFacesConfigName = Faces-Config file name must be entered!
-FacesConfigSelectionWizardPage_Warning_InvalidFacesConfigName = Faces-config file name does not exist!
-FacesConfigSelectionWizardPage_Warning_InvalidFacesConfigContent = ''{0}'' is not a valid faces-config file!
-FacesConfigSelectionWizardPage_Warning_FacesConfigNotDefinedInWebDotXML = ''{0}'' is not specified in web.xml file!
-FacesConfigSelectionWizardPage_HelpContextID = com.sybase.stf.jmt.select_facesconfig_page
-
-FacesConfigFileSelectionDialog_Title = Faces-config File Selection
-FacesConfigFileSelectionDialog_Description = Select a faces-config file in the current project.
-
-JavaSelectionWizardPage_Title = Java Class Selection
-JavaSelectionWizardPage_Description = Search for an existing class or generate a new one.
-JavaSelectionWizardPage_Group = Source type for Java class
-JavaSelectionWizardPage_Search = Using an existing Java class
-JavaSelectionWizardPage_Search_Description = (This option will use an existing java class as managed bean's type.)
-JavaSelectionWizardPage_Search_ClassName = Qualified class name:
-JavaSelectionWizardPage_Search_ClassName_Browse = Browse...
-JavaSelectionWizardPage_Create = Create a new Java class
-JavaSelectionWizardPage_Create_Description = (This option will create a new java class in the next wizard page.)
-
-JavaSelectionWizardPage_FindType = Find Type
-JavaSelectionWizardPage_FindType_Filter = Choose a type (?=any character, *=any string):
-JavaSelectionWizardPage_Error_ClassIsEmpty = The type name should not be empty.
-JavaSelectionWizardPage_Error_ClassIsNotDefined = The type name ''{0}'' does not exist.
-JavaSelectionWizardPage_HelpContextID = com.sybase.stf.jmt.new_java_managedbean_wizard
-
-NewJavaManagedBeanWizard_Summary_ProjectName = Project name
-NewJavaManagedBeanWizard_Summary_FacesConfigFileName = Faces-Config file name
-NewJavaManagedBeanWizard_Summary_TypeName = Type name
-NewJavaManagedBeanWizard_Summary_PackageName = Package name
-NewJavaManagedBeanWizard_Summary_SourceFolder = Source folder
-NewJavaManagedBeanWizard_Summary_ManagedBeanName = Managed bean name
-NewJavaManagedBeanWizard_Summary_ManagedBeanScope = Managed bean scope
-NewJavaManagedBeanWizard_Summary_ClassName = Managed bean class
-NewJavaManagedBeanWizard_Summary_Description = Description
-NewJavaManagedBeanWizard_SummaryPage_Description = A new java managed bean will be created.
-
-NewJavaManagedBeanWizard_Task_CreateNewManagedBean = Creating a new managed bean
-NewJavaManagedBeanWizard_Task_CreateNewJavaClass = Creating a new java class
-
-DuplicateBeanWizard_Title = Set Duplicated Managed Bean
-DuplicateBeanPage_Title = Set duplicated managed bean
-DuplicateBeanPage_Description = Overwrite the duplicated managed bean or create a new one.
-
-DuplicateBeanGroup_Group_Label = Duplicated Managed Bean Options
-DuplicateBeanGroup_OverwriteButton_Text = Overwrite an existing managed bean using the new one
-
-DuplicateBeanGroup_NewButton_Text = Create a new managed bean
-DuplicateBeanGroup_NewNameDialogField_Label = New managed bean name:
-
-DuplicateBeanGroup_Error_EmptyManagedBeanName = The managed bean name can not be empty.
-DuplicateBeanGroup_Error_InvalidManagedBeanName = The managed bean name ''{0}'' contains invalid string, such as #,!.
-DuplicateBeanGroup_Error_DuplicatedManagedBeanName = The managed bean name ''{0}'' is duplicated.
-
-WizardSummaryPage_Title_WizardSummary = Wizard Summarys
-WizardSummaryPage_Summary_SummaryDesc = A new java managed bean will be created.
-WizardSummaryPage_Label_Field = Field
-WizardSummaryPage_Label_Value = Value
-
-
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/.classpath b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/.classpath
deleted file mode 100644
index 304e861..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="con" path="org.eclipse.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/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/.cvsignore b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/.cvsignore
deleted file mode 100644
index f9eb27a..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/.cvsignore
+++ /dev/null
@@ -1,3 +0,0 @@
-build.xml
-@dot
-javaCompiler...args
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/.project b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/.project
deleted file mode 100644
index 2cf9838..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.jst.pagedesigner.jsf.ui</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/.settings/org.eclipse.core.resources.prefs b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index 8fcb2c1..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Sun May 27 16:05:18 EDT 2007
-eclipse.preferences.version=1
-encoding/<project>=ISO-8859-1
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/.settings/org.eclipse.jdt.core.prefs b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 16e5442..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,82 +0,0 @@
-#Mon Jun 30 15:58:09 PDT 2008
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.doc.comment.support=enabled
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.autoboxing=warning
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=ignore
-org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
-org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled
-org.eclipse.jdt.core.compiler.problem.fieldHiding=warning
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=warning
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
-org.eclipse.jdt.core.compiler.problem.invalidJavadoc=error
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=enabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=disabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=disabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=protected
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=warning
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocComments=warning
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=protected
-org.eclipse.jdt.core.compiler.problem.missingJavadocTags=warning
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=protected
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=error
-org.eclipse.jdt.core.compiler.problem.nullReference=ignore
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
-org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=ignore
-org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
-org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=ignore
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=ignore
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=error
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=warning
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=error
-org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=error
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error
-org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.5
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/.settings/org.eclipse.jdt.ui.prefs b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index 82eb6c1..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Fri Apr 06 18:25:15 PDT 2007
-eclipse.preferences.version=1
-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8"?><templates/>
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/.settings/org.eclipse.pde.prefs b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/.settings/org.eclipse.pde.prefs
deleted file mode 100644
index 753d576..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/.settings/org.eclipse.pde.prefs
+++ /dev/null
@@ -1,22 +0,0 @@
-#Fri May 30 11:59:54 PDT 2008
-compilers.f.unresolved-features=1
-compilers.f.unresolved-plugins=1
-compilers.incompatible-environment=1
-compilers.p.build=1
-compilers.p.deprecated=1
-compilers.p.discouraged-class=1
-compilers.p.internal=1
-compilers.p.missing-packages=0
-compilers.p.no-required-att=0
-compilers.p.not-externalized-att=0
-compilers.p.unknown-attribute=1
-compilers.p.unknown-class=1
-compilers.p.unknown-element=1
-compilers.p.unknown-identifier=1
-compilers.p.unknown-resource=1
-compilers.p.unresolved-ex-points=0
-compilers.p.unresolved-import=0
-compilers.s.create-docs=false
-compilers.s.doc-folder=doc
-compilers.s.open-tags=1
-eclipse.preferences.version=1
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/META-INF/MANIFEST.MF b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/META-INF/MANIFEST.MF
deleted file mode 100644
index eedcce2..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,41 +0,0 @@
-Manifest-Version: 1.0
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.jst.pagedesigner.jsf.ui;singleton:=true
-Bundle-Version: 1.2.0.qualifier
-Bundle-Activator: org.eclipse.jst.pagedesigner.jsf.ui.JSFUIPlugin
-Bundle-Vendor: %providerName
-Bundle-Localization: plugin
-Require-Bundle: org.eclipse.jst.jsf.facesconfig;bundle-version="[1.1.0,2.0.0)",
- org.eclipse.jst.pagedesigner;bundle-version="[1.1.0,2.0.0)",
- org.eclipse.jst.pagedesigner.jsp.core;bundle-version="[1.1.0,2.0.0)",
- org.eclipse.wst.common.modulecore;bundle-version="[1.1.0,2.0.0)",
- org.eclipse.jst.jsf.common.ui;bundle-version="[1.1.0,2.0.0)",
- org.eclipse.jst.jsf.core;bundle-version="[1.1.0,2.0.0)",
- org.eclipse.jst.jsf.common;bundle-version="[1.1.0,2.0.0)",
- org.eclipse.wst.sse.core;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.wst.xml.core;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.gef;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.core.resources;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.jdt.core;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.ui.ide;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.ui.views.properties.tabbed;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.emf.ecore;bundle-version="[2.5.0,3.0.0)",
- org.eclipse.jface.text;bundle-version="[3.5.0,4.0.0)"
-Bundle-ActivationPolicy: lazy
-Bundle-ManifestVersion: 2
-Export-Package: org.eclipse.jst.pagedesigner.jsf.core.dom;x-internal:=true,
- org.eclipse.jst.pagedesigner.jsf.ui;x-internal:=true,
- org.eclipse.jst.pagedesigner.jsf.ui.actions;x-internal:=true,
- org.eclipse.jst.pagedesigner.jsf.ui.attributegroup;x-internal:=true,
- org.eclipse.jst.pagedesigner.jsf.ui.commands.jsfhtml;x-internal:=true,
- org.eclipse.jst.pagedesigner.jsf.ui.converter.jsfcore;x-internal:=true,
- org.eclipse.jst.pagedesigner.jsf.ui.converter.jsfhtml;x-internal:=true,
- org.eclipse.jst.pagedesigner.jsf.ui.converter.operations.jsf;x-internal:=true,
- org.eclipse.jst.pagedesigner.jsf.ui.elementedit.jsfcore;x-internal:=true,
- org.eclipse.jst.pagedesigner.jsf.ui.elementedit.jsfhtml;x-internal:=true,
- org.eclipse.jst.pagedesigner.jsf.ui.elementedit.request;x-internal:=true,
- org.eclipse.jst.pagedesigner.jsf.ui.elementedit.util;x-internal:=true,
- org.eclipse.jst.pagedesigner.jsf.ui.sections;x-internal:=true,
- org.eclipse.jst.pagedesigner.jsf.ui.util;x-internal:=true
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/about.html b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/about.html
deleted file mode 100644
index 90bd74d..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/about.html
+++ /dev/null
@@ -1,22 +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>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
-
-<p>June, 2008</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.</p>
-
-</body>
-</html>
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/build.properties b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/build.properties
deleted file mode 100644
index d277d8f..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/build.properties
+++ /dev/null
@@ -1,20 +0,0 @@
-###############################################################################
-# Copyright (c) 2001, 2008 Oracle Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# Oracle Corporation - initial API and implementation
-###############################################################################
-source.. = src/
-output.. = bin/
-bin.includes = .,\
- plugin.xml,\
- META-INF/,\
- plugin.properties,\
- about.html,\
- icons/
-javacSource=1.5
-javacTarget=1.5
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/icons/column_select.gif b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/icons/column_select.gif
deleted file mode 100644
index f9dc006..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/icons/column_select.gif
+++ /dev/null
Binary files differ
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/plugin.properties b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/plugin.properties
deleted file mode 100644
index 5f40d6e..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/plugin.properties
+++ /dev/null
@@ -1,15 +0,0 @@
-###############################################################################
-# Copyright (c) 2001, 2007 Oracle Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# Oracle Corporation - initial API and implementation
-###############################################################################
-####################################################
-# Plugin XML information.
-####################################################
-pluginName=JavaServer Faces Tools - Pagedesigner UI
-providerName=Eclipse.org
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/plugin.xml b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/plugin.xml
deleted file mode 100644
index cb0ccd1..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/plugin.xml
+++ /dev/null
@@ -1,173 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.2"?>
-<plugin>
-
- <!-- page variables -->
- <extension point="org.eclipse.jst.pagedesigner.jsp.core.pageVar">
- <taglib uri="http://java.sun.com/jsf/html">
-
- <tag varTypeStringIsAttr="true" varNameIsAttr="true"
- varTypeMode="EXPRESSION_COLLECTION_ITEM" varTypeString="value"
- varName="var" tagName="dataTable" />
- </taglib>
- <taglib uri="http://java.sun.com/jsf/core">
- <tag varTypeStringIsAttr="true" varNameIsAttr="true"
- varTypeMode="BUNDLE" varTypeString="basename" varName="var"
- tagName="loadBundle" />
- </taglib>
- </extension>
- <extension
- point="org.eclipse.ui.views.properties.tabbed.propertySections">
- <propertySections
- contributorId="org.eclipse.jst.pagedesigner.tabPropertyContributor">
- <propertySection
- class="org.eclipse.jst.pagedesigner.jsf.ui.sections.JSFCoreConvertDateTimeGroup"
- tab="org.eclipse.jst.pagedesigner.tabQuickEdit"
- id="section.general.convertDateTime">
- </propertySection>
- <propertySection
- class="org.eclipse.jst.pagedesigner.jsf.ui.sections.JSFCoreConvertNumberGroup"
- tab="org.eclipse.jst.pagedesigner.tabQuickEdit"
- id="section.general.convertNumber">
- </propertySection>
- <propertySection
- class="org.eclipse.jst.pagedesigner.jsf.ui.sections.JSFHtmlActionListenerSection"
- tab="org.eclipse.jst.pagedesigner.tabQuickEdit"
- id="section.general.commandButton.listener">
- </propertySection>
- <propertySection
- class="org.eclipse.jst.pagedesigner.jsf.ui.sections.JSFHtmlActionListenerSection"
- tab="org.eclipse.jst.pagedesigner.tabQuickEdit"
- id="section.general.commandLink.listener">
- </propertySection>
- <propertySection
- class="org.eclipse.jst.pagedesigner.jsf.ui.sections.JSFHtmlDataTableColumnsSection"
- tab="org.eclipse.jst.pagedesigner.tabQuickEdit"
- id="section.general.dataTable.columns">
- </propertySection>
- <propertySection
- class="org.eclipse.jst.pagedesigner.jsf.ui.sections.JSFHtmlInputHiddenTypeSection"
- tab="org.eclipse.jst.pagedesigner.tabQuickEdit"
- id="section.general.inputHidden.type">
- </propertySection>
-
- <propertySection
- class="org.eclipse.jst.pagedesigner.jsf.ui.sections.JSFHtmlInputSecretTypeSection"
- tab="org.eclipse.jst.pagedesigner.tabQuickEdit"
- id="section.general.inputSecret.type">
- </propertySection>
- <propertySection
- class="org.eclipse.jst.pagedesigner.jsf.ui.sections.JSFHtmlInputOthersSection"
- tab="org.eclipse.jst.pagedesigner.tabQuickEdit"
- id="section.general.inputText.others">
- </propertySection>
- <propertySection
- class="org.eclipse.jst.pagedesigner.jsf.ui.sections.JSFHtmlInputTextTypeSection"
- tab="org.eclipse.jst.pagedesigner.tabQuickEdit"
- id="section.general.inputText.type">
- </propertySection>
- <propertySection
- class="org.eclipse.jst.pagedesigner.jsf.ui.sections.JSFHtmlInputOthersSection"
- tab="org.eclipse.jst.pagedesigner.tabQuickEdit"
- id="section.general.inputText.others">
- </propertySection>
- <propertySection
- afterSection="section.general.inputTextarea"
- class="org.eclipse.jst.pagedesigner.jsf.ui.sections.JSFHtmlInputTextareaTypeSection"
- tab="org.eclipse.jst.pagedesigner.tabQuickEdit"
- id="section.general.inputTextarea.type">
- </propertySection>
- <propertySection
- afterSection="section.general.inputTextarea.type"
- class="org.eclipse.jst.pagedesigner.jsf.ui.sections.JSFHtmlInputOthersSection"
- tab="org.eclipse.jst.pagedesigner.tabQuickEdit"
- id="section.general.inputTextarea.others">
- </propertySection>
- <propertySection
- class="org.eclipse.jst.pagedesigner.jsf.ui.sections.JSFHtmlOutputFormatParamsSection"
- tab="org.eclipse.jst.pagedesigner.tabQuickEdit"
- id="section.general.outputFormat.params">
- </propertySection>
- <propertySection
- class="org.eclipse.jst.pagedesigner.jsf.ui.sections.JSFHtmlOutputTextConverterSection"
- tab="org.eclipse.jst.pagedesigner.tabQuickEdit"
- id="section.general.outputText.converter">
- </propertySection>
- <propertySection
- class="org.eclipse.jst.pagedesigner.jsf.ui.sections.JSFHtmlSelectChoicesSection"
- tab="org.eclipse.jst.pagedesigner.tabQuickEdit"
- id="section.general.selectManyCheckbox.choices">
- </propertySection>
- <propertySection
- class="org.eclipse.jst.pagedesigner.jsf.ui.sections.JSFHtmlSelectChoicesSection"
- tab="org.eclipse.jst.pagedesigner.tabQuickEdit"
- id="section.general.selectManyListbox.choices">
- </propertySection>
- <propertySection
- class="org.eclipse.jst.pagedesigner.jsf.ui.sections.JSFHtmlSelectChoicesSection"
- tab="org.eclipse.jst.pagedesigner.tabQuickEdit"
- id="section.general.selectManyMenu.choices">
- </propertySection>
- <propertySection
- class="org.eclipse.jst.pagedesigner.jsf.ui.sections.JSFHtmlSelectChoicesSection"
- tab="org.eclipse.jst.pagedesigner.tabQuickEdit"
- id="section.general.selectOneListbox.choices">
- </propertySection>
- <propertySection
- class="org.eclipse.jst.pagedesigner.jsf.ui.sections.JSFHtmlSelectChoicesSection"
- tab="org.eclipse.jst.pagedesigner.tabQuickEdit"
- id="section.general.selectOneMenu.choices">
- </propertySection>
- <propertySection
- class="org.eclipse.jst.pagedesigner.jsf.ui.sections.JSFHtmlSelectChoicesSection"
- tab="org.eclipse.jst.pagedesigner.tabQuickEdit"
- id="section.general.selectOneRadio.choices">
- </propertySection>
- </propertySections>
- </extension>
-
- <extension
- point="org.eclipse.jst.pagedesigner.pageDesignerExtension">
- <elementEditFactory
- class="org.eclipse.jst.pagedesigner.jsf.ui.elementedit.jsfhtml.JSFHTMLElementEditFactory" />
- <elementEditFactory
- class="org.eclipse.jst.pagedesigner.jsf.ui.elementedit.jsfcore.JSFCoreElementEditFactory" />
- <linkCreator
- class="org.eclipse.jst.pagedesigner.jsf.ui.actions.JSFCommandLinkCreator"
- linkIdentifier="JSF CommandLink" />
- <linkCreator
- class="org.eclipse.jst.pagedesigner.jsf.ui.actions.JSFOutputLinkCreator"
- linkIdentifier="JSF OutputLink" />
- <tagTransformOperation
- class="org.eclipse.jst.pagedesigner.jsf.ui.converter.operations.jsf.ColumnOperation"
- id="ColumnOperation">
- </tagTransformOperation>
- <tagTransformOperation
- class="org.eclipse.jst.pagedesigner.jsf.ui.converter.operations.jsf.DataTableOperation"
- id="DataTableOperation">
- </tagTransformOperation>
- <tagTransformOperation
- class="org.eclipse.jst.pagedesigner.jsf.ui.converter.operations.jsf.PanelGridOperation"
- id="PanelGridOperation">
- </tagTransformOperation>
- <tagTransformOperation
- class="org.eclipse.jst.pagedesigner.jsf.ui.converter.operations.jsf.SelectManyCheckboxOperation"
- id="SelectManyCheckboxOperation">
- </tagTransformOperation>
- <tagTransformOperation
- class="org.eclipse.jst.pagedesigner.jsf.ui.converter.operations.jsf.SelectOneRadioOperation"
- id="SelectOneRadioOperation">
- </tagTransformOperation>
- <tagTransformOperation
- class="org.eclipse.jst.pagedesigner.jsf.ui.converter.operations.jsf.LoadBundleOperation"
- id="LoadBundleOperation">
- </tagTransformOperation>
- </extension>
-
- <extension
- point="org.eclipse.jst.pagedesigner.popupMenuContributor">
- <menuItemContributor
- class="org.eclipse.jst.pagedesigner.jsf.ui.actions.PageFlowContributor"
- URI="http://java.sun.com/jsf/core" />
- </extension>
-</plugin>
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/core/dom/JSFDOMUtil.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/core/dom/JSFDOMUtil.java
deleted file mode 100644
index 99fa2a9..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/core/dom/JSFDOMUtil.java
+++ /dev/null
@@ -1,116 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http:// www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.pagedesigner.jsf.core.dom;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-import org.eclipse.jst.jsf.core.internal.tld.CMUtil;
-import org.eclipse.jst.jsf.core.internal.tld.ITLDConstants;
-
-/**
- * @author mengbo
- * @version 1.5
- */
-public class JSFDOMUtil
-{
-
- /**
- * @param parentEle
- * @param name
- * @return the facet element or null if not found
- */
- public static Element findFacet(Element parentEle, String name)
- {
- NodeList childnodes = parentEle.getChildNodes();
- for (int i=0, size=childnodes.getLength(); i<size; i++)
- {
- Node node = childnodes.item(i);
- if (node.getNodeType() == Node.ELEMENT_NODE && JSFDOMUtil.isFacet((Element)node))
- {
- Element ele = (Element) node;
- if (name.equals(ele.getAttribute("name"))) //$NON-NLS-1$
- {
- return ele;
- }
- }
- }
- return null;
- }
-
- /**
- * @param node
- * @return true if node is a JSF column
- */
- public static boolean isHColumn(Node node)
- {
- if (node instanceof Element)
- {
- Element ele = (Element) node;
- if ("column".equalsIgnoreCase(ele.getLocalName()) && ITLDConstants.URI_JSF_HTML.equals(CMUtil.getElementNamespaceURI(ele))) //$NON-NLS-1$
- {
- return true;
- }
- }
-
- return false;
- }
-
- /**
- * @param panelGridEle
- * @return the list of UI component children
- */
- public static List getUIComponentChildren(Element panelGridEle)
- {
- // XXX: temp implementation. Later may move this out to be shared.
- // currently just returning all children Element. Need to filter out things like non JSF UI component
- List list = new ArrayList();
- NodeList childnodes = panelGridEle.getChildNodes();
- for (int i=0, size=childnodes.getLength(); i<size; i++)
- {
- Node node = childnodes.item(i);
- if (node.getNodeType() == Node.ELEMENT_NODE)
- {
- if (JSFDOMUtil.isFacet((Element) node))
- {
- continue;
- }
- list.add(node);
- }
- }
- return list;
- }
-
- /**
- * @param ele
- * @return true if ele is a facet
- */
- public static boolean isFacet(Element ele)
- {
- // XXX: here we are not checking namespace! for error tolerant.
- return "facet".equals(ele.getLocalName()); //$NON-NLS-1$
- }
-
- /**
- * @param ele
- * @return true if the local name of ele is "param"
- */
- public static boolean isUIParameter(Element ele)
- {
- return "param".equals(ele.getLocalName()); //$NON-NLS-1$
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/JSFUIPlugin.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/JSFUIPlugin.java
deleted file mode 100644
index f67d22e..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/JSFUIPlugin.java
+++ /dev/null
@@ -1,193 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http:// www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.pagedesigner.jsf.ui;
-
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-import org.eclipse.core.runtime.ILog;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.resource.ImageRegistry;
-import org.eclipse.jst.jsf.common.ui.IFileFolderConstants;
-import org.eclipse.jst.jsf.common.ui.JSFUICommonPlugin;
-import org.eclipse.jst.jsf.common.ui.internal.guiutils.Alerts;
-import org.eclipse.jst.jsf.common.ui.internal.logging.Logger;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * The main plugin class to be used in the desktop.
- */
-public class JSFUIPlugin extends AbstractUIPlugin
-{
- //The shared instance.
- private static JSFUIPlugin _plugin;
- //Resource bundle.
- private ResourceBundle _resourceBundle;
- private URL _pluginBase;
-
- private static Logger _logger;
- private static Alerts _alerts;
-
- /**
- * The constructor.
- */
- public JSFUIPlugin()
- {
- super();
- _plugin = this;
- try
- {
- _resourceBundle = ResourceBundle.getBundle("org.eclipse.jst.pagedesigner.jsf.ui.JSFUIPluginResources"); //$NON-NLS-1$
- }
- catch (MissingResourceException x)
- {
- _resourceBundle = null;
- }
- }
-
- /**
- * This method is called upon plug-in activation
- */
- public void start(BundleContext context) throws Exception
- {
- super.start(context);
- _alerts = new Alerts(this, _resourceBundle);
- _logger = JSFUICommonPlugin.getLogger(JSFUIPlugin.class);
-// _logger.setResourceBundle(_resourceBundle);
- _pluginBase = getBundle().getEntry("/"); //$NON-NLS-1$
- }
-
- /**
- * get the alerts objects associated with this plugin for alerting the user.
- * @return the alerts
- */
- public static Alerts getAlerts()
- {
- return _alerts;
- }
-
- /**
- * This method is called when the plug-in is stopped
- */
- public void stop(BundleContext context) throws Exception
- {
- super.stop(context);
- }
-
- /**
- * Returns the shared instance.
- * @return the default plugin
- */
- public static JSFUIPlugin getDefault()
- {
- return _plugin;
- }
-
- /**
- * Returns the string from the plugin's resource bundle,
- * or 'key' if not found.
- * @param key
- * @return the resource string for key or 'key' if not found
- */
- public static String getResourceString(String key)
- {
- ResourceBundle bundle = JSFUIPlugin.getDefault().getResourceBundle();
- try
- {
- return (bundle != null) ? bundle.getString(key) : key;
- }
- catch (MissingResourceException e)
- {
- return key;
- }
- }
-
- /**
- * Returns the plugin's resource bundle,
- * @return the resource bundle
- */
- public ResourceBundle getResourceBundle()
- {
- return _resourceBundle;
- }
-
- /**
- * Return an image from the path
- * @param name
- * @return Image
- */
- public Image getImage(String name)
- {
- if (name == null)
- {
- return null;
- }
-
- ImageRegistry images = getImageRegistry();
- Image image = images.get(name);
- if (image == null)
- {
- try
- {
- ImageDescriptor id = ImageDescriptor.createFromURL(new URL(_pluginBase,
- IFileFolderConstants.FOLDER_ICONS + "/" + name)); //$NON-NLS-1$
- images.put(name, id);
-
- image = images.get(name);
- }
- catch (MalformedURLException ee)
- {
- _logger.error("Error.JSFUIPlugin", name, ee); //$NON-NLS-1$
- }
- }
- return image;
- }
-
- /**
- * Log message and Throwable by severity.
- *
- * @param severity Severity (use appropriate IStatus constant).
- * @param message Message to be logged.
- * @param exception Throwable instance to be logged.
- */
- public static void log(int severity, String message, Throwable exception) {
- ILog log = getDefault().getLog();
- IStatus status = new Status(
- severity,
- "org.eclipse.jst.pagedesigner.jsf.ui", //$NON-NLS-1$
- message,
- exception);
- log.log(status);
- }
-
- /**
- * Log message by severity.
- *
- * @param severity Severity (use an IStatus constant).
- * @param message Message to be logged.
- */
- public static void log(int severity, String message) {
- ILog log = getDefault().getLog();
- IStatus status = new Status(
- severity,
- "org.eclipse.jst.pagedesigner.jsf.ui", //$NON-NLS-1$
- message);
- log.log(status);
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/JSFUIPluginResources.properties b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/JSFUIPluginResources.properties
deleted file mode 100644
index b628dc5..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/JSFUIPluginResources.properties
+++ /dev/null
@@ -1,50 +0,0 @@
-###############################################################################
-# Copyright (c) 2001, 2007 Oracle Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# Oracle Corporation - initial API and implementation
-###############################################################################
-#DataTable
-ElementEdit.Submenu.DataTable=DataTable
-ElementEdit.Submenu.DataTable.SelectTable=Select Table
-ElementEdit.Submenu.DataTable.InsertColumnBefore=Insert Column Before
-ElementEdit.Submenu.DataTable.InsertColumnAfter=Insert Column After
-ElementEdit.Submenu.DataTable.DeleteColumn=Delete Column
-ElementEdit.Submenu.InsertTableHeader=Insert Table Header
-ElementEdit.Submenu.InsertTableFooter=Insert Table Footer
-ElementEdit.Submenu.DeleteTableHeader=Delete Table Header
-ElementEdit.Submenu.DeleteTableFooter=Delete Table Footer
-ElementEdit.Submenu.InsertColumnHeader=Insert Column Header
-ElementEdit.Submenu.InsertColumnFooter=Insert Column Footer
-ElementEdit.Submenu.DeleteColumnHeader=Delete Column Header
-ElementEdit.Submenu.DeleteColumnFooter=Delete Column Footer
-
-#PanelGrid
-ElementEdit.Submenu.PanelGrid=PanelGrid
-ElementEdit.Submenu.PanelGrid.SelectTable=Select Table
-ElementEdit.Submenu.PanelGrid.InsertRowBefore=Insert Row Before
-ElementEdit.Submenu.PanelGrid.InsertRowAfter=Insert Row After
-ElementEdit.Submenu.PanelGrid.InsertColumnBefore=Insert Column Before
-ElementEdit.Submenu.PanelGrid.InsertColumnAfter=Insert Column After
-ElementEdit.Submenu.PanelGrid.DeleteRow=Delete Row
-ElementEdit.Submenu.PanelGrid.DeleteColumn=Delete Column
-ElementEdit.Submenu.PanelGrid.InsertHeader=Insert Header
-ElementEdit.Submenu.PanelGrid.InsertFooter=Insert Footer
-ElementEdit.Submenu.PanelGird.DeleteHeader=Delete Header
-ElementEdit.Submenu.PanelGrid.DeleteFooter=Delete Footer
-
-ElementEdit.Submenu.JavaNavigation=Java
-ElementEdit.Submenu.JavaNavigation.Binding=Binding
-ElementEdit.Submenu.JavaNavigation.Value=Value
-ElementEdit.Submenu.JavaNavigation.Action=Action
-ElementEdit.Submenu.LoadBundle=Open Properties File
-
-#Warning messages
-Message.Warning.Title=Warning
-Message.Warning.InvalidateExpression=The value is either an invalid Expression or the definition is missing.
-
-Error.JSFUIPlugin=Error in jsf.ui plugin
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/JSFUIResources.properties b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/JSFUIResources.properties
deleted file mode 100644
index 0a4ec8d..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/JSFUIResources.properties
+++ /dev/null
@@ -1,16 +0,0 @@
-###############################################################################
-# Copyright (c) 2001, 2007 Oracle Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# Oracle Corporation - initial API and implementation
-###############################################################################
-MessageTagConverter.defaultValue=Message
-MessageTagConverter.defaultTooltip=Summary
-
-TableBasedOperation.NoSelectItem.style=color:silver;font-family:Arial,Helvetica,Geneva,sans-serif;font-size:8pt;
-TableBasedOperation.NoSelectItem.text=Add child selectItem or selectItems tags
-TableBasedOperation.OnlySelectItems.text=Child selectItems tag(s) cannot be resolved at design-time
\ No newline at end of file
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/actions/ActionsResources.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/actions/ActionsResources.java
deleted file mode 100644
index 77ee60b..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/actions/ActionsResources.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http:// www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.pagedesigner.jsf.ui.actions;
-
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-/**
- * @author mengbo
- * @version 1.5
- */
-public class ActionsResources
-{
- private static final String BUNDLE_NAME = "org.eclipse.jst.pagedesigner.jsf.ui.actions.ActionsResources"; //$NON-NLS-1$
-
- private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle.getBundle(BUNDLE_NAME);
-
- private ActionsResources()
- {
- // no external instantiation
- }
-
- /**
- * @param key
- * @return the res bundle string for key or !key! if not found
- */
- public static String getString(String key)
- {
- try
- {
- return RESOURCE_BUNDLE.getString(key);
- }
- catch (MissingResourceException e)
- {
- return '!' + key + '!';
- }
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/actions/ActionsResources.properties b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/actions/ActionsResources.properties
deleted file mode 100644
index 0f46733..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/actions/ActionsResources.properties
+++ /dev/null
@@ -1,28 +0,0 @@
-###############################################################################
-# Copyright (c) 2001, 2007 Oracle Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# Oracle Corporation - initial API and implementation
-###############################################################################
-AddValueChangeListenerAction.ActionLabel.ValueChangeListener=ValueChangeListener
-AddValidateDoubleRangeAction.ActionLabel.DoubleRange=Double Range
-AddValidateLengthAction.ActionLabel.Length=Length
-AddValidateLongRangeAction.ActionLabel.LongRange=Long Range
-AddConvertDateTimeAction.ActionLabel.DateTime=Date Time
-AddConvertNumberAction.ActionLabel.Number=Number
-AddAttributeAction.Wizard.NewAttribute=New Attribute
-AddAttributeAction.ActionLabel.Attribute=Attribute
-AddSelectItemAction.ActionLabel.SelectItem=Select Item
-AddSelectItemsAction.ActionLabel.SelectItems=Select Items
-AddAttributeAction.Wizard.Description=Enter a name and value for the attribute.
-AddParamAction.ActionLabel.Param=Param
-
-Submenu.JSFAdd=JSF Add
-Submenu.JSFAdd.Converter=Converter
-Submenu.JSFAdd.Validators=Validators
-
-PageFlowContributor.Menu.PageFlow=PageFlow
\ No newline at end of file
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/actions/AddActionListenerAction.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/actions/AddActionListenerAction.java
deleted file mode 100644
index 11148ff..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/actions/AddActionListenerAction.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http:// www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.pagedesigner.jsf.ui.actions;
-
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMElement;
-
-import org.eclipse.jst.jsf.core.internal.tld.IJSFConstants;
-import org.eclipse.jst.jsf.core.internal.tld.ITLDConstants;
-import org.eclipse.jst.pagedesigner.properties.attrgroup.DialogUtil;
-
-/**
- * @author mengbo
- * @version 1.5
- */
-public class AddActionListenerAction extends JSFAddChildAction
-{
- /**
- * @param parentEle
- *
- */
- public AddActionListenerAction(IDOMElement parentEle)
- {
- super("ActionListener", parentEle); //$NON-NLS-1$
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.action.Action#run()
- */
- public void run()
- {
- DialogUtil.createSubElement(getShell(), getParentElement(), ITLDConstants.URI_JSF_CORE, IJSFConstants.TAG_ACTIONLISTENER, new String[]{"type"}); //$NON-NLS-1$
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/actions/AddAttributeAction.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/actions/AddAttributeAction.java
deleted file mode 100644
index 85fa345..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/actions/AddAttributeAction.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http:// www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.pagedesigner.jsf.ui.actions;
-
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMElement;
-
-import org.eclipse.jst.jsf.core.internal.tld.ITLDConstants;
-import org.eclipse.jst.pagedesigner.properties.attrgroup.DialogUtil;
-
-/**
- * @author mengbo
- * @version 1.5
- */
-public class AddAttributeAction extends JSFAddChildAction
-{
-
- /**
- * @param parentNode
- */
- public AddAttributeAction(IDOMElement parentNode)
- {
- super(ActionsResources.getString("AddAttributeAction.ActionLabel.Attribute"), parentNode); //$NON-NLS-1$
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.action.Action#run()
- */
- public void run()
- {
- DialogUtil.createSubElement(getShell(), getParentElement(), ITLDConstants.URI_JSF_CORE, "attribute", new String[]{"name", "value"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-// CommonDialogFieldGroup group = new CommonDialogFieldGroup();
-//
-// AttributeData[] data = createAttributeData();
-// group.setAttributeData(data);
-//
-// DialogFieldGroupPage page = new DialogFieldGroupPage("Attribute", group); //$NON-NLS-1$
-// page.setTitle(ActionsResources.getString("AddAttributeAction.Wizard.NewAttribute")); //$NON-NLS-1$
-// page.setDescription(ActionsResources.getString("AddAttributeAction.Wizard.Description")); //$NON-NLS-1$
-// CommonDialogFieldWizard wizard = new CommonDialogFieldWizard(page);
-// wizard.setWindowTitle(ActionsResources.getString("AddAttributeAction.Wizard.NewAttribute")); //$NON-NLS-1$
-// WizardDialog dialog = new WizardDialog(getShell(), wizard);
-// dialog.create();
-// if (dialog.open() == WizardDialog.OK)
-// {
-// group.prepareData();
-// Map attributesMap = new HashMap();
-// for (int i = 0; i < data.length; i++)
-// {
-// attributesMap.put(data[i].attributeName, data[i].value);
-// }
-// AddJSFCoreChildCommand command = new AddJSFCoreChildCommand(this.getParentElement(),
-// IJSFConstants.TAG_ATTRIBUTE, attributesMap);
-// command.execute();
-// }
- }
-
-// private AttributeData[] createAttributeData()
-// {
-// return new AttributeData[]
-// {
-// new AttributeData(IJMTConstants.URI_JSF_CORE, IJSFConstants.TAG_ATTRIBUTE, IJSFConstants.ATTR_NAME),
-// new AttributeData(IJMTConstants.URI_JSF_CORE, IJSFConstants.TAG_ATTRIBUTE, IJSFConstants.ATTR_VALUE)
-// }
-// ;
-// }
-}
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/actions/AddConvertDateTimeAction.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/actions/AddConvertDateTimeAction.java
deleted file mode 100644
index 6172669..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/actions/AddConvertDateTimeAction.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http:// www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.pagedesigner.jsf.ui.actions;
-
-import org.eclipse.jst.jsf.core.internal.tld.IJSFConstants;
-import org.eclipse.jst.pagedesigner.jsf.ui.commands.jsfhtml.AddJSFCoreChildCommand;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMElement;
-
-
-/**
- * @author mengbo
- * @version 1.5
- */
-public class AddConvertDateTimeAction extends JSFAddChildAction
-{
-
- /**
- * @param parentNode
- */
- public AddConvertDateTimeAction(IDOMElement parentNode)
- {
- super(ActionsResources.getString("AddConvertDateTimeAction.ActionLabel.DateTime"), parentNode); //$NON-NLS-1$
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.action.Action#run()
- */
- public void run()
- {
- AddJSFCoreChildCommand command = new AddJSFCoreChildCommand(this.getParentElement(),
- IJSFConstants.TAG_CONVERTDATETIME, null);
- command.execute();
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/actions/AddConvertNumberAction.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/actions/AddConvertNumberAction.java
deleted file mode 100644
index af33b52..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/actions/AddConvertNumberAction.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http:// www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.pagedesigner.jsf.ui.actions;
-
-import org.eclipse.jst.jsf.core.internal.tld.IJSFConstants;
-import org.eclipse.jst.pagedesigner.jsf.ui.commands.jsfhtml.AddJSFCoreChildCommand;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMElement;
-
-
-/**
- * @author mengbo
- * @version 1.5
- */
-public class AddConvertNumberAction extends JSFAddChildAction
-{
-
- /**
- * @param parentNode
- */
- public AddConvertNumberAction(IDOMElement parentNode)
- {
- super(ActionsResources.getString("AddConvertNumberAction.ActionLabel.Number"), parentNode); //$NON-NLS-1$
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.action.Action#run()
- */
- public void run()
- {
- AddJSFCoreChildCommand command = new AddJSFCoreChildCommand(this.getParentElement(),
- IJSFConstants.TAG_CONVERTNUMBER, null);
- command.execute();
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/actions/AddConverterAction.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/actions/AddConverterAction.java
deleted file mode 100644
index fb6d378..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/actions/AddConverterAction.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http:// www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.pagedesigner.jsf.ui.actions;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.jst.jsf.core.internal.tld.IJSFConstants;
-import org.eclipse.jst.pagedesigner.jsf.ui.commands.jsfhtml.AddJSFCoreChildCommand;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMElement;
-
-
-/**
- * @author mengbo
- * @version 1.5
- */
-public class AddConverterAction extends JSFAddChildAction
-{
- String _converterId;
-
- /**
- * @param converterId
- * @param parentNode
- */
- public AddConverterAction(String converterId, IDOMElement parentNode)
- {
- super(converterId, parentNode);
- this._converterId = converterId;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.action.Action#run()
- */
- public void run()
- {
- Map attributes = new HashMap();
- attributes.put("converterId", _converterId); //$NON-NLS-1$
- AddJSFCoreChildCommand command = new AddJSFCoreChildCommand(this.getParentElement(),
- IJSFConstants.TAG_CONVERTER, attributes);
- command.execute();
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/actions/AddParamAction.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/actions/AddParamAction.java
deleted file mode 100644
index 8cb1a74..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/actions/AddParamAction.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http:// www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.pagedesigner.jsf.ui.actions;
-
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMElement;
-
-import org.eclipse.jst.jsf.core.internal.tld.IJSFConstants;
-import org.eclipse.jst.jsf.core.internal.tld.ITLDConstants;
-import org.eclipse.jst.pagedesigner.properties.attrgroup.DialogUtil;
-
-/**
- * @author mengbo
- * @version 1.5
- */
-public class AddParamAction extends JSFAddChildAction
-{
-
- /**
- * @param parentNode
- */
- public AddParamAction(IDOMElement parentNode)
- {
- super(ActionsResources.getString("AddParamAction.ActionLabel.Param"), parentNode); //$NON-NLS-1$
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.action.Action#run()
- */
- public void run()
- {
- DialogUtil.createSubElement(getShell(), getParentElement(), ITLDConstants.URI_JSF_CORE,
- IJSFConstants.TAG_PARAM, new String[] { IJSFConstants.ATTR_NAME, IJSFConstants.ATTR_VALUE});
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/actions/AddSelectItemAction.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/actions/AddSelectItemAction.java
deleted file mode 100644
index c725801..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/actions/AddSelectItemAction.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http:// www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.pagedesigner.jsf.ui.actions;
-
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMElement;
-
-import org.eclipse.jst.jsf.core.internal.tld.IJSFConstants;
-import org.eclipse.jst.jsf.core.internal.tld.ITLDConstants;
-import org.eclipse.jst.pagedesigner.properties.attrgroup.DialogUtil;
-
-/**
- * @author mengbo
- * @version 1.5
- */
-public class AddSelectItemAction extends JSFAddChildAction
-{
-
- /**
- * @param parentNode
- */
- public AddSelectItemAction(IDOMElement parentNode)
- {
- super(ActionsResources.getString("AddSelectItemAction.ActionLabel.SelectItem"), parentNode); //$NON-NLS-1$
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.action.Action#run()
- */
- public void run()
- {
- DialogUtil.createSubElement(getShell(), getParentElement(), ITLDConstants.URI_JSF_CORE,
- IJSFConstants.TAG_SELECTITEM, new String[] { IJSFConstants.ATTR_ITEMLABEL, IJSFConstants.ATTR_ITEMVALUE});
- }
-}
-
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/actions/AddSelectItemsAction.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/actions/AddSelectItemsAction.java
deleted file mode 100644
index 5598887..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/actions/AddSelectItemsAction.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http:// www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.pagedesigner.jsf.ui.actions;
-
-import org.eclipse.jst.jsf.core.internal.tld.IJSFConstants;
-import org.eclipse.jst.jsf.core.internal.tld.ITLDConstants;
-import org.eclipse.jst.pagedesigner.properties.attrgroup.DialogUtil;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMElement;
-
-
-/**
- * @author mengbo
- * @version 1.5
- */
-public class AddSelectItemsAction extends JSFAddChildAction
-{
-
- /**
- * @param parentNode
- */
- public AddSelectItemsAction(IDOMElement parentNode)
- {
- super(ActionsResources.getString("AddSelectItemsAction.ActionLabel.SelectItems"), parentNode); //$NON-NLS-1$
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.action.Action#run()
- */
- public void run()
- {
-// AddJSFCoreChildCommand command = new AddJSFCoreChildCommand(this.getParentElement(),
-// IJSFConstants.TAG_SELECTITEMS, attributes);
-// command.execute();
- DialogUtil.createSubElement(getShell(), getParentElement(), ITLDConstants.URI_JSF_CORE,
- IJSFConstants.TAG_SELECTITEMS, new String[] { IJSFConstants.ATTR_ID, IJSFConstants.ATTR_BINDING, IJSFConstants.ATTR_VALUE});
-
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/actions/AddValidateDoubleRangeAction.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/actions/AddValidateDoubleRangeAction.java
deleted file mode 100644
index c6c7855..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/actions/AddValidateDoubleRangeAction.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http:// www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.pagedesigner.jsf.ui.actions;
-
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMElement;
-
-import org.eclipse.jst.jsf.core.internal.tld.IJSFConstants;
-import org.eclipse.jst.jsf.core.internal.tld.ITLDConstants;
-import org.eclipse.jst.pagedesigner.properties.attrgroup.DialogUtil;
-
-/**
- * @author mengbo
- * @version 1.5
- */
-public class AddValidateDoubleRangeAction extends JSFAddChildAction
-{
-
- /**
- * @param parentNode
- */
- public AddValidateDoubleRangeAction(IDOMElement parentNode)
- {
- super(ActionsResources.getString("AddValidateDoubleRangeAction.ActionLabel.DoubleRange"), parentNode); //$NON-NLS-1$
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.action.Action#run()
- */
- public void run()
- {
- DialogUtil.createSubElement(getShell(), getParentElement(), ITLDConstants.URI_JSF_CORE,
- IJSFConstants.TAG_VALIDATEDOUBLERANGE, new String[] { IJSFConstants.ATTR_MINIMUM,
- IJSFConstants.ATTR_MAXIMUM});
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/actions/AddValidateLengthAction.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/actions/AddValidateLengthAction.java
deleted file mode 100644
index b89cf1d..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/actions/AddValidateLengthAction.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http:// www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.pagedesigner.jsf.ui.actions;
-
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMElement;
-
-import org.eclipse.jst.jsf.core.internal.tld.IJSFConstants;
-import org.eclipse.jst.jsf.core.internal.tld.ITLDConstants;
-import org.eclipse.jst.pagedesigner.properties.attrgroup.DialogUtil;
-
-/**
- * @author mengbo
- * @version 1.5
- */
-public class AddValidateLengthAction extends JSFAddChildAction
-{
-
- /**
- * @param parentNode
- */
- public AddValidateLengthAction(IDOMElement parentNode)
- {
- super(ActionsResources.getString("AddValidateLengthAction.ActionLabel.Length"), parentNode); //$NON-NLS-1$
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.action.Action#run()
- */
- public void run()
- {
- DialogUtil.createSubElement(getShell(), getParentElement(), ITLDConstants.URI_JSF_CORE,
- IJSFConstants.TAG_VALIDATELENGTH, new String[] { IJSFConstants.ATTR_MINIMUM,
- IJSFConstants.ATTR_MAXIMUM});
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/actions/AddValidateLongRangeAction.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/actions/AddValidateLongRangeAction.java
deleted file mode 100644
index a12ce56..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/actions/AddValidateLongRangeAction.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http:// www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.pagedesigner.jsf.ui.actions;
-
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMElement;
-
-import org.eclipse.jst.jsf.core.internal.tld.IJSFConstants;
-import org.eclipse.jst.jsf.core.internal.tld.ITLDConstants;
-import org.eclipse.jst.pagedesigner.properties.attrgroup.DialogUtil;
-
-/**
- * @author mengbo
- * @version 1.5
- */
-public class AddValidateLongRangeAction extends JSFAddChildAction
-{
-
- /**
- * @param parentNode
- */
- public AddValidateLongRangeAction(IDOMElement parentNode)
- {
- super(ActionsResources.getString("AddValidateLongRangeAction.ActionLabel.LongRange"), parentNode); //$NON-NLS-1$
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.action.Action#run()
- */
- public void run()
- {
- DialogUtil.createSubElement(getShell(), getParentElement(), ITLDConstants.URI_JSF_CORE,
- IJSFConstants.TAG_VALIDATELONGRANGE, new String[] { IJSFConstants.ATTR_MINIMUM,
- IJSFConstants.ATTR_MAXIMUM});
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/actions/AddValidatorAction.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/actions/AddValidatorAction.java
deleted file mode 100644
index 2e65fef..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/actions/AddValidatorAction.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http:// www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.pagedesigner.jsf.ui.actions;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.jst.jsf.core.internal.tld.IJSFConstants;
-import org.eclipse.jst.pagedesigner.jsf.ui.commands.jsfhtml.AddJSFCoreChildCommand;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMElement;
-
-
-/**
- * @author mengbo
- * @version 1.5
- */
-public class AddValidatorAction extends JSFAddChildAction
-{
- String _validatorId;
-
- /**
- * @param validatorId
- * @param parentNode
- */
- public AddValidatorAction(String validatorId, IDOMElement parentNode)
- {
- super(validatorId, parentNode);
- this._validatorId = validatorId;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.action.Action#run()
- */
- public void run()
- {
- Map attributes = new HashMap();
- attributes.put("validatorId", _validatorId); //$NON-NLS-1$
- AddJSFCoreChildCommand command = new AddJSFCoreChildCommand(this.getParentElement(),
- IJSFConstants.TAG_VALIDATOR, attributes);
- command.execute();
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/actions/AddValueChangeListenerAction.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/actions/AddValueChangeListenerAction.java
deleted file mode 100644
index cb76f44..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/actions/AddValueChangeListenerAction.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http:// www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.pagedesigner.jsf.ui.actions;
-
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMElement;
-
-import org.eclipse.jst.jsf.core.internal.tld.IJSFConstants;
-import org.eclipse.jst.jsf.core.internal.tld.ITLDConstants;
-import org.eclipse.jst.pagedesigner.properties.attrgroup.DialogUtil;
-
-/**
- * @author mengbo
- * @version 1.5
- */
-public class AddValueChangeListenerAction extends JSFAddChildAction
-{
-
- /**
- * @param parentNode
- */
- public AddValueChangeListenerAction(IDOMElement parentNode)
- {
- super(ActionsResources.getString("AddValueChangeListenerAction.ActionLabel.ValueChangeListener"), parentNode); //$NON-NLS-1$
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.action.Action#run()
- */
- public void run()
- {
- DialogUtil.createSubElement(getShell(), getParentElement(), ITLDConstants.URI_JSF_CORE,
- IJSFConstants.TAG_VALUECHANGELISTENER, new String[] { IJSFConstants.ATTR_TYPE});
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/actions/DeleteHColumnHeaderFooterAction.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/actions/DeleteHColumnHeaderFooterAction.java
deleted file mode 100644
index 8d6fa01..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/actions/DeleteHColumnHeaderFooterAction.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http:// www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.pagedesigner.jsf.ui.actions;
-
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.jface.action.Action;
-import org.eclipse.jst.pagedesigner.jsf.ui.elementedit.request.DeleteHColumnHeaderFooterRequest;
-
-
-/**
- * @author mengbo
- * @version 1.5
- */
-public class DeleteHColumnHeaderFooterAction extends Action
-{
- private Command _command;
-
- /**
- * @param text
- * @param editPart
- * @param isHeader
- */
- public DeleteHColumnHeaderFooterAction(String text, EditPart editPart, boolean isHeader)
- {
- super(text);
- DeleteHColumnHeaderFooterRequest req = new DeleteHColumnHeaderFooterRequest(text, isHeader);
- this._command = editPart.getCommand(req);
- this.setEnabled(this._command != null && this._command.canExecute());
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.action.Action#run()
- */
- public void run()
- {
- _command.execute();
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/actions/DeleteHeaderFooterAction.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/actions/DeleteHeaderFooterAction.java
deleted file mode 100644
index 7df470c..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/actions/DeleteHeaderFooterAction.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http:// www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.pagedesigner.jsf.ui.actions;
-
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.jface.action.Action;
-import org.eclipse.jst.pagedesigner.jsf.ui.elementedit.request.DeleteHeaderFooterRequest;
-
-
-/**
- * @author mengbo
- * @version 1.5
- */
-public class DeleteHeaderFooterAction extends Action
-{
- private Command _command;
-
- /**
- * @param text
- * @param editPart
- * @param isHeader
- */
- public DeleteHeaderFooterAction(String text, EditPart editPart, boolean isHeader)
- {
- super(text);
- DeleteHeaderFooterRequest req = new DeleteHeaderFooterRequest(text, isHeader);
- this._command = editPart.getCommand(req);
- this.setEnabled(this._command != null && this._command.canExecute());
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.action.Action#run()
- */
- public void run()
- {
- _command.execute();
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/actions/ExpressionAction.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/actions/ExpressionAction.java
deleted file mode 100644
index 2f91a13..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/actions/ExpressionAction.java
+++ /dev/null
@@ -1,113 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http:// www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.pagedesigner.jsf.ui.actions;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jface.action.Action;
-import org.eclipse.jst.pagedesigner.jsf.ui.JSFUIPlugin;
-import org.eclipse.jst.pagedesigner.jsp.core.pagevar.IPageVariablesProvider;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.PlatformUI;
-
-
-/**
- * @author mengbo
- * @version 1.5
- */
-public class ExpressionAction extends Action
-{
- /**
- * enumerates a method-binding expression
- */
- public static final int METHOD = 0;
- /**
- * enumerates a value-binding expression
- */
- public static final int VARIABLE = 1;
-
- private String _action;
- private IProject _project;
- private IFile _file;
-
-
- /**
- * @param attribute
- */
- public void setActionValue(String attribute)
- {
- _action = attribute;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.action.IAction#isEnabled()
- */
- public boolean isEnabled()
- {
- return _project != null && isExpression();
- }
-
- private boolean isExpression()
- {
- boolean flag = false;
- if (_action != null)
- {
- flag = _action.startsWith("#{") && _action.endsWith("}");//$NON-NLS-1$ //$NON-NLS-2$ $NON-NLS-2$
- }
- return flag;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.action.IAction#run()
- */
- public void run()
- {
- IPageVariablesProvider pageVarProvider = (IPageVariablesProvider) getPage().getActiveEditor().getAdapter(
- IPageVariablesProvider.class);
- pageVarProvider.refresh();
-
- JSFUIPlugin.getAlerts().warning("Message.Warning.Title", "Message.Warning.InvalidateExpression");//$NON-NLS-1$ //$NON-NLS-2$ $NON-NLS-2$
- }
-
- /**
- * @param projectFor
- */
- public void setProject(IProject projectFor)
- {
- this._project = projectFor;
- }
-
- private IWorkbenchPage getPage()
- {
- IWorkbench workbench = PlatformUI.getWorkbench();
- IWorkbenchWindow window = workbench.getActiveWorkbenchWindow();
- return window.getActivePage();
- }
-
- /**
- * @param fileFor
- */
- public void setFile(IFile fileFor)
- {
- _file = fileFor;
- }
-
- /**
- * @return the file
- */
- public IFile getFile()
- {
- return _file;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/actions/IJSFCoreSupport.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/actions/IJSFCoreSupport.java
deleted file mode 100644
index 70285ee..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/actions/IJSFCoreSupport.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http:// www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.pagedesigner.jsf.ui.actions;
-
-/**
- * This interface is to provide information of how to enable/disable add
- * jsf core sub element.
- *
- * As other JSF taglibs that we don't know today may also use jsf core tags inside
- * them, so we may also enable the actions for adding jsf core tags to them. But
- * we need check whether individual JSF core tags are supported.
- *
- * @author mengbo
- * @version 1.5
- */
-public interface IJSFCoreSupport
-{
- /**
- * actionListener can only be added to those ActionSource component.
- * @return if is an action source
- */
- public boolean isActionSource();
-
- /**
- *
- * @return true if is a UI component
- */
- public boolean isUIComponent();
-
- /**
- * converter (convertXXX) can only be added to those ValueHolder
- * @return true if is a value holder
- */
- public boolean isValueHolder();
-
- /**
- * validator can only be added to EditableValueHolder
- * @return true if is an editable value holder
- */
- public boolean isEditableValueHolder();
-
- /**
- * whether support selectItem and selectItems
- * @return true if supports the UISelectItem(s) contract
- */
- public boolean supportSelectItems();
-}
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/actions/InsertHColumnHeaderFooterAction.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/actions/InsertHColumnHeaderFooterAction.java
deleted file mode 100644
index e177212..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/actions/InsertHColumnHeaderFooterAction.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http:// www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.pagedesigner.jsf.ui.actions;
-
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.jface.action.Action;
-import org.eclipse.jst.pagedesigner.jsf.ui.elementedit.request.InsertHColumnHeaderFooterRequest;
-
-
-/**
- * @author mengbo
- * @version 1.5
- */
-public class InsertHColumnHeaderFooterAction extends Action
-{
- private Command _command;
-
- /**
- * @param text
- * @param editPart
- * @param isHeader
- */
- public InsertHColumnHeaderFooterAction(String text, EditPart editPart, boolean isHeader)
- {
- super(text);
-
- InsertHColumnHeaderFooterRequest req = new InsertHColumnHeaderFooterRequest(text, isHeader);
- this._command = editPart.getCommand(req);
- this.setEnabled(this._command != null && this._command.canExecute());
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.action.Action#run()
- */
- public void run()
- {
- _command.execute();
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/actions/InsertHeaderFooterAction.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/actions/InsertHeaderFooterAction.java
deleted file mode 100644
index f2ac6b8..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/actions/InsertHeaderFooterAction.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http:// www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.pagedesigner.jsf.ui.actions;
-
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.jface.action.Action;
-import org.eclipse.jst.pagedesigner.jsf.ui.elementedit.request.InsertHeaderFooterRequest;
-
-
-/**
- * @author mengbo
- * @version 1.5
- */
-public class InsertHeaderFooterAction extends Action
-{
- private Command _command;
-
- /**
- * @param text
- * @param editPart
- * @param isHeader
- */
- public InsertHeaderFooterAction(String text, EditPart editPart, boolean isHeader)
- {
- super(text);
-
- InsertHeaderFooterRequest req = new InsertHeaderFooterRequest(text, isHeader);
- this._command = editPart.getCommand(req);
- this.setEnabled(this._command != null && this._command.canExecute());
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.action.Action#run()
- */
- public void run()
- {
- _command.execute();
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/actions/JSFAddActionGroup.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/actions/JSFAddActionGroup.java
deleted file mode 100644
index 8deaeaf..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/actions/JSFAddActionGroup.java
+++ /dev/null
@@ -1,218 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http:// www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.pagedesigner.jsf.ui.actions;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.action.IContributionItem;
-import org.eclipse.jface.action.IMenuListener;
-import org.eclipse.jface.action.IMenuManager;
-import org.eclipse.jface.action.MenuManager;
-import org.eclipse.jface.action.Separator;
-import org.eclipse.jst.jsf.core.jsfappconfig.internal.IJSFAppConfigManager;
-import org.eclipse.jst.jsf.core.jsfappconfig.internal.JSFAppConfigManagerFactory;
-import org.eclipse.jst.jsf.facesconfig.emf.ConverterIdType;
-import org.eclipse.jst.jsf.facesconfig.emf.ConverterType;
-import org.eclipse.jst.jsf.facesconfig.emf.ValidatorIdType;
-import org.eclipse.jst.jsf.facesconfig.emf.ValidatorType;
-import org.eclipse.jst.pagedesigner.editors.PageDesignerActionConstants;
-import org.eclipse.jst.pagedesigner.utils.StructuredModelUtil;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMElement;
-
-/**
- * @author mengbo
- * @version 1.5
- */
-public class JSFAddActionGroup {
-
- private final static Action EMPTY_ACTION = new Action() {
- // TODO: why?
- };
-
-
- /**
- * @param menu
- * @param element
- * @param support
- */
- public void fillContextMenu(IMenuManager menu, final IDOMElement element,
- final IJSFCoreSupport support) {
- IContributionItem item = menu.find(PageDesignerActionConstants.INSERT_SUBMENU_ID);
-
- if (item instanceof IMenuManager)
- {
- final IMenuManager submenu = (IMenuManager) item;
- submenu.add(EMPTY_ACTION);
- submenu.addMenuListener(new IMenuListener() {
- public void menuAboutToShow(IMenuManager manager) {
- submenu.removeAll();
- addJSFAddItems(submenu, element, support);
- }
- });
- }
- //menu.appendToGroup(PageDesignerActionConstants.GROUP_SPECIAL, submenu);
- }
-
- /**
- * @param submenu
- * @param element
- */
- private void addJSFAddItems(IMenuManager submenu, IDOMElement element,
- IJSFCoreSupport support) {
- AddActionListenerAction actionListenerAction = new AddActionListenerAction(
- element);
- actionListenerAction.setEnabled(support.isActionSource());
- submenu.add(actionListenerAction);
-
- AddAttributeAction attrAction = new AddAttributeAction(element);
- attrAction.setEnabled(support.isUIComponent());
- submenu.add(attrAction);
-
- IProject prj = null;
- IFile file = StructuredModelUtil.getFileFor(element.getModel());
- if (file != null) {
- prj = file.getProject();
- }
-
- IMenuManager converterMenu = new MenuManager(ActionsResources
- .getString("Submenu.JSFAdd.Converter"));//$NON-NLS-1$
- boolean supportConverter = support.isValueHolder();
- String[] converterIds = getRegisteredConverterIds(prj);
- if (converterIds != null && converterIds.length > 0) {
- for (int i = 0; i < converterIds.length; i++) {
- AddConverterAction action = new AddConverterAction(
- converterIds[i], element);
- action.setEnabled(supportConverter);
- converterMenu.add(action);
- }
- converterMenu.add(new Separator());
- }
- AddConvertDateTimeAction dateTimeAction = new AddConvertDateTimeAction(
- element);
- dateTimeAction.setEnabled(supportConverter);
- converterMenu.add(dateTimeAction);
- AddConvertNumberAction numberAction = new AddConvertNumberAction(
- element);
- numberAction.setEnabled(supportConverter);
- converterMenu.add(numberAction);
- submenu.add(converterMenu);
-
- AddParamAction addParamAction = new AddParamAction(element);
- addParamAction.setEnabled(support.isUIComponent());
- submenu.add(addParamAction);
-
- AddSelectItemAction selectItemAction = new AddSelectItemAction(element);
- selectItemAction.setEnabled(support.supportSelectItems());
- submenu.add(selectItemAction);
-
- AddSelectItemsAction selectItemsAction = new AddSelectItemsAction(
- element);
- selectItemsAction.setEnabled(support.supportSelectItems());
- submenu.add(selectItemsAction);
-
- IMenuManager validatorMenu = new MenuManager(ActionsResources
- .getString("Submenu.JSFAdd.Validators"));//$NON-NLS-1$
- boolean supportValidator = support.isEditableValueHolder();
- String[] validatorIds = getRegisteredValidatorIds(prj);
- if (validatorIds != null && validatorIds.length > 0) {
- for (int i = 0; i < validatorIds.length; i++) {
- AddValidatorAction action = new AddValidatorAction(
- validatorIds[i], element);
- action.setEnabled(supportValidator);
- validatorMenu.add(action);
- }
- validatorMenu.add(new Separator());
- }
- AddValidateDoubleRangeAction doubleRangeAction = new AddValidateDoubleRangeAction(
- element);
- doubleRangeAction.setEnabled(supportValidator);
- validatorMenu.add(doubleRangeAction);
- AddValidateLengthAction lengthAction = new AddValidateLengthAction(
- element);
- lengthAction.setEnabled(supportValidator);
- validatorMenu.add(lengthAction);
- AddValidateLongRangeAction longRangeAction = new AddValidateLongRangeAction(
- element);
- longRangeAction.setEnabled(supportValidator);
- validatorMenu.add(longRangeAction);
- submenu.add(validatorMenu);
-
- AddValueChangeListenerAction valueChangeAction = new AddValueChangeListenerAction(
- element);
- valueChangeAction.setEnabled(support.isEditableValueHolder());
- submenu.add(valueChangeAction);
- }
-
- /**
- * @return
- */
- private String[] getRegisteredValidatorIds(IProject project)
- {
- String[] result = null;
-
- IJSFAppConfigManager appConfigMgr =
- JSFAppConfigManagerFactory.getJSFAppConfigManagerInstance(project);
-
- // getInstance may return null if there is a problem
- if (appConfigMgr != null)
- {
- final List<ValidatorType> list = appConfigMgr.getValidators();
- result = new String[list.size()];
- int i = 0;
- for (final ValidatorType validator : list)
- {
- ValidatorIdType validatorId = validator.getValidatorId();
- if (validatorId != null)
- {
- result[i++] = validatorId.getTextContent() != null ?
- validatorId.getTextContent().trim() : ""; //$NON-NLS-1$
- }
- }
- }
- return result;
- }
-
- /**
- * @return
- */
- private String[] getRegisteredConverterIds(IProject project)
- {
- String[] result = null;
-
- IJSFAppConfigManager appConfigMgr =
- JSFAppConfigManagerFactory.getJSFAppConfigManagerInstance(project);
-
- // getInstance may return null if there is a problem
- if (appConfigMgr != null)
- {
- final List<ConverterType> list = appConfigMgr.getConverters();
- //prune out converters for classes, they're not valid here
- final List<String> converterIdList = new ArrayList();
- for (final ConverterType converter : list)
- {
- ConverterIdType converterId = converter.getConverterId();
- if (converterId != null)
- {
- converterIdList.add(converterId.getTextContent() != null ?
- converterId.getTextContent().trim() : ""); //$NON-NLS-1$
- }
- }
- result = new String[converterIdList.size()];
- result = converterIdList.toArray(result);
- }
- return result;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/actions/JSFAddChildAction.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/actions/JSFAddChildAction.java
deleted file mode 100644
index 058f67e..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/actions/JSFAddChildAction.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http:// www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.pagedesigner.jsf.ui.actions;
-
-import org.eclipse.jface.action.Action;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMElement;
-
-/**
- * Classes in this package are related to JSF operation.
- *
- * @author mengbo
- * @version 1.5
- */
-public class JSFAddChildAction extends Action
-{
- private IDOMElement _parentEle;
-
- /**
- * @param text
- * @param parentNode
- */
- public JSFAddChildAction(String text, IDOMElement parentNode)
- {
- super(text);
- this._parentEle = parentNode;
- }
-
- /**
- * @return the parent element
- */
- public IDOMElement getParentElement()
- {
- return _parentEle;
- }
-
- /**
- * @return the active shell
- */
- public Shell getShell()
- {
- IWorkbench bench = PlatformUI.getWorkbench();
- if (bench != null)
- {
- IWorkbenchWindow window = bench.getActiveWorkbenchWindow();
- if (window == null)
- {
- IWorkbenchWindow[] windows = bench.getWorkbenchWindows();
- if (windows != null && windows.length > 0)
- {
- window = windows[0];
- }
- }
- if (window != null)
- {
- return window.getShell();
- }
- }
-
- return null;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/actions/JSFCommandLinkCreator.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/actions/JSFCommandLinkCreator.java
deleted file mode 100644
index 36dd0e9..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/actions/JSFCommandLinkCreator.java
+++ /dev/null
@@ -1,101 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http:// www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.pagedesigner.jsf.ui.actions;
-
-import org.eclipse.gef.EditPart;
-import org.eclipse.jst.jsf.core.internal.tld.IJSFConstants;
-import org.eclipse.jst.jsf.core.internal.tld.ITLDConstants;
-import org.eclipse.jst.pagedesigner.actions.link.AbstractLinkCreator;
-import org.eclipse.jst.pagedesigner.actions.link.LinkUtil;
-import org.eclipse.jst.pagedesigner.parts.TextEditPart;
-import org.eclipse.jst.pagedesigner.utils.JSPUtil;
-import org.eclipse.jst.pagedesigner.viewer.DesignPosition;
-import org.eclipse.jst.pagedesigner.viewer.DesignRange;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.Text;
-
-/**
- * @author mengbo
- * @version 1.5
- */
-public class JSFCommandLinkCreator extends AbstractLinkCreator
-{
- /* (non-Javadoc)
- * @see org.eclipse.jst.pagedesigner.actions.link.ILinkCreator#makeLinkElement(org.eclipse.gef.EditPart, org.eclipse.jst.pagedesigner.viewer.DesignRange)
- */
- public Element makeLinkElement(EditPart part, DesignRange range)
- {
- if (part instanceof TextEditPart)
- {
- Text middleNode = LinkUtil.splitDomText(part, range);
- EditPart parent = part.getParent();
- Node parentNode = (Node) parent.getModel();
- Document doc = (parentNode instanceof Document) ? (Document) parentNode : (parentNode.getOwnerDocument());
-
- IDOMModel model = ((IDOMNode) parentNode).getModel();
- String prefix = JSPUtil.getOrCreatePrefix(model, ITLDConstants.URI_JSF_HTML, "h"); //$NON-NLS-1$
- JSPUtil.getOrCreatePrefix(model, ITLDConstants.URI_JSF_CORE, "f"); //$NON-NLS-1$
-
- Element commandLink = doc.createElement(IJSFConstants.TAG_COMMANDLINK);
- commandLink.setPrefix(prefix);
- Element outputText = doc.createElement(IJSFConstants.TAG_OUTPUTTEXT);
- outputText.setPrefix(prefix);
- outputText.setAttribute(IJSFConstants.ATTR_VALUE, middleNode.getNodeValue());
- commandLink.appendChild(outputText);
-
- parentNode.replaceChild(commandLink, middleNode);
- return commandLink;
- }
-
- return null;
-
- }
-
-
- /**
- * @param range
- * @return true if can execute
- */
- public boolean canExecute(DesignRange range)
- {
- DesignPosition startPosition = range.getStartPosition();
- EditPart part = startPosition.getContainerPart();
- IDOMNode node = (IDOMNode) part.getModel();
- IDOMModel model = node.getModel();
- return model.getDocument().getElementsByTagNameNS(ITLDConstants.URI_JSF_HTML, "view") != null; //$NON-NLS-1$
-
- }
-
- public String getSourcePreview(EditPart part, DesignRange range)
- {
- if (part instanceof TextEditPart)
- {
- TextEditPart textPart = (TextEditPart) part;
- int[] offsets = textPart.getSelectedRange();
-
- String displayData = textPart.getTextData();
- String linkExp = displayData.substring(offsets[0], offsets[1]);
-
- StringBuffer sb = new StringBuffer();
- sb.append("<h:commandLink>\n<h:outputText value=\""); //$NON-NLS-1$
- sb.append(linkExp);
- sb.append("\">"); //$NON-NLS-1$
- sb.append("</h:outputText>\n</h:commandLink>"); //$NON-NLS-1$
- return sb.toString();
- }
- return null;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/actions/JSFNavigationGroup.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/actions/JSFNavigationGroup.java
deleted file mode 100644
index 4d593e3..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/actions/JSFNavigationGroup.java
+++ /dev/null
@@ -1,110 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http:// www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.pagedesigner.jsf.ui.actions;
-
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.action.IContributionItem;
-import org.eclipse.jface.action.IMenuListener;
-import org.eclipse.jface.action.IMenuManager;
-import org.eclipse.jface.action.MenuManager;
-import org.eclipse.jst.pagedesigner.css2.property.ICSSPropertyID;
-import org.eclipse.jst.pagedesigner.editors.PageDesignerActionConstants;
-import org.eclipse.jst.pagedesigner.jsf.ui.JSFUIPlugin;
-import org.eclipse.jst.pagedesigner.utils.StructuredModelUtil;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMElement;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-
-
-/**
- * @author mengbo
- * @version 1.5
- */
-public class JSFNavigationGroup
-{
- private final static Action EMPTY_ACTION = new Action()
- {
- // TODO: why?
- };
-
-
- /**
- * @param menu
- * @param element
- * @param support
- */
- public void fillContextMenu(IMenuManager menu, final IDOMElement element, final IJSFCoreSupport support)
- {
- final IContributionItem item =
- menu.find(PageDesignerActionConstants.NAVIGATE_SUBMENU_ID);
-
- if (item instanceof IMenuManager)
- {
- final IMenuManager submenu = (IMenuManager) item;
- final IMenuManager javaMenu = new MenuManager(JSFUIPlugin.getResourceString("ElementEdit.Submenu.JavaNavigation"));//$NON-NLS-1$
- javaMenu.add(EMPTY_ACTION);
- javaMenu.addMenuListener(new IMenuListener()
- {
- public void menuAboutToShow(IMenuManager manager)
- {
- javaMenu.removeAll();
- addNavigationItems(javaMenu, element, support);
- }
- }
- );
-
- submenu.appendToGroup(PageDesignerActionConstants.GROUP_NAVIGATE, javaMenu);
- }
- }
-
- private void addNavigationItems(IMenuManager submenu, IDOMElement ele, IJSFCoreSupport support)
- {
- if (support.isActionSource())
- {
- ExpressionAction action = new ExpressionAction();
- action.setText(JSFUIPlugin.getResourceString("ElementEdit.Submenu.JavaNavigation.Action"));//$NON-NLS-1$
- if (ele != null)
- {
- action.setActionValue(ele.getAttribute(ICSSPropertyID.ATTR_ACTION));
- IDOMModel model = ele.getModel();
- action.setProject(StructuredModelUtil.getProjectFor(model));
- action.setFile(StructuredModelUtil.getFileFor(model));
- }
- submenu.add(action);
- }
- if (support.isValueHolder())
- {
- ExpressionAction action = new ExpressionAction();
- action.setText(JSFUIPlugin.getResourceString("ElementEdit.Submenu.JavaNavigation.Value"));//$NON-NLS-1$
- if (ele != null)
- {
- action.setActionValue(ele.getAttribute(ICSSPropertyID.ATTR_VALUE));
- IDOMModel model = ele.getModel();
- action.setProject(StructuredModelUtil.getProjectFor(model));
- action.setFile(StructuredModelUtil.getFileFor(model));
- }
- submenu.add(action);
- }
-
- {
- ExpressionAction action = new ExpressionAction();
- action.setText(JSFUIPlugin.getResourceString("ElementEdit.Submenu.JavaNavigation.Binding"));//$NON-NLS-1$
- if (ele != null)
- {
- action.setActionValue(ele.getAttribute(ICSSPropertyID.ATTR_BINDING));
- IDOMModel model = ele.getModel();
- action.setProject(StructuredModelUtil.getProjectFor(model));
- action.setFile(StructuredModelUtil.getFileFor(model));
- }
- submenu.add(action);
- }
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/actions/JSFOutputLinkCreator.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/actions/JSFOutputLinkCreator.java
deleted file mode 100644
index 4edf62c..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/actions/JSFOutputLinkCreator.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http:// www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.pagedesigner.jsf.ui.actions;
-
-import org.eclipse.gef.EditPart;
-import org.eclipse.jst.jsf.core.internal.tld.IJSFConstants;
-import org.eclipse.jst.jsf.core.internal.tld.ITLDConstants;
-import org.eclipse.jst.pagedesigner.actions.link.AbstractLinkCreator;
-import org.eclipse.jst.pagedesigner.actions.link.LinkUtil;
-import org.eclipse.jst.pagedesigner.parts.TextEditPart;
-import org.eclipse.jst.pagedesigner.utils.JSPUtil;
-import org.eclipse.jst.pagedesigner.viewer.DesignPosition;
-import org.eclipse.jst.pagedesigner.viewer.DesignRange;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.Text;
-
-/**
- * @author mengbo
- * @version 1.5
- */
-public class JSFOutputLinkCreator extends AbstractLinkCreator
-{
- /* (non-Javadoc)
- * @see org.eclipse.jst.pagedesigner.actions.link.ILinkCreator#makeLinkElement(org.eclipse.gef.EditPart, org.eclipse.jst.pagedesigner.viewer.DesignRange)
- */
- public Element makeLinkElement(EditPart part, DesignRange range)
- {
- if (part instanceof TextEditPart)
- {
- Text middleNode = LinkUtil.splitDomText(part, range);
- EditPart parent = part.getParent();
- Node parentNode = (Node) parent.getModel();
- Document doc = (parentNode instanceof Document) ? (Document) parentNode : (parentNode.getOwnerDocument());
-
- IDOMModel model = ((IDOMNode) parentNode).getModel();
- String prefix = JSPUtil.getOrCreatePrefix(model, ITLDConstants.URI_JSF_HTML, "h"); //$NON-NLS-1$
- String fPrefix = JSPUtil.getOrCreatePrefix(model, ITLDConstants.URI_JSF_CORE, "f"); //$NON-NLS-1$
-
- Element outputLink = doc.createElement(IJSFConstants.TAG_OUTPUTLINK);
- outputLink.setPrefix(prefix);
- Element verbatim = doc.createElement(IJSFConstants.TAG_VERBATIM);
- verbatim.setPrefix(fPrefix);
- Text value = doc.createTextNode(middleNode.getNodeValue());
- verbatim.appendChild(value);
- outputLink.appendChild(verbatim);
-
- parentNode.replaceChild(outputLink, middleNode);
- return outputLink;
- }
-
- return null;
-
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.pagedesigner.actions.link.AbstractLinkCreator#canExecute(org.eclipse.jst.pagedesigner.viewer.DesignRange)
- */
- public boolean canExecute(DesignRange range)
- {
- DesignPosition startPosition = range.getStartPosition();
- EditPart part = startPosition.getContainerPart();
- IDOMNode node = (IDOMNode) part.getModel();
- IDOMModel model = node.getModel();
- return model.getDocument().getElementsByTagNameNS(ITLDConstants.URI_JSF_HTML, "view") != null; //$NON-NLS-1$
-
- }
-
- public String getSourcePreview(EditPart part, DesignRange range)
- {
- if (part instanceof TextEditPart)
- {
- TextEditPart textPart = (TextEditPart) part;
- int[] offsets = textPart.getSelectedRange();
- String displayData = textPart.getTextData();
- String linkExp = displayData.substring(offsets[0], offsets[1]);
-
- StringBuffer sb = new StringBuffer();
- sb.append("<h:outputLink>\n<f:verbatim>"); //$NON-NLS-1$
- sb.append(linkExp);
- sb.append("</f:verbatim>\n</h:outputLink>"); //$NON-NLS-1$
- return sb.toString();
- }
- return null;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/actions/PageFlowContributor.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/actions/PageFlowContributor.java
deleted file mode 100644
index 293965d..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/actions/PageFlowContributor.java
+++ /dev/null
@@ -1,118 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http:// www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.pagedesigner.jsf.ui.actions;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.action.IMenuManager;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jst.pagedesigner.editors.PageDesignerActionConstants;
-import org.eclipse.jst.pagedesigner.extensionpoint.IContextMenuItemContributor;
-import org.eclipse.jst.pagedesigner.jsf.ui.JSFUIPlugin;
-import org.eclipse.jst.pagedesigner.utils.StructuredModelUtil;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.ui.IWorkbenchActionConstants;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-
-
-/**
- * @author mengbo
- * @version 1.5
- */
-public class PageFlowContributor implements IContextMenuItemContributor
-{
- private String _uri;
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.pagedesigner.extensionpoint.IContextMenuItemContributor#setURI(java.lang.String)
- */
- public void setURI(String uri)
- {
- this._uri = uri;
-
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.pagedesigner.extensionpoint.IContextMenuItemContributor#getURI()
- */
- public String getURI()
- {
- return _uri;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.pagedesigner.extensionpoint.IContextMenuItemContributor#setModel(org.eclipse.wst.sse.core.internal.provisional.IStructuredModel)
- */
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.pagedesigner.extensionpoint.IContextMenuItemContributor#fillContextMenu(org.eclipse.jface.action.IMenuManager)
- */
- public void fillContextMenu(IMenuManager manager, ISelection selection, IStructuredModel model, Control parentUI)
- {
- PageFlowAction action = new PageFlowAction();
- action.setId(PageFlowAction.ID);
- action.setModel(model);
- IMenuManager viewMgr = manager.findMenuUsingPath(PageDesignerActionConstants.SHOWVIEW_SUBMENU_ID);
- if (viewMgr != null)
- {
- viewMgr.add(action);
- }
- else
- {
- manager.appendToGroup(IWorkbenchActionConstants.MB_ADDITIONS, action);
- }
- }
-
- private static class PageFlowAction extends Action
- {
- /**
- * this action's id
- */
- public final static String ID = "org.eclipse.jst.pagedesigner.jsf.ui.actions.PageFlowAction"; //$NON-NLS-1$
- private IStructuredModel model;
-
- /**
- * construct the action
- */
- public PageFlowAction()
- {
- setText(ActionsResources.getString("PageFlowContributor.Menu.PageFlow"));//$NON-NLS-1$
- }
-
- /**
- * @param model
- */
- public void setModel(IStructuredModel model)
- {
- this.model = model;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.action.IAction#run()
- */
- public void run()
- {
- IFile file = StructuredModelUtil.getFileFor(model);
- if (file != null)
- {
- try
- {
- // FacesConfigUtil.locateJSPFile(file);
- }
- catch (IllegalArgumentException e)
- {
- JSFUIPlugin.getAlerts().warning("Message.Warning.Title", e.getLocalizedMessage());//$NON-NLS-1$
- }
- }
- }
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/attributegroup/AttributeData.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/attributegroup/AttributeData.java
deleted file mode 100644
index 798da67..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/attributegroup/AttributeData.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http:// www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.pagedesigner.jsf.ui.attributegroup;
-
-import java.util.HashMap;
-
-/**
- * Information and value about a tag attribute
- * @author mengbo
- * @version 1.5
- */
-class AttributeData
-{
- /**
- * possible key in the param map
- */
- static final String SuperType = "superTyle"; //$NON-NLS-1$
- /**
- * possible key in the param map
- */
- static final String Project = "project"; //$NON-NLS-1$
-
- private final String uri;
- private final String elementName;
- private final String attributeName;
- private Object value;
- private HashMap paramMap; // null; lazy initialized
-
- /**
- * @param uri
- * @param elementName
- * @param name
- */
- public AttributeData(String uri,String elementName,String name)
- {
- this.uri = uri;
- this.attributeName = name;
- this.elementName = elementName;
- }
-
- /**
- * @return the uri
- */
- public String getUri() {
- return uri;
- }
-
- /**
- * @return the element name
- */
- public String getElementName() {
- return elementName;
- }
-
- /**
- * @return the attribute name
- */
- public String getAttributeName() {
- return attributeName;
- }
-
- /**
- * @return the value
- */
- public Object getValue() {
- return value;
- }
-
- /**
- * @param value
- */
- public void setValue(Object value) {
- this.value = value;
- }
-
- /**
- * @return the param map
- */
- public HashMap getParamMap()
- {
- if (paramMap == null)
- {
- paramMap = new HashMap();
- }
- return paramMap;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/attributegroup/CommonDialogFieldGroup.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/attributegroup/CommonDialogFieldGroup.java
deleted file mode 100644
index 7959d70..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/attributegroup/CommonDialogFieldGroup.java
+++ /dev/null
@@ -1,156 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http:// www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.pagedesigner.jsf.ui.attributegroup;
-
-import java.util.HashMap;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-
-import org.eclipse.jst.jsf.common.ui.internal.dialogfield.DialogField;
-import org.eclipse.jst.jsf.common.ui.internal.dialogfield.DialogFieldGroup;
-
-/**
- * @author mengbo
- * @version 1.5
- * @TODO - unused now?
- */
-public class CommonDialogFieldGroup extends DialogFieldGroup
-{
- private HashMap map = new HashMap();
- private AttributeData[] attributeData = null;
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.jsf.common.ui.internal.dialogfield.DialogFieldGroup#initialize()
- */
- public void initialize()
- {
- if (attributeData != null)
- {
- for (int i = 0; i < attributeData.length; i++)
- {
- DialogField filed = DialogFieldFactory.getDialogField(attributeData[i]);
- filed.setDialogFieldChangeListener(getDefaultChangeListener());
- map.put(attributeData[i], filed);
- }
- }
- }
-
- /**
- * prepare the dialog field data
- */
- public void prepareData()
- {
- if (attributeData != null)
- {
- for (int i = 0; i < attributeData.length; i++)
- {
- DialogField field = (DialogField) map.get(attributeData[i]);
- DialogFieldFactory.prepareDialogFieldValue(field, attributeData[i]);
- }
- }
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.jsf.common.ui.internal.dialogfield.DialogFieldGroup#refreshData()
- */
- public void refreshData()
- {
- if (attributeData != null)
- {
- for (int i = 0; i < attributeData.length; i++)
- {
- DialogField field = (DialogField) map.get(attributeData[i]);
- DialogFieldFactory.setDialogFieldValue(field, attributeData[i].getValue());
- }
- }
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.jsf.common.ui.internal.dialogfield.DialogFieldGroup#layoutDialogFields(org.eclipse.ui.forms.widgets.FormToolkit, org.eclipse.swt.widgets.Composite)
- */
- public void layoutDialogFields(FormToolkit toolkit, Composite parent)
- {
- GridData data = new GridData(GridData.FILL_BOTH);
- parent.setLayoutData(data);
-
- GridLayout gl = new GridLayout();
- gl.numColumns = getMaxColumnNum();
- parent.setLayout(gl);
-
- if (attributeData != null)
- {
- for (int i = 0; i < attributeData.length; i++)
- {
- DialogField field = (DialogField) map.get(attributeData[i]);
- Control[] controls = field.doFillIntoGrid(toolkit, parent, gl.numColumns);
- if (controls.length > 1)
- {
- GridData gridData = (GridData) controls[1].getLayoutData();
- if(field.getNumberOfControls() == gl.numColumns)
- {
- gridData.grabExcessHorizontalSpace = true;
- }
- gridData.horizontalAlignment = GridData.FILL;
- }
- field.setLabelText(DialogFieldFactory.getDialogFieldLabel(attributeData[i]));
- }
- }
- }
-
- private int getMaxColumnNum()
- {
- int cols = 0;
- if (attributeData != null)
- {
- for (int i = 0; i < attributeData.length; i++)
- {
- DialogField field = (DialogField) map.get(attributeData[i]);
- int fieldCols = field.getNumberOfControls();
- if (fieldCols > cols)
- {
- cols = fieldCols;
- }
- }
- }
- return cols;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.jsf.common.ui.internal.dialogfield.DialogFieldGroup#validateDialogFields()
- */
- public IStatus[] validateDialogFields()
- {
- // TODO Now we let it be.
- return null;
- }
-
- /**
- * @return Returns the attributePairs.
- */
- public AttributeData[] getAttributeData()
- {
- return attributeData;
- }
-
- /**
- * @param attributePairs The attributePairs to set.
- */
- public void setAttributeData(AttributeData[] attributePairs)
- {
- this.attributeData = attributePairs;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/attributegroup/CommonDialogFieldWizard.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/attributegroup/CommonDialogFieldWizard.java
deleted file mode 100644
index 03dcb90..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/attributegroup/CommonDialogFieldWizard.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http:// www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.pagedesigner.jsf.ui.attributegroup;
-
-import org.eclipse.jst.jsf.common.ui.internal.dialogfield.DialogFieldGroupPage;
-import org.eclipse.ui.internal.dialogs.NewWizard;
-
-/**
- * @author mengbo
- * @version 1.5
- */
-public class CommonDialogFieldWizard extends NewWizard
-{
- DialogFieldGroupPage mainPage;
- /**
- * Constructg a new wizard using page as the wizard mage
- *
- * @param page
- */
- public CommonDialogFieldWizard(DialogFieldGroupPage page)
- {
- this.mainPage = page;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.wizard.IWizard#performFinish()
- */
- public boolean performFinish()
- {
- return true;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.wizard.IWizard#addPages()
- */
- public void addPages()
- {
- addPage(mainPage);
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/attributegroup/DialogFieldFactory.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/attributegroup/DialogFieldFactory.java
deleted file mode 100644
index 3a98d39..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/attributegroup/DialogFieldFactory.java
+++ /dev/null
@@ -1,153 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http:// www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.pagedesigner.jsf.ui.attributegroup;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jst.jsf.common.metadata.Entity;
-import org.eclipse.jst.jsf.common.metadata.Trait;
-import org.eclipse.jst.jsf.common.metadata.internal.TraitValueHelper;
-import org.eclipse.jst.jsf.common.metadata.query.TaglibDomainMetaDataQueryHelper;
-import org.eclipse.jst.jsf.common.ui.internal.dialogfield.ClassButtonDialogField;
-import org.eclipse.jst.jsf.common.ui.internal.dialogfield.ComboDialogField;
-import org.eclipse.jst.jsf.common.ui.internal.dialogfield.DialogField;
-import org.eclipse.jst.jsf.common.ui.internal.dialogfield.RadiosDialogField;
-import org.eclipse.jst.jsf.common.ui.internal.dialogfield.StringDialogField;
-import org.eclipse.jst.jsf.metadataprocessors.MetaDataEnabledProcessingFactory;
-import org.eclipse.jst.pagedesigner.meta.IAttributeRuntimeValueType;
-
-/**
- * @author mengbo
- * @version 1.5
- * @TODO - unused now
- */
-public class DialogFieldFactory
-{
- /**
- * @param data
- * @return the dialog field for data
- */
- public static DialogField getDialogField(AttributeData data)
- {
- Object project = data.getParamMap().get(AttributeData.Project);
- Entity attrEntity = null;
- if (project instanceof IProject){
- attrEntity = TaglibDomainMetaDataQueryHelper.getEntity(TaglibDomainMetaDataQueryHelper.createMetaDataModelContext((IProject)project, data.getUri()), data.getElementName()+"/"+data.getAttributeName()); //$NON-NLS-1$
- }
-
- if(attrEntity != null)
- {
- Trait t = TaglibDomainMetaDataQueryHelper.getTrait(attrEntity, MetaDataEnabledProcessingFactory.ATTRIBUTE_VALUE_RUNTIME_TYPE_PROP_NAME);
- String type = TraitValueHelper.getValueAsString(t);
- if (IAttributeRuntimeValueType.JAVACLASS.equals(type))
- {
- ClassButtonDialogField field = new ClassButtonDialogField(null);
-// Object project = data.getParamMap().get(AttributeData.Project);
- if (project instanceof IProject)
- {
- field.setProject((IProject) project);
- }
- Object superType = data.getParamMap().get(AttributeData.SuperType);
- field.setSuperClassName((String) superType);
- return field;
- }
- }
- return new StringDialogField();
- }
-
- /**
- * Sets the initial value of dialog field
- * @param field
- * @param value
- */
- public static void setDialogFieldValue(DialogField field, Object value){
- if (field instanceof StringDialogField)
- {
- ((StringDialogField) field).setTextWithoutUpdate(value == null ? "" : value.toString());//$NON-NLS-1$
- }
- else if (field instanceof ComboDialogField)
- {
- ((ComboDialogField) field).setTextWithoutUpdate(value == null ? "" : value.toString());//$NON-NLS-1$
- }
- else if (field instanceof RadiosDialogField)
- {
- if (value instanceof Integer)
- {
- ((RadiosDialogField) field).setSelectedIndex(((Integer) value).intValue());
- }
- }
- }
-
- /**
- * @param field
- * @param value
- * @deprecated - use setDialogField method
- */
- public static void setDialogFiledValue(DialogField field, Object value)
- {
- setDialogFieldValue(field, value);
- }
-
- /**
- * Sets value of field into AttributeData if it was a StringDialogField
- * @param field
- * @param pair
- */
- public static void prepareDialogFieldValue(DialogField field, AttributeData pair)
- {
- if (field instanceof StringDialogField)
- {
- pair.setValue(((StringDialogField) field).getText());
- }
- }
-
- /**
- * @param field
- * @param pair
- * @deprecated - use prepareDialogFieldValue
- */
- public static void prepareDialogFiledValue(DialogField field, AttributeData pair)
- {
- prepareDialogFieldValue(field, pair);
- }
- /**
- * @param data
- * @return the dialog field label for data
- */
- public static String getDialogFieldLabel(AttributeData data)
- {
- String name = data.getAttributeName();
- int gap = 'a' - 'A';
- if(name != null)
- {
- char[] chars = name.toCharArray();
- char[] newChars = new char[chars.length*2];
- if(chars.length > 0)
- {
- newChars[0] = chars[0] >= 'a' ? (char)(chars[0] - gap) : chars[0];
- }
- int newPos = 1;
- for(int i=1; i<chars.length; i++,newPos++)
- {
- if(chars[i] >= 'A' && chars[i] <= 'Z')
- {
- newChars[newPos++] = ' ';
- }
- newChars[newPos] = chars[i];
- }
- char[] labelChars = new char[newPos + 1];
- System.arraycopy(newChars,0,labelChars,0,newPos);
- labelChars[newPos] = ':';
- return new String(labelChars);
- }
- return "";//$NON-NLS-1$
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/commands/jsfhtml/AddJSFCoreChildCommand.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/commands/jsfhtml/AddJSFCoreChildCommand.java
deleted file mode 100644
index 70eec64..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/commands/jsfhtml/AddJSFCoreChildCommand.java
+++ /dev/null
@@ -1,117 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http:// www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.pagedesigner.jsf.ui.commands.jsfhtml;
-
-import java.util.Iterator;
-import java.util.Map;
-
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMElement;
-import org.w3c.dom.Element;
-
-import org.eclipse.jst.jsf.core.internal.tld.ITLDConstants;
-import org.eclipse.jst.pagedesigner.commands.DesignerCommand;
-import org.eclipse.jst.pagedesigner.utils.JSPUtil;
-
-/**
- * @author mengbo
- * @version 1.5
- */
-public class AddJSFCoreChildCommand extends DesignerCommand
-{
- // either use single name/value pair
- private String _attrName;
- private String _attrValue;
- // or use a map.
- private Map _attrMap;
-
- private String _coreChildLocalName;
- private IDOMElement _parent;
-
- /**
- * @param parent
- * @param coreChildLocalName
- * @param attributes
- */
- public AddJSFCoreChildCommand(IDOMElement parent, String coreChildLocalName, Map attributes)
- {
- super("", parent); //$NON-NLS-1$
- StringBuffer buffer = new StringBuffer(CommandResources.getString("AddJSFCoreChildCommand.Label.Add")); //$NON-NLS-1$
- if(coreChildLocalName != null && coreChildLocalName.length() > 0)
- {
- buffer.append(coreChildLocalName.substring(0,1).toUpperCase());
- buffer.append(coreChildLocalName.substring(1));
- }
- setLabel(buffer.toString());
- this._parent = parent;
- this._coreChildLocalName = coreChildLocalName;
- this._attrMap = attributes;
- }
-
- /**
- * @param parent
- * @param coreChildLocalName
- * @param aname
- * @param avalue
- */
- public AddJSFCoreChildCommand(IDOMElement parent, String coreChildLocalName, String aname, String avalue)
- {
- super("", parent); //$NON-NLS-1$
- StringBuffer buffer = new StringBuffer(CommandResources.getString("AddJSFCoreChildCommand.Label.Add")); //$NON-NLS-1$
- if(coreChildLocalName != null && coreChildLocalName.length() > 0)
- {
- buffer.append(coreChildLocalName.substring(0,1).toUpperCase());
- buffer.append(coreChildLocalName.substring(1));
- }
- setLabel(buffer.toString());
- this._parent = parent;
- this._coreChildLocalName = coreChildLocalName;
- this._attrName = aname;
- this._attrValue = avalue;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.pagedesigner.commands.DesignerCommand#doExecute()
- */
- protected void doExecute()
- {
- String prefix = JSPUtil.getOrCreatePrefix(this.getModel(), ITLDConstants.URI_JSF_CORE, "f"); //$NON-NLS-1$
- String tag = _coreChildLocalName;
- Element child = _parent.getOwnerDocument().createElement(tag);
- child.setPrefix(prefix);
- if (_attrMap != null)
- {
- for (Iterator iter = _attrMap.keySet().iterator(); iter.hasNext();)
- {
- String key = (String) iter.next();
- String value = (String) _attrMap.get(key);
-
- child.setAttribute(key, value);
- }
- }
- if (_attrName != null)
- {
- child.setAttribute(_attrName, _attrValue);
- }
-
- _parent.appendChild(child);
- formatNode(child);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.pagedesigner.commands.DesignerCommand#getAfterCommandDesignerSelection()
- */
- protected ISelection getAfterCommandDesignerSelection()
- {
- return toDesignSelection(_parent);
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/commands/jsfhtml/CommandResources.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/commands/jsfhtml/CommandResources.java
deleted file mode 100644
index 11e8976..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/commands/jsfhtml/CommandResources.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http:// www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.pagedesigner.jsf.ui.commands.jsfhtml;
-
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-/**
- * @author mengbo
- * @version 1.5
- */
-public final class CommandResources
-{
- private static final String BUNDLE_NAME = "org.eclipse.jst.pagedesigner.jsf.ui.commands.jsfhtml.CommandResources"; //$NON-NLS-1$
-
- private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle.getBundle(BUNDLE_NAME);
-
- private CommandResources()
- {
- // no external instantiation
- }
-
- /**
- * @param key
- * @return the resource for key or !key! if not found
- */
- public static String getString(String key)
- {
- try
- {
- return RESOURCE_BUNDLE.getString(key);
- }
- catch (MissingResourceException e)
- {
- return '!' + key + '!';
- }
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/commands/jsfhtml/CommandResources.properties b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/commands/jsfhtml/CommandResources.properties
deleted file mode 100644
index fc1ff34..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/commands/jsfhtml/CommandResources.properties
+++ /dev/null
@@ -1,27 +0,0 @@
-###############################################################################
-# Copyright (c) 2001, 2007 Oracle Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# Oracle Corporation - initial API and implementation
-###############################################################################
-AddJSFCoreChildCommand.Label.Add=Add
-DataTableDeleteColumnCommand.Label.DeleteColumn=Delete Column
-DataTableDeleteHeaderCommand.Label.DeleteHeader=Delete Header
-DataTableDeleteHeaderCommand.Label.DeleteFooter=Delete Footer
-DataTableInsertColumnCommand.Label.InsertColumn=Insert Column
-DataTableInsertHeaderCommand.Label.InsertHeader=Insert Header
-DataTableInsertHeaderCommand.Label.InsertFooter=Insert Footer
-DataTableInsertColumnHeaderCommand.Label.InsertHeader=Insert Header
-DataTableInsertColumnHeaderCommand.Label.InsertFooter=Insert Footer
-DataTableDeleteColumnHeaderCommand.Label.DeleteColumnHeader=Delete Column Header
-DataTableDeleteColumnHeaderCommand.Label.DeleteColumnFooter=Delete Column Footer
-PanelGridDeleteColumnCommand.Label.DeleteColumn=Delete Column
-PanelGridInsertColumnCommand.Label.InsertColumn=Insert Column
-PanelGridInsertFooterCommand.Label.InsertFooter=Insert Footer
-PanelGridInsertHeaderCommand.Label.InsertHeader=Insert Header
-PanelGridDeleteRowCommand.Label.DeleteRow=Delete Row
-PanelGridInsertRowCommand.Label.InsertRow=Insert Row
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/commands/jsfhtml/DataTableDeleteColumnCommand.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/commands/jsfhtml/DataTableDeleteColumnCommand.java
deleted file mode 100644
index 12dce24..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/commands/jsfhtml/DataTableDeleteColumnCommand.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http:// www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.pagedesigner.jsf.ui.commands.jsfhtml;
-
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jst.pagedesigner.commands.DesignerCommand;
-import org.eclipse.jst.pagedesigner.jsf.core.dom.JSFDOMUtil;
-import org.eclipse.jst.pagedesigner.viewer.IHTMLGraphicalViewer;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-
-/**
- * Delete a column from dataTable.
- *
- * @author mengbo
- * @version 1.5
- */
-public class DataTableDeleteColumnCommand extends DesignerCommand
-{
-
- private Element _dataTable;
- private int _index;
-
- /**
- * @param viewer
- * @param dataTable
- * @param columnIndex
- */
- public DataTableDeleteColumnCommand(IHTMLGraphicalViewer viewer, Element dataTable, int columnIndex)
- {
- super(CommandResources.getString("DataTableDeleteColumnCommand.Label.DeleteColumn"), viewer); //$NON-NLS-1$
- this._dataTable = dataTable;
- this._index = columnIndex;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.gef.commands.Command#canExecute()
- */
- public boolean canExecute()
- {
- if (this._index < 0)
- {
- return false;
- }
- return super.canExecute();
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.pagedesigner.commands.DesignerCommand#doExecute()
- */
- /* (non-Javadoc)
- * @see org.eclipse.jst.pagedesigner.commands.DesignerCommand#doExecute()
- */
- protected void doExecute()
- {
- NodeList children = _dataTable.getChildNodes();
- int index = 0;
- for (int i = 0, size = children.getLength(); i < size; i++)
- {
- Node node = children.item(i);
- if (JSFDOMUtil.isHColumn(node))
- {
- if (index++ == this._index)
- {
- _dataTable.removeChild(node);
- return;
- }
- }
- }
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.pagedesigner.commands.DesignerCommand#getAfterCommandDesignerSelection()
- */
- protected ISelection getAfterCommandDesignerSelection()
- {
- return toDesignSelection(_dataTable);
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/commands/jsfhtml/DataTableDeleteColumnHeaderCommand.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/commands/jsfhtml/DataTableDeleteColumnHeaderCommand.java
deleted file mode 100644
index c16d4eb..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/commands/jsfhtml/DataTableDeleteColumnHeaderCommand.java
+++ /dev/null
@@ -1,111 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http:// www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.pagedesigner.jsf.ui.commands.jsfhtml;
-
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jst.pagedesigner.commands.DesignerCommand;
-import org.eclipse.jst.pagedesigner.jsf.core.dom.JSFDOMUtil;
-import org.eclipse.jst.pagedesigner.viewer.IHTMLGraphicalViewer;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-
-/**
- * @author mengbo
- * @version 1.5
- */
-public class DataTableDeleteColumnHeaderCommand extends DesignerCommand
-{
- boolean _header; // true means header, false means footer.
- private Element _dataTable;
-
- /**
- * @param viewer
- * @param dataTable
- * @param header
- */
- public DataTableDeleteColumnHeaderCommand(IHTMLGraphicalViewer viewer, Element dataTable, boolean header)
- {
- super(header ? CommandResources.getString("DataTableDeleteColumnHeaderCommand.Label.DeleteColumnHeader") : //$NON-NLS-1$
- CommandResources.getString("DataTableDeleteColumnHeaderCommand.Label.DeleteColumnFooter"), viewer); //$NON-NLS-1$
- this._header = header;
- this._dataTable = dataTable;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.gef.commands.Command#canExecute()
- */
- public boolean canExecute()
- {
- int num = 0;
- NodeList children = _dataTable.getChildNodes();
- for (int i = 0, size = children.getLength(); i < size; i++)
- {
- Node node = children.item(i);
- if (JSFDOMUtil.isHColumn(node))
- {
- Element column = (Element) node;
- if (hasHeader(column))
- {
- num++;
- break;
- }
- }
- }
- if (num == 0)
- {
- return false;
- }
- return super.canExecute();
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.pagedesigner.commands.DesignerCommand#doExecute()
- */
- protected void doExecute()
- {
- NodeList children = _dataTable.getChildNodes();
- for (int i = 0, size = children.getLength(); i < size; i++)
- {
- Node node = children.item(i);
- if (JSFDOMUtil.isHColumn(node))
- {
- Element column = (Element) node;
- if (hasHeader(column))
- {
- Element hf = JSFDOMUtil.findFacet(column, _header ? "header" : "footer"); //$NON-NLS-1$ //$NON-NLS-2$
- column.removeChild(hf);
- }
- }
- }
- formatNode(this._dataTable);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.pagedesigner.commands.DesignerCommand#getAfterCommandDesignerSelection()
- */
- protected ISelection getAfterCommandDesignerSelection()
- {
- return toDesignSelection(_dataTable);
- }
-
- /**
- * @param column
- * @param _header2
- * @return
- */
- private boolean hasHeader(Element column)
- {
- return JSFDOMUtil.findFacet(column, _header ? "header" : "footer") != null; //$NON-NLS-1$ //$NON-NLS-2$
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/commands/jsfhtml/DataTableDeleteHeaderCommand.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/commands/jsfhtml/DataTableDeleteHeaderCommand.java
deleted file mode 100644
index 44dfff2..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/commands/jsfhtml/DataTableDeleteHeaderCommand.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http:// www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.pagedesigner.jsf.ui.commands.jsfhtml;
-
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jst.pagedesigner.commands.DesignerCommand;
-import org.eclipse.jst.pagedesigner.jsf.core.dom.JSFDOMUtil;
-import org.eclipse.jst.pagedesigner.viewer.IHTMLGraphicalViewer;
-import org.w3c.dom.Element;
-
-
-/**
- * @author mengbo
- * @version 1.5
- */
-public class DataTableDeleteHeaderCommand extends DesignerCommand
-{
- /**
- * true means header,false means footer
- */
- boolean _isHeader;
- private Element _dataTable;
-
- /**
- * @param viewer
- * @param dataTable
- * @param isHeader
- */
- public DataTableDeleteHeaderCommand(IHTMLGraphicalViewer viewer, Element dataTable, boolean isHeader)
- {
- super(isHeader ? CommandResources.getString("DataTableDeleteHeaderCommand.Label.DeleteHeader") : //$NON-NLS-1$
- CommandResources.getString("DataTableDeleteHeaderCommand.Label.DeleteFooter"), viewer); //$NON-NLS-1$
- this._isHeader = isHeader;
- this._dataTable = dataTable;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.gef.commands.Command#canExecute()
- */
- public boolean canExecute()
- {
- if (this._isHeader)
- {
- boolean hasHeader = (JSFDOMUtil.findFacet(this._dataTable, "header") != null); //$NON-NLS-1$
- if (!hasHeader)
- {
- return false;
- }
- }
- else
- {
- boolean hasFooter = (JSFDOMUtil.findFacet(this._dataTable, "footer") != null); //$NON-NLS-1$
- if (!hasFooter)
- {
- return false;
- }
- }
- return super.canExecute();
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.pagedesigner.commands.DesignerCommand#doExecute()
- */
- protected void doExecute()
- {
- String type = (this._isHeader) ? "header" : "footer"; //$NON-NLS-1$ //$NON-NLS-2$
- Element ele = JSFDOMUtil.findFacet(this._dataTable, type);
- if (ele != null)
- {
- this._dataTable.removeChild(ele);
- }
- formatNode(this._dataTable);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.pagedesigner.commands.DesignerCommand#getAfterCommandDesignerSelection()
- */
- protected ISelection getAfterCommandDesignerSelection()
- {
- return toDesignSelection(_dataTable);
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/commands/jsfhtml/DataTableInsertColumnCommand.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/commands/jsfhtml/DataTableInsertColumnCommand.java
deleted file mode 100644
index b5c7d0c..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/commands/jsfhtml/DataTableInsertColumnCommand.java
+++ /dev/null
@@ -1,162 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http:// www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.pagedesigner.jsf.ui.commands.jsfhtml;
-
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jst.jsf.core.internal.tld.IJSFConstants;
-import org.eclipse.jst.jsf.core.internal.tld.ITLDConstants;
-import org.eclipse.jst.pagedesigner.commands.DesignerCommand;
-import org.eclipse.jst.pagedesigner.jsf.core.dom.JSFDOMUtil;
-import org.eclipse.jst.pagedesigner.utils.JSPUtil;
-import org.eclipse.jst.pagedesigner.viewer.IHTMLGraphicalViewer;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-/**
- * Insert a column into dataTable.
- *
- * @author mengbo
- * @version 1.5
- */
-public class DataTableInsertColumnCommand extends DesignerCommand
-{
- Element _dataTable;
- Element _child;
- int _index;
-
- /**
- *
- * @param viewer
- * @param dataTable
- * @param index 0 means before the first column.
- */
- public DataTableInsertColumnCommand(IHTMLGraphicalViewer viewer, Element dataTable, int index)
- {
- super(CommandResources.getString("DataTableInsertColumnCommand.Label.InsertColumn"), viewer); //$NON-NLS-1$
- this._dataTable = dataTable;
- this._index = index;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.gef.commands.Command#canExecute()
- */
- public boolean canExecute()
- {
- if (this._index < 0)
- {
- return false;
- }
- return super.canExecute();
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.pagedesigner.commands.DesignerCommand#doExecute()
- */
- protected void doExecute()
- {
- String prefix = JSPUtil.getOrCreatePrefix(getModel(), ITLDConstants.URI_JSF_HTML, "h"); //$NON-NLS-1$
- _child = _dataTable.getOwnerDocument().createElement(prefix + ":column"); //$NON-NLS-1$
-
- createHeaderFooter(_child);
- NodeList children = _dataTable.getChildNodes();
- int count = 0;
- for (int i = 0, size = children.getLength(); i < size; i++)
- {
- Node node = children.item(i);
- if (JSFDOMUtil.isHColumn(node))
- {
- if (_index == count)
- {
- _dataTable.insertBefore(_child, node);
- return;
- }
- count++;
- }
- }
- _dataTable.insertBefore(_child, null);
- formatNode(this._child);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.pagedesigner.commands.DesignerCommand#getAfterCommandDesignerSelection()
- */
- protected ISelection getAfterCommandDesignerSelection()
- {
- return toDesignSelection(_dataTable);
- }
-
- /**
- * check whether the datatable already have header and footer, if yes,
- * then also create for this column
- *
- * @param column
- */
- private void createHeaderFooter(Element column)
- {
- boolean hasHeader = false;
- boolean hasFooter = false;
- NodeList children = _dataTable.getChildNodes();
- for (int i = 0, size = children.getLength(); i < size; i++)
- {
- Node node = children.item(i);
- if (JSFDOMUtil.isHColumn(node))
- {
- if (!hasHeader && JSFDOMUtil.findFacet((Element) node, "header") != null) //$NON-NLS-1$
- {
- hasHeader = true;
- }
- if (!hasFooter && JSFDOMUtil.findFacet((Element) node, "footer") != null) //$NON-NLS-1$
- {
- hasFooter = true;
- }
- }
- }
- if (hasHeader)
- {
- Element facet = createFacet();
- facet.setAttribute("name", "header"); //$NON-NLS-1$ //$NON-NLS-2$
- Element ele = createDefaultElement();
- facet.appendChild(ele);
- column.appendChild(facet);
- }
- if (hasFooter)
- {
- Element facet = createFacet();
- facet.setAttribute("name", "footer"); //$NON-NLS-1$ //$NON-NLS-2$
- Element ele = createDefaultElement();
- facet.appendChild(ele);
- column.appendChild(facet);
- }
- }
-
- /**
- * @return
- */
- private Element createFacet()
- {
- String prefix = JSPUtil.getOrCreatePrefix(getModel(), ITLDConstants.URI_JSF_CORE, "f"); //$NON-NLS-1$
- Element ele = _dataTable.getOwnerDocument().createElement(IJSFConstants.TAG_FACET);
- ele.setPrefix(prefix);
- return ele;
- }
-
- private Element createDefaultElement()
- {
- String prefix = JSPUtil.getOrCreatePrefix(getModel(), ITLDConstants.URI_JSF_HTML, "h"); //$NON-NLS-1$
- Element ele = _dataTable.getOwnerDocument().createElement(IJSFConstants.TAG_OUTPUTTEXT);
- ele.setPrefix(prefix);
- ele.setAttribute(IJSFConstants.ATTR_VALUE, "Column"); //$NON-NLS-1$
- return ele;
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/commands/jsfhtml/DataTableInsertColumnHeaderCommand.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/commands/jsfhtml/DataTableInsertColumnHeaderCommand.java
deleted file mode 100644
index f69707f..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/commands/jsfhtml/DataTableInsertColumnHeaderCommand.java
+++ /dev/null
@@ -1,146 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http:// www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.pagedesigner.jsf.ui.commands.jsfhtml;
-
-import org.eclipse.jface.viewers.ISelection;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-import org.eclipse.jst.jsf.core.internal.tld.IJSFConstants;
-import org.eclipse.jst.jsf.core.internal.tld.ITLDConstants;
-import org.eclipse.jst.pagedesigner.commands.DesignerCommand;
-import org.eclipse.jst.pagedesigner.jsf.core.dom.JSFDOMUtil;
-import org.eclipse.jst.pagedesigner.utils.JSPUtil;
-import org.eclipse.jst.pagedesigner.viewer.IHTMLGraphicalViewer;
-
-/**
- * @author mengbo
- * @version 1.5
- */
-public class DataTableInsertColumnHeaderCommand extends DesignerCommand
-{
- boolean _header; // true means header, false means footer.
- private Element _dataTable;
-
- /**
- * @param viewer
- * @param dataTable
- * @param header
- */
- public DataTableInsertColumnHeaderCommand(IHTMLGraphicalViewer viewer, Element dataTable, boolean header)
- {
- super(header ? CommandResources.getString("DataTableInsertColumnHeaderCommand.Label.InsertHeader") : CommandResources.getString("DataTableInsertColumnHeaderCommand.Label.InsertFooter"), viewer); //$NON-NLS-1$ //$NON-NLS-2$
- this._header = header;
- this._dataTable = dataTable;
- }
-
- public boolean canExecute()
- {
- int num = 0;
- NodeList children = _dataTable.getChildNodes();
- for (int i = 0, size = children.getLength(); i < size; i++)
- {
- Node node = children.item(i);
- if (JSFDOMUtil.isHColumn(node))
- {
- Element column = (Element) node;
- if (!hasHeader(column))
- {
- num++;
- break;
- }
- }
- }
- if (num == 0)
- {
- return false;
- }
- return super.canExecute();
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.pagedesigner.commands.DesignerCommand#doExecute()
- */
- protected void doExecute()
- {
- String type = (this._header) ? "header" : "footer"; //$NON-NLS-1$ //$NON-NLS-2$
-
- NodeList children = _dataTable.getChildNodes();
- for (int i = 0, size = children.getLength(); i < size; i++)
- {
- Node node = children.item(i);
- if (JSFDOMUtil.isHColumn(node))
- {
- Element column = (Element) node;
- if (!hasHeader(column))
- {
- Element headerOrFooter = createHeaderOrFooter(type);
- column.appendChild(headerOrFooter);
- }
- }
- }
- formatNode(this._dataTable);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.pagedesigner.commands.DesignerCommand#getAfterCommandDesignerSelection()
- */
- protected ISelection getAfterCommandDesignerSelection()
- {
- return toDesignSelection(_dataTable);
- }
-
- /**
- * @param column
- * @param _header2
- * @return
- */
- private boolean hasHeader(Element column)
- {
- return JSFDOMUtil.findFacet(column, _header ? "header" : "footer") != null; //$NON-NLS-1$ //$NON-NLS-2$
- }
-
- private Element createHeaderOrFooter(String type)
- {
- Element facet = createFacet();
- Element def = createDefaultElement();
- facet.appendChild(def);
- facet.setAttribute(IJSFConstants.ATTR_NAME, type);
- return facet;
- }
-
- private Element createFacet()
- {
- String prefix = JSPUtil.getOrCreatePrefix(getModel(), ITLDConstants.URI_JSF_CORE, "f"); //$NON-NLS-1$
- Element ele = _dataTable.getOwnerDocument().createElement(IJSFConstants.TAG_FACET);
- ele.setPrefix(prefix);
- return ele;
- }
-
- private Element createDefaultElement()
- {
- String prefix = JSPUtil.getOrCreatePrefix(getModel(), ITLDConstants.URI_JSF_HTML, "h"); //$NON-NLS-1$
- Element ele = _dataTable.getOwnerDocument().createElement(IJSFConstants.TAG_OUTPUTTEXT);
- ele.setPrefix(prefix);
- if (this._header)
- {
- ele.setAttribute(IJSFConstants.ATTR_VALUE, "Column Header"); //$NON-NLS-1$
- }
- else
- {
- ele.setAttribute(IJSFConstants.ATTR_VALUE, "Column Footer"); //$NON-NLS-1$
- }
-
- return ele;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/commands/jsfhtml/DataTableInsertHeaderCommand.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/commands/jsfhtml/DataTableInsertHeaderCommand.java
deleted file mode 100644
index 4231efc..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/commands/jsfhtml/DataTableInsertHeaderCommand.java
+++ /dev/null
@@ -1,129 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http:// www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.pagedesigner.jsf.ui.commands.jsfhtml;
-
-import org.eclipse.jface.viewers.ISelection;
-import org.w3c.dom.Element;
-
-import org.eclipse.jst.jsf.core.internal.tld.IJSFConstants;
-import org.eclipse.jst.jsf.core.internal.tld.ITLDConstants;
-import org.eclipse.jst.pagedesigner.commands.DesignerCommand;
-import org.eclipse.jst.pagedesigner.jsf.core.dom.JSFDOMUtil;
-import org.eclipse.jst.pagedesigner.utils.JSPUtil;
-import org.eclipse.jst.pagedesigner.viewer.IHTMLGraphicalViewer;
-
-/**
- * This command is used to insert a header row or footer row.
- *
- * @author mengbo
- * @version 1.5
- */
-public class DataTableInsertHeaderCommand extends DesignerCommand
-{
- boolean _header; // true means header, false means footer.
- private Element _dataTable;
-
- /**
- * @param viewer
- * @param dataTable
- * @param header
- */
- public DataTableInsertHeaderCommand(IHTMLGraphicalViewer viewer, Element dataTable, boolean header)
- {
- super(header ? CommandResources.getString("DataTableInsertHeaderCommand.Label.InsertHeader") : CommandResources.getString("DataTableInsertHeaderCommand.Label.InsertFooter"), viewer); //$NON-NLS-1$ //$NON-NLS-2$
- this._header = header;
- this._dataTable = dataTable;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.gef.commands.Command#canExecute()
- */
- public boolean canExecute()
- {
- if (this._header)
- {
- boolean hasHeader = (JSFDOMUtil.findFacet(this._dataTable, "header") != null); //$NON-NLS-1$
- if (hasHeader)
- {
- return false;
- }
- }
- else
- {
- boolean hasFooter = (JSFDOMUtil.findFacet(this._dataTable, "footer") != null); //$NON-NLS-1$
- if (hasFooter)
- {
- return false;
- }
- }
- return super.canExecute();
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.pagedesigner.commands.DesignerCommand#doExecute()
- */
- protected void doExecute()
- {
- String type = (this._header) ? "header" : "footer"; //$NON-NLS-1$ //$NON-NLS-2$
- Element headerOrFooter = createHeaderOrFooter(type);
- if (this._header)
- {
- this._dataTable.insertBefore(headerOrFooter, this._dataTable.getFirstChild());
- }
- else
- {
- this._dataTable.appendChild(headerOrFooter);
- }
- formatNode(this._dataTable);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.pagedesigner.commands.DesignerCommand#getAfterCommandDesignerSelection()
- */
- protected ISelection getAfterCommandDesignerSelection()
- {
- return toDesignSelection(_dataTable);
- }
-
- private Element createHeaderOrFooter(String type)
- {
- Element facet = createFacet();
- Element def = createDefaultElement();
- facet.appendChild(def);
- facet.setAttribute(IJSFConstants.ATTR_NAME, type);
- return facet;
- }
-
- private Element createFacet()
- {
- String prefix = JSPUtil.getOrCreatePrefix(getModel(), ITLDConstants.URI_JSF_CORE, "f"); //$NON-NLS-1$
- Element ele = _dataTable.getOwnerDocument().createElement(IJSFConstants.TAG_FACET);
- ele.setPrefix(prefix);
- return ele;
- }
-
- private Element createDefaultElement()
- {
- String prefix = JSPUtil.getOrCreatePrefix(getModel(), ITLDConstants.URI_JSF_HTML, "h"); //$NON-NLS-1$
- Element ele = _dataTable.getOwnerDocument().createElement(IJSFConstants.TAG_OUTPUTTEXT);
- ele.setPrefix(prefix);
- if (this._header)
- {
- ele.setAttribute(IJSFConstants.ATTR_VALUE, "Table Header"); //$NON-NLS-1$
- }
- else
- {
- ele.setAttribute(IJSFConstants.ATTR_VALUE, "Table Footer"); //$NON-NLS-1$
- }
- return ele;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/commands/jsfhtml/PanelGridDeleteColumnCommand.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/commands/jsfhtml/PanelGridDeleteColumnCommand.java
deleted file mode 100644
index 38d9451..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/commands/jsfhtml/PanelGridDeleteColumnCommand.java
+++ /dev/null
@@ -1,108 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http:// www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.pagedesigner.jsf.ui.commands.jsfhtml;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jface.viewers.ISelection;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-
-import org.eclipse.jst.pagedesigner.commands.DesignerCommand;
-import org.eclipse.jst.pagedesigner.jsf.core.dom.JSFDOMUtil;
-import org.eclipse.jst.pagedesigner.jsf.ui.JSFUIPlugin;
-import org.eclipse.jst.pagedesigner.utils.DOMUtil;
-import org.eclipse.jst.pagedesigner.viewer.IHTMLGraphicalViewer;
-
-/**
- * This is for delete a column in panelGrid
- *
- * @author mengbo
- * @version 1.5
- */
-public class PanelGridDeleteColumnCommand extends DesignerCommand
-{
-
- private int _columnIndex;
- private Element _panelGridEle;
-
- /**
- * @param viewer
- * @param panelGrid
- * @param columnIndex
- */
- public PanelGridDeleteColumnCommand(IHTMLGraphicalViewer viewer, Element panelGrid, int columnIndex)
- {
- super(CommandResources.getString("PanelGridDeleteColumnCommand.Label.DeleteColumn"), viewer); //$NON-NLS-1$
- this._panelGridEle = panelGrid;
- this._columnIndex = columnIndex;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.gef.commands.Command#canExecute()
- */
- public boolean canExecute()
- {
- //if user chose header or footer,then disable the delete column action
- if (this._columnIndex < 0)
- {
- return false;
- }
- int columns = DOMUtil.getIntAttributeIgnoreCase(_panelGridEle, "columns", 1); //$NON-NLS-1$
- if (columns < 1)
- {
- columns = 1;
- }
- return columns > 1;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.pagedesigner.commands.DesignerCommand#doExecute()
- */
- protected void doExecute()
- {
- int columns = DOMUtil.getIntAttributeIgnoreCase(_panelGridEle, "columns", 1); //$NON-NLS-1$
- if (columns < 1)
- {
- columns = 1;
- }
-
- if (_columnIndex >= columns)
- {
- JSFUIPlugin.log(IStatus.ERROR, "Should not happen", new Throwable()); //$NON-NLS-1$
- return;
- }
- List children = JSFDOMUtil.getUIComponentChildren(_panelGridEle);
- List toRemove = new ArrayList();
- for (int i = _columnIndex; i < children.size(); i += columns)
- {
- toRemove.add(children.get(i));
- }
- for (int i = 0, size = toRemove.size(); i < size; i++)
- {
- _panelGridEle.removeChild((Node) toRemove.get(i));
- }
-
- _panelGridEle.setAttribute("columns", String.valueOf(columns - 1)); //$NON-NLS-1$
- formatNode(_panelGridEle);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.pagedesigner.commands.DesignerCommand#getAfterCommandDesignerSelection()
- */
- protected ISelection getAfterCommandDesignerSelection()
- {
- return toDesignSelection(this._panelGridEle);
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/commands/jsfhtml/PanelGridDeleteRowCommand.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/commands/jsfhtml/PanelGridDeleteRowCommand.java
deleted file mode 100644
index e0a2795..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/commands/jsfhtml/PanelGridDeleteRowCommand.java
+++ /dev/null
@@ -1,146 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http:// www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.pagedesigner.jsf.ui.commands.jsfhtml;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.jface.viewers.ISelection;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-
-import org.eclipse.jst.pagedesigner.commands.DesignerCommand;
-import org.eclipse.jst.pagedesigner.jsf.core.dom.JSFDOMUtil;
-import org.eclipse.jst.pagedesigner.utils.DOMUtil;
-import org.eclipse.jst.pagedesigner.viewer.IHTMLGraphicalViewer;
-
-/**
- * Remove a row from panel grid
- *
- * @author mengbo
- * @version 1.5
- */
-public class PanelGridDeleteRowCommand extends DesignerCommand
-{
- Element _panelGridEle;
- int _rowIndex;
-
- /**
- * @param viewer
- * @param panelGrid
- * @param index
- */
- public PanelGridDeleteRowCommand(IHTMLGraphicalViewer viewer, Element panelGrid, int index)
- {
- super(CommandResources.getString("PanelGridDeleteRowCommand.Label.DeleteRow"), viewer); //$NON-NLS-1$
- this._panelGridEle = panelGrid;
- this._rowIndex = index;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.pagedesigner.commands.DesignerCommand#doExecute()
- */
- protected void doExecute()
- {
- // Remove the row from panelGrid is a little complex. Since this row could
- // be header or footer.
- boolean hasHeaderRow = (JSFDOMUtil.findFacet(_panelGridEle, "header") != null); //$NON-NLS-1$
-
- int columns = DOMUtil.getIntAttributeIgnoreCase(_panelGridEle, "columns", 1); //$NON-NLS-1$
- if (columns < 1)
- {
- columns = 1;
- }
-
- List children = JSFDOMUtil.getUIComponentChildren(_panelGridEle);
- int numRows = (children.size() + columns - 1) / columns;
-
- int removeRow = _rowIndex;
-
- if (hasHeaderRow)
- {
- if (removeRow == 0)
- {
- // remove the header row.
- removeHeader();
- formatNode(_panelGridEle);
- return;
- }
- removeRow--;
- }
- if (removeRow < numRows)
- {
- List toRemove = new ArrayList();
- int max = columns * (removeRow + 1);
- max = Math.min(max, children.size());
- for (int i = (columns * removeRow); i < max; i++)
- {
- toRemove.add(children.get(i));
- }
- for (int i = 0, size = toRemove.size(); i < size; i++)
- {
- _panelGridEle.removeChild((Node) toRemove.get(i));
- }
- formatNode(_panelGridEle);
- }
- else
- {
- // must be footer.
- removeFooter();
- formatNode(_panelGridEle);
- }
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.gef.commands.Command#canExecute()
- */
- public boolean canExecute()
- {
- if (this._rowIndex < 0)
- {
- return false;
- }
- return super.canExecute();
- }
-
- /**
- *
- */
- private void removeFooter()
- {
- Element ele = JSFDOMUtil.findFacet(_panelGridEle, "footer"); //$NON-NLS-1$
- if (ele != null)
- {
- _panelGridEle.removeChild(ele);
- }
- }
-
- /**
- *
- */
- private void removeHeader()
- {
- Element ele = JSFDOMUtil.findFacet(_panelGridEle, "header"); //$NON-NLS-1$
- if (ele != null)
- {
- _panelGridEle.removeChild(ele);
- }
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.pagedesigner.commands.DesignerCommand#getAfterCommandDesignerSelection()
- */
- protected ISelection getAfterCommandDesignerSelection()
- {
- return this.toDesignSelection(this._panelGridEle);
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/commands/jsfhtml/PanelGridInsertColumnCommand.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/commands/jsfhtml/PanelGridInsertColumnCommand.java
deleted file mode 100644
index 3c68d26..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/commands/jsfhtml/PanelGridInsertColumnCommand.java
+++ /dev/null
@@ -1,151 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http:// www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.pagedesigner.jsf.ui.commands.jsfhtml;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.jface.viewers.ISelection;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-
-import org.eclipse.jst.jsf.core.internal.tld.IJSFConstants;
-import org.eclipse.jst.jsf.core.internal.tld.ITLDConstants;
-import org.eclipse.jst.pagedesigner.commands.DesignerCommand;
-import org.eclipse.jst.pagedesigner.jsf.core.dom.JSFDOMUtil;
-import org.eclipse.jst.pagedesigner.jsf.ui.elementedit.util.PanelGridUtil;
-import org.eclipse.jst.pagedesigner.utils.DOMUtil;
-import org.eclipse.jst.pagedesigner.utils.JSPUtil;
-import org.eclipse.jst.pagedesigner.viewer.IHTMLGraphicalViewer;
-
-/**
- * @author mengbo
- * @version 1.5
- */
-public class PanelGridInsertColumnCommand extends DesignerCommand
-{
- private int _columnIndex;
- private Element _panelGridEle;
-
- /**
- * construction
- * @param viewer
- * @param panelGrid
- * @param columnIndex
- */
- public PanelGridInsertColumnCommand(IHTMLGraphicalViewer viewer, Element panelGrid, int columnIndex)
- {
- super(CommandResources.getString("PanelGridInsertColumnCommand.Label.InsertColumn"), viewer); //$NON-NLS-1$
- this._panelGridEle = panelGrid;
- this._columnIndex = columnIndex;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.gef.commands.Command#canExecute()
- */
- public boolean canExecute()
- {
- if (this._columnIndex < 0)
- {
- return false;
- }
- return super.canExecute();
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.pagedesigner.commands.DesignerCommand#doExecute()
- */
- protected void doExecute()
- {
- int columns = DOMUtil.getIntAttributeIgnoreCase(_panelGridEle, IJSFConstants.ATTR_COLUMNS, 1);
- if (columns < 1)
- {
- columns = 1;
- }
-
- int startPoint = 0;
- if (_columnIndex > columns)
- {
- return;
- }
- else if (_columnIndex == columns)
- {
- startPoint = _columnIndex - 1;
- }
- else
- {
- startPoint = _columnIndex;
- }
-
- List children = JSFDOMUtil.getUIComponentChildren(_panelGridEle);
-
- List toMove = new ArrayList();
- for (int i = startPoint; i < children.size(); i += columns)
- {
- if (_columnIndex < columns)
- {
- toMove.add(children.get(i));
- }
- else
- {
- int tmp = i + 1;
- if (tmp == children.size())
- {
- toMove.add(null);
- }
- else
- {
- toMove.add(children.get(i + 1));
- }
- }
- }
- // for (int i = 0, size = toMove.size(); i < size; i++)
- int lastRowCells = (children.size() % columns == 0) ? columns : (children.size() % columns);
- PanelGridUtil util = new PanelGridUtil(this._panelGridEle);
- int uiRows = util.getUIRowCount();
- int adds = uiRows;
- if (this._columnIndex > lastRowCells)
- {
- adds += this._columnIndex - lastRowCells;
- }
- for (int i = 0, size = adds; i < size; i++)
- {
- Node child = createDefaultNode();
- int toMoveSize = toMove.size();
- Node node = null;
- if (i < toMoveSize)
- {
- node = (Node) toMove.get(i);
- }
- _panelGridEle.insertBefore(child, node);
- }
-
- _panelGridEle.setAttribute(IJSFConstants.ATTR_COLUMNS, String.valueOf(columns + 1));
- formatNode(_panelGridEle);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.pagedesigner.commands.DesignerCommand#getAfterCommandDesignerSelection()
- */
- protected ISelection getAfterCommandDesignerSelection()
- {
- return toDesignSelection(this._panelGridEle);
- }
-
- private Node createDefaultNode()
- {
- String prefix = JSPUtil.getOrCreatePrefix(getModel(), ITLDConstants.URI_JSF_HTML, "h"); //$NON-NLS-1$
- Element child = _panelGridEle.getOwnerDocument().createElement(IJSFConstants.TAG_OUTPUTTEXT);
- child.setPrefix(prefix);
- return child;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/commands/jsfhtml/PanelGridInsertFooterCommand.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/commands/jsfhtml/PanelGridInsertFooterCommand.java
deleted file mode 100644
index d3cb109..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/commands/jsfhtml/PanelGridInsertFooterCommand.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http:// www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.pagedesigner.jsf.ui.commands.jsfhtml;
-
-import java.util.List;
-
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jst.jsf.core.internal.tld.IJSFConstants;
-import org.eclipse.jst.pagedesigner.commands.DesignerCommand;
-import org.eclipse.jst.pagedesigner.jsf.core.dom.JSFDOMUtil;
-import org.eclipse.jst.pagedesigner.viewer.IHTMLGraphicalViewer;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-
-
-/**
- * @author mengbo
- * @version 1.5
- */
-public class PanelGridInsertFooterCommand extends DesignerCommand
-{
- private Element _panelGrid;
-
- /**
- * @param viewer
- * @param panelGrid
- */
- public PanelGridInsertFooterCommand(IHTMLGraphicalViewer viewer, Element panelGrid)
- {
- super(CommandResources.getString("PanelGridInsertFooterCommand.Label.InsertFooter"), viewer); //$NON-NLS-1$
- this._panelGrid = panelGrid;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.gef.commands.Command#canExecute()
- */
- public boolean canExecute()
- {
- boolean hasHeader = (JSFDOMUtil.findFacet(this._panelGrid, "footer") != null); //$NON-NLS-1$
- if (hasHeader)
- {
- return false;
- }
- return super.canExecute();
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.pagedesigner.commands.DesignerCommand#doExecute()
- */
- protected void doExecute()
- {
- Document doc = this._panelGrid.getOwnerDocument();
- Element facet = doc.createElement(IJSFConstants.TAG_FACET);
- facet.setPrefix("f"); //$NON-NLS-1$
- facet.setAttribute(IJSFConstants.ATTR_NAME, "footer"); //$NON-NLS-1$
- Element outputText = doc.createElement(IJSFConstants.TAG_OUTPUTTEXT);
- outputText.setPrefix("h"); //$NON-NLS-1$
- outputText.setAttribute(IJSFConstants.ATTR_VALUE, "Footer"); //$NON-NLS-1$
- facet.appendChild(outputText);
- List list = JSFDOMUtil.getUIComponentChildren(this._panelGrid);
- if (list != null && list.size() > 0)
- {
- this._panelGrid.insertBefore(facet, (Element) list.get(0));
- }
- else
- {
- this._panelGrid.insertBefore(facet, null);
- }
- formatNode(this._panelGrid);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.pagedesigner.commands.DesignerCommand#getAfterCommandDesignerSelection()
- */
- protected ISelection getAfterCommandDesignerSelection()
- {
- return toDesignSelection(this._panelGrid);
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/commands/jsfhtml/PanelGridInsertHeaderCommand.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/commands/jsfhtml/PanelGridInsertHeaderCommand.java
deleted file mode 100644
index 6a9753d..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/commands/jsfhtml/PanelGridInsertHeaderCommand.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http:// www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.pagedesigner.jsf.ui.commands.jsfhtml;
-
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jst.jsf.core.internal.tld.IJSFConstants;
-import org.eclipse.jst.pagedesigner.commands.DesignerCommand;
-import org.eclipse.jst.pagedesigner.jsf.core.dom.JSFDOMUtil;
-import org.eclipse.jst.pagedesigner.viewer.IHTMLGraphicalViewer;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-
-
-/**
- * @author mengbo
- * @version 1.5
- */
-public class PanelGridInsertHeaderCommand extends DesignerCommand
-{
- private Element _panelGrid;
-
- /**
- * @param viewer
- * @param panelGrid
- */
- public PanelGridInsertHeaderCommand(IHTMLGraphicalViewer viewer, Element panelGrid)
- {
- super(CommandResources.getString("PanelGridInsertHeaderCommand.Label.InsertHeader"), viewer); //$NON-NLS-1$
- this._panelGrid = panelGrid;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.gef.commands.Command#canExecute()
- */
- public boolean canExecute()
- {
- boolean hasHeader = (JSFDOMUtil.findFacet(this._panelGrid, "header") != null); //$NON-NLS-1$
- if (hasHeader)
- {
- return false;
- }
- return super.canExecute();
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.pagedesigner.commands.DesignerCommand#doExecute()
- */
- protected void doExecute()
- {
- Document doc = this._panelGrid.getOwnerDocument();
- Element facet = doc.createElement(IJSFConstants.TAG_FACET);
- facet.setPrefix("f"); //$NON-NLS-1$
- facet.setAttribute(IJSFConstants.ATTR_NAME, "header"); //$NON-NLS-1$
- Element outputText = doc.createElement(IJSFConstants.TAG_OUTPUTTEXT);
- outputText.setPrefix("h"); //$NON-NLS-1$
- outputText.setAttribute(IJSFConstants.ATTR_VALUE, "Header"); //$NON-NLS-1$
- facet.appendChild(outputText);
- this._panelGrid.insertBefore(facet, this._panelGrid.getFirstChild());
- formatNode(this._panelGrid);
- }
- /* (non-Javadoc)
- * @see org.eclipse.jst.pagedesigner.commands.DesignerCommand#getAfterCommandDesignerSelection()
- */
- protected ISelection getAfterCommandDesignerSelection()
- {
- return toDesignSelection(this._panelGrid);
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/commands/jsfhtml/PanelGridInsertRowCommand.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/commands/jsfhtml/PanelGridInsertRowCommand.java
deleted file mode 100644
index 8971b2c..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/commands/jsfhtml/PanelGridInsertRowCommand.java
+++ /dev/null
@@ -1,165 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http:// www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.pagedesigner.jsf.ui.commands.jsfhtml;
-
-import java.util.List;
-
-import org.eclipse.jface.viewers.ISelection;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-
-import org.eclipse.jst.jsf.core.internal.tld.IJSFConstants;
-import org.eclipse.jst.jsf.core.internal.tld.ITLDConstants;
-import org.eclipse.jst.pagedesigner.commands.DesignerCommand;
-import org.eclipse.jst.pagedesigner.jsf.core.dom.JSFDOMUtil;
-import org.eclipse.jst.pagedesigner.utils.DOMUtil;
-import org.eclipse.jst.pagedesigner.utils.JSPUtil;
-import org.eclipse.jst.pagedesigner.viewer.IHTMLGraphicalViewer;
-
-/**
- * @author mengbo
- * @version 1.5
- */
-public class PanelGridInsertRowCommand extends DesignerCommand
-{
- private int _rowIndex;
- private Element _panelGridEle;
-
- /**
- * consturctor
- * @param viewer
- * @param panelGrid
- * @param rowIndex
- */
- public PanelGridInsertRowCommand(IHTMLGraphicalViewer viewer, Element panelGrid, int rowIndex)
- {
- super(CommandResources.getString("PanelGridInsertRowCommand.Label.InsertRow"), viewer); //$NON-NLS-1$
- this._panelGridEle = panelGrid;
- this._rowIndex = rowIndex;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.gef.commands.Command#canExecute()
- */
- public boolean canExecute()
- {
- if (this._rowIndex < 0)
- {
- return false;
- }
- boolean hasHeaderRow = (JSFDOMUtil.findFacet(_panelGridEle, "header") != null); //$NON-NLS-1$
- //forbid insert row before header
- if (hasHeaderRow && _rowIndex == 0)
- {
- return false;
- }
-
- int offIndex = this._rowIndex;
- if (hasHeaderRow)
- {
- offIndex--;
- }
-
- int columns = DOMUtil.getIntAttributeIgnoreCase(_panelGridEle, IJSFConstants.ATTR_COLUMNS, 1);
- if (columns < 1)
- {
- columns = 1;
- }
- List children = JSFDOMUtil.getUIComponentChildren(_panelGridEle);
- int numRows = (children.size() + columns - 1) / columns;
- // //if the last element row is not full,then forbid insert row after the row
- // if ((children.size() % columns != 0) && (offIndex == numRows))
- // {
- // return false;
- // }
- //forbid insert row after the footer row
- if (offIndex > numRows)
- {
- return false;
- }
-
- return super.canExecute();
-
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.pagedesigner.commands.DesignerCommand#doExecute()
- */
- protected void doExecute()
- {
- boolean hasHeaderRow = (JSFDOMUtil.findFacet(_panelGridEle, "header") != null); //$NON-NLS-1$
-
- int columns = DOMUtil.getIntAttributeIgnoreCase(_panelGridEle, IJSFConstants.ATTR_COLUMNS, 1);
- if (columns < 1)
- {
- columns = 1;
- }
-
- List children = JSFDOMUtil.getUIComponentChildren(_panelGridEle);
- int numRows = (children.size() + columns - 1) / columns;
-
- int insertRow = _rowIndex;
-
- if (hasHeaderRow)
- {
- if (insertRow == 0)
- {
- return;
- }
- insertRow--;
- }
- //if (insertRow < numRows || ((insertRow == numRows) && (children.size() % columns == 0)))
-
- {
- int insertPoint = insertRow * columns;
- Node node = null;
- if (insertPoint < children.size())
- {
- node = (Node) children.get(insertPoint);
- }
-
- int adds = 0;
- //if insert after the last ui row
- if (insertRow >= numRows)
- {
- adds = columns * (numRows + 1) - children.size();
- }
- else
- {
- adds = columns;
- }
-
- for (int i = 0; i < adds; i++)
- {
- Node child = createDefaultNode();
- _panelGridEle.insertBefore(child, node);
- }
- formatNode(_panelGridEle);
- }
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.pagedesigner.commands.DesignerCommand#getAfterCommandDesignerSelection()
- */
- protected ISelection getAfterCommandDesignerSelection()
- {
- return toDesignSelection(this._panelGridEle);
- }
-
- private Node createDefaultNode()
- {
- String prefix = JSPUtil.getOrCreatePrefix(getModel(), ITLDConstants.URI_JSF_HTML, "h"); //$NON-NLS-1$
- Element child = _panelGridEle.getOwnerDocument().createElement(IJSFConstants.TAG_OUTPUTTEXT);
- child.setPrefix(prefix);
- return child;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/jsfcore/JSFCoreConverterFactory.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/jsfcore/JSFCoreConverterFactory.java
deleted file mode 100644
index bb218e5..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/jsfcore/JSFCoreConverterFactory.java
+++ /dev/null
@@ -1,141 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http:// www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.pagedesigner.jsf.ui.converter.jsfcore;
-
-import java.util.HashSet;
-import java.util.Set;
-
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.jst.jsf.context.resolver.structureddocument.IStructuredDocumentContextResolverFactory;
-import org.eclipse.jst.jsf.context.resolver.structureddocument.IWorkspaceContextResolver;
-import org.eclipse.jst.jsf.context.structureddocument.IStructuredDocumentContext;
-import org.eclipse.jst.jsf.context.structureddocument.IStructuredDocumentContextFactory2;
-import org.eclipse.jst.jsf.core.internal.tld.IJSFConstants;
-import org.eclipse.jst.jsf.core.internal.tld.ITLDConstants;
-import org.eclipse.jst.pagedesigner.converter.AbstractTagConverter;
-import org.eclipse.jst.pagedesigner.converter.HiddenTagConverter;
-import org.eclipse.jst.pagedesigner.converter.IConverterFactory;
-import org.eclipse.jst.pagedesigner.converter.ITagConverter;
-import org.eclipse.jst.pagedesigner.converter.TagConverterToInlineBlock;
-import org.eclipse.jst.pagedesigner.dtmanager.converter.internal.DTTagConverter;
-import org.eclipse.jst.pagedesigner.editors.palette.TagImageManager;
-import org.eclipse.swt.graphics.Image;
-import org.w3c.dom.Element;
-
-
-/**
- * @author mengbo
- * @version 1.5
- * @deprecated Use DTTagConverter meta-data instead
- */
-public class JSFCoreConverterFactory implements IConverterFactory
-{
-
- private final ILabelProvider _labelProvider;
-
- // TODO C.B: this is a transitional step so that we can incrementally add
- // new meta-data driven tag converter one-by-one without breaking other existing
- // if a tag name is in this set, the new DTTagConverter will be created for it,
- // else, revert to original one
- private final static Set _dtConversionSupported;
-
- static
- {
- _dtConversionSupported = new HashSet();
- /*
- _dtConversionSupported.add(IJSFConstants.TAG_VIEW);
- _dtConversionSupported.add(IJSFConstants.TAG_FACET);
- _dtConversionSupported.add(IJSFConstants.TAG_VERBATIM);
- */
- }
-
- /**
- *
- */
- public JSFCoreConverterFactory()
- {
- super();
- _labelProvider = new MyLabelProvider();
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.pagedesigner.converter.IConverterFactory#createConverter(org.w3c.dom.Element)
- */
- public ITagConverter createConverter(Element element, int mode)
- {
- String tagName = element.getLocalName();
- ITagConverter converter;
-
- if (_dtConversionSupported.contains(tagName))
- {
- converter = createDTTagConverter(element);
- }
- else if (IJSFConstants.TAG_VIEW.equalsIgnoreCase(tagName) || IJSFConstants.TAG_SUBVIEW.equalsIgnoreCase(tagName))
- {
- converter = new ViewTagConverter(element);
- ((ViewTagConverter) converter).setNeedBorderDecorator(true);
- }
- else if (IJSFConstants.TAG_FACET.equalsIgnoreCase(tagName)
- || IJSFConstants.TAG_VERBATIM.equalsIgnoreCase(tagName))
- {
- AbstractTagConverter toSpan = new TagConverterToInlineBlock(element, mode);
- toSpan.setMinWidth(10);
- toSpan.setMinHeight(10);
- toSpan.setNeedBorderDecorator(true);
- converter = toSpan;
- }
- else if (IJSFConstants.TAG_LOADBUNDLE.equalsIgnoreCase(tagName))
- {
- converter = new LoadBundleTagConverter(element, _labelProvider);
- }
- else
- {
- converter = new HiddenTagConverter(element, _labelProvider);
- }
- converter.setMode(mode);
- return converter;
- }
-
- private static class MyLabelProvider extends org.eclipse.jface.viewers.LabelProvider
- {
-
- public Image getImage(Object element)
- {
- if (element instanceof ITagConverter)
- {
- final Element hostElement = ((ITagConverter)element).getHostElement();
- IStructuredDocumentContext context = IStructuredDocumentContextFactory2.INSTANCE.getContext(hostElement);
- if (context != null){
- IWorkspaceContextResolver wsResolver = IStructuredDocumentContextResolverFactory.INSTANCE.getWorkspaceContextResolver(context);
- if (wsResolver != null){
- return TagImageManager.getInstance().getSmallIconImage(wsResolver.getProject(),ITLDConstants.URI_JSF_CORE, hostElement.getLocalName());
- }
- }
- }
-
- return null;
- }
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.pagedesigner.converter.IConverterFactory#getSupportedURI()
- */
- public String getSupportedURI()
- {
- return ITLDConstants.URI_JSF_CORE;
- }
-
- private ITagConverter createDTTagConverter(Element element)
- {
- return new DTTagConverter(element);
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/jsfcore/LoadBundleTagConverter.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/jsfcore/LoadBundleTagConverter.java
deleted file mode 100644
index a5f0fa9..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/jsfcore/LoadBundleTagConverter.java
+++ /dev/null
@@ -1,138 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http:// www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.pagedesigner.jsf.ui.converter.jsfcore;
-
-import java.io.BufferedInputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.MalformedURLException;
-import java.util.HashMap;
-import java.util.PropertyResourceBundle;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.jst.jsf.common.ui.IFileFolderConstants;
-import org.eclipse.jst.jsf.common.ui.internal.logging.Logger;
-import org.eclipse.jst.jsf.common.ui.internal.utils.ResourceUtils;
-import org.eclipse.jst.jsf.core.internal.tld.IJSFConstants;
-import org.eclipse.jst.pagedesigner.PDPlugin;
-import org.eclipse.jst.pagedesigner.converter.HiddenTagConverter;
-import org.eclipse.jst.pagedesigner.utils.PreviewUtil;
-import org.eclipse.jst.pagedesigner.utils.StructuredModelUtil;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
-import org.w3c.dom.Element;
-
-/**
- * @author mengbo
- * @deprecated Use DTTagConverter meta-data instead
- */
-public class LoadBundleTagConverter extends HiddenTagConverter
-{
- private static Logger _log = PDPlugin.getLogger(LoadBundleTagConverter.class);
-
- /**
- * @param host
- * @param labelProvider
- */
- public LoadBundleTagConverter(Element host, ILabelProvider labelProvider)
- {
- super(host, labelProvider);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.pagedesigner.converter.ITagConverter#convertRefresh(java.lang.Object)
- */
- public void convertRefresh(Object context)
- {
- Element hostEle = getHostElement();
- String varString = hostEle.getAttribute(IJSFConstants.ATTR_VAR);
- String baseName = hostEle.getAttribute(IJSFConstants.ATTR_BASENAME);
- if (baseName == null || varString == null)
- {
- return;
- }
- baseName = baseName.replace('.', '/') + IFileFolderConstants.DOT + IFileFolderConstants.EXT_PROPERTIES;
- IProject project = null;
-
- if (hostEle instanceof IDOMNode)
- {
- IDOMModel model = ((IDOMNode) hostEle).getModel();
- if (model != null)
- {
- project = StructuredModelUtil.getProjectFor(model);
- }
- }
- if (project == null)
- {
- return;
- }
- String prop = (new StringBuffer("webroot") //$NON-NLS-1$
- .append(IFileFolderConstants.PATH_SEPARATOR).append(IFileFolderConstants.FOLDER_WEBINF).append(
- IFileFolderConstants.PATH_SEPARATOR).append(IFileFolderConstants.FOLDER_CLASS).append(
- IFileFolderConstants.PATH_SEPARATOR).append(baseName)).toString();
- IResource res = project.findMember(prop);
- if (res == null)
- {
- prop = IFileFolderConstants.FOLDER_SOURCE + IFileFolderConstants.PATH_SEPARATOR + baseName;
- res = project.findMember(prop);
- if (res == null)
- {
- return;
- }
- }
- InputStream ins = null;
- try
- {
- File f = new File(res.getLocation().toString());
- ins = new FileInputStream(f);
- if (ins != null)
- {
- ins = new BufferedInputStream(ins);
- PropertyResourceBundle bundle = new PropertyResourceBundle(ins);
- if (bundle != null)
- {
- if (PreviewUtil.getBUNDLE_MAP() == null)
- {
- PreviewUtil.setBUNDLE_MAP(new HashMap());
- }
- else
- {
- PreviewUtil.getBUNDLE_MAP().clear();
- }
- PreviewUtil.getBUNDLE_MAP().put(varString, bundle);
- PreviewUtil.setBUNDLE(bundle);
- PreviewUtil.setVAR(varString);
- }
- }
- }
- catch (MalformedURLException e)
- {
- _log.error("LoadBundleTagConverter.convertRefresh.MalformedURLException", e); //$NON-NLS-1$
- return;
- }
- catch (IOException e)
- {
- _log.error("LoadBundleTagConverter.convertRefresh.IOException", e); //$NON-NLS-1$
- return;
- }
- finally
- {
- ResourceUtils.ensureClosed(ins);
- }
-
- return;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/jsfcore/ViewTagConverter.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/jsfcore/ViewTagConverter.java
deleted file mode 100644
index 7c40521..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/jsfcore/ViewTagConverter.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http:// www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.pagedesigner.jsf.ui.converter.jsfcore;
-
-import org.eclipse.jst.pagedesigner.IHTMLConstants;
-import org.eclipse.jst.pagedesigner.converter.AbstractTagConverter;
-import org.eclipse.jst.pagedesigner.converter.ConverterUtil;
-import org.w3c.dom.Element;
-
-/**
- * @author mengbo
- * @version 1.5
- * @deprecated Use DTTagConverter meta-data instead
- */
-public class ViewTagConverter extends AbstractTagConverter
-{
- /**
- * @param host
- */
- public ViewTagConverter(Element host)
- {
- super(host);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.pagedesigner.converter.AbstractTagConverter#doConvertRefresh()
- */
- protected Element doConvertRefresh()
- {
- Element result = createElement(IHTMLConstants.TAG_DIV);
- copyChildren(getHostElement(), result);
-// if(!isPreviewMode())
-// {
-// result.setAttribute(IHTMLConstants.ATTR_STYLE,"margin:10px;");
-// }
- if(!isPreviewMode() && ConverterUtil.isEmptyContainer(getHostElement()))
- {
- result.appendChild(ConverterUtil.createDescriptionElement(getDestDocument(),null));
- }
- return result;
- }
-
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.pagedesigner.converter.ITagConverter#isMultiLevel()
- */
- public boolean isMultiLevel()
- {
- return false;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.pagedesigner.css2.style.ITagEditInfo#isWidget()
- */
- public boolean isWidget()
- {
- return false;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/jsfhtml/ColumnTagConverter.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/jsfhtml/ColumnTagConverter.java
deleted file mode 100644
index 6990df4..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/jsfhtml/ColumnTagConverter.java
+++ /dev/null
@@ -1,137 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http:// www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.pagedesigner.jsf.ui.converter.jsfhtml;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.StringTokenizer;
-
-import org.eclipse.jst.jsf.core.internal.tld.IJSFConstants;
-import org.eclipse.jst.pagedesigner.IHTMLConstants;
-import org.eclipse.jst.pagedesigner.converter.AbstractTagConverter;
-import org.eclipse.jst.pagedesigner.converter.ConvertPosition;
-import org.eclipse.jst.pagedesigner.css2.property.ICSSPropertyID;
-import org.eclipse.jst.pagedesigner.dom.EditModelQuery;
-import org.eclipse.jst.pagedesigner.jsf.core.dom.JSFDOMUtil;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-
-
-/**
- * @author mengbo
- * @version 1.5
- * @deprecated Use DTTagConverter meta-data instead
- */
-public class ColumnTagConverter extends AbstractTagConverter
-{
-
- /**
- * @param host
- */
- public ColumnTagConverter(Element host)
- {
- super(host);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.pagedesigner.converter.AbstractTagConverter#doConvertRefresh()
- */
- protected Element doConvertRefresh()
- {
- Element hostEle = getHostElement();
- // we render all non-facet (header, footer) sub elements of this element
- Element resultEle = createElement(IHTMLConstants.TAG_TD);
- // --- create column's td in column tag converter, this should not be final solution, we might need to use
- // referece column figure in td later.
-
- Node parent = hostEle.getParentNode();
- int offset;
- if (parent != null && parent.getLocalName().equals(IJSFConstants.TAG_DATATABLE))
- {
- String columnClassesAttr = ((Element) parent).getAttribute(IJSFConstants.ATTR_COLUMNCLASSES);
- List columnClasses = new ArrayList();
- if (columnClassesAttr != null)
- {
- StringTokenizer tokenizer = new StringTokenizer(columnClassesAttr, ", "); //$NON-NLS-1$
- while (tokenizer.hasMoreTokens())
- {
- columnClasses.add(tokenizer.nextToken());
- }
- }
- offset = EditModelQuery.getInstance().getSameTypeNodeIndex(hostEle);
- if (offset < columnClasses.size())
- {
- resultEle.setAttribute(ICSSPropertyID.ATTR_CLASS, (String) columnClasses.get(offset));
- }
- }
- if (EditModelQuery.getInstance().hasNonTransparentChild(hostEle, new String[]
- {
- IJSFConstants.TAG_FACET
- }
- ))
- {
- Node child = hostEle.getFirstChild();
- int index = 0;
- while (child != null)
- {
- if (!(child instanceof Element)
- || !JSFDOMUtil.isFacet((Element) child))
- {
- addChild(child, new ConvertPosition(resultEle, index++));
- }
- child = child.getNextSibling();
- }
- }
- else
- {
- Node child = createText(" "); //$NON-NLS-1$
- resultEle.appendChild(child);
- }
- return resultEle;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.pagedesigner.converter.ITagConverter#isMultiLevel()
- */
- public boolean isMultiLevel()
- {
- return true;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.pagedesigner.converter.ITagConverter#isWidget()
- */
- public boolean isWidget()
- {
- return false;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.pagedesigner.css2.style.ITagEditInfo#needBorderDecorator()
- */
- public boolean needBorderDecorator()
- {
- Element hostEle = getHostElement();
- Node parent = hostEle.getParentNode();
- if (parent != null && parent.getLocalName().equals(IJSFConstants.TAG_DATATABLE))
- {
- return false;
- }
- return true;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/jsfhtml/CommandButtonTagConverter.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/jsfhtml/CommandButtonTagConverter.java
deleted file mode 100644
index 6a286aa..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/jsfhtml/CommandButtonTagConverter.java
+++ /dev/null
@@ -1,141 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http:// www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.pagedesigner.jsf.ui.converter.jsfhtml;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.jst.jsf.core.internal.tld.IJSFConstants;
-import org.eclipse.jst.pagedesigner.IHTMLConstants;
-import org.eclipse.jst.pagedesigner.converter.AbstractTagConverter;
-import org.eclipse.jst.pagedesigner.converter.JSFConverterUtil;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-/**
- * @author mengbo
- * @version 1.5
- * @deprecated Use DTTagConverter meta-data instead
- */
-public class CommandButtonTagConverter extends AbstractTagConverter
-{
- private List _nonVisualChildren = Collections.EMPTY_LIST;
-
- /**
- * @param host
- */
- public CommandButtonTagConverter(Element host)
- {
- super(host);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.pagedesigner.converter.AbstractTagConverter#doConvertRefresh()
- */
- protected Element doConvertRefresh()
- {
- Element hostEle = getHostElement();
-
- // Renders an HTML "input" element.
- Element inputEle = createElement(IHTMLConstants.TAG_INPUT);
-
- // pass throught attributes
- JSFConverterUtil.copyAllAttributes(hostEle, inputEle, null);
-
-// If the "styleClass" attribute is specified, render its
- // value as the value of the "class" attribute.
- JSFConverterUtil.copyAttribute(hostEle, IJSFConstants.ATTR_STYLECLASS, inputEle, IHTMLConstants.ATTR_CLASS);
-
- inputEle.removeAttribute(IJSFConstants.ATTR_STYLECLASS);
-
- // next handles input type
- // "image" attribute: Absolute or relative URL of the image to be
- // displayed for this button. If specified, this "input" element will be
- // of type "image". Otherwise, it will be of the type specified by the
- // "type" property with a label specified by the "value" property.
-
- String imageAttr = hostEle.getAttribute(IJSFConstants.ATTR_IMAGE);
- String type;
- if (imageAttr == null || imageAttr.length() == 0)
- {
- type = hostEle.getAttribute(IJSFConstants.ATTR_TYPE);
- if (type == null || type.length() == 0)
- {
- type = "submit"; // default type //$NON-NLS-1$
- }
- }
- else
- {
- type = "image"; //$NON-NLS-1$
- // copy the image attribute as the src attribute
- String src = mapURL(imageAttr);
- inputEle.setAttribute(IHTMLConstants.ATTR_SRC, src);
- }
- // overwrite the "type" attribute
- inputEle.setAttribute(IHTMLConstants.ATTR_TYPE, type);
-
- String value = hostEle.getAttribute(IJSFConstants.ATTR_VALUE);
- if (value != null && value.length() > 0)
- {
- value = mapValue(value);
- inputEle.setAttribute(IHTMLConstants.ATTR_VALUE, value);
- }
-
- // get non-visual children
- // a button only has non-visual children, so
- // all Element child nodes are considered such
- if (hostEle.hasChildNodes())
- {
- _nonVisualChildren = new ArrayList();
-
- NodeList list = hostEle.getChildNodes();
-
- for (int i = 0; i < list.getLength(); i++)
- {
- Node node = list.item(i);
-
- if (node.getNodeType() == Node.ELEMENT_NODE)
- {
- _nonVisualChildren.add(node);
- }
- }
- }
-
- // Render the clientId of the component as the value of the "name" attribute.
- // Render the current value of the component as the value of the "value" attribute.
-
- return inputEle;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.pagedesigner.converter.ITagConverter#isMultiLevel()
- */
- public boolean isMultiLevel()
- {
- return true;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.pagedesigner.converter.ITagConverter#isWidget()
- */
- public boolean isWidget()
- {
- return true;
- }
-
- public List getNonVisualChildren() {
- return _nonVisualChildren;
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/jsfhtml/CommandLinkTagConverter.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/jsfhtml/CommandLinkTagConverter.java
deleted file mode 100644
index a027bc4..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/jsfhtml/CommandLinkTagConverter.java
+++ /dev/null
@@ -1,148 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http:// www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.pagedesigner.jsf.ui.converter.jsfhtml;
-
-import org.eclipse.jst.jsf.core.internal.tld.IJSFConstants;
-import org.eclipse.jst.pagedesigner.IHTMLConstants;
-import org.eclipse.jst.pagedesigner.converter.AbstractTagConverter;
-import org.eclipse.jst.pagedesigner.converter.ConvertPosition;
-import org.eclipse.jst.pagedesigner.converter.ConverterUtil;
-import org.eclipse.jst.pagedesigner.converter.JSFConverterUtil;
-import org.eclipse.jst.pagedesigner.jsf.core.dom.JSFDOMUtil;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-
-
-/**
- * @author mengbo
- * @version 1.5
- * @deprecated Use DTTagConverter meta-data instead
- */
-public class CommandLinkTagConverter extends AbstractTagConverter
-{
-
- /**
- * @param host
- */
- public CommandLinkTagConverter(Element host)
- {
- super(host);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.pagedesigner.converter.AbstractTagConverter#doConvertRefresh()
- */
- protected Element doConvertRefresh()
- {
- Element hostEle = getHostElement();
- // Render an HTML "a" anchor element that acts like a form submit button when clicked.
- Element aEle = createElement(IHTMLConstants.TAG_A);
-
- JSFConverterUtil.copyAllAttributes(hostEle, aEle, null);
-
- // If the "styleClass" attribute is specified, render its value as the value of the "class" attribute.
- JSFConverterUtil.copyAttribute(hostEle, IJSFConstants.ATTR_STYLECLASS, aEle, IHTMLConstants.ATTR_CLASS);
-
- aEle.removeAttribute(IJSFConstants.ATTR_STYLECLASS);
-
- // Render "#" as the value of the "href" attribute.
- aEle.setAttribute(IHTMLConstants.ATTR_HREF, "#"); //$NON-NLS-1$
- // Extend the container border a little to make it selectable
- if (!isPreviewMode())
- {
- String style = aEle.getAttribute(IHTMLConstants.ATTR_STYLE);
- style = "padding:0.3em;" + style; //$NON-NLS-1$
- aEle.setAttribute(IHTMLConstants.ATTR_STYLE, style);
- }
-
- int childNodeIndex = 0;
- // Render the current value of the component as the link text if it
- // is specified.
- String value = hostEle.getAttribute(IJSFConstants.ATTR_VALUE);
- if (value != null && value.length() > 0)
- {
- value = mapValue(value);
- aEle.appendChild(createText(value));
- childNodeIndex = 1;
- }
- // generate children
- // Render any non-UIParameter children as normal inside of the "a" element.
- // These will appear as the link text.
-
- if (hostEle.hasChildNodes())
- {
- Node child = hostEle.getFirstChild();
- for (; child != null; child = child.getNextSibling())
- {
- if (!shouldIgnore(child))
- {
- if (child instanceof Element
- && (JSFDOMUtil.isUIParameter((Element) child) || isActionListener((Element) child)))
- {
- // skip
- }
- else
- {
- addChild(child, new ConvertPosition(aEle, childNodeIndex++));
- }
- }
- }
- }
- if (ConverterUtil.isEmptyContainer(hostEle) && !hostEle.hasAttribute(IJSFConstants.ATTR_VALUE))
- {
- aEle.appendChild(getDestDocument().createTextNode(IJSFConstants.TAG_COMMANDLINK));
- }
-
- return aEle;
- }
-
- private boolean isActionListener(Element element)
- {
- if(element != null && IJSFConstants.TAG_ACTIONLISTENER.equalsIgnoreCase(element.getLocalName()))
- {
- return true;
- }
- return false;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.pagedesigner.converter.ITagConverter#isMultiLevel()
- */
- public boolean isMultiLevel()
- {
- return true;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.pagedesigner.converter.ITagConverter#isWidget()
- */
- public boolean isWidget()
- {
- return false;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.pagedesigner.css2.style.ITagEditInfo#needBorderDecorator()
- */
- public boolean needBorderDecorator()
- {
- return true;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/jsfhtml/DataTableTagConverter.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/jsfhtml/DataTableTagConverter.java
deleted file mode 100644
index 7dc052a..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/jsfhtml/DataTableTagConverter.java
+++ /dev/null
@@ -1,306 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http:// www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.pagedesigner.jsf.ui.converter.jsfhtml;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.StringTokenizer;
-
-import org.eclipse.jst.jsf.common.dom.TagIdentifier;
-import org.eclipse.jst.jsf.core.internal.tld.IJSFConstants;
-import org.eclipse.jst.jsf.core.internal.tld.TagIdentifierFactory;
-import org.eclipse.jst.pagedesigner.IHTMLConstants;
-import org.eclipse.jst.pagedesigner.converter.AbstractTagConverter;
-import org.eclipse.jst.pagedesigner.converter.ConvertPosition;
-import org.eclipse.jst.pagedesigner.converter.ConverterUtil;
-import org.eclipse.jst.pagedesigner.converter.JSFConverterUtil;
-import org.eclipse.jst.pagedesigner.jsf.core.dom.JSFDOMUtil;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-
-
-/**
- * @author mengbo
- * @version 1.5
- * @deprecated Use DTTagConverter meta-data instead
- */
-public class DataTableTagConverter extends AbstractTagConverter
-{
- private static final String FACET_NAME_HEADER = "header"; //$NON-NLS-1$
-
- /**
- * @param host
- */
- public DataTableTagConverter(Element host)
- {
- super(host);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.pagedesigner.converter.AbstractTagConverter#doConvertRefresh()
- */
- protected Element doConvertRefresh()
- {
- Element hostEle = getHostElement();
-
- // Renders an HTML "table" element compliant with the HTML 401 specification.
- Element tableEle = createElement(IHTMLConstants.TAG_TABLE);
-
- // Any pass-through attributes are also rendered on the "table" element.
- JSFConverterUtil.copyAllAttributes(hostEle, tableEle, null);
-
- // Please consult the javadoc for UIData to supplement this specification.
- // If the "styleClass" attribute is specified, render its value as the value
- // of the "class" attribute on the "table" element.
- ConverterUtil.copyAttribute(hostEle, IJSFConstants.ATTR_STYLECLASS, tableEle, IHTMLConstants.ATTR_CLASS);
- tableEle.removeAttribute(IJSFConstants.ATTR_STYLECLASS);
-
- List columns = findUIColumns(hostEle);
-
- // rendering the thead
- convertTHeader(hostEle, tableEle, columns, true);
-
- convertTBody(hostEle, tableEle, columns);
- // rendering the tfoot
- // Follow the same process as for the header, except replace "header" with
- // "footer", "th" with "td", "thead" with "tfoot", and "headerClass" with
- // "footerClass". Do not render any "scope" attribute for the footer.
- convertTHeader(hostEle, tableEle, columns, false);
-
- return tableEle;
- }
-
- /**
- * @param hostEle
- * @return
- */
- private List findUIColumns(Element hostEle)
- {
- List result = new ArrayList();
- Node child = hostEle.getFirstChild();
- if (child != null)
- {
-
- while (child != null)
- {
- if (child instanceof Element)
- {
- Element ele = (Element) child;
- TagIdentifier tagId = TagIdentifierFactory.createDocumentTagWrapper(ele);
- if (IJSFConstants.TAG_IDENTIFIER_COLUMN.isSameTagType(tagId))
- {
- result.add(ele);
- }
- }
- child = child.getNextSibling();
- }
- }
- return result;
- }
-
- /**
- * @param hostEle
- * @param tableEle
- * @param columns
- */
- protected void convertTBody(Element hostEle, Element tableEle, List columns)
- {
- // Rendering the table body
- Element tbodyEle = createElement(IHTMLConstants.TAG_TBODY);
- tableEle.appendChild(tbodyEle);
- // Render a "tbody" element. Keep track of the result of the "rows" property
- // on the UIData component. Keep track of the number of rows we have rendered
- // so far.
- // Iterate through the rows. Set the "rowIndex" property of the UIDatacomponent
- // to be correct as we iterate through the rows.
- // Stop rendering children and close out the "tbody" element if the "rowAvailable"
- // property of the UIData returned false.
-
- // XXX: we are only rendering one row.
- // Output a "tr" element.
- Element trEle = createElement(IHTMLConstants.TAG_TR);
- tbodyEle.appendChild(trEle);
-
- // Output the value of the "rowClasses" per the attribute description below.
- String rowClasses = tableEle.getAttribute(IJSFConstants.ATTR_ROWCLASSES);
- if (rowClasses != null)
- {
- // as we are only rendering one row, so we only get the first rowclass
- StringTokenizer tokenizer = new StringTokenizer(rowClasses, ", "); //$NON-NLS-1$
- if (tokenizer.hasMoreTokens())
- {
- trEle.setAttribute(IHTMLConstants.ATTR_CLASS, tokenizer.nextToken());
- }
- }
-
- // --------------------------------- move this part into ColumnsTagConverter. ------------------------------
- String columnClassesAttr = hostEle.getAttribute(IJSFConstants.ATTR_COLUMNCLASSES);
- List columnClasses = new ArrayList();
- if (columnClassesAttr != null)
- {
- StringTokenizer tokenizer = new StringTokenizer(columnClassesAttr, ", "); //$NON-NLS-1$
- while (tokenizer.hasMoreTokens())
- {
- columnClasses.add(tokenizer.nextToken());
- }
- }
- // --- create column's td in column tag converter, here
- // For each UIColumn child, output a "td" element, attaching the value of the
- // "columnClasses" attribute of the UIData component per the attribute description below.
- // Recursively encode each child of each UIColumn child. Close out the "td" element.
- // When done with the row, close out the "tr" element. When done with all the rows,
- // close out the "tbody" element.
- for (int i = 0, size = columns.size(); i < size; i++)
- {
- Element column = (Element) columns.get(i);
- addChild(column, new ConvertPosition(trEle, i));
- // Element tdEle = createElement("td");
- // if (i < columnClasses.size())
- // {
- // tdEle.setAttribute("class", (String) columnClasses.get(i));
- // }
- //
- // trEle.appendChild(tdEle);
- // // put the "h:column" under td.
- // addChild(column, new ConvertPosition(tdEle, 0));
- }
- }
-
- /**
- * @param hostEle
- * @param tableEle
- * @param columns
- * @param header true means header, false means footer
- */
- protected void convertTHeader(Element hostEle, Element tableEle, List columns, boolean header)
- {
- // If the UIData component has a "header" facet, or any of the child UIColumn
- // components has a "header" facet, render a "thead" element.
- Element facetEle = JSFDOMUtil.findFacet(hostEle, header ? FACET_NAME_HEADER : "footer"); //$NON-NLS-1$
- boolean hasColHeader = false;
- for (int i = 0, size = columns.size(); i < size; i++)
- {
- Element uicolumnEle = (Element) columns.get(i);
- Element columnFacet = JSFDOMUtil.findFacet(uicolumnEle, header ? FACET_NAME_HEADER : "footer"); //$NON-NLS-1$
- if (columnFacet != null)
- {
- hasColHeader = true;
- break;
- }
- }
-
- if (facetEle == null && !hasColHeader)
- {
- return;
- }
- Element theadEle = createElement(header ? IHTMLConstants.TAG_THEAD : IHTMLConstants.TAG_TFOOT);
- tableEle.appendChild(theadEle);
-
- // If the UIData component has a "header" facet, encode its contents inside of
- // "tr" and "th" elements, respectively.
- if (facetEle != null)
- {
- Element trEle = createElement(IHTMLConstants.TAG_TR);
- theadEle.appendChild(trEle);
- Element thEle = createElement(header ? IHTMLConstants.TAG_TH : IHTMLConstants.TAG_TD);
- trEle.appendChild(thEle);
- // Output the value of the "headerClass" attribute of the UIData component,
- // if present, as the value of the "class" attribute on the "th".
- ConverterUtil.copyAttribute(hostEle, header ? IJSFConstants.ATTR_HEADERCLASS
- : IJSFConstants.ATTR_FOOTERCLASS, thEle, IHTMLConstants.ATTR_CLASS);
- // Output the number of child UIColumn components of theUIData component as
- // the value of the "colspan" attribute on the "th".
- if (columns.size() > 0)
- {
- thEle.setAttribute(IHTMLConstants.ATTR_COLSPAN, String.valueOf(columns.size()));
- }
-
- addChild(facetEle, new ConvertPosition(thEle, 0));
- }
- // Output "colgroup" as the value of the "scope" attribute on the "th" element.
-
- // If any of the child UIColumn components has a "header" facet render a "tr"
- // element.
- if (hasColHeader)
- {
- Element trEle = createElement(IHTMLConstants.TAG_TR);
- theadEle.appendChild(trEle);
-
- for (int i = 0, size = columns.size(); i < size; i++)
- {
- Element uicolumnEle = (Element) columns.get(i);
- Element columnFacet = JSFDOMUtil.findFacet(uicolumnEle, header ? FACET_NAME_HEADER : "footer"); //$NON-NLS-1$
- Element thEle = createElement(header ? IHTMLConstants.TAG_TH : IHTMLConstants.TAG_TD);
- trEle.appendChild(thEle);
- if (columnFacet != null)
- {
- // For eachUIColumn that actually has a "header" facet, render it inside of
- // a "th" element.
- addChild(columnFacet, new ConvertPosition(thEle, 0));
- }
- else
- {
- // Columns that don't have a "header" facet cause an empty "th" element to be
- // rendered.
- }
-
- // Output the value of the "headerClass" attribute of the UIData component,
- // if present, as the value of the "class" attribute on the "th".
- ConverterUtil.copyAttribute(hostEle, header ? IJSFConstants.ATTR_HEADERCLASS
- : IJSFConstants.ATTR_FOOTERCLASS, thEle, IHTMLConstants.ATTR_CLASS);
-
- // Output "col" as the value of the "colgroup" attribute on the "th" element.
- }
- }
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.pagedesigner.converter.ITagConverter#isMultiLevel()
- */
- public boolean isMultiLevel()
- {
- return true;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.pagedesigner.converter.ITagConverter#isWidget()
- */
- public boolean isWidget()
- {
- return false;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.pagedesigner.converter.AbstractTagConverter#needBorderDecorator()
- */
- public boolean needBorderDecorator()
- {
- return false;
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.jst.pagedesigner.converter.AbstractTagConverter#needTableDecorator()
- */
- public boolean needTableDecorator()
- {
- return true;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/jsfhtml/GraphicImageTagConveter.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/jsfhtml/GraphicImageTagConveter.java
deleted file mode 100644
index bc39f32..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/jsfhtml/GraphicImageTagConveter.java
+++ /dev/null
@@ -1,107 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http:// www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.pagedesigner.jsf.ui.converter.jsfhtml;
-
-import org.eclipse.jst.jsf.core.internal.tld.IJSFConstants;
-import org.eclipse.jst.pagedesigner.IHTMLConstants;
-import org.eclipse.jst.pagedesigner.converter.AbstractTagConverter;
-import org.eclipse.jst.pagedesigner.converter.ConverterUtil;
-import org.eclipse.jst.pagedesigner.converter.JSFConverterUtil;
-import org.w3c.dom.Element;
-
-/**
- * @author mengbo
- * @version 1.5
- * @deprecated Use DTTagConverter meta-data instead
- */
-public class GraphicImageTagConveter extends AbstractTagConverter
-{
-
- /**
- * @param host
- */
- public GraphicImageTagConveter(Element host)
- {
- super(host);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.pagedesigner.converter.AbstractTagConverter#doConvertRefresh()
- */
- protected Element doConvertRefresh()
- {
- Element hostEle = getHostElement();
- // Renders an HTML "img" element.
- Element imgEle = createElement(IHTMLConstants.TAG_IMG);
-
- JSFConverterUtil.copyAllAttributes(hostEle, imgEle, null);
-
- // If the "styleClass" attribute is specified, render its value as
- // the value of the "class" attribute.
- ConverterUtil.copyAttribute(hostEle, IJSFConstants.ATTR_STYLECLASS, imgEle, IHTMLConstants.ATTR_CLASS);
- imgEle.removeAttribute(IJSFConstants.ATTR_STYLECLASS);
-
- // Render the clientId as the value of the "id" attribute.
- // Render the value of the component as the value of the "src"
- // attribute, after passing it to the getResourceUR() method
- // of the ViewHandler for this application, and passing the
- // result through the encodeResourceURL() method of the
- // ExternalContext.
- String src = getSrc(hostEle);
- if (src != null)
- {
- imgEle.setAttribute(IHTMLConstants.ATTR_SRC, src);
- }
- return imgEle;
- }
-
- /**
- * @param hostEle
- * @return
- */
- private String getSrc(Element hostEle)
- {
- // TODO: need revisit the spec for special URL converting
- // for this element
- String value = hostEle.getAttribute(IJSFConstants.ATTR_VALUE);
- if (value == null)
- {
- // Context-relative URL to retrieve the resource associated
- // with this component. This is an alias for the "value"
- // property.
- value = hostEle.getAttribute(IJSFConstants.ATTR_URL);
- }
- if (value != null)
- {
- value = mapValue(value);
- value = mapURL(value);
- }
- return value;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.pagedesigner.converter.ITagConverter#isMultiLevel()
- */
- public boolean isMultiLevel()
- {
- return true;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.pagedesigner.converter.ITagConverter#isWidget()
- */
- public boolean isWidget()
- {
- return true;
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/jsfhtml/InputTagConverter.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/jsfhtml/InputTagConverter.java
deleted file mode 100644
index bb774a3..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/jsfhtml/InputTagConverter.java
+++ /dev/null
@@ -1,101 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http:// www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.pagedesigner.jsf.ui.converter.jsfhtml;
-
-import org.eclipse.jst.jsf.core.internal.tld.IJSFConstants;
-import org.eclipse.jst.pagedesigner.IHTMLConstants;
-import org.eclipse.jst.pagedesigner.converter.AbstractTagConverter;
-import org.eclipse.jst.pagedesigner.converter.JSFConverterUtil;
-import org.w3c.dom.Element;
-
-/**
- * This is for inputHidden, inputSecret, inputText.
- *
- * @author mengbo
- * @version 1.5
- * @deprecated Use DTTagConverter meta-data instead
- */
-public class InputTagConverter extends AbstractTagConverter
-{
-
- private String _inputType;
-
- /**
- * @param host
- * @param inputType
- */
- public InputTagConverter(Element host, String inputType)
- {
- super(host);
- _inputType = inputType;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.pagedesigner.converter.AbstractTagConverter#doConvertRefresh()
- */
- protected Element doConvertRefresh()
- {
- Element hostEle = getHostElement();
- // Renders an HTML "input" element of "type" "text".
- Element inputEle = createElement(IHTMLConstants.TAG_INPUT);
- JSFConverterUtil.copyAllAttributes(hostEle, inputEle, null);
- JSFConverterUtil.copyAttribute(hostEle, IJSFConstants.ATTR_STYLECLASS, inputEle, IHTMLConstants.ATTR_CLASS);
- inputEle.removeAttribute(IJSFConstants.ATTR_STYLECLASS);
-
- inputEle.setAttribute(IHTMLConstants.ATTR_TYPE, getInputType());
-
- inputEle.removeAttribute(IJSFConstants.ATTR_VALUE);
- inputEle.setAttribute(IJSFConstants.ATTR_VALUE, getValue(hostEle));
-
- return inputEle;
- }
-
- /**
- * @param hostEle
- * @return
- */
- private String getValue(Element hostEle)
- {
- String valueAttr = hostEle.getAttribute(IJSFConstants.ATTR_VALUE);
- if (valueAttr == null)
- {
- String name = hostEle.getLocalName();
- return name.substring(0, 1).toUpperCase() + name.substring(1);
- }
- return mapValue(valueAttr);
- }
-
- /**
- * @return
- */
- private String getInputType()
- {
- return _inputType;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.pagedesigner.converter.ITagConverter#isMultiLevel()
- */
- public boolean isMultiLevel()
- {
- return true;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.pagedesigner.converter.ITagConverter#isWidget()
- */
- public boolean isWidget()
- {
- return true;
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/jsfhtml/InputTextAreaTagConverter.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/jsfhtml/InputTextAreaTagConverter.java
deleted file mode 100644
index b43d613..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/jsfhtml/InputTextAreaTagConverter.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http:// www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.pagedesigner.jsf.ui.converter.jsfhtml;
-
-import org.eclipse.jst.jsf.core.internal.tld.IJSFConstants;
-import org.eclipse.jst.pagedesigner.IHTMLConstants;
-import org.eclipse.jst.pagedesigner.converter.AbstractTagConverter;
-import org.eclipse.jst.pagedesigner.converter.JSFConverterUtil;
-import org.w3c.dom.Element;
-
-/**
- * @author mengbo
- * @version 1.5
- * @deprecated Use DTTagConverter meta-data instead
- */
-public class InputTextAreaTagConverter extends AbstractTagConverter
-{
-
- /**
- * @param host
- */
- public InputTextAreaTagConverter(Element host)
- {
- super(host);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.pagedesigner.converter.AbstractTagConverter#doConvertRefresh()
- */
- protected Element doConvertRefresh()
- {
- Element hostEle = getHostElement();
- // Renders an HTML "textarea" element.
- Element textareaEle = createElement(IHTMLConstants.TAG_TEXTAREA);
-
- JSFConverterUtil.copyAllAttributes(hostEle, textareaEle, null);
- JSFConverterUtil.copyAttribute(hostEle, IJSFConstants.ATTR_STYLECLASS, textareaEle, IHTMLConstants.ATTR_CLASS);
- textareaEle.removeAttribute(IJSFConstants.ATTR_STYLECLASS);
-
- String value = hostEle.getAttribute(IJSFConstants.ATTR_VALUE);
- if (value != null && value.length() > 0)
- {
- value = mapValue(value);
- textareaEle.appendChild(createText(value));
- }
-
- return textareaEle;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.pagedesigner.converter.ITagConverter#isMultiLevel()
- */
- public boolean isMultiLevel()
- {
- return true;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.pagedesigner.converter.ITagConverter#isWidget()
- */
- public boolean isWidget()
- {
- return true;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/jsfhtml/JSFFormTagConverter.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/jsfhtml/JSFFormTagConverter.java
deleted file mode 100644
index 9db6c14..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/jsfhtml/JSFFormTagConverter.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http:// www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.pagedesigner.jsf.ui.converter.jsfhtml;
-
-import org.eclipse.jst.jsf.core.internal.tld.IJSFConstants;
-import org.eclipse.jst.pagedesigner.IHTMLConstants;
-import org.eclipse.jst.pagedesigner.converter.AbstractTagConverter;
-import org.eclipse.jst.pagedesigner.converter.JSFConverterUtil;
-import org.w3c.dom.Element;
-
-/**
- * @author mengbo
- * @version 1.5
- * @deprecated Use DTTagConverter meta-data instead
- */
-public class JSFFormTagConverter extends AbstractTagConverter
-{
-
- /**
- * @param host
- */
- public JSFFormTagConverter(Element host)
- {
- super(host);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.pagedesigner.converter.AbstractTagConverter#doConvertRefresh()
- */
- protected Element doConvertRefresh()
- {
- // The value of the "method" attribute must be "post". The value of the
- // "action" attribute must be the result of passing the view identifier
- // of the current view to the getActionURL() method of the ViewHandler for
- // this application, then passing that String to the encodeActionURL()
- // method on the ExternalContext.
- // XXX: as our tag converter only serve designer and preview, so we only
- // deal with attributes relating to visual effect. Ignoring "method", "action",
- // etc.
- Element hostEle = getHostElement();
-
- Element formEle = createElement(IHTMLConstants.TAG_FORM);
-
- // If the "styleClass" attribute is specified, render its value as the
- // value of the "class" attribute.
- JSFConverterUtil.copyAttribute(hostEle, IJSFConstants.ATTR_STYLECLASS, formEle, IHTMLConstants.ATTR_CLASS);
- formEle.removeAttribute(IJSFConstants.ATTR_STYLECLASS);
-
- // pass through other attributes
- // XXX: handle ignored attributes here.
- JSFConverterUtil.copyAllAttributes(hostEle, formEle, null);
-
- // Render all the necessary hidden fields for all commandLink instances
- // in the page just before the close of the "form" element.
- // XXX: ignored for these hidden fields.
-
- // children of old <h:form> should still be children.
- this.copyChildren(hostEle, formEle);
-
- return formEle;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.pagedesigner.converter.ITagConverter#isMultiLevel()
- */
- public boolean isMultiLevel()
- {
- return false;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.pagedesigner.converter.ITagConverter#isWidget()
- */
- public boolean isWidget()
- {
- return false;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.pagedesigner.converter.AbstractTagConverter#needBorderDecorator()
- */
- public boolean needBorderDecorator()
- {
- return true;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/jsfhtml/JSFHTMLConverterFactory.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/jsfhtml/JSFHTMLConverterFactory.java
deleted file mode 100644
index 29a48e0..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/jsfhtml/JSFHTMLConverterFactory.java
+++ /dev/null
@@ -1,219 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http:// www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.pagedesigner.jsf.ui.converter.jsfhtml;
-
-import java.util.HashSet;
-import java.util.Set;
-
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.jst.jsf.context.resolver.structureddocument.IStructuredDocumentContextResolverFactory;
-import org.eclipse.jst.jsf.context.resolver.structureddocument.IWorkspaceContextResolver;
-import org.eclipse.jst.jsf.context.structureddocument.IStructuredDocumentContext;
-import org.eclipse.jst.jsf.context.structureddocument.IStructuredDocumentContextFactory2;
-import org.eclipse.jst.jsf.core.internal.tld.IJSFConstants;
-import org.eclipse.jst.jsf.core.internal.tld.ITLDConstants;
-import org.eclipse.jst.pagedesigner.converter.HiddenTagConverter;
-import org.eclipse.jst.pagedesigner.converter.IConverterFactory;
-import org.eclipse.jst.pagedesigner.converter.ITagConverter;
-import org.eclipse.jst.pagedesigner.dtmanager.converter.internal.DTTagConverter;
-import org.eclipse.jst.pagedesigner.editors.palette.TagImageManager;
-import org.eclipse.swt.graphics.Image;
-import org.w3c.dom.Element;
-
-
-/**
- * @author mengbo
- * @version 1.5
- * @deprecated Use DTTagConverter meta-data instead
- */
-public class JSFHTMLConverterFactory implements IConverterFactory
-{
- private final MyLabelProvider _labelProvider;
-
- // TODO C.B: this is a transitional step so that we can incrementally add
- // new meta-data driven tag converter one-by-one without breaking other existing
- // if a tag name is in this set, the new DTTagConverter will be created for it,
- // else, revert to original one
- private final static Set _dtConversionSupported;
-
- static
- {
- _dtConversionSupported = new HashSet();
- /*
- _dtConversionSupported.add(IJSFConstants.TAG_FORM);
- _dtConversionSupported.add(IJSFConstants.TAG_INPUTTEXT);
- _dtConversionSupported.add(IJSFConstants.TAG_INPUTSECRET);
- _dtConversionSupported.add(IJSFConstants.TAG_INPUTTEXTAREA);
- _dtConversionSupported.add(IJSFConstants.TAG_OUTPUTTEXT);
- _dtConversionSupported.add(IJSFConstants.TAG_OUTPUTLABEL);
- _dtConversionSupported.add(IJSFConstants.TAG_GRAPHICIMAGE);
- _dtConversionSupported.add(IJSFConstants.TAG_PANELGRID);
- */
- }
-
- /**
- *
- */
- public JSFHTMLConverterFactory()
- {
- super();
- _labelProvider = new MyLabelProvider();
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.pagedesigner.converter.IConverterFactory#createConverter(org.w3c.dom.Element)
- */
- public ITagConverter createConverter(Element element, int mode)
- {
- ITagConverter converter;
- String tagName = element.getLocalName();
-
- if (_dtConversionSupported.contains(tagName))
- {
- converter = createDTTagConverter(element);
- }
- else if (IJSFConstants.TAG_COLUMN.equalsIgnoreCase(tagName))
- {
- converter = new ColumnTagConverter(element);
- }
- else if (IJSFConstants.TAG_COMMANDBUTTON.equalsIgnoreCase(tagName))
- {
- converter = new CommandButtonTagConverter(element);
- }
- else if (IJSFConstants.TAG_COMMANDLINK.equalsIgnoreCase(tagName))
- {
- converter = new CommandLinkTagConverter(element);
- }
- else if (IJSFConstants.TAG_DATATABLE.equalsIgnoreCase(tagName))
- {
- converter = new DataTableTagConverter(element);
- }
- else if (IJSFConstants.TAG_FORM.equalsIgnoreCase(tagName))
- {
- converter = new JSFFormTagConverter(element);
- }
- else if (IJSFConstants.TAG_GRAPHICIMAGE.equalsIgnoreCase(tagName))
- {
- converter = new GraphicImageTagConveter(element);
- }
- else if (IJSFConstants.TAG_INPUTHIDDEN.equalsIgnoreCase(tagName))
- {
- return new HiddenTagConverter(element, _labelProvider);
- }
- else if (IJSFConstants.TAG_INPUTSECRET.equalsIgnoreCase(tagName))
- {
- converter = new InputTagConverter(element, "password"); //$NON-NLS-1$
- }
- else if (IJSFConstants.TAG_INPUTTEXT.equalsIgnoreCase(tagName))
- {
- converter = new InputTagConverter(element, "text"); //$NON-NLS-1$
- }
- else if (IJSFConstants.TAG_INPUTTEXTAREA.equalsIgnoreCase(tagName))
- {
- converter = new InputTextAreaTagConverter(element);
- }
- else if (IJSFConstants.TAG_MESSAGE.equalsIgnoreCase(tagName)
- || IJSFConstants.TAG_MESSAGES.equalsIgnoreCase(tagName))
- {
- converter = new HiddenTagConverter(element, _labelProvider);
- }
- else if (IJSFConstants.TAG_OUTPUTTEXT.equalsIgnoreCase(tagName)
- || IJSFConstants.TAG_OUTPUTFORMAT.equalsIgnoreCase(tagName))
- {
- converter = new OutputTextTagConverter(element);
- }
- else if (IJSFConstants.TAG_OUTPUTLABEL.equalsIgnoreCase(tagName))
- {
- converter = new OutputLabelTagConverter(element);
- }
- else if (IJSFConstants.TAG_OUTPUTLINK.equalsIgnoreCase(tagName))
- {
- converter = new OutputLinkTagConverter(element);
- }
- else if (IJSFConstants.TAG_PANELGRID.equalsIgnoreCase(tagName))
- {
- converter = new PanelGridTagConverter(element);
- }
- else if (IJSFConstants.TAG_PANELGROUP.equalsIgnoreCase(tagName))
- {
- converter = new PanelGroupTagConverter(element);
- }
- else if (IJSFConstants.TAG_SELECTBOOLEANCHECKBOX.equalsIgnoreCase(tagName))
- {
- converter = new SelectBooleanCheckboxTagConverter(element);
- }
- else if (IJSFConstants.TAG_SELECTMANYCHECKBOX.equalsIgnoreCase(tagName))
- {
- converter = new TableBasedSelectTagConverter(element, "checkbox"); //$NON-NLS-1$
- }
- else if (IJSFConstants.TAG_SELECTMANYLISTBOX.equalsIgnoreCase(tagName))
- {
- converter = new SelectManyListboxTagConverter(element);
- }
- else if (IJSFConstants.TAG_SELECTMANYMENU.equalsIgnoreCase(tagName))
- {
- converter = new SelectManyMenuTagConverter(element);
- }
- else if (IJSFConstants.TAG_SELECTONELISTBOX.equalsIgnoreCase(tagName))
- {
- converter = new SelectOneListboxTagConverter(element);
- }
- else if (IJSFConstants.TAG_SELECTONEMENU.equalsIgnoreCase(tagName))
- {
- converter = new SelectOneMenuTagConverter(element);
- }
- else if (IJSFConstants.TAG_SELECTONERADIO.equalsIgnoreCase(tagName))
- {
- converter = new TableBasedSelectTagConverter(element, "radio"); //$NON-NLS-1$
- }
- else
- {
- return null;
- }
- converter.setMode(mode);
- return converter;
- }
-
- private static class MyLabelProvider extends LabelProvider
- {
- public Image getImage(Object element)
- {
- if (element instanceof ITagConverter)
- {
- final Element hostElement = ((ITagConverter)element).getHostElement();
- IStructuredDocumentContext context = IStructuredDocumentContextFactory2.INSTANCE.getContext(hostElement);
- if (context != null){
- IWorkspaceContextResolver wsResolver = IStructuredDocumentContextResolverFactory.INSTANCE.getWorkspaceContextResolver(context);
- if (wsResolver != null){
- return TagImageManager.getInstance().getSmallIconImage(wsResolver.getProject(),ITLDConstants.URI_JSF_HTML, hostElement.getLocalName());
- }
- }
- }
-
- return null;
- }
- }
-
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.pagedesigner.converter.IConverterFactory#getSupportedURI()
- */
- public String getSupportedURI()
- {
- return ITLDConstants.URI_JSF_HTML;
- }
-
- private ITagConverter createDTTagConverter(Element element)
- {
- return new DTTagConverter(element);
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/jsfhtml/MessageTagConverter.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/jsfhtml/MessageTagConverter.java
deleted file mode 100644
index 47a995d..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/jsfhtml/MessageTagConverter.java
+++ /dev/null
@@ -1,149 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http:// www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.pagedesigner.jsf.ui.converter.jsfhtml;
-
-import org.eclipse.jst.jsf.core.internal.tld.IJSFConstants;
-import org.eclipse.jst.pagedesigner.IHTMLConstants;
-import org.eclipse.jst.pagedesigner.converter.AbstractTagConverter;
-import org.eclipse.jst.pagedesigner.converter.JSFConverterUtil;
-import org.eclipse.jst.pagedesigner.jsf.ui.util.JSFUIPluginResourcesUtil;
-import org.w3c.dom.Element;
-import org.w3c.dom.Text;
-
-
-/**
- * @author mengbo
- * @version 1.5
- * @deprecated Use DTTagConverter meta-data instead
- */
-public class MessageTagConverter extends AbstractTagConverter
-{
- private static final String MESSAGE_CONTENT = JSFUIPluginResourcesUtil.getInstance().getString(
- "MessageTagConverter.defaultValue"); //$NON-NLS-1$
- private static final String MESSAGE_TOOLTIP = JSFUIPluginResourcesUtil.getInstance().getString(
- "MessageTagConverter.defaultTooltip"); //$NON-NLS-1$
-
- /**
- * @param host
- */
- public MessageTagConverter(Element host)
- {
- super(host);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.pagedesigner.converter.AbstractTagConverter#doConvertRefresh()
- */
- protected Element doConvertRefresh()
- {
- Element hostEle = getHostElement();
-
- // If the "styleClass" or "style" attributes are present,
- // render a "span" element.
- // XXX: to make things simpler, we always create a span
- Element spanEle = createElement(IHTMLConstants.TAG_SPAN);
-
- // If the "style" attribute is present, pass it thru.
- // XXX: we are passing all the attributes through, since other attribute
- // don't conflict with html attributes.
- JSFConverterUtil.copyAllAttributes(hostEle, spanEle, null);
-
- // If the "styleClass" attribute is present,
- // output the value of the "styleClass" attribute as the value of the "class" attribute on the "span" element
- JSFConverterUtil.copyAttribute(hostEle, IJSFConstants.ATTR_STYLECLASS, spanEle, IHTMLConstants.ATTR_CLASS);
- spanEle.removeAttribute(IJSFConstants.ATTR_STYLECLASS);
-
- String fatalStyle = hostEle.getAttribute(IJSFConstants.ATTR_FATALSTYLE);
- String errorStyle = hostEle.getAttribute(IJSFConstants.ATTR_ERRORSTYLE);
- String warnStyle = hostEle.getAttribute(IJSFConstants.ATTR_WARNSTYLE);
- String infoStyle = hostEle.getAttribute(IJSFConstants.ATTR_INFOSTYLE);
- String fatalClass = hostEle.getAttribute(IJSFConstants.ATTR_FATALCLASS);
- String errorClass = hostEle.getAttribute(IJSFConstants.ATTR_ERRORCLASS);
- String warnClass = hostEle.getAttribute(IJSFConstants.ATTR_WARNCLASS);
- String infoClass = hostEle.getAttribute(IJSFConstants.ATTR_INFOCLASS);
-
- if ((!"".equals(fatalStyle)) && (fatalStyle != null)) //$NON-NLS-1$
- {
- spanEle.setAttribute(IHTMLConstants.ATTR_STYLE, fatalStyle);
- }
- else if ((!"".equals(errorStyle)) && (errorStyle != null)) //$NON-NLS-1$
- {
- spanEle.setAttribute(IHTMLConstants.ATTR_STYLE, errorStyle);
- }
- else if ((!"".equals(warnStyle)) && (warnStyle != null)) //$NON-NLS-1$
- {
- spanEle.setAttribute(IHTMLConstants.ATTR_STYLE, warnStyle);
- }
- else if ((!"".equals(infoStyle)) && (infoStyle != null)) //$NON-NLS-1$
- {
- spanEle.setAttribute(IHTMLConstants.ATTR_STYLE, infoStyle);
- }
-
- if ((!"".equals(fatalClass)) && (fatalClass != null)) //$NON-NLS-1$
- {
- spanEle.setAttribute(IJSFConstants.ATTR_STYLECLASS, fatalClass);
- }
- else if ((!"".equals(errorClass)) && (errorClass != null)) //$NON-NLS-1$
- {
- spanEle.setAttribute(IJSFConstants.ATTR_STYLECLASS, errorClass);
- }
- else if ((!"".equals(warnClass)) && (warnClass != null)) //$NON-NLS-1$
- {
- spanEle.setAttribute(IJSFConstants.ATTR_STYLECLASS, warnClass);
- }
- else if ((!"".equals(infoClass)) && (infoClass != null)) //$NON-NLS-1$
- {
- spanEle.setAttribute(IJSFConstants.ATTR_STYLECLASS, infoClass);
- }
- spanEle.removeAttribute(IJSFConstants.ATTR_STYLECLASS);
-
- //If the "tooltip" attribute is present with the value of "true", and so does
- //the "showSummary",then output the "summary" as the value of the "title" attribute on the "span".
- String hasToolTip = hostEle.getAttribute(IJSFConstants.ATTR_TOOLTIP);
- String showSummary = hostEle.getAttribute(IJSFConstants.ATTR_SHOWSUMMARY);
- if ("true".equalsIgnoreCase(hasToolTip)) //$NON-NLS-1$
- {
- if ("true".equalsIgnoreCase(showSummary)) //$NON-NLS-1$
- {
- spanEle.setAttribute("title", MESSAGE_TOOLTIP); //$NON-NLS-1$
- }
- }
- Text text = createText(MESSAGE_CONTENT);
- spanEle.appendChild(text);
-
- return spanEle;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.pagedesigner.converter.ITagConverter#isMultiLevel()
- */
- public boolean isMultiLevel()
- {
- return true;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.pagedesigner.css2.style.ITagEditInfo#isWidget()
- */
- public boolean isWidget()
- {
- return true;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.pagedesigner.css2.style.ITagEditInfo#needBorderDecorator()
- */
- public boolean needBorderDecorator()
- {
- return true;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/jsfhtml/MessagesTagConverter.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/jsfhtml/MessagesTagConverter.java
deleted file mode 100644
index c604d11..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/jsfhtml/MessagesTagConverter.java
+++ /dev/null
@@ -1,179 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http:// www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.pagedesigner.jsf.ui.converter.jsfhtml;
-
-import org.eclipse.jst.jsf.core.internal.tld.IJSFConstants;
-import org.eclipse.jst.pagedesigner.IHTMLConstants;
-import org.eclipse.jst.pagedesigner.converter.AbstractTagConverter;
-import org.eclipse.jst.pagedesigner.converter.JSFConverterUtil;
-import org.eclipse.jst.pagedesigner.jsf.ui.util.JSFUIPluginResourcesUtil;
-import org.w3c.dom.Element;
-import org.w3c.dom.Text;
-
-
-/**
- * @author mengbo
- * @version 1.5
- * @deprecated Use DTTagConverter meta-data instead
- */
-public class MessagesTagConverter extends AbstractTagConverter
-{
- private static final String MESSAGE_CONTENT = JSFUIPluginResourcesUtil.getInstance().getString(
- "MessageTagConverter.defaultValue"); //$NON-NLS-1$
- private static final String MESSAGE_TOOLTIP = JSFUIPluginResourcesUtil.getInstance().getString(
- "MessageTagConverter.defaultTooltip"); //$NON-NLS-1$
-
- /**
- * @param host
- */
- public MessagesTagConverter(Element host)
- {
- super(host);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.pagedesigner.converter.AbstractTagConverter#doConvertRefresh()
- */
- protected Element doConvertRefresh()
- {
- Element hostEle = getHostElement();
- String layout = hostEle.getAttribute(IJSFConstants.ATTR_LAYOUT);
- if (IHTMLConstants.TAG_TABLE.equalsIgnoreCase(layout))
- {
- Element table = createElement(IHTMLConstants.TAG_TABLE);
- table.setAttribute(IHTMLConstants.ATTR_BORDER, "1"); //$NON-NLS-1$
- for (int i = 0; i < 2; i++)
- {
- Element tr = createElement(IHTMLConstants.TAG_TR);
- Element td = createElement(IHTMLConstants.TAG_TD);
- Element span = createSpan();
- td.appendChild(span);
- tr.appendChild(td);
- table.appendChild(tr);
- }
- return table;
- }
- Element ul = createElement(IHTMLConstants.TAG_UL);
- for (int i = 0; i < 2; i++)
- {
- Element li = createElement(IHTMLConstants.TAG_LI);
- Element span = createSpan();
- li.appendChild(span);
- ul.appendChild(li);
- }
- return ul;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.pagedesigner.converter.ITagConverter#isMultiLevel()
- */
- public boolean isMultiLevel()
- {
- return true;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.pagedesigner.css2.style.ITagEditInfo#isWidget()
- */
- public boolean isWidget()
- {
- return true;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.pagedesigner.css2.style.ITagEditInfo#needBorderDecorator()
- */
- public boolean needBorderDecorator()
- {
- return true;
- }
-
- private Element createSpan()
- {
- Element hostEle = getHostElement();
-
- // If the "styleClass" or "style" attributes are present,
- // render a "span" element.
- // XXX: to make things simpler, we always create a span
- Element spanEle = createElement(IHTMLConstants.TAG_SPAN);
-
- // If the "style" attribute is present, pass it thru.
- // XXX: we are passing all the attributes through, since other attribute
- // don't conflict with html attributes.
- JSFConverterUtil.copyAllAttributes(hostEle, spanEle, null);
-
- // If the "styleClass" attribute is present,
- // output the value of the "styleClass" attribute as the value of the "class" attribute on the "span" element
- JSFConverterUtil.copyAttribute(hostEle, IJSFConstants.ATTR_STYLECLASS, spanEle, IHTMLConstants.ATTR_CLASS);
- spanEle.removeAttribute(IJSFConstants.ATTR_STYLECLASS);
-
- String fatalStyle = hostEle.getAttribute(IJSFConstants.ATTR_FATALSTYLE);
- String errorStyle = hostEle.getAttribute(IJSFConstants.ATTR_ERRORSTYLE);
- String warnStyle = hostEle.getAttribute(IJSFConstants.ATTR_WARNSTYLE);
- String infoStyle = hostEle.getAttribute(IJSFConstants.ATTR_INFOSTYLE);
- String fatalClass = hostEle.getAttribute(IJSFConstants.ATTR_FATALCLASS);
- String errorClass = hostEle.getAttribute(IJSFConstants.ATTR_ERRORCLASS);
- String warnClass = hostEle.getAttribute(IJSFConstants.ATTR_WARNCLASS);
- String infoClass = hostEle.getAttribute(IJSFConstants.ATTR_INFOCLASS);
-
- if ((!"".equals(fatalStyle)) && (fatalStyle != null)) //$NON-NLS-1$
- {
- spanEle.setAttribute(IHTMLConstants.ATTR_STYLE, fatalStyle);
- }
- else if ((!"".equals(errorStyle)) && (errorStyle != null)) //$NON-NLS-1$
- {
- spanEle.setAttribute(IHTMLConstants.ATTR_STYLE, errorStyle);
- }
- else if ((!"".equals(warnStyle)) && (warnStyle != null)) //$NON-NLS-1$
- {
- spanEle.setAttribute(IHTMLConstants.ATTR_STYLE, warnStyle);
- }
- else if ((!"".equals(infoStyle)) && (infoStyle != null)) //$NON-NLS-1$
- {
- spanEle.setAttribute(IHTMLConstants.ATTR_STYLE, infoStyle);
- }
-
- if ((!"".equals(fatalClass)) && (fatalClass != null)) //$NON-NLS-1$
- {
- spanEle.setAttribute(IJSFConstants.ATTR_STYLECLASS, fatalClass);
- }
- else if ((!"".equals(errorClass)) && (errorClass != null)) //$NON-NLS-1$
- {
- spanEle.setAttribute(IJSFConstants.ATTR_STYLECLASS, errorClass);
- }
- else if ((!"".equals(warnClass)) && (warnClass != null)) //$NON-NLS-1$
- {
- spanEle.setAttribute(IJSFConstants.ATTR_STYLECLASS, warnClass);
- }
- else if ((!"".equals(infoClass)) && (infoClass != null)) //$NON-NLS-1$
- {
- spanEle.setAttribute(IJSFConstants.ATTR_STYLECLASS, infoClass);
- }
-
- //If the "tooltip" attribute is present with the value of "true", and so does
- //the "showSummary",then output the "summary" as the value of the "title" attribute on the "span".
- String hasToolTip = hostEle.getAttribute(IJSFConstants.ATTR_TOOLTIP);
- String showSummary = hostEle.getAttribute(IJSFConstants.ATTR_SHOWSUMMARY);
- if ("true".equalsIgnoreCase(hasToolTip)) //$NON-NLS-1$
- {
- if ("true".equalsIgnoreCase(showSummary)) //$NON-NLS-1$
- {
- spanEle.setAttribute(IHTMLConstants.ATTR_TITLE, MESSAGE_TOOLTIP);
- }
- }
- Text text = createText(MESSAGE_CONTENT);
- spanEle.appendChild(text);
-
- return spanEle;
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/jsfhtml/OutputLabelTagConverter.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/jsfhtml/OutputLabelTagConverter.java
deleted file mode 100644
index c7eaad3..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/jsfhtml/OutputLabelTagConverter.java
+++ /dev/null
@@ -1,120 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http:// www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.pagedesigner.jsf.ui.converter.jsfhtml;
-
-import org.eclipse.jst.jsf.core.internal.tld.IJSFConstants;
-import org.eclipse.jst.pagedesigner.IHTMLConstants;
-import org.eclipse.jst.pagedesigner.converter.AbstractTagConverter;
-import org.eclipse.jst.pagedesigner.converter.ConvertPosition;
-import org.eclipse.jst.pagedesigner.converter.JSFConverterUtil;
-import org.eclipse.jst.pagedesigner.jsf.core.dom.JSFDOMUtil;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-
-
-/**
- * @author mengbo
- * @version 1.5
- * @deprecated Use DTTagConverter meta-data instead
- */
-public class OutputLabelTagConverter extends AbstractTagConverter
-{
- /**
- * @param host
- */
- public OutputLabelTagConverter(Element host)
- {
- super(host);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.pagedesigner.converter.AbstractTagConverter#doConvertRefresh()
- */
- protected Element doConvertRefresh()
- {
- Element hostEle = getHostElement();
-
- Element labelEle = createElement(IHTMLConstants.TAG_LABEL);
-
- JSFConverterUtil.copyAllAttributes(hostEle, labelEle, null);
-
- // If the "styleClass" attribute is present,
- // render its value as the value of the "class" attribute.
- JSFConverterUtil.copyAttribute(hostEle, IJSFConstants.ATTR_STYLECLASS, labelEle, IHTMLConstants.ATTR_CLASS);
- labelEle.removeAttribute(IJSFConstants.ATTR_STYLECLASS);
-
- // String value = getValue(hostEle);
- // Text textNode = createText(value);
- // labelEle.appendChild(textNode);
-
- int index = 0;
- Node child = hostEle.getFirstChild();
- if (hostEle.hasChildNodes())
- {
- for (; child != null; child = child.getNextSibling())
- {
- if (!shouldIgnore(child))
- {
- if (child instanceof Element && JSFDOMUtil.isUIParameter((Element) child))
- {
- // skip
- }
- else
- {
- addChild(child, new ConvertPosition(labelEle, index++));
- }
- }
- }
- }
- else
- {
- labelEle.appendChild(createText(getDefaultValue()));
- }
-
- return labelEle;
- }
-
- /**
- * @param hostEle
- * @return
- */
- private String getDefaultValue()
- {
- String name = IJSFConstants.TAG_OUTPUTLABEL;
-
- return name.substring(0, 1).toUpperCase() + name.substring(1);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.pagedesigner.converter.ITagConverter#isMultiLevel()
- */
- public boolean isMultiLevel()
- {
- return true;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.pagedesigner.converter.ITagConverter#isWidget()
- */
- public boolean isWidget()
- {
- return true;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.pagedesigner.css2.style.ITagEditInfo#needBorderDecorator()
- */
- public boolean needBorderDecorator()
- {
- return true;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/jsfhtml/OutputLinkTagConverter.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/jsfhtml/OutputLinkTagConverter.java
deleted file mode 100644
index 3c45703..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/jsfhtml/OutputLinkTagConverter.java
+++ /dev/null
@@ -1,139 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http:// www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.pagedesigner.jsf.ui.converter.jsfhtml;
-
-import org.eclipse.jst.jsf.core.internal.tld.IJSFConstants;
-import org.eclipse.jst.pagedesigner.IHTMLConstants;
-import org.eclipse.jst.pagedesigner.converter.AbstractTagConverter;
-import org.eclipse.jst.pagedesigner.converter.ConvertPosition;
-import org.eclipse.jst.pagedesigner.converter.ConverterUtil;
-import org.eclipse.jst.pagedesigner.converter.JSFConverterUtil;
-import org.eclipse.jst.pagedesigner.jsf.core.dom.JSFDOMUtil;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-
-
-/**
- * @author mengbo
- * @version 1.5
- * @deprecated Use DTTagConverter meta-data instead
- */
-public class OutputLinkTagConverter extends AbstractTagConverter
-{
-
- /**
- * @param host
- */
- public OutputLinkTagConverter(Element host)
- {
- super(host);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.pagedesigner.converter.AbstractTagConverter#doConvertRefresh()
- */
- protected Element doConvertRefresh()
- {
- Element hostEle = getHostElement();
-
- Element aEle = createElement(IHTMLConstants.TAG_A);
-
- // If the "style" attribute is present, pass it thru.
- // XXX: we are passing all the attributes through, since other attribute
- // don't conflict with html attributes.
- JSFConverterUtil.copyAllAttributes(hostEle, aEle, null);
-
- // If the "styleClass" attribute is present,
- // render its value as the value of the "class" attribute.
- JSFConverterUtil.copyAttribute(hostEle, IJSFConstants.ATTR_STYLECLASS, aEle, IHTMLConstants.ATTR_CLASS);
- aEle.removeAttribute(IJSFConstants.ATTR_STYLECLASS);
-
- // value should be mapped to href, but it won't affect visual
- // so use "#"
- aEle.setAttribute(IHTMLConstants.ATTR_HREF, "#"); //$NON-NLS-1$
-
- JSFConverterUtil.copyAttribute(hostEle, IJSFConstants.ATTR_VALUE, aEle, IHTMLConstants.ATTR_HREF);
- aEle.removeAttribute(IJSFConstants.ATTR_VALUE);
-
- // Extend the container border a little to make it selectable
- if (!isPreviewMode())
- {
- String style = aEle.getAttribute(IHTMLConstants.ATTR_STYLE);
- style = "padding:0.3em;" + style; //$NON-NLS-1$
- aEle.setAttribute(IHTMLConstants.ATTR_STYLE, style);
- }
-
- int index = 0;
- Node child = hostEle.getFirstChild();
- if (hostEle.hasChildNodes())
- {
- for (; child != null; child = child.getNextSibling())
- {
- if (!shouldIgnore(child))
- {
- if (child instanceof Element && JSFDOMUtil.isUIParameter((Element) child))
- {
- // skip
- }
- else
- {
- addChild(child, new ConvertPosition(aEle, index++));
- }
- }
- }
- }
- if (ConverterUtil.isEmptyContainer(hostEle) && !hostEle.hasAttribute(IJSFConstants.ATTR_VALUE))
- {
- aEle.appendChild(createText(getDefaultValue()));
- }
- return aEle;
- }
-
- private String getDefaultValue()
- {
- String name = IJSFConstants.TAG_OUTPUTLINK;
-
- return name.substring(0, 1).toUpperCase() + name.substring(1);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.pagedesigner.converter.ITagConverter#isMultiLevel()
- */
- public boolean isMultiLevel()
- {
- return true;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.pagedesigner.converter.ITagConverter#isWidget()
- */
- public boolean isWidget()
- {
- return false;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.pagedesigner.css2.style.ITagEditInfo#needBorderDecorator()
- */
- public boolean needBorderDecorator()
- {
- return true;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/jsfhtml/OutputTextTagConverter.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/jsfhtml/OutputTextTagConverter.java
deleted file mode 100644
index f43ae97..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/jsfhtml/OutputTextTagConverter.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http:// www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.pagedesigner.jsf.ui.converter.jsfhtml;
-
-import org.eclipse.jst.jsf.core.internal.tld.IJSFConstants;
-import org.eclipse.jst.pagedesigner.IHTMLConstants;
-import org.eclipse.jst.pagedesigner.converter.AbstractTagConverter;
-import org.eclipse.jst.pagedesigner.converter.JSFConverterUtil;
-import org.w3c.dom.Element;
-import org.w3c.dom.Text;
-
-/**
- * @author mengbo
- * @version 1.5
- * @deprecated Use DTTagConverter meta-data instead
- */
-public class OutputTextTagConverter extends AbstractTagConverter
-{
-
- /**
- * @param host
- */
- public OutputTextTagConverter(Element host)
- {
- super(host);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.pagedesigner.converter.AbstractTagConverter#doConvertRefresh()
- */
- protected Element doConvertRefresh()
- {
- Element hostEle = getHostElement();
-
- // If the "styleClass" or "style" attributes are present,
- // render a "span" element.
- // XXX: to make things simpler, we always create a span
- Element spanEle = createElement(IHTMLConstants.TAG_SPAN);
-
- // If the "style" attribute is present, pass it thru.
- // XXX: we are passing all the attributes through, since other attribute
- // don't conflict with html attributes.
- JSFConverterUtil.copyAllAttributes(hostEle, spanEle, null);
-
- // If the "styleClass" attribute is present,
- // render its value as the value of the "class" attribute.
- JSFConverterUtil.copyAttribute(hostEle, IJSFConstants.ATTR_STYLECLASS, spanEle, IHTMLConstants.ATTR_CLASS);
- spanEle.removeAttribute(IJSFConstants.ATTR_STYLECLASS);
-
- spanEle.removeAttribute(IJSFConstants.ATTR_VALUE);
-
- // If the "escape" attribute is not present, or it is present and
- // its value is "true" all angle brackets should be converted to the
- // ampersand xx semicolon syntax when rendering the value of the "value"
- // attribute as the value of the component. If the "escape" attribute is
- // present and is "false" the value of the component should be rendered
- // as text without escaping.
- String value = getValue(hostEle);
- Text textNode = createText(value);
- spanEle.appendChild(textNode);
-
- return spanEle;
- }
-
- /**
- * @param hostEle
- * @return
- */
- private String getValue(Element hostEle)
- {
- String valueAttr = hostEle.getAttribute(IJSFConstants.ATTR_VALUE);
- if (valueAttr == null)
- {
- String name = hostEle.getLocalName();
- return name.substring(0, 1).toUpperCase() + name.substring(1);
- }
- return mapValue(valueAttr);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.pagedesigner.converter.ITagConverter#isMultiLevel()
- */
- public boolean isMultiLevel()
- {
- return true;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.pagedesigner.converter.ITagConverter#isWidget()
- */
- public boolean isWidget()
- {
- return true;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.pagedesigner.converter.AbstractTagConverter#needBorderDecorator()
- */
- public boolean needBorderDecorator()
- {
- return true;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/jsfhtml/PanelGridTagConverter.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/jsfhtml/PanelGridTagConverter.java
deleted file mode 100644
index f9ff8e9..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/jsfhtml/PanelGridTagConverter.java
+++ /dev/null
@@ -1,211 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http:// www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.pagedesigner.jsf.ui.converter.jsfhtml;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.StringTokenizer;
-
-import org.eclipse.jst.jsf.core.internal.tld.IJSFConstants;
-import org.eclipse.jst.pagedesigner.jsf.core.dom.JSFDOMUtil;
-import org.w3c.dom.Element;
-
-import org.eclipse.jst.pagedesigner.IHTMLConstants;
-import org.eclipse.jst.pagedesigner.converter.AbstractTagConverter;
-import org.eclipse.jst.pagedesigner.converter.ConvertPosition;
-import org.eclipse.jst.pagedesigner.converter.JSFConverterUtil;
-import org.eclipse.jst.pagedesigner.utils.DOMUtil;
-
-/**
- * @author mengbo
- * @version 1.5
- * @deprecated Use DTTagConverter meta-data instead
- */
-public class PanelGridTagConverter extends AbstractTagConverter
-{
- /**
- * @param host
- */
- public PanelGridTagConverter(Element host)
- {
- super(host);
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.jst.pagedesigner.visualtag.AbstractTagConverter#doConvertRefresh()
- */
- protected Element doConvertRefresh()
- {
- Element panelGridEle = this.getHostElement();
-
- // Renders an HTML "table" element, conforming to the rules in the HTML 401 specification.
- Element tableEle = createElement(IHTMLConstants.TAG_TABLE);
-
- // Render the pass-through attributes in the table below.
- // TODO: need handle ignored attributes here. But as they don't conflict
- // with standard table attributes, so its ok that we leave it later.
- JSFConverterUtil.copyAllAttributes(panelGridEle, tableEle, null);
-
- // If the "styleClass" attribute is specified, render its value as the value of the "class" attribute
- JSFConverterUtil.copyAttribute(panelGridEle, IJSFConstants.ATTR_STYLECLASS, tableEle, IHTMLConstants.ATTR_CLASS);
- tableEle.removeAttribute(IJSFConstants.ATTR_STYLECLASS);
-
- int columns = DOMUtil.getIntAttributeIgnoreCase(panelGridEle, IJSFConstants.ATTR_COLUMNS, 1);
- if (columns < 1)
- {
- columns = 1;
- }
-
- // Render the "header" facet, if present, inside of "thead", "tr", and "th" elements, nested in that order.
- Element facet = JSFDOMUtil.findFacet(panelGridEle, "header"); //$NON-NLS-1$
- if (facet != null)
- {
- // we need render a thead here
- Element theadEle = createElement(IHTMLConstants.TAG_THEAD);
- tableEle.appendChild(theadEle);
- Element trEle = createElement(IHTMLConstants.TAG_TR);
- theadEle.appendChild(trEle);
- Element thEle = createElement(IHTMLConstants.TAG_TH);
- trEle.appendChild(thEle);
- // If the "headerClass" attribute is specifed, render its value as the value of the "class" attribute on
- // the "th" element.
- String headerClass = panelGridEle.getAttribute(IJSFConstants.ATTR_HEADERCLASS);
- if (headerClass != null && headerClass.length() > 0)
- {
- thEle.setAttribute(IHTMLConstants.ATTR_CLASS, headerClass);
- }
- // Render the value of the "columns" attribute as the value of the "colspan" attribute on the "th" element.
- thEle.setAttribute(IHTMLConstants.ATTR_COLSPAN, String.valueOf(columns));
- addChild(facet, new ConvertPosition(thEle, 0));
- }
-
- // Render the "footer" facet if present, using similar logic to the rendering of
- // the "header", but replacing "thead" with "tfoot", "th" with "td", and "headerClass"
- // with "footerClass".
- facet = JSFDOMUtil.findFacet(panelGridEle, "footer"); //$NON-NLS-1$
- if (facet != null)
- {
- // we need render a thead here
- Element theadEle = createElement(IHTMLConstants.TAG_TFOOT);
- tableEle.appendChild(theadEle);
- Element trEle = createElement(IHTMLConstants.TAG_TR);
- theadEle.appendChild(trEle);
- Element tdEle = createElement(IHTMLConstants.TAG_TD);
- trEle.appendChild(tdEle);
- // If the "headerClass" attribute is specifed, render its value as the value of the "class" attribute on
- // the "th" element.
- String footerClass = panelGridEle.getAttribute(IJSFConstants.ATTR_FOOTERCLASS);
- if (footerClass != null && footerClass.length() > 0)
- {
- tdEle.setAttribute(IHTMLConstants.ATTR_CLASS, footerClass);
- }
- // Render the value of the "columns" attribute as the value of the "colspan" attribute on the "th" element.
- tdEle.setAttribute(IHTMLConstants.ATTR_COLSPAN, String.valueOf(columns));
- addChild(facet, new ConvertPosition(tdEle, 0));
- }
-
- List rowclasses = new ArrayList();
- String rowclassesattr = panelGridEle.getAttribute(IJSFConstants.ATTR_ROWCLASSES);
- if (rowclassesattr != null)
- {
- StringTokenizer tokenizer = new StringTokenizer(rowclassesattr, ", "); //$NON-NLS-1$
- while (tokenizer.hasMoreTokens())
- {
- rowclasses.add(tokenizer.nextToken());
- }
- }
-
- List columnclasses = new ArrayList();
- String columnclassattr = panelGridEle.getAttribute(IJSFConstants.ATTR_COLUMNCLASSES);
- if (columnclassattr != null)
- {
- StringTokenizer tokenizer = new StringTokenizer(columnclassattr, ", "); //$NON-NLS-1$
- while (tokenizer.hasMoreTokens())
- {
- columnclasses.add(tokenizer.nextToken());
- }
- }
-
- // Render the children of the UIPanel component inside of a "tbody" element.
- // Render the children based on the value of the "columns" attribute, creating a new
- // row each time a "columns" worth of children have been rendered. Each child is rendered
- // inside of a "td" element. If a child has "rendered==false" it is not rendered,
- // and the column counter must not be incremented.
- Element tbody = createElement(IHTMLConstants.TAG_TBODY);
- tableEle.appendChild(tbody);
-
- List uipanelChildren = JSFDOMUtil.getUIComponentChildren(panelGridEle);
- Element currentTr = null;
- int nextRow = 0; // for rowclasses
- for (int i = 0; i < uipanelChildren.size(); i++)
- {
- int columnIndex = i % columns;
- if (columnIndex == 0)
- {
- currentTr = createElement(IHTMLConstants.TAG_TR);
- if (!rowclasses.isEmpty())
- {
- currentTr.setAttribute(IHTMLConstants.ATTR_CLASS, (String) rowclasses.get(nextRow));
- nextRow = (nextRow + 1) % rowclasses.size();
- }
- tbody.appendChild(currentTr);
- }
- Element uichild = (Element) uipanelChildren.get(i);
- Element td = createElement(IHTMLConstants.TAG_TD);
- if (columnIndex < columnclasses.size())
- {
- td.setAttribute(IHTMLConstants.ATTR_CLASS, (String) columnclasses.get(columnIndex));
- }
- currentTr.appendChild(td);
- this.addChild(uichild, new ConvertPosition(td, 0));
- }
-
- return (tableEle);
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.jst.pagedesigner.visualtag.ITagConverter#isMultiLevel()
- */
- public boolean isMultiLevel()
- {
- return true;
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.jst.pagedesigner.visualtag.ITagConverter#isWidget()
- */
- public boolean isWidget()
- {
- return false;
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.jst.pagedesigner.css2.style.ITagEditInfo#needBorderDecorator()
- */
- public boolean needBorderDecorator()
- {
- return true;
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.jst.pagedesigner.converter.AbstractTagConverter#needTableDecorator()
- */
- public boolean needTableDecorator()
- {
- return true;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/jsfhtml/PanelGroupTagConverter.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/jsfhtml/PanelGroupTagConverter.java
deleted file mode 100644
index ca592cc..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/jsfhtml/PanelGroupTagConverter.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http:// www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.pagedesigner.jsf.ui.converter.jsfhtml;
-
-import org.eclipse.jst.jsf.core.internal.tld.IJSFConstants;
-import org.eclipse.jst.pagedesigner.IHTMLConstants;
-import org.eclipse.jst.pagedesigner.converter.AbstractTagConverter;
-import org.eclipse.jst.pagedesigner.converter.JSFConverterUtil;
-import org.w3c.dom.Element;
-
-/**
- * @author mengbo
- * @version 1.5
- * @deprecated Use DTTagConverter meta-data instead
- */
-public class PanelGroupTagConverter extends AbstractTagConverter
-{
-
- /**
- * @param host
- */
- public PanelGroupTagConverter(Element host)
- {
- super(host);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.pagedesigner.converter.AbstractTagConverter#doConvertRefresh()
- */
- protected Element doConvertRefresh()
- {
- Element hostEle = getHostElement();
-
- // If the "styleClass" or "style" attributes are present,
- // render a "span" element.
- // XXX: for page designer to have the panelGroup to always take up space,
- // we use "div".
- Element spanEle = createElement(IHTMLConstants.TAG_DIV);
-
- // If the "style" attribute is present, pass it thru.
- // XXX: we are passing all the attributes through, since other attribute
- // don't conflict with html attributes.
- JSFConverterUtil.copyAllAttributes(hostEle, spanEle, null);
-
- // If the "styleClass" attribute is present,
- // render its value as the value of the "class" attribute.
- JSFConverterUtil.copyAttribute(hostEle, IJSFConstants.ATTR_STYLECLASS, spanEle, IHTMLConstants.ATTR_CLASS);
- spanEle.removeAttribute(IJSFConstants.ATTR_STYLECLASS);
-
- copyChildren(hostEle, spanEle);
- return spanEle;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.pagedesigner.converter.ITagConverter#isMultiLevel()
- */
- public boolean isMultiLevel()
- {
- return true;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.pagedesigner.converter.ITagConverter#isWidget()
- */
- public boolean isWidget()
- {
- return false;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.pagedesigner.css2.style.ITagEditInfo#needBorderDecorator()
- */
- public boolean needBorderDecorator()
- {
- return true;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/jsfhtml/SelectBasedTagConverter.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/jsfhtml/SelectBasedTagConverter.java
deleted file mode 100644
index e7f817e..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/jsfhtml/SelectBasedTagConverter.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http:// www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.pagedesigner.jsf.ui.converter.jsfhtml;
-
-import java.util.List;
-
-import org.eclipse.jst.jsf.core.internal.tld.IJSFConstants;
-import org.eclipse.jst.pagedesigner.IHTMLConstants;
-import org.eclipse.jst.pagedesigner.converter.ConverterUtil;
-import org.eclipse.jst.pagedesigner.converter.JSFConverterUtil;
-import org.w3c.dom.Element;
-import org.w3c.dom.Text;
-
-/**
- * @author mengbo
- * @version 1.5
- * @deprecated Use DTTagConverter meta-data instead
- */
-public abstract class SelectBasedTagConverter extends SelectTagConverter
-{
-
- /**
- * @param host
- */
- public SelectBasedTagConverter(Element host)
- {
- super(host);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.pagedesigner.converter.AbstractTagConverter#doConvertRefresh()
- */
- protected Element doConvertRefresh()
- {
- Element hostEle = getHostElement();
-
- // Render an HTML "select" element.
- Element selectEle = createElement(IHTMLConstants.TAG_SELECT);
-
- // Render the clientId of the component as the value of the "name" attribute.
- ConverterUtil.copyAttribute(hostEle, IJSFConstants.ATTR_ID, selectEle, IHTMLConstants.ATTR_NAME);
-
- // XXX: handle ignore
- JSFConverterUtil.copyAllAttributes(hostEle, selectEle, null);
-
-// If the "styleClass" attribute is specified, render its value as the value of
- // the "class" attribute on the "select" element.
- JSFConverterUtil.copyAttribute(hostEle, IJSFConstants.ATTR_STYLECLASS, selectEle, IHTMLConstants.ATTR_CLASS);
- selectEle.removeAttribute(IJSFConstants.ATTR_STYLECLASS);
-
- // child class may generated different multiple and size attribute
- handleMultipleAndSize(hostEle, selectEle);
-
- // next generated the options under the <select>, so they can also be displayed.
- List selectItems = this.getSelectItems(hostEle);
- for (int i=0, size=selectItems.size(); i<size; i++)
- {
- SelectItemModel item = (SelectItemModel) selectItems.get(i);
- Element option = createElement(IHTMLConstants.TAG_OPTION);
- option.setAttribute(IHTMLConstants.ATTR_VALUE, item.getItemValue());
- Text textNode = createText(item.getDisplayString());
- option.appendChild(textNode);
- selectEle.appendChild(option);
- }
-
- return (selectEle);
- }
-
- /**
- * @param hostEle
- * @param selectEle
- */
- protected abstract void handleMultipleAndSize(Element hostEle, Element selectEle);
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/jsfhtml/SelectBooleanCheckboxTagConverter.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/jsfhtml/SelectBooleanCheckboxTagConverter.java
deleted file mode 100644
index 26c512a..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/jsfhtml/SelectBooleanCheckboxTagConverter.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http:// www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.pagedesigner.jsf.ui.converter.jsfhtml;
-
-import org.eclipse.jst.jsf.core.internal.tld.IJSFConstants;
-import org.eclipse.jst.pagedesigner.IHTMLConstants;
-import org.eclipse.jst.pagedesigner.converter.AbstractTagConverter;
-import org.eclipse.jst.pagedesigner.converter.JSFConverterUtil;
-import org.w3c.dom.Element;
-
-/**
- * @author mengbo
- * @version 1.5
- * @deprecated Use DTTagConverter meta-data instead
- */
-public class SelectBooleanCheckboxTagConverter extends AbstractTagConverter
-{
-
- /**
- * @param host
- */
- public SelectBooleanCheckboxTagConverter(Element host)
- {
- super(host);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.pagedesigner.converter.AbstractTagConverter#doConvertRefresh()
- */
- protected Element doConvertRefresh()
- {
- Element hostEle = getHostElement();
- // Renders an HTML "input" element of type "checkbox".
- Element inputEle = createElement(IHTMLConstants.TAG_INPUT);
- JSFConverterUtil.copyAllAttributes(hostEle, inputEle, null);
- JSFConverterUtil.copyAttribute(hostEle, IJSFConstants.ATTR_STYLECLASS, inputEle, IHTMLConstants.ATTR_CLASS);
- inputEle.removeAttribute(IJSFConstants.ATTR_STYLECLASS);
-
- inputEle.setAttribute(IHTMLConstants.ATTR_TYPE, "checkbox"); //$NON-NLS-1$
-
- if ("true".equalsIgnoreCase(inputEle.getAttribute(IHTMLConstants.ATTR_VALUE))) //$NON-NLS-1$
- {
- inputEle.setAttribute(IHTMLConstants.ATTR_CHECKED,"checked"); //$NON-NLS-1$
- }
- return inputEle;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.pagedesigner.converter.ITagConverter#isMultiLevel()
- */
- public boolean isMultiLevel()
- {
- return true;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.pagedesigner.converter.ITagConverter#isWidget()
- */
- public boolean isWidget()
- {
- return true;
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/jsfhtml/SelectItemModel.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/jsfhtml/SelectItemModel.java
deleted file mode 100644
index b0493c5..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/jsfhtml/SelectItemModel.java
+++ /dev/null
@@ -1,155 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http:// www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.pagedesigner.jsf.ui.converter.jsfhtml;
-
-/**
- * This class emulate a javax.faces.model.SelectItem
- *
- * @author mengbo
- * @version 1.5
- * @deprecated Use DTTagConverter meta-data instead
- */
-public class SelectItemModel
-{
- private String _description;
- private String _label;
- private String _itemValue;
- private String _value;
- private String _id;
- private boolean _disabled;
-
- /**
- * @return Returns the disabled.
- */
- public boolean isDisabled()
- {
- return _disabled;
- }
-
- /**
- * @param disabled The disabled to set.
- */
- public void setDisabled(boolean disabled)
- {
- this._disabled = disabled;
- }
-
- /**
- * Return a description of this item, for use in development tools.
- * @return the description
- */
- public String getDescription()
- {
- return _description;
- }
-
- /**
- * Return the label of this item, to be rendered visibly for the user.
- * @return the label for this item
- */
- public String getLabel()
- {
- return _label;
- }
-
- /**
- * Set the description of this item, for use in development tools.
- * @param description
- */
- public void setDescription(java.lang.String description)
- {
- _description = description;
- }
-
- /**
- * Set the label of this item, to be rendered visibly for the user.
- * @param label
- */
- public void setLabel(java.lang.String label)
- {
- this._label = label;
- }
- /**
- * @return the item value
- */
- public String getItemValue()
- {
- return _itemValue;
- }
-
- /**
- * @param itemValue
- */
- public void setItemValue(String itemValue)
- {
- this._itemValue = itemValue;
- }
-
- /**
- * @return the value
- */
- public String getValue()
- {
- return _value;
- }
-
- /**
- * @param value
- */
- public void setValue(String value)
- {
- this._value = value;
- }
-
- /**
- * @return the id
- */
- public String getId()
- {
- return _id;
- }
-
- /**
- * @param id
- */
- public void setId(String id)
- {
- _id = id;
- }
-
- /**
- * @return the display string
- */
- public String getDisplayString()
- {
- if (_label != null && _label.length() > 0)
- {
- return _label;
- }
- else if (_value != null && _value.length() > 0)
- {
- return _value;
- }
- else if (_description != null && _description.length() > 0)
- {
- return _description;
- }
- else if (_itemValue != null && _itemValue.length() > 0)
- {
- return _itemValue;
- }
- else
- {
- return "SelectItem"; //$NON-NLS-1$
- }
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/jsfhtml/SelectManyListboxTagConverter.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/jsfhtml/SelectManyListboxTagConverter.java
deleted file mode 100644
index 32f404d..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/jsfhtml/SelectManyListboxTagConverter.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http:// www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.pagedesigner.jsf.ui.converter.jsfhtml;
-
-import java.util.List;
-
-import org.w3c.dom.Element;
-
-/**
- * @author mengbo
- * @version 1.5
- * @deprecated Use DTTagConverter meta-data instead
- */
-public class SelectManyListboxTagConverter extends SelectBasedTagConverter
-{
-
- /**
- * @param host
- */
- public SelectManyListboxTagConverter(Element host)
- {
- super(host);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.pagedesigner.converter.jsfhtml.SelectBasedTagConverter#handleMultipleAndSize(org.w3c.dom.Element, org.w3c.dom.Element)
- */
- protected void handleMultipleAndSize(Element hostEle, Element selectEle)
- {
- // If the component is a UISelectMany instance, render "multiple" as the value of the
- // "multiple" attribute.
- selectEle.setAttribute("multiple", "multiple"); //$NON-NLS-1$ //$NON-NLS-2$
-
- // If the "size" attribute is specified, render its value as the value of the "size"
- // attribute. Otherwise use the number of items as the value of the "size" attribute.
- String sizeattr = hostEle.getAttribute("size"); //$NON-NLS-1$
-
- List selectItems = this.getSelectItems(hostEle);
- if (sizeattr == null)
- {
- if (!selectItems.isEmpty())
- {
- selectEle.setAttribute("size", String.valueOf(selectItems.size())); //$NON-NLS-1$
- }
- }
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/jsfhtml/SelectManyMenuTagConverter.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/jsfhtml/SelectManyMenuTagConverter.java
deleted file mode 100644
index 393f2ae..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/jsfhtml/SelectManyMenuTagConverter.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http:// www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.pagedesigner.jsf.ui.converter.jsfhtml;
-
-import org.w3c.dom.Element;
-
-/**
- * @author mengbo
- * @version 1.5
- * @deprecated Use DTTagConverter meta-data instead
- */
-public class SelectManyMenuTagConverter extends SelectBasedTagConverter
-{
-
- /**
- * @param host
- */
- public SelectManyMenuTagConverter(Element host)
- {
- super(host);
- // TODO Auto-generated constructor stub
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.pagedesigner.converter.jsfhtml.SelectBasedTagConverter#handleMultipleAndSize(org.w3c.dom.Element, org.w3c.dom.Element)
- */
- protected void handleMultipleAndSize(Element hostEle, Element selectEle)
- {
- // If the component is a UISelectMany instance, render "multiple" as the value of the
- // "multiple" attribute.
- selectEle.setAttribute("multiple", "multiple"); //$NON-NLS-1$ //$NON-NLS-2$
-
- // If the "size" attribute is specified, render its value as the value of the "size"
- // attribute. Otherwise use the number of items as the value of the "size" attribute.
- selectEle.setAttribute("size", "1"); //$NON-NLS-1$ //$NON-NLS-2$
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/jsfhtml/SelectOneListboxTagConverter.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/jsfhtml/SelectOneListboxTagConverter.java
deleted file mode 100644
index 4178e5c..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/jsfhtml/SelectOneListboxTagConverter.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http:// www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.pagedesigner.jsf.ui.converter.jsfhtml;
-
-import java.util.List;
-
-import org.w3c.dom.Element;
-
-/**
- * @author mengbo
- * @version 1.5
- * @deprecated Use DTTagConverter meta-data instead
- */
-public class SelectOneListboxTagConverter extends SelectBasedTagConverter
-{
-
- /**
- * @param host
- */
- public SelectOneListboxTagConverter(Element host)
- {
- super(host);
- // TODO Auto-generated constructor stub
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.pagedesigner.converter.jsfhtml.SelectBasedTagConverter#handleMultipleAndSize(org.w3c.dom.Element, org.w3c.dom.Element)
- */
- protected void handleMultipleAndSize(Element hostEle, Element selectEle)
- {
- // always not multiple
- selectEle.removeAttribute("multiple"); //$NON-NLS-1$
-
- // If the "size" attribute is specified, render its value as the value of the "size"
- // attribute. Otherwise use the number of items as the value of the "size" attribute.
- String sizeattr = hostEle.getAttribute("size"); //$NON-NLS-1$
-
- List selectItems = this.getSelectItems(hostEle);
- if (sizeattr == null)
- {
- if (!selectItems.isEmpty())
- {
- selectEle.setAttribute("size", String.valueOf(selectItems.size())); //$NON-NLS-1$
- }
- }
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/jsfhtml/SelectOneMenuTagConverter.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/jsfhtml/SelectOneMenuTagConverter.java
deleted file mode 100644
index 95d0bf3..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/jsfhtml/SelectOneMenuTagConverter.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http:// www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.pagedesigner.jsf.ui.converter.jsfhtml;
-
-import org.w3c.dom.Element;
-
-/**
- * @author mengbo
- * @version 1.5
- * @deprecated Use DTTagConverter meta-data instead
- */
-public class SelectOneMenuTagConverter extends SelectBasedTagConverter
-{
-
- /**
- * @param host
- */
- public SelectOneMenuTagConverter(Element host)
- {
- super(host);
- // TODO Auto-generated constructor stub
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.pagedesigner.converter.jsfhtml.SelectBasedTagConverter#handleMultipleAndSize(org.w3c.dom.Element, org.w3c.dom.Element)
- */
- protected void handleMultipleAndSize(Element hostEle, Element selectEle)
- {
- // always not multiple
- selectEle.removeAttribute("multiple"); //$NON-NLS-1$
-
- selectEle.setAttribute("size", "1"); //$NON-NLS-1$ //$NON-NLS-2$
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/jsfhtml/SelectTagConverter.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/jsfhtml/SelectTagConverter.java
deleted file mode 100644
index cbc7b3e..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/jsfhtml/SelectTagConverter.java
+++ /dev/null
@@ -1,134 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http:// www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.pagedesigner.jsf.ui.converter.jsfhtml;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.jst.jsf.core.internal.tld.IJSFConstants;
-import org.eclipse.jst.pagedesigner.converter.AbstractTagConverter;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-/**
- * This class is supposed to be common parent class for the different selectMany tags.
- *
- * @author mengbo
- * @version 1.5
- * @deprecated Use DTTagConverter meta-data instead
- */
-public abstract class SelectTagConverter extends AbstractTagConverter
-{
- /**
- * @param host
- */
- public SelectTagConverter(Element host)
- {
- super(host);
- }
-
- /**
- * Return a list of SelectItem
- *
- * @param parent
- * @return the select item list for parent
- */
- protected List getSelectItems(Element parent)
- {
- List result = new ArrayList();
- NodeList nl = parent.getChildNodes();
- for (int i = 0, size = nl.getLength(); i < size; i++)
- {
- Node child = nl.item(i);
- if (child instanceof Element)
- {
- Element ele = (Element) child;
- String tagname = ele.getLocalName();
- if (IJSFConstants.TAG_SELECTITEM.equalsIgnoreCase(tagname))
- {
- SelectItemModel item = new SelectItemModel();
- item.setDescription(ele.getAttribute(IJSFConstants.ATTR_ITEMDESCRIPTION));
- item.setLabel(ele.getAttribute(IJSFConstants.ATTR_ITEMLABEL));
- item.setItemValue(ele.getAttribute(IJSFConstants.ATTR_ITEMVALUE));
- item.setValue(ele.getAttribute(IJSFConstants.ATTR_VALUE));
- item.setId(ele.getAttribute(IJSFConstants.ATTR_ID));
- item.setDisabled("true".equalsIgnoreCase(ele.getAttribute(IJSFConstants.ATTR_ITEMDISABLED))); //$NON-NLS-1$
- result.add(item);
- }
- else if (IJSFConstants.TAG_SELECTITEMS.equalsIgnoreCase(tagname))
- {
- // as selectItems can only be resolved at run time, so we just emulate
- // as if it map to two selectitem
- String value = ele.getAttribute(IJSFConstants.ATTR_VALUE);
- if (value == null || value.length() == 0)
- {
- value = IJSFConstants.ATTR_VALUE;
- }
- SelectItemModel item1 = new SelectItemModel();
- item1.setValue(value + "_1"); //$NON-NLS-1$
- item1.setId(ele.getAttribute(IJSFConstants.ATTR_ID));
- result.add(item1);
- SelectItemModel item2 = new SelectItemModel();
- item2.setValue(value + "_2"); //$NON-NLS-1$
- item2.setId(ele.getAttribute(IJSFConstants.ATTR_ID));
- result.add(item2);
- }
- }
- }
-
- return result;
- }
-
- /**
- * @param parent
- * @return the select item model for parent
- */
- public SelectItemModel getDefault(Element parent)
- {
- SelectItemModel item = new SelectItemModel();
- if (parent.getLocalName().equals(IJSFConstants.TAG_SELECTONERADIO))
- {
- item.setLabel("radio"); //$NON-NLS-1$
- }
- else if (parent.getLocalName().equals(IJSFConstants.TAG_SELECTMANYCHECKBOX))
- {
- item.setLabel("checkBox"); //$NON-NLS-1$
- }
- else
- {
- item.setLabel(parent.getLocalName());
- }
- return item;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.pagedesigner.converter.ITagConverter#isMultiLevel()
- */
- public boolean isMultiLevel()
- {
- return true;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.pagedesigner.converter.ITagConverter#isWidget()
- */
- public boolean isWidget()
- {
- return true;
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/jsfhtml/TableBasedSelectTagConverter.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/jsfhtml/TableBasedSelectTagConverter.java
deleted file mode 100644
index 94377ee..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/jsfhtml/TableBasedSelectTagConverter.java
+++ /dev/null
@@ -1,178 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http:// www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.pagedesigner.jsf.ui.converter.jsfhtml;
-
-import java.util.List;
-
-import org.eclipse.jst.jsf.core.internal.tld.IJSFConstants;
-import org.eclipse.jst.pagedesigner.IHTMLConstants;
-import org.eclipse.jst.pagedesigner.converter.ConverterUtil;
-import org.w3c.dom.Element;
-import org.w3c.dom.Text;
-
-/**
- * @author mengbo
- * @version 1.5
- * @deprecated Use DTTagConverter meta-data instead
- */
-public class TableBasedSelectTagConverter extends SelectTagConverter
-{
-
- private String _inputType;
-
- /**
- * @param host
- * @param inputType
- */
- public TableBasedSelectTagConverter(Element host, String inputType)
- {
- super(host);
- this._inputType = inputType;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.pagedesigner.converter.AbstractTagConverter#doConvertRefresh()
- */
- protected Element doConvertRefresh()
- {
- Element hostEle = getHostElement();
-
- // Render a "table" element.
- Element tableEle = createElement(IHTMLConstants.TAG_TABLE);
-
- // If the "styleClass" is specified, render the value of the "styleClass"
- // attribute as the value of the "class" attribute on the "table" element.
- ConverterUtil.copyAttribute(hostEle, IJSFConstants.ATTR_STYLECLASS, tableEle, IHTMLConstants.ATTR_CLASS);
-
- // If the "style", "border" attributes are specified, pass them thru.
- ConverterUtil.copyAttribute(hostEle, IJSFConstants.ATTR_STYLE, tableEle, IHTMLConstants.ATTR_STYLE);
- ConverterUtil.copyAttribute(hostEle, IJSFConstants.ATTR_BORDER, tableEle, IHTMLConstants.ATTR_BORDER);
-
- // If the "layout" attribute is specified, and its value is "pageDirection",
- // render the children elements vertically, otherwise horizontally, in the table.
- boolean horizontal = true;
- if ("pageDirection".equalsIgnoreCase(hostEle.getAttribute(IJSFConstants.ATTR_LAYOUT))) //$NON-NLS-1$
- {
- horizontal = false;
- }
-
- Element itemContainer;
- if (horizontal)
- {
- itemContainer = createElement(IHTMLConstants.TAG_TR);
- tableEle.appendChild(itemContainer);
- }
- else
- {
- itemContainer = tableEle;
- }
-
- // XXX: If any of the children are an instance of SelectItemGroup, render them as a
- // nested table.
- // but at design time, we don't know anything about SelectItemGroup. so will not
- // rendering nested table.
-
- List selectitems = this.getSelectItems(hostEle);
-
- // for designer, if there is no item, we still want to render one
- if (this.isDesignerMode() && selectitems.isEmpty())
- {
- SelectItemModel item = getDefault(hostEle);
- selectitems.add(item);
- }
-
- boolean isDisabled = Boolean.TRUE.toString()
- .equalsIgnoreCase(hostEle.getAttribute(IJSFConstants.ATTR_DISABLED));
- boolean isReadonly = Boolean.TRUE.toString()
- .equalsIgnoreCase(hostEle.getAttribute(IJSFConstants.ATTR_READONLY));
-
- for (int i = 0, size = selectitems.size(); i < size; i++)
- {
- SelectItemModel item = (SelectItemModel) selectitems.get(i);
- // Each of the children are ultimately rendererd as follows.
- // Render a "label" element. Inside of the "label", render an "input" element
- // of "type" "checkbox" for each child component.
- Element labelEle = createElement(IHTMLConstants.TAG_LABEL);
- Element inputEle = createElement(IHTMLConstants.TAG_INPUT);
- inputEle.setAttribute(IHTMLConstants.ATTR_TYPE, getInputType());
- if (isDisabled || item.isDisabled())
- {
- inputEle.setAttribute(IHTMLConstants.ATTR_DISABLED, "disabled"); //$NON-NLS-1$
- }
- if (isReadonly)
- {
- inputEle.setAttribute(IHTMLConstants.ATTR_READONLY, "readonly"); //$NON-NLS-1$
- }
-
- // As an exception to the general
- // rules about how to handle the "id" attribute, render it as an attribute on
- // the outer "table" element, the value of which is the clientId of the component
- // per the rules at the beginning of this specification.The "id" attribute must
- // not be output on each "input" element.
- if (item.getId() != null)
- {
- labelEle.setAttribute(IHTMLConstants.ATTR_ID, item.getId());
- }
-
- // The value of the current SelectItem
- // is rendered as the value of the "value" attribute. If the value of the enclosing
- // UISelectMany matches the current value, render "checked" as the value of the
- // "checked" attribute. If the current SelectItem.isDisabled() returns true,
- // render "disabled" as the value of the "disabled" attribute.
- if (item.getValue() != null)
- {
- inputEle.setAttribute(IHTMLConstants.ATTR_VALUE, item.getValue());
- }
- // XXX: checked and disabled is not handled.
-
- // Close out the "input" element and render the return value from
- // SelectItem.getLabel(). Close out the "label" element and any other nested elements.
- Text label = createText(item.getDisplayString());
-
- labelEle.appendChild(inputEle);
- labelEle.appendChild(label);
-
- if (horizontal)
- {
- Element td = createElement(IHTMLConstants.TAG_TD);
- td.appendChild(labelEle);
- itemContainer.appendChild(td);
- }
- else
- {
- Element tr = createElement(IHTMLConstants.TAG_TR);
- Element td = createElement(IHTMLConstants.TAG_TD);
- tr.appendChild(td);
- td.appendChild(labelEle);
- itemContainer.appendChild(tr);
- }
- }
-
- return (tableEle);
- }
-
- /**
- * @return the input type
- */
- protected String getInputType()
- {
- return _inputType;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.pagedesigner.converter.AbstractTagConverter#needBorderDecorator()
- */
- public boolean needBorderDecorator()
- {
- return true;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/operations/jsf/ColumnOperation.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/operations/jsf/ColumnOperation.java
deleted file mode 100644
index a8b15e7..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/operations/jsf/ColumnOperation.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 Oracle 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:
- * Ian Trimble - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.pagedesigner.jsf.ui.converter.operations.jsf;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.StringTokenizer;
-
-import org.eclipse.jst.pagedesigner.converter.ConvertPosition;
-import org.eclipse.jst.pagedesigner.dom.EditModelQuery;
-import org.eclipse.jst.pagedesigner.dtmanager.converter.ITransformOperation;
-import org.eclipse.jst.pagedesigner.dtmanager.converter.operations.AbstractTransformOperation;
-import org.eclipse.jst.pagedesigner.dtmanager.converter.operations.TransformOperationFactory;
-import org.eclipse.jst.pagedesigner.jsf.core.dom.JSFDOMUtil;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-
-/**
- * ITransformOperation implementation specifically for the "column" JSF (HTML)
- * Element.
- *
- * <br><b>Note:</b> requires ITransformOperation.setTagConverterContext(...) to
- * have been called to provide a valid ITagConverterContext instance prior to
- * a call to the transform(...) method.
- *
- * @author Ian Trimble - Oracle
- */
-public class ColumnOperation extends AbstractTransformOperation {
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.jst.pagedesigner.dtmanager.converter.operations.internal.provisional.AbstractTransformOperation#transform(org.w3c.dom.Element, org.w3c.dom.Element)
- */
- public Element transform(Element srcElement, Element curElement) {
-
- //create "td" Element
- Element tdElement = createElement("td"); //$NON-NLS-1$
-
- //get parent Node
- Node parentNode = srcElement.getParentNode();
-
- //process if parentNode is a "dataTable" Element
- if (parentNode != null && parentNode.getNodeType() == Node.ELEMENT_NODE && parentNode.getLocalName().equals("dataTable")) { //$NON-NLS-1$
- //tokenize "columnClasses" attribute into a List
- List columnClassesList = new ArrayList();
- String columnClassesAttribute = ((Element)parentNode).getAttribute("columnClasses"); //$NON-NLS-1$
- if (columnClassesAttribute != null && columnClassesAttribute.length() > 0) {
- StringTokenizer tokenizer = new StringTokenizer(columnClassesAttribute, ", "); //$NON-NLS-1$
- while (tokenizer.hasMoreTokens()) {
- columnClassesList.add(tokenizer.nextToken());
- }
- }
- //set "class" attribute
- int offset = EditModelQuery.getInstance().getSameTypeNodeIndex(srcElement);
- if (offset < columnClassesList.size()) {
- ITransformOperation operation =
- TransformOperationFactory.getInstance().getTransformOperation(
- TransformOperationFactory.OP_CreateAttributeOperation,
- new String[]{"class", (String)columnClassesList.get(offset)}); //$NON-NLS-1$
- operation.transform(srcElement, tdElement);
- }
- }
-
- //add non-transparent (?), non-facet children (for further processing)
- if (EditModelQuery.getInstance().hasNonTransparentChild(srcElement, new String[] {"facet"})) { //$NON-NLS-1$
- Node childNode = srcElement.getFirstChild();
- int index = 0;
- while (childNode != null) {
- if (!(childNode instanceof Element) || !JSFDOMUtil.isFacet((Element)childNode)) {
- //Bug 251378 - only add element, text, and CDATA child nodes (as we do everywhere else)
- if (childNode.getNodeType() == Node.ELEMENT_NODE ||
- childNode.getNodeType() == Node.TEXT_NODE ||
- childNode.getNodeType() == Node.CDATA_SECTION_NODE) {
- tagConverterContext.addChild(childNode, new ConvertPosition(tdElement, index++));
- }
- }
- childNode = childNode.getNextSibling();
- }
- } else {
- //append single space for esthetics of the "td" Element
- appendChildText(" ", tdElement); //$NON-NLS-1$
- }
-
- return tdElement;
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/operations/jsf/DataTableOperation.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/operations/jsf/DataTableOperation.java
deleted file mode 100644
index 95c0bed..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/operations/jsf/DataTableOperation.java
+++ /dev/null
@@ -1,200 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 Oracle 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:
- * Ian Trimble - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.pagedesigner.jsf.ui.converter.operations.jsf;
-
-import java.util.Iterator;
-import java.util.List;
-import java.util.StringTokenizer;
-
-import org.eclipse.jst.pagedesigner.converter.ConvertPosition;
-import org.eclipse.jst.pagedesigner.dtmanager.converter.ITransformOperation;
-import org.eclipse.jst.pagedesigner.dtmanager.converter.operations.AbstractTransformOperation;
-import org.eclipse.jst.pagedesigner.dtmanager.converter.operations.TransformOperationFactory;
-import org.w3c.dom.Element;
-
-/**
- * ITransformOperation implementation specifically for the "dataTable" JSF
- * (HTML) Element.
- *
- * <br><b>Note:</b> requires ITransformOperation.setTagConverterContext(...) to
- * have been called to provide a valid ITagConverterContext instance prior to
- * a call to the transform(...) method.
- *
- * @author Ian Trimble - Oracle
- */
-public class DataTableOperation extends AbstractTransformOperation {
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.jst.pagedesigner.dtmanager.converter.operations.internal.provisional.AbstractTransformOperation#transform(org.w3c.dom.Element, org.w3c.dom.Element)
- */
- public Element transform(Element srcElement, Element curElement) {
- Element tableElement = null;
- //create table element, copy all attributes, rename "styleClass" attribute to "class"
- tableElement = createElement("table"); //$NON-NLS-1$
- ITransformOperation operation =
- TransformOperationFactory.getInstance().getTransformOperation(
- TransformOperationFactory.OP_CopyAllAttributesOperation,
- new String[]{});
- operation.transform(srcElement, tableElement);
- operation =
- TransformOperationFactory.getInstance().getTransformOperation(
- TransformOperationFactory.OP_RenameAttributeOperation,
- new String[]{"styleClass", "class"}); //$NON-NLS-1$ //$NON-NLS-2$
- operation.transform(srcElement, tableElement);
- //build thead
- buildHeaderOrFooter(srcElement, tableElement, true);
- //build tbody
- buildBody(srcElement, tableElement);
- //build tfoot
- buildHeaderOrFooter(srcElement, tableElement, false);
- return tableElement;
- }
-
- private void buildHeaderOrFooter(Element srcElement, Element tableElement, boolean isHeader) {
- //setup vars depending on whether we are building thead or tfoot
- String facetName = isHeader ? "header" : "footer"; //$NON-NLS-1$ //$NON-NLS-2$
- String headerOrFooterTagName = isHeader ? "thead" : "tfoot"; //$NON-NLS-1$ //$NON-NLS-2$
- String thOrTdTagName = isHeader ? "th" : "td"; //$NON-NLS-1$ //$NON-NLS-2$
- String headerClassOrFooterClassAttrName = isHeader ? "headerClass" : "footerClass"; //$NON-NLS-1$ //$NON-NLS-2$
-
- //look for facet ("header" or "footer")
- Element facetElement = getChildFacetByName(srcElement, facetName);
-
- //get list of child "column" elements
- List columnElementList = getChildElements(srcElement, "column"); //$NON-NLS-1$
-
- //look for facet ("header" or "footer") on child "column" elements
- boolean hasColumnFacet = false;
- Iterator itColumnElementList = columnElementList.iterator();
- while (itColumnElementList.hasNext()) {
- Element columnElement = (Element)itColumnElementList.next();
- Element columnFacet = getChildFacetByName(columnElement, facetName);
- if (columnFacet != null) {
- hasColumnFacet = true;
- break;
- }
- }
-
- //test if we even need to build header or footer
- if (facetElement == null && !hasColumnFacet) {
- return;
- }
-
- //append "thead" or "tfoot" Element
- Element headerOrFooterElement = appendChildElement(headerOrFooterTagName, tableElement);
-
- //if facetElement exists, build appropriate thead or tfoot children
- if (facetElement != null) {
- //append "tr" Element
- Element trElement = appendChildElement("tr", headerOrFooterElement); //$NON-NLS-1$
- //append "th" or "td" Element
- Element thOrTdElement = appendChildElement(thOrTdTagName, trElement);
- //set "class" attribute
- String headerClassOrFooterClassAttribute = srcElement.getAttribute(headerClassOrFooterClassAttrName);
- if (headerClassOrFooterClassAttribute != null && headerClassOrFooterClassAttribute.length() > 0) {
- ITransformOperation operation =
- TransformOperationFactory.getInstance().getTransformOperation(
- TransformOperationFactory.OP_CreateAttributeOperation,
- new String[]{"class", headerClassOrFooterClassAttribute}); //$NON-NLS-1$
- operation.transform(srcElement, thOrTdElement);
- }
- //set "colspan" attribute
- if (columnElementList.size() > 0) {
- ITransformOperation operation =
- TransformOperationFactory.getInstance().getTransformOperation(
- TransformOperationFactory.OP_CreateAttributeOperation,
- new String[]{"colspan", String.valueOf(columnElementList.size())}); //$NON-NLS-1$
- operation.transform(srcElement, thOrTdElement);
- }
- //add facet Element as child (to be processed further)
- tagConverterContext.addChild(facetElement, new ConvertPosition(thOrTdElement, 0));
- }
-
- //if any child column has "header" or "footer" facet, build "tr" element
- if (hasColumnFacet) {
- //append "tr" Element
- Element trElement = appendChildElement("tr", headerOrFooterElement); //$NON-NLS-1$
- //iterate through columnElementList
- itColumnElementList = columnElementList.iterator();
- while (itColumnElementList.hasNext()) {
- Element columnElement = (Element)itColumnElementList.next();
- //get "header" or "footer" facet of column
- Element columnFacet = getChildFacetByName(columnElement, facetName);
- //append "th" or "td" Element
- Element thOrTdElement = appendChildElement(thOrTdTagName, trElement);
- //set "class" attribute
- String headerClassOrFooterClassAttribute = srcElement.getAttribute(headerClassOrFooterClassAttrName);
- if (headerClassOrFooterClassAttribute != null && headerClassOrFooterClassAttribute.length() > 0) {
- ITransformOperation operation =
- TransformOperationFactory.getInstance().getTransformOperation(
- TransformOperationFactory.OP_CreateAttributeOperation,
- new String[]{"class", headerClassOrFooterClassAttribute}); //$NON-NLS-1$
- operation.transform(srcElement, thOrTdElement);
- }
- //if facet exists, add facet Element as child (to be processed further)
- if (columnFacet != null) {
- tagConverterContext.addChild(columnFacet, new ConvertPosition(thOrTdElement, 0));
- }
- }
- }
- }
-
- private void buildBody(Element srcElement, Element tableElement) {
- //append "tbody" element
- Element tbodyElement = appendChildElement("tbody", tableElement); //$NON-NLS-1$
- //append "tr" element
- Element trElement = appendChildElement("tr", tbodyElement); //$NON-NLS-1$
- //parse "rowClasses" attribute and set "class" attribute
- String rowClassesAttribute = srcElement.getAttribute("rowClasses"); //$NON-NLS-1$
- if (rowClassesAttribute != null && rowClassesAttribute.length() > 0) {
- StringTokenizer tokenizer = new StringTokenizer(rowClassesAttribute, ", "); //$NON-NLS-1$
- if (tokenizer.hasMoreTokens()) {
- ITransformOperation operation =
- TransformOperationFactory.getInstance().getTransformOperation(
- TransformOperationFactory.OP_CreateAttributeOperation,
- new String[]{"class", tokenizer.nextToken()}); //$NON-NLS-1$
- operation.transform(srcElement, trElement);
- }
- }
- //add child columns (to be processed further)
- List columnElementList = getChildElements(srcElement, "column"); //$NON-NLS-1$
- Iterator itColumnElementList = columnElementList.iterator();
- int index = 0;
- while (itColumnElementList.hasNext()) {
- Element columnElement = (Element)itColumnElementList.next();
- tagConverterContext.addChild(columnElement, new ConvertPosition(trElement, index++));
- }
- }
-
- /**
- * Gets a child Element of the specified parent Element that has the node
- * name "facet" and the specified value of the "name" attribute.
- *
- * @param srcElement Parent Element instance.
- * @param facetName Name of the facet Element for which to search.
- * @return Child Element that is a facet with the specified name.
- */
- private Element getChildFacetByName(Element srcElement, String facetName) {
- Element element = null;
- List facets = getChildElements(srcElement, "facet"); //$NON-NLS-1$
- Iterator itFacets = facets.iterator();
- while (itFacets.hasNext()) {
- Element facet = (Element)itFacets.next();
- if (facet.getAttribute("name").equals(facetName)) { //$NON-NLS-1$
- element = facet;
- break;
- }
- }
- return element;
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/operations/jsf/LoadBundleOperation.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/operations/jsf/LoadBundleOperation.java
deleted file mode 100644
index 7ae84d4..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/operations/jsf/LoadBundleOperation.java
+++ /dev/null
@@ -1,162 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 Oracle 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:
- * Ian Trimble - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.pagedesigner.jsf.ui.converter.operations.jsf;
-
-import java.io.BufferedInputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.HashMap;
-import java.util.PropertyResourceBundle;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jst.jsf.common.ui.IFileFolderConstants;
-import org.eclipse.jst.jsf.common.ui.internal.utils.ResourceUtils;
-import org.eclipse.jst.jsf.core.internal.tld.IJSFConstants;
-import org.eclipse.jst.pagedesigner.PDPlugin;
-import org.eclipse.jst.pagedesigner.dtmanager.converter.operations.AbstractTransformOperation;
-import org.eclipse.jst.pagedesigner.utils.PreviewUtil;
-import org.eclipse.jst.pagedesigner.utils.StructuredModelUtil;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.componentcore.resources.IVirtualFolder;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
-import org.w3c.dom.Element;
-
-/**
- * ITransformOperation implementation specifically for the "loadBundle" JSF
- * (core) Element.
- *
- * @author Ian Trimble - Oracle
- */
-public class LoadBundleOperation extends AbstractTransformOperation {
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.jst.pagedesigner.dtmanager.converter.operations.internal.provisional.AbstractTransformOperation#transform(org.w3c.dom.Element, org.w3c.dom.Element)
- */
- public Element transform(Element srcElement, Element curElement) {
- if (srcElement != null) {
- //get "var" and "basename" attributes of srcElement
- String var = srcElement.getAttribute(IJSFConstants.ATTR_VAR);
- String basename = srcElement.getAttribute(IJSFConstants.ATTR_BASENAME);
- if (var != null && basename != null && var.length() > 0 && basename.length() > 0) {
- String basePath =
- basename.replace('.', IFileFolderConstants.PATH_SEPARATOR.charAt(0)) +
- IFileFolderConstants.DOT +
- IFileFolderConstants.EXT_PROPERTIES;
- if (srcElement instanceof IDOMNode) {
- //get model
- IDOMModel model = ((IDOMNode)srcElement).getModel();
- if (model != null) {
- //get project
- IProject project = StructuredModelUtil.getProjectFor(model);
- if (project != null) {
- //attempt to locate properties file in "/{WebRoot}/WEB-INF/classes"
- IVirtualComponent component = ComponentCore.createComponent(project);
- if (component != null) {
- IVirtualFolder rootFolder = component.getRootFolder();
- if (rootFolder != null) {
- IPath webRootPath = rootFolder.getProjectRelativePath();
- if (webRootPath != null) {
- StringBuffer sb = new StringBuffer(webRootPath.toString());
- if (!IFileFolderConstants.PATH_SEPARATOR.equals(webRootPath.toString())) {
- sb.append(IFileFolderConstants.PATH_SEPARATOR);
- }
- sb.append(IFileFolderConstants.FOLDER_WEBINF);
- sb.append(IFileFolderConstants.PATH_SEPARATOR);
- sb.append(IFileFolderConstants.FOLDER_CLASS);
- sb.append(IFileFolderConstants.PATH_SEPARATOR);
- sb.append(basePath);
- IResource resource = project.findMember(sb.toString());
- if (resource == null) {
- resource = findFileInSrcFolder(project, basePath);
- if (resource != null) {
- //load properties file and configure PreviewUtil
- InputStream inputStream = null;
- try {
- File file = new File(resource.getLocation().toString());
- inputStream = new FileInputStream(file);
- if (inputStream != null) {
- inputStream = new BufferedInputStream(inputStream);
- PropertyResourceBundle bundle = new PropertyResourceBundle(inputStream);
- if (bundle != null) {
- if (PreviewUtil.getBUNDLE_MAP() == null) {
- PreviewUtil.setBUNDLE_MAP(new HashMap());
- } else {
- PreviewUtil.getBUNDLE_MAP().clear();
- }
- PreviewUtil.getBUNDLE_MAP().put(var, bundle);
- PreviewUtil.setBUNDLE(bundle);
- PreviewUtil.setVAR(var);
- }
- }
- } catch(IOException ioe) {
- PDPlugin.getLogger(LoadBundleOperation.class).error("LoadBundleTagConverter.convertRefresh.IOException", ioe); //$NON-NLS-1$
- } finally {
- ResourceUtils.ensureClosed(inputStream);
- }
- }
- }
- }
- }
- }
- }
- }
- }
- }
- }
- //return null to indicate there is no HTML element associated with this tag
- return null;
- }
-
- /**
- * Find specified file in any source folder of the specified project.
- *
- * @param project IProject instance.
- * @param filePath Source folder-relative path of the file to be located.
- * @return the specified file in any source folder of the specified project.
- */
- protected IResource findFileInSrcFolder(IProject project, String filePath) {
- IResource resource = null;
- IJavaProject javaProject = JavaCore.create(project);
- if (javaProject != null) {
- try {
- IClasspathEntry[] classpathEntries = javaProject.getResolvedClasspath(true);
- for (int i = 0; i < classpathEntries.length; i++) {
- IClasspathEntry classpathEntry = classpathEntries[i];
- if (classpathEntry.getEntryKind() == IClasspathEntry.CPE_SOURCE) {
- IPath srcPath = classpathEntry.getPath();
- //srcPath = srcPath.removeFirstSegments(srcPath.matchingFirstSegments(project.getFullPath()));
- IPath srcFilePath = srcPath.append(filePath);
- IResource tmpResource = project.getParent().findMember(srcFilePath);
- if (tmpResource != null) {
- resource = tmpResource;
- break;
- }
- }
- }
- } catch(JavaModelException jme) {
- //ignore - returning null from method will indicate failure
- }
- }
- return resource;
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/operations/jsf/PanelGridOperation.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/operations/jsf/PanelGridOperation.java
deleted file mode 100644
index 7ee81bf..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/operations/jsf/PanelGridOperation.java
+++ /dev/null
@@ -1,204 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 Oracle 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:
- * Ian Trimble - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.pagedesigner.jsf.ui.converter.operations.jsf;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.StringTokenizer;
-
-import org.eclipse.jst.pagedesigner.converter.ConvertPosition;
-import org.eclipse.jst.pagedesigner.dtmanager.converter.ITransformOperation;
-import org.eclipse.jst.pagedesigner.dtmanager.converter.operations.AbstractTransformOperation;
-import org.eclipse.jst.pagedesigner.dtmanager.converter.operations.TransformOperationFactory;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-/**
- * ITransformOperation implementation specifically for the "panelGrid" JSF
- * (HTML) Element.
- *
- * <br><b>Note:</b> requires ITransformOperation.setTagConverterContext(...) to
- * have been called to provide a valid ITagConverterContext instance prior to
- * a call to the transform(...) method.
- *
- * @author Ian Trimble - Oracle
- */
-public class PanelGridOperation extends AbstractTransformOperation {
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.jst.pagedesigner.dtmanager.converter.operations.internal.provisional.AbstractTransformOperation#transform(org.w3c.dom.Element, org.w3c.dom.Element)
- */
- public Element transform(Element srcElement, Element curElement) {
- Element tableElement = null;
- //create table element, copy all attributes, rename "styleClass" attribute to "class"
- tableElement = createElement("table"); //$NON-NLS-1$
- ITransformOperation operation =
- TransformOperationFactory.getInstance().getTransformOperation(
- TransformOperationFactory.OP_CopyAllAttributesOperation,
- new String[]{});
- operation.transform(srcElement, tableElement);
- operation =
- TransformOperationFactory.getInstance().getTransformOperation(
- TransformOperationFactory.OP_RenameAttributeOperation,
- new String[]{"styleClass", "class"}); //$NON-NLS-1$ //$NON-NLS-2$
- operation.transform(srcElement, tableElement);
- //get value of "columns" attribute
- int columns;
- try {
- columns = Integer.parseInt(srcElement.getAttribute("columns")); //$NON-NLS-1$
- } catch(NumberFormatException nfe) {
- columns = 1;
- }
- if (columns < 1) {
- columns = 1;
- }
- //check for "header" facet and render appropriately
- Element headerFacetElement = getChildFacetByName(srcElement, "header"); //$NON-NLS-1$
- if (headerFacetElement != null) {
- Element tHeadElement = appendChildElement("thead", tableElement); //$NON-NLS-1$
- Element trElement = appendChildElement("tr", tHeadElement); //$NON-NLS-1$
- Element thElement = appendChildElement("th", trElement); //$NON-NLS-1$
- String headerClass = srcElement.getAttribute("headerClass"); //$NON-NLS-1$
- if (headerClass != null && headerClass.length() > 0) {
- operation =
- TransformOperationFactory.getInstance().getTransformOperation(
- TransformOperationFactory.OP_CreateAttributeOperation,
- new String[]{"class", headerClass}); //$NON-NLS-1$
- operation.transform(srcElement, thElement);
- }
- operation =
- TransformOperationFactory.getInstance().getTransformOperation(
- TransformOperationFactory.OP_CreateAttributeOperation,
- new String[]{"colspan", String.valueOf(columns)}); //$NON-NLS-1$
- operation.transform(srcElement, thElement);
- tagConverterContext.addChild(headerFacetElement, new ConvertPosition(thElement, 0));
- }
- //check for "footer" facet and render appropriately
- Element footerFacetElement = getChildFacetByName(srcElement, "footer"); //$NON-NLS-1$
- if (footerFacetElement != null) {
- Element tFootElement = appendChildElement("tfoot", tableElement); //$NON-NLS-1$
- Element trElement = appendChildElement("tr", tFootElement); //$NON-NLS-1$
- Element tdElement = appendChildElement("td", trElement); //$NON-NLS-1$
- String footerClass = srcElement.getAttribute("footerClass"); //$NON-NLS-1$
- if (footerClass != null && footerClass.length() > 0) {
- operation =
- TransformOperationFactory.getInstance().getTransformOperation(
- TransformOperationFactory.OP_CreateAttributeOperation,
- new String[]{"class", footerClass}); //$NON-NLS-1$
- operation.transform(srcElement, tdElement);
- }
- operation =
- TransformOperationFactory.getInstance().getTransformOperation(
- TransformOperationFactory.OP_CreateAttributeOperation,
- new String[]{"colspan", String.valueOf(columns)}); //$NON-NLS-1$
- operation.transform(srcElement, tdElement);
- tagConverterContext.addChild(footerFacetElement, new ConvertPosition(tdElement, 0));
- }
- //get rowClasses and columnClasses for subsequent processing
- List rowClasses = new ArrayList();
- String rowClassesAttribute = srcElement.getAttribute("rowClasses"); //$NON-NLS-1$
- if (rowClassesAttribute != null && rowClassesAttribute.length() > 0) {
- StringTokenizer tokenizer = new StringTokenizer(rowClassesAttribute, ", "); //$NON-NLS-1$
- while (tokenizer.hasMoreTokens()) {
- rowClasses.add(tokenizer.nextToken());
- }
- }
- List columnClasses = new ArrayList();
- String columnClassAttribute = srcElement.getAttribute("columnClasses"); //$NON-NLS-1$
- if (columnClassAttribute != null) {
- StringTokenizer tokenizer = new StringTokenizer(columnClassAttribute, ", "); //$NON-NLS-1$
- while (tokenizer.hasMoreTokens()) {
- columnClasses.add(tokenizer.nextToken());
- }
- }
- //render children using appropriate number of columns and appropriate classes
- Element tBodyElement = appendChildElement("tbody", tableElement); //$NON-NLS-1$
- List childElements = getChildElementsSkipFacets(srcElement);
- Element trElement = null;
- int nextRow = 0;
- int curIndex = 0;
- Iterator itChildElements = childElements.iterator();
- while (itChildElements.hasNext()) {
- int columnIndex = curIndex % columns;
- if (columnIndex == 0) {
- trElement = appendChildElement("tr", tBodyElement); //$NON-NLS-1$
- if (!rowClasses.isEmpty()) {
- operation =
- TransformOperationFactory.getInstance().getTransformOperation(
- TransformOperationFactory.OP_CreateAttributeOperation,
- new String[]{"class", (String)rowClasses.get(nextRow)}); //$NON-NLS-1$
- operation.transform(srcElement, trElement);
- nextRow = (nextRow + 1) % rowClasses.size();
- }
- }
- Element tdElement = appendChildElement("td", trElement); //$NON-NLS-1$
- if (columnIndex < columnClasses.size()) {
- operation =
- TransformOperationFactory.getInstance().getTransformOperation(
- TransformOperationFactory.OP_CreateAttributeOperation,
- new String[]{"class", (String)columnClasses.get(columnIndex)}); //$NON-NLS-1$
- operation.transform(srcElement, tdElement);
- }
- tagConverterContext.addChild((Element)itChildElements.next(), new ConvertPosition(tdElement, 0));
- curIndex++;
- }
- return tableElement;
- }
-
- /**
- * Gets a child Element of the specified parent Element that has the node
- * name "facet" and the specified value of the "name" attribute.
- *
- * @param srcElement Parent Element instance.
- * @param facetName Name of the facet Element for which to search.
- * @return Child Element that is a facet with the specified name.
- */
- private Element getChildFacetByName(Element srcElement, String facetName) {
- Element element = null;
- List facets = getChildElements(srcElement, "facet"); //$NON-NLS-1$
- Iterator itFacets = facets.iterator();
- while (itFacets.hasNext()) {
- Element facet = (Element)itFacets.next();
- String facetAttrName = facet.getAttribute("name"); //$NON-NLS-1$
- if (facetAttrName != null && facetAttrName.equals(facetName)) {
- element = facet;
- break;
- }
- }
- return element;
- }
-
- /**
- * Gets a list of child Elements of the specified parent Element, skipping
- * any "facet" Elements.
- *
- * @param srcElement Parent Element instance.
- * @return List of child Elements of the specified parent Element that does
- * not include any child "facet" Elements.
- */
- private List getChildElementsSkipFacets(Element srcElement) {
- List childElementsList = new ArrayList();
- NodeList childNodes = srcElement.getChildNodes();
- for (int i = 0; i < childNodes.getLength(); i++) {
- Node childNode = childNodes.item(i);
- if (childNode.getNodeType() == Node.ELEMENT_NODE) {
- if (!childNode.getLocalName().equals("facet")) { //$NON-NLS-1$
- childElementsList.add(childNode);
- }
- }
- }
- return childElementsList;
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/operations/jsf/SelectManyCheckboxOperation.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/operations/jsf/SelectManyCheckboxOperation.java
deleted file mode 100644
index 4ebd28d..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/operations/jsf/SelectManyCheckboxOperation.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 Oracle 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:
- * Ian Trimble - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.pagedesigner.jsf.ui.converter.operations.jsf;
-
-/**
- * ITransformOperation implementation specifically for the "selectManyCheckbox"
- * JSF (HTML) Element.
- *
- * <br><b>Note:</b> requires ITransformOperation.setTagConverterContext(...) to
- * have been called to provide a valid ITagConverterContext instance prior to
- * a call to the transform(...) method.
- *
- * @author Ian Trimble - Oracle
- */
-public class SelectManyCheckboxOperation extends TableBasedOperation {
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.jst.pagedesigner.jsf.ui.converter.operations.jsf.TableBasedOperation#getInputType()
- */
- protected String getInputType() {
- return "checkbox"; //$NON-NLS-1$
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/operations/jsf/SelectOneRadioOperation.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/operations/jsf/SelectOneRadioOperation.java
deleted file mode 100644
index 12a32e5..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/operations/jsf/SelectOneRadioOperation.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 Oracle 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:
- * Ian Trimble - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.pagedesigner.jsf.ui.converter.operations.jsf;
-
-/**
- * ITransformOperation implementation specifically for the "selectOneRadio"
- * JSF (HTML) Element.
- *
- * <br><b>Note:</b> requires ITransformOperation.setTagConverterContext(...) to
- * have been called to provide a valid ITagConverterContext instance prior to
- * a call to the transform(...) method.
- *
- * @author Ian Trimble - Oracle
- */
-public class SelectOneRadioOperation extends TableBasedOperation {
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.jst.pagedesigner.jsf.ui.converter.operations.jsf.TableBasedOperation#getInputType()
- */
- protected String getInputType() {
- return "radio"; //$NON-NLS-1$
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/operations/jsf/TableBasedOperation.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/operations/jsf/TableBasedOperation.java
deleted file mode 100644
index a503acf..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/operations/jsf/TableBasedOperation.java
+++ /dev/null
@@ -1,184 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 Oracle 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:
- * Ian Trimble - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.pagedesigner.jsf.ui.converter.operations.jsf;
-
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.jst.pagedesigner.dtmanager.converter.ITransformOperation;
-import org.eclipse.jst.pagedesigner.dtmanager.converter.operations.AbstractTransformOperation;
-import org.eclipse.jst.pagedesigner.dtmanager.converter.operations.TransformOperationFactory;
-import org.eclipse.jst.pagedesigner.jsf.ui.util.JSFUIPluginResourcesUtil;
-import org.w3c.dom.Element;
-
-/**
- * Abstract ITransformOperation implementation intended as super class for HTML
- * "table"-based "selectXXX" JSF (HTML) Elements.
- *
- * <br><b>Note:</b> requires ITransformOperation.setTagConverterContext(...) to
- * have been called to provide a valid ITagConverterContext instance prior to
- * a call to the transform(...) method.
- *
- * @author Ian Trimble - Oracle
- */
-public abstract class TableBasedOperation extends AbstractTransformOperation {
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.jst.pagedesigner.dtmanager.converter.operations.internal.provisional.AbstractTransformOperation#transform(org.w3c.dom.Element, org.w3c.dom.Element)
- */
- public Element transform(Element srcElement, Element curElement) {
- Element tableElement = createElement("table"); //$NON-NLS-1$
- ITransformOperation operation =
- TransformOperationFactory.getInstance().getTransformOperation(
- TransformOperationFactory.OP_CopyAttributeOperation,
- new String[]{"styleClass"}); //$NON-NLS-1$
- operation.transform(srcElement, tableElement);
- operation =
- TransformOperationFactory.getInstance().getTransformOperation(
- TransformOperationFactory.OP_RenameAttributeOperation,
- new String[]{"styleClass", "class"}); //$NON-NLS-1$ //$NON-NLS-2$
- operation.transform(srcElement, tableElement);
- operation =
- TransformOperationFactory.getInstance().getTransformOperation(
- TransformOperationFactory.OP_CopyAttributeOperation,
- new String[]{"style"}); //$NON-NLS-1$
- operation.transform(srcElement, tableElement);
- operation =
- TransformOperationFactory.getInstance().getTransformOperation(
- TransformOperationFactory.OP_CopyAttributeOperation,
- new String[]{"border"}); //$NON-NLS-1$
- operation.transform(srcElement, tableElement);
- boolean layoutHorizontal = true;
- if ("pageDirection".equalsIgnoreCase(srcElement.getAttribute("layout"))) { //$NON-NLS-1$ //$NON-NLS-2$
- layoutHorizontal = false;
- }
- Element itemContainer;
- if (layoutHorizontal) {
- itemContainer = appendChildElement("tr", tableElement); //$NON-NLS-1$
- } else {
- itemContainer = tableElement;
- }
- boolean isDisabled = Boolean.TRUE.toString().equalsIgnoreCase(srcElement.getAttribute("disabled")); //$NON-NLS-1$
- boolean isReadOnly = Boolean.TRUE.toString().equalsIgnoreCase(srcElement.getAttribute("readonly")); //$NON-NLS-1$
- List selectItemList = getChildElements(srcElement, "selectItem"); //$NON-NLS-1$
- if (selectItemList.size() > 0) {
- Iterator itSelectItemList = selectItemList.iterator();
- while (itSelectItemList.hasNext()) {
- Element selectItem = (Element) itSelectItemList.next();
- Element labelElement = createElement("label"); //$NON-NLS-1$
- Element inputElement = appendChildElement("input", labelElement); //$NON-NLS-1$
- inputElement.setAttribute("type", getInputType()); //$NON-NLS-1$
- if (isDisabled || Boolean.TRUE.toString().equalsIgnoreCase(selectItem.getAttribute("itemDisabled"))) { //$NON-NLS-1$
- inputElement.setAttribute("disabled", "disabled"); //$NON-NLS-1$ //$NON-NLS-2$
- }
- if (isReadOnly) {
- inputElement.setAttribute("readonly", "readonly"); //$NON-NLS-1$ //$NON-NLS-2$
- }
- String selectItemID = selectItem.getAttribute("id"); //$NON-NLS-1$
- if (selectItemID != null && selectItemID.length() > 0) {
- inputElement.setAttribute("id", selectItemID); //$NON-NLS-1$
- }
- String selectItemValue = selectItem.getAttribute("value"); //$NON-NLS-1$
- if (selectItemValue != null && selectItemValue.length() > 0) {
- inputElement.setAttribute("value", selectItemValue); //$NON-NLS-1$
- }
- String label = getSelectItemLabel(selectItem);
- appendChildText(label, labelElement);
- if (layoutHorizontal) {
- Element tdElement = appendChildElement("td", itemContainer); //$NON-NLS-1$
- tdElement.appendChild(labelElement);
- } else {
- Element trElement = appendChildElement("tr", itemContainer); //$NON-NLS-1$
- Element tdElement = appendChildElement("td", trElement); //$NON-NLS-1$
- tdElement.appendChild(labelElement);
- }
- }
- } else {
- Element spanElement = createElement("span"); //$NON-NLS-1$
- appendAttribute(spanElement, "style", //$NON-NLS-1$
- JSFUIPluginResourcesUtil.getInstance().getString("TableBasedOperation.NoSelectItem.style")); //$NON-NLS-1$
- List selectItemsList = getChildElements(srcElement, "selectItems"); //$NON-NLS-1$
- if (selectItemsList.size() > 0) {
- appendChildText(
- JSFUIPluginResourcesUtil.getInstance().getString("TableBasedOperation.OnlySelectItems.text"), //$NON-NLS-1$
- spanElement);
- } else {
- appendChildText(
- JSFUIPluginResourcesUtil.getInstance().getString("TableBasedOperation.NoSelectItem.text"), //$NON-NLS-1$
- spanElement);
- }
- if (layoutHorizontal) {
- Element tdElement = appendChildElement("td", itemContainer); //$NON-NLS-1$
- tdElement.appendChild(spanElement);
- } else {
- Element trElement = appendChildElement("tr", itemContainer); //$NON-NLS-1$
- Element tdElement = appendChildElement("td", trElement); //$NON-NLS-1$
- tdElement.appendChild(spanElement);
- }
- }
- return tableElement;
- }
-
- /**
- * Subclasses override this in order to return the "type" attribute of
- * child "input" Elements ("checkbox" or "radio").
- *
- * @return the "type" attribute of child "input" Elements.
- */
- protected abstract String getInputType();
-
- /**
- * Attempts to get a label for the selectItem Element instance.
- *
- * @param selectItem "selectItem" source Element instance.
- * @return Label for the specified selectItem Element instance.
- */
- private String getSelectItemLabel(Element selectItem) {
- String attribute = selectItem.getAttribute("itemLabel"); //$NON-NLS-1$
- if (attribute != null && attribute.length() > 0) {
- return attribute;
- }
- attribute = selectItem.getAttribute("value"); //$NON-NLS-1$
- if (attribute != null && attribute.length() > 0) {
- return attribute;
- }
- attribute = selectItem.getAttribute("itemDescription"); //$NON-NLS-1$
- if (attribute != null && attribute.length() > 0) {
- return attribute;
- }
- attribute = selectItem.getAttribute("itemValue"); //$NON-NLS-1$
- if (attribute != null && attribute.length() > 0) {
- return attribute;
- }
- return "selectItem"; //$NON-NLS-1$
- }
-
- /**
- * Appends the specified attribute with the specified value to the specified
- * Element instance.
- *
- * @param element Element instance to append attribute to.
- * @param attributeName Name of attribute to be appended.
- * @param attributeValue Value of attribute to be appended.
- */
- protected void appendAttribute(
- Element element,
- String attributeName,
- String attributeValue) {
- ITransformOperation operation =
- TransformOperationFactory.getInstance().getTransformOperation(
- TransformOperationFactory.OP_CreateAttributeOperation,
- new String[]{attributeName, attributeValue});
- operation.transform(null, element);
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/elementedit/jsfcore/FacetElementEdit.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/elementedit/jsfcore/FacetElementEdit.java
deleted file mode 100644
index cf5ac89..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/elementedit/jsfcore/FacetElementEdit.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http:// www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.pagedesigner.jsf.ui.elementedit.jsfcore;
-
-import org.eclipse.gef.EditPart;
-import org.eclipse.jst.pagedesigner.elementedit.AbstractElementEdit;
-import org.eclipse.jst.pagedesigner.parts.ElementEditPart;
-import org.w3c.dom.Element;
-
-/**
- * Element edit for a f:facet
- *
- * @author cbateman
- *
- */
-public class FacetElementEdit extends AbstractElementEdit
-{
- /* (non-Javadoc)
- * @see org.eclipse.jst.pagedesigner.elementedit.AbstractElementEdit#handleModelChange(org.w3c.dom.Element, org.eclipse.jst.pagedesigner.parts.ElementEditPart)
- */
- public boolean handleModelChange(Element ele, ElementEditPart part,boolean recursive)
- {
- EditPart parent = part.getParent();
- if (parent instanceof ElementEditPart)
- {
- ((ElementEditPart) parent).refreshModelChange(recursive);
- return true;
- }
- return false;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/elementedit/jsfcore/JSFCoreElementEditFactory.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/elementedit/jsfcore/JSFCoreElementEditFactory.java
deleted file mode 100644
index 966a68b..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/elementedit/jsfcore/JSFCoreElementEditFactory.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http:// www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.pagedesigner.jsf.ui.elementedit.jsfcore;
-
-import org.eclipse.jst.jsf.common.dom.TagIdentifier;
-import org.eclipse.jst.jsf.core.internal.tld.IJSFConstants;
-import org.eclipse.jst.jsf.core.internal.tld.ITLDConstants;
-import org.eclipse.jst.pagedesigner.elementedit.IElementEdit;
-import org.eclipse.jst.pagedesigner.elementedit.IElementEditFactory;
-
-/**
- * @author mengbo
- * @version 1.5
- */
-public class JSFCoreElementEditFactory implements IElementEditFactory
-{
- /* (non-Javadoc)
- * @see org.eclipse.jst.pagedesigner.elementedit.IElementEditFactory#createElementEdit(org.w3c.dom.Element)
- */
- public IElementEdit createElementEdit(TagIdentifier tagIdentifier)
- {
- if (IJSFConstants.TAG_IDENTIFIER_LOADBUNDLE.isSameTagType(tagIdentifier))
- {
- return new LoadBundleElementEdit();
- }
- else if(IJSFConstants.TAG_IDENTIFIER_FACET.isSameTagType(tagIdentifier))
- {
- return new FacetElementEdit();
- }
- return null;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.pagedesigner.elementedit.IElementEditFactory#getSupportedURI()
- */
- public String getSupportedURI()
- {
- return ITLDConstants.URI_JSF_CORE;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/elementedit/jsfcore/JarEntryEditorInput.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/elementedit/jsfcore/JarEntryEditorInput.java
deleted file mode 100644
index 17ee5a4..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/elementedit/jsfcore/JarEntryEditorInput.java
+++ /dev/null
@@ -1,138 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http:// www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.pagedesigner.jsf.ui.elementedit.jsfcore;
-
-import org.eclipse.core.resources.IStorage;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.ui.IEditorRegistry;
-import org.eclipse.ui.IPersistableElement;
-import org.eclipse.ui.IStorageEditorInput;
-import org.eclipse.ui.PlatformUI;
-
-/**
- * @author mengbo
- * @version 1.5
- */
-public class JarEntryEditorInput implements IStorageEditorInput
-{
-
- private IStorage fJarEntryFile;
-
- /**
- * @param jarEntryFile
- */
- public JarEntryEditorInput(IStorage jarEntryFile)
- {
- fJarEntryFile = jarEntryFile;
- }
-
- /*
- */
- public boolean equals(Object obj)
- {
- if (this == obj)
- {
- return true;
- }
- if (!(obj instanceof JarEntryEditorInput))
- {
- return false;
- }
- JarEntryEditorInput other = (JarEntryEditorInput) obj;
- return fJarEntryFile.equals(other.fJarEntryFile);
- }
-
-
- @Override
- public int hashCode()
- {
- // two editor inputs are equal if their fJarEntryFile's are
- // equal. Therefore use the same criteria for hashcodes
- return fJarEntryFile.hashCode();
- }
-
- /*
- * @see IEditorInput#getPersistable()
- */
- public IPersistableElement getPersistable()
- {
- return null;
- }
-
- /*
- * @see IEditorInput#getName()
- */
- public String getName()
- {
- return fJarEntryFile.getName();
- }
-
-
- /**
- * @return the full path of the entry as a string
- */
- public String getFullPath()
- {
- return fJarEntryFile.getFullPath().toString();
- }
-
-
- /**
- * @return the file extension of this input
- */
- public String getContentType()
- {
- return fJarEntryFile.getFullPath().getFileExtension();
- }
-
- /*
- * @see IEditorInput#getToolTipText()
- */
- public String getToolTipText()
- {
- return fJarEntryFile.getFullPath().toString();
- }
-
- /*
- * @see IEditorInput#getImageDescriptor()
- */
- public ImageDescriptor getImageDescriptor()
- {
- IEditorRegistry registry = PlatformUI.getWorkbench().getEditorRegistry();
- return registry.getImageDescriptor(fJarEntryFile.getFullPath().getFileExtension());
- }
-
- /*
- * @see IEditorInput#exists()
- */
- public boolean exists()
- {
- // JAR entries can't be deleted
- return true;
- }
-
- /*
- * @see IAdaptable#getAdapter(Class)
- */
- public Object getAdapter(Class adapter)
- {
- return null;
- }
-
- /*
- * see IStorageEditorInput#getStorage()
- */
- public IStorage getStorage()
- {
- return fJarEntryFile;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/elementedit/jsfcore/LoadBundleAction.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/elementedit/jsfcore/LoadBundleAction.java
deleted file mode 100644
index 2599167..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/elementedit/jsfcore/LoadBundleAction.java
+++ /dev/null
@@ -1,167 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http:// www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.pagedesigner.jsf.ui.elementedit.jsfcore;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IStorage;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jface.action.Action;
-import org.eclipse.jst.jsf.core.internal.tld.LoadBundleUtil;
-import org.eclipse.jst.pagedesigner.jsf.ui.JSFUIPlugin;
-import org.eclipse.ui.IEditorDescriptor;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IEditorRegistry;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.ide.IDE;
-
-
-/**
- * @author mengbo
- */
-public class LoadBundleAction extends Action
-{
- private String _baseName;
- private IProject _project;
-
- /**
- * Create a new action
- */
- public LoadBundleAction()
- {
- setText(JSFUIPlugin.getResourceString("ElementEdit.Submenu.LoadBundle"));//$NON-NLS-1$
- }
-
- /**
- * @param attribute
- */
- public void setBaseName(String attribute)
- {
- _baseName = attribute;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.action.IAction#run()
- */
- public void run()
- {
- if (_project == null || _baseName == null)
- {
- return;
- }
-
- IStorage storage = null;
- try
- {
- storage = LoadBundleUtil.getLoadBundleResource(_project, _baseName);
- }
- catch (CoreException e)
- {
- JSFUIPlugin.getAlerts().warning("Message.Warning.Title", e.getLocalizedMessage());//$NON-NLS-1$
- return;
- }
-
- if (storage instanceof IFile)
- {
- try
- {
- IDE.openEditor(getPage(), (IFile) storage, true);
- }
- catch (PartInitException e1)
- {
- JSFUIPlugin.getAlerts().warning("Message.Warning.Title", e1.getLocalizedMessage());//$NON-NLS-1$
- }
- }
- else if (storage != null)
- {
- IEditorInput input = new JarEntryEditorInput(storage);
- try
- {
- getPage().openEditor(input, "org.eclipse.ui.DefaultTextEditor");//$NON-NLS-1$
- }
- catch (PartInitException e1)
- {
- JSFUIPlugin.getAlerts().warning("Message.Warning.Title", e1.getLocalizedMessage());//$NON-NLS-1$
- }
- }
- else {
- //create new file??? Will be covered by https://bugs.eclipse.org/bugs/show_bug.cgi?id=225232
-
- }
- }
-
-
- private IWorkbenchPage getPage()
- {
- IWorkbench workbench = PlatformUI.getWorkbench();
- IWorkbenchWindow window = workbench.getActiveWorkbenchWindow();
- return window.getActivePage();
- }
-
- /**
- * @param projectFor
- */
- public void setProject(IProject projectFor)
- {
- this._project = projectFor;
- }
-
- /**
- * @param inputName
- * @return the editor id of theditor to open for the inputName or null
- * if none can be ascertained
- */
- public String getEditorID(String inputName)
- {
- IEditorRegistry registry = PlatformUI.getWorkbench().getEditorRegistry();
-
- // check for a default editor
- IEditorDescriptor editorDescriptor = registry.getDefaultEditor(inputName);
-
- // next check the OS for in-place editor (OLE on Win32)
- if (editorDescriptor == null && registry.isSystemInPlaceEditorAvailable(inputName))
- {
- editorDescriptor = registry.findEditor(IEditorRegistry.SYSTEM_INPLACE_EDITOR_ID);
- }
-
- // next check with the OS for an external editor
- if (editorDescriptor == null && registry.isSystemExternalEditorAvailable(inputName))
- {
- editorDescriptor = registry.findEditor(IEditorRegistry.SYSTEM_EXTERNAL_EDITOR_ID);
- }
-
- // next lookup the default text editor
- if (editorDescriptor == null)
- {
- editorDescriptor = registry.findEditor("org.eclipse.ui.DefaultTextEditor"); //$NON-NLS-1$
- }
-
- // if no valid editor found, bail out
- if (editorDescriptor == null)
- {
- return null;
- }
-
- return editorDescriptor.getId();
- }
- /* (non-Javadoc)
- * @see org.eclipse.jface.action.IAction#isEnabled()
- */
- public boolean isEnabled()
- {
- return _project != null && _baseName != null && !"".equals(_baseName);//$NON-NLS-1$
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/elementedit/jsfcore/LoadBundleElementEdit.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/elementedit/jsfcore/LoadBundleElementEdit.java
deleted file mode 100644
index 4f3dfe6..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/elementedit/jsfcore/LoadBundleElementEdit.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http:// www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.pagedesigner.jsf.ui.elementedit.jsfcore;
-
-import org.eclipse.jface.action.IMenuManager;
-import org.eclipse.jst.pagedesigner.css2.property.ICSSPropertyID;
-import org.eclipse.jst.pagedesigner.editors.PageDesignerActionConstants;
-import org.eclipse.jst.pagedesigner.elementedit.AbstractElementEdit;
-import org.eclipse.jst.pagedesigner.utils.StructuredModelUtil;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMElement;
-import org.w3c.dom.Element;
-
-/**
- * @author mengbo
- * @version 1.5
- */
-public class LoadBundleElementEdit extends AbstractElementEdit
-{
- private LoadBundleAction loadBundleAction;
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.pagedesigner.elementedit.IElementEdit#fillContextMenu(org.eclipse.jface.action.IMenuManager, org.w3c.dom.Element)
- */
- public void fillContextMenu(IMenuManager contextMenu, Element ele)
- {
- super.fillContextMenu(contextMenu,ele);
-
- LoadBundleAction action = getAction();
- action.setBaseName(ele.getAttribute(ICSSPropertyID.ATTR_BASENAME));
- if (ele instanceof IDOMElement)
- {
- action.setProject(StructuredModelUtil.getProjectFor(((IDOMElement) ele).getModel()));
- }
- contextMenu.appendToGroup(PageDesignerActionConstants.GROUP_SPECIAL, action);
- }
-
- private LoadBundleAction getAction()
- {
- if (loadBundleAction == null)
- {
- loadBundleAction = new LoadBundleAction();
- }
- return loadBundleAction;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/elementedit/jsfhtml/ColumnElementEdit.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/elementedit/jsfhtml/ColumnElementEdit.java
deleted file mode 100644
index 78affcf..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/elementedit/jsfhtml/ColumnElementEdit.java
+++ /dev/null
@@ -1,156 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http:// www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.pagedesigner.jsf.ui.elementedit.jsfhtml;
-
-import java.util.Iterator;
-
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPartViewer;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.GraphicalEditPart;
-import org.eclipse.jst.jsf.common.dom.TagIdentifier;
-import org.eclipse.jst.jsf.core.internal.tld.IJSFConstants;
-import org.eclipse.jst.pagedesigner.editpolicies.ColumnHelper;
-import org.eclipse.jst.pagedesigner.editpolicies.ColumnResizableEditPolicy;
-import org.eclipse.jst.pagedesigner.parts.ElementEditPart;
-import org.eclipse.jst.pagedesigner.parts.NodeEditPart;
-import org.eclipse.jst.pagedesigner.validation.caret.IPositionMediator;
-import org.eclipse.jst.pagedesigner.validation.caret.Target;
-import org.eclipse.jst.pagedesigner.viewer.CaretPositionResolver;
-import org.eclipse.jst.pagedesigner.viewer.DefaultDropLocationStrategy;
-import org.eclipse.jst.pagedesigner.viewer.DesignPosition;
-import org.eclipse.jst.pagedesigner.viewer.IDropLocationStrategy;
-import org.w3c.dom.Element;
-
-/**
- * @author mengbo
- * @version 1.5
- */
-public class ColumnElementEdit extends DefaultJSFHTMLElementEdit
-{
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.pagedesigner.elementedit.AbstractElementEdit#handleModelChange(org.w3c.dom.Element, org.eclipse.jst.pagedesigner.parts.ElementEditPart)
- */
- public boolean handleModelChange(Element ele, ElementEditPart part, boolean recursive)
- {
- EditPart parent = part.getParent();
- if (parent instanceof ElementEditPart)
- {
- ((ElementEditPart) parent).refreshModelChange(recursive);
- return true;
- }
- return false;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.pagedesigner.elementedit.IElementEdit#createEditPolicies(org.eclipse.jst.pagedesigner.parts.ElementEditPart)
- */
- public void createEditPolicies(ElementEditPart part)
- {
- part.installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new ColumnResizableEditPolicy());
- }
-
- public IDropLocationStrategy getDropRequestorLocationStrategy(TagIdentifier tag, EditPartViewer viewer) {
- return new MyDropLocationStrategy(viewer);
- }
-
- private static class MyDropLocationStrategy extends DefaultDropLocationStrategy
- {
- /**
- * @param viewer
- */
- public MyDropLocationStrategy(EditPartViewer viewer) {
- super(viewer);
- }
-
- public DesignPosition calculateDesignPosition(EditPart target,
- Point p, IPositionMediator validator)
- {
- // get the nearest ancestor part to target that is
- // editable or target if it is editable
- target = validator.getEditableContainer(new Target(target));
-
- // target must be an element part
- if (target instanceof ElementEditPart)
- {
- // can only try to drop a column into a table. If we are
- // targetting a column, then we can see if its table will take it
- TagIdentifier tagId = ((ElementEditPart)target).getTagIdentifier();
-
- if (IJSFConstants.TAG_IDENTIFIER_DATA_TABLE.isSameTagType(tagId))
- {
- // if we're on the table, try to figure out which column we are above
- for (Iterator it = target.getChildren().iterator(); it.hasNext();)
- {
- final NodeEditPart nodeEditPart = (NodeEditPart) it.next();
- TagIdentifier tagId2 = nodeEditPart.getTagIdentifier();
-
- if (IJSFConstants.TAG_IDENTIFIER_COLUMN.isSameTagType(tagId2))
- {
- final Rectangle columnBounds =
- ColumnHelper.getAdjustedColumnBoundingRectangle(nodeEditPart);
- if (columnBounds.contains(p))
- {
- target = nodeEditPart;
- break;
- }
- }
- }
- }
-
- // recalculate the id because it may have changed
- tagId = ((ElementEditPart)target).getTagIdentifier();
-
- if (IJSFConstants.TAG_IDENTIFIER_COLUMN.isSameTagType(tagId))
- {
- DesignPosition position = null;
- final Rectangle columnBounds =
- ColumnHelper.getAdjustedColumnBoundingRectangle((GraphicalEditPart) target);
- if (CaretPositionResolver.toXMiddle(columnBounds, p) < 0)
- {
- position = DesignPosition.createPositionBeforePart(target);
- }
- else
- {
- position = DesignPosition.createPositionAfterPart(target);
- }
-
-
- if (validator.isValidPosition(position))
- {
- return position;
- }
- }
- }
-
- // otherwise, no valid position
- return null;
- }
-
- protected Rectangle createCaretBounds(DesignPosition position) {
- Rectangle bounds = super.createCaretBounds(position);
-
- // we want to extend the insert caret to be the height of the column container (i.e. dataTable)
- // and positioned so it starts at the top of the container in the column where the insertion will occur
- GraphicalEditPart parent =
- (GraphicalEditPart) position.getContainerPart();
- Rectangle containerBounds = parent.getFigure().getBounds().getCopy();
- parent.getFigure().translateToAbsolute(containerBounds);
- bounds.height = containerBounds.height;
- bounds.y = containerBounds.y;
- return bounds;
- }
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/elementedit/jsfhtml/DataTableElementEdit.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/elementedit/jsfhtml/DataTableElementEdit.java
deleted file mode 100644
index 5025fb4..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/elementedit/jsfhtml/DataTableElementEdit.java
+++ /dev/null
@@ -1,487 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http:// www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.pagedesigner.jsf.ui.elementedit.jsfhtml;
-
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.gef.DragTracker;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.GraphicalEditPart;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.requests.DropRequest;
-import org.eclipse.gef.requests.LocationRequest;
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.action.IMenuListener;
-import org.eclipse.jface.action.IMenuManager;
-import org.eclipse.jface.action.MenuManager;
-import org.eclipse.jface.action.Separator;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jst.jsf.common.dom.TagIdentifier;
-import org.eclipse.jst.jsf.core.internal.tld.IJSFConstants;
-import org.eclipse.jst.pagedesigner.actions.single.SelectEditPartAction;
-import org.eclipse.jst.pagedesigner.editors.PageDesignerActionConstants;
-import org.eclipse.jst.pagedesigner.editpolicies.DragMoveEditPolicy;
-import org.eclipse.jst.pagedesigner.editpolicies.ElementResizableEditPolicy;
-import org.eclipse.jst.pagedesigner.jsf.core.dom.JSFDOMUtil;
-import org.eclipse.jst.pagedesigner.jsf.ui.JSFUIPlugin;
-import org.eclipse.jst.pagedesigner.jsf.ui.actions.DeleteHColumnHeaderFooterAction;
-import org.eclipse.jst.pagedesigner.jsf.ui.actions.DeleteHeaderFooterAction;
-import org.eclipse.jst.pagedesigner.jsf.ui.actions.InsertHColumnHeaderFooterAction;
-import org.eclipse.jst.pagedesigner.jsf.ui.actions.InsertHeaderFooterAction;
-import org.eclipse.jst.pagedesigner.jsf.ui.commands.jsfhtml.DataTableDeleteColumnCommand;
-import org.eclipse.jst.pagedesigner.jsf.ui.commands.jsfhtml.DataTableDeleteColumnHeaderCommand;
-import org.eclipse.jst.pagedesigner.jsf.ui.commands.jsfhtml.DataTableDeleteHeaderCommand;
-import org.eclipse.jst.pagedesigner.jsf.ui.commands.jsfhtml.DataTableInsertColumnCommand;
-import org.eclipse.jst.pagedesigner.jsf.ui.commands.jsfhtml.DataTableInsertColumnHeaderCommand;
-import org.eclipse.jst.pagedesigner.jsf.ui.commands.jsfhtml.DataTableInsertHeaderCommand;
-import org.eclipse.jst.pagedesigner.jsf.ui.elementedit.request.DeleteHColumnHeaderFooterRequest;
-import org.eclipse.jst.pagedesigner.jsf.ui.elementedit.request.DeleteHeaderFooterRequest;
-import org.eclipse.jst.pagedesigner.jsf.ui.elementedit.request.InsertHColumnHeaderFooterRequest;
-import org.eclipse.jst.pagedesigner.jsf.ui.elementedit.request.InsertHeaderFooterRequest;
-import org.eclipse.jst.pagedesigner.jsf.ui.elementedit.util.DataTableUtil;
-import org.eclipse.jst.pagedesigner.parts.ElementEditPart;
-import org.eclipse.jst.pagedesigner.parts.NodeEditPart;
-import org.eclipse.jst.pagedesigner.tableedit.DeleteRowColumnAction;
-import org.eclipse.jst.pagedesigner.tableedit.InsertRowColumnAction;
-import org.eclipse.jst.pagedesigner.tableedit.TableInsertRequest;
-import org.eclipse.jst.pagedesigner.tableedit.TableResizeRequest;
-import org.eclipse.jst.pagedesigner.tableedit.TableRowColumnDeleteRequest;
-import org.eclipse.jst.pagedesigner.tools.ObjectModeDragTracker;
-import org.eclipse.jst.pagedesigner.validation.caret.ActionData;
-import org.eclipse.jst.pagedesigner.validation.caret.DefaultPositionRule;
-import org.eclipse.jst.pagedesigner.validation.caret.DnDPositionValidator;
-import org.eclipse.jst.pagedesigner.validation.caret.DropActionData;
-import org.eclipse.jst.pagedesigner.validation.caret.IPositionMediator;
-import org.eclipse.jst.pagedesigner.validation.caret.Target;
-import org.eclipse.jst.pagedesigner.validation.caret.DropActionData.DropData;
-import org.eclipse.jst.pagedesigner.viewer.IHTMLGraphicalViewer;
-import org.eclipse.swt.graphics.Cursor;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMElement;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-
-/**
- * @author mengbo
- * @version 1.5
- */
-public class DataTableElementEdit extends DefaultJSFHTMLElementEdit
-{
- private final static Action EMPTY_ACTION = new Action()
- {
- // TODO: why?
- };
- private final static int FAKE_INDEX = -10;
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.pagedesigner.elementedit.IElementEdit#fillContextMenu(org.eclipse.jface.action.IMenuManager, org.w3c.dom.Element)
- */
- public void fillContextMenu(IMenuManager contextMenu, Element ele)
- {
- super.fillContextMenu(contextMenu, ele);
-
- final IMenuManager tableMenu = new MenuManager(JSFUIPlugin.getResourceString("ElementEdit.Submenu.DataTable"));//$NON-NLS-1$
- final ElementEditPart editPart = (ElementEditPart) ((IDOMElement) ele).getAdapterFor(EditPart.class);
- // ok, we passed the checking, now let's create the actions.
- tableMenu.add(EMPTY_ACTION);
- tableMenu.addMenuListener(new IMenuListener()
- {
- public void menuAboutToShow(IMenuManager manager)
- {
- tableMenu.removeAll();
- fillTableMenu(editPart, FAKE_INDEX, tableMenu);
- }
- });
-
- contextMenu.appendToGroup(PageDesignerActionConstants.GROUP_CONTAINER, tableMenu);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.pagedesigner.elementedit.IElementEdit#fillContainerContextMenu(org.eclipse.jface.action.IMenuManager, org.eclipse.jst.pagedesigner.parts.ElementEditPart, org.eclipse.jst.pagedesigner.parts.NodeEditPart, org.eclipse.jface.viewers.ISelection)
- */
- public boolean fillContainerContextMenu(IMenuManager contextMenu, final ElementEditPart elePart,
- NodeEditPart nodePart, ISelection innerSelection)
- {
- Element table = (Element) elePart.getModel();
- Node node = (Node) nodePart.getModel();
-
- DataTableUtil util = new DataTableUtil(table);
- Element columnParent = util.findHColumnParent(node);
-
- final int cellColumn = util.getColumnIndex(columnParent);
-
- final IMenuManager tableMenu = new MenuManager(JSFUIPlugin.getResourceString("ElementEdit.Submenu.DataTable"));//$NON-NLS-1$
-
- // ok, we passed the checking, now let's create the actions.
- tableMenu.add(EMPTY_ACTION);
- tableMenu.addMenuListener(new IMenuListener()
- {
- public void menuAboutToShow(IMenuManager manager)
- {
- tableMenu.removeAll();
- fillTableMenu(elePart, cellColumn, tableMenu);
- }
- });
-
- contextMenu.appendToGroup(PageDesignerActionConstants.GROUP_CONTAINER, tableMenu);
- return true;
-
- }
-
- /**
- * @param elePart
- * @param cellColumn
- * @param tableMenu
- */
- private void fillTableMenu(ElementEditPart elePart, int cellColumn, IMenuManager tableMenu)
- {
- SelectEditPartAction action = SelectEditPartAction.create(JSFUIPlugin
- .getResourceString("ElementEdit.Submenu.DataTable.SelectTable"), elePart);//$NON-NLS-1$
- tableMenu.add(action);
-
- tableMenu.add(new Separator());
-
- {
- InsertRowColumnAction insertColumnBeforeAction = new InsertRowColumnAction(JSFUIPlugin
- .getResourceString("ElementEdit.Submenu.DataTable.InsertColumnBefore"), //$NON-NLS-1$
- elePart, cellColumn, false, true);
- tableMenu.add(insertColumnBeforeAction);
-
- InsertRowColumnAction insertColumnAfterAction = new InsertRowColumnAction(JSFUIPlugin
- .getResourceString("ElementEdit.Submenu.DataTable.InsertColumnAfter"),//$NON-NLS-1$
- elePart, cellColumn, false, false);
- tableMenu.add(insertColumnAfterAction);
-
- tableMenu.add(new Separator());
- }
-
- {
- DeleteRowColumnAction deleteColumnAction = new DeleteRowColumnAction(JSFUIPlugin
- .getResourceString("ElementEdit.Submenu.DataTable.DeleteColumn"), //$NON-NLS-1$
- elePart, cellColumn, false);
- tableMenu.add(deleteColumnAction);
- tableMenu.add(new Separator());
- }
-
- {
- InsertHeaderFooterAction headerAction = new InsertHeaderFooterAction(JSFUIPlugin
- .getResourceString("ElementEdit.Submenu.InsertTableHeader"), elePart, true);//$NON-NLS-1$
- tableMenu.add(headerAction);
-
- InsertHeaderFooterAction footerAction = new InsertHeaderFooterAction(JSFUIPlugin
- .getResourceString("ElementEdit.Submenu.InsertTableFooter"), elePart, false);//$NON-NLS-1$
- tableMenu.add(footerAction);
-
- DeleteHeaderFooterAction delHeaderAction = new DeleteHeaderFooterAction(JSFUIPlugin
- .getResourceString("ElementEdit.Submenu.DeleteTableHeader"), elePart, true);//$NON-NLS-1$
- tableMenu.add(delHeaderAction);
-
- DeleteHeaderFooterAction delFooterAction = new DeleteHeaderFooterAction(JSFUIPlugin
- .getResourceString("ElementEdit.Submenu.DeleteTableFooter"), elePart, false);//$NON-NLS-1$
- tableMenu.add(delFooterAction);
- tableMenu.add(new Separator());
- }
-
- {
- InsertHColumnHeaderFooterAction hColHeaderAction = new InsertHColumnHeaderFooterAction(JSFUIPlugin
- .getResourceString("ElementEdit.Submenu.InsertColumnHeader"),//$NON-NLS-1$
- elePart, true);
- tableMenu.add(hColHeaderAction);
-
- InsertHColumnHeaderFooterAction hColFooterAction = new InsertHColumnHeaderFooterAction(JSFUIPlugin
- .getResourceString("ElementEdit.Submenu.InsertColumnFooter"),//$NON-NLS-1$
- elePart, false);
- tableMenu.add(hColFooterAction);
-
- DeleteHColumnHeaderFooterAction delColHeader = new DeleteHColumnHeaderFooterAction(JSFUIPlugin
- .getResourceString("ElementEdit.Submenu.DeleteColumnHeader"),//$NON-NLS-1$
- elePart, true);
- tableMenu.add(delColHeader);
-
- DeleteHColumnHeaderFooterAction delColFooter = new DeleteHColumnHeaderFooterAction(JSFUIPlugin
- .getResourceString("ElementEdit.Submenu.DeleteColumnFooter"),//$NON-NLS-1$
- elePart, false);
- tableMenu.add(delColFooter);
- }
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.pagedesigner.elementedit.IElementEdit#createEditPolicies(org.eclipse.jst.pagedesigner.parts.ElementEditPart)
- */
- public void createEditPolicies(ElementEditPart part)
- {
- part.installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new DataTableResizePolicy(part));
- part.installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE,
- new MyDragMoveEditPolicy());
- }
-
- static class DataTableResizePolicy extends ElementResizableEditPolicy
- {
- private static final String COLUMN_SELECT_IMAGE_FILE = "column_select.gif"; //$NON-NLS-1$
-
- ElementEditPart _part;
- Cursor _columnSelectCursor;
-
- /**
- * @param part
- */
- public DataTableResizePolicy(ElementEditPart part)
- {
- _part = part;
- }
-
- public void deactivate() {
- super.deactivate();
- if (_columnSelectCursor != null && !_columnSelectCursor.isDisposed())
- {
- _columnSelectCursor.dispose();
- _columnSelectCursor = null;
- }
- }
-
- private Cursor getColumnSelectCursor()
- {
- if (_columnSelectCursor == null)
- {
- final Image cursorImage = JSFUIPlugin.getDefault().getImage(COLUMN_SELECT_IMAGE_FILE);
- _columnSelectCursor = new Cursor(null, cursorImage.getImageData(), 2, 5);
- }
-
- return _columnSelectCursor;
- }
- /* (non-Javadoc)
- * @see org.eclipse.gef.editpolicies.ResizableEditPolicy#getCommand(org.eclipse.gef.Request)
- */
- public Command getCommand(Request request)
- {
- IHTMLGraphicalViewer viewer = (IHTMLGraphicalViewer) _part.getViewer();
- Element dataTable = (Element) _part.getIDOMNode();
- if (request instanceof TableResizeRequest)
- {
- return super.getCommand(request);
- }
- else if (request instanceof TableInsertRequest)
- {
- TableInsertRequest tableInsertRequest = (TableInsertRequest) request;
- if (tableInsertRequest.isRow())
- {
- // don't support insert row.
- return null;
- }
- int index = tableInsertRequest.getIndex() + (tableInsertRequest.isBefore() ? 0 : 1);
- return new DataTableInsertColumnCommand(viewer, dataTable, index);
- }
- else if (request instanceof InsertHeaderFooterRequest)
- {
- InsertHeaderFooterRequest req = (InsertHeaderFooterRequest) request;
- boolean isHeader = req.isHeader();
- return new DataTableInsertHeaderCommand(viewer, dataTable, isHeader);
- }
- else if (request instanceof DeleteHeaderFooterRequest)
- {
- DeleteHeaderFooterRequest req = (DeleteHeaderFooterRequest) request;
- boolean isHeader = req.isHeader();
- return new DataTableDeleteHeaderCommand(viewer, dataTable, isHeader);
- }
- else if (request instanceof InsertHColumnHeaderFooterRequest)
- {
- InsertHColumnHeaderFooterRequest req = (InsertHColumnHeaderFooterRequest) request;
- boolean isHeader = req.isHeader();
- return new DataTableInsertColumnHeaderCommand(viewer, dataTable, isHeader);
- }
- else if (request instanceof DeleteHColumnHeaderFooterRequest)
- {
- DeleteHColumnHeaderFooterRequest req = (DeleteHColumnHeaderFooterRequest) request;
- boolean isHeader = req.isHeader();
- return new DataTableDeleteColumnHeaderCommand(viewer, dataTable, isHeader);
- }
- else if (request instanceof TableRowColumnDeleteRequest)
- {
- TableRowColumnDeleteRequest deleteReq = (TableRowColumnDeleteRequest) request;
- if (deleteReq.isRow())
- {
- return null;
- }
- return new DataTableDeleteColumnCommand(viewer, dataTable, deleteReq.getIndex());
- }
- return super.getCommand(request);
- }
-
- public Cursor getSelectionToolCursor(Point mouseLocation)
- {
- if (hitTestColumnSelection(mouseLocation))
- {
- return getColumnSelectCursor();
- }
-
- return null;
- }
-
- protected DragTracker getSelectionTracker(LocationRequest request) {
- final Point mouseLocator = request.getLocation();
- if (hitTestColumnSelection(mouseLocator))
- {
- ObjectModeDragTracker dragTracker = new ObjectModeDragTracker(getHost())
- {
- protected boolean handleButtonDown(int button)
- {
- // only customize the case where we are in a column selection mode
- if (button == 1)
- {
- EditPart retarget =
- getRetargetSelectionEditPart(mouseLocator);
-
- if (retarget != null)
- {
- setSourceEditPart(retarget);
- }
- }
-
- // default
- return super.handleButtonDown(button);
- }
- };
-
- dragTracker.setDefaultCursor(getSelectionToolCursor(mouseLocator));
- return dragTracker;
- }
- return new ObjectModeDragTracker(getHost());
- }
-
- public DragTracker getSelectionDragTracker(LocationRequest request) {
- return getSelectionTracker(request);
- }
-
- /**
- * @param mouseLocation
- * @return the edit part fo the given mouse location
- */
- public EditPart getRetargetSelectionEditPart(Point mouseLocation) {
- if (hitTestColumnSelection(mouseLocation))
- {
- GraphicalEditPart editPart = (GraphicalEditPart) getHost();
- List children = editPart.getChildren();
-
- for (Iterator it = children.iterator(); it.hasNext();)
- {
- GraphicalEditPart child = (GraphicalEditPart) it.next();
-
- if (child instanceof NodeEditPart)
- {
- Node childNode = ((NodeEditPart)child).getDOMNode();
-
- if (JSFDOMUtil.isHColumn(childNode))
- {
- Point relativeMousePointer = mouseLocation.getCopy();
- IFigure hostFigure = child.getFigure();
- hostFigure.translateToRelative(relativeMousePointer);
- Rectangle hostBounds = hostFigure.getBounds();
- if (relativeMousePointer.x >= hostBounds.x
- && relativeMousePointer.x < hostBounds.x+hostBounds.width)
- {
- return child;
- }
- }
- }
- }
- }
-
- // otherwise, don't retarget
- return null;
- }
-
- private boolean hitTestColumnSelection(Point mouseLocation)
- {
- final GraphicalEditPart part = (GraphicalEditPart) getHost();
- final IFigure panelFigure = part.getFigure();
-
- Point relativeLocation = mouseLocation.getCopy();
- panelFigure.translateToRelative(relativeLocation);
-
- final int yoffsetAbs = Math.abs(panelFigure.getBounds().y - relativeLocation.y);
-
- if (yoffsetAbs <= 4)
- {
- return true;
- }
-
- return false;
- }
- }
-
- /**
- * @author cbateman
- *
- */
- public static class MyDragMoveEditPolicy extends DragMoveEditPolicy
- {
- protected IPositionMediator createDropChildValidator(
- DropRequest r)
- {
- DropData dropData = createDropData(r);
-
- if (dropData!=null)
- {
- DnDPositionValidator validator =
- new DnDPositionValidator(new DropActionData(
- ActionData.COMPONENT_MOVE, dropData));
- validator.addRule(new OnlyColumnsAndFacetsRule(validator.getActionData()));
- return validator;
- }
- return null;
- }
-
- private static class OnlyColumnsAndFacetsRule extends DefaultPositionRule
- {
- /**
- * @param actionData
- */
- public OnlyColumnsAndFacetsRule(ActionData actionData) {
- super(actionData);
- }
-
- public boolean isEditable(Target target) {
- if (IJSFConstants.TAG_IDENTIFIER_DATA_TABLE.isSameTagType(target.getTagWrapper()))
- {
- return isDataDroppable();
- }
-
- return true;
- }
-
- private boolean isDataDroppable()
- {
- ActionData actionData = getActionData();
- if (actionData instanceof DropActionData)
- {
- DropActionData dropActionData = (DropActionData) actionData;
- TagIdentifier tagId =
- (TagIdentifier) dropActionData.getDropData().getTagIdentifiers().get(0);
-
- if (IJSFConstants.TAG_IDENTIFIER_FACET.isSameTagType(tagId)
- || IJSFConstants.TAG_IDENTIFIER_COLUMN.isSameTagType(tagId))
- {
- return true;
- }
- }
-
- return false;
- }
- }
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/elementedit/jsfhtml/DefaultJSFHTMLElementEdit.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/elementedit/jsfhtml/DefaultJSFHTMLElementEdit.java
deleted file mode 100644
index acfc346..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/elementedit/jsfhtml/DefaultJSFHTMLElementEdit.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http:// www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.pagedesigner.jsf.ui.elementedit.jsfhtml;
-
-import org.eclipse.jface.action.IMenuManager;
-import org.eclipse.jst.pagedesigner.elementedit.AbstractElementEdit;
-import org.eclipse.jst.pagedesigner.jsf.ui.actions.IJSFCoreSupport;
-import org.eclipse.jst.pagedesigner.jsf.ui.actions.JSFAddActionGroup;
-import org.eclipse.jst.pagedesigner.jsf.ui.actions.JSFNavigationGroup;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMElement;
-import org.w3c.dom.Element;
-
-
-/**
- * @author mengbo
- * @version 1.5
- */
-public class DefaultJSFHTMLElementEdit extends AbstractElementEdit
-{
- /* (non-Javadoc)
- * @see org.eclipse.jst.pagedesigner.elementedit.AbstractElementEdit#fillContextMenu(org.eclipse.jface.action.IMenuManager, org.w3c.dom.Element)
- */
- public void fillContextMenu(IMenuManager contextMenu, Element ele)
- {
- super.fillContextMenu(contextMenu, ele);
-
- // next are JSF HTML special support.
- new JSFAddActionGroup().fillContextMenu(contextMenu, (IDOMElement) ele, new JSFCoreSupport(ele.getLocalName()));
- new JSFNavigationGroup().fillContextMenu(contextMenu, (IDOMElement) ele, new JSFCoreSupport(ele.getLocalName()));
- }
-
- static class JSFCoreSupport implements IJSFCoreSupport
- {
- String _localName;
-
- /**
- * @param localtag
- */
- public JSFCoreSupport(String localtag)
- {
- _localName = localtag;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.pagedesigner.jsf.actions.IJSFCoreSupport#isActionSource()
- */
- public boolean isActionSource()
- {
- // UICommand.
- return _localName.startsWith("command"); //$NON-NLS-1$
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.pagedesigner.jsf.actions.IJSFCoreSupport#isUIComponent()
- */
- public boolean isUIComponent()
- {
- return true;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.pagedesigner.jsf.actions.IJSFCoreSupport#isValueHolder()
- */
- public boolean isValueHolder()
- {
- // UIOutput
- return _localName.startsWith("output") || _localName.startsWith("input") //$NON-NLS-1$ //$NON-NLS-2$
- || _localName.startsWith("select"); //$NON-NLS-1$
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.pagedesigner.jsf.actions.IJSFCoreSupport#isEditableValueHolder()
- */
- public boolean isEditableValueHolder()
- {
- // UIInput
- return _localName.startsWith("input") || _localName.startsWith("select"); //$NON-NLS-1$ //$NON-NLS-2$
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.pagedesigner.jsf.actions.IJSFCoreSupport#supportSelectItems()
- */
- public boolean supportSelectItems()
- {
- return _localName.startsWith("select"); //$NON-NLS-1$
- }
-
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/elementedit/jsfhtml/JSFHTMLElementEditFactory.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/elementedit/jsfhtml/JSFHTMLElementEditFactory.java
deleted file mode 100644
index ebae8db..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/elementedit/jsfhtml/JSFHTMLElementEditFactory.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http:// www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.pagedesigner.jsf.ui.elementedit.jsfhtml;
-
-import org.eclipse.jst.jsf.common.dom.TagIdentifier;
-import org.eclipse.jst.jsf.core.internal.tld.IJSFConstants;
-import org.eclipse.jst.jsf.core.internal.tld.ITLDConstants;
-import org.eclipse.jst.pagedesigner.elementedit.IElementEdit;
-import org.eclipse.jst.pagedesigner.elementedit.IElementEditFactory;
-
-/**
- * @author mengbo
- * @version 1.5
- */
-public class JSFHTMLElementEditFactory implements IElementEditFactory
-{
- /* (non-Javadoc)
- * @see org.eclipse.jst.pagedesigner.elementedit.IElementEditFactory#createElementEdit(org.w3c.dom.Element)
- */
- public IElementEdit createElementEdit(final TagIdentifier tagIdentifier)
- {
- if (IJSFConstants.TAG_IDENTIFIER_DATA_TABLE.isSameTagType(tagIdentifier))
- {
- return new DataTableElementEdit();
- }
- else if (IJSFConstants.TAG_IDENTIFIER_PANEL_GRID.isSameTagType(tagIdentifier))
- {
- return new PanelGridElementEdit();
- }
- else if (IJSFConstants.TAG_IDENTIFIER_COLUMN.isSameTagType(tagIdentifier))
- {
- return new ColumnElementEdit();
- }
- return new DefaultJSFHTMLElementEdit();
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.pagedesigner.elementedit.IElementEditFactory#getSupportedURI()
- */
- public String getSupportedURI()
- {
- return ITLDConstants.URI_JSF_HTML;
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/elementedit/jsfhtml/PanelGridElementEdit.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/elementedit/jsfhtml/PanelGridElementEdit.java
deleted file mode 100644
index 6719607..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/elementedit/jsfhtml/PanelGridElementEdit.java
+++ /dev/null
@@ -1,322 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http:// www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.pagedesigner.jsf.ui.elementedit.jsfhtml;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.GraphicalEditPart;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.SharedCursors;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.action.IMenuListener;
-import org.eclipse.jface.action.IMenuManager;
-import org.eclipse.jface.action.MenuManager;
-import org.eclipse.jface.action.Separator;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jst.jsf.core.internal.tld.IJSFConstants;
-import org.eclipse.jst.pagedesigner.actions.single.SelectEditPartAction;
-import org.eclipse.jst.pagedesigner.editors.PageDesignerActionConstants;
-import org.eclipse.jst.pagedesigner.editpolicies.ElementResizableEditPolicy;
-import org.eclipse.jst.pagedesigner.jsf.ui.JSFUIPlugin;
-import org.eclipse.jst.pagedesigner.jsf.ui.actions.DeleteHeaderFooterAction;
-import org.eclipse.jst.pagedesigner.jsf.ui.actions.InsertHeaderFooterAction;
-import org.eclipse.jst.pagedesigner.jsf.ui.commands.jsfhtml.DataTableDeleteHeaderCommand;
-import org.eclipse.jst.pagedesigner.jsf.ui.commands.jsfhtml.PanelGridDeleteColumnCommand;
-import org.eclipse.jst.pagedesigner.jsf.ui.commands.jsfhtml.PanelGridDeleteRowCommand;
-import org.eclipse.jst.pagedesigner.jsf.ui.commands.jsfhtml.PanelGridInsertColumnCommand;
-import org.eclipse.jst.pagedesigner.jsf.ui.commands.jsfhtml.PanelGridInsertFooterCommand;
-import org.eclipse.jst.pagedesigner.jsf.ui.commands.jsfhtml.PanelGridInsertHeaderCommand;
-import org.eclipse.jst.pagedesigner.jsf.ui.commands.jsfhtml.PanelGridInsertRowCommand;
-import org.eclipse.jst.pagedesigner.jsf.ui.elementedit.request.DeleteHeaderFooterRequest;
-import org.eclipse.jst.pagedesigner.jsf.ui.elementedit.request.InsertHeaderFooterRequest;
-import org.eclipse.jst.pagedesigner.jsf.ui.elementedit.util.PanelGridUtil;
-import org.eclipse.jst.pagedesigner.parts.ElementEditPart;
-import org.eclipse.jst.pagedesigner.parts.NodeEditPart;
-import org.eclipse.jst.pagedesigner.tableedit.DeleteRowColumnAction;
-import org.eclipse.jst.pagedesigner.tableedit.InsertRowColumnAction;
-import org.eclipse.jst.pagedesigner.tableedit.TableInsertRequest;
-import org.eclipse.jst.pagedesigner.tableedit.TableResizeRequest;
-import org.eclipse.jst.pagedesigner.tableedit.TableRowColumnDeleteRequest;
-import org.eclipse.jst.pagedesigner.viewer.IHTMLGraphicalViewer;
-import org.eclipse.swt.graphics.Cursor;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMElement;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-
-/**
- * @author mengbo
- * @version 1.5
- */
-public class PanelGridElementEdit extends DefaultJSFHTMLElementEdit
-{
- private final static Action EMPTY_ACTION = new Action()
- {
- // TODO: why?
- };
- private final static int FAKE_INDEX = -10;
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.pagedesigner.elementedit.IElementEdit#fillContextMenu(org.eclipse.jface.action.IMenuManager, org.w3c.dom.Element)
- */
- public void fillContextMenu(IMenuManager contextMenu, Element ele)
- {
- super.fillContextMenu(contextMenu, ele);
-
- final IMenuManager tableMenu = new MenuManager(JSFUIPlugin.getResourceString("ElementEdit.Submenu.PanelGrid"));//$NON-NLS-1$
- tableMenu.add(EMPTY_ACTION);
- final ElementEditPart gridEditPart = (ElementEditPart) ((IDOMElement) ele).getAdapterFor(EditPart.class);
-
- // ok, we passed the checking, now let's create the actions.
- tableMenu.addMenuListener(new IMenuListener()
- {
- public void menuAboutToShow(IMenuManager manager)
- {
- tableMenu.removeAll();
- fillPanelGridMenu(gridEditPart, FAKE_INDEX, FAKE_INDEX, tableMenu);
- }
- });
-
- contextMenu.appendToGroup(PageDesignerActionConstants.GROUP_CONTAINER, tableMenu);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.pagedesigner.elementedit.IElementEdit#fillContainerContextMenu(org.eclipse.jface.action.IMenuManager, org.eclipse.jst.pagedesigner.parts.ElementEditPart, org.eclipse.jst.pagedesigner.parts.NodeEditPart, org.eclipse.jface.viewers.ISelection)
- */
- public boolean fillContainerContextMenu(IMenuManager contextMenu, final ElementEditPart elePart,
- NodeEditPart nodePart, ISelection innerSelection)
- {
- Element table = (Element) elePart.getModel();
- Node node = (Node) nodePart.getModel();
-
- Element childEle = null;
- if (node instanceof Element)
- {
- childEle = (Element) node;
- }
- else
- {
- boolean hasElementParent = false;
- Node nodeBackup = node;
- while (!IJSFConstants.TAG_PANELGRID.equalsIgnoreCase(nodeBackup.getParentNode().getLocalName()))
- {
- nodeBackup = nodeBackup.getParentNode();
- if (nodeBackup instanceof Element)
- {
- hasElementParent = true;
- break;
- }
- }
- if (!hasElementParent)
- {
- return false;
- }
- childEle = (Element) nodeBackup;
- }
-
- PanelGridUtil util = new PanelGridUtil(table);
- final int cellRow = util.convertRowIndexFromDomToView(util.getDomRowIndex(childEle));
- final int cellColumn = util.getDomColumnIndex(childEle);
-
- final IMenuManager tableMenu = new MenuManager(JSFUIPlugin.getResourceString("ElementEdit.Submenu.PanelGrid"));//$NON-NLS-1$
- tableMenu.add(EMPTY_ACTION);
-
- // ok, we passed the checking, now let's create the actions.
- tableMenu.addMenuListener(new IMenuListener()
- {
- public void menuAboutToShow(IMenuManager manager)
- {
- tableMenu.removeAll();
- fillPanelGridMenu(elePart, cellRow, cellColumn, tableMenu);
- }
- });
-
- contextMenu.appendToGroup(PageDesignerActionConstants.GROUP_CONTAINER, tableMenu);
- return true;
-
- }
-
- /**
- * @param elePart
- * @param cellRow
- * @param cellColumn
- * @param tableMenu
- */
- private void fillPanelGridMenu(ElementEditPart elePart, int cellRow, int cellColumn, IMenuManager tableMenu)
- {
- SelectEditPartAction action = SelectEditPartAction.create(JSFUIPlugin
- .getResourceString("ElementEdit.Submenu.PanelGrid.SelectTable"), elePart);//$NON-NLS-1$
- tableMenu.add(action);
-
- tableMenu.add(new Separator());
-
- {
- InsertRowColumnAction insertRowBeforeAction = new InsertRowColumnAction(JSFUIPlugin
- .getResourceString("ElementEdit.Submenu.PanelGrid.InsertRowBefore"), //$NON-NLS-1$
- elePart, cellRow, true, true);
- tableMenu.add(insertRowBeforeAction);
-
- InsertRowColumnAction insertRowAfterAction = new InsertRowColumnAction(JSFUIPlugin
- .getResourceString("ElementEdit.Submenu.PanelGrid.InsertRowAfter"), //$NON-NLS-1$
- elePart, cellRow, true, false);
- tableMenu.add(insertRowAfterAction);
-
- tableMenu.add(new Separator());
- }
-
- {
- InsertRowColumnAction insertColumnBeforeAction = new InsertRowColumnAction(JSFUIPlugin
- .getResourceString("ElementEdit.Submenu.PanelGrid.InsertColumnBefore"), //$NON-NLS-1$
- elePart, cellColumn, false, true);
- tableMenu.add(insertColumnBeforeAction);
-
- InsertRowColumnAction insertColumnAfterAction = new InsertRowColumnAction(JSFUIPlugin
- .getResourceString("ElementEdit.Submenu.PanelGrid.InsertColumnAfter"), //$NON-NLS-1$
- elePart, cellColumn, false, false);
- tableMenu.add(insertColumnAfterAction);
-
- tableMenu.add(new Separator());
- }
-
- {
- DeleteRowColumnAction deleteRowAction = new DeleteRowColumnAction(JSFUIPlugin
- .getResourceString("ElementEdit.Submenu.PanelGrid.DeleteRow"), //$NON-NLS-1$
- elePart, cellRow, true);
- tableMenu.add(deleteRowAction);
-
- DeleteRowColumnAction deleteColumnAction = new DeleteRowColumnAction(JSFUIPlugin
- .getResourceString("ElementEdit.Submenu.PanelGrid.DeleteColumn"), //$NON-NLS-1$
- elePart, cellColumn, false);
- tableMenu.add(deleteColumnAction);
- tableMenu.add(new Separator());
- }
-
- {
- InsertHeaderFooterAction headerAction = new InsertHeaderFooterAction(JSFUIPlugin
- .getResourceString("ElementEdit.Submenu.PanelGrid.InsertHeader"), //$NON-NLS-1$
- elePart, true);
- tableMenu.add(headerAction);
-
- InsertHeaderFooterAction footerAction = new InsertHeaderFooterAction(JSFUIPlugin
- .getResourceString("ElementEdit.Submenu.PanelGrid.InsertFooter"), //$NON-NLS-1$
- elePart, false);
- tableMenu.add(footerAction);
-
- DeleteHeaderFooterAction delHeaderAction = new DeleteHeaderFooterAction(JSFUIPlugin
- .getResourceString("ElementEdit.Submenu.PanelGird.DeleteHeader"), elePart, true);//$NON-NLS-1$
- tableMenu.add(delHeaderAction);
-
- DeleteHeaderFooterAction delFooterAction = new DeleteHeaderFooterAction(JSFUIPlugin
- .getResourceString("ElementEdit.Submenu.PanelGrid.DeleteFooter"), elePart, false);//$NON-NLS-1$
- tableMenu.add(delFooterAction);
- }
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.pagedesigner.elementedit.IElementEdit#createEditPolicies(org.eclipse.jst.pagedesigner.parts.ElementEditPart)
- */
- public void createEditPolicies(ElementEditPart part)
- {
- part.installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new PanelGridResizePolicy(part));
- }
-
- static class PanelGridResizePolicy extends ElementResizableEditPolicy
- {
- ElementEditPart _part;
-
- /**
- * @param part
- */
- public PanelGridResizePolicy(ElementEditPart part)
- {
- _part = part;
- }
-
- public Cursor getSelectionToolCursor(Point mouseLocation)
- {
- final GraphicalEditPart part = (GraphicalEditPart) getHost();
- final IFigure panelFigure = part.getFigure();
-
- Point relativeLocation = mouseLocation.getCopy();
- panelFigure.translateToRelative(relativeLocation);
-
- // row cursor if we are within +/- 2 pixels of the left side
- final int xoffsetAbs = Math.abs(panelFigure.getBounds().x - relativeLocation.x);
-
- if (xoffsetAbs <= 2)
- {
- return SharedCursors.SIZEE;
- }
-
- final int yoffsetAbs = Math.abs(panelFigure.getBounds().y - relativeLocation.y);
-
- if (yoffsetAbs <= 2)
- {
- return SharedCursors.SIZEW;
- }
-
- return null;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.gef.editpolicies.ResizableEditPolicy#getCommand(org.eclipse.gef.Request)
- */
- public Command getCommand(Request request)
- {
- IHTMLGraphicalViewer viewer = (IHTMLGraphicalViewer) _part.getViewer();
- Element panelGrid = (Element) _part.getIDOMNode();
- if (request instanceof TableResizeRequest)
- {
- return super.getCommand(request);
- }
- else if (request instanceof TableInsertRequest)
- {
- TableInsertRequest tableInsertRequest = (TableInsertRequest) request;
- if (tableInsertRequest.isRow())
- {
- int index = tableInsertRequest.getIndex() + (tableInsertRequest.isBefore() ? 0 : 1);
- return new PanelGridInsertRowCommand(viewer, panelGrid, index);
- }
- int index = tableInsertRequest.getIndex() + (tableInsertRequest.isBefore() ? 0 : 1);
- return new PanelGridInsertColumnCommand(viewer, panelGrid, index);
- }
- else if (request instanceof InsertHeaderFooterRequest)
- {
- InsertHeaderFooterRequest req = (InsertHeaderFooterRequest) request;
- boolean isHeader = req.isHeader();
- if (isHeader)
- {
- return new PanelGridInsertHeaderCommand(viewer, panelGrid);
- }
- return new PanelGridInsertFooterCommand(viewer, panelGrid);
- }
- else if (request instanceof DeleteHeaderFooterRequest)
- {
- DeleteHeaderFooterRequest req = (DeleteHeaderFooterRequest) request;
- boolean isHeader = req.isHeader();
- return new DataTableDeleteHeaderCommand(viewer, panelGrid, isHeader);
- }
- else if (request instanceof TableRowColumnDeleteRequest)
- {
- TableRowColumnDeleteRequest deleteReq = (TableRowColumnDeleteRequest) request;
- if (deleteReq.isRow())
- {
- return new PanelGridDeleteRowCommand(viewer, panelGrid, deleteReq.getIndex());
- }
- return new PanelGridDeleteColumnCommand(viewer, panelGrid, deleteReq.getIndex());
- }
- return super.getCommand(request);
- }
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/elementedit/request/DeleteHColumnHeaderFooterRequest.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/elementedit/request/DeleteHColumnHeaderFooterRequest.java
deleted file mode 100644
index 076fd74..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/elementedit/request/DeleteHColumnHeaderFooterRequest.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http:// www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.pagedesigner.jsf.ui.elementedit.request;
-
-import org.eclipse.gef.Request;
-
-/**
- * @author mengbo
- * @version 1.5
- */
-public class DeleteHColumnHeaderFooterRequest extends Request
-{
- private boolean _isHeader;
-
- /**
- * @param type
- * @param isHeader
- */
- public DeleteHColumnHeaderFooterRequest(String type, boolean isHeader)
- {
- super(type);
- this._isHeader = isHeader;
- }
-
- /**
- * @return Returns the _isHeader.
- */
- public boolean isHeader()
- {
- return _isHeader;
- }
-
- /**
- * @param header The _isHeader to set.
- */
- public void setHeader(boolean header)
- {
- _isHeader = header;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/elementedit/request/DeleteHeaderFooterRequest.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/elementedit/request/DeleteHeaderFooterRequest.java
deleted file mode 100644
index d935652..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/elementedit/request/DeleteHeaderFooterRequest.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http:// www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.pagedesigner.jsf.ui.elementedit.request;
-
-import org.eclipse.gef.Request;
-
-/**
- * @author mengbo
- * @version 1.5
- */
-public class DeleteHeaderFooterRequest extends Request
-{
- private boolean _isHeader;
-
- /**
- * @param type
- * @param isHeader
- */
- public DeleteHeaderFooterRequest(String type, boolean isHeader)
- {
- super(type);
- this._isHeader = isHeader;
- }
-
- /**
- * @return Returns the _isHeader.
- */
- public boolean isHeader()
- {
- return _isHeader;
- }
-
- /**
- * @param header The _isHeader to set.
- */
- public void setHeader(boolean header)
- {
- _isHeader = header;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/elementedit/request/InsertHColumnHeaderFooterRequest.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/elementedit/request/InsertHColumnHeaderFooterRequest.java
deleted file mode 100644
index 34e3d4a..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/elementedit/request/InsertHColumnHeaderFooterRequest.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http:// www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.pagedesigner.jsf.ui.elementedit.request;
-
-import org.eclipse.gef.Request;
-
-/**
- * @author mengbo
- * @version 1.5
- */
-public class InsertHColumnHeaderFooterRequest extends Request
-{
- private boolean _isHeader;
-
- /**
- * @param type
- * @param isHeader
- */
- public InsertHColumnHeaderFooterRequest(String type, boolean isHeader)
- {
- super(type);
- this._isHeader = isHeader;
- }
-
- /**
- * @return Returns the _isHeader.
- */
- public boolean isHeader()
- {
- return _isHeader;
- }
-
- /**
- * @param header The _isHeader to set.
- */
- public void setHeader(boolean header)
- {
- _isHeader = header;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/elementedit/request/InsertHeaderFooterRequest.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/elementedit/request/InsertHeaderFooterRequest.java
deleted file mode 100644
index 31e853f..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/elementedit/request/InsertHeaderFooterRequest.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http:// www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.pagedesigner.jsf.ui.elementedit.request;
-
-import org.eclipse.gef.Request;
-
-/**
- * @author mengbo
- * @version 1.5
- */
-public class InsertHeaderFooterRequest extends Request
-{
- private boolean _isHeader;
-
- /**
- * @param type
- * @param isHeader
- */
- public InsertHeaderFooterRequest(String type, boolean isHeader)
- {
- super(type);
- this._isHeader = isHeader;
- }
-
- /**
- * @return Returns the _isHeader.
- */
- public boolean isHeader()
- {
- return _isHeader;
- }
-
- /**
- * @param header The _isHeader to set.
- */
- public void setHeader(boolean header)
- {
- _isHeader = header;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/elementedit/util/DataTableUtil.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/elementedit/util/DataTableUtil.java
deleted file mode 100644
index 15c08ad..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/elementedit/util/DataTableUtil.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http:// www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.pagedesigner.jsf.ui.elementedit.util;
-
-import org.eclipse.jst.jsf.core.internal.tld.IJSFConstants;
-import org.eclipse.jst.pagedesigner.jsf.core.dom.JSFDOMUtil;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-
-/**
- * @author mengbo
- * @version 1.5
- */
-public class DataTableUtil
-{
- private static final int INVALID_POSITION = -10;
- private Element _dataTable = null;
-
- /**
- * @param dataTable
- */
- public DataTableUtil(Element dataTable)
- {
- this._dataTable = dataTable;
- }
-
- /**
- * @param column
- * @return the column index for column
- */
- public int getColumnIndex(Element column)
- {
- NodeList nodeList = this._dataTable.getElementsByTagName("h:column"); //$NON-NLS-1$
- if (nodeList != null)
- {
- for (int i = 0, size = nodeList.getLength(); i < size; i++)
- {
- if (column == (Element) nodeList.item(i))
- {
- return i;
- }
- }
- }
- return INVALID_POSITION;
- }
-
- /**
- * @param child
- * @return the hcolumn parent of child or null if not found
- */
- public Element findHColumnParent(Node child)
- {
- if (child == null)
- {
- return null;
- }
-
- Node childBackup = child;
- boolean hasHColumnParent = false;
-
- if (JSFDOMUtil.isHColumn(child))
- {
- return (Element) child;
- }
- while (!IJSFConstants.TAG_DATATABLE.equalsIgnoreCase(childBackup.getParentNode().getLocalName()))
- {
- childBackup = childBackup.getParentNode();
- String tagName = childBackup.getLocalName();
- if (IJSFConstants.TAG_COLUMN.equalsIgnoreCase(tagName))
- {
- hasHColumnParent = true;
- break;
- }
- }
-
- if (hasHColumnParent)
- {
- return (Element) childBackup;
- }
- return null;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/elementedit/util/PanelGridUtil.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/elementedit/util/PanelGridUtil.java
deleted file mode 100644
index 8c19239..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/elementedit/util/PanelGridUtil.java
+++ /dev/null
@@ -1,184 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http:// www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.pagedesigner.jsf.ui.elementedit.util;
-
-import java.util.List;
-
-import org.eclipse.jst.jsf.core.internal.tld.IJSFConstants;
-import org.eclipse.jst.pagedesigner.jsf.core.dom.JSFDOMUtil;
-import org.w3c.dom.Element;
-
-import org.eclipse.jst.pagedesigner.utils.DOMUtil;
-
-/**
- * @author mengbo
- * @version 1.5
- */
-public class PanelGridUtil
-{
- private static final int INVALID_POSITION = -10;
- private Element _panelGrid = null;
-
- /**
- * @param panelGrid
- */
- public PanelGridUtil(Element panelGrid)
- {
- this._panelGrid = panelGrid;
- }
-
- /**
- * @param domIndex
- * @return the row index in the panel of the relative dom index
- */
- public int convertRowIndexFromDomToView(int domIndex)
- {
- boolean hasHeaderRow = (JSFDOMUtil.findFacet(this._panelGrid, "header") != null); //$NON-NLS-1$
- boolean hasFooterRow = (JSFDOMUtil.findFacet(this._panelGrid, "footer") != null); //$NON-NLS-1$
- if (!hasFooterRow)
- {
- return domIndex;
- }
- if (domIndex == 0)
- {
- return domIndex;
- }
- if (hasHeaderRow)
- {
- if (domIndex > 1)
- {
- return domIndex - 1;
- }
- }
- else
- {
- if (domIndex > 0)
- {
- return domIndex - 1;
- }
- }
- //must be footer
- int uiRows = getUIRowCount();
- return domIndex + uiRows;
- }
-
- /**
- * @param cell
- * @return the dom row index of cell in the panel
- */
- public int getDomRowIndex(Element cell)
- {
- boolean hasHeaderRow = (JSFDOMUtil.findFacet(this._panelGrid, "header") != null); //$NON-NLS-1$
- boolean hasFooterRow = (JSFDOMUtil.findFacet(this._panelGrid, "footer") != null); //$NON-NLS-1$
- //if cell is header or footer
- boolean isFacet = JSFDOMUtil.isFacet(cell);
- Element parent = (Element) cell.getParentNode();
- boolean isParentFacet = JSFDOMUtil.isFacet(parent);
- if (isParentFacet)
- {
- cell = parent;
- }
- if (isFacet || isParentFacet)
- {
- String attrName = cell.getAttribute("name"); //$NON-NLS-1$
- if ("header".equalsIgnoreCase(attrName)) //$NON-NLS-1$
- {
- return 0;
- }
- else if ("footer".equalsIgnoreCase(attrName)) //$NON-NLS-1$
- {
- if (hasHeaderRow)
- {
- return 1;
- }
- return 0;
- }
- }
-
- int columns = DOMUtil.getIntAttributeIgnoreCase(this._panelGrid, IJSFConstants.ATTR_COLUMNS, 1);
- if (columns < 1)
- {
- columns = 1;
- }
- int pos = getPosition(cell);
- int rowIndex = pos / columns;
-
- if (hasHeaderRow)
- {
- rowIndex++;
- }
- if (hasFooterRow)
- {
- rowIndex++;
- }
-
- return rowIndex;
- }
-
- /**
- * @param cell
- * @return the column index of cell in the panel
- */
- public int getDomColumnIndex(Element cell)
- {
- int columns = DOMUtil.getIntAttributeIgnoreCase(this._panelGrid, IJSFConstants.ATTR_COLUMNS, 1);
- if (columns < 1)
- {
- columns = 1;
- }
- int pos = getPosition(cell);
- //if position is at header or footer,then insert column action should be disabled
- if (pos == INVALID_POSITION)
- {
- return pos;
- }
-
- int columnIndex = pos % columns;
- return columnIndex;
- }
-
- /**
- * @return the row count in the panel
- */
- public int getUIRowCount()
- {
- int columns = DOMUtil.getIntAttributeIgnoreCase(this._panelGrid, IJSFConstants.ATTR_COLUMNS, 1);
- if (columns < 1)
- {
- columns = 1;
- }
- List children = JSFDOMUtil.getUIComponentChildren(this._panelGrid);
- int numRows = (children.size() + columns - 1) / columns;
-
- return numRows;
- }
-
- private int getPosition(Element cell)
- {
- List children = JSFDOMUtil.getUIComponentChildren(this._panelGrid);
- int size = children.size();
- int i = 0;
- for (i = 0; i < size; i++)
- {
- if (cell == children.get(i))
- {
- break;
- }
- }
- if (i == size)
- {
- return INVALID_POSITION;
- }
- return i;
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/sections/IInputWidgetTypes.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/sections/IInputWidgetTypes.java
deleted file mode 100644
index a2df68a..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/sections/IInputWidgetTypes.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2007 Oracle Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Oracle Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.pagedesigner.jsf.ui.sections;
-
-interface IInputWidgetTypes
-{
- /**
- * a hidden input
- */
- public static final int HIDDEN = 0;
- /**
- * a secret input
- */
- public static final int SECRET = 1;
- /**
- * an input box
- */
- public static final int TEXT = 2;
- /**
- * an input text area
- */
- public static final int TEXTAREA = 3;
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/sections/JSFCoreConvertDateTimeGroup.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/sections/JSFCoreConvertDateTimeGroup.java
deleted file mode 100644
index e69ed40..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/sections/JSFCoreConvertDateTimeGroup.java
+++ /dev/null
@@ -1,281 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http:// www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.pagedesigner.jsf.ui.sections;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.jst.jsf.common.ui.internal.dialogfield.DialogField;
-import org.eclipse.jst.jsf.common.ui.internal.dialogfield.IDialogFieldApplyListener;
-import org.eclipse.jst.jsf.common.ui.internal.dialogfield.StyleComboDialogField;
-import org.eclipse.jst.jsf.core.internal.tld.IJSFConstants;
-import org.eclipse.jst.jsf.core.internal.tld.ITLDConstants;
-import org.eclipse.jst.pagedesigner.commands.single.ChangeAttributeCommand;
-import org.eclipse.jst.pagedesigner.editors.properties.IPropertyPageDescriptor;
-import org.eclipse.jst.pagedesigner.meta.EditorCreator;
-import org.eclipse.jst.pagedesigner.properties.internal.AttributeGroup;
-import org.eclipse.jst.pagedesigner.ui.dialogfields.DialogFieldWrapper;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMElement;
-
-/**
- * This group could be used in both section and dialog.
- *
- * @author mengbo
- * @version 1.5
- */
-public class JSFCoreConvertDateTimeGroup extends AttributeGroup//AttributeGroup
-{
- private StyleComboDialogField _typeField;
- private StyleComboDialogField _dateStyleField;
- private StyleComboDialogField _timeStyleField;
- private StyleComboDialogField _patternField;
-
- final private static String[] TYPES = { "date", "time", "both" //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- };
- final private static String[] DATESTYLES = { "default", "short", "medium", "long", "full", "custom" //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$
- };
- final private static String[] TIMESTYLES = { "default", "short", "medium", "long", "full", "custom" //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$
- };
- final private static String[] DATEPATTERNS = { "", "M/d/yy", "EEE, M/d/yy", "MM/dd/yyyy", "EEE, MM/dd/yyyy", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
- "MMM d, yyyy", "EEE, MMM d, yyyy", "MMMM d, yyyy", "EEEE, MMMM d, yyyy", "MMMM yyyy" //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
- };
- final private static String[] TIMEPATTERNS = { "", "hh:mm", "hh:mm z", "HH:mm z", "HH:mm:ss z" //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
- };
- final private static String[] DATETIMEPATTERNS = {
- "", "M/d/yy hh:mm", "EEE, M/d/yy hh:mm", "MM/dd/yyyy HH:mm:ss z", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
- "EEE, MM/dd/yyyy HH:mm:ss z", "MMM d, yyyy HH:mm z", "EEE, MMM d, yyyy HH:mm z", "MMMM d, yyyy HH:mm z", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
- "EEEE, MMMM d, yyyy HH:mm z" //$NON-NLS-1$
- };
-
- /**
- * The default constructor
- */
- public JSFCoreConvertDateTimeGroup()
- {
- super(ITLDConstants.URI_JSF_CORE, IJSFConstants.TAG_CONVERTDATETIME, new String[] { IJSFConstants.ATTR_TYPE,
- IJSFConstants.ATTR_DATESTYLE, IJSFConstants.ATTR_TIMESTYLE, IJSFConstants.ATTR_PATTERN});
- }
-
- protected DialogField createDialogField(IPropertyPageDescriptor ppd) {
- EditorCreator creator = EditorCreator.getInstance();
- if (ppd.getAttributeName().equals(IJSFConstants.ATTR_TYPE))
- {
- DialogFieldWrapper wrapper = (DialogFieldWrapper) creator
- .createDialogFieldWithWrapper(getURI(), getTagName(), ppd, null);
- _typeField = (StyleComboDialogField) wrapper.getWrappedDialogField();
- return wrapper;
- }
- else if (ppd.getAttributeName().equals(IJSFConstants.ATTR_DATESTYLE))
- {
- DialogFieldWrapper wrapper = (DialogFieldWrapper) creator
- .createDialogFieldWithWrapper(getURI(), getTagName(), ppd, null);
- _dateStyleField = (StyleComboDialogField) wrapper.getWrappedDialogField();
- _dateStyleField.setItems(DATESTYLES);
- return wrapper;
- }
- else if (ppd.getAttributeName().equals(IJSFConstants.ATTR_TIMESTYLE))
- {
- DialogFieldWrapper wrapper = (DialogFieldWrapper) creator
- .createDialogFieldWithWrapper(getURI(), getTagName(), ppd, null);
- _timeStyleField = (StyleComboDialogField) wrapper.getWrappedDialogField();
- _timeStyleField.setItems(TIMESTYLES);
- return wrapper;
- }
- else if (ppd.getAttributeName().equals(IJSFConstants.ATTR_PATTERN))
- {
- DialogFieldWrapper wrapper = (DialogFieldWrapper) creator
- .createDialogFieldWithWrapper(getURI(), getTagName(), ppd, null);
- _patternField = (StyleComboDialogField) wrapper.getWrappedDialogField();
- return wrapper;
- }
- else
- {
- return null;
- }
- }
-
- protected IDialogFieldApplyListener getDialogFieldApplyListener(IPropertyPageDescriptor ppd)
- {
- String attribute = ppd.getAttributeName();
- if (attribute.equals(IJSFConstants.ATTR_TYPE) || attribute.equals(IJSFConstants.ATTR_DATESTYLE)
- || attribute.equals(IJSFConstants.ATTR_TIMESTYLE))
- {
- IDialogFieldApplyListener listener = new IDialogFieldApplyListener()
- {
- public void dialogFieldApplied(DialogField field)
- {
- updatePatternItems();
- updateFieldStatus();
- updateFieldData();
- }
- };
- return listener;
- }
- else if (attribute.equals(IJSFConstants.ATTR_PATTERN))
- {
- IDialogFieldApplyListener listener = new IDialogFieldApplyListener()
- {
- public void dialogFieldApplied(DialogField field)
- {
- updateFieldStatus();
- updateFieldData();
- }
- };
- return listener;
- }
- else
- {
- return null;
- }
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.pagedesigner.properties.attrgroup.AttributeGroup#refreshData()
- */
-
- public void refreshData()
- {
- IDOMElement element = getElement();
-
- String type = element.getAttribute(IJSFConstants.ATTR_TYPE);
- _typeField.setTextWithoutUpdate(type);
-
- String dateStyle = element.getAttribute(IJSFConstants.ATTR_DATESTYLE);
- if (!_dateStyleField.getText().equalsIgnoreCase(DATESTYLES[5]))
- {
- _dateStyleField.setTextWithoutUpdate(dateStyle);
- }
-
- String timeStyle = element.getAttribute(IJSFConstants.ATTR_TIMESTYLE);
- if (!_timeStyleField.getText().equalsIgnoreCase(TIMESTYLES[5]))
- {
- _timeStyleField.setTextWithoutUpdate(timeStyle);
- }
-
- updatePatternItems();
- String pattern = element.getAttribute(IJSFConstants.ATTR_PATTERN);
- _patternField.setTextWithoutUpdate(pattern);
-
- updateFieldStatus();
- }
-
- /**
- *
- */
- private void updateFieldStatus()
- {
- String type = _typeField.getText();
- String dateStyle = _dateStyleField.getText();
- String timeStyle = _timeStyleField.getText();
-
- if (type.equalsIgnoreCase(TYPES[0]))
- {
- _dateStyleField.setEnabled(true);
- _timeStyleField.setEnabled(false);
- if (dateStyle.equalsIgnoreCase(DATESTYLES[5]))
- {
- _patternField.setEnabled(true);
- }
- else
- {
- _patternField.setEnabled(false);
- }
- }
- else if (type.equalsIgnoreCase(TYPES[1]))
- {
- _dateStyleField.setEnabled(false);
- _timeStyleField.setEnabled(true);
- if (timeStyle.equalsIgnoreCase(TIMESTYLES[5]))
- {
- _patternField.setEnabled(true);
- }
- else
- {
- _patternField.setEnabled(false);
- }
- }
- else if (type.equalsIgnoreCase(TYPES[2]))
- {
- _dateStyleField.setEnabled(true);
- _timeStyleField.setEnabled(true);
- if (dateStyle.equalsIgnoreCase(DATESTYLES[5]) || timeStyle.equalsIgnoreCase(TIMESTYLES[5]))
- {
- _patternField.setEnabled(true);
- }
- else
- {
- _patternField.setEnabled(false);
- }
- }
- }
-
- private void updatePatternItems()
- {
- String type = _typeField.getText();
- String dateStyle = _dateStyleField.getText();
- String timeStyle = _timeStyleField.getText();
-
- if (type.equalsIgnoreCase(TYPES[0]) && dateStyle.equalsIgnoreCase(DATESTYLES[5]))
- {
- _patternField.getComboControl(null, null).removeAll();
- _patternField.getComboControl(null, null).setItems(DATEPATTERNS);
- }
-
- if (type.equalsIgnoreCase(TYPES[1]) && timeStyle.equalsIgnoreCase(TIMESTYLES[5]))
- {
- _patternField.getComboControl(null, null).removeAll();
- _patternField.getComboControl(null, null).setItems(TIMEPATTERNS);
- }
-
- if (type.equalsIgnoreCase(TYPES[2])
- && (dateStyle.equalsIgnoreCase(DATESTYLES[5]) || timeStyle.equalsIgnoreCase(TIMESTYLES[5])))
- {
- _patternField.getComboControl(null, null).removeAll();
- _patternField.getComboControl(null, null).setItems(DATETIMEPATTERNS);
- }
- }
-
- private void updateFieldData()
- {
- String type = _typeField.getText();
- String dateStyle = _dateStyleField.getText();
- String timeStyle = _timeStyleField.getText();
- String pattern = _patternField.getText();
-
- // update the model
- if (!_dateStyleField.isEnabled() || dateStyle.equalsIgnoreCase(DATESTYLES[5]))
- {
- dateStyle = ""; //$NON-NLS-1$
- }
-
- if (!_timeStyleField.isEnabled() || timeStyle.equalsIgnoreCase(TIMESTYLES[5]))
- {
- timeStyle = ""; //$NON-NLS-1$
- }
-
- if (!_patternField.isEnabled())
- {
- pattern = ""; //$NON-NLS-1$
-
- }
-
- Map map = new HashMap();
- map.put(IJSFConstants.ATTR_TYPE, type);
- map.put(IJSFConstants.ATTR_DATESTYLE, dateStyle);
- map.put(IJSFConstants.ATTR_TIMESTYLE, timeStyle);
- map.put(IJSFConstants.ATTR_PATTERN, pattern);
-
- ChangeAttributeCommand c = new ChangeAttributeCommand(SectionResources
- .getString("JSFCoreConvertDateTimeSection.ChangeAttribute"), getElement(), map); //$NON-NLS-1$
- c.execute();
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/sections/JSFCoreConvertNumberGroup.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/sections/JSFCoreConvertNumberGroup.java
deleted file mode 100644
index 75a5d2f..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/sections/JSFCoreConvertNumberGroup.java
+++ /dev/null
@@ -1,216 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http:// www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.pagedesigner.jsf.ui.sections;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.jst.jsf.common.ui.internal.dialogfield.DialogField;
-import org.eclipse.jst.jsf.common.ui.internal.dialogfield.IDialogFieldApplyListener;
-import org.eclipse.jst.jsf.common.ui.internal.dialogfield.StringDialogField;
-import org.eclipse.jst.jsf.common.ui.internal.dialogfield.StyleComboDialogField;
-import org.eclipse.jst.jsf.core.internal.tld.IJSFConstants;
-import org.eclipse.jst.jsf.core.internal.tld.ITLDConstants;
-import org.eclipse.jst.pagedesigner.commands.single.ChangeAttributeCommand;
-import org.eclipse.jst.pagedesigner.editors.properties.IPropertyPageDescriptor;
-import org.eclipse.jst.pagedesigner.meta.EditorCreator;
-import org.eclipse.jst.pagedesigner.properties.internal.AttributeGroup;
-import org.eclipse.jst.pagedesigner.ui.dialogfields.DialogFieldWrapper;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMElement;
-
-/**
- * @author mengbo
- */
-public class JSFCoreConvertNumberGroup extends AttributeGroup
-{
- private StyleComboDialogField _typeField;
- private StyleComboDialogField _patternField;
- private StyleComboDialogField _currencyCodeField;
- private StringDialogField _currencySymbolField;
-
- final private static String[] TYPES = { "number", "currency", "percentage", "custom" //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
- };
-
- /**
- * The default constructor
- */
- public JSFCoreConvertNumberGroup()
- {
- super(ITLDConstants.URI_JSF_CORE, IJSFConstants.TAG_CONVERTNUMBER, new String[] { IJSFConstants.ATTR_TYPE,
- IJSFConstants.ATTR_CURRENCYCODE, IJSFConstants.ATTR_CURRENCYSYMBOL, IJSFConstants.ATTR_PATTERN});
- }
-
- protected DialogField createDialogField(IPropertyPageDescriptor ppd)
- {
- EditorCreator creator = EditorCreator.getInstance();
- if (ppd.getAttributeName().equals(IJSFConstants.ATTR_TYPE))
- {
- DialogFieldWrapper wrapper = (DialogFieldWrapper) creator
- .createDialogFieldWithWrapper(getURI(), getTagName(), ppd, null);
- _typeField = (StyleComboDialogField) wrapper.getWrappedDialogField();
- _typeField.setItems(TYPES);
- return wrapper;
- }
- else if (ppd.getAttributeName().equals(IJSFConstants.ATTR_CURRENCYCODE))
- {
- DialogFieldWrapper wrapper = (DialogFieldWrapper) creator
- .createDialogFieldWithWrapper(getURI(), getTagName(), ppd, null);
- _currencyCodeField = (StyleComboDialogField) wrapper.getWrappedDialogField();
- return wrapper;
- }
- else if (ppd.getAttributeName().equals(IJSFConstants.ATTR_CURRENCYSYMBOL))
- {
- DialogFieldWrapper wrapper = (DialogFieldWrapper) creator
- .createDialogFieldWithWrapper(getURI(), getTagName(), ppd, null);
- _currencySymbolField = (StringDialogField) wrapper.getWrappedDialogField();
- return wrapper;
- }
- else if (ppd.getAttributeName().equals(IJSFConstants.ATTR_PATTERN))
- {
- DialogFieldWrapper wrapper = (DialogFieldWrapper) creator
- .createDialogFieldWithWrapper(getURI(), getTagName(), ppd, null);
- _patternField = (StyleComboDialogField) wrapper.getWrappedDialogField();
- return wrapper;
- }
- else
- {
- return null;
- }
- }
-
- public IDialogFieldApplyListener getDialogFieldApplyListener(IPropertyPageDescriptor ppd)
- {
- String attribute = ppd.getAttributeName();
- if (attribute.equals(IJSFConstants.ATTR_CURRENCYCODE) || attribute.equals(IJSFConstants.ATTR_CURRENCYSYMBOL)
- || attribute.equals(IJSFConstants.ATTR_PATTERN))
- {
- IDialogFieldApplyListener listener = new IDialogFieldApplyListener()
- {
- public void dialogFieldApplied(DialogField field)
- {
- updateFieldData();
- }
- };
- return listener;
- }
- else if (attribute.equals(IJSFConstants.ATTR_TYPE))
- {
- IDialogFieldApplyListener listener = new IDialogFieldApplyListener()
- {
- public void dialogFieldApplied(DialogField field)
- {
- updateFieldStatus();
- updateFieldData();
- }
- };
- return listener;
- }
- else
- {
- return null;
- }
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.pagedesigner.pagedesigner.properties.attrgroup.AttributeGroup#refreshData()
- */
- public void refreshData()
- {
- IDOMElement element = getElement();
-
- String type = element.getAttribute(IJSFConstants.ATTR_TYPE);
- if (!_typeField.getText().equalsIgnoreCase(TYPES[3]))
- {
- _typeField.setTextWithoutUpdate(type);
- }
-
- String currencyCode = element.getAttribute(IJSFConstants.ATTR_CURRENCYCODE);
- _currencyCodeField.setTextWithoutUpdate(currencyCode);
-
- String currencySymbol = element.getAttribute(IJSFConstants.ATTR_CURRENCYSYMBOL);
- _currencySymbolField.setTextWithoutUpdate(currencySymbol);
-
- String pattern = element.getAttribute(IJSFConstants.ATTR_PATTERN);
- _patternField.setTextWithoutUpdate(pattern);
-
- updateFieldStatus();
- }
-
- private void updateFieldStatus()
- {
- String type = _typeField.getText();
-
- if (type.equalsIgnoreCase(TYPES[0]))
- {
- _currencyCodeField.setEnabled(false);
- _currencySymbolField.setEnabled(false);
- _patternField.setEnabled(false);
- }
- else if (type.equalsIgnoreCase(TYPES[1]))
- {
- _currencyCodeField.setEnabled(true);
- _currencySymbolField.setEnabled(true);
- _patternField.setEnabled(false);
- }
- else if (type.equalsIgnoreCase(TYPES[2]))
- {
- _currencyCodeField.setEnabled(false);
- _currencySymbolField.setEnabled(false);
- _patternField.setEnabled(false);
- }
- else if (type.equalsIgnoreCase(TYPES[3]))
- {
- _currencyCodeField.setEnabled(false);
- _currencySymbolField.setEnabled(false);
- _patternField.setEnabled(true);
- }
- }
-
- private void updateFieldData()
- {
- String type = _typeField.getText();
- String currencyCode = _currencyCodeField.getText();
- String currencySymbol = _currencySymbolField.getText();
- String pattern = _patternField.getText();
-
- // update the model
- if (type.equalsIgnoreCase(TYPES[3]))
- {
- type = ""; //$NON-NLS-1$
- }
-
- if (!_currencyCodeField.isEnabled())
- {
- currencyCode = ""; //$NON-NLS-1$
- }
-
- if (!_currencySymbolField.isEnabled())
- {
- currencySymbol = ""; //$NON-NLS-1$
- }
-
- if (!_patternField.isEnabled())
- {
- pattern = ""; //$NON-NLS-1$
- }
-
- Map map = new HashMap();
- map.put(IJSFConstants.ATTR_TYPE, type);
- map.put(IJSFConstants.ATTR_CURRENCYCODE, currencyCode);
- map.put(IJSFConstants.ATTR_CURRENCYSYMBOL, currencySymbol);
- map.put(IJSFConstants.ATTR_PATTERN, pattern);
-
- ChangeAttributeCommand c = new ChangeAttributeCommand(SectionResources
- .getString("JSFCoreConvertNumberSection.CommandLabel.ChangeAttribute"), getElement(), map); //$NON-NLS-1$
- c.execute();
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/sections/JSFHtmlActionListenerSection.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/sections/JSFHtmlActionListenerSection.java
deleted file mode 100644
index 33e7916..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/sections/JSFHtmlActionListenerSection.java
+++ /dev/null
@@ -1,326 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http:// www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.pagedesigner.jsf.ui.sections;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.jface.viewers.DoubleClickEvent;
-import org.eclipse.jface.viewers.IDoubleClickListener;
-import org.eclipse.jface.viewers.ILabelProviderListener;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.ITableLabelProvider;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jst.jsf.core.internal.tld.ITLDConstants;
-import org.eclipse.jst.pagedesigner.commands.single.AddSubNodeCommand;
-import org.eclipse.jst.pagedesigner.commands.single.RemoveSubNodeCommand;
-import org.eclipse.jst.pagedesigner.properties.BaseCustomSection;
-import org.eclipse.jst.pagedesigner.properties.DesignerPropertyTool;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.CCombo;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.TableColumn;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetPage;
-import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetWidgetFactory;
-import org.eclipse.wst.sse.core.internal.provisional.INodeNotifier;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMElement;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-/**
- * @author mengbo
- * @version 1.5
- */
-public class JSFHtmlActionListenerSection extends BaseCustomSection
-{
- final private static String[] LISTENTYPES = { "Action"}; //$NON-NLS-1$
-
- private IDOMElement _element;
- private Table _listenersTable;
- private TableViewer _listenersViewer;
- private CCombo _listenTypeCombo;
- private Button _listenAddButton, _listenRemoveButton;
-
- private class ListenerContentLabelProvider implements IStructuredContentProvider, ITableLabelProvider
- {
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.viewers.IStructuredContentProvider#getElements(java.lang.Object)
- */
- public Object[] getElements(Object inputElement)
- {
- IDOMElement root = _element;
- List result = new ArrayList();
-
- NodeList children = root.getChildNodes();
- for (int i = 0, n = children.getLength(); i < n; i++)
- {
- Node child = children.item(i);
- if (child.getNodeType() == Node.ELEMENT_NODE)
- {
- IDOMElement element = (IDOMElement) child;
- String nodeName = element.getNodeName();
- if (nodeName.indexOf("Listener") != -1) //$NON-NLS-1$
- {
- result.add(child);
- }
- }
- }
-
- if (result.isEmpty())
- {
- return new Object[0];
- }
-
- return result.toArray(new IDOMElement[result.size()]);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.viewers.IContentProvider#inputChanged(org.eclipse.jface.viewers.Viewer, java.lang.Object, java.lang.Object)
- */
- public void inputChanged(Viewer viewer, Object oldInput, Object newInput)
- {
- // no support for viewer changes
- }
-
- public String getColumnText(Object element, int columnIndex)
- {
- String result = null;
- if (element instanceof Node)
- {
- Node node = (Node) element;
- String nodeName = getTableNodeName(node, "type"); //$NON-NLS-1$
- switch (columnIndex)
- {
- case 0:
- result = nodeName;
- break;
- default:
- break;
- }
- }
- return result != null ? result : ""; //$NON-NLS-1$
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.viewers.IContentProvider#dispose()
- */
-
- private String getTableNodeName(Node node, String ... attrNames) {
- for (String attrName : attrNames) {
- Node attr = node.getAttributes().getNamedItem(attrName);
- if (attr != null && attr.getNodeValue()!= null &&
- ! attr.getNodeValue().trim().equals("")) //$NON-NLS-1$
- return attr.getNodeValue().trim();
- }
- return node.getNodeName();
- }
-
- public void dispose()
- {
- // nothing to dispose
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.viewers.ITableLabelProvider#getColumnImage(java.lang.Object, int)
- */
- public Image getColumnImage(Object element, int columnIndex)
- {
- return null;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.viewers.IBaseLabelProvider#addListener(org.eclipse.jface.viewers.ILabelProviderListener)
- */
- public void addListener(ILabelProviderListener listener)
- {
- // TODO: listeners not supported?
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.viewers.IBaseLabelProvider#isLabelProperty(java.lang.Object, java.lang.String)
- */
- public boolean isLabelProperty(Object element, String property)
- {
- return false;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.viewers.IBaseLabelProvider#removeListener(org.eclipse.jface.viewers.ILabelProviderListener)
- */
- public void removeListener(ILabelProviderListener listener)
- {
- // TODO: listeners not supported?
- }
- }
-
- /**
- * Default constructor
- */
- public JSFHtmlActionListenerSection()
- {
- super();
- }
-
- public void createControls(Composite parent, TabbedPropertySheetPage aTabbedPropertySheetPage)
- {
- super.createControls(parent, aTabbedPropertySheetPage);
- TabbedPropertySheetWidgetFactory factory = aTabbedPropertySheetPage.getWidgetFactory();
- Composite top = factory.createFlatFormComposite(parent);
-
- GridLayout layout = new GridLayout();
- layout.numColumns = 4;
- top.setLayout(layout);
-
- createListenerPart(factory, top);
- }
-
- /**
- * @param factory
- * @param other
- */
- private void createListenerPart(TabbedPropertySheetWidgetFactory factory, Composite other)
- {
- GridData data;
- _listenersTable = factory.createTable(other, SWT.FULL_SELECTION | SWT.MULTI);
- data = new GridData(GridData.FILL_BOTH);
- data.horizontalSpan = 3;
- data.verticalSpan = 4;
- data.heightHint = 50;
- data.widthHint = 100;
- _listenersTable.setHeaderVisible(true);
- _listenersTable.setLayoutData(data);
- _listenersTable.setLinesVisible(true);
-
- TableColumn listenColumn = new TableColumn(_listenersTable, SWT.NONE);
- listenColumn.setText(SectionResources.getString("JSFHtmlCommandButtonSection.Listeners")); //$NON-NLS-1$
- listenColumn.setWidth(500);
-
- _listenersViewer = new TableViewer(_listenersTable);
- _listenersViewer.setContentProvider(new ListenerContentLabelProvider());
- _listenersViewer.setLabelProvider(new ListenerContentLabelProvider());
- _listenersViewer.addDoubleClickListener(new IDoubleClickListener()
- {
- public void doubleClick(DoubleClickEvent event)
- {
- IStructuredSelection selection = (IStructuredSelection) event.getSelection();
- if (selection != null)
- {
- IDOMElement node = (IDOMElement) selection.getFirstElement();
- gotoNode(node);
- }
- }
- });
- _listenersViewer.addSelectionChangedListener(new ISelectionChangedListener()
- {
- public void selectionChanged(SelectionChangedEvent event)
- {
- updateListenerButtonStatus();
- }
- });
-
- _listenTypeCombo = factory.createCCombo(other, SWT.READ_ONLY);
- _listenTypeCombo.setItems(LISTENTYPES);
- _listenTypeCombo.select(0);
- data = new GridData(GridData.HORIZONTAL_ALIGN_FILL);
- _listenTypeCombo.setLayoutData(data);
-
- _listenAddButton = factory.createButton(other, SectionResources.getString("JSFHtmlCommandButtonSection.Add"), //$NON-NLS-1$
- SWT.NONE);
- data = new GridData(GridData.HORIZONTAL_ALIGN_FILL);
- _listenAddButton.setLayoutData(data);
- _listenAddButton.addSelectionListener(new SelectionAdapter()
- {
- public void widgetSelected(SelectionEvent e)
- {
- Map attributes = new HashMap();
- String listener = _listenTypeCombo.getText();
- listener = listener.substring(0, 1).toLowerCase() + listener.substring(1) + "Listener"; //$NON-NLS-1$
- AddSubNodeCommand c = new AddSubNodeCommand(
- SectionResources.getString("JSFHtmlCommandButtonSection.CommandLabel.AddSubTag"), _element, listener, ITLDConstants.URI_JSF_CORE, attributes); //$NON-NLS-1$
- c.execute();
- _listenersViewer.refresh();
- updateListenerButtonStatus();
- }
- });
- _listenRemoveButton = factory.createButton(other, SectionResources
- .getString("JSFHtmlCommandButtonSection.Remove"), SWT.NONE); //$NON-NLS-1$
- data = new GridData(GridData.HORIZONTAL_ALIGN_FILL);
- _listenRemoveButton.setLayoutData(data);
- _listenRemoveButton.addSelectionListener(new SelectionAdapter()
- {
- public void widgetSelected(SelectionEvent e)
- {
- IStructuredSelection selection = (IStructuredSelection) _listenersViewer.getSelection();
- if (selection != null)
- {
- for (Iterator i = selection.iterator(); i.hasNext();)
- {
- IDOMElement node = (IDOMElement) i.next();
- RemoveSubNodeCommand c = new RemoveSubNodeCommand(SectionResources
- .getString("JSFHtmlCommandButtonSection.CommandLabel.RemoveSubTag"), _element, node); //$NON-NLS-1$
- c.execute();
- }
- _listenersViewer.refresh();
- updateListenerButtonStatus();
- }
- }
- });
- }
-
- private void updateListenerButtonStatus()
- {
- _listenRemoveButton.setEnabled(true);
- ISelection selection = _listenersViewer.getSelection();
- if (selection == null || selection.isEmpty())
- {
- _listenRemoveButton.setEnabled(false);
- }
- if (_listenersTable.getItemCount() == 0)
- {
- _listenRemoveButton.setEnabled(false);
- }
- }
-
- public void setInput(IWorkbenchPart part, ISelection selection)
- {
- super.setInput(part, selection);
- _element = (IDOMElement) DesignerPropertyTool.getElement(part, selection);
- if (_listenersViewer != null)
- _listenersViewer.setInput(_element);
- }
-
- protected void notifyChanged(INodeNotifier notifier, int eventType, Object changedFeature, Object oldValue, Object newValue, int pos)
- {
- if(_listenersViewer != null && !_listenersViewer.getControl().isDisposed())
- {
- _listenersViewer.refresh();
- }
-
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/sections/JSFHtmlDataTableColumnsSection.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/sections/JSFHtmlDataTableColumnsSection.java
deleted file mode 100644
index 92bd788..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/sections/JSFHtmlDataTableColumnsSection.java
+++ /dev/null
@@ -1,390 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http:// www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.pagedesigner.jsf.ui.sections;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.jface.viewers.DoubleClickEvent;
-import org.eclipse.jface.viewers.IDoubleClickListener;
-import org.eclipse.jface.viewers.ILabelProviderListener;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.ITableLabelProvider;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jst.jsf.core.internal.tld.IJSFConstants;
-import org.eclipse.jst.jsf.core.internal.tld.ITLDConstants;
-import org.eclipse.jst.pagedesigner.commands.single.AddSubNodeCommand;
-import org.eclipse.jst.pagedesigner.commands.single.InsertSubNodeCommand;
-import org.eclipse.jst.pagedesigner.commands.single.RemoveSubNodeCommand;
-import org.eclipse.jst.pagedesigner.properties.BaseCustomSection;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.TableColumn;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetPage;
-import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetWidgetFactory;
-import org.eclipse.wst.sse.core.internal.provisional.INodeNotifier;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMElement;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-/**
- * @author mengbo
- * @version 1.5
- */
-public class JSFHtmlDataTableColumnsSection extends BaseCustomSection
-{
- private Table _columnsTable;
- private TableViewer _columnsViewer;
- private Button _addButton, _removeButton, _moveUpButton, _moveDownButton;
-
- final static private String DEFAULT_COLUMN_NAME = "column"; //$NON-NLS-1$
- final static private String DEFAULT_FACET_NAME = "header"; //$NON-NLS-1$
- final static private String DEFAULT_TEXT_NAME = "text"; //$NON-NLS-1$
-
- class ColumnCotentLabelProvider implements IStructuredContentProvider, ITableLabelProvider
- {
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.viewers.IStructuredContentProvider#getElements(java.lang.Object)
- */
- public Object[] getElements(Object inputElement)
- {
- IDOMElement root = _element;
- List result = new ArrayList();
-
- NodeList children = root.getChildNodes();
- for (int i = 0, n = children.getLength(); i < n; i++)
- {
- Node child = children.item(i);
- if (child.getNodeType() == Node.ELEMENT_NODE)
- {
- IDOMElement element = (IDOMElement) child;
- String nodeName = element.getNodeName();
- if (nodeName.indexOf("column") != -1) //$NON-NLS-1$
- {
- result.add(child);
- }
- }
- }
-
- if (result.isEmpty())
- {
- return new Object[0];
- }
-
- return result.toArray(new IDOMElement[result.size()]);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.viewers.IContentProvider#inputChanged(org.eclipse.jface.viewers.Viewer, java.lang.Object, java.lang.Object)
- */
- public void inputChanged(Viewer viewer, Object oldInput, Object newInput)
- {
- // no support for input changed
- }
-
- public String getColumnText(Object element, int columnIndex)
- {
- String result = null;
- if (element instanceof IDOMElement)
- {
- IDOMElement node = (IDOMElement) element;
- switch (columnIndex)
- {
- case 0:
- result = node.getAttribute(IJSFConstants.ATTR_ID);
- break;
- default:
- break;
- }
- }
- return result != null ? result : ""; //$NON-NLS-1$
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.viewers.IContentProvider#dispose()
- */
-
- public void dispose()
- {
- // nothing to dispose
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.viewers.ITableLabelProvider#getColumnImage(java.lang.Object, int)
- */
- public Image getColumnImage(Object element, int columnIndex)
- {
- return null;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.viewers.IBaseLabelProvider#addListener(org.eclipse.jface.viewers.ILabelProviderListener)
- */
- public void addListener(ILabelProviderListener listener)
- {
- // TODO: no support for listeners?
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.viewers.IBaseLabelProvider#isLabelProperty(java.lang.Object, java.lang.String)
- */
- public boolean isLabelProperty(Object element, String property)
- {
- return false;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.viewers.IBaseLabelProvider#removeListener(org.eclipse.jface.viewers.ILabelProviderListener)
- */
- public void removeListener(ILabelProviderListener listener)
- {
- // TODO: no support for listeners?
- }
-
- }
-
- /**
- * default constructor
- */
- public JSFHtmlDataTableColumnsSection()
- {
- super();
- }
-
- public void createControls(Composite parent, TabbedPropertySheetPage aTabbedPropertySheetPage)
- {
- super.createControls(parent, aTabbedPropertySheetPage);
- TabbedPropertySheetWidgetFactory factory = aTabbedPropertySheetPage.getWidgetFactory();
- Composite top = factory.createFlatFormComposite(parent);
-
- GridLayout layout = new GridLayout();
- layout.numColumns = 4;
- top.setLayout(layout);
-
- createColumnPart(factory, top);
- }
-
- private void createColumnPart(TabbedPropertySheetWidgetFactory factory, Composite other)
- {
- GridData data;
- _columnsTable = factory.createTable(other, SWT.FULL_SELECTION | SWT.MULTI);
- data = new GridData(GridData.FILL_BOTH);
- data.horizontalSpan = 3;
- data.verticalSpan = 4;
- data.widthHint = 10;
- data.heightHint = 50;
- _columnsTable.setHeaderVisible(true);
- _columnsTable.setLayoutData(data);
- _columnsTable.setLinesVisible(true);
-
- TableColumn column = new TableColumn(_columnsTable, SWT.NONE);
- column.setText(SectionResources.getString("JSFHtmlDataTableSection.Columns")); //$NON-NLS-1$
- column.setWidth(200);
-
- _columnsViewer = new TableViewer(_columnsTable);
- _columnsViewer.setContentProvider(new ColumnCotentLabelProvider());
- _columnsViewer.setLabelProvider(new ColumnCotentLabelProvider());
- _columnsViewer.addDoubleClickListener(new IDoubleClickListener()
- {
- public void doubleClick(DoubleClickEvent event)
- {
- IStructuredSelection selection = (IStructuredSelection) event.getSelection();
- if (selection != null)
- {
- IDOMElement node = (IDOMElement) selection.getFirstElement();
- gotoNode(node);
- }
- }
- }
- );
- _columnsViewer.addSelectionChangedListener(new ISelectionChangedListener()
- {
- public void selectionChanged(SelectionChangedEvent event)
- {
- updateButtonStatus();
- }
- }
- );
-
- // add buttons group
- _addButton = factory.createButton(other, SectionResources.getString("JSFHtmlDataTableSection.Add"), SWT.NONE); //$NON-NLS-1$
- data = new GridData(GridData.HORIZONTAL_ALIGN_FILL);
- _addButton.setLayoutData(data);
- _addButton.addSelectionListener(new SelectionAdapter()
- {
- public void widgetSelected(SelectionEvent e)
- {
- int count = _columnsTable.getItemCount();
-
- Map attributes = new HashMap();
- attributes.put(IJSFConstants.ATTR_ID, DEFAULT_COLUMN_NAME + (count + 1));
- AddSubNodeCommand c = new AddSubNodeCommand(SectionResources.getString("JSFHtmlDataTableSection.CommandLabel.AddSubTag"), _element, "column", //$NON-NLS-1$ //$NON-NLS-2$
- ITLDConstants.URI_JSF_HTML, attributes);
- c.execute();
-
- IDOMElement child = c.getChildNode();
- attributes = new HashMap();
- attributes.put(IJSFConstants.ATTR_NAME, DEFAULT_FACET_NAME);
- c = new AddSubNodeCommand(SectionResources.getString("JSFHtmlDataTableSection.CommandLabel.AddSubTag"), child, "facet", ITLDConstants.URI_JSF_CORE, attributes); //$NON-NLS-1$ //$NON-NLS-2$
- c.execute();
-
- child = c.getChildNode();
- attributes = new HashMap();
- attributes.put(IJSFConstants.ATTR_ID, DEFAULT_TEXT_NAME + (count + 1));
- attributes.put(IJSFConstants.ATTR_VALUE, DEFAULT_COLUMN_NAME + (count + 1));
- c = new AddSubNodeCommand(SectionResources.getString("JSFHtmlDataTableSection.CommandLabel.AddSubTag"), child, "outputText", ITLDConstants.URI_JSF_HTML, attributes); //$NON-NLS-1$ //$NON-NLS-2$
- c.execute();
-
- _columnsViewer.refresh();
- // if (c.getChildNode() != null)
- // {
- // gotoNode(c.getChildNode());
- // }
- updateButtonStatus();
- }
- }
- );
- _removeButton = factory.createButton(other, SectionResources.getString("JSFHtmlDataTableSection.Remove"), //$NON-NLS-1$
- SWT.NONE);
- data = new GridData(GridData.HORIZONTAL_ALIGN_FILL);
- _removeButton.setLayoutData(data);
- _removeButton.addSelectionListener(new SelectionAdapter()
- {
- public void widgetSelected(SelectionEvent e)
- {
- IStructuredSelection selection = (IStructuredSelection) _columnsViewer.getSelection();
- if (selection != null)
- {
- for (Iterator i = selection.iterator(); i.hasNext();)
- {
- IDOMElement node = (IDOMElement) i.next();
- RemoveSubNodeCommand c = new RemoveSubNodeCommand(SectionResources.getString("JSFHtmlDataTableSection.CommandLabel.RemoveSubTag"), _element, node); //$NON-NLS-1$
- c.execute();
- }
- _columnsViewer.refresh();
- updateButtonStatus();
- }
- }
- }
- );
- _moveUpButton = factory.createButton(other, SectionResources.getString("JSFHtmlDataTableSection.MoveUp"), //$NON-NLS-1$
- SWT.NONE);
- data = new GridData(GridData.HORIZONTAL_ALIGN_FILL);
- _moveUpButton.setLayoutData(data);
- _moveUpButton.addSelectionListener(new SelectionAdapter()
- {
- public void widgetSelected(SelectionEvent e)
- {
- int index = _columnsTable.getSelectionIndex();
- IDOMElement child = (IDOMElement) _columnsTable.getItem(index).getData();
- IDOMElement refchild = (IDOMElement) _columnsTable.getItem(index - 1).getData();
- RemoveSubNodeCommand remove = new RemoveSubNodeCommand(SectionResources.getString("JSFHtmlDataTableSection.CommandLabel.RemoveSubTag"), _element, child); //$NON-NLS-1$
- remove.execute();
- InsertSubNodeCommand insert = new InsertSubNodeCommand(SectionResources.getString("JSFHtmlDataTableSection.CommandLabel.InsertSubTag"), _element, child, refchild); //$NON-NLS-1$
- insert.execute();
- _columnsViewer.refresh();
- updateButtonStatus();
- }
- }
- );
- _moveDownButton = factory.createButton(other, SectionResources.getString("JSFHtmlDataTableSection.MoveDown"), //$NON-NLS-1$
- SWT.NONE);
- data = new GridData(GridData.HORIZONTAL_ALIGN_FILL);
- _moveDownButton.setLayoutData(data);
- _moveDownButton.addSelectionListener(new SelectionAdapter()
- {
- public void widgetSelected(SelectionEvent e)
- {
- int index = _columnsTable.getSelectionIndex();
- IDOMElement child = (IDOMElement) _columnsTable.getItem(index).getData();
- IDOMElement refchild = (IDOMElement) _columnsTable.getItem(index + 1).getData();
- RemoveSubNodeCommand remove = new RemoveSubNodeCommand(SectionResources.getString("JSFHtmlDataTableSection.CommandLabel.RemoveSubTag"), _element, refchild); //$NON-NLS-1$
- remove.execute();
- InsertSubNodeCommand insert = new InsertSubNodeCommand(SectionResources.getString("JSFHtmlDataTableSection.CommandLabel.InsertSubTag"), _element, refchild, child); //$NON-NLS-1$
- insert.execute();
- _columnsViewer.refresh();
- updateButtonStatus();
- }
- }
- );
- }
-
- /**
- * Update the button status
- */
- private void updateButtonStatus()
- {
- _removeButton.setEnabled(true);
- _moveUpButton.setEnabled(true);
- _moveDownButton.setEnabled(true);
- ISelection selection = _columnsViewer.getSelection();
- if (selection.isEmpty())
- {
- _removeButton.setEnabled(false);
- _moveUpButton.setEnabled(false);
- _moveDownButton.setEnabled(false);
- }
- if (_columnsTable.getItemCount() == 0)
- {
- _removeButton.setEnabled(false);
- _moveUpButton.setEnabled(false);
- _moveDownButton.setEnabled(false);
- }
- if (_columnsTable.getSelectionCount() > 1)
- {
- _moveUpButton.setEnabled(false);
- _moveDownButton.setEnabled(false);
- }
- if (_columnsTable.getSelectionIndex() == 0)
- {
- _moveUpButton.setEnabled(false);
- }
- if (_columnsTable.getSelectionIndex() == _columnsTable.getItemCount() - 1)
- {
- _moveDownButton.setEnabled(false);
- }
- }
-
- public void setInput(IWorkbenchPart part, ISelection selection)
- {
- super.setInput(part, selection);
-
- _columnsViewer.setInput(_element);
-
- updateButtonStatus();
- }
-
- protected void notifyChanged(INodeNotifier notifier, int eventType, Object changedFeature, Object oldValue, Object newValue, int pos)
- {
- if(_columnsViewer != null && !_columnsViewer.getControl().isDisposed())
- {
- _columnsViewer.refresh();
- }
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/sections/JSFHtmlInputHiddenTypeSection.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/sections/JSFHtmlInputHiddenTypeSection.java
deleted file mode 100644
index 77c1be1..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/sections/JSFHtmlInputHiddenTypeSection.java
+++ /dev/null
@@ -1,166 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http:// www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.pagedesigner.jsf.ui.sections;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jst.jsf.common.ui.internal.dialogfield.DialogField;
-import org.eclipse.jst.jsf.common.ui.internal.dialogfield.IDialogFieldApplyListener;
-import org.eclipse.jst.jsf.common.ui.internal.dialogfield.LayoutUtil;
-import org.eclipse.jst.jsf.common.ui.internal.dialogfield.RadiosDialogField;
-import org.eclipse.jst.jsf.core.internal.tld.IJSFConstants;
-import org.eclipse.jst.pagedesigner.commands.single.ChangeTagCommand;
-import org.eclipse.jst.pagedesigner.properties.BaseCustomSection;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetPage;
-import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetWidgetFactory;
-import org.eclipse.wst.sse.core.internal.provisional.INodeNotifier;
-
-/**
- * @author mengbo
- * @version 1.5
- */
-public class JSFHtmlInputHiddenTypeSection extends BaseCustomSection
-{
- private RadiosDialogField _typesField;
-
- final private static String[] TYPES = { SectionResources.getString("JSFHtmlInputHiddenSection.Type0"), //$NON-NLS-1$
- SectionResources.getString("JSFHtmlInputHiddenSection.Type1"), //$NON-NLS-1$
- SectionResources.getString("JSFHtmlInputHiddenSection.Type2"), //$NON-NLS-1$
- SectionResources.getString("JSFHtmlInputHiddenSection.Type3") //$NON-NLS-1$
- };
-
- /**
- * The default constructor
- */
- public JSFHtmlInputHiddenTypeSection()
- {
- super();
- _typesField = new RadiosDialogField();
- _typesField.setLabelText(SectionResources.getString("JSFHtmlInputHiddenSection.Type")); //$NON-NLS-1$
- _typesField.setItems(TYPES);
- _typesField.setDialogFieldApplyListener(new IDialogFieldApplyListener()
- {
- public void dialogFieldApplied(DialogField field)
- {
- int type = _typesField.getSelectedIndex();
- String prefix = _element.getPrefix();
- String localTag = toLocalTag(type);
- String newtag = prefix + ":" + localTag; //$NON-NLS-1$
- Map attrs = new HashMap();
- if (type == IInputWidgetTypes.TEXTAREA)
- {
- // need to change "size" attribute to "cols"
- String size = _element.getAttribute(IJSFConstants.ATTR_SIZE);
- if (size != null && size.length() != 0)
- {
- attrs.put(IJSFConstants.ATTR_SIZE, null);
- attrs.put(IJSFConstants.ATTR_COLS, size);
- }
- }
- else
- {
- // need to change "cols" attribute to "size"
- String size = _element.getAttribute("cols"); //$NON-NLS-1$
- if (size != null && size.length() != 0)
- {
- attrs.put(IJSFConstants.ATTR_COLS, null);
- attrs.put(IJSFConstants.ATTR_SIZE, size);
- }
- }
- ChangeTagCommand c = new ChangeTagCommand(SectionResources
- .getString("JSFHtmlInputHidden.CommandLabel.ChangeType"), _element, newtag, attrs, true); //$NON-NLS-1$
- c.execute();
- _element = c.getNewElement();
- }
- });
- }
-
- public void createControls(Composite parent, TabbedPropertySheetPage aTabbedPropertySheetPage)
- {
- super.createControls(parent, aTabbedPropertySheetPage);
- TabbedPropertySheetWidgetFactory factory = aTabbedPropertySheetPage.getWidgetFactory();
- Composite top = factory.createFlatFormComposite(parent);
-
- int numberOfColumns = _typesField.getNumberOfControls();
- GridLayout layout = new GridLayout(numberOfColumns, false);
- top.setLayout(layout);
-
- _typesField.doFillIntoGrid(factory, top, numberOfColumns);
- LayoutUtil.setGrabHorizontal(_typesField.getGroup(factory, top), true);
- }
-
- private String toLocalTag(int type)
- {
- switch (type)
- {
- case IInputWidgetTypes.SECRET:
- return IJSFConstants.TAG_INPUTSECRET;
- case IInputWidgetTypes.HIDDEN:
- return IJSFConstants.TAG_INPUTHIDDEN;
- case IInputWidgetTypes.TEXTAREA:
- return IJSFConstants.TAG_INPUTTEXTAREA;
- case IInputWidgetTypes.TEXT:
- return IJSFConstants.TAG_INPUTTEXT;
- default:
- return IJSFConstants.TAG_INPUTHIDDEN;
- }
- }
-
- public void setInput(IWorkbenchPart part, ISelection selection)
- {
- super.setInput(part, selection);
-
- _typesField.setSelectedIndexWithoutUpdate(getInputType());
- }
-
- /**
- * @return the type of the input. One of TEXT, TEXTAREA, HIDDEN, SECRET.
- */
- public int getInputType()
- {
- String localTag = _element.getLocalName();
- if (IJSFConstants.TAG_INPUTTEXT.equals(localTag))
- {
- return IInputWidgetTypes.TEXT;
- }
- else if (IJSFConstants.TAG_INPUTSECRET.equals(localTag))
- {
- return IInputWidgetTypes.SECRET;
- }
- else if (IJSFConstants.TAG_INPUTHIDDEN.equals(localTag))
- {
- return IInputWidgetTypes.HIDDEN;
- }
- else if (IJSFConstants.TAG_INPUTTEXTAREA.equals(localTag))
- {
- return IInputWidgetTypes.TEXTAREA;
- }
- else
- {
- return IInputWidgetTypes.HIDDEN;
- }
- }
-
- protected void notifyChanged(INodeNotifier notifier, int eventType, Object changedFeature, Object oldValue,
- Object newValue, int pos)
- {
- if (_typesField != null)
- {
- _typesField.setSelectedIndexWithoutUpdate(getInputType());
- }
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/sections/JSFHtmlInputOthersSection.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/sections/JSFHtmlInputOthersSection.java
deleted file mode 100644
index 2da1a53..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/sections/JSFHtmlInputOthersSection.java
+++ /dev/null
@@ -1,868 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http:// www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.pagedesigner.jsf.ui.sections;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.jface.viewers.CellEditor;
-import org.eclipse.jface.viewers.DoubleClickEvent;
-import org.eclipse.jface.viewers.ICellModifier;
-import org.eclipse.jface.viewers.IDoubleClickListener;
-import org.eclipse.jface.viewers.ILabelProviderListener;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.ITableLabelProvider;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jface.viewers.TextCellEditor;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jst.jsf.core.internal.tld.IJSFConstants;
-import org.eclipse.jst.jsf.core.internal.tld.ITLDConstants;
-import org.eclipse.jst.pagedesigner.commands.single.AddSubNodeCommand;
-import org.eclipse.jst.pagedesigner.commands.single.ChangeAttributeCommand;
-import org.eclipse.jst.pagedesigner.commands.single.RemoveSubNodeCommand;
-import org.eclipse.jst.pagedesigner.properties.BaseCustomSection;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.CCombo;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.TableColumn;
-import org.eclipse.swt.widgets.TableItem;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetPage;
-import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetWidgetFactory;
-import org.eclipse.wst.sse.core.internal.provisional.INodeNotifier;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMElement;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-/**
- * @author mengbo
- * @version 1.5
- */
-public class JSFHtmlInputOthersSection extends BaseCustomSection
-{
- private Table _validatorsTable, _convertorsTable, _listenersTable;
- private TableViewer _validatorsViewer, _convertorsViewer, _listenersViewer;
-
- private Button _validateAddButton, _validateRemoveButton;
- private Button _convertAddButton, _convertRemoveButton;
- private Button _listenAddButton, _listenRemoveButton;
- private CCombo _validateTypeCombo, _convertTypeCombo, _listenTypeCombo;
- final private static String[] VALIDATETYPES = { "DoubleRange", "Length", "LongRange" //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- };
- final private static String[] CONVERTTYPES = { "DateTime", "Number" //$NON-NLS-1$ //$NON-NLS-2$
- };
- final private static String[] LISTENTYPES = { "ValueChange" //$NON-NLS-1$
- };
- final private static String[] VALIDATORS_COLUMN_NAMES = { IJSFConstants.TAG_VALIDATOR, IJSFConstants.ATTR_MINIMUM,
- IJSFConstants.ATTR_MAXIMUM };
-
- private class ValidateContentLabelProvider implements IStructuredContentProvider, ITableLabelProvider
- {
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.viewers.IStructuredContentProvider#getElements(java.lang.Object)
- */
- public Object[] getElements(Object inputElement)
- {
- IDOMElement root = _element;
- List result = new ArrayList();
-
- NodeList children = root.getChildNodes();
- for (int i = 0, n = children.getLength(); i < n; i++)
- {
- Node child = children.item(i);
- if (child.getNodeType() == Node.ELEMENT_NODE)
- {
- IDOMElement element = (IDOMElement) child;
- String nodeName = element.getNodeName();
- if (nodeName.indexOf("validat") != -1) //$NON-NLS-1$
- {
- result.add(child);
- }
- }
- }
-
- if (result.isEmpty())
- {
- return new Object[0];
- }
-
- return result.toArray(new IDOMElement[result.size()]);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.viewers.IContentProvider#inputChanged(org.eclipse.jface.viewers.Viewer, java.lang.Object, java.lang.Object)
- */
- public void inputChanged(Viewer viewer, Object oldInput, Object newInput)
- {
- // no support for input changed
- }
-
- public String getColumnText(Object element, int columnIndex)
- {
- String result = null;
- if (element instanceof IDOMElement)
- {
- IDOMElement node = (IDOMElement) element;
- String nodeName = node.getNodeName();
- switch (columnIndex)
- {
- case 0:
- result = nodeName;
- break;
- case 1:
- result = node.getAttribute(IJSFConstants.ATTR_MINIMUM);
- break;
- case 2:
- result = node.getAttribute(IJSFConstants.ATTR_MAXIMUM);
- break;
- default:
- break;
- }
- }
- return result != null ? result : ""; //$NON-NLS-1$
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.viewers.IContentProvider#dispose()
- */
-
- public void dispose()
- {
- // nothing to dispose
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.viewers.ITableLabelProvider#getColumnImage(java.lang.Object, int)
- */
- public Image getColumnImage(Object element, int columnIndex)
- {
- return null;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.viewers.IBaseLabelProvider#addListener(org.eclipse.jface.viewers.ILabelProviderListener)
- */
- public void addListener(ILabelProviderListener listener)
- {
- // TODO: no support for listeners?
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.viewers.IBaseLabelProvider#isLabelProperty(java.lang.Object, java.lang.String)
- */
- public boolean isLabelProperty(Object element, String property)
- {
- return false;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.viewers.IBaseLabelProvider#removeListener(org.eclipse.jface.viewers.ILabelProviderListener)
- */
- public void removeListener(ILabelProviderListener listener)
- {
- // TODO: no support for listeners?
- }
- }
-
- private class ValidateCellModifier implements ICellModifier
- {
- /* (non-Javadoc)
- * @see org.eclipse.jface.viewers.ICellModifier#canModify(java.lang.Object, java.lang.String)
- */
- public boolean canModify(Object element, String property)
- {
- int columnIndex = getColumnNames().indexOf(property);
-
- if (columnIndex == 0)
- {
- return false;
- }
- return true;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.viewers.ICellModifier#getValue(java.lang.Object, java.lang.String)
- */
- public Object getValue(Object element, String property)
- {
- int columnIndex = getColumnNames().indexOf(property);
-
- Object result = null;
- IDOMElement node = (IDOMElement) element;
- switch (columnIndex)
- {
- case 0: // Node Name
- result = node.getNodeName();
- break;
- case 1: // Min
- result = node.getAttribute(IJSFConstants.ATTR_MINIMUM);
- break;
- case 2: // Max
- result = node.getAttribute(IJSFConstants.ATTR_MAXIMUM);
- break;
- default:
- result = ""; //$NON-NLS-1$
- }
- return result != null ? result : ""; //$NON-NLS-1$
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.viewers.ICellModifier#modify(java.lang.Object, java.lang.String, java.lang.Object)
- */
- public void modify(Object element, String property, Object value)
- {
- int columnIndex = getColumnNames().indexOf(property);
-
- TableItem item = (TableItem) element;
- IDOMElement node = (IDOMElement) item.getData();
- String valueString;
- ChangeAttributeCommand c;
- switch (columnIndex)
- {
- case 1: // Min
- valueString = ((String) value).trim();
- c = new ChangeAttributeCommand(
- SectionResources.getString("JSFHtmlInputTextSection.CommandLabel.ChangeAttribute"), node, IJSFConstants.ATTR_MINIMUM, valueString); //$NON-NLS-1$
- c.execute();
- break;
- case 2: // Max
- valueString = ((String) value).trim();
- c = new ChangeAttributeCommand(
- SectionResources.getString("JSFHtmlInputTextSection.CommandLabel.ChangeAttribute"), node, IJSFConstants.ATTR_MAXIMUM, valueString); //$NON-NLS-1$
- c.execute();
- break;
- default:
- break;
- }
- _validatorsViewer.refresh();
-// _validatorsViewer.setInput(_element);
- updateValidateButtonStatus();
- }
- }
-
- private class ConvertContentLabelProvider implements IStructuredContentProvider, ITableLabelProvider
- {
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.viewers.IStructuredContentProvider#getElements(java.lang.Object)
- */
- public Object[] getElements(Object inputElement)
- {
- IDOMElement root = _element;
- List result = new ArrayList();
-
- NodeList children = root.getChildNodes();
- for (int i = 0, n = children.getLength(); i < n; i++)
- {
- Node child = children.item(i);
- if (child.getNodeType() == Node.ELEMENT_NODE)
- {
- IDOMElement element = (IDOMElement) child;
- String nodeName = element.getNodeName();
- if (nodeName.indexOf("convert") != -1) //$NON-NLS-1$
- {
- result.add(child);
- }
- }
- }
-
- if (result.isEmpty())
- {
- return new Object[0];
- }
-
- return result.toArray(new IDOMElement[result.size()]);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.viewers.IContentProvider#inputChanged(org.eclipse.jface.viewers.Viewer, java.lang.Object, java.lang.Object)
- */
- public void inputChanged(Viewer viewer, Object oldInput, Object newInput)
- {
- // do nothing
- }
-
- public String getColumnText(Object element, int columnIndex)
- {
- String result = null;
- if (element instanceof IDOMElement)
- {
- IDOMElement node = (IDOMElement) element;
- String nodeName = node.getNodeName();
- switch (columnIndex)
- {
- case 0:
- result = nodeName;
- break;
- default:
- break;
- }
- }
- return result != null ? result : ""; //$NON-NLS-1$
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.viewers.IContentProvider#dispose()
- */
-
- public void dispose()
- {
- // nothing to dispose
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.viewers.ITableLabelProvider#getColumnImage(java.lang.Object, int)
- */
- public Image getColumnImage(Object element, int columnIndex)
- {
- return null;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.viewers.IBaseLabelProvider#addListener(org.eclipse.jface.viewers.ILabelProviderListener)
- */
- public void addListener(ILabelProviderListener listener)
- {
- // TODO: no support for listeners?
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.viewers.IBaseLabelProvider#isLabelProperty(java.lang.Object, java.lang.String)
- */
- public boolean isLabelProperty(Object element, String property)
- {
- return false;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.viewers.IBaseLabelProvider#removeListener(org.eclipse.jface.viewers.ILabelProviderListener)
- */
- public void removeListener(ILabelProviderListener listener)
- {
- // TODO: no support for listeners?
- }
- }
-
- private class ListenerContentLabelProvider implements IStructuredContentProvider, ITableLabelProvider
- {
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.viewers.IStructuredContentProvider#getElements(java.lang.Object)
- */
- public Object[] getElements(Object inputElement)
- {
- IDOMElement root = _element;
- List result = new ArrayList();
-
- NodeList children = root.getChildNodes();
- for (int i = 0, n = children.getLength(); i < n; i++)
- {
- Node child = children.item(i);
- if (child.getNodeType() == Node.ELEMENT_NODE)
- {
- IDOMElement element = (IDOMElement) child;
- String nodeName = element.getNodeName();
- if (nodeName.indexOf("Listener") != -1) //$NON-NLS-1$
- {
- result.add(child);
- }
- }
- }
-
- if (result.isEmpty())
- {
- return new Object[0];
- }
-
- return result.toArray(new IDOMElement[result.size()]);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.viewers.IContentProvider#inputChanged(org.eclipse.jface.viewers.Viewer, java.lang.Object, java.lang.Object)
- */
- public void inputChanged(Viewer viewer, Object oldInput, Object newInput)
- {
- // do nothing
- }
-
- public String getColumnText(Object element, int columnIndex)
- {
- String result = null;
- if (element instanceof IDOMElement)
- {
- IDOMElement node = (IDOMElement) element;
- String nodeName = node.getNodeName();
- switch (columnIndex)
- {
- case 0:
- result = nodeName;
- break;
- default:
- break;
- }
- }
- return result != null ? result : ""; //$NON-NLS-1$
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.viewers.IContentProvider#dispose()
- */
-
- public void dispose()
- {
- // nothing to dispose
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.viewers.ITableLabelProvider#getColumnImage(java.lang.Object, int)
- */
- public Image getColumnImage(Object element, int columnIndex)
- {
- return null;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.viewers.IBaseLabelProvider#addListener(org.eclipse.jface.viewers.ILabelProviderListener)
- */
- public void addListener(ILabelProviderListener listener)
- {
- // TODO: no support for listeners?
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.viewers.IBaseLabelProvider#isLabelProperty(java.lang.Object, java.lang.String)
- */
- public boolean isLabelProperty(Object element, String property)
- {
- return false;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.viewers.IBaseLabelProvider#removeListener(org.eclipse.jface.viewers.ILabelProviderListener)
- */
- public void removeListener(ILabelProviderListener listener)
- {
- // TODO: no support for listeners?
- }
- }
-
- /**
- * The default constructor
- */
- public JSFHtmlInputOthersSection()
- {
- super();
- }
-
- public void createControls(Composite parent, TabbedPropertySheetPage aTabbedPropertySheetPage)
- {
- super.createControls(parent, aTabbedPropertySheetPage);
- TabbedPropertySheetWidgetFactory factory = aTabbedPropertySheetPage.getWidgetFactory();
- Composite top = factory.createFlatFormComposite(parent);
-
- GridLayout layout = new GridLayout();
- layout.numColumns = 4;
- top.setLayout(layout);
-
- createValidatePart(factory, top);
-
- createConvertPart(factory, top);
-
- createListenPart(factory, top);
- }
-
- /**
- * @param factory
- * @param other
- */
- private void createConvertPart(TabbedPropertySheetWidgetFactory factory, Composite other)
- {
- GridData data;
- _convertorsTable = factory.createTable(other, SWT.FULL_SELECTION | SWT.MULTI);
- data = new GridData(GridData.FILL_BOTH);
- data.horizontalSpan = 3;
- data.verticalSpan = 3;
- data.heightHint = 50;
- _convertorsTable.setHeaderVisible(true);
- _convertorsTable.setLayoutData(data);
- _convertorsTable.setLinesVisible(true);
-
- TableColumn convertColumn = new TableColumn(_convertorsTable, SWT.NONE);
- convertColumn.setText(SectionResources.getString("JSFHtmlInputTextSection.Converter")); //$NON-NLS-1$
- convertColumn.setWidth(150);
-
- _convertorsViewer = new TableViewer(_convertorsTable);
- _convertorsViewer.setContentProvider(new ConvertContentLabelProvider());
- _convertorsViewer.setLabelProvider(new ConvertContentLabelProvider());
- _convertorsViewer.addDoubleClickListener(new IDoubleClickListener()
- {
- public void doubleClick(DoubleClickEvent event)
- {
- IStructuredSelection selection = (IStructuredSelection) event.getSelection();
- if (selection != null)
- {
- IDOMElement node = (IDOMElement) selection.getFirstElement();
- gotoNode(node);
- }
- }
- });
- _convertorsViewer.addSelectionChangedListener(new ISelectionChangedListener()
- {
- public void selectionChanged(SelectionChangedEvent event)
- {
- updateConvertButtonStatus();
- }
- });
-
- _convertTypeCombo = factory.createCCombo(other, SWT.READ_ONLY);
- _convertTypeCombo.setItems(CONVERTTYPES);
- _convertTypeCombo.select(0);
- data = new GridData(GridData.HORIZONTAL_ALIGN_FILL);
- _convertTypeCombo.setLayoutData(data);
-
- _convertAddButton = factory.createButton(other, SectionResources.getString("JSFHtmlInputTextSection.Add"), //$NON-NLS-1$
- SWT.NONE);
- data = new GridData(GridData.HORIZONTAL_ALIGN_FILL);
- _convertAddButton.setLayoutData(data);
- _convertAddButton.addSelectionListener(new SelectionAdapter()
- {
- public void widgetSelected(SelectionEvent e)
- {
- Map attributes = new HashMap();
- AddSubNodeCommand c = new AddSubNodeCommand(SectionResources
- .getString("JSFHtmlInputTextSection.CommandLabel.AddSubTag"), _element, "convert" //$NON-NLS-1$ //$NON-NLS-2$
- + _convertTypeCombo.getText(), ITLDConstants.URI_JSF_CORE, attributes);
- c.execute();
- _convertorsViewer.refresh();
- updateConvertButtonStatus();
- }
- });
- _convertRemoveButton = factory.createButton(other,
- SectionResources.getString("JSFHtmlInputTextSection.Remove"), SWT.NONE); //$NON-NLS-1$
- data = new GridData(GridData.HORIZONTAL_ALIGN_FILL);
- _convertRemoveButton.setLayoutData(data);
- _convertRemoveButton.addSelectionListener(new SelectionAdapter()
- {
- public void widgetSelected(SelectionEvent e)
- {
- IStructuredSelection selection = (IStructuredSelection) _convertorsViewer.getSelection();
- if (selection != null)
- {
- for (Iterator i = selection.iterator(); i.hasNext();)
- {
- IDOMElement node = (IDOMElement) i.next();
- RemoveSubNodeCommand c = new RemoveSubNodeCommand(SectionResources
- .getString("JSFHtmlInputTextSection.CommandLabel.RemoveSubTag"), _element, node); //$NON-NLS-1$
- c.execute();
- }
- _convertorsViewer.refresh();
- updateConvertButtonStatus();
- }
- }
- });
- }
-
- /**
- * @param factory
- * @param other
- */
- private void createListenPart(TabbedPropertySheetWidgetFactory factory, Composite other)
- {
- GridData data;
- _listenersTable = factory.createTable(other, SWT.FULL_SELECTION | SWT.MULTI);
- data = new GridData(GridData.FILL_BOTH);
- data.horizontalSpan = 3;
- data.verticalSpan = 3;
- data.heightHint = 50;
- _listenersTable.setHeaderVisible(true);
- _listenersTable.setLayoutData(data);
- _listenersTable.setLinesVisible(true);
-
- TableColumn listenColumn = new TableColumn(_listenersTable, SWT.NONE);
- listenColumn.setText(SectionResources.getString("JSFHtmlInputTextSection.Listeners")); //$NON-NLS-1$
- listenColumn.setWidth(150);
-
- _listenersViewer = new TableViewer(_listenersTable);
- _listenersViewer.setContentProvider(new ListenerContentLabelProvider());
- _listenersViewer.setLabelProvider(new ListenerContentLabelProvider());
- _listenersViewer.addDoubleClickListener(new IDoubleClickListener()
- {
- public void doubleClick(DoubleClickEvent event)
- {
- IStructuredSelection selection = (IStructuredSelection) event.getSelection();
- if (selection != null)
- {
- IDOMElement node = (IDOMElement) selection.getFirstElement();
- gotoNode(node);
- }
- }
- });
- _listenersViewer.addSelectionChangedListener(new ISelectionChangedListener()
- {
- public void selectionChanged(SelectionChangedEvent event)
- {
- updateListenButtonStatus();
- }
- });
-
- _listenTypeCombo = factory.createCCombo(other, SWT.READ_ONLY);
- _listenTypeCombo.setItems(LISTENTYPES);
- _listenTypeCombo.select(0);
- data = new GridData(GridData.HORIZONTAL_ALIGN_FILL);
- _listenTypeCombo.setLayoutData(data);
-
- _listenAddButton = factory.createButton(other, SectionResources.getString("JSFHtmlInputTextSection.Add"), //$NON-NLS-1$
- SWT.NONE);
- data = new GridData(GridData.HORIZONTAL_ALIGN_FILL);
- _listenAddButton.setLayoutData(data);
- _listenAddButton.addSelectionListener(new SelectionAdapter()
- {
- public void widgetSelected(SelectionEvent e)
- {
- Map attributes = new HashMap();
- String listener = _listenTypeCombo.getText();
- listener = listener.substring(0, 1).toLowerCase() + listener.substring(1) + "Listener"; //$NON-NLS-1$
- AddSubNodeCommand c = new AddSubNodeCommand(
- SectionResources.getString("JSFHtmlInputTextSection.CommandLabel.AddSubTag"), _element, listener, ITLDConstants.URI_JSF_CORE, attributes); //$NON-NLS-1$
- c.execute();
- _listenersViewer.refresh();
- updateListenButtonStatus();
- }
- });
- _listenRemoveButton = factory.createButton(other,
- SectionResources.getString("JSFHtmlInputTextSection.Remove"), SWT.NONE); //$NON-NLS-1$
- data = new GridData(GridData.HORIZONTAL_ALIGN_FILL);
- _listenRemoveButton.setLayoutData(data);
- _listenRemoveButton.addSelectionListener(new SelectionAdapter()
- {
- public void widgetSelected(SelectionEvent e)
- {
- IStructuredSelection selection = (IStructuredSelection) _listenersViewer.getSelection();
- if (selection != null)
- {
- for (Iterator i = selection.iterator(); i.hasNext();)
- {
- IDOMElement node = (IDOMElement) i.next();
- RemoveSubNodeCommand c = new RemoveSubNodeCommand(SectionResources
- .getString("JSFHtmlInputTextSection.CommandLabel.RemoveSubTag"), _element, node); //$NON-NLS-1$
- c.execute();
- }
- _listenersViewer.refresh();
- updateListenButtonStatus();
- }
- }
- });
- }
-
- /**
- * @param factory
- * @param other
- */
- private void createValidatePart(TabbedPropertySheetWidgetFactory factory, Composite other)
- {
- GridData data;
- _validatorsTable = factory.createTable(other, SWT.FULL_SELECTION | SWT.MULTI);
- data = new GridData(GridData.FILL_BOTH);
- data.horizontalSpan = 3;
- data.verticalSpan = 3;
- data.heightHint = 50;
- _validatorsTable.setHeaderVisible(true);
- _validatorsTable.setLayoutData(data);
- _validatorsTable.setLinesVisible(true);
-
- TableColumn validateColumn = new TableColumn(_validatorsTable, SWT.NONE);
- validateColumn.setText(SectionResources.getString("JSFHtmlInputTextSection.Validators")); //$NON-NLS-1$
- validateColumn.setWidth(150);
-
- TableColumn minColumn = new TableColumn(_validatorsTable, SWT.NONE);
- minColumn.setText(SectionResources.getString("JSFHtmlInputTextSection.Minimum")); //$NON-NLS-1$
- minColumn.setWidth(100);
-
- TableColumn maxColumn = new TableColumn(_validatorsTable, SWT.NONE);
- maxColumn.setText(SectionResources.getString("JSFHtmlInputTextSection.Maximum")); //$NON-NLS-1$
- maxColumn.setWidth(100);
-
- _validatorsViewer = new TableViewer(_validatorsTable);
- _validatorsViewer.setColumnProperties(VALIDATORS_COLUMN_NAMES);
-
- CellEditor[] editors = new CellEditor[VALIDATORS_COLUMN_NAMES.length];
- TextCellEditor textEditor = new TextCellEditor(_validatorsTable);
- editors[0] = textEditor;
- textEditor = new TextCellEditor(_validatorsTable);
- editors[1] = textEditor;
- textEditor = new TextCellEditor(_validatorsTable);
- editors[2] = textEditor;
-
- _validatorsViewer.setCellEditors(editors);
- _validatorsViewer.setCellModifier(new ValidateCellModifier());
- _validatorsViewer.setContentProvider(new ValidateContentLabelProvider());
- _validatorsViewer.setLabelProvider(new ValidateContentLabelProvider());
- _validatorsViewer.addDoubleClickListener(new IDoubleClickListener()
- {
- public void doubleClick(DoubleClickEvent event)
- {
- IStructuredSelection selection = (IStructuredSelection) event.getSelection();
- if (selection != null)
- {
- IDOMElement node = (IDOMElement) selection.getFirstElement();
- gotoNode(node);
- }
- }
- });
- _validatorsViewer.addSelectionChangedListener(new ISelectionChangedListener()
- {
- public void selectionChanged(SelectionChangedEvent event)
- {
- updateValidateButtonStatus();
- }
- });
-
- _validateTypeCombo = factory.createCCombo(other, SWT.READ_ONLY);
- _validateTypeCombo.setItems(VALIDATETYPES);
- _validateTypeCombo.select(0);
- data = new GridData(GridData.HORIZONTAL_ALIGN_FILL);
- _validateTypeCombo.setLayoutData(data);
-
- _validateAddButton = factory.createButton(other, SectionResources.getString("JSFHtmlInputTextSection.Add"), //$NON-NLS-1$
- SWT.NONE);
- data = new GridData(GridData.HORIZONTAL_ALIGN_FILL);
- _validateAddButton.setLayoutData(data);
- _validateAddButton.addSelectionListener(new SelectionAdapter()
- {
- public void widgetSelected(SelectionEvent e)
- {
- Map attributes = new HashMap();
- AddSubNodeCommand c = new AddSubNodeCommand(SectionResources
- .getString("JSFHtmlInputTextSection.CommandLabel.AddSubTag"), _element, "validate" //$NON-NLS-1$ //$NON-NLS-2$
- + _validateTypeCombo.getText(), ITLDConstants.URI_JSF_CORE, attributes);
- c.execute();
- _validatorsViewer.refresh();
- updateValidateButtonStatus();
- }
- });
- _validateRemoveButton = factory.createButton(other, SectionResources
- .getString("JSFHtmlInputTextSection.Remove"), SWT.NONE); //$NON-NLS-1$
- data = new GridData(GridData.HORIZONTAL_ALIGN_FILL);
- _validateRemoveButton.setLayoutData(data);
- _validateRemoveButton.addSelectionListener(new SelectionAdapter()
- {
- public void widgetSelected(SelectionEvent e)
- {
- IStructuredSelection selection = (IStructuredSelection) _validatorsViewer.getSelection();
- if (selection != null)
- {
- for (Iterator i = selection.iterator(); i.hasNext();)
- {
- IDOMElement node = (IDOMElement) i.next();
- RemoveSubNodeCommand c = new RemoveSubNodeCommand(SectionResources
- .getString("JSFHtmlInputTextSection.CommandLabel.RemoveSubTag"), _element, node); //$NON-NLS-1$
- c.execute();
- }
- _validatorsViewer.refresh();
- updateValidateButtonStatus();
- }
- }
- });
- }
-
- private void updateValidateButtonStatus()
- {
- _validateRemoveButton.setEnabled(true);
- ISelection selection = _validatorsViewer.getSelection();
- if (selection == null || selection.isEmpty())
- {
- _validateRemoveButton.setEnabled(false);
- }
- if (_validatorsTable.getItemCount() == 0)
- {
- _validateRemoveButton.setEnabled(false);
- }
- }
-
- private void updateConvertButtonStatus()
- {
- _convertAddButton.setEnabled(true);
- _convertRemoveButton.setEnabled(true);
- ISelection selection = _convertorsViewer.getSelection();
- if (selection == null || selection.isEmpty())
- {
- _convertRemoveButton.setEnabled(false);
- }
- if (_convertorsTable.getItemCount() == 0)
- {
- _convertRemoveButton.setEnabled(false);
- }
- if (_convertorsTable.getItemCount() > 0)
- {
- _convertAddButton.setEnabled(false);
- }
- }
-
- private void updateListenButtonStatus()
- {
- _listenRemoveButton.setEnabled(true);
- ISelection selection = _listenersViewer.getSelection();
- if (selection == null || selection.isEmpty())
- {
- _listenRemoveButton.setEnabled(false);
- }
- if (_listenersTable.getItemCount() == 0)
- {
- _listenRemoveButton.setEnabled(false);
- }
- }
-
- public void setInput(IWorkbenchPart part, ISelection selection)
- {
- super.setInput(part, selection);
-
- _validatorsViewer.setInput(_element);
- updateValidateButtonStatus();
-
- _convertorsViewer.setInput(_element);
- updateConvertButtonStatus();
-
- _listenersViewer.setInput(_element);
- updateListenButtonStatus();
- }
-
- private List getColumnNames()
- {
- return Arrays.asList(VALIDATORS_COLUMN_NAMES);
- }
-
- protected void notifyChanged(INodeNotifier notifier, int eventType, Object changedFeature, Object oldValue, Object newValue, int pos)
- {
- if(_validatorsViewer != null && !_validatorsViewer.getControl().isDisposed())
- {
- _validatorsViewer.refresh();
- _convertorsViewer.refresh();
- _listenersViewer.refresh();
- }
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/sections/JSFHtmlInputSecretTypeSection.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/sections/JSFHtmlInputSecretTypeSection.java
deleted file mode 100644
index 76b49ea..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/sections/JSFHtmlInputSecretTypeSection.java
+++ /dev/null
@@ -1,165 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http:// www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.pagedesigner.jsf.ui.sections;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jst.jsf.common.ui.internal.dialogfield.DialogField;
-import org.eclipse.jst.jsf.common.ui.internal.dialogfield.IDialogFieldApplyListener;
-import org.eclipse.jst.jsf.common.ui.internal.dialogfield.LayoutUtil;
-import org.eclipse.jst.jsf.common.ui.internal.dialogfield.RadiosDialogField;
-import org.eclipse.jst.jsf.core.internal.tld.IJSFConstants;
-import org.eclipse.jst.pagedesigner.commands.single.ChangeTagCommand;
-import org.eclipse.jst.pagedesigner.properties.BaseCustomSection;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetPage;
-import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetWidgetFactory;
-import org.eclipse.wst.sse.core.internal.provisional.INodeNotifier;
-
-/**
- * @author mengbo
- * @version 1.5
- */
-public class JSFHtmlInputSecretTypeSection extends BaseCustomSection
-{
- private RadiosDialogField _typesField;
-
- final private static String[] TYPES = { SectionResources.getString("JSFHtmlInputHiddenSection.Type0"), //$NON-NLS-1$
- SectionResources.getString("JSFHtmlInputHiddenSection.Type1"), //$NON-NLS-1$
- SectionResources.getString("JSFHtmlInputHiddenSection.Type2"), //$NON-NLS-1$
- SectionResources.getString("JSFHtmlInputHiddenSection.Type3") //$NON-NLS-1$
- };
-
- /**
- * The default constructor
- */
- public JSFHtmlInputSecretTypeSection()
- {
- super();
- _typesField = new RadiosDialogField();
- _typesField.setLabelText(SectionResources.getString("JSFHtmlInputHiddenSection.Type")); //$NON-NLS-1$
- _typesField.setItems(TYPES);
- _typesField.setDialogFieldApplyListener(new IDialogFieldApplyListener()
- {
- public void dialogFieldApplied(DialogField field)
- {
- int type = _typesField.getSelectedIndex();
- String prefix = _element.getPrefix();
- String localTag = toLocalTag(type);
- String newtag = prefix + ":" + localTag; //$NON-NLS-1$
- Map attrs = new HashMap();
- if (type == IInputWidgetTypes.TEXTAREA)
- {
- // need to change "size" attribute to "cols"
- String size = _element.getAttribute(IJSFConstants.ATTR_SIZE);
- if (size != null && size.length() != 0)
- {
- attrs.put(IJSFConstants.ATTR_SIZE, null);
- attrs.put(IJSFConstants.ATTR_COLS, size);
- }
- }
- else
- {
- // need to change "cols" attribute to "size"
- String size = _element.getAttribute(IJSFConstants.ATTR_COLS);
- if (size != null && size.length() != 0)
- {
- attrs.put(IJSFConstants.ATTR_COLS, null);
- attrs.put(IJSFConstants.ATTR_SIZE, size);
- }
- }
- ChangeTagCommand c = new ChangeTagCommand(SectionResources
- .getString("JSFHtmlInputHidden.CommandLabel.ChangeType"), _element, newtag, attrs, true); //$NON-NLS-1$
- c.execute();
- _element = c.getNewElement();
- }
- });
- }
-
- public void createControls(Composite parent, TabbedPropertySheetPage aTabbedPropertySheetPage)
- {
- super.createControls(parent, aTabbedPropertySheetPage);
- TabbedPropertySheetWidgetFactory factory = aTabbedPropertySheetPage.getWidgetFactory();
- Composite top = factory.createFlatFormComposite(parent);
-
- int numberOfColumns = _typesField.getNumberOfControls();
- GridLayout layout = new GridLayout(numberOfColumns, false);
- top.setLayout(layout);
-
- _typesField.doFillIntoGrid(factory, top, numberOfColumns);
- LayoutUtil.setGrabHorizontal(_typesField.getGroup(factory, top), true);
- }
-
- private String toLocalTag(int type)
- {
- switch (type)
- {
- case IInputWidgetTypes.SECRET:
- return IJSFConstants.TAG_INPUTSECRET;
- case IInputWidgetTypes.HIDDEN:
- return IJSFConstants.TAG_INPUTHIDDEN;
- case IInputWidgetTypes.TEXTAREA:
- return IJSFConstants.TAG_INPUTTEXTAREA;
- case IInputWidgetTypes.TEXT:
- return IJSFConstants.TAG_INPUTTEXT;
- default:
- return IJSFConstants.TAG_INPUTHIDDEN;
- }
- }
-
- public void setInput(IWorkbenchPart part, ISelection selection)
- {
- super.setInput(part, selection);
- _typesField.setSelectedIndexWithoutUpdate(getInputType());
- }
-
- /**
- * @return the input type
- */
- public int getInputType()
- {
- String localTag = _element.getLocalName();
- if (IJSFConstants.TAG_INPUTTEXT.equals(localTag))
- {
- return IInputWidgetTypes.TEXT;
- }
- else if (IJSFConstants.TAG_INPUTSECRET.equals(localTag))
- {
- return IInputWidgetTypes.SECRET;
- }
- else if (IJSFConstants.TAG_INPUTHIDDEN.equals(localTag))
- {
- return IInputWidgetTypes.HIDDEN;
- }
- else if (IJSFConstants.TAG_INPUTTEXTAREA.equals(localTag))
- {
- return IInputWidgetTypes.TEXTAREA;
- }
- else
- {
- return IInputWidgetTypes.HIDDEN;
- }
- }
-
- protected void notifyChanged(INodeNotifier notifier, int eventType, Object changedFeature, Object oldValue,
- Object newValue, int pos)
- {
- if (_typesField != null)
- {
- _typesField.setSelectedIndexWithoutUpdate(getInputType());
- }
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/sections/JSFHtmlInputTextTypeSection.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/sections/JSFHtmlInputTextTypeSection.java
deleted file mode 100644
index 26befdf..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/sections/JSFHtmlInputTextTypeSection.java
+++ /dev/null
@@ -1,166 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http:// www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.pagedesigner.jsf.ui.sections;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jst.jsf.common.ui.internal.dialogfield.DialogField;
-import org.eclipse.jst.jsf.common.ui.internal.dialogfield.IDialogFieldApplyListener;
-import org.eclipse.jst.jsf.common.ui.internal.dialogfield.LayoutUtil;
-import org.eclipse.jst.jsf.common.ui.internal.dialogfield.RadiosDialogField;
-import org.eclipse.jst.jsf.core.internal.tld.IJSFConstants;
-import org.eclipse.jst.pagedesigner.commands.single.ChangeTagCommand;
-import org.eclipse.jst.pagedesigner.properties.BaseCustomSection;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetPage;
-import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetWidgetFactory;
-import org.eclipse.wst.sse.core.internal.provisional.INodeNotifier;
-
-/**
- * @author mengbo
- * @version 1.5
- */
-public class JSFHtmlInputTextTypeSection extends BaseCustomSection
-{
- private RadiosDialogField _typesField;
-
- final private static String[] TYPES = { SectionResources.getString("JSFHtmlInputHiddenSection.Type0"), //$NON-NLS-1$
- SectionResources.getString("JSFHtmlInputHiddenSection.Type1"), //$NON-NLS-1$
- SectionResources.getString("JSFHtmlInputHiddenSection.Type2"), //$NON-NLS-1$
- SectionResources.getString("JSFHtmlInputHiddenSection.Type3") //$NON-NLS-1$
- };
-
- /**
- * The default constructor
- */
- public JSFHtmlInputTextTypeSection()
- {
- super();
- _typesField = new RadiosDialogField();
- _typesField.setLabelText(SectionResources.getString("JSFHtmlInputHiddenSection.Type")); //$NON-NLS-1$
- _typesField.setItems(TYPES);
- _typesField.setDialogFieldApplyListener(new IDialogFieldApplyListener()
- {
- public void dialogFieldApplied(DialogField field)
- {
- int type = _typesField.getSelectedIndex();
- String prefix = _element.getPrefix();
- String localTag = toLocalTag(type);
- String newtag = prefix + ":" + localTag; //$NON-NLS-1$
- Map attrs = new HashMap();
- if (type == IInputWidgetTypes.TEXTAREA)
- {
- // need to change "size" attribute to "cols"
- String size = _element.getAttribute(IJSFConstants.ATTR_SIZE);
- if (size != null && size.length() != 0)
- {
- attrs.put(IJSFConstants.ATTR_SIZE, null);
- attrs.put(IJSFConstants.ATTR_COLS, size);
- }
- }
- else
- {
- // need to change "cols" attribute to "size"
- String size = _element.getAttribute(IJSFConstants.ATTR_COLS);
- if (size != null && size.length() != 0)
- {
- attrs.put(IJSFConstants.ATTR_COLS, null);
- attrs.put(IJSFConstants.ATTR_SIZE, size);
- }
- }
- ChangeTagCommand c = new ChangeTagCommand(SectionResources
- .getString("JSFHtmlInputHidden.CommandLabel.ChangeType"), _element, newtag, attrs, true); //$NON-NLS-1$
- c.execute();
- _element = c.getNewElement();
- }
- });
- }
-
- public void createControls(Composite parent, TabbedPropertySheetPage aTabbedPropertySheetPage)
- {
- super.createControls(parent, aTabbedPropertySheetPage);
- TabbedPropertySheetWidgetFactory factory = aTabbedPropertySheetPage.getWidgetFactory();
- Composite top = factory.createFlatFormComposite(parent);
-
- int numberOfColumns = _typesField.getNumberOfControls();
- GridLayout layout = new GridLayout(numberOfColumns, false);
- top.setLayout(layout);
-
- _typesField.doFillIntoGrid(factory, top, numberOfColumns);
- LayoutUtil.setGrabHorizontal(_typesField.getGroup(factory, top), true);
- }
-
- private String toLocalTag(int type)
- {
- switch (type)
- {
- case IInputWidgetTypes.SECRET:
- return IJSFConstants.TAG_INPUTSECRET;
- case IInputWidgetTypes.HIDDEN:
- return IJSFConstants.TAG_INPUTHIDDEN;
- case IInputWidgetTypes.TEXTAREA:
- return IJSFConstants.TAG_INPUTTEXTAREA;
- case IInputWidgetTypes.TEXT:
- return IJSFConstants.TAG_INPUTTEXT;
- default:
- return IJSFConstants.TAG_INPUTHIDDEN;
- }
- }
-
- public void setInput(IWorkbenchPart part, ISelection selection)
- {
- super.setInput(part, selection);
-
- _typesField.setSelectedIndexWithoutUpdate(getInputType());
- }
-
- /**
- * @return the input type. One of IInputWidgetTypes.
- */
- public int getInputType()
- {
- String localTag = _element.getLocalName();
- if (IJSFConstants.TAG_INPUTTEXT.equals(localTag))
- {
- return IInputWidgetTypes.TEXT;
- }
- else if (IJSFConstants.TAG_INPUTSECRET.equals(localTag))
- {
- return IInputWidgetTypes.SECRET;
- }
- else if (IJSFConstants.TAG_INPUTHIDDEN.equals(localTag))
- {
- return IInputWidgetTypes.HIDDEN;
- }
- else if (IJSFConstants.TAG_INPUTTEXTAREA.equals(localTag))
- {
- return IInputWidgetTypes.TEXTAREA;
- }
- else
- {
- return IInputWidgetTypes.HIDDEN;
- }
- }
-
- protected void notifyChanged(INodeNotifier notifier, int eventType, Object changedFeature, Object oldValue,
- Object newValue, int pos)
- {
- if (_typesField != null)
- {
- _typesField.setSelectedIndexWithoutUpdate(getInputType());
- }
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/sections/JSFHtmlInputTextareaTypeSection.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/sections/JSFHtmlInputTextareaTypeSection.java
deleted file mode 100644
index 5696ccc..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/sections/JSFHtmlInputTextareaTypeSection.java
+++ /dev/null
@@ -1,168 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http:// www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.pagedesigner.jsf.ui.sections;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jst.jsf.common.ui.internal.dialogfield.DialogField;
-import org.eclipse.jst.jsf.common.ui.internal.dialogfield.IDialogFieldApplyListener;
-import org.eclipse.jst.jsf.common.ui.internal.dialogfield.LayoutUtil;
-import org.eclipse.jst.jsf.common.ui.internal.dialogfield.RadiosDialogField;
-import org.eclipse.jst.jsf.core.internal.tld.IJSFConstants;
-import org.eclipse.jst.pagedesigner.commands.single.ChangeTagCommand;
-import org.eclipse.jst.pagedesigner.properties.BaseCustomSection;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetPage;
-import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetWidgetFactory;
-import org.eclipse.wst.sse.core.internal.provisional.INodeNotifier;
-
-/**
- * FIXME: there is a lot of copied code for this input sections
- * @author mengbo
- * @version 1.5
- */
-public class JSFHtmlInputTextareaTypeSection extends BaseCustomSection
-{
- private RadiosDialogField _typesField;
-
- final private static String[] TYPES = { SectionResources.getString("JSFHtmlInputHiddenSection.Type0"), //$NON-NLS-1$
- SectionResources.getString("JSFHtmlInputHiddenSection.Type1"), //$NON-NLS-1$
- SectionResources.getString("JSFHtmlInputHiddenSection.Type2"), //$NON-NLS-1$
- SectionResources.getString("JSFHtmlInputHiddenSection.Type3") //$NON-NLS-1$
- };
-
- /**
- * The default constructor
- */
- public JSFHtmlInputTextareaTypeSection()
- {
- super();
- _typesField = new RadiosDialogField();
- _typesField.setLabelText(SectionResources.getString("JSFHtmlInputHiddenSection.Type")); //$NON-NLS-1$
- _typesField.setItems(TYPES);
- _typesField.setDialogFieldApplyListener(new IDialogFieldApplyListener()
- {
- public void dialogFieldApplied(DialogField field)
- {
- int type = _typesField.getSelectedIndex();
- String prefix = _element.getPrefix();
- String localTag = toLocalTag(type);
- String newtag = prefix + ":" + localTag; //$NON-NLS-1$
- Map attrs = new HashMap();
- if (type == IInputWidgetTypes.TEXTAREA)
- {
- // need to change "size" attribute to "cols"
- String size = _element.getAttribute(IJSFConstants.ATTR_SIZE);
- if (size != null && size.length() != 0)
- {
- attrs.put(IJSFConstants.ATTR_SIZE, null);
- attrs.put(IJSFConstants.ATTR_COLS, size);
- }
- }
- else
- {
- // need to change "cols" attribute to "size"
- String size = _element.getAttribute(IJSFConstants.ATTR_COLS);
- if (size != null && size.length() != 0)
- {
- attrs.put(IJSFConstants.ATTR_COLS, null);
- attrs.put(IJSFConstants.ATTR_SIZE, size);
- }
- }
- ChangeTagCommand c = new ChangeTagCommand(SectionResources
- .getString("JSFHtmlInputHidden.CommandLabel.ChangeType"), _element, newtag, attrs, true); //$NON-NLS-1$
- c.execute();
- _element = c.getNewElement();
- }
- });
- }
-
- public void createControls(Composite parent, TabbedPropertySheetPage aTabbedPropertySheetPage)
- {
- super.createControls(parent, aTabbedPropertySheetPage);
- TabbedPropertySheetWidgetFactory factory = aTabbedPropertySheetPage.getWidgetFactory();
- Composite top = factory.createFlatFormComposite(parent);
-
- int numberOfColumns = _typesField.getNumberOfControls();
- GridLayout layout = new GridLayout(numberOfColumns, false);
- top.setLayout(layout);
-
- _typesField.doFillIntoGrid(factory, top, numberOfColumns);
- LayoutUtil.setGrabHorizontal(_typesField.getGroup(factory, top), true);
- }
-
- private String toLocalTag(int type)
- {
- switch (type)
- {
- case IInputWidgetTypes.SECRET:
- return IJSFConstants.TAG_INPUTSECRET;
- case IInputWidgetTypes.HIDDEN:
- return IJSFConstants.TAG_INPUTHIDDEN;
- case IInputWidgetTypes.TEXTAREA:
- return IJSFConstants.TAG_INPUTTEXTAREA;
- case IInputWidgetTypes.TEXT:
- return IJSFConstants.TAG_INPUTTEXT;
- default:
- return IJSFConstants.TAG_INPUTHIDDEN;
- }
- }
-
- public void setInput(IWorkbenchPart part, ISelection selection)
- {
- super.setInput(part, selection);
-
- _typesField.setSelectedIndexWithoutUpdate(getInputType());
- }
-
- /**
- * @return one of IInputWidgetTypes
- */
- public int getInputType()
- {
- String localTag = _element.getLocalName();
- if (IJSFConstants.TAG_INPUTTEXT.equals(localTag))
- {
- return IInputWidgetTypes.TEXT;
- }
- else if (IJSFConstants.TAG_INPUTSECRET.equals(localTag))
- {
- return IInputWidgetTypes.SECRET;
- }
- else if (IJSFConstants.TAG_INPUTHIDDEN.equals(localTag))
- {
- return IInputWidgetTypes.HIDDEN;
- }
- else if (IJSFConstants.TAG_INPUTTEXTAREA.equals(localTag))
- {
- return IInputWidgetTypes.TEXTAREA;
- }
- else
- {
- return IInputWidgetTypes.HIDDEN;
- }
- }
-
- protected void notifyChanged(INodeNotifier notifier, int eventType, Object changedFeature, Object oldValue,
- Object newValue, int pos)
- {
- if (_typesField != null)
- {
- _typesField.setSelectedIndexWithoutUpdate(getInputType());
- }
-
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/sections/JSFHtmlOutputFormatParamsSection.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/sections/JSFHtmlOutputFormatParamsSection.java
deleted file mode 100644
index 1d307cf..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/sections/JSFHtmlOutputFormatParamsSection.java
+++ /dev/null
@@ -1,401 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http:// www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.pagedesigner.jsf.ui.sections;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.jface.viewers.CellEditor;
-import org.eclipse.jface.viewers.DoubleClickEvent;
-import org.eclipse.jface.viewers.ICellModifier;
-import org.eclipse.jface.viewers.IDoubleClickListener;
-import org.eclipse.jface.viewers.ILabelProviderListener;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.ITableLabelProvider;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jface.viewers.TextCellEditor;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jst.jsf.core.internal.tld.IJSFConstants;
-import org.eclipse.jst.jsf.core.internal.tld.ITLDConstants;
-import org.eclipse.jst.pagedesigner.commands.single.AddSubNodeCommand;
-import org.eclipse.jst.pagedesigner.commands.single.ChangeAttributeCommand;
-import org.eclipse.jst.pagedesigner.commands.single.RemoveSubNodeCommand;
-import org.eclipse.jst.pagedesigner.properties.BaseCustomSection;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.TableColumn;
-import org.eclipse.swt.widgets.TableItem;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetPage;
-import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetWidgetFactory;
-import org.eclipse.wst.sse.core.internal.provisional.INodeNotifier;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMElement;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-/**
- * @author mengbo
- * @version 1.5
- */
-public class JSFHtmlOutputFormatParamsSection extends BaseCustomSection
-{
- private Table _paramTable;
- private TableViewer _paramViewer;
- private Button _paramAddButton, _paramRemoveButton;
-
- private String[] _columnNames =
- {
- "name", "value" //$NON-NLS-1$ //$NON-NLS-2$
- }
- ;
-
- private class ParamCotentLabelProvider implements IStructuredContentProvider, ITableLabelProvider
- {
- /* (non-Javadoc)
- * @see org.eclipse.jface.viewers.IStructuredContentProvider#getElements(java.lang.Object)
- */
- public Object[] getElements(Object inputElement)
- {
- IDOMElement root = _element;
- List result = new ArrayList();
-
- NodeList children = root.getChildNodes();
- for (int i = 0, n = children.getLength(); i < n; i++)
- {
- Node child = children.item(i);
- if (child.getNodeType() == Node.ELEMENT_NODE)
- {
- IDOMElement element = (IDOMElement) child;
- String nodeName = element.getNodeName();
- if (nodeName.indexOf("param") != -1) //$NON-NLS-1$
- {
- result.add(child);
- }
- }
- }
-
- if (result.isEmpty())
- {
- return new Object[0];
- }
-
- return result.toArray(new IDOMElement[result.size()]);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.viewers.IContentProvider#inputChanged(org.eclipse.jface.viewers.Viewer, java.lang.Object, java.lang.Object)
- */
- public void inputChanged(Viewer viewer, Object oldInput, Object newInput)
- {
- // do nothing
- }
-
- public String getColumnText(Object element, int columnIndex)
- {
- String result = null;
- if (element instanceof IDOMElement)
- {
- IDOMElement node = (IDOMElement) element;
- switch (columnIndex)
- {
- case 0:
- result = node.getAttribute(IJSFConstants.ATTR_NAME);
- break;
- case 1:
- result = node.getAttribute(IJSFConstants.ATTR_VALUE);
- break;
- default:
- break;
- }
- }
- return result != null ? result : ""; //$NON-NLS-1$
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.viewers.IContentProvider#dispose()
- */
-
- public void dispose()
- {
- // nothing to dispose
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.viewers.ITableLabelProvider#getColumnImage(java.lang.Object, int)
- */
- public Image getColumnImage(Object element, int columnIndex)
- {
- return null;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.viewers.IBaseLabelProvider#addListener(org.eclipse.jface.viewers.ILabelProviderListener)
- */
- public void addListener(ILabelProviderListener listener)
- {
- // TODO: no support for listeners?
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.viewers.IBaseLabelProvider#isLabelProperty(java.lang.Object, java.lang.String)
- */
- public boolean isLabelProperty(Object element, String property)
- {
- return false;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.viewers.IBaseLabelProvider#removeListener(org.eclipse.jface.viewers.ILabelProviderListener)
- */
- public void removeListener(ILabelProviderListener listener)
- {
- // TODO: no support for listeners?
- }
- }
-
- private class ParamCellModifier implements ICellModifier
- {
- /* (non-Javadoc)
- * @see org.eclipse.jface.viewers.ICellModifier#canModify(java.lang.Object, java.lang.String)
- */
- public boolean canModify(Object element, String property)
- {
- return true;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.viewers.ICellModifier#getValue(java.lang.Object, java.lang.String)
- */
- public Object getValue(Object element, String property)
- {
- int columnIndex = getColumnNames().indexOf(property);
-
- Object result = null;
- IDOMElement node = (IDOMElement) element;
- switch (columnIndex)
- {
- case 0: // Name
- result = node.getAttribute(IJSFConstants.ATTR_NAME);
- break;
- case 1: // Value
- result = node.getAttribute(IJSFConstants.ATTR_VALUE);
- break;
- default:
- result = ""; //$NON-NLS-1$
- }
- return result != null ? result : ""; //$NON-NLS-1$
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.viewers.ICellModifier#modify(java.lang.Object, java.lang.String, java.lang.Object)
- */
- public void modify(Object element, String property, Object value)
- {
- int columnIndex = getColumnNames().indexOf(property);
-
- TableItem item = (TableItem) element;
- IDOMElement node = (IDOMElement) item.getData();
- String valueString;
- ChangeAttributeCommand c;
- switch (columnIndex)
- {
- case 0: // Name
- valueString = ((String) value).trim();
- c = new ChangeAttributeCommand(SectionResources.getString("JSFHtmlOutputFormatSection.CommandLabel.ChangeAttribute"), node, IJSFConstants.ATTR_NAME, valueString); //$NON-NLS-1$
- c.execute();
- break;
- case 1: // Value
- valueString = ((String) value).trim();
- c = new ChangeAttributeCommand(SectionResources.getString("JSFHtmlOutputFormatSection.CommandLabel.ChangeAttribute"), node, IJSFConstants.ATTR_VALUE, valueString); //$NON-NLS-1$
- c.execute();
- break;
- default:
- break;
- }
- _paramViewer.setInput(_element);
- // TODO: does nothing updateParamButtonStatus();
- }
- }
-
- /**
- * Default constructor
- */
- public JSFHtmlOutputFormatParamsSection()
- {
- super();
- }
-
- public void createControls(Composite parent, TabbedPropertySheetPage aTabbedPropertySheetPage)
- {
- super.createControls(parent, aTabbedPropertySheetPage);
- TabbedPropertySheetWidgetFactory factory = aTabbedPropertySheetPage.getWidgetFactory();
- Composite top = factory.createFlatFormComposite(parent);
-
- GridLayout layout = new GridLayout();
- layout.numColumns = 4;
- top.setLayout(layout);
-
- createParamPart(factory, top);
- }
-
- /**
- * @param factory
- * @param other
- */
- private void createParamPart(TabbedPropertySheetWidgetFactory factory, Composite other)
- {
- GridData data;
-
- Label label = factory.createLabel(other, SectionResources.getString("JSFHtmlOutputFormatSection.Parameters")); //$NON-NLS-1$
- data = new GridData(GridData.FILL);
- data.horizontalSpan = 4;
- label.setLayoutData(data);
-
- _paramTable = factory.createTable(other, SWT.FULL_SELECTION | SWT.MULTI);
- data = new GridData(GridData.FILL_BOTH);
- data.horizontalSpan = 3;
- data.verticalSpan = 3;
- data.heightHint = 50;
- _paramTable.setHeaderVisible(true);
- _paramTable.setLinesVisible(true);
- _paramTable.setLayoutData(data);
-
- TableColumn column = new TableColumn(_paramTable, SWT.NONE);
- column.setText(SectionResources.getString("JSFHtmlOutputFormatSection.ColName")); //$NON-NLS-1$
- column.setWidth(100);
-
- column = new TableColumn(_paramTable, SWT.NONE);
- column.setText(SectionResources.getString("JSFHtmlOutputFormatSection.ColValue")); //$NON-NLS-1$
- column.setWidth(100);
-
- _paramViewer = new TableViewer(_paramTable);
- _paramViewer.setColumnProperties(_columnNames);
-
- CellEditor[] editors = new CellEditor[_columnNames.length];
- TextCellEditor textEditor = new TextCellEditor(_paramTable);
- editors[0] = textEditor;
- textEditor = new TextCellEditor(_paramTable);
- editors[1] = textEditor;
-
- _paramViewer.setCellEditors(editors);
- _paramViewer.setCellModifier(new ParamCellModifier());
- _paramViewer.setContentProvider(new ParamCotentLabelProvider());
- _paramViewer.setLabelProvider(new ParamCotentLabelProvider());
- _paramViewer.addDoubleClickListener(new IDoubleClickListener()
- {
- public void doubleClick(DoubleClickEvent event)
- {
- IStructuredSelection selection = (IStructuredSelection) event.getSelection();
- if (selection != null)
- {
- IDOMElement node = (IDOMElement) selection.getFirstElement();
- gotoNode(node);
- }
- }
- }
- );
- _paramViewer.addSelectionChangedListener(new ISelectionChangedListener()
- {
- public void selectionChanged(SelectionChangedEvent event)
- {
-// TODO: does nothing updateParamButtonStatus();
- }
- }
- );
-
- _paramAddButton = factory.createButton(other, SectionResources.getString("JSFHtmlOutputTextSection.Add"), //$NON-NLS-1$
- SWT.NONE);
- data = new GridData(GridData.HORIZONTAL_ALIGN_FILL);
- _paramAddButton.setLayoutData(data);
- _paramAddButton.addSelectionListener(new SelectionAdapter()
- {
- public void widgetSelected(SelectionEvent e)
- {
- Map attributes = new HashMap();
- attributes.put(IJSFConstants.ATTR_NAME, "name"); //$NON-NLS-1$
- attributes.put(IJSFConstants.ATTR_VALUE, "value"); //$NON-NLS-1$
- AddSubNodeCommand c = new AddSubNodeCommand(SectionResources.getString("JSFHtmlOutputFormatSection.CommandLabel.AddSubTag"), _element, "param", //$NON-NLS-1$ //$NON-NLS-2$
- ITLDConstants.URI_JSF_CORE, attributes);
- c.execute();
- _paramViewer.refresh();
-// TODO: does nothing updateParamButtonStatus();
- }
- }
- );
- _paramRemoveButton = factory.createButton(other, SectionResources.getString("JSFHtmlOutputTextSection.Remove"), //$NON-NLS-1$
- SWT.NONE);
- data = new GridData(GridData.HORIZONTAL_ALIGN_FILL);
- _paramRemoveButton.setLayoutData(data);
- _paramRemoveButton.addSelectionListener(new SelectionAdapter()
- {
- public void widgetSelected(SelectionEvent e)
- {
- IStructuredSelection selection = (IStructuredSelection) _paramViewer.getSelection();
- if (selection != null)
- {
- for (Iterator i = selection.iterator(); i.hasNext();)
- {
- IDOMElement node = (IDOMElement) i.next();
- RemoveSubNodeCommand c = new RemoveSubNodeCommand(SectionResources.getString("JSFHtmlOutputFormatSection.CommandLabel.RemoveSubTag"), _element, node); //$NON-NLS-1$
- c.execute();
- }
- _paramViewer.refresh();
-// TODO: does nothing updateParamButtonStatus();
- }
- }
- }
- );
- }
-
- // TODO: does nothing
-// private void updateParamButtonStatus()
-// {
-// }
-
- public void setInput(IWorkbenchPart part, ISelection selection)
- {
- super.setInput(part, selection);
-
- _paramViewer.setInput(_element);
-// TODO: does nothing updateParamButtonStatus();
- }
-
- private List getColumnNames()
- {
- return Arrays.asList(_columnNames);
- }
-
- protected void notifyChanged(INodeNotifier notifier, int eventType, Object changedFeature, Object oldValue, Object newValue, int pos)
- {
- if(_paramViewer != null && !_paramViewer.getControl().isDisposed())
- {
- _paramViewer.refresh();
- }
-
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/sections/JSFHtmlOutputTextConverterSection.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/sections/JSFHtmlOutputTextConverterSection.java
deleted file mode 100644
index 718dddc..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/sections/JSFHtmlOutputTextConverterSection.java
+++ /dev/null
@@ -1,321 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http:// www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.pagedesigner.jsf.ui.sections;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.jface.viewers.DoubleClickEvent;
-import org.eclipse.jface.viewers.IDoubleClickListener;
-import org.eclipse.jface.viewers.ILabelProviderListener;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.ITableLabelProvider;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jst.jsf.core.internal.tld.ITLDConstants;
-import org.eclipse.jst.pagedesigner.commands.single.AddSubNodeCommand;
-import org.eclipse.jst.pagedesigner.commands.single.RemoveSubNodeCommand;
-import org.eclipse.jst.pagedesigner.properties.BaseCustomSection;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.CCombo;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.TableColumn;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetPage;
-import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetWidgetFactory;
-import org.eclipse.wst.sse.core.internal.provisional.INodeNotifier;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMElement;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-/**
- * @author mengbo
- * @version 1.5
- */
-public class JSFHtmlOutputTextConverterSection extends BaseCustomSection
-{
- private Table _convertTable;
- private TableViewer _convertViewer;
- private Button _convertAddButton, _convertRemoveButton;
- private CCombo _convertTypeCombo;
- final private static String[] CONVERTTYPES =
- {
- "DateTime", "Number" //$NON-NLS-1$ //$NON-NLS-2$
- }
- ;
-
- private class ConvertCotentLabelProvider implements IStructuredContentProvider, ITableLabelProvider
- {
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.viewers.IStructuredContentProvider#getElements(java.lang.Object)
- */
- public Object[] getElements(Object inputElement)
- {
- IDOMElement root = _element;
- List result = new ArrayList();
-
- NodeList children = root.getChildNodes();
- for (int i = 0, n = children.getLength(); i < n; i++)
- {
- Node child = children.item(i);
- if (child.getNodeType() == Node.ELEMENT_NODE)
- {
- IDOMElement element = (IDOMElement) child;
- String nodeName = element.getNodeName();
- if (nodeName.indexOf("convert") != -1) //$NON-NLS-1$
- {
- result.add(child);
- }
- }
- }
-
- if (result.isEmpty())
- {
- return new Object[0];
- }
-
- return result.toArray(new IDOMElement[result.size()]);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.viewers.IContentProvider#inputChanged(org.eclipse.jface.viewers.Viewer, java.lang.Object, java.lang.Object)
- */
- public void inputChanged(Viewer viewer, Object oldInput, Object newInput)
- {
- // do nothing
- }
-
- public String getColumnText(Object element, int columnIndex)
- {
- String result = null;
- if (element instanceof IDOMElement)
- {
- IDOMElement node = (IDOMElement) element;
- String nodeName = node.getNodeName();
- switch (columnIndex)
- {
- case 0:
- result = nodeName;
- break;
- default:
- break;
- }
- }
- return result != null ? result : ""; //$NON-NLS-1$
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.viewers.IContentProvider#dispose()
- */
-
- public void dispose()
- {
- // nothing to dispose
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.viewers.ITableLabelProvider#getColumnImage(java.lang.Object, int)
- */
- public Image getColumnImage(Object element, int columnIndex)
- {
- return null;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.viewers.IBaseLabelProvider#addListener(org.eclipse.jface.viewers.ILabelProviderListener)
- */
- public void addListener(ILabelProviderListener listener)
- {
- // TODO: no support for listeners?
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.viewers.IBaseLabelProvider#isLabelProperty(java.lang.Object, java.lang.String)
- */
- public boolean isLabelProperty(Object element, String property)
- {
- return false;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.viewers.IBaseLabelProvider#removeListener(org.eclipse.jface.viewers.ILabelProviderListener)
- */
- public void removeListener(ILabelProviderListener listener)
- {
- // TODO: no support for listeners?
- }
-
- }
-
- /**
- * Default constructor
- */
- public JSFHtmlOutputTextConverterSection()
- {
- super();
- }
-
- public void createControls(Composite parent, TabbedPropertySheetPage aTabbedPropertySheetPage)
- {
- super.createControls(parent, aTabbedPropertySheetPage);
- TabbedPropertySheetWidgetFactory factory = aTabbedPropertySheetPage.getWidgetFactory();
- Composite top = factory.createFlatFormComposite(parent);
-
- GridLayout layout = new GridLayout();
- layout.numColumns = 4;
- top.setLayout(layout);
-
- createConvertPart(factory, top);
- }
-
- /**
- * @param factory
- * @param other
- */
- private void createConvertPart(TabbedPropertySheetWidgetFactory factory, Composite other)
- {
- GridData data;
- _convertTable = factory.createTable(other, SWT.FULL_SELECTION | SWT.MULTI);
- data = new GridData(GridData.FILL_BOTH);
- data.horizontalSpan = 3;
- data.verticalSpan = 3;
- _convertTable.setHeaderVisible(true);
- _convertTable.setLayoutData(data);
- _convertTable.setLinesVisible(true);
-
- TableColumn convertColumn = new TableColumn(_convertTable, SWT.NONE);
- convertColumn.setText(SectionResources.getString("JSFHtmlOutputTextSection.Converter")); //$NON-NLS-1$
- convertColumn.setWidth(100);
-
- _convertViewer = new TableViewer(_convertTable);
- _convertViewer.setContentProvider(new ConvertCotentLabelProvider());
- _convertViewer.setLabelProvider(new ConvertCotentLabelProvider());
- _convertViewer.addDoubleClickListener(new IDoubleClickListener()
- {
- public void doubleClick(DoubleClickEvent event)
- {
- IStructuredSelection selection = (IStructuredSelection) event.getSelection();
- if (selection != null)
- {
- IDOMElement node = (IDOMElement) selection.getFirstElement();
- gotoNode(node);
- }
- }
- }
- );
- _convertViewer.addSelectionChangedListener(new ISelectionChangedListener()
- {
- public void selectionChanged(SelectionChangedEvent event)
- {
- updateConvertButtonStatus();
- }
- }
- );
-
- _convertTypeCombo = factory.createCCombo(other, SWT.READ_ONLY);
- _convertTypeCombo.setItems(CONVERTTYPES);
- _convertTypeCombo.select(0);
- data = new GridData(GridData.HORIZONTAL_ALIGN_FILL);
- _convertTypeCombo.setLayoutData(data);
-
- _convertAddButton = factory.createButton(other, SectionResources.getString("JSFHtmlOutputTextSection.Add"), //$NON-NLS-1$
- SWT.NONE);
- data = new GridData(GridData.HORIZONTAL_ALIGN_FILL);
- _convertAddButton.setLayoutData(data);
- _convertAddButton.addSelectionListener(new SelectionAdapter()
- {
- public void widgetSelected(SelectionEvent e)
- {
- Map attributes = new HashMap();
- AddSubNodeCommand c = new AddSubNodeCommand(SectionResources.getString("JSFHtmlOutputTextSection.CommandLabel.AddSubTag"), _element, "convert" //$NON-NLS-1$ //$NON-NLS-2$
- + _convertTypeCombo.getText(), ITLDConstants.URI_JSF_CORE, attributes);
- c.execute();
- _convertViewer.refresh();
- updateConvertButtonStatus();
- }
- }
- );
- _convertRemoveButton = factory.createButton(other, SectionResources
- .getString("JSFHtmlOutputTextSection.Remove"), SWT.NONE); //$NON-NLS-1$
- data = new GridData(GridData.HORIZONTAL_ALIGN_FILL);
- _convertRemoveButton.setLayoutData(data);
- _convertRemoveButton.addSelectionListener(new SelectionAdapter()
- {
- public void widgetSelected(SelectionEvent e)
- {
- IStructuredSelection selection = (IStructuredSelection) _convertViewer.getSelection();
- if (selection != null)
- {
- for (Iterator i = selection.iterator(); i.hasNext();)
- {
- IDOMElement node = (IDOMElement) i.next();
- RemoveSubNodeCommand c = new RemoveSubNodeCommand(SectionResources.getString("JSFHtmlOutputTextSection.CommandLabel.RemoveSubTag"), _element, node); //$NON-NLS-1$
- c.execute();
- }
- _convertViewer.refresh();
- updateConvertButtonStatus();
- }
- }
- }
- );
- }
-
- private void updateConvertButtonStatus()
- {
- _convertAddButton.setEnabled(true);
- _convertRemoveButton.setEnabled(true);
- ISelection selection = _convertViewer.getSelection();
- if (selection == null || selection.isEmpty())
- {
- _convertRemoveButton.setEnabled(false);
- }
- if (_convertTable.getItemCount() == 0)
- {
- _convertRemoveButton.setEnabled(false);
- }
- if (_convertTable.getItemCount() > 0)
- {
- _convertAddButton.setEnabled(false);
- }
- }
-
- public void setInput(IWorkbenchPart part, ISelection selection)
- {
- super.setInput(part, selection);
-
- _convertViewer.setInput(_element);
- updateConvertButtonStatus();
- }
-
- protected void notifyChanged(INodeNotifier notifier, int eventType, Object changedFeature, Object oldValue, Object newValue, int pos)
- {
- if(_convertViewer != null && !_convertViewer.getControl().isDisposed())
- {
- _convertViewer.refresh();
- }
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/sections/JSFHtmlSelectChoicesSection.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/sections/JSFHtmlSelectChoicesSection.java
deleted file mode 100644
index 4b7f39c..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/sections/JSFHtmlSelectChoicesSection.java
+++ /dev/null
@@ -1,457 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http:// www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.pagedesigner.jsf.ui.sections;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.jface.viewers.CellEditor;
-import org.eclipse.jface.viewers.DoubleClickEvent;
-import org.eclipse.jface.viewers.ICellModifier;
-import org.eclipse.jface.viewers.IDoubleClickListener;
-import org.eclipse.jface.viewers.ILabelProviderListener;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.ITableLabelProvider;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jface.viewers.TextCellEditor;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jst.jsf.core.internal.tld.IJSFConstants;
-import org.eclipse.jst.jsf.core.internal.tld.ITLDConstants;
-import org.eclipse.jst.pagedesigner.commands.single.AddSubNodeCommand;
-import org.eclipse.jst.pagedesigner.commands.single.ChangeAttributeCommand;
-import org.eclipse.jst.pagedesigner.commands.single.InsertSubNodeCommand;
-import org.eclipse.jst.pagedesigner.commands.single.RemoveSubNodeCommand;
-import org.eclipse.jst.pagedesigner.properties.BaseCustomSection;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.CCombo;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.TableColumn;
-import org.eclipse.swt.widgets.TableItem;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetPage;
-import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetWidgetFactory;
-import org.eclipse.wst.sse.core.internal.provisional.INodeNotifier;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMElement;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-/**
- * @author mengbo
- * @version 1.5
- */
-public class JSFHtmlSelectChoicesSection extends BaseCustomSection
-{
- final private static String[] CHOICETYPES = { IJSFConstants.TAG_SELECTITEM, IJSFConstants.TAG_SELECTITEMS};
- private Table _choiceTable;
- private TableViewer _choiceViewer;
- private CCombo _choiceTypeCombo;
- private Button _choiceAddButton, _choiceRemoveButton, _choiceMoveUpButton, _choiceMoveDownButton;
- private static final String[] COLUMN_NAMES = new String[] {"choices","itemLabel", "itemValue", "id"}; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
-
- private class ChoiceCotentLabelProvider implements IStructuredContentProvider, ITableLabelProvider
- {
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.viewers.IStructuredContentProvider#getElements(java.lang.Object)
- */
- public Object[] getElements(final Object inputElement)
- {
- final IDOMElement root = _element;
- final List result = new ArrayList();
-
- final NodeList children = root.getChildNodes();
- for (int i = 0, n = children.getLength(); i < n; i++)
- {
- final Node child = children.item(i);
- if (child.getNodeType() == Node.ELEMENT_NODE)
- {
- final IDOMElement element = (IDOMElement) child;
- final String nodeName = element.getNodeName();
- if (nodeName.indexOf("select") != -1) //$NON-NLS-1$
- {
- result.add(child);
- }
- }
- }
-
- if (result.isEmpty())
- {
- return new Object[0];
- }
-
- return result.toArray(new IDOMElement[result.size()]);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.viewers.IContentProvider#inputChanged(org.eclipse.jface.viewers.Viewer, java.lang.Object, java.lang.Object)
- */
- public void inputChanged(final Viewer viewer, final Object oldInput, final Object newInput)
- {
- // do nothing
- }
-
- public String getColumnText(final Object element, final int columnIndex)
- {
- String result = null;
- if (element instanceof Node)
- {
- final Node node = (Node) element;
- Node attrNode = null;
- String attrName = null;
- if (columnIndex == 1)
- {
- attrName = "itemLabel"; //$NON-NLS-1$
- }
- else if (columnIndex == 2)
- {
- attrName = "itemValue"; //$NON-NLS-1$
- }
- else if (columnIndex == 3)
- {
- attrName = "id"; //$NON-NLS-1$
- }
-
- switch (columnIndex)
- {
- case 0:
- result = node.getNodeName();
- break;
- default:
- {
- attrNode = node.getAttributes().getNamedItem(attrName);
- if (attrNode != null)
- {
- result = attrNode.getNodeValue()!=null ? attrNode.getNodeValue() : " - "; //$NON-NLS-1$
- }
- else
- {
- result = " - "; //$NON-NLS-1$
- }
- }
- }
- }
- return result != null ? result : ""; //$NON-NLS-1$
- }
-
- public void dispose()
- {
- // do nothing
- }
-
- public Image getColumnImage(final Object element, final int columnIndex)
- {
- return null;
- }
-
- public void addListener(final ILabelProviderListener listener)
- {
- // TODO: no support for listeners?
- }
-
- public boolean isLabelProperty(final Object element, final String property)
- {
- return false;
- }
-
- public void removeListener(final ILabelProviderListener listener)
- {
- // TODO: no support for listeners?
- }
- }
-
- /**
- * Default constructor
- */
- public JSFHtmlSelectChoicesSection()
- {
- super();
- }
-
- @Override
- public void createControls(final Composite parent, final TabbedPropertySheetPage aTabbedPropertySheetPage)
- {
- super.createControls(parent, aTabbedPropertySheetPage);
- final TabbedPropertySheetWidgetFactory factory = aTabbedPropertySheetPage.getWidgetFactory();
- final Composite top = factory.createFlatFormComposite(parent);
-
- final GridLayout layout = new GridLayout();
- layout.numColumns = 4;
- top.setLayout(layout);
-
- createChoicePart(factory, top);
- }
-
- /**
- * @param factory
- * @param other
- */
- private void createChoicePart(final TabbedPropertySheetWidgetFactory factory, final Composite other)
- {
- GridData data;
- _choiceTable = factory.createTable(other, SWT.FULL_SELECTION | SWT.MULTI);
- data = new GridData(GridData.FILL_BOTH);
- data.horizontalSpan = 3;
- data.verticalSpan = 5;
- data.heightHint = 50;
- _choiceTable.setHeaderVisible(true);
- _choiceTable.setLayoutData(data);
- _choiceTable.setLinesVisible(true);
-
- final TableColumn choiceColumn = new TableColumn(_choiceTable, SWT.NONE);
- choiceColumn.setText(SectionResources.getString("JSFHtmlSelectManyCheckboxSection.Choices")); //$NON-NLS-1$
- choiceColumn.setWidth(100);
-
- final TableColumn labelColumn = new TableColumn(_choiceTable, SWT.NONE);
- labelColumn.setText("itemLabel"); //$NON-NLS-1$
- labelColumn.setWidth(100);
-
- final TableColumn valueColumn = new TableColumn(_choiceTable, SWT.NONE);
- valueColumn.setText("itemValue"); //$NON-NLS-1$
- valueColumn.setWidth(100);
-
- final TableColumn idColumn = new TableColumn(_choiceTable, SWT.NONE);
- idColumn.setText("id"); //$NON-NLS-1$
- idColumn.setWidth(100);
-
- _choiceViewer = new TableViewer(_choiceTable);
- _choiceViewer.setColumnProperties(COLUMN_NAMES );
- final CellEditor[] editors = new CellEditor[4];
- TextCellEditor textEditor = new TextCellEditor(_choiceTable);
- editors[0] = textEditor;
- textEditor = new TextCellEditor(_choiceTable);
- editors[1] = textEditor;
- textEditor = new TextCellEditor(_choiceTable);
- editors[2] = textEditor;
- textEditor = new TextCellEditor(_choiceTable);
- editors[3] = textEditor;
-
- _choiceViewer.setCellEditors(editors);
- _choiceViewer.setCellModifier(new ICellModifier(){
-
- public boolean canModify(final Object element, final String property) {
- final IDOMElement node = (IDOMElement)element;
- if (node.getLocalName().equals("selectItem")) //$NON-NLS-1$
- {
- return ! property.equals("choices"); //$NON-NLS-1$
- }
-
- return property.equals("id"); //$NON-NLS-1$
- }
-
- public Object getValue(final Object element, final String property) {
- final IDOMElement node = (IDOMElement) element;
- final String val = node.getAttribute(property) != null ? node.getAttribute(property) : ""; //$NON-NLS-1$
- return val;
- }
-
- public void modify(final Object element, final String property, final Object value) {
-
- final TableItem item = (TableItem) element;
- final IDOMElement node = (IDOMElement) item.getData();
- String valueString;
- ChangeAttributeCommand c;
-
- valueString = ((String) value).trim();
- c = new ChangeAttributeCommand(
- SectionResources.getString("JSFHtmlInputTextSection.CommandLabel.ChangeAttribute"), node, property, valueString); //$NON-NLS-1$
- c.execute();
-
- _choiceViewer.refresh();
- }
-
- });
- _choiceViewer.setContentProvider(new ChoiceCotentLabelProvider());
- _choiceViewer.setLabelProvider(new ChoiceCotentLabelProvider());
- _choiceViewer.addDoubleClickListener(new IDoubleClickListener()
- {
- public void doubleClick(final DoubleClickEvent event)
- {
- final IStructuredSelection selection = (IStructuredSelection) event.getSelection();
- if (selection != null)
- {
- final IDOMElement node = (IDOMElement) selection.getFirstElement();
- gotoNode(node);
- }
- }
- });
- _choiceViewer.addSelectionChangedListener(new ISelectionChangedListener()
- {
- public void selectionChanged(final SelectionChangedEvent event)
- {
- updateChoiceButtonStatus();
- }
- });
-
- _choiceTypeCombo = factory.createCCombo(other, SWT.READ_ONLY);
- _choiceTypeCombo.setItems(CHOICETYPES);
- _choiceTypeCombo.select(0);
- data = new GridData(GridData.HORIZONTAL_ALIGN_FILL);
- _choiceTypeCombo.setLayoutData(data);
-
- _choiceAddButton = factory.createButton(other, SectionResources
- .getString("JSFHtmlSelectManyCheckboxSection.Add"), SWT.NONE); //$NON-NLS-1$
- data = new GridData(GridData.HORIZONTAL_ALIGN_FILL);
- _choiceAddButton.setLayoutData(data);
- _choiceAddButton.addSelectionListener(new SelectionAdapter()
- {
- @Override
- public void widgetSelected(final SelectionEvent e)
- {
- final Map attributes = new HashMap();
- final AddSubNodeCommand c = new AddSubNodeCommand(
- SectionResources.getString("JSFHtmlSelectManyCheckboxSection.CommandLabel.AddSubTag"), _element, _choiceTypeCombo.getText(), //$NON-NLS-1$
- ITLDConstants.URI_JSF_CORE, attributes);
- c.execute();
- _choiceViewer.refresh();
- updateChoiceButtonStatus();
- }
- });
- _choiceRemoveButton = factory.createButton(other, SectionResources
- .getString("JSFHtmlSelectManyCheckboxSection.Remove"), SWT.NONE); //$NON-NLS-1$
- data = new GridData(GridData.HORIZONTAL_ALIGN_FILL);
- _choiceRemoveButton.setLayoutData(data);
- _choiceRemoveButton.addSelectionListener(new SelectionAdapter()
- {
- @Override
- public void widgetSelected(final SelectionEvent e)
- {
- final IStructuredSelection selection = (IStructuredSelection) _choiceViewer.getSelection();
- if (selection != null)
- {
- for (final Iterator i = selection.iterator(); i.hasNext();)
- {
- final IDOMElement node = (IDOMElement) i.next();
- final RemoveSubNodeCommand c = new RemoveSubNodeCommand(
- SectionResources
- .getString("JSFHtmlSelectManyCheckboxSection.CommandLabel.RemoveSubTag"), _element, node); //$NON-NLS-1$
- c.execute();
- }
- _choiceViewer.refresh();
- updateChoiceButtonStatus();
- }
- }
- });
- _choiceMoveUpButton = factory.createButton(other, SectionResources
- .getString("JSFHtmlSelectManyCheckboxSection.MoveUp"), SWT.NONE); //$NON-NLS-1$
- data = new GridData(GridData.HORIZONTAL_ALIGN_FILL);
- _choiceMoveUpButton.setLayoutData(data);
- _choiceMoveUpButton.addSelectionListener(new SelectionAdapter()
- {
- @Override
- public void widgetSelected(final SelectionEvent e)
- {
- final int index = _choiceTable.getSelectionIndex();
- final IDOMElement child = (IDOMElement) _choiceTable.getItem(index).getData();
- final IDOMElement refchild = (IDOMElement) _choiceTable.getItem(index - 1).getData();
- final RemoveSubNodeCommand remove = new RemoveSubNodeCommand(SectionResources
- .getString("JSFHtmlSelectManyCheckboxSection.CommandLabel.RemoveSubTag"), _element, child); //$NON-NLS-1$
- remove.execute();
- final InsertSubNodeCommand insert = new InsertSubNodeCommand(
- SectionResources.getString("JSFHtmlSelectManyCheckboxSection.CommandLabel.InsertSubTag"), _element, child, refchild); //$NON-NLS-1$
- insert.execute();
- _choiceViewer.refresh();
- _choiceViewer.getTable().select(index - 1);
- updateChoiceButtonStatus();
- }
- });
- _choiceMoveDownButton = factory.createButton(other, SectionResources
- .getString("JSFHtmlSelectManyCheckboxSection.MoveDown"), SWT.NONE); //$NON-NLS-1$
- data = new GridData(GridData.HORIZONTAL_ALIGN_FILL);
- _choiceMoveDownButton.setLayoutData(data);
- _choiceMoveDownButton.addSelectionListener(new SelectionAdapter()
- {
- @Override
- public void widgetSelected(final SelectionEvent e)
- {
- final int index = _choiceTable.getSelectionIndex();
- final IDOMElement child = (IDOMElement) _choiceTable.getItem(index).getData();
- final IDOMElement refchild = (IDOMElement) _choiceTable.getItem(index + 1).getData();
- final RemoveSubNodeCommand remove = new RemoveSubNodeCommand(SectionResources
- .getString("JSFHtmlSelectManyCheckboxSection.CommandLabel.RemoveSubTag"), _element, refchild); //$NON-NLS-1$
- remove.execute();
- final InsertSubNodeCommand insert = new InsertSubNodeCommand(
- SectionResources.getString("JSFHtmlSelectManyCheckboxSection.CommandLabel.InsertSubTag"), _element, refchild, child); //$NON-NLS-1$
- insert.execute();
- _choiceViewer.refresh();
- _choiceViewer.getTable().select(index + 1);
- updateChoiceButtonStatus();
- }
- });
- }
-
- private void updateChoiceButtonStatus()
- {
- _choiceRemoveButton.setEnabled(true);
- _choiceMoveUpButton.setEnabled(true);
- _choiceMoveDownButton.setEnabled(true);
- final ISelection selection = _choiceViewer.getSelection();
- if (selection.isEmpty())
- {
- _choiceRemoveButton.setEnabled(false);
- _choiceMoveUpButton.setEnabled(false);
- _choiceMoveDownButton.setEnabled(false);
- }
- if (_choiceTable.getItemCount() == 0)
- {
- _choiceRemoveButton.setEnabled(false);
- _choiceMoveUpButton.setEnabled(false);
- _choiceMoveDownButton.setEnabled(false);
- }
- if (_choiceTable.getSelectionCount() > 1)
- {
- _choiceMoveUpButton.setEnabled(false);
- _choiceMoveDownButton.setEnabled(false);
- }
- if (_choiceTable.getSelectionIndex() == 0)
- {
- _choiceMoveUpButton.setEnabled(false);
- }
- if (_choiceTable.getSelectionIndex() == _choiceTable.getItemCount() - 1)
- {
- _choiceMoveDownButton.setEnabled(false);
- }
- }
-
- @Override
- public void setInput(final IWorkbenchPart part, final ISelection selection)
- {
- super.setInput(part, selection);
-
- _choiceViewer.setInput(_element);
- updateChoiceButtonStatus();
- }
-
- @Override
- protected void notifyChanged(final INodeNotifier notifier, final int eventType, final Object changedFeature, final Object oldValue,
- final Object newValue, final int pos)
- {
- if (_choiceViewer != null && !_choiceViewer.getControl().isDisposed())
- {
- _choiceViewer.refresh();
- }
-
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/sections/SectionResources.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/sections/SectionResources.java
deleted file mode 100644
index c4b2b82..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/sections/SectionResources.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http:// www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.pagedesigner.jsf.ui.sections;
-
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-/**
- * Section resources
- * @author mengbo
- * @version 1.5
- */
-public final class SectionResources
-{
- private static final String BUNDLE_NAME = "org.eclipse.jst.pagedesigner.jsf.ui.sections.SectionResources"; //$NON-NLS-1$
-
- private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle.getBundle(BUNDLE_NAME);
-
- private SectionResources()
- {
- // no external instantiation
- }
-
- /**
- * @param key
- * @return the resource for key or !key! if not found
- */
- public static String getString(String key)
- {
- try
- {
- return RESOURCE_BUNDLE.getString(key);
- }
- catch (MissingResourceException e)
- {
- return '!' + key + '!';
- }
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/sections/SectionResources.properties b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/sections/SectionResources.properties
deleted file mode 100644
index e2db901..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/sections/SectionResources.properties
+++ /dev/null
@@ -1,78 +0,0 @@
-###############################################################################
-# Copyright (c) 2001, 2007 Oracle Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# Oracle Corporation - initial API and implementation
-###############################################################################
-# <f:convertDateTime>
-JSFCoreConvertDateTimeSection.ChangeAttribute=Change Attribute
-
-# <f:convertNumber>
-JSFCoreConvertNumberSection.CommandLabel.ChangeAttribute=Change Attribute
-
-# <h:commandButton>
-JSFHtmlCommandButtonSection.Listeners=Listeners
-JSFHtmlCommandButtonSection.Add=&Add
-JSFHtmlCommandButtonSection.Remove=&Remove
-JSFHtmlCommandButtonSection.CommandLabel.AddSubTag=Add Sub Tag
-JSFHtmlCommandButtonSection.CommandLabel.RemoveSubTag=Remove Sub Tag
-
-# <h:dataTable>
-JSFHtmlDataTableSection.Columns=Columns
-JSFHtmlDataTableSection.Add=&Add
-JSFHtmlDataTableSection.Remove=&Remove
-JSFHtmlDataTableSection.MoveUp=Move &up
-JSFHtmlDataTableSection.MoveDown=Move &down
-JSFHtmlDataTableSection.CommandLabel.AddSubTag=Add Sub Tag
-JSFHtmlDataTableSection.CommandLabel.RemoveSubTag=Remove Sub Tag
-JSFHtmlDataTableSection.CommandLabel.InsertSubTag=Insert Sub Tag
-
-# <h:inputHidden>
-JSFHtmlInputHiddenSection.Type=Type:
-JSFHtmlInputHiddenSection.Type0=Hidden
-JSFHtmlInputHiddenSection.Type1=Secret
-JSFHtmlInputHiddenSection.Type2=Text
-JSFHtmlInputHiddenSection.Type3=Textarea
-
-JSFHtmlInputHidden.CommandLabel.ChangeType=Change Type
-
-# <h:inputText>
-JSFHtmlInputTextSection.Validators=Validators
-JSFHtmlInputTextSection.Listeners=Listeners
-JSFHtmlInputTextSection.Minimum=Minimum
-JSFHtmlInputTextSection.Maximum=Maximum
-JSFHtmlInputTextSection.Add=&Add
-JSFHtmlInputTextSection.Remove=&Remove
-JSFHtmlInputTextSection.Converter=Converter
-JSFHtmlInputTextSection.CommandLabel.ChangeAttribute=Change Attribute
-JSFHtmlInputTextSection.CommandLabel.AddSubTag=Add Sub Tag
-JSFHtmlInputTextSection.CommandLabel.RemoveSubTag=Remove Sub Tag
-
-# <h:outputFormat>
-JSFHtmlOutputFormatSection.Parameters=Parameters:
-JSFHtmlOutputFormatSection.ColName=Name
-JSFHtmlOutputFormatSection.ColValue=Value
-JSFHtmlOutputFormatSection.CommandLabel.ChangeAttribute=Change Attribute
-JSFHtmlOutputFormatSection.CommandLabel.AddSubTag=Add Sub Tag
-JSFHtmlOutputFormatSection.CommandLabel.RemoveSubTag=Remove Sub Tag
-
-# <h:outputText>
-JSFHtmlOutputTextSection.Converter=Converter
-JSFHtmlOutputTextSection.Add=&Add
-JSFHtmlOutputTextSection.Remove=&Remove
-JSFHtmlOutputTextSection.CommandLabel.AddSubTag=Add Sub Tag
-JSFHtmlOutputTextSection.CommandLabel.RemoveSubTag=Remove Sub Tag
-
-# <h:selectManyCheckbox>
-JSFHtmlSelectManyCheckboxSection.Choices=Choices
-JSFHtmlSelectManyCheckboxSection.Add=&Add
-JSFHtmlSelectManyCheckboxSection.Remove=&Remove
-JSFHtmlSelectManyCheckboxSection.MoveUp=Move &up
-JSFHtmlSelectManyCheckboxSection.MoveDown=Move &down
-JSFHtmlSelectManyCheckboxSection.CommandLabel.AddSubTag=Add Sub Tag
-JSFHtmlSelectManyCheckboxSection.CommandLabel.RemoveSubTag=Remove Sub Tag
-JSFHtmlSelectManyCheckboxSection.CommandLabel.InsertSubTag=Insert Sub Tag
\ No newline at end of file
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/util/JSFUIPluginResourcesUtil.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/util/JSFUIPluginResourcesUtil.java
deleted file mode 100644
index a542670..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/util/JSFUIPluginResourcesUtil.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http:// www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.pagedesigner.jsf.ui.util;
-
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-import org.eclipse.jst.jsf.common.ui.JSFUICommonPlugin;
-import org.eclipse.jst.jsf.common.ui.internal.logging.Logger;
-import org.eclipse.jst.jsf.common.ui.internal.utils.ResourceUtils;
-
-/**
- * @author mengbo
- */
-public class JSFUIPluginResourcesUtil extends ResourceUtils
-{
- private final static String bundleName = "org.eclipse.jst.pagedesigner.jsf.ui.JSFUIResources"; //$NON-NLS-1$
- private static Logger _log = JSFUICommonPlugin.getLogger(JSFUIPluginResourcesUtil.class);
- private static JSFUIPluginResourcesUtil _resource; // singleton
-
- private JSFUIPluginResourcesUtil()
- {
- try
- {
- _resources = ResourceBundle.getBundle(bundleName);
- }
- catch (MissingResourceException e)
- {
- _log.error("Error in getting show messages resource bundle file", e); //$NON-NLS-1$
- }
- }
-
- /**
- * @return the singleton instance
- */
- public static JSFUIPluginResourcesUtil getInstance()
- {
- if (_resource == null)
- {
- _resource = new JSFUIPluginResourcesUtil();
- }
- return _resource;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/.classpath b/jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/.classpath
deleted file mode 100644
index 304e861..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/.cvsignore b/jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/.cvsignore
deleted file mode 100644
index f9eb27a..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/.cvsignore
+++ /dev/null
@@ -1,3 +0,0 @@
-build.xml
-@dot
-javaCompiler...args
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/.project b/jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/.project
deleted file mode 100644
index 9685725..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.jst.pagedesigner.jsp.core</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/.settings/org.eclipse.core.resources.prefs b/jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index 1c9084e..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Sun May 27 16:05:25 EDT 2007
-eclipse.preferences.version=1
-encoding/<project>=ISO-8859-1
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/.settings/org.eclipse.jdt.core.prefs b/jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index d8bc1cd..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,82 +0,0 @@
-#Mon Jun 30 15:58:19 PDT 2008
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.doc.comment.support=enabled
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.autoboxing=warning
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=ignore
-org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
-org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled
-org.eclipse.jdt.core.compiler.problem.fieldHiding=warning
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=warning
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
-org.eclipse.jdt.core.compiler.problem.invalidJavadoc=error
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=enabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=disabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=disabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=protected
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=warning
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocComments=warning
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=protected
-org.eclipse.jdt.core.compiler.problem.missingJavadocTags=warning
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=protected
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=error
-org.eclipse.jdt.core.compiler.problem.nullReference=ignore
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
-org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=ignore
-org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
-org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=ignore
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=ignore
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=error
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=warning
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=error
-org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=error
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error
-org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.5
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/.settings/org.eclipse.jdt.ui.prefs b/jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index 82eb6c1..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Fri Apr 06 18:25:15 PDT 2007
-eclipse.preferences.version=1
-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8"?><templates/>
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/.settings/org.eclipse.pde.prefs b/jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/.settings/org.eclipse.pde.prefs
deleted file mode 100644
index 851c0c3..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/.settings/org.eclipse.pde.prefs
+++ /dev/null
@@ -1,22 +0,0 @@
-#Fri May 30 12:00:06 PDT 2008
-compilers.f.unresolved-features=1
-compilers.f.unresolved-plugins=1
-compilers.incompatible-environment=1
-compilers.p.build=1
-compilers.p.deprecated=1
-compilers.p.discouraged-class=1
-compilers.p.internal=1
-compilers.p.missing-packages=0
-compilers.p.no-required-att=0
-compilers.p.not-externalized-att=0
-compilers.p.unknown-attribute=1
-compilers.p.unknown-class=1
-compilers.p.unknown-element=1
-compilers.p.unknown-identifier=1
-compilers.p.unknown-resource=1
-compilers.p.unresolved-ex-points=0
-compilers.p.unresolved-import=0
-compilers.s.create-docs=false
-compilers.s.doc-folder=doc
-compilers.s.open-tags=1
-eclipse.preferences.version=1
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/META-INF/MANIFEST.MF b/jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/META-INF/MANIFEST.MF
deleted file mode 100644
index 6a5feed..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,33 +0,0 @@
-Manifest-Version: 1.0
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.jst.pagedesigner.jsp.core;singleton:=true
-Bundle-Version: 1.2.0.qualifier
-Bundle-ClassPath: .
-Bundle-Activator: org.eclipse.jst.pagedesigner.jsp.core.JSPCorePlugin
-Bundle-Vendor: %providerName
-Bundle-Localization: plugin
-Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.core.resources;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.wst.sse.core;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.wst.xml.core;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.jst.jsp.core;bundle-version="[1.1.0,1.3.0)",
- org.eclipse.wst.html.core;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.jst.jsf.common;bundle-version="[1.0.0,2.0.0)"
-Bundle-ActivationPolicy: lazy
-Bundle-ManifestVersion: 2
-Export-Package: org.eclipse.jst.pagedesigner.jsp.core;x-internal:=true,
- org.eclipse.jst.pagedesigner.jsp.core.el;x-internal:=true,
- org.eclipse.jst.pagedesigner.jsp.core.internal.pagevar;x-internal:=true,
- org.eclipse.jst.pagedesigner.jsp.core.pagevar;x-internal:=true,
- org.eclipse.jst.pagedesigner.jsp.core.pagevar.adapter;x-internal:=true,
- org.eclipse.jst.pagedesigner.jsp.core.util;x-internal:=true
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Import-Package: javax.servlet;version="2.4.0",
- javax.servlet.http;version="2.4.0",
- javax.servlet.jsp;version="2.0.0",
- javax.servlet.jsp.el;version="2.0.0",
- javax.servlet.jsp.resources;version="2.0.0",
- javax.servlet.jsp.tagext;version="2.0.0",
- javax.servlet.resources;version="2.4.0",
- org.apache.commons.el;version="1.0.0",
- org.apache.commons.el.parser;version="1.0.0"
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/about.html b/jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/about.html
deleted file mode 100644
index 90bd74d..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/about.html
+++ /dev/null
@@ -1,22 +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>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
-
-<p>June, 2008</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.</p>
-
-</body>
-</html>
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/build.properties b/jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/build.properties
deleted file mode 100644
index 6429d84..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/build.properties
+++ /dev/null
@@ -1,20 +0,0 @@
-###############################################################################
-# Copyright (c) 2001, 2008 Oracle Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# Oracle Corporation - initial API and implementation
-###############################################################################
-source.. = src/
-output.. = bin/
-bin.includes = plugin.xml,\
- META-INF/,\
- .,\
- schema/,\
- about.html,\
- plugin.properties\
-javacSource=1.5
-javacTarget=1.5
\ No newline at end of file
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/plugin.properties b/jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/plugin.properties
deleted file mode 100644
index 3c3f9a1..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/plugin.properties
+++ /dev/null
@@ -1,17 +0,0 @@
-###############################################################################
-# Copyright (c) 2001, 2007 Oracle Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# Oracle Corporation - initial API and implementation
-###############################################################################
-####################################################
-# Plugin XML information.
-####################################################
-pluginName=JavaServer Faces Tools - JSP Core Pagedesigner
-providerName=Eclipse.org
-
-extension-point.name.0 = page variable
\ No newline at end of file
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/plugin.xml b/jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/plugin.xml
deleted file mode 100644
index ea261e8..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/plugin.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin>
- <extension-point id="pageVar" name="%extension-point.name.0" schema="schema/pageVar.exsd"/>
-</plugin>
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/schema/pageVar.exsd b/jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/schema/pageVar.exsd
deleted file mode 100644
index 962bf34..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/schema/pageVar.exsd
+++ /dev/null
@@ -1,172 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.jst.pagedesigner.jsp.core">
-<annotation>
- <appInfo>
- <meta.schema plugin="org.eclipse.jst.pagedesigner.jsp.core" id="pageVar" name="page variable"/>
- </appInfo>
- <documentation>
- [Enter description of this extension point.]
- </documentation>
- </annotation>
-
- <element name="extension">
- <complexType>
- <sequence>
- <element ref="taglib" minOccurs="0" maxOccurs="unbounded"/>
- </sequence>
- <attribute name="point" type="string" use="required">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- <attribute name="id" type="string">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- <attribute name="name" type="string">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <element name="tag">
- <complexType>
- <attribute name="varName" type="string" use="required">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- <attribute name="varTypeMode" use="required">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- <simpleType>
- <restriction base="string">
- <enumeration value="CLASSNAME">
- </enumeration>
- <enumeration value="EXPRESSION">
- </enumeration>
- <enumeration value="EXPRESSION_COLLECTION_ITEM">
- </enumeration>
- <enumeration value="BUNDLE">
- </enumeration>
- </restriction>
- </simpleType>
- </attribute>
- <attribute name="varTypeString" type="string">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- <attribute name="varNameIsAttr" type="boolean" use="default" value="true">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- <attribute name="varTypeStringIsAttr" type="boolean" use="default" value="true">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- <attribute name="tagName" type="string" use="required">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <element name="taglib">
- <complexType>
- <sequence>
- <element ref="tag" minOccurs="0" maxOccurs="unbounded"/>
- </sequence>
- <attribute name="uri" type="string" use="required">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <annotation>
- <appInfo>
- <meta.section type="since"/>
- </appInfo>
- <documentation>
- [Enter the first release in which this extension point appears.]
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="examples"/>
- </appInfo>
- <documentation>
- [Enter extension point usage example here.]
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="apiInfo"/>
- </appInfo>
- <documentation>
- [Enter API information here.]
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="implementation"/>
- </appInfo>
- <documentation>
- [Enter information about supplied implementation of this extension point.]
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="copyright"/>
- </appInfo>
- <documentation>
- /*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-
- </documentation>
- </annotation>
-
-</schema>
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/src/org/eclipse/jst/pagedesigner/jsp/core/IJSPCoreConstants.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/src/org/eclipse/jst/pagedesigner/jsp/core/IJSPCoreConstants.java
deleted file mode 100644
index a628e6a..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/src/org/eclipse/jst/pagedesigner/jsp/core/IJSPCoreConstants.java
+++ /dev/null
@@ -1,284 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.pagedesigner.jsp.core;
-
-/**
- * @author mengbo
- * @version 1.5
- */
-public interface IJSPCoreConstants
-{
- /**
- * JSP tag name
- */
- final static public String TAG_ATTRIBUTE = "attribute"; //$NON-NLS-1$
-
- /**
- * JSP tag name
- */
- final static public String TAG_BODY = "body"; //$NON-NLS-1$
-
- /**
- * JSP tag name
- */
- final static public String TAG_ELEMENT = "element"; //$NON-NLS-1$
-
- /**
- * JSP tag name
- */
- final static public String TAG_EXPRESSION = "expression"; //$NON-NLS-1$
-
- /**
- * JSP tag name
- */
- final static public String TAG_DECLARATION = "declaration"; //$NON-NLS-1$
-
- /**
- * JSP tag name
- */
- final static public String TAG_DIRECTIVE_INCLUDE = "directive.include"; //$NON-NLS-1$
-
- /**
- * JSP tag name
- */
- final static public String TAG_DIRECTIVE_PAGE = "directive.page"; //$NON-NLS-1$
-
- /**
- * JSP tag name
- */
- final static public String TAG_DIRECTIVE_TAGLIB = "directive.taglib"; //$NON-NLS-1$
-
- /**
- * JSP tag name
- */
- final static public String TAG_DOBODY = "doBody"; //$NON-NLS-1$
-
- /**
- * JSP tag name
- */
- final static public String TAG_FORWARD = "forward"; //$NON-NLS-1$
-
- /**
- * JSP tag name
- */
- final static public String TAG_GETPROPERTY = "getProperty"; //$NON-NLS-1$
-
- /**
- * JSP tag name
- */
- final static public String TAG_INCLUDE = "include"; //$NON-NLS-1$
-
- /**
- * JSP tag name
- */
- final static public String TAG_INVOKE = "invoke"; //$NON-NLS-1$
-
- /**
- * JSP tag name
- */
- final static public String TAG_OUTPUT = "output"; //$NON-NLS-1$
-
- /**
- * JSP tag name
- */
- final static public String TAG_PLUGIN = "plugin"; //$NON-NLS-1$
-
- /**
- * JSP tag name
- */
- final static public String TAG_ROOT = "root"; //$NON-NLS-1$
-
- /**
- * JSP tag name
- */
- final static public String TAG_SCRIPTLET = "scriptlet"; //$NON-NLS-1$
-
- /**
- * JSP tag name
- */
- final static public String TAG_SETPROPERTY = "setProperty"; //$NON-NLS-1$
-
- /**
- * JSP tag name
- */
- final static public String TAG_TEXT = "text"; //$NON-NLS-1$
-
- /**
- * JSP tag name
- */
- final static public String TAG_USEBEAN = "useBean"; //$NON-NLS-1$
-
- /**
- * JSP tag name
- */
- final static public String TAG_LEADING_DIRECTIVE = "directive."; //$NON-NLS-1$
-
- /**
- * JSP tag attribute name
- */
- final static public String ATTR_ALIGN = "align"; //$NON-NLS-1$
-
- /**
- * JSP tag attribute name
- */
- final static public String ATTR_ARCHIVE = "archive"; //$NON-NLS-1$
-
- /**
- * JSP tag attribute name
- */
- final static public String ATTR_BEANNAME = "beanName"; //$NON-NLS-1$
-
- /**
- * JSP tag attribute name
- */
- final static public String ATTR_CLASS = "class"; //$NON-NLS-1$
-
- /**
- * JSP tag attribute name
- */
- final static public String ATTR_CODE = "code"; //$NON-NLS-1$
-
- /**
- * JSP tag attribute name
- */
- final static public String ATTR_CODEBASE = "codebase"; //$NON-NLS-1$
-
- /**
- * JSP tag attribute name
- */
- final static public String ATTR_DOCTYPEROOTELEMENT = "doctype-root-element"; //$NON-NLS-1$
-
- /**
- * JSP tag attribute name
- */
- final static public String ATTR_DOCTYPESYSTEM = "doctype-system"; //$NON-NLS-1$
-
- /**
- * JSP tag attribute name
- */
- final static public String ATTR_DOCTYPEPUBLIC = "doctype-public"; //$NON-NLS-1$
-
- /**
- * JSP tag attribute name
- */
- final static public String ATTR_FILE = "file"; //$NON-NLS-1$
-
- /**
- * JSP tag attribute name
- */
- final static public String ATTR_FRAGMENT = "fragment"; //$NON-NLS-1$
-
- /**
- * JSP tag attribute name
- */
- final static public String ATTR_HEIGHT = "height"; //$NON-NLS-1$
-
- /**
- * JSP tag attribute name
- */
- final static public String ATTR_HSPACE = "hspace"; //$NON-NLS-1$
-
- /**
- * JSP tag attribute name
- */
- final static public String ATTR_ID = "id"; //$NON-NLS-1$
-
- /**
- * JSP tag attribute name
- */
- final static public String ATTR_IEPLUGINURL = "iepluginurl"; //$NON-NLS-1$
-
- /**
- * JSP tag attribute name
- */
- final static public String ATTR_JREVERSION = "jreversion"; //$NON-NLS-1$
-
- /**
- * JSP tag attribute name
- */
- final static public String ATTR_NAME = "name"; //$NON-NLS-1$
-
- /**
- * JSP tag attribute name
- */
- final static public String ATTR_NSPLUGINURL = "nspluginurl"; //$NON-NLS-1$
-
- /**
- * JSP tag attribute name
- */
- final static public String ATTR_OMITXMLDECLARATION = "omit-xml-declaration"; //$NON-NLS-1$
-
- /**
- * JSP tag attribute name
- */
- final static public String ATTR_PAGE = "page"; //$NON-NLS-1$
-
- /**
- * JSP tag attribute name
- */
- final static public String ATTR_PROPERTY = "property"; //$NON-NLS-1$
-
- /**
- * JSP tag attribute name
- */
- final static public String ATTR_SCOPE = "scope"; //$NON-NLS-1$
-
- /**
- * JSP tag attribute name
- */
- final static public String ATTR_TRIM = "trim"; //$NON-NLS-1$
-
- /**
- * JSP tag attribute name
- */
- final static public String ATTR_TYPE = "type"; //$NON-NLS-1$
-
- /**
- * JSP tag attribute name
- */
- final static public String ATTR_URI = "uri"; //$NON-NLS-1$
-
- /**
- * JSP tag attribute name
- */
- final public static String ATTR_TAGDIR = "tagdir"; //$NON-NLS-1$
- /**
- * JSP tag attribute name
- */
- final static public String ATTR_VALUE = "value"; //$NON-NLS-1$
-
- /**
- * JSP tag attribute name
- */
- final static public String ATTR_VAR = "var"; //$NON-NLS-1$
-
- /**
- * JSP tag attribute name
- */
- final static public String ATTR_VARREADER = "varReader"; //$NON-NLS-1$
-
- /**
- * JSP tag attribute name
- */
- final static public String ATTR_VERSION = "version"; //$NON-NLS-1$
-
- /**
- * JSP tag attribute name
- */
- final static public String ATTR_XMLNSJSP = "xmlns:jsp"; //$NON-NLS-1$
-
- /**
- * JSP tag attribute name
- */
- final static public String ATTR_XMLNSTAGLIBPREFIX = "xmlns:taglibPrefix"; //$NON-NLS-1$
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/src/org/eclipse/jst/pagedesigner/jsp/core/JSPCorePlugin.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/src/org/eclipse/jst/pagedesigner/jsp/core/JSPCorePlugin.java
deleted file mode 100644
index 4ea9674..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/src/org/eclipse/jst/pagedesigner/jsp/core/JSPCorePlugin.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.pagedesigner.jsp.core;
-
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-import org.eclipse.core.runtime.Plugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * The main plugin class to be used in the desktop.
- */
-public class JSPCorePlugin extends Plugin {
- // The shared instance.
- private static JSPCorePlugin plugin;
-
- // Resource bundle.
- private ResourceBundle resourceBundle;
-
- /**
- * The constructor.
- */
- public JSPCorePlugin() {
- super();
- plugin = this;
- try {
- resourceBundle = ResourceBundle
- .getBundle("org.eclipse.jst.pagedesigner.jsp.core.JSPCorePluginResources"); //$NON-NLS-1$
- } catch (MissingResourceException x) {
- resourceBundle = null;
- }
- }
-
- /**
- * This method is called upon plug-in activation
- */
- public void start(BundleContext context) throws Exception {
- super.start(context);
- }
-
- /**
- * This method is called when the plug-in is stopped
- */
- public void stop(BundleContext context) throws Exception {
- super.stop(context);
- }
-
- /**
- * Returns the shared instance.
- * @return the default plugin instance
- */
- public static JSPCorePlugin getDefault() {
- return plugin;
- }
-
- /**
- * Returns the string from the plugin's resource bundle, or 'key' if not
- * found.
- * @param key
- * @return the string for key or 'key' if not found in the default resource bundle
- */
- public static String getResourceString(String key) {
- ResourceBundle bundle = JSPCorePlugin.getDefault().getResourceBundle();
- try {
- return (bundle != null) ? bundle.getString(key) : key;
- } catch (MissingResourceException e) {
- return key;
- }
- }
-
- /**
- * Returns the plugin's resource bundle,
- * @return the resource bundle
- */
- public ResourceBundle getResourceBundle() {
- return resourceBundle;
- }
-
- /**
- * @return the plugin id
- */
- public static String getPluginId() {
- return getDefault().getBundle().getSymbolicName();
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/src/org/eclipse/jst/pagedesigner/jsp/core/ListenerList.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/src/org/eclipse/jst/pagedesigner/jsp/core/ListenerList.java
deleted file mode 100644
index 9596f97..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/src/org/eclipse/jst/pagedesigner/jsp/core/ListenerList.java
+++ /dev/null
@@ -1,142 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.pagedesigner.jsp.core;
-
-/**
- * Local version of org.eclipse.jface.util.ListenerList (modified)
- * @author mengbo
- * @version 1.5
- */
-public class ListenerList {
- /**
- * The current number of listeners. Maintains invariant: 0 <= fSize <=
- * listeners.length.
- */
- private int _size;
-
- /**
- * The list of listeners. Initially <code>null</code> but initialized to
- * an array of size capacity the first time a listener is added. Maintains
- * invariant: listeners != null if and only if fSize != 0
- */
- private Object[] _listeners = null;
-
- /**
- * The empty array singleton instance, returned by getListeners() when size ==
- * 0.
- */
- private static final Object[] EmptyArray = new Object[0];
-
- /**
- * Creates a listener list with the given initial capacity.
- *
- * @param capacity
- * the number of listeners which this list can initially accept
- * without growing its internal representation; must be at least
- * 1
- */
- public ListenerList(int capacity) {
- if (capacity < 1) {
- throw new IllegalArgumentException();
- }
- _listeners = new Object[capacity];
- _size = 0;
- }
-
- /**
- * Adds a listener to the list. Has no effect if an identical listener is
- * already registered.
- *
- * @param listener
- * a listener
- */
- public synchronized void add(Object listener) {
- if (listener == null) {
- throw new IllegalArgumentException();
- }
- // check for duplicates using identity
- for (int i = 0; i < _size; ++i) {
- if (_listeners[i] == listener) {
- return;
- }
- }
- // grow array if necessary
- if (_size == _listeners.length) {
- Object[] temp = new Object[(_size * 2) + 1];
- System.arraycopy(_listeners, 0, temp, 0, _size);
- _listeners = temp;
- }
- _listeners[_size++] = listener;
- }
-
- /**
- * Returns an array containing all the registered listeners. The resulting
- * array is unaffected by subsequent adds or removes. If there are no
- * listeners registered, the result is an empty array singleton instance (no
- * garbage is created). Use this method when notifying listeners, so that
- * any modifications to the listener list during the notification will have
- * no effect on the notification itself.
- * @return the array of registered listeners
- */
- public synchronized Object[] getListeners() {
- if (_size == 0) {
- return EmptyArray;
- }
- Object[] result = new Object[_size];
- System.arraycopy(_listeners, 0, result, 0, _size);
- return result;
- }
-
- /**
- * Removes a listener from the list. Has no effect if an identical listener
- * was not already registered.
- *
- * @param listener
- * a listener
- */
- public synchronized void remove(Object listener) {
- if (listener == null) {
- throw new IllegalArgumentException();
- }
-
- for (int i = 0; i < _size; ++i) {
- if (_listeners[i] == listener) {
- if (--_size == 0) {
- _listeners = new Object[1];
- } else {
- if (i < _size) {
- _listeners[i] = _listeners[_size];
- }
- _listeners[_size] = null;
- }
- return;
- }
- }
- }
-
- /**
- * Removes all the listeners from the list.
- */
- public void removeAll() {
- _listeners = new Object[0];
- _size = 0;
- }
-
- /**
- * Returns the number of registered listeners
- *
- * @return the number of registered listeners
- */
- public int size() {
- return _size;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/src/org/eclipse/jst/pagedesigner/jsp/core/el/ELParser.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/src/org/eclipse/jst/pagedesigner/jsp/core/el/ELParser.java
deleted file mode 100644
index 9c3ee7f..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/src/org/eclipse/jst/pagedesigner/jsp/core/el/ELParser.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.pagedesigner.jsp.core.el;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.commons.el.ComplexValue;
-import org.apache.commons.el.NamedValue;
-
-/**
- *
- * @author mengbo
- * @version 1.5
- */
-public class ELParser {
- private String _jsfExpression;
-
- private List _expressionList;
-
- /**
- * @param expression
- *
- */
- public ELParser(String expression) {
- super();
- _jsfExpression = expression;
- init();
- }
-
- /**
- *
- */
- private void init() {
- Object parsedExpression = JSFELParserHelper
- .parseExpression(_jsfExpression);
-
- if (parsedExpression instanceof ComplexValue) {
- _expressionList = new ArrayList();
- _expressionList.add(((ComplexValue) parsedExpression).getPrefix());
- _expressionList.addAll(((ComplexValue) parsedExpression)
- .getSuffixes());
- } else if (parsedExpression instanceof NamedValue) {
- _expressionList = new ArrayList();
- _expressionList.add(parsedExpression);
- }
-
- }
-
- /**
- * @return the expression elements of null if none
- */
- public Object[] getElements() {
- if (_expressionList == null) {
- return null;
- }
-
- return _expressionList.toArray();
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/src/org/eclipse/jst/pagedesigner/jsp/core/el/JSFELParserHelper.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/src/org/eclipse/jst/pagedesigner/jsp/core/el/JSFELParserHelper.java
deleted file mode 100644
index b8bca4e..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/src/org/eclipse/jst/pagedesigner/jsp/core/el/JSFELParserHelper.java
+++ /dev/null
@@ -1,267 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.pagedesigner.jsp.core.el;
-
-import java.io.StringReader;
-
-import org.apache.commons.el.Expression;
-import org.apache.commons.el.ExpressionString;
-import org.apache.commons.el.parser.ELParser;
-import org.apache.commons.el.parser.ParseException;
-
-/**
- * Utility class to implement support functionality to "morph" JSP EL into JSF
- * EL
- *
- * @author mengbo
- * @version 1.5
- */
-public final class JSFELParserHelper {
- /**
- * an EL left brace
- */
- public static String JSF_EL_LEFT_BRACE = "#{"; //$NON-NLS-1$
-
- /**
- * an EL right brace
- */
- public static String JSF_EL_RIGHT_BRACE = "}"; //$NON-NLS-1$
-
- private JSFELParserHelper() {
- // util class, do not instantiate
- }
-
- /**
- * Gets the parsed form of the given expression string. Returns either an
- * Expression or ExpressionString.
- * @param expressionString
- * @return the result of parsing expressionString
- */
- public static Object parseExpression(String expressionString) {
- expressionString = toJspElExpression(expressionString);
-
- ELParser parser = new ELParser(new StringReader(expressionString));
- try {
- Object expression = parser.ExpressionString();
- if (!(expression instanceof Expression)
- && !(expression instanceof ExpressionString)) {
- return null;
- }
-
- return expression;
- } catch (ParseException e) {
-
- // String msg = "Invalid expression: '" + expressionString + "'";
- // log.debug(msg, e);
- // throw new ReferenceSyntaxException(msg, e);
- }
- return null;
- }
-
- /**
- * @param expressionString
- * @return true if the expression is 'valid'
- */
- public static boolean isValidEL(String expressionString) {
- if (expressionString == null || expressionString.length() == 0) {
- return false;
- }
-
- return expressionString.startsWith(JSF_EL_LEFT_BRACE)
- && expressionString.endsWith(JSF_EL_RIGHT_BRACE);
- }
-
- /**
- * @param expressionString
- * @return expressionString with the left and right braces removed
- * or the original string if isValidEL(expression) == false
- */
- public static String trimELBrace(String expressionString) {
- if (!isValidEL(expressionString)) {
- return expressionString;
- }
- String trimedExpression = null;
-
- trimedExpression = expressionString.substring(JSF_EL_LEFT_BRACE
- .length(), expressionString.length()
- - JSF_EL_RIGHT_BRACE.length());
-
- return trimedExpression;
- }
-
- /**
- * Convert ValueBinding syntax #{ } to JSP EL syntax ${ }
- *
- * @param expressionString
- * <code>ValueBinding</code> reference expression
- *
- * @return JSP EL compatible expression
- */
- public static String toJspElExpression(String expressionString) {
- StringBuffer sb = new StringBuffer(expressionString.length());
- int remainsPos = 0;
-
- for (int posOpenBrace = expressionString.indexOf('{'); posOpenBrace >= 0; posOpenBrace = expressionString
- .indexOf('{', remainsPos)) {
- if (posOpenBrace > 0) {
- if (posOpenBrace - 1 > remainsPos)
- sb.append(expressionString.substring(remainsPos,
- posOpenBrace - 1));
-
- if (expressionString.charAt(posOpenBrace - 1) == '$') {
- sb.append("${'${'}"); //$NON-NLS-1$
- remainsPos = posOpenBrace + 1;
- continue;
- } else if (expressionString.charAt(posOpenBrace - 1) == '#') {
- // TODO: should use \\ as escape for \ always, not just when
- // before #{
- // allow use of '\' as escape symbol for #{ (for
- // compatibility with Sun's extended implementation)
- /*
- * if (isEscaped(expressionString, posOpenBrace - 1)) {
- * escapes: { for (int i = sb.length() - 1; i >= 0; i--) {
- * if (sb.charAt(i) != '\\') { sb.setLength( sb.length() -
- * (sb.length() - i) / 2); break escapes; } }
- * sb.setLength(sb.length() / 2); } sb.append("#{"); } else {
- */
- sb.append("${"); //$NON-NLS-1$
- int posCloseBrace = indexOfMatchingClosingBrace(
- expressionString, posOpenBrace);
- sb.append(expressionString.substring(posOpenBrace + 1,
- posCloseBrace + 1));
- remainsPos = posCloseBrace + 1;
- continue;
- // }
- } else {
- if (posOpenBrace > remainsPos)
- sb.append(expressionString.charAt(posOpenBrace - 1));
- }
- }
-
- // Standalone brace
- sb.append('{');
- remainsPos = posOpenBrace + 1;
- }
-
- sb.append(expressionString.substring(remainsPos));
-
- // Create a new String to shrink mem size since we are caching
- return new String(sb.toString());
- }
-
- private static int findQuote(String expressionString, int start) {
- int indexofSingleQuote = expressionString.indexOf('\'', start);
- int indexofDoubleQuote = expressionString.indexOf('"', start);
- return minIndex(indexofSingleQuote, indexofDoubleQuote);
- }
-
- /**
- * Return the index of the matching closing brace, skipping over quoted text
- *
- * @param expressionString
- * string to search
- * @param indexofOpeningBrace
- * the location of opening brace to match
- *
- * @return the index of the matching closing brace
- *
- * @throws ReferenceSyntaxException
- * if matching brace cannot be found
- */
- private static int indexOfMatchingClosingBrace(String expressionString,
- int indexofOpeningBrace) {
- int len = expressionString.length();
- int i = indexofOpeningBrace + 1;
-
- // Loop through quoted strings
- for (;;) {
- if (i >= len) {
- throw new IllegalStateException(
- "Missing closing brace. Expression: '" //$NON-NLS-1$
- + expressionString + "'"); //$NON-NLS-1$
- }
-
- int indexofClosingBrace = expressionString.indexOf('}', i);
- i = minIndex(indexofClosingBrace, findQuote(expressionString, i));
-
- if (i < 0) {
- // No delimiter found
- throw new IllegalStateException(
- "Missing closing brace. Expression: '" //$NON-NLS-1$
- + expressionString + "'"); //$NON-NLS-1$
- }
-
- // 1. If quoted literal, find closing quote
- if (i != indexofClosingBrace) {
- i = indexOfMatchingClosingQuote(expressionString, i) + 1;
- if (i == 0) {
- // Note: if no match, i==0 because -1 + 1 = 0
- throw new IllegalStateException(
- "Missing closing quote. Expression: '" //$NON-NLS-1$
- + expressionString + "'"); //$NON-NLS-1$
- }
- } else {
- // Closing brace
- return i;
- }
- }
- }
-
- /**
- * Returns the index of the matching closing quote, skipping over escaped
- * quotes
- *
- * @param expressionString
- * string to scan
- * @param indexOfOpeningQuote
- * start from this position in the string
- * @return -1 if no match, the index of closing quote otherwise
- */
- private static int indexOfMatchingClosingQuote(String expressionString,
- int indexOfOpeningQuote) {
- char quote = expressionString.charAt(indexOfOpeningQuote);
- for (int i = expressionString.indexOf(quote, indexOfOpeningQuote + 1); i >= 0; i = expressionString
- .indexOf(quote, i + 1)) {
- if (!isEscaped(expressionString, i)) {
- return i;
- }
- }
-
- // No matching quote found
- return -1;
- }
-
- private static boolean isEscaped(String expressionString, int i) {
- int escapeCharCount = 0;
- while ((--i >= 0) && (expressionString.charAt(i) == '\\')) {
- escapeCharCount++;
- }
-
- return (escapeCharCount % 2) != 0;
- }
-
- /**
- * Returns the minimum index >= 0, if any
- *
- * <p>
- * Use to find the first of two characters in a string:<br>
- * <code>minIndex(s.indexOf('/'), indexOf('\'))</code>
- * </p>
- * @param a
- * @param b
- * @return the minimum index >= 0, if any
- *
- */
- public static int minIndex(int a, int b) {
- return (a < 0) ? b : (b < 0) ? a : (a < b) ? a : b;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/src/org/eclipse/jst/pagedesigner/jsp/core/internal/pagevar/DocumentPageVariableAdapter.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/src/org/eclipse/jst/pagedesigner/jsp/core/internal/pagevar/DocumentPageVariableAdapter.java
deleted file mode 100644
index ebd93fe..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/src/org/eclipse/jst/pagedesigner/jsp/core/internal/pagevar/DocumentPageVariableAdapter.java
+++ /dev/null
@@ -1,212 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.pagedesigner.jsp.core.internal.pagevar;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.jst.pagedesigner.jsp.core.ListenerList;
-import org.eclipse.jst.pagedesigner.jsp.core.pagevar.IChangeListener;
-import org.eclipse.jst.pagedesigner.jsp.core.pagevar.IVariableInfo;
-import org.eclipse.jst.pagedesigner.jsp.core.pagevar.adapter.IDocumentPageVariableAdapter;
-import org.eclipse.jst.pagedesigner.jsp.core.pagevar.adapter.IPageVariableAdapter;
-import org.eclipse.wst.sse.core.internal.provisional.INodeNotifier;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMDocument;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-/**
- * This adapter will be adapted on the JSP document.
- *
- * @author mengbo
- * @version 1.5
- */
-public class DocumentPageVariableAdapter implements
- IDocumentPageVariableAdapter {
- private IDOMDocument _document;
-
- private ListenerList _changeListeners = new ListenerList(2);
-
- private List _variableInfos = new ArrayList();
-
- private boolean _readingInfo = false;
-
- /**
- * @param doc
- *
- */
- public DocumentPageVariableAdapter(IDOMDocument doc) {
- super();
- this._document = doc;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.pagedesigner.jsp.core.pagevar.IPageVariablesProvider#getBeanInfos()
- */
- public IVariableInfo[] getBeanInfos() {
- IVariableInfo[] ret = new IVariableInfo[_variableInfos.size()];
- return (IVariableInfo[]) _variableInfos.toArray(ret);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.pagedesigner.jsp.core.pagevar.IPageVariablesProvider#addChangeListener(org.eclipse.jst.pagedesigner.jsp.core.pagevar.IChangeListener)
- */
- public void addChangeListener(IChangeListener listener) {
- this.reReadInfo();
- _changeListeners.add(listener);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.pagedesigner.jsp.core.pagevar.IPageVariablesProvider#removeChangeListener(org.eclipse.jst.pagedesigner.jsp.core.pagevar.IChangeListener)
- */
- public void removeChangeListener(IChangeListener listener) {
- _changeListeners.remove(listener);
- }
-
- /**
- * fire change events on all listeners
- */
- protected void fireChanged() {
- Object[] listeners = _changeListeners.getListeners();
- for (int i = 0; i < listeners.length; i++) {
- IChangeListener l = (IChangeListener) listeners[i];
- l.changed();
- }
-
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.sse.core.internal.provisional.INodeAdapter#isAdapterForType(java.lang.Object)
- */
- public boolean isAdapterForType(Object type) {
- return IDocumentPageVariableAdapter.class.equals(type);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.sse.core.internal.provisional.INodeAdapter#notifyChanged(org.eclipse.wst.sse.core.internal.provisional.INodeNotifier,
- * int, java.lang.Object, java.lang.Object, java.lang.Object, int)
- */
- public void notifyChanged(INodeNotifier notifier, int eventType,
- Object changedFeature, Object oldValue, Object newValue, int pos) {
- switch (eventType) {
- case INodeNotifier.STRUCTURE_CHANGED:
- case INodeNotifier.CONTENT_CHANGED:
- case INodeNotifier.CHANGE:
- refresh();
- break;
- default:
- // skip. Ignore other kinds of change.
- }
-
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.pagedesigner.jsp.core.pagevar.IPageVariablesProvider#refresh()
- */
- public void refresh() {
- reReadInfo();
- }
-
- /**
- * re-read page variable info
- */
- protected void reReadInfo() {
- if (this._readingInfo) {
- return;
- }
- try {
- List oldInfo = this._variableInfos;
- this._variableInfos = new ArrayList();
- readNode(_document);
- if (!isSame(oldInfo, this._variableInfos)) {
- fireChanged();
- }
- } finally {
- this._readingInfo = false;
- }
- }
-
- /**
- * compare two variable info list.
- *
- * @param oldInfo
- * @param list
- * @return true if same.
- */
- private boolean isSame(List oldInfo, List list) {
- if (oldInfo.size() != list.size()) {
- return false;
- }
- for (int i = 0, size = oldInfo.size(); i < size; i++) {
- IVariableInfo info1 = (IVariableInfo) oldInfo.get(i);
- IVariableInfo info2 = (IVariableInfo) list.get(i);
- if (info1 == null) {
- return false;// should not happen
- }
- if (!info1.equals(info2)) {
- return false;
- }
- }
- return true;
- }
-
- /**
- * recursively read all element, and see whether they have
- * IPageVariableAdapter, and then get variable info.
- *
- * @param element
- */
- private void readNode(Node node) {
- if (node instanceof INodeNotifier && node instanceof Element) {
- Element element = (Element) node;
- Object obj = ((INodeNotifier) element)
- .getAdapterFor(IPageVariableAdapter.class);
- if (obj instanceof IPageVariableAdapter) {
- IPageVariableAdapter adapter = (IPageVariableAdapter) obj;
- if (adapter.supportMultipleVariable(element)) {
- List infos = ((IPageVariableAdapter) obj)
- .getVariableInfos(element);
- if (infos != null) {
- this._variableInfos.addAll(infos);
- }
- } else {
- // hope not doing addAll could improve some performance.
- IVariableInfo info = adapter.getVariableInfo(element);
- if (info != null) {
- this._variableInfos.add(info);
- }
- }
- }
- }
-
- NodeList childNodes = node.getChildNodes();
- if (childNodes != null) {
- for (int i = 0, length = childNodes.getLength(); i < length; i++) {
- Node childNode = childNodes.item(i);
- readNode(childNode);
- }
- }
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/src/org/eclipse/jst/pagedesigner/jsp/core/internal/pagevar/PageVariableAdapter.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/src/org/eclipse/jst/pagedesigner/jsp/core/internal/pagevar/PageVariableAdapter.java
deleted file mode 100644
index 40e01b5..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/src/org/eclipse/jst/pagedesigner/jsp/core/internal/pagevar/PageVariableAdapter.java
+++ /dev/null
@@ -1,164 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.pagedesigner.jsp.core.internal.pagevar;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.jst.pagedesigner.jsp.core.pagevar.IVariableInfo;
-import org.eclipse.jst.pagedesigner.jsp.core.pagevar.adapter.IDocumentPageVariableAdapter;
-import org.eclipse.jst.pagedesigner.jsp.core.pagevar.adapter.IPageVariableAdapter;
-import org.eclipse.wst.sse.core.internal.provisional.INodeNotifier;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMDocument;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
-import org.w3c.dom.Element;
-
-/**
- * @author mengbo
- * @version 1.5
- */
-public class PageVariableAdapter implements IPageVariableAdapter {
- static final PageVariableAdapter _instance = new PageVariableAdapter();
-
- /**
- * @return the singleton instance
- */
- public static PageVariableAdapter getInstance() {
- return _instance;
- }
-
- /**
- * no external instatiation
- */
- private PageVariableAdapter() {
- super();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.sse.core.internal.provisional.INodeAdapter#isAdapterForType(java.lang.Object)
- */
- public boolean isAdapterForType(Object type) {
- return IPageVariableAdapter.class.equals(type);
- }
-
- private IDocumentPageVariableAdapter getDocumentAdapter(
- INodeNotifier notifier) {
- if (notifier instanceof IDOMNode) {
- IDOMModel model = ((IDOMNode) notifier).getModel();
- if (model != null) {
- IDOMDocument document = model.getDocument();
- if (document != null) {
- return (IDocumentPageVariableAdapter) document
- .getAdapterFor(IDocumentPageVariableAdapter.class);
- }
- }
- }
- return null;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.sse.core.internal.provisional.INodeAdapter#notifyChanged(org.eclipse.wst.sse.core.internal.provisional.INodeNotifier,
- * int, java.lang.Object, java.lang.Object, java.lang.Object, int)
- */
- public void notifyChanged(INodeNotifier notifier, int eventType,
- Object changedFeature, Object oldValue, Object newValue, int pos) {
- IDocumentPageVariableAdapter docadapter = getDocumentAdapter(notifier);
-
- switch (eventType) {
- case INodeNotifier.STRUCTURE_CHANGED:
- docadapter.refresh();
- break;
- case INodeNotifier.CONTENT_CHANGED:
- case INodeNotifier.CHANGE:
- // only this node changed, only refresh if this node is page
- // variable node
- if (notifier instanceof Element
- && supportVariableInfo((Element) notifier)) {
- docadapter.refresh();
- }
- break;
- default:
- // skip. Ignore other kinds of change.
- }
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.pagedesigner.jsp.core.pagevar.adapter.IPageVariableAdapter#supportMultipleVariable(org.w3c.dom.Element)
- */
- public boolean supportMultipleVariable(Element element) {
- return false;
- }
-
- /**
- * @param element
- * @return
- */
- private boolean supportVariableInfo(Element element) {
- return PageVariableAdatperRegistry.getInstance().getTagVarDescriptor(
- element) != null;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.pagedesigner.jsp.core.pagevar.adapter.IPageVariableAdapter#getVariableInfo(org.w3c.dom.Element)
- */
- public IVariableInfo getVariableInfo(Element element) {
- TagVarDescriptor desc = PageVariableAdatperRegistry.getInstance()
- .getTagVarDescriptor(element);
- if (desc == null) {
- return null;
- }
- String name;
- if (desc.isVarNameIsAttr()) {
- name = element.getAttribute(desc.getVarName());
- if (name == null || name.length() == 0) {
- return null; // missing name.
- }
- } else {
- name = desc.getVarName();
- }
- String type;
- if (desc.isVarTypeStringIsAttr()) {
- type = element.getAttribute(desc.getVarTypeString());
- if (type == null || type.length() == 0) {
- return null; // missing type
- }
- } else {
- type = desc.getVarTypeString();
- }
- return new VariableInfo(name, desc.getVarTypeMode(), type);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.pagedesigner.jsp.core.pagevar.adapter.IPageVariableAdapter#getVariableInfos(org.w3c.dom.Element)
- */
- public List getVariableInfos(Element element) {
- IVariableInfo info = getVariableInfo(element);
- if (info == null) {
- return Collections.EMPTY_LIST;
- }
- List ret = new ArrayList(1);
- ret.add(info);
- return ret;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/src/org/eclipse/jst/pagedesigner/jsp/core/internal/pagevar/PageVariableAdatperRegistry.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/src/org/eclipse/jst/pagedesigner/jsp/core/internal/pagevar/PageVariableAdatperRegistry.java
deleted file mode 100644
index e64dce6..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/src/org/eclipse/jst/pagedesigner/jsp/core/internal/pagevar/PageVariableAdatperRegistry.java
+++ /dev/null
@@ -1,248 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.pagedesigner.jsp.core.internal.pagevar;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtension;
-import org.eclipse.core.runtime.IExtensionPoint;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.jst.pagedesigner.jsp.core.IJSPCoreConstants;
-import org.eclipse.jst.pagedesigner.jsp.core.JSPCorePlugin;
-import org.eclipse.jst.pagedesigner.jsp.core.pagevar.IVariableInfo;
-import org.eclipse.jst.pagedesigner.jsp.core.util.CMUtil;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMElement;
-import org.w3c.dom.Element;
-
-/**
- * @author mengbo
- * @version 1.5
- */
-public class PageVariableAdatperRegistry {
- /**
- * pageVar
- */
- public static final String PAGEVAR = "pageVar"; //$NON-NLS-1$
-
- /**
- * taglib
- */
- public static final String TAGLIB = "taglib"; //$NON-NLS-1$
-
- /**
- * tag
- */
- public static final String TAG = "tag"; //$NON-NLS-1$
-
- /**
- * varName
- */
- public static final String VARNAME = "varName"; //$NON-NLS-1$
-
- /**
- * varNameIsAttr
- */
- public static final String VARNAMEISATTR = "varNameIsAttr"; //$NON-NLS-1$
-
- /**
- * varTypeMode
- */
- public static final String VARTYPEMODE = "varTypeMode"; //$NON-NLS-1$
-
- /**
- * tagName
- */
- public static final String TAGNAME = "tagName"; //$NON-NLS-1$
-
- /**
- * varTypeString
- */
- public static final String VARTYPESTRING = "varTypeString"; //$NON-NLS-1$
-
- /**
- * varTypeStringIsAttr
- */
- public static final String VARTYPESTRINGISATTR = "varTypeStringIsAttr"; //$NON-NLS-1$
-
- /**
- * uri
- */
- public static final String URI = "uri"; //$NON-NLS-1$
-
- private static PageVariableAdatperRegistry _instance = null;
-
- private Map _registry;
-
- private TagVarDescriptor _useBeanDescriptor;
-
- /**
- * @return the singleton instance
- */
- public static PageVariableAdatperRegistry getInstance() {
- if (_instance == null) {
- _instance = new PageVariableAdatperRegistry();
- }
- return _instance;
- }
-
- private PageVariableAdatperRegistry() {
- _registry = readAllDescriptors();
- }
-
- // public IPageVariableAdapter createAdapter(IDOMElement ele, String uri,
- // String tagname)
- // {
- // String key = uri + "#" + tagname;
- // TagVarDescriptor desc = (TagVarDescriptor) _registry.get(key);
- // if (desc != null)
- // {
- // PageVariableAdapter adapter = new PageVariableAdapter(ele);
- // adapter.setVarName(desc.getVarName());
- // adapter.setVarNameAttrName(desc.isVarNameIsAttr());
- // adapter.setVarTypeString(desc.getVarTypeString());
- // adapter.setVarTypeAttrName(desc.isVarTypeStringIsAttr());
- // adapter.setVarTypeMode(desc.getVarTypeMode());
- // return adapter;
- // }
- // else
- // {
- // return null;
- // }
- // }
-
- private Map readAllDescriptors() {
- Map map = new HashMap();
-
- IExtensionPoint extensionPoint = Platform.getExtensionRegistry()
- .getExtensionPoint(JSPCorePlugin.getPluginId(), PAGEVAR);
- IExtension[] extensions = extensionPoint.getExtensions();
-
- for (int i = 0; i < extensions.length; i++) {
- IExtension ext = extensions[i];
- IConfigurationElement[] facs = ext.getConfigurationElements();
-
- for (int j = 0; j < facs.length; j++) {
- if (facs[j].getName().equals(TAGLIB)) {
- String uri = facs[j].getAttribute(URI);
- if (uri == null || uri.length() == 0) {
- continue;
- }
- IConfigurationElement[] tags = facs[j].getChildren(TAG);
- for (int k = 0; k < tags.length; k++) {
- TagVarDescriptor desc = new TagVarDescriptor();
-
- String tag = tags[k].getAttribute(TAGNAME);
- String varName = tags[k].getAttribute(VARNAME);
- boolean varNameIsAttr = "true".equalsIgnoreCase(tags[k] //$NON-NLS-1$
- .getAttribute(VARNAMEISATTR));
- String varTypeString = tags[k]
- .getAttribute(VARTYPESTRING);
- boolean varTypeStringIsAttr = "true" //$NON-NLS-1$
- .equalsIgnoreCase(tags[k]
- .getAttribute(VARTYPESTRINGISATTR));
- String varTypeModeString = tags[k]
- .getAttribute(VARTYPEMODE);
- int varTypeMode = toVarTypeMode(varTypeModeString);
-
- desc.setVarName(varName);
- desc.setVarNameIsAttr(varNameIsAttr);
- desc.setVarTypeMode(varTypeMode);
- desc.setVarTypeString(varTypeString);
- desc.setVarTypeStringIsAttr(varTypeStringIsAttr);
- desc.setTagName(tag);
-
- // Use uri#tag as key.
- map.put(uri + "#" + tag, desc); //$NON-NLS-1$
- }
- }
- }
- }
-
- return map;
- }
-
- /**
- * @param varTypeModeString
- * @return variable typemode
- */
- public static int toVarTypeMode(String varTypeModeString) {
- if ("CLASSNAME".equalsIgnoreCase(varTypeModeString)) { //$NON-NLS-1$
- return IVariableInfo.CLASSNAME;
- } else if ("EXPRESSION".equalsIgnoreCase(varTypeModeString)) { //$NON-NLS-1$
- return IVariableInfo.EXPRESSION;
- } else if ("EXPRESSION_COLLECTION_ITEM" //$NON-NLS-1$
- .equalsIgnoreCase(varTypeModeString)) {
- return IVariableInfo.EXPRESSION_LISTITEM;
- } else if ("BUNDLE".equalsIgnoreCase(varTypeModeString)) { //$NON-NLS-1$
- return IVariableInfo.RESOURCEBUNDLE;
- } else {
- return IVariableInfo.EXPRESSION; // default
- }
- }
-
- /**
- * @param uri
- * @param tagname
- * @return the tag variable descriptor for the given tag (may be null)
- */
- public TagVarDescriptor getTagVarDescriptor(String uri, String tagname) {
- String key = uri + "#" + tagname; //$NON-NLS-1$
- return (TagVarDescriptor) _registry.get(key);
- }
-
- /**
- * @param localName
- * @return
- */
- private TagVarDescriptor getJSPTagVarDescriptor(String localName) {
- if (IJSPCoreConstants.TAG_USEBEAN.equals(localName)) {
- if (_useBeanDescriptor == null) {
- _useBeanDescriptor = new TagVarDescriptor();
- _useBeanDescriptor.setVarName(IJSPCoreConstants.ATTR_ID);
- _useBeanDescriptor.setVarNameIsAttr(true);
- _useBeanDescriptor.setVarTypeMode(IVariableInfo.CLASSNAME);
- _useBeanDescriptor
- .setVarTypeString(IJSPCoreConstants.ATTR_CLASS);
- _useBeanDescriptor.setVarTypeStringIsAttr(true);
- }
-
- return _useBeanDescriptor;
- }
-
- return null;
- }
-
- /**
- * @param target
- * @return the tag variable descriptor for the target
- */
- public TagVarDescriptor getTagVarDescriptor(Element target) {
- if (target instanceof IDOMElement) {
- IDOMElement xmlEle = (IDOMElement) target;
- CMElementDeclaration decl = CMUtil.getElementDeclaration(xmlEle);
- if (decl != null) {
- if (CMUtil.isJSP(decl)) {
- return getJSPTagVarDescriptor(xmlEle.getLocalName());
- }
- String uri = CMUtil.getTagURI(decl);
- if (uri != null) {
- return getTagVarDescriptor(uri, xmlEle.getLocalName());
- }
- }
- }
- return null;
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/src/org/eclipse/jst/pagedesigner/jsp/core/internal/pagevar/TagVarDescriptor.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/src/org/eclipse/jst/pagedesigner/jsp/core/internal/pagevar/TagVarDescriptor.java
deleted file mode 100644
index 8e5b649..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/src/org/eclipse/jst/pagedesigner/jsp/core/internal/pagevar/TagVarDescriptor.java
+++ /dev/null
@@ -1,114 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.pagedesigner.jsp.core.internal.pagevar;
-
-/**
- * @author mengbo
- * @version 1.5
- */
-public class TagVarDescriptor {
- private String _varName;
-
- private boolean _varNameIsAttr;
-
- private String _varTypeString;
-
- private boolean _varTypeStringIsAttr;
-
- private int _varTypeMode;
-
- private String _tagName;
-
- /**
- * @return the varName
- */
- public String getVarName() {
- return _varName;
- }
-
- /**
- * @param varName
- */
- public void setVarName(String varName) {
- this._varName = varName;
- }
-
- /**
- * @return true if var name is attribute
- */
- public boolean isVarNameIsAttr() {
- return _varNameIsAttr;
- }
-
- /**
- * @param varNameIsAttr
- */
- public void setVarNameIsAttr(boolean varNameIsAttr) {
- this._varNameIsAttr = varNameIsAttr;
- }
-
- /**
- * @return the variable type mode
- */
- public int getVarTypeMode() {
- return _varTypeMode;
- }
-
- /**
- * @param varTypeMode
- */
- public void setVarTypeMode(int varTypeMode) {
- this._varTypeMode = varTypeMode;
- }
-
- /**
- * @return the variable type string
- */
- public String getVarTypeString() {
- return _varTypeString;
- }
-
- /**
- * @param varTypeString
- */
- public void setVarTypeString(String varTypeString) {
- this._varTypeString = varTypeString;
- }
-
- /**
- * @return true if variable type string is attr
- */
- public boolean isVarTypeStringIsAttr() {
- return _varTypeStringIsAttr;
- }
-
- /**
- * @param varTypeStringIsAttr
- */
- public void setVarTypeStringIsAttr(boolean varTypeStringIsAttr) {
- this._varTypeStringIsAttr = varTypeStringIsAttr;
- }
-
- /**
- * @param tag
- */
- public void setTagName(String tag) {
- this._tagName = tag;
- }
-
- /**
- * @return the tag name
- */
- public String getTagName() {
- return this._tagName;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/src/org/eclipse/jst/pagedesigner/jsp/core/internal/pagevar/VariableInfo.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/src/org/eclipse/jst/pagedesigner/jsp/core/internal/pagevar/VariableInfo.java
deleted file mode 100644
index 6b29b9a..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/src/org/eclipse/jst/pagedesigner/jsp/core/internal/pagevar/VariableInfo.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.pagedesigner.jsp.core.internal.pagevar;
-
-import org.eclipse.jst.pagedesigner.jsp.core.pagevar.IVariableInfo;
-
-/**
- * @author mengbo
- * @version 1.5
- */
-public class VariableInfo implements IVariableInfo {
- private String _typeInfo;
-
- private int _mode;
-
- private String _name;
-
- /**
- * @param name
- * @param mode
- * @param typeInfo
- *
- */
- public VariableInfo(String name, int mode, String typeInfo) {
- this._name = name;
- this._mode = mode;
- this._typeInfo = typeInfo;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.pagedesigner.jsp.core.pagevar.IVariableInfo#getName()
- */
- public String getName() {
- return _name;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.pagedesigner.jsp.core.pagevar.IVariableInfo#getMode()
- */
- public int getMode() {
- return _mode;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.pagedesigner.jsp.core.pagevar.IVariableInfo#getTypeInfoString()
- */
- public String getTypeInfoString() {
- return _typeInfo;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see java.lang.Object#equals(java.lang.Object)
- */
- // TODO: no hashcode override?
- public boolean equals(Object obj) {
- if (this == obj) {
- return true;
- }
- if (obj instanceof VariableInfo) {
- VariableInfo info = (VariableInfo) obj;
- return this._mode == info._mode && equals(this._name, info._name)
- && equals(this._typeInfo, info._typeInfo);
- }
- return false;
- }
-
- private boolean equals(String s1, String s2) {
- if (s1 == null) {
- return s2 == null;
- }
- return s1.equals(s2);
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/src/org/eclipse/jst/pagedesigner/jsp/core/pagevar/IChangeListener.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/src/org/eclipse/jst/pagedesigner/jsp/core/pagevar/IChangeListener.java
deleted file mode 100644
index 9196d0c..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/src/org/eclipse/jst/pagedesigner/jsp/core/pagevar/IChangeListener.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.pagedesigner.jsp.core.pagevar;
-
-import java.util.EventListener;
-
-/**
- * @author mengbo
- * @version 1.5
- */
-public interface IChangeListener extends EventListener {
- /**
- * fire a changed indication
- */
- public void changed();
-}
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/src/org/eclipse/jst/pagedesigner/jsp/core/pagevar/IPageVariablesProvider.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/src/org/eclipse/jst/pagedesigner/jsp/core/pagevar/IPageVariablesProvider.java
deleted file mode 100644
index a538ec8..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/src/org/eclipse/jst/pagedesigner/jsp/core/pagevar/IPageVariablesProvider.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.pagedesigner.jsp.core.pagevar;
-
-/**
- * @author mengbo
- * @version 1.5
- */
-public interface IPageVariablesProvider {
- /**
- *
- */
- public void refresh();
-
- /**
- * @return the bean infos
- */
- public IVariableInfo[] getBeanInfos();
-
- /**
- * @param listener
- */
- public void addChangeListener(IChangeListener listener);
-
- /**
- * @param listener
- */
- public void removeChangeListener(IChangeListener listener);
-}
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/src/org/eclipse/jst/pagedesigner/jsp/core/pagevar/IVariableInfo.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/src/org/eclipse/jst/pagedesigner/jsp/core/pagevar/IVariableInfo.java
deleted file mode 100644
index a491de0..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/src/org/eclipse/jst/pagedesigner/jsp/core/pagevar/IVariableInfo.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.pagedesigner.jsp.core.pagevar;
-
-/**
- * @author mengbo
- * @version 1.5
- */
-public interface IVariableInfo {
- /**
- * @return the name
- */
- public String getName();
-
- /**
- * TODO
- */
- public static final int CLASSNAME = 0;
-
- /**
- * TODO
- */
- public static final int EXPRESSION = 1;
-
- /**
- * TODO
- */
- public static final int EXPRESSION_LISTITEM = 2;
-
- /**
- * TODO
- */
- public static final int RESOURCEBUNDLE = 3;
-
- /**
- * @return one of CLASSNAME, EXPRESSION, EXPRESSION_LISTITEM, RESOURCEBUNDLE
- */
- public int getMode();
-
- /**
- * type info string will have different meaning for different mode.
- *
- * @return the type info string
- */
- public String getTypeInfoString();
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/src/org/eclipse/jst/pagedesigner/jsp/core/pagevar/adapter/IDocumentPageVariableAdapter.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/src/org/eclipse/jst/pagedesigner/jsp/core/pagevar/adapter/IDocumentPageVariableAdapter.java
deleted file mode 100644
index 31979ef..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/src/org/eclipse/jst/pagedesigner/jsp/core/pagevar/adapter/IDocumentPageVariableAdapter.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.pagedesigner.jsp.core.pagevar.adapter;
-
-import org.eclipse.jst.pagedesigner.jsp.core.pagevar.IPageVariablesProvider;
-import org.eclipse.wst.sse.core.internal.provisional.INodeAdapter;
-
-/**
- * IDocumentPageVariableAdapter will be adapted to the jsp document.
- *
- * @author mengbo
- * @version 1.5
- */
-public interface IDocumentPageVariableAdapter extends IPageVariablesProvider,
- INodeAdapter {
- // TODO: what's this for?
-}
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/src/org/eclipse/jst/pagedesigner/jsp/core/pagevar/adapter/IPageVariableAdapter.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/src/org/eclipse/jst/pagedesigner/jsp/core/pagevar/adapter/IPageVariableAdapter.java
deleted file mode 100644
index 158799f..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/src/org/eclipse/jst/pagedesigner/jsp/core/pagevar/adapter/IPageVariableAdapter.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.pagedesigner.jsp.core.pagevar.adapter;
-
-import java.util.List;
-
-import org.eclipse.jst.pagedesigner.jsp.core.pagevar.IVariableInfo;
-import org.eclipse.wst.sse.core.internal.provisional.INodeAdapter;
-import org.w3c.dom.Element;
-
-/**
- * A IPageVariableAdapter normally will be adapted to an JSP tag.
- *
- * @author mengbo
- * @version 1.5
- */
-public interface IPageVariableAdapter extends INodeAdapter {
- /**
- * most JSP tags will only support a single variable.
- * @param element
- *
- * @return true if the tag supports multiple variables
- */
- public boolean supportMultipleVariable(Element element);
-
- /**
- * If only support single variable, this method will return the variable
- * info. This method is provided for better performance.
- *
- * @param element
- * @return null means no variable info provided.
- */
- public IVariableInfo getVariableInfo(Element element);
-
- /**
- * should return a list of IVariableInfo
- * @param element
- *
- * @return the list of variable infos
- */
- public List getVariableInfos(Element element);
-}
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/src/org/eclipse/jst/pagedesigner/jsp/core/pagevar/adapter/PageVariableAdapterFactory.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/src/org/eclipse/jst/pagedesigner/jsp/core/pagevar/adapter/PageVariableAdapterFactory.java
deleted file mode 100644
index 1c6c64d..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/src/org/eclipse/jst/pagedesigner/jsp/core/pagevar/adapter/PageVariableAdapterFactory.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.pagedesigner.jsp.core.pagevar.adapter;
-
-import org.eclipse.jst.pagedesigner.jsp.core.internal.pagevar.PageVariableAdapter;
-import org.eclipse.wst.sse.core.internal.provisional.AbstractAdapterFactory;
-import org.eclipse.wst.sse.core.internal.provisional.INodeAdapter;
-import org.eclipse.wst.sse.core.internal.provisional.INodeNotifier;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMElement;
-
-/**
- * @author mengbo
- * @version 1.5
- */
-public class PageVariableAdapterFactory extends AbstractAdapterFactory {
- /**
- *
- */
- public PageVariableAdapterFactory() {
- super(IPageVariableAdapter.class, true);
- }
-
- /*
- * (non-Javadoc)
- * @seeorg.eclipse.wst.sse.core.internal.provisional.AbstractAdapterFactory#createAdapter(org.eclipse.wst.sse.core.internal.provisional.INodeNotifier)
- */
- protected INodeAdapter createAdapter(INodeNotifier target) {
- if (target instanceof IDOMElement) {
- return PageVariableAdapter.getInstance();
- }
- return null;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/src/org/eclipse/jst/pagedesigner/jsp/core/util/CMUtil.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/src/org/eclipse/jst/pagedesigner/jsp/core/util/CMUtil.java
deleted file mode 100644
index fd299aa..0000000
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/src/org/eclipse/jst/pagedesigner/jsp/core/util/CMUtil.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Sybase, Inc. and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sybase, Inc. - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.pagedesigner.jsp.core.util;
-
-import org.eclipse.jst.jsp.core.internal.contentmodel.tld.provisional.TLDDocument;
-import org.eclipse.jst.jsp.core.internal.contentmodel.tld.provisional.TLDElementDeclaration;
-import org.eclipse.wst.html.core.internal.provisional.HTMLCMProperties;
-import org.eclipse.wst.sse.core.internal.provisional.INodeNotifier;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMDocument;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNode;
-import org.eclipse.wst.xml.core.internal.provisional.contentmodel.CMNodeWrapper;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMElement;
-import org.eclipse.wst.xml.core.internal.ssemodelquery.ModelQueryAdapter;
-
-/**
- * Utility class to content model related information.
- *
- * @author mengbo
- */
-public class CMUtil {
- /**
- * If the element is a custom tag, get the URI of it. If the element is a
- * standard JSP tag, return null. If is not jsp tag, then return null
- * @param decl
- * @return the tag uri for decl
- */
- public static String getTagURI(CMElementDeclaration decl) {
- if (decl instanceof CMNodeWrapper) {
- decl = (CMElementDeclaration) ((CMNodeWrapper) decl)
- .getOriginNode();
- }
- if (decl instanceof TLDElementDeclaration) {
- CMDocument doc = ((TLDElementDeclaration) decl).getOwnerDocument();
- if (doc instanceof TLDDocument) {
- return ((TLDDocument) doc).getUri();
- }
- }
- return null;
- }
-
- /**
- * get element declaration of specified element
- *
- * @param element
- * @return null if can't get it.
- */
- public static CMElementDeclaration getElementDeclaration(IDOMElement element) {
- INodeNotifier notifier = (INodeNotifier) element.getOwnerDocument();
- if (notifier == null) {
- return null;
- }
- ModelQueryAdapter mqa = (ModelQueryAdapter) notifier
- .getAdapterFor(ModelQueryAdapter.class);
- if (mqa == null) {
- return null;
- }
- return mqa.getModelQuery().getCMElementDeclaration(element);
- }
-
- /**
- * @param element
- * @return the tld element declaration for element
- */
- public static TLDElementDeclaration getTLDElementDeclaration(
- IDOMElement element) {
- CMNode decl = getElementDeclaration(element);
- if (decl instanceof CMNodeWrapper) {
- decl = ((CMNodeWrapper) decl).getOriginNode();
- }
- if (decl instanceof TLDElementDeclaration) {
- return (TLDElementDeclaration) decl;
- }
- return null;
- }
-
- /**
- * @param decl
- * @return true if decl is a JSP tag
- */
- public static boolean isJSP(CMElementDeclaration decl) {
- if (!decl.supports(HTMLCMProperties.IS_JSP)) {
- return false;
- }
- return ((Boolean) decl.getProperty(HTMLCMProperties.IS_JSP))
- .booleanValue();
- }
-}
