This commit was manufactured by cvs2svn to create tag 'v201203090500'.
diff --git a/features/org.eclipse.wst.common_ui.feature.patch/.cvsignore b/features/org.eclipse.wst.common_ui.feature.patch/.cvsignore
deleted file mode 100644
index c14487c..0000000
--- a/features/org.eclipse.wst.common_ui.feature.patch/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-build.xml
diff --git a/features/org.eclipse.wst.common_ui.feature.patch/.project b/features/org.eclipse.wst.common_ui.feature.patch/.project
deleted file mode 100644
index 0dbb12b..0000000
--- a/features/org.eclipse.wst.common_ui.feature.patch/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.wst.common_ui.feature.patch</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/features/org.eclipse.wst.common_ui.feature.patch/build.properties b/features/org.eclipse.wst.common_ui.feature.patch/build.properties
deleted file mode 100644
index cb50260..0000000
--- a/features/org.eclipse.wst.common_ui.feature.patch/build.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-bin.includes = feature.xml,\
- license.html,\
- feature.properties,\
- epl-v10.html,\
- eclipse_update_120.jpg
diff --git a/features/org.eclipse.wst.common_ui.feature.patch/buildnotes_org.eclipse.wst.common_ui.feature.patch.html b/features/org.eclipse.wst.common_ui.feature.patch/buildnotes_org.eclipse.wst.common_ui.feature.patch.html
deleted file mode 100644
index fff3c4e..0000000
--- a/features/org.eclipse.wst.common_ui.feature.patch/buildnotes_org.eclipse.wst.common_ui.feature.patch.html
+++ /dev/null
@@ -1,18 +0,0 @@
-<!doctype html public "-//w3c//dtd html 4.0 transitional//en">
-<html>
-
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<meta name="Build" content="Build">
-<title>WTP 3.3.2 Patches</title>
-</head>
-
-<body>
-
-<h1>WTP 3.3.2 Patches</h1>
-
-<h2>org.eclipse.wst.common_ui.feature</h2>
-
-<p>Bug <a href='https://bugs.eclipse.org/373416'>373416</a>. Remove reference to JBoss</p>
-</body>
-</html>
\ No newline at end of file
diff --git a/features/org.eclipse.wst.common_ui.feature.patch/eclipse_update_120.jpg b/features/org.eclipse.wst.common_ui.feature.patch/eclipse_update_120.jpg
deleted file mode 100644
index bfdf708..0000000
--- a/features/org.eclipse.wst.common_ui.feature.patch/eclipse_update_120.jpg
+++ /dev/null
Binary files differ
diff --git a/features/org.eclipse.wst.common_ui.feature.patch/epl-v10.html b/features/org.eclipse.wst.common_ui.feature.patch/epl-v10.html
deleted file mode 100644
index fd39122..0000000
--- a/features/org.eclipse.wst.common_ui.feature.patch/epl-v10.html
+++ /dev/null
@@ -1,261 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<title>Eclipse Public License - Version 1.0</title>
-<style type="text/css">
- body {
- size: 8.5in 11.0in;
- margin: 0.25in 0.5in 0.25in 0.5in;
- tab-interval: 0.5in;
- }
- p {
- margin-left: auto;
- margin-top: 0.5em;
- margin-bottom: 0.5em;
- }
- p.list {
- margin-left: 0.5in;
- margin-top: 0.05em;
- margin-bottom: 0.05em;
- }
- </style>
-
-</head>
-
-<body lang="EN-US">
-
-<h2>Eclipse Public License - v 1.0</h2>
-
-<p>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.</p>
-
-<p><b>1. DEFINITIONS</b></p>
-
-<p>"Contribution" means:</p>
-
-<p class="list">a) in the case of the initial Contributor, the initial
-code and documentation distributed under this Agreement, and</p>
-<p class="list">b) in the case of each subsequent Contributor:</p>
-<p class="list">i) changes to the Program, and</p>
-<p class="list">ii) additions to the Program;</p>
-<p class="list">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.</p>
-
-<p>"Contributor" means any person or entity that distributes
-the Program.</p>
-
-<p>"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.</p>
-
-<p>"Program" means the Contributions distributed in accordance
-with this Agreement.</p>
-
-<p>"Recipient" means anyone who receives the Program under
-this Agreement, including all Contributors.</p>
-
-<p><b>2. GRANT OF RIGHTS</b></p>
-
-<p class="list">a) Subject to the terms of this Agreement, each
-Contributor hereby grants Recipient a non-exclusive, worldwide,
-royalty-free copyright license to 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.</p>
-
-<p class="list">b) Subject to the terms of this Agreement, each
-Contributor hereby grants Recipient a non-exclusive, worldwide,
-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.</p>
-
-<p class="list">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.</p>
-
-<p class="list">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.</p>
-
-<p><b>3. REQUIREMENTS</b></p>
-
-<p>A Contributor may choose to distribute the Program in object code
-form under its own license agreement, provided that:</p>
-
-<p class="list">a) it complies with the terms and conditions of this
-Agreement; and</p>
-
-<p class="list">b) its license agreement:</p>
-
-<p class="list">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;</p>
-
-<p class="list">ii) effectively excludes on behalf of all Contributors
-all liability for damages, including direct, indirect, special,
-incidental and consequential damages, such as lost profits;</p>
-
-<p class="list">iii) states that any provisions which differ from this
-Agreement are offered by that Contributor alone and not by any other
-party; and</p>
-
-<p class="list">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.</p>
-
-<p>When the Program is made available in source code form:</p>
-
-<p class="list">a) it must be made available under this Agreement; and</p>
-
-<p class="list">b) a copy of this Agreement must be included with each
-copy of the Program.</p>
-
-<p>Contributors may not remove or alter any copyright notices contained
-within the Program.</p>
-
-<p>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.</p>
-
-<p><b>4. COMMERCIAL DISTRIBUTION</b></p>
-
-<p>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.</p>
-
-<p>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.</p>
-
-<p><b>5. NO WARRANTY</b></p>
-
-<p>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.</p>
-
-<p><b>6. DISCLAIMER OF LIABILITY</b></p>
-
-<p>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.</p>
-
-<p><b>7. GENERAL</b></p>
-
-<p>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.</p>
-
-<p>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.</p>
-
-<p>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.</p>
-
-<p>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.</p>
-
-<p>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.</p>
-
-</body>
-
-</html>
diff --git a/features/org.eclipse.wst.common_ui.feature.patch/feature.properties b/features/org.eclipse.wst.common_ui.feature.patch/feature.properties
deleted file mode 100644
index 1b30032..0000000
--- a/features/org.eclipse.wst.common_ui.feature.patch/feature.properties
+++ /dev/null
@@ -1,174 +0,0 @@
-###############################################################################
-# Copyright (c) 2008 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-# feature.properties
-# contains externalized strings for feature.xml
-# "%foo" in feature.xml corresponds to the key "foo" in this file
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file should be translated.
-
-# "featureName" property - name of the feature
-featureName=WTP Patches for org.eclipse.wst.common_ui.feature
-
-# "providerName" property - name of the company that provides the feature
-providerName=Eclipse Web Tools Platform
-
-# "updateSiteName" property - label for the update site
-updateSiteName=The Eclipse Web Tools Platform (WTP) Project update site
-
-# "description" property - description of the feature
-description=\
-Contains fixes described in the following bugzilla(s):\n\
-\n\
-Bug https://bugs.eclipse.org/373416 Remove reference to JBoss\n\
-\n\
-# "copyright" property - text of the "Feature Update Copyright"
-copyright=\
-Copyright (c) 2010 IBM Corporation and others.\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\
- IBM 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\
-February 1, 2011\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the\n\
-Eclipse Foundation is provided to you under the terms and conditions of\n\
-the Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is\n\
-provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse Foundation source code\n\
-repository ("Repository") in software modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
- - Content may be structured and packaged into modules to facilitate delivering,\n\
- extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
- plug-in fragments ("Fragments"), and features ("Features").\n\
- - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\
- in a directory named "plugins".\n\
- - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
- Each Feature may be packaged as a sub-directory in a directory named "features".\n\
- Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
- numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
- - Features may also include other Features ("Included Features"). Within a Feature, files\n\
- named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
- - The top-level (root) directory\n\
- - Plug-in and Fragment directories\n\
- - Inside Plug-ins and Fragments packaged as JARs\n\
- - Sub-directories of the directory named "src" of certain Plug-ins\n\
- - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Provisioning Technology (as defined below), you must agree to a license ("Feature \n\
-Update License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties" found within a Feature.\n\
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the\n\
-terms and conditions (or references to such terms and conditions) that\n\
-govern your use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
- - Eclipse Distribution License Version 1.0 (available at http://www.eclipse.org/licenses/edl-v1.0.html)\n\
- - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
- - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
- - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
- - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
- - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-\n\Use of Provisioning Technology\n\
-\n\
-The Eclipse Foundation makes available provisioning software, examples of which include,\n\
-but are not limited to, p2 and the Eclipse Update Manager ("Provisioning Technology") for\n\
-the purpose of allowing users to install software, documentation, information and/or\n\
-other materials (collectively "Installable Software"). This capability is provided with\n\
-the intent of allowing such users to install, extend and update Eclipse-based products.\n\
-Information about packaging Installable Software is available at\n\
-http://eclipse.org/equinox/p2/repository_packaging.html ("Specification").\n\
-\n\
-You may use Provisioning Technology to allow other parties to install Installable Software.\n\
-You shall be responsible for enabling the applicable license agreements relating to the\n\
-Installable Software to be presented to, and accepted by, the users of the Provisioning Technology\n\
-in accordance with the Specification. By using Provisioning Technology in such a manner and\n\
-making it available in accordance with the Specification, you further acknowledge your\n\
-agreement to, and the acquisition of all necessary rights to permit the following:\n\
-\n\
- 1. A series of actions may occur ("Provisioning Process") in which a user may execute\n\
- the Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\
- extending or updating the functionality of an Eclipse-based product.\n\
- 2. During the Provisioning Process, the Provisioning Technology may cause third party\n\
- Installable Software or a portion thereof to be accessed and copied to the Target Machine.\n\
- 3. Pursuant to the Specification, you will provide to the user the terms and conditions that\n\
- govern the use of the Installable Software ("Installable Software Agreement") and such\n\
- Installable Software Agreement shall be accessed from the Target Machine in accordance\n\
- with the Specification. Such Installable Software Agreement must inform the user of the\n\
- terms and conditions that govern the Installable Software and must solicit acceptance by\n\
- the end user in the manner prescribed in such Installable Software Agreement. Upon such\n\
- indication of agreement by the user, the provisioning Technology will complete installation\n\
- of the Installable Software.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use, and\n\
-re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.\n
-########### end of license property ##########################################
diff --git a/features/org.eclipse.wst.common_ui.feature.patch/feature.xml b/features/org.eclipse.wst.common_ui.feature.patch/feature.xml
deleted file mode 100644
index 431dbdb..0000000
--- a/features/org.eclipse.wst.common_ui.feature.patch/feature.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
- id="org.eclipse.wst.common_ui.feature.patch"
- label="%featureName"
- version="3.3.2.qualifier"
- provider-name="%providerName">
-
- <description>
- %description
- </description>
-
- <copyright>
- %copyright
- </copyright>
-
- <license url="%licenseURL">
- %license
- </license>
-
- <requires>
- <import feature="org.eclipse.wst.common_ui.feature" version="3.3.2.v201111030500-7C79FVsEdhO_sfog9oNekiJkS7Nz00OK" patch="true"/>
- </requires>
-
- <plugin
- id="org.eclipse.wst.validation.ui"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
-</feature>
diff --git a/features/org.eclipse.wst.common_ui.feature.patch/license.html b/features/org.eclipse.wst.common_ui.feature.patch/license.html
deleted file mode 100644
index f19c483..0000000
--- a/features/org.eclipse.wst.common_ui.feature.patch/license.html
+++ /dev/null
@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<title>Eclipse Foundation Software User Agreement</title>
-</head>
-
-<body lang="EN-US">
-<h2>Eclipse Foundation Software User Agreement</h2>
-<p>February 1, 2011</p>
-
-<h3>Usage Of Content</h3>
-
-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
- (COLLECTIVELY "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>Eclipse Distribution License Version 1.0 (available at <a href="http://www.eclipse.org/licenses/edl-v10.html">http://www.eclipse.org/licenses/edl-v1.0.html</a>)</li>
- <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
- <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
- <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
- <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
- <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
-</ul>
-
-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License is provided, please
-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
-
-
-<h3>Use of Provisioning Technology</h3>
-
-<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse
- Update Manager ("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/plugins/org.eclipse.wst.common.modulecore.ui/.classpath b/plugins/org.eclipse.wst.common.modulecore.ui/.classpath
deleted file mode 100644
index 64c5e31..0000000
--- a/plugins/org.eclipse.wst.common.modulecore.ui/.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/plugins/org.eclipse.wst.common.modulecore.ui/.project b/plugins/org.eclipse.wst.common.modulecore.ui/.project
deleted file mode 100644
index 4977ea7..0000000
--- a/plugins/org.eclipse.wst.common.modulecore.ui/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.wst.common.modulecore.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/plugins/org.eclipse.wst.common.modulecore.ui/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.wst.common.modulecore.ui/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 44d82f6..0000000
--- a/plugins/org.eclipse.wst.common.modulecore.ui/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,74 +0,0 @@
-#Fri Sep 11 17:13:08 PDT 2009
-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.problem.annotationSuperInterface=ignore
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning
-org.eclipse.jdt.core.compiler.problem.deadCode=warning
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
-org.eclipse.jdt.core.compiler.problem.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=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=ignore
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=error
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=error
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=error
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=error
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=ignore
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=error
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning
-org.eclipse.jdt.core.compiler.problem.nullReference=ignore
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=error
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=ignore
-org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
-org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=error
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=error
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=ignore
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=error
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=error
-org.eclipse.jdt.core.compiler.problem.unusedLabel=error
-org.eclipse.jdt.core.compiler.problem.unusedLocal=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=ignore
-org.eclipse.jdt.core.compiler.source=1.5
diff --git a/plugins/org.eclipse.wst.common.modulecore.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.wst.common.modulecore.ui/META-INF/MANIFEST.MF
deleted file mode 100644
index 9275fc3..0000000
--- a/plugins/org.eclipse.wst.common.modulecore.ui/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,28 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Bundle-Name.0
-Bundle-Vendor: %provider
-Bundle-SymbolicName: org.eclipse.wst.common.modulecore.ui; singleton:=true
-Bundle-Version: 1.0.102.qualifier
-Bundle-Localization: plugin
-Bundle-Activator: org.eclipse.wst.common.componentcore.ui.ModuleCoreUIPlugin
-Require-Bundle: org.eclipse.ui;bundle-version="[3.5.0,4.0.0)",
- org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
- org.eclipse.core.resources;bundle-version="[3.5.0,4.0.0)",
- org.eclipse.wst.common.modulecore;bundle-version="[1.2.101,2.0.0)",
- org.eclipse.wst.common.frameworks;bundle-version="[1.1.300,2.0.0)",
- org.eclipse.wst.common.project.facet.core;bundle-version="[1.4.0,2.0.0)",
- org.eclipse.jem.util;bundle-version="[2.0.200,3.0.0)",
- org.eclipse.emf.ecore;bundle-version="[2.5.0,3.0.0)",
- org.eclipse.ui.ide;bundle-version="[3.5.0,4.0.0)",
- org.eclipse.wst.common.emfworkbench.integration;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.wst.server.core;bundle-version="[1.1.202,2.0.0)",
- org.eclipse.core.expressions;bundle-version="[3.4.200,4.0.0)"
-Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Export-Package: org.eclipse.wst.common.componentcore.internal.impl;x-internal:=true,
- org.eclipse.wst.common.componentcore.ui;x-internal:=true,
- org.eclipse.wst.common.componentcore.ui.internal.propertypage;x-internal:=true,
- org.eclipse.wst.common.componentcore.ui.internal.propertypage.verifier;x-internal:=true,
- org.eclipse.wst.common.componentcore.ui.internal.taskwizard;x-internal:=true,
- org.eclipse.wst.common.componentcore.ui.propertypage;x-internal:=true
diff --git a/plugins/org.eclipse.wst.common.modulecore.ui/about.html b/plugins/org.eclipse.wst.common.modulecore.ui/about.html
deleted file mode 100644
index b6ed5b0..0000000
--- a/plugins/org.eclipse.wst.common.modulecore.ui/about.html
+++ /dev/null
@@ -1,34 +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">
-
-<H3>About This Content</H3>
-
-<P>August, 2009</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/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>.
-For purposes of the EPL, "Program" will mean the Content.</P>
-
-<P>If you did not receive this Content directly from the Eclipse Foundation, the
-Content is being redistributed by another party ("Redistributor") and different
-terms and conditions may apply to your use of any object code in the Content.
-Check the RedistributorÂ’s license that was provided with the Content. If no such
-license exists, contact the Redistributor. Unless otherwise indicated below, the
-terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at
-<A href="http://www.eclipse.org/">http://www.eclipse.org/</A>.</P>
-
-</BODY>
-</HTML>
diff --git a/plugins/org.eclipse.wst.common.modulecore.ui/build.properties b/plugins/org.eclipse.wst.common.modulecore.ui/build.properties
deleted file mode 100644
index ef0787e..0000000
--- a/plugins/org.eclipse.wst.common.modulecore.ui/build.properties
+++ /dev/null
@@ -1,19 +0,0 @@
-###############################################################################
-# Copyright (c) 2009 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-source.. = src/
-output.. = bin/
-bin.includes = plugin.xml,\
- .,\
- icons/,\
- META-INF/,\
- about.html,\
- plugin.properties
-src.includes = schema/
diff --git a/plugins/org.eclipse.wst.common.modulecore.ui/icons/assembly-banner.png b/plugins/org.eclipse.wst.common.modulecore.ui/icons/assembly-banner.png
deleted file mode 100644
index 6628af8..0000000
--- a/plugins/org.eclipse.wst.common.modulecore.ui/icons/assembly-banner.png
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.wst.common.modulecore.ui/icons/folder.gif b/plugins/org.eclipse.wst.common.modulecore.ui/icons/folder.gif
deleted file mode 100644
index c91b267..0000000
--- a/plugins/org.eclipse.wst.common.modulecore.ui/icons/folder.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.wst.common.modulecore.ui/icons/jar_obj.gif b/plugins/org.eclipse.wst.common.modulecore.ui/icons/jar_obj.gif
deleted file mode 100644
index ec315d5..0000000
--- a/plugins/org.eclipse.wst.common.modulecore.ui/icons/jar_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.wst.common.modulecore.ui/icons/prj_obj.gif b/plugins/org.eclipse.wst.common.modulecore.ui/icons/prj_obj.gif
deleted file mode 100644
index a4ea580..0000000
--- a/plugins/org.eclipse.wst.common.modulecore.ui/icons/prj_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.wst.common.modulecore.ui/plugin.properties b/plugins/org.eclipse.wst.common.modulecore.ui/plugin.properties
deleted file mode 100644
index a963071..0000000
--- a/plugins/org.eclipse.wst.common.modulecore.ui/plugin.properties
+++ /dev/null
@@ -1,15 +0,0 @@
-###############################################################################
-# Copyright (c) 2009 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-provider=Eclipse.org
-Bundle-Name.0 = Modulecore UI Plug-in
-Module_assembly.name = Deployment Assembly
-Project=Project
-Folder_Mapping=Folder
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.modulecore.ui/plugin.xml b/plugins/org.eclipse.wst.common.modulecore.ui/plugin.xml
deleted file mode 100644
index 21c635e..0000000
--- a/plugins/org.eclipse.wst.common.modulecore.ui/plugin.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin>
- <extension-point id="moduleDependencyPropertyPage" name="moduleDependencyPropertyPage" schema="schema/moduleDependencyPropertyPage.exsd"/>
- <extension-point id="referenceWizardFragment" name="referenceWizardFragment" schema="schema/referenceWizardFragment.exsd"/>
- <extension-point id="virtualComponentLabelProvider" name="virtualComponentLabelProvider" schema="schema/virtualComponentLabelProvider.exsd"/>
- <extension-point id="deploymentAssemblyVerifier" name="Deployment Assembly Verifier" schema="schema/deploymentAssemblyVerifier.exsd"/>
- <extension-point id="resourceMappingFilter" name="resourceMappingFilter" schema="schema/resourceMappingFilter.exsd"/>
- <!-- =========== DeploymentAssemblyPage ============ -->
- <extension
- point="org.eclipse.ui.propertyPages">
- <page
- name="%Module_assembly.name"
- class="org.eclipse.wst.common.componentcore.ui.propertypage.ModuleAssemblyRootPage"
- id="org.eclipse.wst.common.componentcore.ui.DeploymentAssemblyPage">
- <enabledWhen>
- <adapt
- type="org.eclipse.core.resources.IProject">
- <test
- property="org.eclipse.core.resources.projectNature"
- value="org.eclipse.wst.common.modulecore.ModuleCoreNature"/>
- </adapt>
- </enabledWhen>
- </page>
- </extension>
-
-
- <extension
- point="org.eclipse.wst.common.modulecore.ui.referenceWizardFragment">
- <referenceFragment
- class="org.eclipse.wst.common.componentcore.ui.internal.propertypage.ProjectReferenceWizardFragment"
- icon="icons/prj_obj.gif"
- id="org.eclipse.wst.common.componentcore.ui.newProjectReference"
- name="%Project">
- </referenceFragment>
- <referenceFragment
- class="org.eclipse.wst.common.componentcore.ui.internal.propertypage.FolderMappingWizardFragment"
- icon="icons/folder.gif"
- id="org.eclipse.wst.common.componentcore.ui.resourceMappingReference"
- name="%Folder_Mapping">
- </referenceFragment>
- </extension>
-
- <extension
- point="org.eclipse.wst.common.modulecore.ui.resourceMappingFilter">
- <resourceMapping
- source-path="\.settings">
- </resourceMapping>
- </extension>
-
-</plugin>
diff --git a/plugins/org.eclipse.wst.common.modulecore.ui/schema/deploymentAssemblyVerifier.exsd b/plugins/org.eclipse.wst.common.modulecore.ui/schema/deploymentAssemblyVerifier.exsd
deleted file mode 100644
index 36e2203..0000000
--- a/plugins/org.eclipse.wst.common.modulecore.ui/schema/deploymentAssemblyVerifier.exsd
+++ /dev/null
@@ -1,115 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.wst.common.modulecore.ui" xmlns="http://www.w3.org/2001/XMLSchema">
-<annotation>
- <appInfo>
- <meta.schema plugin="org.eclipse.wst.common.modulecore.ui" id="DeploymentAssemblyVerifier" name="Deployment Assembly Verifier"/>
- </appInfo>
- <documentation>
- The extension point gives the ability to extend deployment assembly validation during the creation of resource and dependency mappings. Registration of the verifier is based on component type and server target.
- </documentation>
- </annotation>
-
- <element name="extension">
- <annotation>
- <appInfo>
- <meta.element />
- </appInfo>
- </annotation>
- <complexType>
- <sequence>
- <element ref="verifier"/>
- </sequence>
- <attribute name="point" type="string" use="required">
- <annotation>
- <documentation>
- a fully qualified identifier of the target extension point
- </documentation>
- </annotation>
- </attribute>
- <attribute name="id" type="string">
- <annotation>
- <documentation>
- an optional identifier of the extension instance
- </documentation>
- </annotation>
- </attribute>
- <attribute name="name" type="string">
- <annotation>
- <documentation>
- an optional name of the extension instance
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <element name="verifier">
- <complexType>
- <sequence>
- <element ref="runtime" minOccurs="1" maxOccurs="unbounded"/>
- <element ref="component"/>
- </sequence>
- <attribute name="class" type="string" use="required">
- <annotation>
- <documentation>
- the qualified name of the class to be used as the verifier
- </documentation>
- <appInfo>
- <meta.attribute kind="java" basedOn="AbstractDeploymentAssemblyVerifier:"/>
- </appInfo>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <element name="runtime">
- <complexType>
- <attribute name="runtime_server_id" type="string" use="required">
- <annotation>
- <documentation>
- the runtime server id for this verifier
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <element name="component">
- <complexType>
- <attribute name="component_type" type="string" use="required">
- <annotation>
- <documentation>
- the supported component type for this verifier(uses facet id)
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <annotation>
- <appInfo>
- <meta.section type="since"/>
- </appInfo>
- <documentation>
- <b>This extension point is part of an interim API that is still under development and expected to change significantly before reaching stability. It is being made available at this early stage to solicit feedback from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken (repeatedly) as the API evolves.</b>
- </documentation>
- </annotation>
-
-
-
-
- <annotation>
- <appInfo>
- <meta.section type="copyright"/>
- </appInfo>
- <documentation>
- Copyright (c) 2010 IBM Corporation and others.<br>
-All rights reserved. This program and the accompanying materials are made
-available under the terms of the Eclipse Public License v1.0 which accompanies
-this distribution, and is available at <a
-href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>
- </documentation>
- </annotation>
-
-</schema>
diff --git a/plugins/org.eclipse.wst.common.modulecore.ui/schema/moduleDependencyPropertyPage.exsd b/plugins/org.eclipse.wst.common.modulecore.ui/schema/moduleDependencyPropertyPage.exsd
deleted file mode 100644
index df32f3e..0000000
--- a/plugins/org.eclipse.wst.common.modulecore.ui/schema/moduleDependencyPropertyPage.exsd
+++ /dev/null
@@ -1,123 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.wst.common.componentcore.ui" xmlns="http://www.w3.org/2001/XMLSchema">
-<annotation>
- <appinfo>
- <meta.schema plugin="org.eclipse.wst.common.componentcore.ui" id="moduleDependencyPropertyPage" name="moduleDependencyPropertyPage"/>
- </appinfo>
- <documentation>
- [Enter description of this extension point.]
- </documentation>
- </annotation>
-
- <element name="extension">
- <annotation>
- <appinfo>
- <meta.element />
- </appinfo>
- </annotation>
- <complexType>
- <sequence minOccurs="1" maxOccurs="unbounded">
- <element ref="dependencyPage"/>
- </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>
- <attribute name="weight" type="string">
- <annotation>
- <documentation>
- Default weight is 100. Make higher is wanting to override
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <element name="dependencyPage">
- <complexType>
- <attribute name="id" type="string" use="required">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- <attribute name="class" type="string" use="required">
- <annotation>
- <documentation>
-
- </documentation>
- <appinfo>
- <meta.attribute kind="java" basedOn=":org.eclipse.wst.common.componentcore.ui.propertypage.IDependencyPageProvider"/>
- </appinfo>
- </annotation>
- </attribute>
- <attribute name="weight" type="string">
- <annotation>
- <documentation>
- Default weight is 100. Make higher is wanting to override
- </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>
-
-
-</schema>
diff --git a/plugins/org.eclipse.wst.common.modulecore.ui/schema/referenceWizardFragment.exsd b/plugins/org.eclipse.wst.common.modulecore.ui/schema/referenceWizardFragment.exsd
deleted file mode 100644
index e320384..0000000
--- a/plugins/org.eclipse.wst.common.modulecore.ui/schema/referenceWizardFragment.exsd
+++ /dev/null
@@ -1,138 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.wst.common.componentcore.ui" xmlns="http://www.w3.org/2001/XMLSchema">
-<annotation>
- <appinfo>
- <meta.schema plugin="org.eclipse.wst.common.componentcore.ui" id="referenceWizardFragment" name="referenceWizardFragment"/>
- </appinfo>
- <documentation>
- [Enter description of this extension point.]
- </documentation>
- </annotation>
-
- <include schemaLocation="schema://org.eclipse.core.expressions/schema/expressionLanguage.exsd"/>
-
- <element name="extension">
- <annotation>
- <appinfo>
- <meta.element internal="true" />
- </appinfo>
- </annotation>
- <complexType>
- <sequence minOccurs="1" maxOccurs="unbounded">
- <element ref="referenceFragment"/>
- </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="referenceFragment">
- <complexType>
- <sequence minOccurs="1" maxOccurs="unbounded">
- <element ref="enablement" minOccurs="0" maxOccurs="1"/>
- </sequence>
- <attribute name="id" type="string" use="required">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- <attribute name="name" type="string" use="required">
- <annotation>
- <documentation>
- The name will be displayed in the UI, inside the viewer
- </documentation>
- </annotation>
- </attribute>
- <attribute name="icon" type="string">
- <annotation>
- <documentation>
-
- </documentation>
- <appinfo>
- <meta.attribute kind="resource"/>
- </appinfo>
- </annotation>
- </attribute>
- <attribute name="class" type="string" use="required">
- <annotation>
- <documentation>
-
- </documentation>
- <appinfo>
- <meta.attribute kind="java" basedOn="org.eclipse.wst.common.componentcore.ui.internal.taskwizard.WizardFragment:"/>
- </appinfo>
- </annotation>
- </attribute>
- <attribute name="hidden" type="boolean">
- <annotation>
- <documentation>
- True if this reference type should be hidden and NOT exposed as a possible reference for all virtual components, false if it will be hidden and added manually to relevant components' reference wizards.
- </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>
-
-
-</schema>
diff --git a/plugins/org.eclipse.wst.common.modulecore.ui/schema/resourceMappingFilter.exsd b/plugins/org.eclipse.wst.common.modulecore.ui/schema/resourceMappingFilter.exsd
deleted file mode 100644
index 38b775a..0000000
--- a/plugins/org.eclipse.wst.common.modulecore.ui/schema/resourceMappingFilter.exsd
+++ /dev/null
@@ -1,97 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.wst.common.componentcore.ui" xmlns="http://www.w3.org/2001/XMLSchema">
-<annotation>
- <appinfo>
- <meta.schema plugin="org.eclipse.wst.common.componentcore.ui" id="resourceMappingFilter" name="resourceMappingFilter"/>
- </appinfo>
- <documentation>
- This extension point is to be used to specify any folder that should not be displayed or allowed to be added as resource mapping using the 'Deployment Assembly' properties page
- </documentation>
- </annotation>
-
- <element name="extension">
- <annotation>
- <appinfo>
- <meta.element internal="true" />
- </appinfo>
- </annotation>
- <complexType>
- <sequence minOccurs="1" maxOccurs="unbounded">
- <element ref="resourceMapping" minOccurs="1" maxOccurs="unbounded"/>
- </sequence>
- <attribute name="point" type="string" use="required">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- <attribute name="id" type="string">
- <annotation>
- <documentation>
- an optional identifier of the extension instance
- </documentation>
- </annotation>
- </attribute>
- <attribute name="name" type="string">
- <annotation>
- <documentation>
- an optional name of the extension instance
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <element name="resourceMapping">
- <complexType>
- <attribute name="source-path" type="string" use="required">
- <annotation>
- <documentation>
- Project relative source path that should be filtered out represented as regular expression. (i.e. source-path="\.settings" would filter out the '.settings' folder and its contents; Since it expects a relative path filtering source-path="/\.settings" would not filter out the '.settings' folder)
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <annotation>
- <appinfo>
- <meta.section type="since"/>
- </appinfo>
- <documentation>
- WTP 3.2.2
- </documentation>
- </annotation>
-
- <annotation>
- <appinfo>
- <meta.section type="examples"/>
- </appinfo>
- <documentation>
- <extension
- point="org.eclipse.wst.common.modulecore.ui.resourceMappingFilter">
- <resourceMapping
- source-path="\.settings">
- </resourceMapping>
-</extension>
- </documentation>
- </annotation>
-
-
-
- <annotation>
- <appinfo>
- <meta.section type="copyright"/>
- </appinfo>
- <documentation>
- Copyright (c) 2010 IBM Corporation and others.<br>
-All rights reserved. This program and the accompanying materials are made
-available under the terms of the Eclipse Public License v1.0 which accompanies
-this distribution, and is available at <a
-href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>
- </documentation>
- </annotation>
-
-</schema>
diff --git a/plugins/org.eclipse.wst.common.modulecore.ui/schema/virtualComponentLabelProvider.exsd b/plugins/org.eclipse.wst.common.modulecore.ui/schema/virtualComponentLabelProvider.exsd
deleted file mode 100644
index 07d87a8..0000000
--- a/plugins/org.eclipse.wst.common.modulecore.ui/schema/virtualComponentLabelProvider.exsd
+++ /dev/null
@@ -1,109 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.wst.common.modulecore.ui" xmlns="http://www.w3.org/2001/XMLSchema">
-<annotation>
- <appInfo>
- <meta.schema plugin="org.eclipse.wst.common.modulecore.ui" id="virtualComponentLabelProvider" name="virtualComponentLabelProvider"/>
- </appInfo>
- <documentation>
- [Enter description of this extension point.]
- </documentation>
- </annotation>
-
- <element name="extension">
- <annotation>
- <appInfo>
- <meta.element />
- </appInfo>
- </annotation>
- <complexType>
- <sequence minOccurs="1" maxOccurs="unbounded">
- <element ref="provider"/>
- </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="provider">
- <complexType>
- <attribute name="class" type="string" use="required">
- <annotation>
- <documentation>
-
- </documentation>
- <appInfo>
- <meta.attribute kind="java" basedOn=":org.eclipse.wst.common.componentcore.ui.internal.propertypage.IVirtualComponentLabelProvider"/>
- </appInfo>
- </annotation>
- </attribute>
- <attribute name="weight" type="string">
- <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>
-
-
-</schema>
diff --git a/plugins/org.eclipse.wst.common.modulecore.ui/src/org/eclipse/wst/common/componentcore/internal/impl/TaskModel.java b/plugins/org.eclipse.wst.common.modulecore.ui/src/org/eclipse/wst/common/componentcore/internal/impl/TaskModel.java
deleted file mode 100644
index de61006..0000000
--- a/plugins/org.eclipse.wst.common.modulecore.ui/src/org/eclipse/wst/common/componentcore/internal/impl/TaskModel.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.common.componentcore.internal.impl;
-
-import java.util.HashMap;
-import java.util.Map;
-/**
- * A task model represents a model that can be shared between multiple
- * tasks in a common workflow.
- * <p>
- * The task model contains information about the overall task flow and allows
- * tasks to store and retrieve data. Its usage allows multiple tasks to be
- * chained together and share data from the output of one task to the input
- * of another.
- * </p>
- *
- * @since 1.0
- */
-public class TaskModel {
-
- private Map<String, Object> map = new HashMap<String, Object>();
-
- /**
- * Returns the object in the task model with the given id.
- * <p>
- * The id can be any of the predefined ids within TaskModel, or
- * any other key to retrieve task-specific data.
- * </p>
- *
- * @param id an id for the object
- * @return the object with the given id, or <code>null</code>
- * if no object could be found with that id
- */
- public Object getObject(String id) {
- try {
- return map.get(id);
- } catch (Exception e) {
- return null;
- }
- }
-
- /**
- * Put an object into the task model with the given id.
- * <p>
- * The id can be any of the predefined ids within TaskModel, or
- * any other key to store task-specific data.
- * </p>
- *
- * @param id the id to associate the object with
- * @param obj an object, or <code>null</code> to reset (clear) the id
- */
- public void putObject(String id, Object obj) {
- map.put(id, obj);
- }
-}
diff --git a/plugins/org.eclipse.wst.common.modulecore.ui/src/org/eclipse/wst/common/componentcore/ui/IModuleCoreUIContextIds.java b/plugins/org.eclipse.wst.common.modulecore.ui/src/org/eclipse/wst/common/componentcore/ui/IModuleCoreUIContextIds.java
deleted file mode 100644
index f526c66..0000000
--- a/plugins/org.eclipse.wst.common.modulecore.ui/src/org/eclipse/wst/common/componentcore/ui/IModuleCoreUIContextIds.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.common.componentcore.ui;
-
-/**
- * @author: Aidyl Kareh
- */
-public interface IModuleCoreUIContextIds {
- // New references wizards
- public static final String DEPLOYMENT_ASSEMBLY_PREFERENCE_PAGE_ADD_NEW_REFERENCE_P1 = ModuleCoreUIPlugin.PLUGIN_ID + ".DEPLOYMENT_ASSEMBLY_PREFERENCE_PAGE_ADD_NEW_REFERENCE_P1"; //$NON-NLS-1$
- public static final String DEPLOYMENT_ASSEMBLY_PREFERENCE_PAGE_ADD_NEW_PROJECT_REFERENCE_P1 = ModuleCoreUIPlugin.PLUGIN_ID + ".DEPLOYMENT_ASSEMBLY_PREFERENCE_PAGE_ADD_NEW_PROJECT_REFERENCE_P1"; //$NON-NLS-1$
- public static final String DEPLOYMENT_ASSEMBLY_PREFERENCE_PAGE_ADD_NEW_FOLDER_MAPPING_P1 = ModuleCoreUIPlugin.PLUGIN_ID + ".DEPLOYMENT_ASSEMBLY_PREFERENCE_PAGE_ADD_NEW_FOLDER_MAPPING_P1"; //$NON-NLS-1$
- public static final String DEPLOYMENT_ASSEMBLY_PREFERENCE_PAGE_DEPLOYMENT_ASSEMBLY_TAB = ModuleCoreUIPlugin.PLUGIN_ID + ".DEPLOYMENT_ASSEMBLY_PREFERENCE_PAGE_DEPLOYMENT_ASSEMBLY_TAB"; //$NON-NLS-1$
-}
diff --git a/plugins/org.eclipse.wst.common.modulecore.ui/src/org/eclipse/wst/common/componentcore/ui/Messages.java b/plugins/org.eclipse.wst.common.modulecore.ui/src/org/eclipse/wst/common/componentcore/ui/Messages.java
deleted file mode 100644
index 7281d5c..0000000
--- a/plugins/org.eclipse.wst.common.modulecore.ui/src/org/eclipse/wst/common/componentcore/ui/Messages.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - Initial API and implementation
- *
- * API in these packages is provisional in this release
- *******************************************************************************/
-package org.eclipse.wst.common.componentcore.ui;
-
-import org.eclipse.osgi.util.NLS;
-
-public class Messages extends NLS {
- private static final String BUNDLE_NAME = "org.eclipse.wst.common.componentcore.ui.messages"; //$NON-NLS-1$
- public static String ModuleAssemblyRootPageDescription;
- public static String ErrorCheckingFacets;
- public static String ErrorNotVirtualComponent;
- public static String DeploymentAssemblyVerifierHelper_0;
- public static String DeployPathColumn;
- public static String SourceColumn;
- public static String InternalLibJarWarning;
- public static String AddFolder;
- public static String AddFolderElipses;
- public static String AddFolderMappings;
- public static String AddEllipsis;
- public static String EditEllipsis;
- public static String RemoveSelected;
- public static String JarTitle;
- public static String JarDescription;
- public static String ExternalJarTitle;
- public static String ExternalJarDescription;
- public static String Browse;
- public static String NewReferenceTitle;
- public static String NewReferenceDescription;
- public static String NewReferenceWizard;
- public static String ProjectReferenceTitle;
- public static String ProjectReferenceDescription;
- public static String VariableReferenceTitle;
- public static String VariableReferenceDescription;
- public static String WizardError;
- public static String ProjectConversionError;
- public static String ExistingFolderError;
- public static String Revert;
- public static String ErrorEntryNotFound;
-
- static {
- // initialize resource bundle
- NLS.initializeMessages(BUNDLE_NAME, Messages.class);
- }
-
- private Messages() {
- }
-}
diff --git a/plugins/org.eclipse.wst.common.modulecore.ui/src/org/eclipse/wst/common/componentcore/ui/ModuleCoreUIPlugin.java b/plugins/org.eclipse.wst.common.modulecore.ui/src/org/eclipse/wst/common/componentcore/ui/ModuleCoreUIPlugin.java
deleted file mode 100644
index 2734514..0000000
--- a/plugins/org.eclipse.wst.common.modulecore.ui/src/org/eclipse/wst/common/componentcore/ui/ModuleCoreUIPlugin.java
+++ /dev/null
@@ -1,174 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2009 Red Hat
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Rob Stryker - initial implementation and ongoing maintenance
- *
- * API in these packages is provisional in this release
- ******************************************************************************/
-package org.eclipse.wst.common.componentcore.ui;
-
-import java.net.MalformedURLException;
-import java.net.URL;
-
-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.Platform;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.resource.ImageRegistry;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.osgi.framework.Bundle;
-import org.osgi.framework.BundleContext;
-
-/**
- * The activator class controls the plug-in life cycle
- */
-public class ModuleCoreUIPlugin extends AbstractUIPlugin {
-
- // The plug-in ID
- public static final String PLUGIN_ID = "org.eclipse.wst.common.modulecore.ui"; //$NON-NLS-1$
-
- public static final String[] ICON_DIRS = new String[]{"icons/full/obj16", //$NON-NLS-1$
- "icons/full/cview16", //$NON-NLS-1$
- "icons/full/ctool16", //$NON-NLS-1$
- "icons/full/clcl16", //$NON-NLS-1$
- "icons/full/ovr16", //$NON-NLS-1$
- "icons/full/extra", //$NON-NLS-1$
- "icons/full/wizban", //$NON-NLS-1$
- "icons", //$NON-NLS-1$
- ""}; //$NON-NLS-1$
-
- // The shared instance
- private static ModuleCoreUIPlugin plugin;
- /**
- * The constructor for this plugin
- */
- public ModuleCoreUIPlugin() {
- super();
- }
-
- /**
- * Returns the singleton instance of this plugin.
- *
- * @return org.eclipse.wst.server.ui.internal.plugin.ServerUIPlugin
- */
- public static ModuleCoreUIPlugin getInstance() {
- return plugin;
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
- */
- public void start(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(BundleContext context) throws Exception {
- plugin = null;
- super.stop(context);
- }
-
- /**
- * Get a .gif from the image registry.
- */
- public Image getImage(String key) {
- ImageRegistry imageRegistry = getImageRegistry();
- Image image = imageRegistry.get(key);
- if (image == null || image.isDisposed()) {
- ImageDescriptor descriptor = getImageDescriptor(key);
- if (descriptor != null) {
- image = descriptor.createImage();
- imageRegistry.put(key, image);
- }
- }
- return image;
- }
-
- /**
- * This gets a .gif from the icons folder.
- */
- public ImageDescriptor getImageDescriptor(String key) {
- ImageDescriptor imageDescriptor = null;
- URL gifImageURL = getImageURL(key,getBundle());
- if (gifImageURL != null)
- imageDescriptor = ImageDescriptor.createFromURL(gifImageURL);
- return imageDescriptor;
- }
-
- /**
- * This gets a .gif from the icons folder.
- */
- public URL getImageURL(String key, Bundle bundle) {
- String gif = "/" + key + ".gif"; //$NON-NLS-1$ //$NON-NLS-2$
- IPath path = null;
- for (int i = 0; i < ICON_DIRS.length; i++) {
- path = new Path(ICON_DIRS[i]).append(gif);
- if (Platform.find(bundle,path) == null)
- continue;
- try {
- return new URL( bundle.getEntry("/"), path.toString()); //$NON-NLS-1$
- } catch (MalformedURLException exception) {
- logError(exception);
- continue;
- }
- }
- return null;
- }
-
- /**
- * Returns the shared instance
- *
- * @return the shared instance
- */
- public static ModuleCoreUIPlugin getDefault() {
- return plugin;
- }
-
- public static void log(Exception e) {
- log(e.getMessage(), e);
- }
-
- public static void log(String message, Exception e) {
- IStatus status = new Status(IStatus.ERROR, PLUGIN_ID, message, e);
- getDefault().getLog().log(status);
- }
- public static IStatus createStatus(int severity, int aCode,
- String aMessage, Throwable exception) {
- return new Status(severity, PLUGIN_ID, aCode,
- aMessage != null ? aMessage : "No message.", exception); //$NON-NLS-1$
- }
- public static IStatus createErrorStatus(int aCode, String aMessage,
- Throwable exception) {
- return createStatus(IStatus.ERROR, aCode, aMessage, exception);
- }
-
- public static IStatus createStatus(int severity, String message, Throwable exception) {
- return new Status(severity, PLUGIN_ID, message, exception);
- }
-
- public static IStatus createStatus(int severity, String message) {
- return createStatus(severity, message, null);
- }
- public static void logError(Throwable exception) {
- Platform.getLog(Platform.getBundle(PLUGIN_ID)).log( createStatus(IStatus.ERROR, exception.getMessage(), exception));
- }
-
- public static void logError(CoreException exception) {
- Platform.getLog(Platform.getBundle(PLUGIN_ID)).log( exception.getStatus() );
- }
-
-}
diff --git a/plugins/org.eclipse.wst.common.modulecore.ui/src/org/eclipse/wst/common/componentcore/ui/Trace.java b/plugins/org.eclipse.wst.common.modulecore.ui/src/org/eclipse/wst/common/componentcore/ui/Trace.java
deleted file mode 100644
index 941d375..0000000
--- a/plugins/org.eclipse.wst.common.modulecore.ui/src/org/eclipse/wst/common/componentcore/ui/Trace.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - Initial API and implementation
- *
- * API in these packages is provisional in this release
- *******************************************************************************/
-package org.eclipse.wst.common.componentcore.ui;
-
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.HashSet;
-import java.util.Set;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-/**
- * Helper class to route trace output.
- */
-public class Trace {
- public static final byte CONFIG = 0;
- public static final byte INFO = 1;
- public static final byte WARNING = 2;
- public static final byte SEVERE = 3;
- public static final byte FINEST = 4;
- public static final byte FINER = 5;
- public static final byte PERFORMANCE = 6;
- public static final byte EXTENSION_POINT = 7;
-
- private static final String[] levelNames = new String[] {
- "CONFIG ", "INFO ", "WARNING", "SEVERE ", "FINER ", "FINEST ", "PERF ", "EXTENSION"};
-
- private static final SimpleDateFormat sdf = new SimpleDateFormat("dd/MM/yy HH:mm.ss.SSS");
-
- private static Set<String> logged = new HashSet<String>();
-
- /**
- * Trace constructor comment.
- */
- private Trace() {
- super();
- }
-
- /**
- * Trace the given text.
- *
- * @param level a trace level
- * @param s a message
- */
- public static void trace(byte level, String s) {
- trace(level, s, null);
- }
-
- /**
- * Trace the given message and exception.
- *
- * @param level a trace level
- * @param s a message
- * @param t a throwable
- */
- public static void trace(byte level, String s, Throwable t) {
- if (s == null)
- return;
-
- if (level == SEVERE) {
- if (!logged.contains(s)) {
- ModuleCoreUIPlugin.getInstance().getLog().log(
- new Status(IStatus.ERROR,
- ModuleCoreUIPlugin.PLUGIN_ID, s, t));
- logged.add(s);
- }
- }
-
- if (!ModuleCoreUIPlugin.getInstance().isDebugging())
- return;
-
- StringBuffer sb = new StringBuffer(ModuleCoreUIPlugin.PLUGIN_ID);
- sb.append(" ");
- sb.append(levelNames[level]);
- sb.append(" ");
- sb.append(sdf.format(new Date()));
- sb.append(" ");
- sb.append(s);
- System.out.println(sb.toString());
- if (t != null)
- t.printStackTrace();
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.modulecore.ui/src/org/eclipse/wst/common/componentcore/ui/internal/propertypage/AddFolderDialog.java b/plugins/org.eclipse.wst.common.modulecore.ui/src/org/eclipse/wst/common/componentcore/ui/internal/propertypage/AddFolderDialog.java
deleted file mode 100644
index 2c93a37..0000000
--- a/plugins/org.eclipse.wst.common.modulecore.ui/src/org/eclipse/wst/common/componentcore/ui/internal/propertypage/AddFolderDialog.java
+++ /dev/null
@@ -1,151 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2009 Red Hat
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Rob Stryker - initial implementation and ongoing maintenance
- ******************************************************************************/
-package org.eclipse.wst.common.componentcore.ui.internal.propertypage;
-
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jface.dialogs.TitleAreaDialog;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.ITreeContentProvider;
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.TreeViewer;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerFilter;
-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.Control;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.ISharedImages;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.common.componentcore.ui.Messages;
-
-@Deprecated
-public class AddFolderDialog extends TitleAreaDialog {
- private IProject project;
- private TreeViewer viewer;
- private IContainer selected = null;
- public AddFolderDialog(Shell parentShell, IProject project) {
- super(parentShell);
- setShellStyle( getShellStyle() | SWT.RESIZE );
- this.project = project;
- }
-
- protected void configureShell(Shell shell) {
- super.configureShell(shell);
-
- shell.setBounds(shell.getLocation().x, shell.getLocation().y, 400,300);
-
- }
-
- protected Control createDialogArea(Composite parent) {
- Composite c = (Composite)super.createDialogArea(parent);
- parent.getShell().setText(Messages.AddFolder);
- setTitle(Messages.AddFolder);
- setMessage(Messages.AddFolderMappings);
- //setTitleImage( );
- this.viewer = new TreeViewer(c, SWT.SINGLE | SWT.H_SCROLL | SWT.V_SCROLL | SWT.BORDER);
- viewer.setContentProvider(getContentProvider());
- viewer.setLabelProvider(getLabelProvider());
- viewer.addFilter(getFilter());
- viewer.setInput(project);
- viewer.getTree().setLayoutData(new GridData(GridData.FILL_BOTH));
- viewer.addSelectionChangedListener(getListener());
- return c;
- }
-
- protected ISelectionChangedListener getListener() {
- return new ISelectionChangedListener() {
- public void selectionChanged(SelectionChangedEvent event) {
- IStructuredSelection sel = (IStructuredSelection)viewer.getSelection();
- Object first = sel.getFirstElement();
- if( first instanceof IContainer)
- selected = (IContainer)first;
- }
- };
- }
-
- public IContainer getSelected() {
- return selected;
- }
-
- protected ViewerFilter getFilter() {
- return new ViewerFilter() {
- public boolean select(Viewer viewer, Object parentElement,
- Object element) {
- return element instanceof IContainer;
- }
- };
- }
-
- protected ITreeContentProvider getContentProvider() {
- return new ITreeContentProvider() {
-
- public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
- }
-
- public void dispose() {
- }
-
- public Object[] getElements(Object inputElement) {
- try {
- return project.members();
- } catch( CoreException ce ) {
- return new Object[]{};
- }
- }
-
- public boolean hasChildren(Object element) {
- if( element instanceof IContainer) {
- try {
- return ((IContainer)element).members().length > 0;
- } catch( CoreException ce ) {
- }
- }
- return false;
- }
-
- public Object getParent(Object element) {
- if( element instanceof IResource)
- return ((IResource)element).getParent();
- return null;
- }
-
- public Object[] getChildren(Object parentElement) {
- if( parentElement instanceof IContainer) {
- try {
- return ((IContainer)parentElement).members();
- } catch( CoreException ce ) {
- }
- }
- return new Object[]{};
- }
- };
- }
-
- protected LabelProvider getLabelProvider() {
- return new LabelProvider() {
- public Image getImage(Object element) {
- return PlatformUI.getWorkbench().getSharedImages().getImage(ISharedImages.IMG_OBJ_FOLDER);
- }
- public String getText(Object element) {
- if( element instanceof IResource)
- return ((IResource)element).getName();
- return element.toString();
- }
- };
- }
-}
diff --git a/plugins/org.eclipse.wst.common.modulecore.ui/src/org/eclipse/wst/common/componentcore/ui/internal/propertypage/ComponentDependencyContentProvider.java b/plugins/org.eclipse.wst.common.modulecore.ui/src/org/eclipse/wst/common/componentcore/ui/internal/propertypage/ComponentDependencyContentProvider.java
deleted file mode 100644
index d262603..0000000
--- a/plugins/org.eclipse.wst.common.modulecore.ui/src/org/eclipse/wst/common/componentcore/ui/internal/propertypage/ComponentDependencyContentProvider.java
+++ /dev/null
@@ -1,171 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2009 Red Hat
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Rob Stryker - initial implementation and ongoing maintenance
- ******************************************************************************/
-package org.eclipse.wst.common.componentcore.ui.internal.propertypage;
-
-import java.util.ArrayList;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jface.viewers.DecoratingLabelProvider;
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.jface.viewers.ITableLabelProvider;
-import org.eclipse.jface.viewers.ITreeContentProvider;
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.model.WorkbenchLabelProvider;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.componentcore.resources.IVirtualReference;
-import org.eclipse.wst.common.componentcore.ui.ModuleCoreUIPlugin;
-import org.eclipse.wst.common.componentcore.ui.propertypage.AddModuleDependenciesPropertiesPage;
-import org.eclipse.wst.common.componentcore.ui.propertypage.AddModuleDependenciesPropertiesPage.ComponentResourceProxy;
-
-
-/*
- * The only valid elements this content provider (should) provide
- * are IProject or IVirtualComponent objects. The runtime paths portion is
- * shared with the preference page itself where they can both modify the data.
- *
- * This provider no longer "meddles" in to the content as it used to,
- * but rather serves as only a view of it.
- */
-public class ComponentDependencyContentProvider extends LabelProvider implements IStructuredContentProvider, ITableLabelProvider, ITreeContentProvider {
-
- final static String PATH_SEPARATOR = String.valueOf(IPath.SEPARATOR);
-
- private IVirtualComponent component;
- private ArrayList<IVirtualReference> runtimePaths;
- private ArrayList<ComponentResourceProxy> resourceMappings;
- private DecoratingLabelProvider decProvider = new DecoratingLabelProvider(
- new WorkbenchLabelProvider(), PlatformUI.getWorkbench().
- getDecoratorManager().getLabelDecorator());
- private IVirtualComponentLabelProvider[] delegates;
- public ComponentDependencyContentProvider(AddModuleDependenciesPropertiesPage addModuleDependenciesPropertiesPage) {
- super();
- decProvider.addListener(addModuleDependenciesPropertiesPage);
- delegates = DependencyPageExtensionManager.loadDelegates();
- }
-
- public void setRuntimePaths(ArrayList<IVirtualReference> runtimePaths) {
- this.runtimePaths = runtimePaths;
- }
-
- public void setResourceMappings(ArrayList<ComponentResourceProxy> mappings) {
- this.resourceMappings = mappings;
- }
-
- public Object[] getElements(Object inputElement) {
- Object[] empty = new Object[0];
- if( !(inputElement instanceof IWorkspaceRoot))
- return empty;
- ArrayList<Object> list = new ArrayList<Object>();
- list.addAll(resourceMappings);
- list.addAll(runtimePaths);
- return list.toArray();
- }
-
- public Image getColumnImage(Object element, int columnIndex) {
- if( element instanceof ComponentResourceProxy) {
- return ModuleCoreUIPlugin.getInstance().getImage("folder");
- }
- if (element instanceof IVirtualReference) {
- if( columnIndex == AddModuleDependenciesPropertiesPage.SOURCE_COLUMN ){
- return handleSourceImage(((IVirtualReference)element).getReferencedComponent());
- } else if(columnIndex == AddModuleDependenciesPropertiesPage.DEPLOY_COLUMN){
- return ModuleCoreUIPlugin.getInstance().getImage("jar_obj");
- }
- }
- if (element instanceof IProject){
- return decProvider.getImage(element);
- }
- return null;
- }
-
- public String getColumnText(Object element, int columnIndex) {
- if( element instanceof ComponentResourceProxy) {
- if( columnIndex == AddModuleDependenciesPropertiesPage.SOURCE_COLUMN ) {
- return ((ComponentResourceProxy)element).source.toString();
- } else if( columnIndex == AddModuleDependenciesPropertiesPage.DEPLOY_COLUMN ) {
- if(((ComponentResourceProxy)element).runtimePath.isRoot())
- return ((ComponentResourceProxy)element).runtimePath.toString();
- else
- return ((ComponentResourceProxy)element).runtimePath.makeRelative().toString();
- }
- }
- if( element instanceof IVirtualReference) {
- if (columnIndex == AddModuleDependenciesPropertiesPage.SOURCE_COLUMN) {
- return handleSourceText(((IVirtualReference)element).getReferencedComponent());
- } else if (columnIndex == AddModuleDependenciesPropertiesPage.DEPLOY_COLUMN) {
- return new Path(AddModuleDependenciesPropertiesPage.getSafeRuntimePath((IVirtualReference)element)).makeRelative().toString();
- }
- }
- return null;
- }
-
-
- private String handleSourceText(IVirtualComponent component) {
- if( delegates != null ) {
- for( int i = 0; i < delegates.length; i++ )
- if( delegates[i].canHandle(component))
- return delegates[i].getSourceText(component);
- }
-
- // default impl
- if( component.isBinary() ) {
- IPath p = (IPath)component.getAdapter(IPath.class);
- return p == null ? component.getName() : p.toString();
- }
- return component.getProject().getName();
- }
-
- private Image handleSourceImage(IVirtualComponent component) {
- if( delegates != null ) {
- for( int i = 0; i < delegates.length; i++ )
- if( delegates[i].canHandle(component))
- return delegates[i].getSourceImage(component);
- }
-
- // default impl
- if(component.isBinary())
- return ModuleCoreUIPlugin.getInstance().getImage("jar_obj");
- else return decProvider.getImage(component.getProject());
- }
-
-
- public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
- // TODO Auto-generated method stub
-
- }
-
- public void setComponent(IVirtualComponent component) {
- this.component = component;
- }
-
- public IVirtualComponent getComponent(){
- return component;
- }
-
- public Object[] getChildren(Object parentElement) {
- return null;
- }
-
- public Object getParent(Object element) {
- return null;
- }
-
- public boolean hasChildren(Object element) {
- return false;
- }
-
-}
diff --git a/plugins/org.eclipse.wst.common.modulecore.ui/src/org/eclipse/wst/common/componentcore/ui/internal/propertypage/DependencyPageExtensionManager.java b/plugins/org.eclipse.wst.common.modulecore.ui/src/org/eclipse/wst/common/componentcore/ui/internal/propertypage/DependencyPageExtensionManager.java
deleted file mode 100644
index 01dd452..0000000
--- a/plugins/org.eclipse.wst.common.modulecore.ui/src/org/eclipse/wst/common/componentcore/ui/internal/propertypage/DependencyPageExtensionManager.java
+++ /dev/null
@@ -1,296 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2010 Red Hat and Others
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Rob Stryker - initial implementation and ongoing maintenance
- * Konstantin Komissarchik - added support for enablement expressions
- ******************************************************************************/
-
-package org.eclipse.wst.common.componentcore.ui.internal.propertypage;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Set;
-
-import org.eclipse.core.expressions.EvaluationContext;
-import org.eclipse.core.expressions.EvaluationResult;
-import org.eclipse.core.expressions.Expression;
-import org.eclipse.core.expressions.ExpressionConverter;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtensionRegistry;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.eclipse.wst.common.componentcore.ui.ModuleCoreUIPlugin;
-import org.eclipse.wst.common.componentcore.ui.internal.taskwizard.WizardFragment;
-import org.eclipse.wst.common.componentcore.ui.propertypage.IDependencyPageProvider;
-import org.eclipse.wst.common.project.facet.core.IFacetedProject;
-
-public class DependencyPageExtensionManager {
- private static final String DEFAULT_WEIGHT = "100"; //$NON-NLS-1$
- private static DependencyPageExtensionManager manager = null;
- public static DependencyPageExtensionManager getManager() {
- if( manager == null )
- manager = new DependencyPageExtensionManager();
- return manager;
- }
-
- private HashMap<String, IDependencyPageProvider> providers = null;
- private HashMap<String, String> providerWeight;
-
- public IDependencyPageProvider getProvider(IFacetedProject project) {
- if( providers == null )
- loadProviders();
- IDependencyPageProvider foundProvider = null;
- int highestWeight = 0;
- for (Iterator iterator = providers.keySet().iterator(); iterator.hasNext();) {
- String id = (String) iterator.next();
- IDependencyPageProvider temp = providers.get(id);
- if( temp.canHandle(project)) {
- int weight = Integer.valueOf(providerWeight.get(id)).intValue();
- if (foundProvider == null) {
- foundProvider = temp;
- highestWeight = weight;
- }
- else {
- if (highestWeight < weight) {
- foundProvider = temp;
- highestWeight = weight;
- }
- }
- }
- }
- return foundProvider;
- }
-
- private void loadProviders() {
- HashMap<String, IDependencyPageProvider> temp = new HashMap<String, IDependencyPageProvider>();
- HashMap<String, String> tempProviderWeight = new HashMap<String, String>();
- String weight;
- IExtensionRegistry registry = Platform.getExtensionRegistry();
- IConfigurationElement[] cf = registry.getConfigurationElementsFor(
- ModuleCoreUIPlugin.PLUGIN_ID, "moduleDependencyPropertyPage"); //$NON-NLS-1$
- for( int i = 0; i < cf.length; i++ ) {
- try {
- temp.put(cf[i].getAttribute("id"), //$NON-NLS-1$
- (IDependencyPageProvider)cf[i].createExecutableExtension("class")); //$NON-NLS-1$
- weight = cf[i].getAttribute("weight"); //$NON-NLS-1$
- tempProviderWeight.put(cf[i].getAttribute("id"),(weight == null) ? DEFAULT_WEIGHT : weight); //$NON-NLS-1$
- } catch( CoreException ce )
- {
- ModuleCoreUIPlugin.log( ce );
- }
- }
- providers = temp;
- providerWeight = tempProviderWeight;
- }
-
- public WizardFragment[] loadAllReferenceWizardFragments() {
- IExtensionRegistry registry = Platform.getExtensionRegistry();
- IConfigurationElement[] cf = registry.getConfigurationElementsFor(
- ModuleCoreUIPlugin.PLUGIN_ID, "referenceWizardFragment"); //$NON-NLS-1$
- ArrayList<WizardFragment> list = new ArrayList<WizardFragment>();
- for( int i = 0; i < cf.length; i++ ) {
- try {
- list.add((WizardFragment)cf[i].createExecutableExtension("class"));
- } catch( CoreException ce)
- {
- ModuleCoreUIPlugin.log( ce );
- }
- }
- return list.toArray(new WizardFragment[list.size()]);
- }
-
- public WizardFragment loadReferenceWizardFragment(String id) {
- IExtensionRegistry registry = Platform.getExtensionRegistry();
- IConfigurationElement[] cf = registry.getConfigurationElementsFor(
- ModuleCoreUIPlugin.PLUGIN_ID, "referenceWizardFragment"); //$NON-NLS-1$
- for( int i = 0; i < cf.length; i++ ) {
- if( cf[i].getAttribute("id").equals(id)) //$NON-NLS-1$
- try {
- return (WizardFragment)cf[i].createExecutableExtension("class"); //$NON-NLS-1$
- } catch( CoreException ce)
- {
- ModuleCoreUIPlugin.log( ce );
- }
- }
- return null;
- }
-
- public List<ReferenceExtension> getExposedReferenceExtensions()
- {
- final List<ReferenceExtension> list = new ArrayList<ReferenceExtension>();
- final Set<String> hidden = new HashSet<String>();
-
- for( ReferenceExtension ext : getAllReferenceExtensions() )
- {
- if( ext.isHidden() )
- {
- hidden.add( ext.getId() );
- }
- }
-
- for( ReferenceExtension ext : getAllReferenceExtensions() )
- {
- if( ! ext.isHidden() && ! hidden.contains( ext.getId() ) )
- {
- list.add( ext );
- }
- }
-
- return list;
- }
-
- public List<ReferenceExtension> getAllReferenceExtensions()
- {
- final ArrayList<ReferenceExtension> list = new ArrayList<ReferenceExtension>();
- final IExtensionRegistry registry = Platform.getExtensionRegistry();
-
- for( IConfigurationElement cf : registry.getConfigurationElementsFor( ModuleCoreUIPlugin.PLUGIN_ID, "referenceWizardFragment" ) )
- {
- list.add( new ReferenceExtension( cf ) );
- }
-
- return list;
- }
-
- public ReferenceExtension findReferenceExtension(String id) {
- IExtensionRegistry registry = Platform.getExtensionRegistry();
- IConfigurationElement[] cf = registry.getConfigurationElementsFor(
- ModuleCoreUIPlugin.PLUGIN_ID, "referenceWizardFragment"); //$NON-NLS-1$
- ArrayList<ReferenceExtension> list = new ArrayList<ReferenceExtension>();
- for( int i = 0; i < cf.length; i++ ) {
- if(cf[i].getAttribute("id").equals(id)) //$NON-NLS-1$
- return new ReferenceExtension(cf[i]);
- }
- return null;
- }
-
- public class ReferenceExtension {
- private IConfigurationElement element;
- private String id, name, imageLoc;
- private Image image;
- private boolean hidden;
- private Expression enablementExpression;
-
- public ReferenceExtension(IConfigurationElement element)
- {
- this.element = element;
- this.id = element.getAttribute("id"); //$NON-NLS-1$
- this.name = element.getAttribute("name"); //$NON-NLS-1$
- this.imageLoc = element.getAttribute("icon"); //$NON-NLS-1$
- this.hidden = Boolean.parseBoolean(element.getAttribute("hidden")); //$NON-NLS-1$
-
- for( IConfigurationElement child : element.getChildren( "enablement" ) ) //$NON-NLS-1$
- {
- try
- {
- this.enablementExpression = ExpressionConverter.getDefault().perform( child );
- }
- catch( CoreException e )
- {
- ModuleCoreUIPlugin.log( e );
- }
- }
- }
-
- public String getId() { return this.id;}
- public String getName() { return this.name; }
- public boolean isHidden() { return this.hidden; }
-
- public boolean isApplicable( final IProject project )
- {
- if( this.enablementExpression != null )
- {
- final EvaluationContext evalContext = new EvaluationContext( null, project );
- evalContext.setAllowPluginActivation( true );
-
- try
- {
- final EvaluationResult evalResult = this.enablementExpression.evaluate( evalContext );
-
- if( evalResult == EvaluationResult.FALSE )
- {
- return false;
- }
- }
- catch( CoreException e )
- {
- ModuleCoreUIPlugin.log( e );
- }
- }
-
- return true;
- }
-
- public Image getImage() {
- if( image == null ) {
- if( imageLoc != null && element.getContributor().getName() != null) {
- ImageDescriptor desc = AbstractUIPlugin.imageDescriptorFromPlugin(element.getContributor().getName(), imageLoc);
- image = desc.createImage();
- }
- }
- return image;
- }
- public void disposeImage() {
- if( image != null ) {
- image.dispose();
- image = null;
- }
- }
- }
-
- public static IVirtualComponentLabelProvider[] loadDelegates() {
- IExtensionRegistry registry = Platform.getExtensionRegistry();
- IConfigurationElement[] cf = registry.getConfigurationElementsFor(
- ModuleCoreUIPlugin.PLUGIN_ID, "virtualComponentLabelProvider"); //$NON-NLS-1$
- List<IConfigurationElement> list = Arrays.asList(cf);
- Comparator c = new Comparator<IConfigurationElement>() {
- public int compare(IConfigurationElement o1,
- IConfigurationElement o2) {
- String o1String, o2String;
- int o1int, o2int;
- o1String=o1.getAttribute("weight");
- o2String=o2.getAttribute("weight");
- try {
- o1int = Integer.parseInt(o1String);
- } catch(NumberFormatException nfe ) {
- o1int = 0;
- }
- try {
- o2int = Integer.parseInt(o2String);
- } catch(NumberFormatException nfe ) {
- o2int = 0;
- }
- return o1int-o2int;
- }
- };
- Collections.sort(list, c);
- ArrayList<IVirtualComponentLabelProvider> retList = new ArrayList<IVirtualComponentLabelProvider>();
- Iterator<IConfigurationElement> i = list.iterator();
- while(i.hasNext()) {
- try {
- IConfigurationElement el = i.next();
- String className = el.getAttribute("class");
- retList.add((IVirtualComponentLabelProvider)el.createExecutableExtension("class"));
- } catch( CoreException ce) {
- ModuleCoreUIPlugin.log( ce );
- }
- }
- return retList.toArray(new IVirtualComponentLabelProvider[retList.size()]);
- }
-
-}
diff --git a/plugins/org.eclipse.wst.common.modulecore.ui/src/org/eclipse/wst/common/componentcore/ui/internal/propertypage/FolderMappingWizardFragment.java b/plugins/org.eclipse.wst.common.modulecore.ui/src/org/eclipse/wst/common/componentcore/ui/internal/propertypage/FolderMappingWizardFragment.java
deleted file mode 100644
index e9b1306..0000000
--- a/plugins/org.eclipse.wst.common.modulecore.ui/src/org/eclipse/wst/common/componentcore/ui/internal/propertypage/FolderMappingWizardFragment.java
+++ /dev/null
@@ -1,215 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2010 Red Hat and Others
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Rob Stryker - initial implementation and ongoing maintenance
- * Konstantin Komissarchik - misc. UI cleanup
- ******************************************************************************/
-
-package org.eclipse.wst.common.componentcore.ui.internal.propertypage;
-
-
-import java.util.ArrayList;
-
-import org.eclipse.core.resources.IContainer;
-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.jface.dialogs.IMessageProvider;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.ITreeContentProvider;
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.TreeViewer;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerFilter;
-import org.eclipse.osgi.util.NLS;
-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.ISharedImages;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.internal.ide.IDEWorkbenchPlugin;
-import org.eclipse.wst.common.componentcore.ui.IModuleCoreUIContextIds;
-import org.eclipse.wst.common.componentcore.ui.Messages;
-import org.eclipse.wst.common.componentcore.ui.internal.taskwizard.IWizardHandle;
-import org.eclipse.wst.common.componentcore.ui.internal.taskwizard.WizardFragment;
-import org.eclipse.wst.common.componentcore.ui.propertypage.AddModuleDependenciesPropertiesPage.ComponentResourceProxy;
-import org.eclipse.wst.common.componentcore.ui.propertypage.IReferenceWizardConstants;
-
-public class FolderMappingWizardFragment extends WizardFragment {
- private IProject project;
- private TreeViewer viewer;
- private IContainer selected = null;
- protected IWizardHandle handle;
-
- boolean isComplete = false;
-
- public boolean isComplete() {
- return isComplete;
- }
-
- public boolean hasComposite() {
- return true;
- }
-
- public Composite createComposite(Composite parent, IWizardHandle handle) {
- this.handle = handle;
- handle.setTitle(Messages.AddFolder);
- handle.setDescription(Messages.AddFolderMappings);
- handle.setImageDescriptor(IDEWorkbenchPlugin.getIDEImageDescriptor("wizban/newfolder_wiz.png"));
- project = (IProject)getTaskModel().getObject(IReferenceWizardConstants.PROJECT);
- Composite c = new Composite(parent, SWT.NONE);
- GridLayout layout = new GridLayout();
- c.setLayout(layout);
- PlatformUI.getWorkbench().getHelpSystem().setHelp(c, IModuleCoreUIContextIds.DEPLOYMENT_ASSEMBLY_PREFERENCE_PAGE_ADD_NEW_FOLDER_MAPPING_P1);
- this.viewer = new TreeViewer(c, SWT.SINGLE | SWT.H_SCROLL | SWT.V_SCROLL | SWT.BORDER);
- viewer.setContentProvider(getContentProvider());
- viewer.setLabelProvider(getLabelProvider());
- viewer.addFilter(getFilter());
- viewer.setInput(project);
- viewer.addSelectionChangedListener(getListener());
- GridData data = new GridData(GridData.FILL_BOTH);
- data.widthHint = 390;
- data.heightHint = 185;
- viewer.getTree().setLayoutData(data);
- return c;
- }
-
- protected ISelectionChangedListener getListener() {
- return new ISelectionChangedListener() {
- public void selectionChanged(SelectionChangedEvent event) {
- IStructuredSelection sel = (IStructuredSelection)viewer.getSelection();
- Object first = sel.getFirstElement();
- if( first instanceof IContainer) {
- selected = (IContainer)first;
- String errorMessage=validateFolder();
- if (errorMessage != null)
- handle.setMessage(errorMessage,IMessageProvider.ERROR);
- else
- handle.setMessage(Messages.AddFolderMappings, IMessageProvider.NONE);
- handle.update();
- }
- }
- };
- }
-
- protected String validateFolder() {
- IContainer c = getSelected();
- IPath p = c.getProjectRelativePath().makeAbsolute();
- ArrayList<Object> currentRefs = (ArrayList<Object>)getTaskModel().getObject(IReferenceWizardConstants.ALL_DIRECTIVES);
- if (!currentRefs.isEmpty())
- for (int j = 0; j < currentRefs.size(); j++)
- {
- Object ref = currentRefs.get(j);
- if (ref instanceof ComponentResourceProxy)
- {
- ComponentResourceProxy folder = (ComponentResourceProxy) ref;
- if (p.equals(folder.source)){
- isComplete=false;
- return NLS.bind(Messages.ExistingFolderError, folder.source);
- }
- }
- }
- isComplete = true;
- return null;
- }
-
- public IContainer getSelected() {
- return selected;
- }
-
- protected ViewerFilter getFilter() {
- return new ViewerFilter() {
- public boolean select(Viewer viewer, Object parentElement,
- Object element) {
- if(element instanceof IContainer) {
- IContainer container = (IContainer) element;
- IPath path = container.getProjectRelativePath();
- if(!ResourceMappingFilterExtensionRegistry.shouldFilter(path)){
- return true;
- }
- }
- return false;
- }
- };
- }
-
- protected ITreeContentProvider getContentProvider() {
- return new ITreeContentProvider() {
-
- public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
- }
-
- public void dispose() {
- }
-
- public Object[] getElements(Object inputElement) {
- try {
- return project.members();
- } catch( CoreException ce ) {
- return new Object[]{};
- }
- }
-
- public boolean hasChildren(Object element) {
- if( element instanceof IContainer) {
- try {
- return ((IContainer)element).members().length > 0;
- } catch( CoreException ce ) {
- }
- }
- return false;
- }
-
- public Object getParent(Object element) {
- if( element instanceof IResource)
- return ((IResource)element).getParent();
- return null;
- }
-
- public Object[] getChildren(Object parentElement) {
- if( parentElement instanceof IContainer) {
- try {
- return ((IContainer)parentElement).members();
- } catch( CoreException ce ) {
- }
- }
- return new Object[]{};
- }
- };
- }
-
- protected LabelProvider getLabelProvider() {
- return new LabelProvider() {
- public Image getImage(Object element) {
- return PlatformUI.getWorkbench().getSharedImages().getImage(ISharedImages.IMG_OBJ_FOLDER);
- }
- public String getText(Object element) {
- if( element instanceof IResource)
- return ((IResource)element).getName();
- return element.toString();
- }
- };
- }
-
-
- public void performFinish(IProgressMonitor monitor) throws CoreException {
- IContainer c = getSelected();
- if( c != null ) {
- IPath p = c.getProjectRelativePath().makeAbsolute();
- ComponentResourceProxy proxy = new ComponentResourceProxy(p, new Path("/")); //$NON-NLS-1$
- getTaskModel().putObject(IReferenceWizardConstants.FOLDER_MAPPING, proxy);
- }
- }
-}
diff --git a/plugins/org.eclipse.wst.common.modulecore.ui/src/org/eclipse/wst/common/componentcore/ui/internal/propertypage/IReferenceEditor.java b/plugins/org.eclipse.wst.common.modulecore.ui/src/org/eclipse/wst/common/componentcore/ui/internal/propertypage/IReferenceEditor.java
deleted file mode 100644
index eb00ab3..0000000
--- a/plugins/org.eclipse.wst.common.modulecore.ui/src/org/eclipse/wst/common/componentcore/ui/internal/propertypage/IReferenceEditor.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2009 Red Hat
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Rob Stryker - initial implementation and ongoing maintenance
- ******************************************************************************/
-package org.eclipse.wst.common.componentcore.ui.internal.propertypage;
-
-import org.eclipse.wst.common.componentcore.resources.IVirtualReference;
-
-/**
- * WizardFragments that are providing reference wizard extensions
- * may also implement IReferenceEditor to show that this particular
- * fragment may be able to edit components it has created.
- */
-public interface IReferenceEditor {
-
- /**
- * The wizard fragment that implements this interface
- * and is able to edit the provided reference is expected
- * to cache this reference at the time canEdit(etc) is called
- *
- * @param vc
- * @return
- */
- public boolean canEdit(IVirtualReference reference);
-}
diff --git a/plugins/org.eclipse.wst.common.modulecore.ui/src/org/eclipse/wst/common/componentcore/ui/internal/propertypage/IVirtualComponentLabelProvider.java b/plugins/org.eclipse.wst.common.modulecore.ui/src/org/eclipse/wst/common/componentcore/ui/internal/propertypage/IVirtualComponentLabelProvider.java
deleted file mode 100644
index 6007c03..0000000
--- a/plugins/org.eclipse.wst.common.modulecore.ui/src/org/eclipse/wst/common/componentcore/ui/internal/propertypage/IVirtualComponentLabelProvider.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2009 Red Hat
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Rob Stryker - initial implementation and ongoing maintenance
- ******************************************************************************/
-package org.eclipse.wst.common.componentcore.ui.internal.propertypage;
-
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-
-public interface IVirtualComponentLabelProvider {
- /**
- * Return whether this label provider can provide
- * UI elements for this component
- * @param component
- * @return
- */
- public boolean canHandle(IVirtualComponent component);
-
- /**
- * Return a string representation for this component
- * @param component
- * @return
- */
- public String getSourceText(IVirtualComponent component);
-
- /**
- * Return an image representing this component
- * @param component
- * @return
- */
- public Image getSourceImage(IVirtualComponent component);
-
- /**
- * Clean up any images you created
- */
- public void dispose();
-}
diff --git a/plugins/org.eclipse.wst.common.modulecore.ui/src/org/eclipse/wst/common/componentcore/ui/internal/propertypage/NewReferenceRootWizardFragment.java b/plugins/org.eclipse.wst.common.modulecore.ui/src/org/eclipse/wst/common/componentcore/ui/internal/propertypage/NewReferenceRootWizardFragment.java
deleted file mode 100644
index 676fce5..0000000
--- a/plugins/org.eclipse.wst.common.modulecore.ui/src/org/eclipse/wst/common/componentcore/ui/internal/propertypage/NewReferenceRootWizardFragment.java
+++ /dev/null
@@ -1,184 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2010 Red Hat and Others
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Rob Stryker - initial implementation and ongoing maintenance
- * Konstantin Komissarchik - misc. UI cleanup
- ******************************************************************************/
-
-package org.eclipse.wst.common.componentcore.ui.internal.propertypage;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.jface.viewers.DoubleClickEvent;
-import org.eclipse.jface.viewers.IDoubleClickListener;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.ITreeContentProvider;
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.TreeViewer;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerComparator;
-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.PlatformUI;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.eclipse.wst.common.componentcore.ui.IModuleCoreUIContextIds;
-import org.eclipse.wst.common.componentcore.ui.Messages;
-import org.eclipse.wst.common.componentcore.ui.ModuleCoreUIPlugin;
-import org.eclipse.wst.common.componentcore.ui.internal.propertypage.DependencyPageExtensionManager.ReferenceExtension;
-import org.eclipse.wst.common.componentcore.ui.internal.taskwizard.IWizardHandle;
-import org.eclipse.wst.common.componentcore.ui.internal.taskwizard.WizardFragment;
-
-public class NewReferenceRootWizardFragment extends WizardFragment {
- protected Map<String, WizardFragment> fragmentMap =
- new HashMap<String, WizardFragment>();
- private IWizardHandle wizard;
- private TreeViewer viewer;
- private List<ReferenceExtension> extensions = null;
- public NewReferenceRootWizardFragment(List<ReferenceExtension> extensions) {
- this.extensions = extensions;
- if( this.extensions.size() == 0 )
- setComplete(false);
- }
-
- public boolean hasComposite() {
- return true;
- }
-
- public Composite createComposite(Composite parent, final IWizardHandle wizard) {
- this.wizard = wizard;
- wizard.setTitle(Messages.NewReferenceTitle);
- wizard.setDescription(Messages.NewReferenceDescription);
- wizard.setImageDescriptor( AbstractUIPlugin.imageDescriptorFromPlugin( ModuleCoreUIPlugin.PLUGIN_ID, "icons/assembly-banner.png" ) );
- Composite c = new Composite(parent, SWT.NONE);
- PlatformUI.getWorkbench().getHelpSystem().setHelp(c, IModuleCoreUIContextIds.DEPLOYMENT_ASSEMBLY_PREFERENCE_PAGE_ADD_NEW_REFERENCE_P1);
- c.setLayout(new GridLayout());
- viewer = new TreeViewer(c, SWT.SINGLE | SWT.BORDER);
- viewer.getTree().setLayoutData(new GridData( GridData.FILL_BOTH ));
- viewer.setLabelProvider(getLabelProvider());
- viewer.setContentProvider(getContentProvider());
- viewer.setComparator( new ViewerComparator() );
- viewer.setInput(ResourcesPlugin.getWorkspace());
- viewer.addSelectionChangedListener(new ISelectionChangedListener() {
- public void selectionChanged(SelectionChangedEvent event) {
- viewerSelectionChanged();
- }
- });
- viewer.addDoubleClickListener(new IDoubleClickListener() {
- public void doubleClick(DoubleClickEvent event) {
- advanceToNextPageOrFinish();
- }
- });
- return c;
- }
-
- protected void viewerSelectionChanged() {
- wizard.update();
- }
-
- protected WizardFragment getWizardFragment(String extensionPointID) {
- try {
- WizardFragment fragment = fragmentMap.get(extensionPointID);
- if (fragment != null)
- return fragment;
- } catch (Exception e) {
- // ignore
- }
-
- WizardFragment fragment = DependencyPageExtensionManager.getManager().loadReferenceWizardFragment(extensionPointID);
- if (fragment != null)
- fragmentMap.put(extensionPointID, fragment);
- return fragment;
- }
-
- public List getChildFragments() {
- List<WizardFragment> listImpl = new ArrayList<WizardFragment>();
- createChildFragments(listImpl);
- return listImpl;
- }
-
- protected void createChildFragments(List<WizardFragment> list) {
- // Instantiate and add the fragment for the current ID
- if( viewer != null ) {
- IStructuredSelection sel = (IStructuredSelection)viewer.getSelection();
- ReferenceExtension selected = (ReferenceExtension)sel.getFirstElement();
- if( selected != null ) {
- WizardFragment child = getWizardFragment(selected.getId());
- if( child != null )
- list.add(child);
- }
- }
- }
-
- public boolean isComplete() {
- return true;
- }
-
-
- private LabelProvider labelProvider = null;
- private ITreeContentProvider contentProvider = null;
- protected LabelProvider getLabelProvider() {
- if( labelProvider == null ) {
- labelProvider = new LabelProvider() {
- public Image getImage(Object element) {
- if( element instanceof ReferenceExtension)
- return ((ReferenceExtension)element).getImage();
- return null;
- }
- public String getText(Object element) {
- if( element instanceof ReferenceExtension)
- return ((ReferenceExtension)element).getName();
- return element == null ? "" : element.toString();//$NON-NLS-1$
- }
- public void dispose() {
- super.dispose();
- if( extensions != null ) {
- for( ReferenceExtension ex : extensions )
- {
- ex.disposeImage();
- }
- }
- }
- };
- }
- return labelProvider;
- }
-
- protected ITreeContentProvider getContentProvider() {
- if( contentProvider == null ) {
- contentProvider = new ITreeContentProvider() {
- public Object[] getElements(Object inputElement) {
- return extensions.toArray();
- }
- public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
- }
- public void dispose() {
- }
- public boolean hasChildren(Object element) {
- return false;
- }
- public Object getParent(Object element) {
- return null;
- }
- public Object[] getChildren(Object parentElement) {
- return null;
- }
- };
- }
- return contentProvider;
- }
-
-}
diff --git a/plugins/org.eclipse.wst.common.modulecore.ui/src/org/eclipse/wst/common/componentcore/ui/internal/propertypage/NewReferenceWizard.java b/plugins/org.eclipse.wst.common.modulecore.ui/src/org/eclipse/wst/common/componentcore/ui/internal/propertypage/NewReferenceWizard.java
deleted file mode 100644
index 1a96473..0000000
--- a/plugins/org.eclipse.wst.common.modulecore.ui/src/org/eclipse/wst/common/componentcore/ui/internal/propertypage/NewReferenceWizard.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2010 Red Hat
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Rob Stryker - initial implementation and ongoing maintenance
- * Konstantin Komissarchik - misc. UI cleanup
- ******************************************************************************/
-
-package org.eclipse.wst.common.componentcore.ui.internal.propertypage;
-
-import java.util.List;
-
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.wst.common.componentcore.resources.IVirtualReference;
-import org.eclipse.wst.common.componentcore.ui.Messages;
-import org.eclipse.wst.common.componentcore.ui.internal.propertypage.DependencyPageExtensionManager.ReferenceExtension;
-import org.eclipse.wst.common.componentcore.ui.internal.taskwizard.TaskWizard;
-import org.eclipse.wst.common.componentcore.ui.internal.taskwizard.WizardFragment;
-import org.eclipse.wst.common.componentcore.ui.propertypage.IReferenceWizardConstants;
-
-public class NewReferenceWizard extends TaskWizard implements IReferenceWizardConstants {
- private static final Object REFERENCE_FAMILY = new Object();
- public NewReferenceWizard(List<ReferenceExtension> extensions) {
- super(Messages.NewReferenceWizard, new RootWizardFragment(extensions));
- setFinishJobFamily(REFERENCE_FAMILY);
- getRootFragment().setTaskModel(getTaskModel());
- }
- protected static class RootWizardFragment extends WizardFragment {
- private List<ReferenceExtension> extensions = null;
- public RootWizardFragment(List<ReferenceExtension> extensions) {
- this.extensions = extensions;
- }
-
- protected void createChildFragments(List<WizardFragment> list) {
- IVirtualReference origRef = (IVirtualReference)getTaskModel().getObject(ORIGINAL_REFERENCE);
- if( origRef == null )
- list.add(new NewReferenceRootWizardFragment(extensions));
- else {
- WizardFragment fragment = getFirstEditingFragment(origRef);
- if( fragment != null )
- list.add(fragment);
- }
- if( list.size() == 0 )
- setComplete(false);
- }
- }
-
- public static WizardFragment getFirstEditingFragment(IVirtualReference reference) {
- WizardFragment[] frags = DependencyPageExtensionManager.getManager().loadAllReferenceWizardFragments();
- for( int i = 0; i < frags.length; i++ ) {
- if( frags[i] instanceof IReferenceEditor ) {
- if( ((IReferenceEditor)frags[i]).canEdit(reference)) {
- // accept first one
- return frags[i];
- }
- }
- }
- return null;
- }
-
- public void init(IWorkbench newWorkbench, IStructuredSelection newSelection) {
- // do nothing
- }
-}
diff --git a/plugins/org.eclipse.wst.common.modulecore.ui/src/org/eclipse/wst/common/componentcore/ui/internal/propertypage/ProjectReferenceWizardFragment.java b/plugins/org.eclipse.wst.common.modulecore.ui/src/org/eclipse/wst/common/componentcore/ui/internal/propertypage/ProjectReferenceWizardFragment.java
deleted file mode 100644
index ff38a4d..0000000
--- a/plugins/org.eclipse.wst.common.modulecore.ui/src/org/eclipse/wst/common/componentcore/ui/internal/propertypage/ProjectReferenceWizardFragment.java
+++ /dev/null
@@ -1,230 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2010 Red Hat and Others
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Rob Stryker - initial implementation and ongoing maintenance
- * Konstantin Komissarchik - misc. UI cleanup
- ******************************************************************************/
-
-package org.eclipse.wst.common.componentcore.ui.internal.propertypage;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jface.viewers.DoubleClickEvent;
-import org.eclipse.jface.viewers.IDoubleClickListener;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.ITreeContentProvider;
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.TreeViewer;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.osgi.util.NLS;
-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.PlatformUI;
-import org.eclipse.ui.ide.IDE;
-import org.eclipse.ui.internal.ide.IDEWorkbenchPlugin;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.ModuleCoreNature;
-import org.eclipse.wst.common.componentcore.internal.IModuleHandler;
-import org.eclipse.wst.common.componentcore.internal.resources.VirtualReference;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.componentcore.resources.IVirtualReference;
-import org.eclipse.wst.common.componentcore.ui.IModuleCoreUIContextIds;
-import org.eclipse.wst.common.componentcore.ui.Messages;
-import org.eclipse.wst.common.componentcore.ui.ModuleCoreUIPlugin;
-import org.eclipse.wst.common.componentcore.ui.internal.taskwizard.IWizardHandle;
-import org.eclipse.wst.common.componentcore.ui.internal.taskwizard.TaskWizardPage;
-import org.eclipse.wst.common.componentcore.ui.internal.taskwizard.WizardFragment;
-import org.eclipse.wst.common.componentcore.ui.propertypage.IReferenceWizardConstants;
-import org.eclipse.wst.common.componentcore.ui.propertypage.IReferenceWizardConstants.ProjectConverterOperationProvider;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelOperation;
-import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
-
-public class ProjectReferenceWizardFragment extends WizardFragment {
- protected LabelProvider labelProvider = null;
- protected ITreeContentProvider contentProvider = null;
- protected TreeViewer viewer;
- protected IProject[] selected;
-
- public ProjectReferenceWizardFragment() {
- super();
- setComplete(false);
- }
- public boolean hasComposite() {
- return true;
- }
-
- public Composite createComposite(Composite parent, IWizardHandle handle) {
- handle.setTitle(Messages.ProjectReferenceTitle);
- handle.setDescription(Messages.ProjectReferenceDescription);
- handle.setImageDescriptor(IDEWorkbenchPlugin.getIDEImageDescriptor("wizban/newprj_wiz.png"));
-
- Composite c = new Composite(parent, SWT.NONE);
- c.setLayout(new GridLayout());
- PlatformUI.getWorkbench().getHelpSystem().setHelp(c, IModuleCoreUIContextIds.DEPLOYMENT_ASSEMBLY_PREFERENCE_PAGE_ADD_NEW_PROJECT_REFERENCE_P1);
- viewer = new TreeViewer(c, SWT.MULTI | SWT.BORDER);
- viewer.setContentProvider(getContentProvider());
- viewer.setLabelProvider(getLabelProvider());
- viewer.addSelectionChangedListener(new ISelectionChangedListener() {
- public void selectionChanged(SelectionChangedEvent event) {
- selChanged();
- }
- });
- viewer.addDoubleClickListener(new IDoubleClickListener() {
- public void doubleClick(DoubleClickEvent event) {
- advanceToNextPageOrFinish();
- }
- });
- viewer.setInput(ResourcesPlugin.getWorkspace());
- GridData data = new GridData(GridData.FILL_BOTH);
- data.widthHint = 390;
- data.heightHint = 185;
- viewer.getTree().setLayoutData(data);
- return c;
- }
-
- protected void selChanged() {
- if( viewer != null ) {
- IStructuredSelection sel = (IStructuredSelection)viewer.getSelection();
- if( sel != null ) {
- List selectionList = sel.toList();
- selected = (IProject[])selectionList.toArray(new IProject[selectionList.size()]);
- if (selected.length != 0) setComplete(true);
- else setComplete(false);
- } else setComplete(false);
- }
- ((TaskWizardPage)getPage()).update();
- }
-
- public void performFinish(IProgressMonitor monitor) throws CoreException {
- VirtualReference[] refs = new VirtualReference[selected.length];
- String runtimeLoc = (String) getTaskModel().getObject(IReferenceWizardConstants.DEFAULT_LIBRARY_LOCATION);
- ProjectConverterOperationProvider converter = (ProjectConverterOperationProvider)getTaskModel().getObject(IReferenceWizardConstants.PROJECT_CONVERTER_OPERATION_PROVIDER);
- runtimeLoc = runtimeLoc != null ? runtimeLoc : "/"; //$NON-NLS-1$
- for (int i = 0; i < selected.length; i++) {
- IProject proj = selected[i];
-
- if( !ModuleCoreNature.isFlexibleProject(proj)) {
- convertProject(selected[i], converter, monitor);
- }
- String path = null;
- refs[i] = new VirtualReference(
- (IVirtualComponent)getTaskModel().getObject(IReferenceWizardConstants.ROOT_COMPONENT),
- ComponentCore.createComponent(proj, false));
- refs[i].setArchiveName(new Path(getArchiveName(proj, refs[i].getReferencedComponent())).lastSegment());
- refs[i].setRuntimePath(new Path(runtimeLoc).makeAbsolute());
- }
- getTaskModel().putObject(IReferenceWizardConstants.FINAL_REFERENCE, refs);
- }
-
- protected void convertProject(IProject proj, ProjectConverterOperationProvider converter, IProgressMonitor monitor) {
- if( converter != null ) {
- IDataModelOperation operation = converter.getConversionOperation(proj);
- if( operation != null ) {
- try {
- operation.execute(monitor, null);
- return;
- } catch( ExecutionException ee ) {
- ModuleCoreUIPlugin.log(NLS.bind(Messages.ProjectConversionError, proj.getName()), ee);
- }
- }
- }
- try {
- if( !ModuleCoreNature.isFlexibleProject(proj)) {
- ModuleCoreNature.addModuleCoreNatureIfNecessary(proj, monitor);
- ProjectFacetsManager.create(proj, true, monitor);
- }
- } catch( CoreException ce) {
- ModuleCoreUIPlugin.log(NLS.bind(Messages.ProjectConversionError, proj.getName()), ce);
- }
- }
-
- protected String getArchiveName(IProject proj, IVirtualComponent comp) {
- return getModuleHandler().getArchiveName(proj,comp);
- }
-
-
- protected IModuleHandler getModuleHandler() {
- return (IModuleHandler)getTaskModel().getObject(IReferenceWizardConstants.MODULEHANDLER);
- }
-
- protected LabelProvider getLabelProvider() {
- if( labelProvider == null ) {
- labelProvider = new LabelProvider() {
- public Image getImage(Object element) {
- return PlatformUI.getWorkbench().getSharedImages().getImage(IDE.SharedImages.IMG_OBJ_PROJECT);
- }
- public String getText(Object element) {
- if( element instanceof IProject )
- return ((IProject)element).getName();
- return element == null ? "" : element.toString();//$NON-NLS-1$
- }
- };
- }
- return labelProvider;
- }
-
- protected ITreeContentProvider getContentProvider() {
- if( contentProvider == null ) {
- contentProvider = new ITreeContentProvider() {
- public Object[] getElements(Object inputElement) {
- IProject root = (IProject)getTaskModel().getObject(IReferenceWizardConstants.PROJECT);
- IProject[] projects = ResourcesPlugin.getWorkspace().getRoot().getProjects();
- ArrayList<IVirtualReference> currentRefs = (ArrayList<IVirtualReference>)getTaskModel().getObject(IReferenceWizardConstants.CURRENT_REFS);
- ArrayList<IProject> availableList = getAvailableProjects(projects,currentRefs);
- IVirtualComponent comp = (IVirtualComponent)getTaskModel().getObject(IReferenceWizardConstants.ROOT_COMPONENT);
- List filtered = getModuleHandler().getFilteredProjectListForAdd(comp, availableList);
- return filtered.toArray(new IProject[filtered.size()]);
- }
- private ArrayList<IProject> getAvailableProjects(IProject[] projects, ArrayList<IVirtualReference> currentRefs) {
- if (currentRefs.isEmpty())
- return new ArrayList<IProject>(Arrays.asList(projects));
- ArrayList availProjects = new ArrayList();
- for (int i = 0; i < projects.length; i++) {
- IProject proj = projects[i];
- boolean matches = false;
- for (int j = 0; j < currentRefs.size() && !matches; j++) {
- IVirtualReference ref = currentRefs.get(j);
- if ((ref.getReferencedComponent().getProject().equals(proj)) || availProjects.contains(proj))
- matches = true;
- }
- if( !matches )
- availProjects.add(proj);
- }
- return availProjects;
- }
- public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
- }
- public void dispose() {
- }
- public boolean hasChildren(Object element) {
- return false;
- }
- public Object getParent(Object element) {
- return null;
- }
- public Object[] getChildren(Object parentElement) {
- return null;
- }
- };
- }
- return contentProvider;
- }
-}
diff --git a/plugins/org.eclipse.wst.common.modulecore.ui/src/org/eclipse/wst/common/componentcore/ui/internal/propertypage/ResourceMappingFilterExtensionRegistry.java b/plugins/org.eclipse.wst.common.modulecore.ui/src/org/eclipse/wst/common/componentcore/ui/internal/propertypage/ResourceMappingFilterExtensionRegistry.java
deleted file mode 100644
index 9f4c316..0000000
--- a/plugins/org.eclipse.wst.common.modulecore.ui/src/org/eclipse/wst/common/componentcore/ui/internal/propertypage/ResourceMappingFilterExtensionRegistry.java
+++ /dev/null
@@ -1,107 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.common.componentcore.ui.internal.propertypage;
-
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-import java.util.regex.PatternSyntaxException;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.wst.common.componentcore.ui.ModuleCoreUIPlugin;
-import org.eclipse.wst.common.core.util.RegistryReader;
-
-public class ResourceMappingFilterExtensionRegistry extends RegistryReader {
-
- static final String EXTENSION_NAME = "resourceMappingFilter"; //$NON-NLS-1$
- static final String RESOURCE_MAPPING = "resourceMapping"; //$NON-NLS-1$
- static final String SOURCE_PATH = "source-path"; //$NON-NLS-1$
- private static ResourceMappingFilterExtensionRegistry instance = null;
- private static HashMap<String, Pattern> resourceMappingFilters = null;
-
-
- public ResourceMappingFilterExtensionRegistry() {
- super(ModuleCoreUIPlugin.PLUGIN_ID, EXTENSION_NAME);
- }
-
- public static ResourceMappingFilterExtensionRegistry getInstance() {
- if( instance == null ) {
- instance = new ResourceMappingFilterExtensionRegistry();
- instance.readRegistry();
- }
- return instance;
- }
-
- @Override
- public boolean readElement(IConfigurationElement element) {
- if (!element.getName().equals(RESOURCE_MAPPING))
- return false;
- String sourcePath = element.getAttribute(SOURCE_PATH);
- if(sourcePath != null)
- addResourceMappingFilter(sourcePath);
- return true;
- }
-
-
- private static void addResourceMappingFilter(String filterRegExp) {
- if(resourceMappingFilters == null)
- resourceMappingFilters = new HashMap<String, Pattern>();
- if(filterRegExp != null) {
- try {
- Pattern pattern = Pattern.compile(filterRegExp);
- resourceMappingFilters.put(filterRegExp, pattern);
- } catch(PatternSyntaxException e) {
- ModuleCoreUIPlugin.logError(e);
- }
- }
- }
-
-
-
- public static boolean shouldFilter(IPath path) {
- ResourceMappingFilterExtensionRegistry.getInstance();
- if(path != null) {
- String relativePath = path.makeRelative().toString();
- for(Iterator iterator = resourceMappingFilters.values().iterator(); iterator.hasNext();) {
- Pattern pattern = (Pattern) iterator.next();
- Matcher matcher = pattern.matcher(relativePath);
- if (matcher.matches()) {
- return true;
- } else {
- Pattern childrenPattern = Pattern.compile(pattern.pattern()+"/.*"); //$NON-NLS-1$
- matcher = childrenPattern.matcher(relativePath);
- if (matcher.matches()) {
- return true;
- }
- }
- }
- }
- return false;
- }
-
- public static boolean shouldFilter(String path) {
- if(path != null) {
- return shouldFilter(new Path(path));
- }
- return false;
- }
-
- public static String[] getResourceMappingFiltersRegularExpressions() {
- return resourceMappingFilters.keySet().toArray(new String[resourceMappingFilters.keySet().size()]);
- }
-
- public static Pattern[] getResourceMappingFiltersRelativePatterns() {
- return resourceMappingFilters.values().toArray(new Pattern[resourceMappingFilters.values().size()]);
- }
-}
diff --git a/plugins/org.eclipse.wst.common.modulecore.ui/src/org/eclipse/wst/common/componentcore/ui/internal/propertypage/verifier/AbstractDeploymentAssemblyVerifier.java b/plugins/org.eclipse.wst.common.modulecore.ui/src/org/eclipse/wst/common/componentcore/ui/internal/propertypage/verifier/AbstractDeploymentAssemblyVerifier.java
deleted file mode 100644
index 7cc4832..0000000
--- a/plugins/org.eclipse.wst.common.modulecore.ui/src/org/eclipse/wst/common/componentcore/ui/internal/propertypage/verifier/AbstractDeploymentAssemblyVerifier.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.common.componentcore.ui.internal.propertypage.verifier;
-
-import org.eclipse.core.runtime.IStatus;
-
-/**
- * All extenders of AbstractDeploymentAssemblyVerifier must implement the verify methods to perform any verification on the deployment assembly wizard page
- *
- */
-public abstract class AbstractDeploymentAssemblyVerifier implements IDeploymentAssemblyVerifier {
-
- public abstract IStatus verify(DeploymentAssemblyVerifierData data);
-
-}
diff --git a/plugins/org.eclipse.wst.common.modulecore.ui/src/org/eclipse/wst/common/componentcore/ui/internal/propertypage/verifier/DefaultDeploymentAssemblyVerifier.java b/plugins/org.eclipse.wst.common.modulecore.ui/src/org/eclipse/wst/common/componentcore/ui/internal/propertypage/verifier/DefaultDeploymentAssemblyVerifier.java
deleted file mode 100644
index 1a158ee..0000000
--- a/plugins/org.eclipse.wst.common.modulecore.ui/src/org/eclipse/wst/common/componentcore/ui/internal/propertypage/verifier/DefaultDeploymentAssemblyVerifier.java
+++ /dev/null
@@ -1,111 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2011 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-
-package org.eclipse.wst.common.componentcore.ui.internal.propertypage.verifier;
-
-import java.util.ArrayList;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.MultiStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.wst.common.componentcore.ui.Messages;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.componentcore.resources.IVirtualReference;
-import org.eclipse.wst.common.componentcore.ui.ModuleCoreUIPlugin;
-import org.eclipse.wst.common.componentcore.ui.internal.propertypage.ResourceMappingFilterExtensionRegistry;
-import org.eclipse.wst.common.componentcore.ui.propertypage.AddModuleDependenciesPropertiesPage.ComponentResourceProxy;
-
-/**
- * This class does basic validation of the deployment assembly. It validates that
- * references to other components like projects and archives exists. It also validates that
- * folder mappings exists in the project.
- *
- */
-
-public class DefaultDeploymentAssemblyVerifier extends AbstractDeploymentAssemblyVerifier {
-
- @Override
- public IStatus verify(DeploymentAssemblyVerifierData data) {
- IStatus status = validateResourceMappings(data, null);
- return validateMissingReferences(data, status);
- }
-
-
- protected IStatus validateResourceMappings(DeploymentAssemblyVerifierData data, IStatus existingStatus){
- IStatus status = existingStatus!=null?existingStatus:Status.OK_STATUS;
- ArrayList<ComponentResourceProxy> mappings = data.getResourceMappings();
- if (mappings == null)
- return status;
- int severity = Status.ERROR;
- String msg = null;
- IProject project = data.getComponent().getProject();
- for (ComponentResourceProxy mapping:mappings){
- if (ResourceMappingFilterExtensionRegistry.shouldFilter(mapping.source))
- continue; // Do not validate filtered entries
- if (!project.exists(mapping.source)){
- msg = NLS.bind(Messages.ErrorEntryNotFound, mapping.source);
- status = appendStatusMessage(status, msg, severity);
- }
- }
- return status;
-
- }
-
- protected IStatus validateMissingReferences(DeploymentAssemblyVerifierData data, IStatus existingStatus) {
- IStatus status = existingStatus!=null?existingStatus:Status.OK_STATUS;
- ArrayList<IVirtualReference> references = data.getCurrentReferences();
- if (references == null){
- return status;
- }
- int severity = Status.ERROR;
- String msg = null;
- for (IVirtualReference reference:references){
- if (!reference.getReferencedComponent().exists()){
- String name;
- if( reference.getReferencedComponent().isBinary() ) {
- IVirtualComponent vc = reference.getReferencedComponent();
- IPath p = (IPath)vc.getAdapter(IPath.class);
- name= p == null ? vc.getName() : p.toString();
- }
- else {
- name = reference.getReferencedComponent().getProject().getName();
- }
- msg = NLS.bind(Messages.ErrorEntryNotFound, name);
- status = appendStatusMessage(status, msg, severity);
- }
- }
- return status;
- }
-
- private IStatus appendStatusMessage(IStatus existingStatus, String message, int severity) {
- MultiStatus multiStatus;
- IStatus newStatus = new Status(severity, ModuleCoreUIPlugin.PLUGIN_ID, message);
- int newSeverity = severity;
- if(existingStatus.getSeverity() > severity)
- newSeverity = existingStatus.getSeverity();
- if(existingStatus instanceof MultiStatus){
- multiStatus = (MultiStatus)existingStatus;
- multiStatus.merge(newStatus);
- } else {
- if(!existingStatus.isMultiStatus() && existingStatus.isOK()) {
- return newStatus;
- }
- IStatus [] children = new IStatus [] {existingStatus, newStatus};
- multiStatus = new MultiStatus(ModuleCoreUIPlugin.PLUGIN_ID, newSeverity, children, null, null);
- }
- return multiStatus;
- }
-
-}
diff --git a/plugins/org.eclipse.wst.common.modulecore.ui/src/org/eclipse/wst/common/componentcore/ui/internal/propertypage/verifier/DeploymentAssemblyVerifierData.java b/plugins/org.eclipse.wst.common.modulecore.ui/src/org/eclipse/wst/common/componentcore/ui/internal/propertypage/verifier/DeploymentAssemblyVerifierData.java
deleted file mode 100644
index c183835..0000000
--- a/plugins/org.eclipse.wst.common.modulecore.ui/src/org/eclipse/wst/common/componentcore/ui/internal/propertypage/verifier/DeploymentAssemblyVerifierData.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.common.componentcore.ui.internal.propertypage.verifier;
-
-import java.util.ArrayList;
-
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.componentcore.resources.IVirtualReference;
-import org.eclipse.wst.common.componentcore.ui.propertypage.AddModuleDependenciesPropertiesPage.ComponentResourceProxy;
-import org.eclipse.wst.server.core.IRuntime;
-
-public class DeploymentAssemblyVerifierData {
-
- public DeploymentAssemblyVerifierData(IVirtualComponent component, IRuntime runtime, ArrayList<IVirtualReference> currentReferences,
- ArrayList<ComponentResourceProxy> resourceMappings, boolean resourceMappingsChanged) {
- super();
- this.component = component;
- this.runtime = runtime;
- this.currentReferences = currentReferences;
- this.resourceMappings = resourceMappings;
- this.resourceMappingsChanged = resourceMappingsChanged;
- }
- private IVirtualComponent component;
- private IRuntime runtime;
- private ArrayList<IVirtualReference> currentReferences;
- private ArrayList<ComponentResourceProxy> resourceMappings;
- private boolean resourceMappingsChanged;
- public IVirtualComponent getComponent() {
- return component;
- }
- public void setComponent(IVirtualComponent component) {
- this.component = component;
- }
- public IRuntime getRuntime() {
- return runtime;
- }
- public void setRuntime(IRuntime runtime) {
- this.runtime = runtime;
- }
- public ArrayList<IVirtualReference> getCurrentReferences() {
- return currentReferences;
- }
- public void setCurrentReferences(ArrayList<IVirtualReference> currentReferences) {
- this.currentReferences = currentReferences;
- }
- public ArrayList<ComponentResourceProxy> getResourceMappings() {
- return resourceMappings;
- }
- public void setResourceMappings(ArrayList<ComponentResourceProxy> resourceMappings) {
- this.resourceMappings = resourceMappings;
- }
- public boolean isResourceMappingsChanged() {
- return resourceMappingsChanged;
- }
- public void setResourceMappingsChanged(boolean resourceMappingsChanged) {
- this.resourceMappingsChanged = resourceMappingsChanged;
- }
-
-}
diff --git a/plugins/org.eclipse.wst.common.modulecore.ui/src/org/eclipse/wst/common/componentcore/ui/internal/propertypage/verifier/DeploymentAssemblyVerifierHelper.java b/plugins/org.eclipse.wst.common.modulecore.ui/src/org/eclipse/wst/common/componentcore/ui/internal/propertypage/verifier/DeploymentAssemblyVerifierHelper.java
deleted file mode 100644
index aa1b6cd..0000000
--- a/plugins/org.eclipse.wst.common.modulecore.ui/src/org/eclipse/wst/common/componentcore/ui/internal/propertypage/verifier/DeploymentAssemblyVerifierHelper.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.common.componentcore.ui.internal.propertypage.verifier;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Set;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.MultiStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.componentcore.resources.IVirtualReference;
-import org.eclipse.wst.common.componentcore.ui.Messages;
-import org.eclipse.wst.common.componentcore.ui.ModuleCoreUIPlugin;
-import org.eclipse.wst.common.componentcore.ui.propertypage.AddModuleDependenciesPropertiesPage.ComponentResourceProxy;
-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;
-import org.eclipse.wst.server.core.IRuntime;
-
-public class DeploymentAssemblyVerifierHelper {
-
-
- /**
- * This method will use the facet framework to find all registered verifiers based on installed facets and runtimes.
- * All the verifiers will have an opportunity to verify and return status on the proposed component mappings
- * @param component
- * @param runtime
- * @param resourceMappingsChanged
- * @param resourceMappings
- * @param currentReferences
- * @return IStatus
- */
- public static IStatus verify(IVirtualComponent component,IRuntime runtime, ArrayList<IVirtualReference> currentReferences, ArrayList<ComponentResourceProxy> resourceMappings, boolean resourceMappingsChanged) {
- IProject project = component.getProject();
-
- List verifiers = collectAllVerifiers(project,runtime);
- if (verifiers.isEmpty()) return Status.OK_STATUS;
- MultiStatus masterStatus = new MultiStatus(ModuleCoreUIPlugin.PLUGIN_ID, IStatus.OK, Messages.DeploymentAssemblyVerifierHelper_0,null);
-
- for (int i = 0; i < verifiers.size(); i++) {
- if (!(verifiers.get(i) instanceof IConfigurationElement))
- continue;
- IDeploymentAssemblyVerifier verifier = null;
- try {
- verifier = (IDeploymentAssemblyVerifier) ((IConfigurationElement) verifiers.get(i)).createExecutableExtension(VerifierRegistryReader.VERIFIER_CLASS);
- DeploymentAssemblyVerifierData data = new DeploymentAssemblyVerifierData(component, runtime,currentReferences,resourceMappings,resourceMappingsChanged);
- IStatus verifyStatus = verifier.verify(data);
- if(verifyStatus != null && verifyStatus.isMultiStatus()) {
- masterStatus.addAll(verifyStatus);
- } else {
- masterStatus.add(verifyStatus);
- }
- } catch (Exception e) {
- ModuleCoreUIPlugin.log(e);
- continue;
- }
-
- }
- return masterStatus;
- }
-
- /**
- * @param project
- * @param runtime
- * @return all verifiers by iterating through projects installed facets, and querying the registry
- */
- public static List collectAllVerifiers(IProject project, IRuntime runtime) {
- IFacetedProject fProj = null;
- try {
- fProj = ProjectFacetsManager.create(project);
- } catch (CoreException e) {
- ModuleCoreUIPlugin.log(e);
- return Collections.EMPTY_LIST;
- }
- Set<IProjectFacetVersion> facets = fProj.getProjectFacets();
- List verifiers = new ArrayList();
- for (Iterator iterator = facets.iterator(); iterator.hasNext();) {
- IProjectFacetVersion facet = (IProjectFacetVersion)iterator.next();
- verifiers.addAll(VerifierRegistry.instance().getVerifierExtensions(facet.getProjectFacet().getId(), runtime));
- }
- return verifiers;
- }
-
-}
diff --git a/plugins/org.eclipse.wst.common.modulecore.ui/src/org/eclipse/wst/common/componentcore/ui/internal/propertypage/verifier/IDeploymentAssemblyVerifier.java b/plugins/org.eclipse.wst.common.modulecore.ui/src/org/eclipse/wst/common/componentcore/ui/internal/propertypage/verifier/IDeploymentAssemblyVerifier.java
deleted file mode 100644
index a3576b9..0000000
--- a/plugins/org.eclipse.wst.common.modulecore.ui/src/org/eclipse/wst/common/componentcore/ui/internal/propertypage/verifier/IDeploymentAssemblyVerifier.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.common.componentcore.ui.internal.propertypage.verifier;
-
-import org.eclipse.core.runtime.IStatus;
-
-/**
- * This interface is used to allow verifications from extending plugins registered by runtime targets and component type
- * This interface in NOT meant to be implemented, but instead extend the abstract class AbstractDeploymentAssemblyVerifier
- *
- */
-public interface IDeploymentAssemblyVerifier {
- /**
- * Validate the current state of the component resource and reference mappings
- *
- * @param data - All of the relevant dialog properties/values is sent via a DeploymentAssemblyVerifierData object
- * @return IStatus indicating OK, Warning , or Error. Warning text will display in the wizard dialog, but not prevent completion.
- * Error status will prevent completion
- */
- IStatus verify(DeploymentAssemblyVerifierData data);
-
-}
diff --git a/plugins/org.eclipse.wst.common.modulecore.ui/src/org/eclipse/wst/common/componentcore/ui/internal/propertypage/verifier/VerifierRegistry.java b/plugins/org.eclipse.wst.common.modulecore.ui/src/org/eclipse/wst/common/componentcore/ui/internal/propertypage/verifier/VerifierRegistry.java
deleted file mode 100644
index ba74ba0..0000000
--- a/plugins/org.eclipse.wst.common.modulecore.ui/src/org/eclipse/wst/common/componentcore/ui/internal/propertypage/verifier/VerifierRegistry.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010, 2011 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.common.componentcore.ui.internal.propertypage.verifier;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.wst.server.core.IRuntime;
-
-public class VerifierRegistry {
- /**
- *
- */
- private static VerifierRegistry INSTANCE;
- private HashMap assemblyVerifierExtensions = new HashMap();
-
- public VerifierRegistry() {
- super();
- }
-
- /**
- * @param verifier
- * @param serverTargets
- * @param components
- */
- protected void register(IConfigurationElement verifier, List serverTargets, List components) {
- HashMap targetVerifiers;
- for (Iterator iter = components.iterator(); iter.hasNext();) {
- String compID = (String) iter.next();
- for (Iterator iterator = serverTargets.iterator(); iterator.hasNext();) {
- String runtimeID = (String) iterator.next();
- targetVerifiers = getVerifierExtensions(compID);
- getTargetVerifiers(targetVerifiers, runtimeID).add(verifier);
- }
- }
- }
-
- private List getVerifiers(String compID, String serverTarget) {
- HashMap targetVerifiers = getVerifierExtensions(compID);
- return getTargetVerifiers(targetVerifiers, serverTarget);
- }
-
- protected static VerifierRegistry instance() {
- if (INSTANCE == null) {
- INSTANCE = new VerifierRegistry();
- readRegistry();
- }
- return INSTANCE;
- }
-
- /**
- *
- */
- private static void readRegistry() {
- VerifierRegistryReader reader = new VerifierRegistryReader();
- reader.readRegistry();
- }
-
- /**
- * @param targetVerifiers
- * @param serverTarget
- */
- private List getTargetVerifiers(HashMap targetVerifiers, String serverTarget) {
- if (targetVerifiers.get(serverTarget) == null)
- targetVerifiers.put(serverTarget, new ArrayList());
- return (List) targetVerifiers.get(serverTarget);
- }
-
- /**
- * @param compID
- * @return
- */
- private HashMap getVerifierExtensions(String compID) {
- if (getVerifierExtensions().get(compID) == null)
- getVerifierExtensions().put(compID, new HashMap());
- return (HashMap) getVerifierExtensions().get(compID);
- }
-
- /**
- * @return Returns the verifierExtensions.
- */
- private HashMap getVerifierExtensions() {
- return assemblyVerifierExtensions;
- }
-
- /**
- * @param facetTypeID
- * @param runtime
- * @return List of IConfigurationElements representing instances of IDeploymentAssemblyVerifier
- */
- public List getVerifierExtensions(String facetTypeID, IRuntime runtime) {
- // Identifier used by verifiers that will run for any runtime
- String allRuntimes = "org.eclipse.wst.common.modulecore.ui.deploymentAssemblyVerifier.anyruntime"; //$NON-NLS-1$
- String runtimeID = null;
- if (runtime == null)
- runtimeID = "None"; //$NON-NLS-1$
- else
- runtimeID = runtime.getRuntimeType().getId();
- // Get the verifiers specific for the target runtime
- List verifiers = getVerifiers(facetTypeID, runtimeID);
- if (verifiers == null)
- verifiers = Collections.EMPTY_LIST;
- // Get the verifiers for any runtime
- List genericVerifiers = getVerifiers(facetTypeID, allRuntimes);
- if (genericVerifiers == null)
- genericVerifiers = Collections.EMPTY_LIST;
- // Merge both verifiers into one list and return
- List result = new ArrayList(verifiers);
- result.addAll(genericVerifiers);
- return result;
- }
-
-
-}
diff --git a/plugins/org.eclipse.wst.common.modulecore.ui/src/org/eclipse/wst/common/componentcore/ui/internal/propertypage/verifier/VerifierRegistryReader.java b/plugins/org.eclipse.wst.common.modulecore.ui/src/org/eclipse/wst/common/componentcore/ui/internal/propertypage/verifier/VerifierRegistryReader.java
deleted file mode 100644
index 0a454d3..0000000
--- a/plugins/org.eclipse.wst.common.modulecore.ui/src/org/eclipse/wst/common/componentcore/ui/internal/propertypage/verifier/VerifierRegistryReader.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.common.componentcore.ui.internal.propertypage.verifier;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.wst.common.componentcore.ui.ModuleCoreUIPlugin;
-import org.eclipse.wst.common.core.util.RegistryReader;
-
-
-public class VerifierRegistryReader extends RegistryReader {
- /**
- * @param registry
- * @param plugin
- * @param extensionPoint
- */
- static final String ASSEMBLY_VERIFIER_EXTENSION_POINT = "deploymentAssemblyVerifier"; //$NON-NLS-1$
- static final String TARGET_SERVER_RUNTIME_ID = "runtime_server_id"; //$NON-NLS-1$
- static final String RUNTIME = "runtime"; //$NON-NLS-1$
- static final String VERIFIER = "verifier"; //$NON-NLS-1$
- public static final String VERIFIER_CLASS = "class"; //$NON-NLS-1$
- static final String COMPONENT_TYPE_ID = "component_type"; //$NON-NLS-1$
- static final String COMPONENT = "component"; //$NON-NLS-1$
-
- public VerifierRegistryReader() {
- super(ModuleCoreUIPlugin.PLUGIN_ID, ASSEMBLY_VERIFIER_EXTENSION_POINT);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.frameworks.internal.RegistryReader#readElement(org.eclipse.core.runtime.IConfigurationElement)
- */
- @Override
- public boolean readElement(IConfigurationElement element) {
- if (!element.getName().equals(VERIFIER))
- return false;
- List runtimeList = new ArrayList();
- List comps = new ArrayList();
- IConfigurationElement[] runtimes = element.getChildren(RUNTIME);
- for (int i = 0; i < runtimes.length; i++) {
- IConfigurationElement runtime = runtimes[i];
- String serverTarget = runtime.getAttribute(TARGET_SERVER_RUNTIME_ID);
- runtimeList.add(serverTarget);
- }
- IConfigurationElement[] components = element.getChildren(COMPONENT);
- for (int i = 0; i < components.length; i++) {
- IConfigurationElement component = components[i];
- String compType = component.getAttribute(COMPONENT_TYPE_ID);
- comps.add(compType);
- }
-
- String deployer = element.getAttribute(VERIFIER_CLASS);
- if (deployer != null) {
- VerifierRegistry.instance().register(element, runtimeList, comps);
- return true;
- }
- return false;
- }
-
-}
diff --git a/plugins/org.eclipse.wst.common.modulecore.ui/src/org/eclipse/wst/common/componentcore/ui/internal/taskwizard/IWizardHandle.java b/plugins/org.eclipse.wst.common.modulecore.ui/src/org/eclipse/wst/common/componentcore/ui/internal/taskwizard/IWizardHandle.java
deleted file mode 100644
index 58f763d..0000000
--- a/plugins/org.eclipse.wst.common.modulecore.ui/src/org/eclipse/wst/common/componentcore/ui/internal/taskwizard/IWizardHandle.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.common.componentcore.ui.internal.taskwizard;
-
-import java.lang.reflect.InvocationTargetException;
-
-import org.eclipse.jface.dialogs.IMessageProvider;
-import org.eclipse.jface.operation.IRunnableWithProgress;
-import org.eclipse.jface.resource.ImageDescriptor;
-/**
- * A wizard handle.
- *
- * @since 1.0
- */
-public interface IWizardHandle extends IMessageProvider {
- /**
- * Updates the wizard error messages and buttons.
- */
- public void update();
-
- /**
- * Sets the title of this wizard page.
- *
- * @param title the title of the wizard page
- */
- public void setTitle(String title);
-
- /**
- * The page's description.
- *
- * @param desc the page's description
- */
- public void setDescription(String desc);
-
- /**
- * The page's image descriptor.
- *
- * @param image the page's image descriptor
- */
- public void setImageDescriptor(ImageDescriptor image);
-
- /**
- * Set an error or warning message.
- *
- * @param newMessage the new message
- * @param newType the new type, from IStatus
- */
- public void setMessage(String newMessage, int newType);
-
- /**
- * Execute a runnable within the context of the wizard. This will typically
- * disable the wizard while the runnable is running, and provide a progress
- * monitor for the user.
- *
- * @param fork true if a separate thread should be used
- * @param cancelable true if it should be cancelable
- * @param runnable the runnable
- * @throws InterruptedException thrown if it is interrupted
- * @throws InvocationTargetException thrown if there is an error
- */
- public void run(boolean fork, boolean cancelable, IRunnableWithProgress runnable) throws InterruptedException, InvocationTargetException;
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.modulecore.ui/src/org/eclipse/wst/common/componentcore/ui/internal/taskwizard/TaskWizard.java b/plugins/org.eclipse.wst.common.modulecore.ui/src/org/eclipse/wst/common/componentcore/ui/internal/taskwizard/TaskWizard.java
deleted file mode 100644
index 78a2410..0000000
--- a/plugins/org.eclipse.wst.common.modulecore.ui/src/org/eclipse/wst/common/componentcore/ui/internal/taskwizard/TaskWizard.java
+++ /dev/null
@@ -1,587 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.common.componentcore.ui.internal.taskwizard;
-
-import java.lang.reflect.InvocationTargetException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.core.resources.IWorkspaceRunnable;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.jface.dialogs.ErrorDialog;
-import org.eclipse.jface.dialogs.IDialogSettings;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.operation.IRunnableWithProgress;
-import org.eclipse.jface.wizard.IWizard;
-import org.eclipse.jface.wizard.IWizardContainer;
-import org.eclipse.jface.wizard.IWizardPage;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.graphics.RGB;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.wst.common.componentcore.internal.impl.TaskModel;
-import org.eclipse.wst.common.componentcore.ui.Messages;
-import org.eclipse.wst.common.componentcore.ui.ModuleCoreUIPlugin;
-import org.eclipse.wst.common.componentcore.ui.Trace;
-
-
-
-/**
- * A wizard used to execute tasks.
- */
-public class TaskWizard implements IWizard {
- private static final byte FINISH = 2;
- private static final byte CANCEL = 3;
-
- private List<IWizardPage> pages;
- private boolean addingPages;
- private Map<WizardFragment, TaskWizardPage> fragmentData = new HashMap<WizardFragment, TaskWizardPage>();
- protected TaskModel taskModel;
-
- private IWizardContainer container = null;
-
- private boolean needsProgressMonitor = false;
-
- private boolean forcePreviousAndNextButtons = false;
-
- private boolean isHelpAvailable = false;
-
- private Image defaultImage = null;
-
- private RGB titleBarColor = null;
-
- private String windowTitle = null;
-
- private IDialogSettings dialogSettings = null;
-
- private WizardFragment rootFragment;
- private WizardFragment currentFragment;
- private Object finishFamily;
-
- /**
- * Create a new TaskWizard with the given title and root fragment.
- *
- * @param title a title
- * @param rootFragment a root fragment
- */
- public TaskWizard(String title, WizardFragment rootFragment) {
- this(title, rootFragment, null);
- setWindowTitle(title);
- }
-
- /**
- * Create a new TaskWizard with the given title, root fragment, and task model.
- *
- * @param title a title
- * @param rootFragment a root fragment
- * @param taskModel a task model
- */
- public TaskWizard(String title, WizardFragment rootFragment, TaskModel taskModel) {
- super();
- if (title != null)
- setWindowTitle(title);
- this.rootFragment = rootFragment;
- this.taskModel = taskModel;
- if (taskModel == null)
- this.taskModel = new TaskModel();
-
- setNeedsProgressMonitor(true);
- setForcePreviousAndNextButtons(true);
- }
-
- public void setTaskModel(TaskModel taskModel) {
- this.taskModel = taskModel;
- }
-
- public TaskModel getTaskModel() {
- return taskModel;
- }
-
- public void setRootFragment(WizardFragment rootFragment) {
- this.rootFragment = rootFragment;
- }
-
- public WizardFragment getRootFragment() {
- return rootFragment;
- }
-
- /**
- * Cancel the client selection.
- *
- * @return boolean
- */
- public boolean performCancel() {
- final List list = getAllWizardFragments();
- IRunnableWithProgress runnable = new IRunnableWithProgress() {
- public void run(IProgressMonitor monitor) throws InvocationTargetException {
- try {
- Iterator iterator = list.iterator();
- while (iterator.hasNext())
- executeTask((WizardFragment) iterator.next(), CANCEL, monitor);
- } catch (CoreException ce) {
- throw new InvocationTargetException(ce);
- }
- }
- };
-
- Throwable t = null;
- try {
- if (getContainer() != null)
- getContainer().run(true, true, runnable);
- else
- runnable.run(new NullProgressMonitor());
- return true;
- } catch (InvocationTargetException te) {
- t = te.getCause();
- } catch (Exception e) {
- t = e;
- }
- Trace.trace(Trace.SEVERE, "Error cancelling task wizard", t);
- handleThrowable(t);
- return false;
-
- }
-
- public boolean performFinish() {
- if (currentFragment != null)
- currentFragment.exit();
-
- final WizardFragment cFragment = currentFragment;
-
- final List list = getAllWizardFragments();
- IWorkspaceRunnable runnable = new IWorkspaceRunnable() {
- public void run(IProgressMonitor monitor) throws CoreException {
- // enter & exit the remaining pages
- int index = list.indexOf(cFragment);
- while (index > 0 && index < list.size() - 1) {
- final WizardFragment fragment = (WizardFragment) list.get(++index);
- try {
- Display.getDefault().syncExec(new Runnable() {
- public void run() {
- fragment.enter();
- fragment.exit();
- }
- });
- } catch (Exception e) {
- Trace.trace(Trace.WARNING, "Could not enter/exit page", e);
- }
- }
-
- if (useJob()) {
- class FinishWizardJob extends Job {
- public FinishWizardJob() {
- super(getJobTitle());
- }
-
- public boolean belongsTo(Object family) {
- return (getFinishJobFamily() == null && family == null )
- || (getFinishJobFamily() != null && getFinishJobFamily().equals(family));
- }
-
- public IStatus run(IProgressMonitor monitor2) {
- try {
- Iterator iterator = list.iterator();
- while (iterator.hasNext())
- executeTask((WizardFragment) iterator.next(), FINISH, monitor2);
- } catch (CoreException ce) {
- Trace.trace(Trace.SEVERE, "Error finishing wizard job", ce);
- return new Status(IStatus.ERROR, ModuleCoreUIPlugin.PLUGIN_ID, 0, ce.getLocalizedMessage(), null);
- }
- return Status.OK_STATUS;
- }
- }
-
- FinishWizardJob job = new FinishWizardJob();
- job.setUser(true);
- job.schedule();
- } else {
- Iterator iterator = list.iterator();
- while (iterator.hasNext())
- executeTask((WizardFragment) iterator.next(), FINISH, monitor);
- }
- }
- };
-
- Throwable t = null;
- try {
- if (getContainer() != null)
- getContainer().run(true, true, new WorkspaceRunnableAdapter(runnable));
- else
- runnable.run(new NullProgressMonitor());
- return true;
- } catch (InvocationTargetException te) {
- Trace.trace(Trace.SEVERE, "Error finishing task wizard", te);
- t = te.getCause();
- } catch (Exception e) {
- Trace.trace(Trace.SEVERE, "Error finishing task wizard 2", e);
- t = e;
- }
-
- // TODO: show better error dialog, e.g. when Tomcat config is corrupt while doing Add/Remove
- // it currently displays the error message twice
- Trace.trace(Trace.WARNING, "Error completing wizard", t);
- handleThrowable(t);
-
- return false;
- }
-
- public Object getFinishJobFamily() {
- return finishFamily;
- }
-
- public void setFinishJobFamily(Object o) {
- this.finishFamily = o;
- }
-
- public void addPage(IWizardPage page) {
- pages.add(page);
- page.setWizard(this);
- }
-
- protected void executeTask(WizardFragment fragment, byte type, IProgressMonitor monitor) throws CoreException {
- if (fragment == null)
- return;
-
- if (type == FINISH)
- fragment.performFinish(monitor);
- else if (type == CANCEL)
- fragment.performCancel(monitor);
- }
-
- protected WizardFragment getCurrentWizardFragment() {
- return currentFragment;
- }
-
- protected void switchWizardFragment(WizardFragment newFragment) {
- List list = getAllWizardFragments();
- int oldIndex = list.indexOf(currentFragment);
- int newIndex = list.indexOf(newFragment);
- if (oldIndex == newIndex)
- return;
-
- //safeExecuteTask(currentFragment, DEPARTURE);
- if (currentFragment != null)
- currentFragment.exit();
-
- if (oldIndex < newIndex)
- oldIndex ++;
- else
- oldIndex --;
-
- while (oldIndex != newIndex) {
- WizardFragment fragment = (WizardFragment) list.get(oldIndex);
- //safeExecuteTask(fragment, ARRIVAL);
- //safeExecuteTask(fragment, DEPARTURE);
- fragment.enter();
- fragment.exit();
- if (oldIndex < newIndex)
- oldIndex ++;
- else
- oldIndex --;
- }
-
- currentFragment = newFragment;
- //safeExecuteTask(currentFragment, ARRIVAL);
- currentFragment.enter();
- }
-
- private List<WizardFragment> getAllWizardFragments() {
- List<WizardFragment> list = new ArrayList<WizardFragment>();
- list.add(rootFragment);
- addSubWizardFragments(rootFragment, list);
-
- Iterator iterator = list.iterator();
- while (iterator.hasNext()) {
- WizardFragment fragment = (WizardFragment) iterator.next();
- if (!taskModel.equals(fragment.getTaskModel()))
- fragment.setTaskModel(taskModel);
- }
- return list;
- }
-
- private void addSubWizardFragments(WizardFragment fragment, List<WizardFragment> list) {
- Iterator iterator = fragment.getChildFragments().iterator();
- while (iterator.hasNext()) {
- WizardFragment child = (WizardFragment) iterator.next();
- list.add(child);
- addSubWizardFragments(child, list);
- }
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.wizard.IWizard#addPages()
- */
- public void addPages() {
- if (addingPages)
- return;
-
- try {
- addingPages = true;
- pages = new ArrayList<IWizardPage>();
- Iterator<WizardFragment> iterator = getAllWizardFragments().iterator();
- while (iterator.hasNext()) {
- WizardFragment fragment = iterator.next();
- TaskWizardPage page = getFragmentData(fragment);
- if (fragment.hasComposite()) {
- if (page != null)
- addPage(page);
- else {
- TaskWizardPage page2 = new TaskWizardPage(fragment);
- fragmentData.put(fragment, page2);
- addPage(page2);
- }
- }
- }
- } catch (Exception e) {
- Trace.trace(Trace.SEVERE, "Error adding fragments to wizard", e);
- } finally {
- addingPages = false;
- }
- }
-
- /*private static void updateWizardPages() {
- try {
- current.updatePages();
- current.getContainer().updateButtons();
- } catch (Exception e) {
- Trace.trace(Trace.SEVERE, "Error updating wizard pages", e);
- }
- }*/
-
- private TaskWizardPage getFragmentData(WizardFragment fragment) {
- try {
- TaskWizardPage page = fragmentData.get(fragment);
- if (page != null)
- return page;
- } catch (Exception e) {
- Trace.trace(Trace.SEVERE, "Error getting fragment data", e);
- }
-
- return null;
- }
-
- protected void updatePages() {
- addPages();
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.wizard.IWizard#canFinish()
- */
- public boolean canFinish() {
- // Default implementation is to check if all pages are complete.
- for (int i= 0; i < pages.size(); i++) {
- if (!(pages.get(i)).isPageComplete())
- return false;
- }
- return true;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.wizard.IWizard#createPageControls(org.eclipse.swt.widgets.Composite)
- */
- public void createPageControls(Composite pageContainer) {
- // the default behavior is to create all the pages controls
- for (int i = 0; i < pages.size(); i++){
- IWizardPage page = pages.get(i);
- page.createControl(pageContainer);
- }
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.wizard.IWizard#dispose()
- */
- public void dispose() {
- // notify pages
- for (int i = 0; i < pages.size(); i++) {
- pages.get(i).dispose();
- }
-
- // dispose of image
- if (defaultImage != null) {
- defaultImage.dispose();
- defaultImage = null;
- }
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.wizard.IWizard#getContainer()
- */
- public IWizardContainer getContainer() {
- return container;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.wizard.IWizard#getDefaultPageImage()
- */
- public Image getDefaultPageImage() {
- return defaultImage;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.wizard.IWizard#getDialogSettings()
- */
- public IDialogSettings getDialogSettings() {
- return dialogSettings;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.wizard.IWizard#getNextPage(org.eclipse.jface.wizard.IWizardPage)
- */
- public IWizardPage getNextPage(IWizardPage page) {
- int index = pages.indexOf(page);
- if (index == pages.size() - 1 || index == -1)
- // last page or page not found
- return null;
-
- return pages.get(index + 1);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.wizard.IWizard#getPage(java.lang.String)
- */
- public IWizardPage getPage(String name) {
- for (int i= 0; i < pages.size(); i++) {
- IWizardPage page = pages.get(i);
- String pageName = page.getName();
- if (pageName.equals(name))
- return page;
- }
- return null;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.wizard.IWizard#getPageCount()
- */
- public int getPageCount() {
- return pages.size();
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.wizard.IWizard#getPages()
- */
- public IWizardPage[] getPages() {
- return pages.toArray(new IWizardPage[pages.size()]);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.wizard.IWizard#getPreviousPage(org.eclipse.jface.wizard.IWizardPage)
- */
- public IWizardPage getPreviousPage(IWizardPage page) {
- int index = pages.indexOf(page);
- if (index == 0 || index == -1)
- // first page or page not found
- return null;
- return pages.get(index - 1);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.wizard.IWizard#getStartingPage()
- */
- public IWizardPage getStartingPage() {
- if (pages.size() == 0)
- return null;
-
- return pages.get(0);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.wizard.IWizard#getTitleBarColor()
- */
- public RGB getTitleBarColor() {
- return titleBarColor;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.wizard.IWizard#getWindowTitle()
- */
- public String getWindowTitle() {
- return windowTitle;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.wizard.IWizard#isHelpAvailable()
- */
- public boolean isHelpAvailable() {
- return isHelpAvailable;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.wizard.IWizard#needsPreviousAndNextButtons()
- */
- public boolean needsPreviousAndNextButtons() {
- return forcePreviousAndNextButtons || pages.size() > 1;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.wizard.IWizard#needsProgressMonitor()
- */
- public boolean needsProgressMonitor() {
- return needsProgressMonitor;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.wizard.IWizard#setContainer(org.eclipse.jface.wizard.IWizardContainer)
- */
- public void setContainer(IWizardContainer wizardContainer) {
- this.container = wizardContainer;
- }
-
- public void setDialogSettings(IDialogSettings settings) {
- dialogSettings = settings;
- }
-
- public void setNeedsProgressMonitor(boolean b) {
- needsProgressMonitor = b;
- }
-
- public void setForcePreviousAndNextButtons(boolean b) {
- forcePreviousAndNextButtons = b;
- }
-
- public void setWindowTitle(String title) {
- windowTitle = title;
- }
-
- protected boolean useJob() {
- return false;
- }
-
- protected String getJobTitle() {
- return getWindowTitle();
- }
-
- private void handleThrowable(final Throwable t) {
- Display display = Display.getCurrent();
- if (display == null)
- display = Display.getDefault();
- final Shell shell = display.getActiveShell();
- final String message = t.getLocalizedMessage();
- final IStatus status = (t instanceof CoreException) ? ((CoreException)t).getStatus() : null;
-
- Display.getDefault().asyncExec(new Runnable() {
- public void run() {
- if( status == null )
- MessageDialog.openError(shell, Messages.WizardError, message);
- else
- ErrorDialog.openError(shell, Messages.WizardError, message, status);
- }
- });
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.modulecore.ui/src/org/eclipse/wst/common/componentcore/ui/internal/taskwizard/TaskWizardPage.java b/plugins/org.eclipse.wst.common.modulecore.ui/src/org/eclipse/wst/common/componentcore/ui/internal/taskwizard/TaskWizardPage.java
deleted file mode 100644
index ded4661..0000000
--- a/plugins/org.eclipse.wst.common.modulecore.ui/src/org/eclipse/wst/common/componentcore/ui/internal/taskwizard/TaskWizardPage.java
+++ /dev/null
@@ -1,126 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.common.componentcore.ui.internal.taskwizard;
-
-import java.lang.reflect.InvocationTargetException;
-
-import org.eclipse.jface.dialogs.IMessageProvider;
-import org.eclipse.jface.operation.IRunnableWithProgress;
-import org.eclipse.jface.wizard.IWizardContainer;
-import org.eclipse.jface.wizard.WizardPage;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.FillLayout;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.wst.common.componentcore.ui.Trace;
-
-/**
- * A task wizard page.
- */
-public class TaskWizardPage extends WizardPage implements IWizardHandle {
- protected WizardFragment fragment;
-
- protected boolean isCreated = false;
-
- public TaskWizardPage(WizardFragment fragment) {
- super(fragment.toString());
- this.fragment = fragment;
- }
-
- public void createControl(Composite parentComp) {
- Composite comp = null;
- try {
- fragment.setPage(this);
- comp = fragment.createComposite(parentComp, this);
- } catch (Exception e) {
- Trace.trace(Trace.WARNING, "Could not create wizard page composite", e);
- }
- if (comp == null) {
- comp = new Composite(parentComp, SWT.NONE);
- comp.setLayout(new FillLayout(SWT.VERTICAL));
- Label label = new Label(comp, SWT.NONE);
- label.setText("Internal error");
- }
- GridData data = new GridData(GridData.HORIZONTAL_ALIGN_FILL);
- data.widthHint = convertHorizontalDLUsToPixels(150);
- comp.setLayoutData(data);
- setControl(comp);
-
- isCreated = true;
- update();
- }
-
- public boolean isPageComplete() {
- try {
- if (!fragment.isComplete())
- return false;
- } catch (Exception e) {
- return false;
- }
- return true;
- }
-
- public boolean canFlipToNextPage() {
- if (getNextPage() == null)
- return false;
- try {
- if (!fragment.isComplete())
- return false;
- } catch (Exception e) {
- return false;
- }
- return true;
- }
-
- public void setVisible(boolean visible) {
- super.setVisible(visible);
-
- if (visible) {
- TaskWizard wizard = (TaskWizard) getWizard();
- wizard.switchWizardFragment(fragment);
-
- if (getContainer().getCurrentPage() != null)
- getContainer().updateButtons();
- }
- }
-
- public void setMessage(String message, int type) {
- if (type == IMessageProvider.ERROR && "".equals(message)) {
- message = null;
- }
- super.setMessage(message, type);
- WizardFragment frag = ((TaskWizard) getWizard()).getCurrentWizardFragment();
- if (!fragment.equals(frag))
- return;
- getContainer().updateButtons();
- }
-
- public void run(boolean fork, boolean cancelable, IRunnableWithProgress runnable) throws InterruptedException, InvocationTargetException {
- getWizard().getContainer().run(fork, cancelable, runnable);
- }
-
- public void update() {
- if (!isCreated)
- return;
-
- final IWizardContainer container = getContainer();
- getShell().getDisplay().syncExec(new Runnable() {
- public void run() {
- fragment.updateChildFragments();
- ((TaskWizard) getWizard()).updatePages();
-
- if (container.getCurrentPage() != null)
- container.updateButtons();
- }
- });
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.modulecore.ui/src/org/eclipse/wst/common/componentcore/ui/internal/taskwizard/WizardFragment.java b/plugins/org.eclipse.wst.common.modulecore.ui/src/org/eclipse/wst/common/componentcore/ui/internal/taskwizard/WizardFragment.java
deleted file mode 100644
index e7c9635..0000000
--- a/plugins/org.eclipse.wst.common.modulecore.ui/src/org/eclipse/wst/common/componentcore/ui/internal/taskwizard/WizardFragment.java
+++ /dev/null
@@ -1,244 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.common.componentcore.ui.internal.taskwizard;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.jface.wizard.IWizardPage;
-import org.eclipse.jface.wizard.WizardDialog;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.wst.common.componentcore.internal.impl.TaskModel;
-
-/**
- * A wizard fragment is a node within a wizard that provides a completely
- * extendable wizard flow by supporting a flexible tree structure for the
- * pages. As the user walks pages through the wizard, they are actually
- * traversing the nodes of a tree, and each node can add or remove children
- * at any time.
- *
- * Each node may be non-UI (useful for injecting behaviour into the tree)
- * or contain a single wizard page (@see hasComposite() and
- * createComposite(Composite, IWizardHandle)). The node may also have
- * children (@see getChildFragments(), which should be updated or refreshed
- * whenever the updateChildFragments() method is called by another node to
- * let this node know that it's state may have changed.
- *
- * This implementation uses a createChildFragments() method to allow the
- * fragment to add it's children into the tree. Note that this method may
- * be called multiple times as the tree is updated and it must return the
- * same instance of any children that have previously been returned.
- *
- * @since 1.0
- */
-public abstract class WizardFragment {
- private TaskWizardPage page;
- private TaskModel taskModel;
- private boolean isComplete = true;
- private List<WizardFragment> listImpl;
-
- /**
- * Returns <code>true</code> if this fragment has an associated UI,
- * and <code>false</code> otherwise.
- *
- * @return true if the fragment has a composite
- */
- public boolean hasComposite() {
- return false;
- }
-
- /**
- * Creates the composite associated with this fragment.
- * This method is only called when hasComposite() returns true.
- *
- * @param parent a parent composite
- * @param handle a wizard handle
- * @return the created composite
- */
- public Composite createComposite(Composite parent, IWizardHandle handle) {
- return null;
- }
-
- /**
- * Sets the wizard task model.
- * <p>
- * A task model is shared by all fragments in the wizard and is used to share
- * data. It contains information about the overall task flow and allows
- * fragments to store and retrieve data. Its usage allows multiple fragments
- * to be chained together and share data from the output of one fragment to
- * the input of another.
- * </p>
- *
- * @param taskModel the task model
- * @see #getTaskModel()
- */
- public void setTaskModel(TaskModel taskModel) {
- this.taskModel = taskModel;
- }
-
- /**
- * Returns the wizard task model.
- *
- * @return the task model
- * @see #setTaskModel(TaskModel)
- */
- public TaskModel getTaskModel() {
- return taskModel;
- }
-
- public void setPage(TaskWizardPage page) {
- this.page = page;
- }
-
- public IWizardPage getPage() {
- return page;
- }
-
- /**
- * Called when the wizard that this fragment belongs to has traversed
- * into this wizard fragment. It is called to give the fragment the
- * opportunity to initialize any values shown in the composite or
- * update the task model.
- * <p>
- * When finish is pressed, the current fragment is exit()ed, and then
- * performFinish() is called on all of the fragments in the tree.
- * enter() and exit() are not called on the remaining fragments.
- * </p>
- */
- public void enter() {
- // do nothing
- }
-
- /**
- * Called when the wizard that this fragment belongs to has traversed
- * out of this wizard fragment. It is called to give the fragment the
- * opportunity to save any values entered into the composite or
- * update the task model.
- * <p>
- * When finish is pressed, the current fragment is exit()ed, and then
- * performFinish() is called on all of the fragments in the tree.
- * enter() and exit() are not called on the remaining fragments.
- * </p>
- */
- public void exit() {
- // do nothing
- }
-
- /**
- * Called when the wizard that this fragment belongs to is finished.
- * After exit()ing the current page, all fragment's performFinish()
- * methods are called in order.
- * <p>
- * This method is not called on the UI thread and must not access the
- * composite. Not only might the user never have accessed the fragment's
- * composite, but this method may be called asynchronously on a job
- * once the wizard has closed.
- * </p>
- *
- * @param monitor a progress monitor, or <code>null</code> if progress
- * reporting and cancellation are not desired
- * @throws CoreException if something goes wrong
- */
- public void performFinish(IProgressMonitor monitor) throws CoreException {
- // do nothing
- }
-
- /**
- * Called when the wizard that this fragment belongs to is canceled.
- * After exit()ing the current page, all fragment's performCancel()
- * methods are called in order.
- * <p>
- * This method is not called on the UI thread and must not access the
- * composite. Not only might the user never have accessed the fragment's
- * composite, but this method may be called asynchronously on a job
- * once the wizard has closed.
- * </p>
- *
- * @param monitor a progress monitor, or <code>null</code> if progress
- * reporting and cancellation are not desired
- * @throws CoreException if something goes wrong
- */
- public void performCancel(IProgressMonitor monitor) throws CoreException {
- // do nothing
- }
-
- /**
- * Returns the child fragments. Child fragments come directly after this fragment
- * in the wizard flow.
- *
- * @return a list of child fragments
- */
- public List getChildFragments() {
- if (listImpl == null) {
- listImpl = new ArrayList<WizardFragment>();
- createChildFragments(listImpl);
- }
- return listImpl;
- }
-
- /**
- * Called to give the fragment a chance to update it's child fragments in
- * response to other changes within the wizard or task model.
- */
- public void updateChildFragments() {
- listImpl = null;
- }
-
- /**
- * This method is called by the implementation of getChildFragments() to
- * allow this fragment to add it's children. This method must cache and
- * return the same instance of any child fragment created. If new
- * instances are created each time the wizard is updated, the enablement
- * state and the flow of the wizard will be incorrect.
- *
- * @param list a list to add the child fragments to
- */
- protected void createChildFragments(List<WizardFragment> list) {
- // do nothing
- }
-
- /**
- * Returns true if this fragment is complete (can finish). If it is
- * complete the user will be allowed to go to the next fragment or
- * finish the wizard. If the fragment is not complete, the Next button
- * will be disabled. If the fragment is complete but another fragment
- * is not complete, the Finish button will not be enabled.
- *
- * @return <code>true</code> if the fragment is complete, and
- * <code>false</code> otherwise
- */
- public boolean isComplete() {
- return isComplete;
- }
-
- /**
- * Set the isComplete state.
- *
- * @param complete <code>true</code> if the fragment is complete, and
- * <code>false</code> otherwise
- */
- protected void setComplete(boolean complete) {
- this.isComplete = complete;
- }
-
- public void advanceToNextPageOrFinish() {
- if (getPage().canFlipToNextPage()) {
- getPage().getWizard().getContainer().showPage(getPage().getNextPage());
- } else if(getPage().getWizard().canFinish()) {
- if (getPage().getWizard().performFinish()) {
- ((WizardDialog)getPage().getWizard().getContainer()).close();
- }
- }
- }
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.modulecore.ui/src/org/eclipse/wst/common/componentcore/ui/internal/taskwizard/WorkspaceRunnableAdapter.java b/plugins/org.eclipse.wst.common.modulecore.ui/src/org/eclipse/wst/common/componentcore/ui/internal/taskwizard/WorkspaceRunnableAdapter.java
deleted file mode 100644
index 4447e53..0000000
--- a/plugins/org.eclipse.wst.common.modulecore.ui/src/org/eclipse/wst/common/componentcore/ui/internal/taskwizard/WorkspaceRunnableAdapter.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.common.componentcore.ui.internal.taskwizard;
-
-import java.lang.reflect.InvocationTargetException;
-
-import org.eclipse.core.resources.IWorkspaceRunnable;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.jface.operation.IRunnableWithProgress;
-/**
- * IRunnableWithProgressAdapter to allow it to run an IWorkspaceRunnable.
- */
-public class WorkspaceRunnableAdapter implements IRunnableWithProgress {
- private IWorkspaceRunnable workspaceRunnable;
-
- public WorkspaceRunnableAdapter(IWorkspaceRunnable runnable) {
- workspaceRunnable = runnable;
- }
-
- /*
- * @see IRunnableWithProgress#run(IProgressMonitor)
- */
- public void run(IProgressMonitor monitor) throws InvocationTargetException {
- try {
- ResourcesPlugin.getWorkspace().run(workspaceRunnable, monitor);
- } catch (CoreException e) {
- throw new InvocationTargetException(e);
- }
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.modulecore.ui/src/org/eclipse/wst/common/componentcore/ui/messages.properties b/plugins/org.eclipse.wst.common.modulecore.ui/src/org/eclipse/wst/common/componentcore/ui/messages.properties
deleted file mode 100644
index 5083668..0000000
--- a/plugins/org.eclipse.wst.common.modulecore.ui/src/org/eclipse/wst/common/componentcore/ui/messages.properties
+++ /dev/null
@@ -1,30 +0,0 @@
-ModuleAssemblyRootPageDescription=Define packaging structure for this project.
-ErrorCheckingFacets=Error Checking Project Facets
-ErrorNotVirtualComponent=The given project is not a virtual component project
-DeploymentAssemblyVerifierHelper_0=Verifying Component
-DeployPathColumn=Deploy Path
-SourceColumn=Source
-InternalLibJarWarning=This library has been added to the project by using the project tree or the file system. If you want to move / remove it, use the same approach.
-AddFolder=Folder
-AddFolderElipses=Add Folder...
-AddFolderMappings=Select a project folder to include in the deployment assembly.
-AddEllipsis=A&dd...
-EditEllipsis=&Edit...
-RemoveSelected=&Remove
-ExternalJarTitle=Add an External Jar Reference
-ExternalJarDescription=Here you can reference a filesystem Jar\nThis is not a suggested use-case, but is here for backwards compatability.
-JarTitle=Add a Jar Reference
-JarDescription="Here you can reference a workspace Jar\nThis is not a suggested use-case, but is here for backwards compatability.
-Browse=Browse...
-NewReferenceTitle=Select Directive Type
-NewReferenceDescription=Add a new assembly directive.
-NewReferenceWizard=New Assembly Directive
-ProjectReferenceTitle=Projects
-ProjectReferenceDescription=Select projects to include in the deployment assembly.
-VariableReferenceTitle=Add a Variable Reference
-VariableReferenceDescription="Here you can reference a variable which maps to a single jar.\nThis is not a suggested use-case, but is here for backwards compatability.
-WizardError=Wizard Error
-ProjectConversionError=Error converting project {0} into a flexible project
-ExistingFolderError= Folder "{0}" already exists.
-Revert=Re&vert
-ErrorEntryNotFound=Cannot find entry: "{0}".
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.modulecore.ui/src/org/eclipse/wst/common/componentcore/ui/propertypage/AbstractIModuleDependenciesControl.java b/plugins/org.eclipse.wst.common.modulecore.ui/src/org/eclipse/wst/common/componentcore/ui/propertypage/AbstractIModuleDependenciesControl.java
deleted file mode 100644
index 05845d4..0000000
--- a/plugins/org.eclipse.wst.common.modulecore.ui/src/org/eclipse/wst/common/componentcore/ui/propertypage/AbstractIModuleDependenciesControl.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial implementation
- *******************************************************************************/
-package org.eclipse.wst.common.componentcore.ui.propertypage;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-
-public abstract class AbstractIModuleDependenciesControl implements IModuleDependenciesControl {
-
- /**
- * Returns any error/warning messages that are associated with the current content of the page
- * @param parent Parent Composite.
- * @return IStatus with all the error/warning messages associated with the page
- */
- public IStatus validate() {
- return Status.OK_STATUS;
- }
-
-}
diff --git a/plugins/org.eclipse.wst.common.modulecore.ui/src/org/eclipse/wst/common/componentcore/ui/propertypage/AddModuleDependenciesPropertiesPage.java b/plugins/org.eclipse.wst.common.modulecore.ui/src/org/eclipse/wst/common/componentcore/ui/propertypage/AddModuleDependenciesPropertiesPage.java
deleted file mode 100644
index 1300350..0000000
--- a/plugins/org.eclipse.wst.common.modulecore.ui/src/org/eclipse/wst/common/componentcore/ui/propertypage/AddModuleDependenciesPropertiesPage.java
+++ /dev/null
@@ -1,1319 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2010, 2011 Red Hat and others
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Rob Stryker - initial implementation and ongoing maintenance
- * Konstantin Komissarchik - misc. UI cleanup
- * Roberto Sanchez (IBM) - Handle tags in mappings
- *
- * API in these packages is provisional in this release
- ******************************************************************************/
-package org.eclipse.wst.common.componentcore.ui.propertypage;
-
-import java.io.File;
-import java.text.Collator;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IWorkspaceRoot;
-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.IStatus;
-import org.eclipse.core.runtime.MultiStatus;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.layout.GridDataFactory;
-import org.eclipse.jface.viewers.CellEditor;
-import org.eclipse.jface.viewers.ColumnViewerEditor;
-import org.eclipse.jface.viewers.ColumnViewerEditorActivationEvent;
-import org.eclipse.jface.viewers.ColumnViewerEditorActivationStrategy;
-import org.eclipse.jface.viewers.ColumnWeightData;
-import org.eclipse.jface.viewers.FocusCellOwnerDrawHighlighter;
-import org.eclipse.jface.viewers.IBaseLabelProvider;
-import org.eclipse.jface.viewers.ICellModifier;
-import org.eclipse.jface.viewers.ILabelProviderListener;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.ITableLabelProvider;
-import org.eclipse.jface.viewers.LabelProviderChangedEvent;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.TableLayout;
-import org.eclipse.jface.viewers.TextCellEditor;
-import org.eclipse.jface.viewers.TreeViewer;
-import org.eclipse.jface.viewers.TreeViewerEditor;
-import org.eclipse.jface.viewers.TreeViewerFocusCellManager;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerComparator;
-import org.eclipse.jface.window.Window;
-import org.eclipse.jface.wizard.WizardDialog;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.swt.widgets.Tree;
-import org.eclipse.swt.widgets.TreeColumn;
-import org.eclipse.swt.widgets.TreeItem;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.datamodel.properties.IAddReferenceDataModelProperties;
-import org.eclipse.wst.common.componentcore.internal.ComponentResource;
-import org.eclipse.wst.common.componentcore.internal.DefaultModuleHandler;
-import org.eclipse.wst.common.componentcore.internal.DependencyType;
-import org.eclipse.wst.common.componentcore.internal.IModuleHandler;
-import org.eclipse.wst.common.componentcore.internal.StructureEdit;
-import org.eclipse.wst.common.componentcore.internal.WorkbenchComponent;
-import org.eclipse.wst.common.componentcore.internal.impl.TaskModel;
-import org.eclipse.wst.common.componentcore.internal.operation.AddReferenceDataModelProvider;
-import org.eclipse.wst.common.componentcore.internal.operation.RemoveReferenceDataModelProvider;
-import org.eclipse.wst.common.componentcore.internal.resources.VirtualArchiveComponent;
-import org.eclipse.wst.common.componentcore.internal.resources.VirtualReference;
-import org.eclipse.wst.common.componentcore.internal.util.VirtualReferenceUtilities;
-import org.eclipse.wst.common.componentcore.resources.ITaggedVirtualResource;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.componentcore.resources.IVirtualFolder;
-import org.eclipse.wst.common.componentcore.resources.IVirtualReference;
-import org.eclipse.wst.common.componentcore.ui.IModuleCoreUIContextIds;
-import org.eclipse.wst.common.componentcore.ui.Messages;
-import org.eclipse.wst.common.componentcore.ui.ModuleCoreUIPlugin;
-import org.eclipse.wst.common.componentcore.ui.internal.propertypage.ComponentDependencyContentProvider;
-import org.eclipse.wst.common.componentcore.ui.internal.propertypage.DependencyPageExtensionManager;
-import org.eclipse.wst.common.componentcore.ui.internal.propertypage.DependencyPageExtensionManager.ReferenceExtension;
-import org.eclipse.wst.common.componentcore.ui.internal.propertypage.NewReferenceWizard;
-import org.eclipse.wst.common.componentcore.ui.internal.propertypage.ResourceMappingFilterExtensionRegistry;
-import org.eclipse.wst.common.componentcore.ui.internal.propertypage.verifier.DeploymentAssemblyVerifierHelper;
-import org.eclipse.wst.common.componentcore.ui.internal.taskwizard.TaskWizard;
-import org.eclipse.wst.common.componentcore.ui.internal.taskwizard.WizardFragment;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelOperation;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelProvider;
-import org.eclipse.wst.common.project.facet.core.IFacetedProject;
-import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
-import org.eclipse.wst.server.core.IRuntime;
-import org.eclipse.wst.server.core.internal.facets.FacetUtil;
-
-public class AddModuleDependenciesPropertiesPage extends AbstractIModuleDependenciesControl implements Listener,
- ILabelProviderListener {
-
-
- public static final int SOURCE_COLUMN = 0;
- public static final int DEPLOY_COLUMN = 1;
- protected static final String SOURCE_PROPERTY = new Integer(SOURCE_COLUMN).toString();
- protected static final String DEPLOY_PATH_PROPERTY = new Integer(DEPLOY_COLUMN).toString();
-
- protected final String PATH_SEPARATOR = String.valueOf(IPath.SEPARATOR);
- private boolean hasInitialized = false;
- protected final IProject project;
- protected final IRuntime runtime;
- protected final ModuleAssemblyRootPage propPage;
- protected IVirtualComponent rootComponent = null;
- protected Text componentNameText;
- protected TreeViewer availableComponentsViewer;
-
- protected Button addMappingButton, addReferenceButton, editReferenceButton, removeButton;
- protected Composite buttonColumn;
- protected static final IStatus OK_STATUS = IDataModelProvider.OK_STATUS;
- //protected Listener tableListener;
- protected Listener labelListener;
-
- protected ArrayList<IVirtualReference> originalReferences = new ArrayList<IVirtualReference>();
- protected ArrayList<IVirtualReference> currentReferences = new ArrayList<IVirtualReference>();
-
- // A single list of wb-resource mappings. If there's any change,
- // all old will be removed and new ones added
- protected ArrayList<ComponentResourceProxy> resourceMappings = new ArrayList<ComponentResourceProxy>();
- protected ArrayList<ComponentResourceProxy> hiddenMappings = new ArrayList<ComponentResourceProxy>();
-
- // keeps track if a change has occurred in wb-resource mappings
- protected boolean resourceMappingsChanged = false;
-
- protected IModuleHandler moduleHandler;
-
- public static String getSafeRuntimePath(IVirtualReference ref) {
- String archiveName = ref.getDependencyType() == DependencyType.CONSUMES ? null : ref.getArchiveName();
- String val = null;
- if(archiveName != null) {
- IPath runtimePath = new Path(archiveName);
- if(runtimePath.segmentCount() > 1) {
- val = archiveName;
- } else {
- val = ref.getRuntimePath().append(archiveName).toString();
- }
- } else {
- val = ref.getRuntimePath().toString();
- }
- if( val == null ) val = "/";
- return val;
- }
-
- public static void setRuntimePathSafe(IVirtualReference ref, String newPath) {
- if( ref.getDependencyType() == IVirtualReference.DEPENDENCY_TYPE_CONSUMES)
- ref.setRuntimePath(new Path(newPath == null ? "/" : newPath.trim()).makeRelative().makeAbsolute());
- else {
- IPath path2 = new Path(newPath == null ? "/" : newPath.trim()).makeRelative().makeAbsolute();
- ref.setRuntimePath(path2.segmentCount() > 1 ? path2.removeLastSegments(1) : new Path("/"));
- if(path2.segmentCount() > 0) {
- ref.setArchiveName(path2.lastSegment());
- } else if(ref.getReferencedComponent() instanceof VirtualArchiveComponent && ((VirtualArchiveComponent)ref.getReferencedComponent()).getArchiveType().equals(VirtualArchiveComponent.VARARCHIVETYPE) ) {
- File diskFile = (java.io.File)ref.getReferencedComponent().getAdapter(java.io.File.class);
- IPath filePath = null;
- if (diskFile.exists()) {
- filePath = new Path(diskFile.getAbsolutePath());
- ref.setArchiveName(filePath.lastSegment());
- }
- } else {
- ref.setArchiveName(VirtualReferenceUtilities.INSTANCE.getDefaultArchiveName(ref));
- }
- }
- }
-
- /**
- * Constructor for AddModulestoEARPropertiesControl.
- */
- public AddModuleDependenciesPropertiesPage(final IProject project,
- final ModuleAssemblyRootPage page) {
- this.project = project;
- this.propPage = page;
- this.runtime = setRuntime();
- rootComponent = ComponentCore.createComponent(project);
- }
-
- private IRuntime setRuntime() {
- IRuntime aRuntime = null;
- try {
- aRuntime = getServerRuntime(project);
- }
- catch (CoreException e) {
- ModuleCoreUIPlugin.log(e);
- }
- return aRuntime;
- }
-
- /*
- * UI Creation Methods
- */
-
- public Composite createContents(final Composite parent) {
- Composite composite = new Composite(parent, SWT.NONE);
- PlatformUI.getWorkbench().getHelpSystem().setHelp(composite, IModuleCoreUIContextIds.DEPLOYMENT_ASSEMBLY_PREFERENCE_PAGE_DEPLOYMENT_ASSEMBLY_TAB);
- GridLayout layout = new GridLayout();
- layout.marginWidth = 0;
- layout.marginWidth = 0;
- composite.setLayout(layout);
- composite.setLayoutData(new GridData(GridData.FILL_BOTH));
- createDescriptionComposite(composite);
- createListGroup(composite);
- refresh();
- Dialog.applyDialogFont(parent);
- return composite;
- }
-
- protected void createDescriptionComposite(Composite parent){
- ModuleAssemblyRootPage.createDescriptionComposite(parent, getModuleAssemblyRootPageDescription());
- }
-
- protected String getModuleAssemblyRootPageDescription() {
- return Messages.ModuleAssemblyRootPageDescription;
- }
-
- protected void createListGroup(Composite parent) {
- Composite listGroup = new Composite(parent, SWT.NONE);
- GridLayout layout = new GridLayout();
- layout.numColumns = 1;
- layout.marginWidth = 0;
- layout.marginHeight = 0;
- listGroup.setLayout(layout);
- listGroup.setLayoutData(new GridData(GridData.FILL_BOTH));
-
- createTableComposite(listGroup);
- }
-
- protected void createTableComposite(Composite parent) {
- Composite composite = new Composite(parent, SWT.NONE);
- GridData gData = new GridData(GridData.FILL_BOTH);
- composite.setLayoutData(gData);
- fillTableComposite(composite);
- }
-
- public void fillTableComposite(Composite parent) {
- GridLayout layout = new GridLayout();
- layout.numColumns = 2;
- layout.marginHeight = 0;
- layout.marginWidth = 0;
- parent.setLayout(layout);
- parent.setLayoutData(new GridData(GridData.FILL_BOTH));
- createTable(parent);
- createButtonColumn(parent);
- }
-
- protected void createButtonColumn(Composite parent) {
- buttonColumn = createButtonColumnComposite(parent);
- GridData data = new GridData(GridData.HORIZONTAL_ALIGN_END);
- buttonColumn.setLayoutData(data);
- createPushButtons();
- }
-
- protected void createPushButtons() {
- addReferenceButton = createPushButton(Messages.AddEllipsis);
- editReferenceButton = createPushButton(Messages.EditEllipsis);
- removeButton = createPushButton(Messages.RemoveSelected);
- }
-
- protected Button createPushButton(String label) {
- Button aButton = new Button(buttonColumn, SWT.PUSH);
- aButton.setText(label);
- aButton.addListener(SWT.Selection, this);
- GridDataFactory.defaultsFor( aButton ).applyTo( aButton );
- return aButton;
- }
-
- public Composite createButtonColumnComposite(Composite parent) {
- Composite aButtonColumn = new Composite(parent, SWT.NONE);
- GridLayout layout = new GridLayout();
- layout.numColumns = 1;
- layout.marginHeight = 0;
- layout.marginWidth = 0;
- aButtonColumn.setLayout(layout);
- GridData data = new GridData(GridData.HORIZONTAL_ALIGN_FILL
- | GridData.VERTICAL_ALIGN_BEGINNING);
- aButtonColumn.setLayoutData(data);
- return aButtonColumn;
- }
-
- public Group createGroup(Composite parent) {
- return new Group(parent, SWT.NULL);
- }
-
- protected void createTable(Composite parent) {
- if (rootComponent != null) {
- availableComponentsViewer = createAvailableComponentsViewer(parent);
- GridData gd = new GridData( GridData.FILL_BOTH );
- availableComponentsViewer.getTree().setLayoutData(gd);
-
- ComponentDependencyContentProvider provider = createProvider();
- provider.setComponent(rootComponent);
- provider.setRuntimePaths(currentReferences);
- provider.setResourceMappings(resourceMappings);
- availableComponentsViewer.setContentProvider(provider);
- //availableComponentsViewer.setLabelProvider(new DecoratingLabelProvider(
- // new WorkbenchLabelProvider(), PlatformUI.getWorkbench().
- // getDecoratorManager().getLabelDecorator()));
- availableComponentsViewer.setLabelProvider(provider);
- addTableListeners();
- }
- }
-
- /**
- * Subclasses should over-ride this and extend the class
- */
- protected ComponentDependencyContentProvider createProvider() {
- return new ComponentDependencyContentProvider(this);
- }
-
- /*
- * Listeners of various events
- */
-
- protected void addTableListeners() {
- addHoverHelpListeners();
- addDoubleClickListener();
- addSelectionListener();
- }
-
- protected void addHoverHelpListeners() {
- final Tree tree = availableComponentsViewer.getTree();
- createLabelListener(tree);
-// createTableListener(table);
-// table.addListener(SWT.Dispose, tableListener);
-// table.addListener(SWT.KeyDown, tableListener);
-// table.addListener(SWT.MouseMove, tableListener);
-// table.addListener(SWT.MouseHover, tableListener);
- }
-
- protected void createLabelListener(final Tree tree) {
- labelListener = new Listener() {
- public void handleEvent(Event event) {
- Label label = (Label) event.widget;
- Shell shell = label.getShell();
- switch (event.type) {
- case SWT.MouseDown:
- Event e = new Event();
- e.item = (TreeItem) label.getData("_TreeItem"); //$NON-NLS-1$
- tree.setSelection(new TreeItem[] { (TreeItem) e.item });
- tree.notifyListeners(SWT.Selection, e);
- shell.dispose();
- tree.setFocus();
- break;
- case SWT.MouseExit:
- shell.dispose();
- break;
- }
- }
- };
- }
-
-// protected void createTableListener(final Table table) {
-// tableListener = new Listener() {
-// Shell tip = null;
-// Label label = null;
-//
-// public void handleEvent(Event event) {
-// switch (event.type) {
-// case SWT.Dispose:
-// case SWT.KeyDown:
-// case SWT.MouseMove: {
-// if (tip == null)
-// break;
-// tip.dispose();
-// tip = null;
-// label = null;
-// break;
-// }
-// case SWT.MouseHover: {
-// TreeItem item = table.getItem(new Point(event.x, event.y));
-// if (item != null && item.getData() != null && !canEdit(item.getData())) {
-// if (tip != null && !tip.isDisposed())
-// tip.dispose();
-// tip = new Shell(PlatformUI.getWorkbench()
-// .getActiveWorkbenchWindow().getShell(),
-// SWT.ON_TOP | SWT.NO_FOCUS | SWT.TOOL);
-// tip.setBackground(Display.getDefault().getSystemColor(
-// SWT.COLOR_INFO_BACKGROUND));
-// FillLayout layout = new FillLayout();
-// layout.marginWidth = 2;
-// tip.setLayout(layout);
-// label = new Label(tip, SWT.WRAP);
-// label.setForeground(Display.getDefault()
-// .getSystemColor(SWT.COLOR_INFO_FOREGROUND));
-// label.setBackground(Display.getDefault()
-// .getSystemColor(SWT.COLOR_INFO_BACKGROUND));
-// label.setData("_TreeItem", item); //$NON-NLS-1$
-// label.setText( Messages.InternalLibJarWarning);
-// label.addListener(SWT.MouseExit, labelListener);
-// label.addListener(SWT.MouseDown, labelListener);
-// Point size = tip.computeSize(SWT.DEFAULT, SWT.DEFAULT);
-// Rectangle rect = item.getBounds(0);
-// Point pt = table.toDisplay(rect.x, rect.y);
-// tip.setBounds(pt.x, pt.y - size.y, size.x, size.y);
-// tip.setVisible(true);
-// }
-// }
-// }
-// }
-// };
-// }
-
-// protected boolean canEdit(Object data) {
-// if( data == null ) return false;
-// if( !(data instanceof VirtualArchiveComponent)) return true;
-//
-// VirtualArchiveComponent d2 = (VirtualArchiveComponent)data;
-// boolean sameProject = d2.getWorkspaceRelativePath() != null
-// && d2.getWorkspaceRelativePath().segment(0)
-// .equals(rootComponent.getProject().getName());
-// return !(sameProject && isPhysicallyAdded(d2));
-// }
-
- protected void addDoubleClickListener() {
- availableComponentsViewer.setColumnProperties(new String[] {
- SOURCE_PROPERTY, DEPLOY_PATH_PROPERTY });
-
- CellEditor[] editors = new CellEditor[] {
- new TextCellEditor(),
- new TextCellEditor(availableComponentsViewer.getTree())};
- availableComponentsViewer.setCellEditors(editors);
- availableComponentsViewer
- .setCellModifier(getRuntimePathCellModifier());
- }
-
- protected RuntimePathCellModifier getRuntimePathCellModifier() {
- return new RuntimePathCellModifier();
- }
-
- protected void addSelectionListener() {
- availableComponentsViewer.addSelectionChangedListener(
- new ISelectionChangedListener(){
- public void selectionChanged(SelectionChangedEvent event) {
- viewerSelectionChanged();
- }
- });
- }
-
- protected void viewerSelectionChanged() {
- editReferenceButton.setEnabled(hasEditWizardPage(getSelectedObject()));
- removeButton.setEnabled(canRemove(getSelectedObject()));
- }
-
- protected boolean canRemove(Object selectedObject) {
- return selectedObject != null;
- }
-
- protected boolean hasEditWizardPage(Object o) {
- if( o == null || !(o instanceof IVirtualReference))
- return false;
- WizardFragment wf = NewReferenceWizard.getFirstEditingFragment((IVirtualReference)o);
- return wf != null;
- }
-
- protected Object getSelectedObject() {
- IStructuredSelection sel = (IStructuredSelection)availableComponentsViewer.getSelection();
- return sel.getFirstElement();
- }
-
- protected class RuntimePathCellModifier implements ICellModifier {
-
- public boolean canModify(Object element, String property) {
- if( property.equals(DEPLOY_PATH_PROPERTY)) {
- if( element instanceof IVirtualReference && !((IVirtualReference)element).isDerived())
- return true;
- if( element instanceof ComponentResourceProxy )
- return true;
- }
- return false;
- }
-
- public Object getValue(Object element, String property) {
- if( element instanceof IVirtualReference ) {
- return new Path(getSafeRuntimePath((IVirtualReference)element)).makeRelative().toString();
- } else if( element instanceof ComponentResourceProxy) {
- if(((ComponentResourceProxy)element).runtimePath.isRoot())
- return ((ComponentResourceProxy)element).runtimePath.toString();
- else
- return ((ComponentResourceProxy)element).runtimePath.makeRelative().toString();
- }
- return new Path("/"); //$NON-NLS-1$
- }
-
- public void modify(Object element, String property, Object value) {
- if (property.equals(DEPLOY_PATH_PROPERTY)) {
- TreeItem item = (TreeItem) element;
- TreeItem[] components = availableComponentsViewer.getTree().getItems();
- int tableIndex = -1;
- for(int i=0; i < components.length; i++) {
- if(components[i] == item) {
- tableIndex = i;
- break;
- }
- }
- if( item.getData() instanceof IVirtualReference) {
- setRuntimePathSafe((IVirtualReference)item.getData(), (String) value);
- if(tableIndex >= 0) {
- IPath deployPath = ((IVirtualReference)item.getData()).getRuntimePath();
- if( ((IVirtualReference)item.getData()).getDependencyType() == IVirtualReference.DEPENDENCY_TYPE_USES )
- deployPath = deployPath.append(((IVirtualReference)item.getData()).getArchiveName());
- components[tableIndex].setText(AddModuleDependenciesPropertiesPage.DEPLOY_COLUMN, deployPath.makeRelative().toString());
- }
- } else if( item.getData() instanceof ComponentResourceProxy) {
- ComponentResourceProxy c = ((ComponentResourceProxy)item.getData());
- c.runtimePath = new Path((String)value).makeAbsolute();
- String runtimePath;
- if(c.runtimePath.isRoot())
- runtimePath = c.runtimePath.toString();
- else
- runtimePath = c.runtimePath.makeRelative().toString();
- resourceMappingsChanged = true;
- if(tableIndex >= 0)
- components[tableIndex].setText(AddModuleDependenciesPropertiesPage.DEPLOY_COLUMN, runtimePath);
- }
- verify();
- }
- }
-
- }
-
- public void handleEvent(Event event) {
- if( event.widget == addReferenceButton)
- handleAddReferenceButton();
- else if( event.widget == editReferenceButton)
- handleEditReferenceButton();
- else if( event.widget == removeButton )
- handleRemoveSelectedButton();
- }
-
- protected void handleAddReferenceButton() {
- showReferenceWizard(false);
- }
-
- protected void handleEditReferenceButton() {
- showReferenceWizard(true);
- }
-
- protected void filterReferenceTypes(List<ReferenceExtension> defaults)
- {
- }
-
- protected void showReferenceWizard( final boolean editing )
- {
- final List<ReferenceExtension> extensions =
- DependencyPageExtensionManager.getManager().getExposedReferenceExtensions();
-
- for( Iterator<ReferenceExtension> itr = extensions.iterator(); itr.hasNext(); )
- {
- final ReferenceExtension extension = itr.next();
-
- if( ! extension.isApplicable( this.project ) )
- {
- itr.remove();
- }
- }
-
- filterReferenceTypes( extensions );
-
- NewReferenceWizard wizard = new NewReferenceWizard(extensions);
-
- // fill the task model
- wizard.getTaskModel().putObject(IReferenceWizardConstants.PROJECT, project);
- wizard.getTaskModel().putObject(IReferenceWizardConstants.ROOT_COMPONENT, rootComponent);
- wizard.getTaskModel().putObject(IReferenceWizardConstants.MODULEHANDLER, getModuleHandler());
- wizard.getTaskModel().putObject(IReferenceWizardConstants.CURRENT_REFS, currentReferences);
-
- final List<Object> directives = new ArrayList<Object>();
-
- for( TreeItem item : this.availableComponentsViewer.getTree().getItems() )
- {
- directives.add( item.getData() );
- }
-
- wizard.getTaskModel().putObject(IReferenceWizardConstants.ALL_DIRECTIVES, directives);
-
- setCustomReferenceWizardProperties(wizard.getTaskModel());
-
- IVirtualReference selected = null;
- if( editing ) {
- Object o = ((IStructuredSelection)availableComponentsViewer.getSelection()).getFirstElement();
- if( o instanceof IVirtualReference ) {
- selected = (IVirtualReference)o;
- wizard.getTaskModel().putObject(IReferenceWizardConstants.ORIGINAL_REFERENCE, selected);
- }
- }
-
- WizardDialog wd = new WizardDialog(addReferenceButton.getShell(), wizard);
- if( wd.open() != Window.CANCEL) {
- if( editing && selected != null) {
- // remove old
- currentReferences.remove(selected);
- }
-
- handleAddDirective( wizard );
- refresh();
- }
- }
-
- /*
- * Clients can override this to set custom properties
- */
- protected void setCustomReferenceWizardProperties(TaskModel model) {
- // do nothing
- }
-
- protected void handleAddDirective( final TaskWizard wizard )
- {
- final Object folderMapping = wizard.getTaskModel().getObject(IReferenceWizardConstants.FOLDER_MAPPING);
-
- if( folderMapping != null && folderMapping instanceof ComponentResourceProxy )
- {
- ComponentResourceProxy proxy = (ComponentResourceProxy) folderMapping;
- resourceMappings.add(proxy);
- resourceMappingsChanged = true;
- }
- else
- {
- Object reference = wizard.getTaskModel().getObject(IReferenceWizardConstants.FINAL_REFERENCE);
-
- if( reference != null )
- {
- IVirtualReference[] referenceArray = reference instanceof IVirtualReference ?
- new IVirtualReference[] { (IVirtualReference)reference } :
- (IVirtualReference[])reference;
- currentReferences.addAll(Arrays.asList(referenceArray));
- }
- }
- }
-
- /**
- * Subclasses are encouraged to override this method if
- * they have some specific place (webinf/lib etc) where certain
- * types of references should default to.
- *
- * If the subclass does not understand or know about the
- * this component type, or if it has no customizations to perform,
- * it should return the provided wizardPath unchanged
- *
- * @param addedComp The component being added as a reference
- * @param addedPath The path that the wizard suggests as the path
- * @return The runtime path that should be added to the properties page
- */
- protected String getRuntimePath(IVirtualComponent addedComp, String wizardPath) {
- return wizardPath;
- }
-
- protected void handleRemoveSelectedButton() {
- ISelection sel = availableComponentsViewer.getSelection();
- if( sel instanceof IStructuredSelection ) {
- IStructuredSelection sel2 = (IStructuredSelection)sel;
- Object[] selectedStuff = sel2.toArray();
- for( int i = 0; i < selectedStuff.length; i++) {
- Object o = selectedStuff[i];
- remove(o);
- }
- refresh();
- }
- }
-
- protected void remove(Object selectedItem){
- if( selectedItem instanceof IVirtualReference)
- currentReferences.remove(selectedItem);
- else if( selectedItem instanceof ComponentResourceProxy) {
- resourceMappings.remove(selectedItem);
- resourceMappingsChanged = true;
- }
- }
-
- /**
- * Provides two possible sorts for each column based on the text labels.
- * Clicking on the column will toggle forwards/backwards sorting
- * @author jsholl
- */
- private static class TreeViewerTableColumnSortToggler {
- private int sortDirection = 0;
- private int sortColumn = 0;
- private TreeViewer treeViewer;
-
- private TreeViewerTableColumnSortToggler(TreeViewer treeViewer){
- this.treeViewer = treeViewer;
- }
-
- private void toggleSort(int column){
- if(sortColumn == column){
- //cycle through sort options
- switch(sortDirection){
- case SWT.NONE:
- sortDirection = SWT.UP;
- break;
- case SWT.UP:
- sortDirection = SWT.DOWN;
- break;
- case SWT.DOWN:
- sortDirection = SWT.UP;
- break;
- }
- } else {
- //clicked on a different column reset cycle
- sortColumn = column;
- sortDirection = SWT.UP;
- }
-
- ViewerComparator comparator = getViewerComparator(column, sortDirection);
- treeViewer.setComparator(comparator);
-
- Tree tree = treeViewer.getTree();
- TreeColumn sortColumn = treeViewer.getTree().getColumn(column);
- tree.setSortColumn(sortColumn);
- tree.setSortDirection(sortDirection);
- }
-
- private ViewerComparator getViewerComparator(final int columnIndex, final int sortDirection) {
- if(sortDirection == SWT.NONE){
- return null;
- }
- return new ViewerComparator() {
- Collator collator = Collator.getInstance();
- public int compare(Viewer viewerLocal, Object e1, Object e2) {
- IBaseLabelProvider baseLabelProvider = treeViewer.getLabelProvider();
- if(baseLabelProvider instanceof ITableLabelProvider){
- ITableLabelProvider tableLabelProvider = (ITableLabelProvider)baseLabelProvider;
- String text1 = tableLabelProvider.getColumnText(e1, columnIndex);
- if(text1 != null){
- String text2 = tableLabelProvider.getColumnText(e2, columnIndex);
- int comp = collator.compare(text1, text2);
- if(sortDirection == SWT.DOWN){
- comp = -comp;
- }
- return comp;
- }
- }
- return 0;
- }
- };
- }
- };
-
- public TreeViewer createAvailableComponentsViewer(Composite parent) {
- int flags = SWT.BORDER | SWT.FULL_SELECTION | SWT.MULTI;
-
- Tree tree = new Tree(parent, flags);
- TreeViewer tempViewer = new TreeViewer(tree);
- final TreeViewerTableColumnSortToggler sortController = new TreeViewerTableColumnSortToggler(tempViewer);
-
- TreeViewerFocusCellManager focusCellManager = new TreeViewerFocusCellManager(tempViewer,new FocusCellOwnerDrawHighlighter(tempViewer));
- ColumnViewerEditorActivationStrategy actSupport = new ColumnViewerEditorActivationStrategy(tempViewer) {
- private final int SPACE = 32;
- protected boolean isEditorActivationEvent(
- ColumnViewerEditorActivationEvent event) {
- return event.eventType == ColumnViewerEditorActivationEvent.TRAVERSAL
- || event.eventType == ColumnViewerEditorActivationEvent.MOUSE_DOUBLE_CLICK_SELECTION
- || (event.eventType == ColumnViewerEditorActivationEvent.KEY_PRESSED && event.keyCode == SPACE)
- || event.eventType == ColumnViewerEditorActivationEvent.PROGRAMMATIC;
- }
- };
-
- TreeViewerEditor.create(tempViewer, focusCellManager, actSupport, ColumnViewerEditor.TABBING_HORIZONTAL
- | ColumnViewerEditor.TABBING_MOVE_TO_ROW_NEIGHBOR
- | ColumnViewerEditor.TABBING_VERTICAL | ColumnViewerEditor.KEYBOARD_ACTIVATION);
-
- // set up table layout
- TableLayout tableLayout = new org.eclipse.jface.viewers.TableLayout();
- tableLayout.addColumnData(new ColumnWeightData(400, true));
- tableLayout.addColumnData(new ColumnWeightData(500, true));
- tree.setLayout(tableLayout);
- tree.setHeaderVisible(true);
- tree.setLinesVisible(true);
- tempViewer.setSorter(null);
-
- TreeColumn projectColumn = new TreeColumn(tree, SWT.NONE, SOURCE_COLUMN);
- projectColumn.setText(Messages.SourceColumn);
- projectColumn.setResizable(true);
- projectColumn.addSelectionListener(new SelectionListener() {
- public void widgetSelected(SelectionEvent e) {
- sortController.toggleSort(0);
- }
- public void widgetDefaultSelected(SelectionEvent e) {
- //do nothing
- }
- });
-
- TreeColumn bndColumn = new TreeColumn(tree, SWT.NONE, DEPLOY_COLUMN);
- bndColumn.setText(Messages.DeployPathColumn);
- bndColumn.setResizable(true);
- bndColumn.addSelectionListener(new SelectionListener() {
- public void widgetSelected(SelectionEvent e) {
- sortController.toggleSort(1);
- }
- public void widgetDefaultSelected(SelectionEvent e) {
- //do nothing
- }
- });
-
- tableLayout.layout(tree, true);
- sortController.toggleSort(0);
- return tempViewer;
-
- }
-
- /**
- * This should only be called on changes, such as adding a project
- * reference, adding a lib reference etc.
- *
- * It will reset the input, manually re-add missing elements, and do other
- * tasks
- */
- public void refresh() {
- resetTableUI();
- if (!hasInitialized) {
- initialize();
- resetTableUI();
- }
- verify();
-
- }
-
- protected void verify() {
- propPage.refreshProblemsView();
- }
-
- public IStatus validate() {
- ArrayList<ComponentResourceProxy> allMappings = new ArrayList<ComponentResourceProxy>();
- allMappings.addAll(resourceMappings);
- allMappings.addAll(hiddenMappings);
-
- return DeploymentAssemblyVerifierHelper.verify(rootComponent, runtime, currentReferences, allMappings,resourceMappingsChanged);
- }
-
- protected void setErrorMessage(IStatus status) {
- // Clear the messages
- propPage.setErrorMessage(null);
- propPage.setMessage(null);
- if(status != null) {
- if (status.isMultiStatus()) {
- MultiStatus multi = (MultiStatus)status;
- if (!multi.isOK()) {
- propPage.setMessage(getMessage(multi), multi.getSeverity());
- if (multi.getSeverity() == IStatus.ERROR) {
- propPage.setErrorMessage(getMessage(multi));
- propPage.setValid(false);
- }
- else
- propPage.setValid(true);
- } else propPage.setValid(true);
- } else if (status.isOK()) propPage.setValid(true);
- propPage.getContainer().updateMessage();
- }
- }
-
- private String getMessage(MultiStatus multi) {
- //Append Messages
- StringBuffer message = new StringBuffer();
-
- for (int i = 0; i < multi.getChildren().length; i++) {
- IStatus status = multi.getChildren()[i];
- if (!status.isOK() && status.getMessage() != null) {
- message.append(status.getMessage());
- message.append(" "); //$NON-NLS-1$
- }
- }
- return message.toString();
- }
-
- protected void resetTableUI() {
- IWorkspaceRoot input = ResourcesPlugin.getWorkspace().getRoot();
- availableComponentsViewer.setInput(input);
- GridData data = new GridData(GridData.FILL_BOTH);
- int numlines = Math.min(10, availableComponentsViewer.getTree()
- .getItemCount());
- data.heightHint = availableComponentsViewer.getTree().getItemHeight()
- * numlines;
- availableComponentsViewer.getTree().setLayoutData(data);
- GridData btndata = new GridData(GridData.HORIZONTAL_ALIGN_FILL
- | GridData.VERTICAL_ALIGN_BEGINNING);
- buttonColumn.setLayoutData(btndata);
- }
-
- protected void initialize() {
- Map<String, Object> options = new HashMap<String, Object>();
- options.put(IVirtualComponent.REQUESTED_REFERENCE_TYPE, IVirtualComponent.DISPLAYABLE_REFERENCES_ALL);
- IVirtualReference[] refs = rootComponent.getReferences(options);
- IVirtualComponent comp;
- originalReferences.addAll(Arrays.asList(refs));
- currentReferences.addAll(Arrays.asList(cloneReferences(refs)));
-
- ComponentResource[] allMappings = findAllExposedMappings();
- for( int i = 0; i < allMappings.length; i++ ) {
- resourceMappings.add(new ComponentResourceProxy(
- allMappings[i].getSourcePath(), allMappings[i].getRuntimePath(), allMappings[i].getTag()
- ));
- }
- ComponentResource[] onlyHiddenMappings = findOnlyHiddenMappings();
- for( int i = 0; i < onlyHiddenMappings.length; i++ ) {
- hiddenMappings.add(new ComponentResourceProxy(
- onlyHiddenMappings[i].getSourcePath(), onlyHiddenMappings[i].getRuntimePath(), onlyHiddenMappings[i].getTag()
- ));
- }
- if(editReferenceButton != null)
- editReferenceButton.setEnabled(false);
- if(removeButton != null)
- removeButton.setEnabled(false);
- hasInitialized = true;
- }
-
- private IRuntime getServerRuntime(IProject project2) throws CoreException {
- if (project == null)
- return null;
- IFacetedProject facetedProject = ProjectFacetsManager.create(project);
- if (facetedProject == null)
- return null;
- org.eclipse.wst.common.project.facet.core.runtime.IRuntime runtime = facetedProject.getRuntime();
- if (runtime == null)
- return null;
- return FacetUtil.getRuntime(runtime);
- }
-
- protected IVirtualReference[] cloneReferences(IVirtualReference[] refs) {
- IVirtualReference[] result = new IVirtualReference[refs.length];
- VirtualReference temp;
- for( int i = 0; i < result.length; i++ ) {
- temp = new VirtualReference(refs[i].getEnclosingComponent(), refs[i].getReferencedComponent());
- temp.setDependencyType(refs[i].getDependencyType());
- temp.setDerived(refs[i].isDerived());
- temp.setArchiveName(refs[i].getArchiveName());
- temp.setRuntimePath(refs[i].getRuntimePath());
- result[i] = temp;
- }
- return result;
- }
-
- protected ComponentResource[] findAllMappings() {
- StructureEdit structureEdit = null;
- try {
- structureEdit = StructureEdit.getStructureEditForRead(project);
- WorkbenchComponent component = structureEdit.getComponent();
- Object[] arr = component.getResources().toArray();
- ComponentResource[] result = new ComponentResource[arr.length];
- for( int i = 0; i < arr.length; i++ )
- result[i] = (ComponentResource)arr[i];
- return result;
- } catch (NullPointerException e) {
- ModuleCoreUIPlugin.logError(e);
- } finally {
- if(structureEdit != null)
- structureEdit.dispose();
- }
- return new ComponentResource[]{};
- }
-
- protected ComponentResource[] findAllExposedMappings() {
- StructureEdit structureEdit = null;
- try {
- structureEdit = StructureEdit.getStructureEditForRead(project);
- WorkbenchComponent component = structureEdit.getComponent();
- Object[] arr = component.getResources().toArray();
- ArrayList <ComponentResource> result = new ArrayList<ComponentResource>();
- for( int i = 0; i < arr.length; i++ ) {
- ComponentResource resource = (ComponentResource)arr[i];
- if(!ResourceMappingFilterExtensionRegistry.shouldFilter(resource.getSourcePath())) {
- result.add((ComponentResource)arr[i]);
- }
- }
- return result.toArray(new ComponentResource[result.size()]);
- } catch (NullPointerException e) {
- ModuleCoreUIPlugin.logError(e);
- } finally {
- if(structureEdit != null)
- structureEdit.dispose();
- }
- return new ComponentResource[]{};
- }
-
- protected ComponentResource[] findOnlyHiddenMappings() {
- StructureEdit structureEdit = null;
- try {
- structureEdit = StructureEdit.getStructureEditForRead(project);
- WorkbenchComponent component = structureEdit.getComponent();
- Object[] arr = component.getResources().toArray();
- ArrayList <ComponentResource> result = new ArrayList<ComponentResource>();
- for( int i = 0; i < arr.length; i++ ) {
- ComponentResource resource = (ComponentResource)arr[i];
- if(ResourceMappingFilterExtensionRegistry.shouldFilter(resource.getSourcePath())) {
- result.add((ComponentResource)arr[i]);
- }
- }
- return result.toArray(new ComponentResource[result.size()]);
- } catch (NullPointerException e) {
- ModuleCoreUIPlugin.logError(e);
- } finally {
- if(structureEdit != null)
- structureEdit.dispose();
- }
- return new ComponentResource[]{};
- }
-
- public static class ComponentResourceProxy {
- public IPath source, runtimePath;
- public String tag;
- public ComponentResourceProxy(IPath source, IPath runtimePath) {
- this(source, runtimePath, null);
- }
- public ComponentResourceProxy(IPath source, IPath runtimePath, String tag) {
- this.source = source;
- this.runtimePath = runtimePath;
- this.tag = tag;
- }
- }
-
- /*
- * Clean-up methods are below. These include performCancel, performDefaults,
- * performOK, and any other methods that are called *only* by this one.
- */
- public void setVisible(boolean visible) {
- }
-
- public void performDefaults() {
- currentReferences.clear();
- IVirtualReference[] currentTmp =
- originalReferences.toArray(new IVirtualReference[originalReferences.size()]);
- currentReferences.addAll(Arrays.asList(cloneReferences(currentTmp)));
- resourceMappings.clear();
- ComponentResource[] allMappings = findAllExposedMappings();
- for( int i = 0; i < allMappings.length; i++ ) {
- resourceMappings.add(new ComponentResourceProxy(
- allMappings[i].getSourcePath(), allMappings[i].getRuntimePath(), allMappings[i].getTag()
- ));
- }
- refresh();
- }
-
- public boolean performCancel() {
- return true;
- }
-
- public void dispose() {
- Tree tree = null;
- if (availableComponentsViewer != null) {
- tree = availableComponentsViewer.getTree();
- }
-// if (table == null || tableListener == null)
-// return;
-// table.removeListener(SWT.Dispose, tableListener);
-// table.removeListener(SWT.KeyDown, tableListener);
-// table.removeListener(SWT.MouseMove, tableListener);
-// table.removeListener(SWT.MouseHover, tableListener);
- }
-
-
-
- /*
- * This is where the OK work goes. Lots of it. Watch your head.
- * xiao xin
- */
- protected boolean preHandleChanges(IProgressMonitor monitor) {
- return true;
- }
-
- protected boolean postHandleChanges(IProgressMonitor monitor) {
- return true;
- }
-
- public boolean performOk() {
- boolean result = true;
- result &= saveResourceChanges();
- result &= saveReferenceChanges();
- return result;
- }
-
- protected boolean saveResourceChanges() {
- if( resourceMappingsChanged ) {
- removeAllResourceMappings();
- addNewResourceMappings();
- addAllHiddenResourceMappings();
- }
- return true;
- }
-
- private void addAllHiddenResourceMappings() {
- ComponentResourceProxy[] proxies = hiddenMappings.toArray(new ComponentResourceProxy[hiddenMappings.size()]);
- IVirtualFolder rootFolder = rootComponent.getRootFolder();
- for( int i = 0; i < proxies.length; i++ ) {
- try {
- rootFolder.getFolder(proxies[i].runtimePath).createLink(proxies[i].source, 0, null);
- } catch( CoreException ce ) {
- ModuleCoreUIPlugin.logError(ce);
- }
- }
- }
-
- protected boolean addNewResourceMappings() {
- ComponentResourceProxy[] proxies = resourceMappings.toArray(new ComponentResourceProxy[resourceMappings.size()]);
- IVirtualFolder rootFolder = rootComponent.getRootFolder();
- IVirtualFolder subFolder = null;
- for( int i = 0; i < proxies.length; i++ ) {
- try {
- subFolder= rootFolder.getFolder(proxies[i].runtimePath);
- subFolder.createLink(proxies[i].source, 0, null);
- if (subFolder instanceof ITaggedVirtualResource){
- ((ITaggedVirtualResource) subFolder).tagResource(proxies[i].source, proxies[i].tag, null);
- }
- } catch( CoreException ce ) {
- ModuleCoreUIPlugin.logError(ce);
- }
- }
- resourceMappingsChanged = false;
- return true;
- }
-
- protected boolean removeAllResourceMappings() {
- StructureEdit moduleCore = null;
- try {
- moduleCore = StructureEdit.getStructureEditForWrite(project);
- moduleCore.getComponent().getResources().clear();
- }
- finally {
- if (moduleCore != null) {
- moduleCore.saveIfNecessary(new NullProgressMonitor());
- moduleCore.dispose();
- }
- }
- return true;
- }
-
- protected boolean saveReferenceChanges() {
- // Fill our delta lists
- ArrayList<IVirtualReference> added = new ArrayList<IVirtualReference>();
- ArrayList<IVirtualReference> removed = new ArrayList<IVirtualReference>();
-
- HashMap<IVirtualComponent, IVirtualReference> map = new HashMap<IVirtualComponent, IVirtualReference>();
- Iterator<IVirtualReference> k = currentReferences.iterator();
- IVirtualReference v1;
- while(k.hasNext()) {
- v1 = k.next();
- map.put(v1.getReferencedComponent(), v1);
- }
-
- Iterator<IVirtualReference> j = originalReferences.iterator();
- IVirtualReference origRef, newRef;
- while (j.hasNext()) {
- origRef = j.next();
- newRef = map.get(origRef.getReferencedComponent());
- if( newRef == null )
- removed.add(origRef);
- else if( !getSafeRuntimePath(origRef).equals(getSafeRuntimePath(newRef))) {
- removed.add(origRef);
- added.add(newRef);
- }
- map.remove(origRef.getReferencedComponent());
- }
-
- added.addAll(map.values());
-
- NullProgressMonitor monitor = new NullProgressMonitor();
- boolean subResult = preHandleChanges(monitor);
- if( !subResult )
- return false;
-
- handleRemoved(removed);
- handleAdded(added);
-
- subResult &= postHandleChanges(monitor);
-
- originalReferences.clear();
- originalReferences.addAll(currentReferences);
- currentReferences.clear();
- IVirtualReference[] currentTmp =
- originalReferences.toArray(new IVirtualReference[originalReferences.size()]);
- currentReferences.addAll(Arrays.asList(cloneReferences(currentTmp)));
- return subResult;
- }
-
- protected void handleRemoved(ArrayList<IVirtualReference> removed) {
- // If it's removed it should *only* be a virtual component already
- if(removed.isEmpty()) return;
- final ArrayList<IVirtualReference> refs = new ArrayList<IVirtualReference>();
- Iterator<IVirtualReference> i = removed.iterator();
- IVirtualReference o;
- while(i.hasNext()) {
- o = i.next();
- refs.add(o);
- }
- IWorkspaceRunnable runnable = new IWorkspaceRunnable(){
- public void run(IProgressMonitor monitor) throws CoreException{
- removeReferences(refs);
- }
- };
- try {
- ResourcesPlugin.getWorkspace().run(runnable, new NullProgressMonitor());
- } catch( CoreException e ) {
- ModuleCoreUIPlugin.logError(e);
- }
-
- }
-
- protected void removeReferences(ArrayList<IVirtualReference> removed) {
- Iterator<IVirtualReference> i = removed.iterator();
- while(i.hasNext()) {
- removeOneReference(i.next());
- }
- }
-
- protected void removeOneReference(IVirtualReference comp) {
- try {
- IDataModelOperation operation = getRemoveComponentOperation(comp);
- operation.execute(null, null);
- } catch( ExecutionException e) {
- ModuleCoreUIPlugin.logError(e);
- }
-
- }
-
- protected IDataModelOperation getRemoveComponentOperation(IVirtualReference reference) {
- IDataModelProvider provider = getRemoveReferenceDataModelProvider(reference);
- IDataModel model = DataModelFactory.createDataModel(provider);
- model.setProperty(IAddReferenceDataModelProperties.SOURCE_COMPONENT, rootComponent);
- List<IVirtualReference> toRemove = new ArrayList<IVirtualReference>();
- toRemove.add(reference);
- model.setProperty(IAddReferenceDataModelProperties.TARGET_REFERENCE_LIST, toRemove);
- return model.getDefaultOperation();
- }
-
- protected IDataModelProvider getRemoveReferenceDataModelProvider(IVirtualReference reference) {
- return new RemoveReferenceDataModelProvider();
- }
-
- protected void handleAdded(ArrayList<IVirtualReference> added) {
- final ArrayList<IVirtualReference> refs = new ArrayList<IVirtualReference>();
- Iterator<IVirtualReference> i = added.iterator();
- IVirtualReference o;
- while(i.hasNext()) {
- o = i.next();
- refs.add(o);
- }
-
- IWorkspaceRunnable runnable = new IWorkspaceRunnable(){
- public void run(IProgressMonitor monitor) throws CoreException{
- addReferences(refs);
- }
- };
- try {
- ResourcesPlugin.getWorkspace().run(runnable, new NullProgressMonitor());
- } catch( CoreException e ) {
- ModuleCoreUIPlugin.logError(e);
- }
- }
-
- protected void addReferences(ArrayList<IVirtualReference> refs) throws CoreException {
- Iterator<IVirtualReference> i = refs.iterator();
- while(i.hasNext()) {
- addOneReference(i.next());
- }
- }
-
- protected IDataModelProvider getAddReferenceDataModelProvider(IVirtualReference component) {
- return new AddReferenceDataModelProvider();
- }
-
- protected void addOneReference(IVirtualReference ref) throws CoreException {
- String path, archiveName;
-
- IDataModelProvider provider = getAddReferenceDataModelProvider(ref);
- IDataModel dm = DataModelFactory.createDataModel(provider);
- dm.setProperty(IAddReferenceDataModelProperties.SOURCE_COMPONENT, rootComponent);
- dm.setProperty(IAddReferenceDataModelProperties.TARGET_REFERENCE_LIST, Arrays.asList(ref));
-
- IStatus stat = dm.validateProperty(IAddReferenceDataModelProperties.TARGET_REFERENCE_LIST);
- if (stat != OK_STATUS)
- throw new CoreException(stat);
- try {
- dm.getDefaultOperation().execute(new NullProgressMonitor(), null);
- } catch (ExecutionException e) {
- ModuleCoreUIPlugin.logError(e);
- }
- }
-
- public void labelProviderChanged(LabelProviderChangedEvent event) {
- if(!availableComponentsViewer.getTree().isDisposed())
- availableComponentsViewer.refresh(true);
- }
-
- protected IModuleHandler getModuleHandler() {
- if(moduleHandler == null)
- moduleHandler = new DefaultModuleHandler();
- return moduleHandler;
- }
-
- public void performApply() {
- performOk();
- verify();
- }
-
-}
diff --git a/plugins/org.eclipse.wst.common.modulecore.ui/src/org/eclipse/wst/common/componentcore/ui/propertypage/IDependencyPageProvider.java b/plugins/org.eclipse.wst.common.modulecore.ui/src/org/eclipse/wst/common/componentcore/ui/propertypage/IDependencyPageProvider.java
deleted file mode 100644
index 47332e2..0000000
--- a/plugins/org.eclipse.wst.common.modulecore.ui/src/org/eclipse/wst/common/componentcore/ui/propertypage/IDependencyPageProvider.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2009 Red Hat
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Rob Stryker - initial implementation and ongoing maintenance
- *
- * API in these packages is provisional in this release
- ******************************************************************************/
-package org.eclipse.wst.common.componentcore.ui.propertypage;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.wst.common.project.facet.core.IFacetedProject;
-
-/**
- * Suggested use case of this class is as follows:
- *
- * provider = DependencyPageExtensionManager.getManager().getProvider(facetedProject);
- * if( provider != null ) {
- * controls = provider.createPages(facetedProject, this);
- * Composite root = provider.createRootControl(controls, parent);
- * }
- */
-public interface IDependencyPageProvider {
- /**
- * Returns true if this page provider knows how to
- * handle the given faceted project, false otherwise
- * @param project a project
- * @return true if this provider can handle it, false otherwise
- */
- public boolean canHandle(IFacetedProject project);
-
- /**
- * Returns a list of page control objects which should be
- * presented to the user for this project type.
- *
- * @param project
- * @param parent
- * @return
- */
- public IModuleDependenciesControl[] createPages(IFacetedProject project, ModuleAssemblyRootPage parent);
-
- /**
- * Turn this array of pages / controls into one root control
- * that can be returned to the Properties Page container.
-
- * @param pages
- * @param parent
- * @return
- */
- public Composite createRootControl(IFacetedProject project, IModuleDependenciesControl[] pages, Composite parent);
-
- /**
- *
- * @return String - page title string or null if default title is desired
- */
- public String getPageTitle(IProject project);
-
-}
diff --git a/plugins/org.eclipse.wst.common.modulecore.ui/src/org/eclipse/wst/common/componentcore/ui/propertypage/IModuleDependenciesControl.java b/plugins/org.eclipse.wst.common.modulecore.ui/src/org/eclipse/wst/common/componentcore/ui/propertypage/IModuleDependenciesControl.java
deleted file mode 100644
index d6ca4c8..0000000
--- a/plugins/org.eclipse.wst.common.modulecore.ui/src/org/eclipse/wst/common/componentcore/ui/propertypage/IModuleDependenciesControl.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2009 Red Hat
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Rob Stryker - initial implementation and ongoing maintenance
- *
- * API in these packages is provisional in this release
- ******************************************************************************/
-package org.eclipse.wst.common.componentcore.ui.propertypage;
-
-import org.eclipse.swt.widgets.Composite;
-
-/**
- * This represents one control which may be present on a page
- * and requires to listen in to the specific lifecycle
- * events of the page.
- */
-public interface IModuleDependenciesControl {
- /**
- * Creates the Composite associated with this control.
- * @param parent Parent Composite.
- * @return Composite for the control.
- */
- Composite createContents(Composite parent);
-
- /**
- * Called when the property page's <code>performOk()</code> method is called.
- * @return
- */
- boolean performOk();
-
- /**
- * Called when the property page's <code>performDefaults()</code> method is called.
- * @return
- */
- void performDefaults();
-
- /**
- * Called when the property page's <code>performCancel()</code> method is called.
- * @return
- */
- boolean performCancel();
-
- /**
- * Called when the property page's <code>performApply()</code> method is called.
- * @return
- */
- void performApply();
-
- /**
- * Called when the property page's <code>setVisible()</code> method is called.
- * @return
- */
- void setVisible(boolean visible);
-
- /**
- * Called when the property page's <code>dispose()</code> method is called.
- * @return
- */
- void dispose();
-}
diff --git a/plugins/org.eclipse.wst.common.modulecore.ui/src/org/eclipse/wst/common/componentcore/ui/propertypage/IReferenceWizardConstants.java b/plugins/org.eclipse.wst.common.modulecore.ui/src/org/eclipse/wst/common/componentcore/ui/propertypage/IReferenceWizardConstants.java
deleted file mode 100644
index 11d8ce1..0000000
--- a/plugins/org.eclipse.wst.common.modulecore.ui/src/org/eclipse/wst/common/componentcore/ui/propertypage/IReferenceWizardConstants.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2009 Red Hat
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Rob Stryker - initial implementation and ongoing maintenance
- * IBM - Ongoing maintenance
- *
- * API in these packages is provisional in this release
- ******************************************************************************/
-package org.eclipse.wst.common.componentcore.ui.propertypage;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelOperation;
-
-public interface IReferenceWizardConstants {
- /**
- * The key representing that this wizard can return a folder mapping
- * The value should be an instanceof ComponentResourceProxy
- */
- public static final String FOLDER_MAPPING = "folder.mapping"; //$NON-NLS-1$
-
- /**
- * This property should map to the IProject which is the root project
- * which will enclose the returned reference
- */
- public static final String PROJECT = "root.project"; //$NON-NLS-1$
-
- /**
- * This property should map to the IVirtualComponent which is the root component
- * which will enclose the returned reference
- */
- public static final String ROOT_COMPONENT = "root.component"; //$NON-NLS-1$
-
- /**
- * This property should map to the IModuleHandler for customized behaviour
- */
- public static final String MODULEHANDLER = "module.handler"; //$NON-NLS-1$
-
- /**
- * This property should map to the original reference, if the wizard has been opened
- * in editing mode.
- */
- public static final String ORIGINAL_REFERENCE = "dependency.reference.original";//$NON-NLS-1$
-
- /**
- * This property should map to the final reference, either new reference,
- * or a new instance of a modified reference.
- */
- public static final String FINAL_REFERENCE = "dependency.reference.final";//$NON-NLS-1$
-
- /**
- * This property should map to the default location that libraries should be placed.
- * If this is unset, the creating or editing wizard fragment can choose to
- * set the runtimePath of the reference to whatever it wants.
- */
- public static final String DEFAULT_LIBRARY_LOCATION = "default.library.location";
-
- /**
- * This property should map to the default location that generic resources should be placed.
- * If this is unset, the creating or editing wizard fragment can choose to
- * set the runtimePath of the reference to whatever it wants.
- */
- public static final String DEFAULT_RESOURCE_LOCATION = "default.resource.location";
-
- /**
- * This property helps track the current state of the component ref model as each subsequent action is taken, but not committed
- */
- public static final String CURRENT_REFS = "current.references";
-
- /**
- * This key should be used when you want to convert a project into
- * a specific modulecore project type.
- *
- */
- public static final String PROJECT_CONVERTER_OPERATION_PROVIDER = "project.converter.operation.provider";
-
- public static final String ALL_DIRECTIVES = "all.directives";
-
- /**
- * An interface to provide an operation for converting a specific project
- */
- public static interface ProjectConverterOperationProvider {
- public IDataModelOperation getConversionOperation(IProject project);
- }
-}
diff --git a/plugins/org.eclipse.wst.common.modulecore.ui/src/org/eclipse/wst/common/componentcore/ui/propertypage/ModuleAssemblyRootPage.java b/plugins/org.eclipse.wst.common.modulecore.ui/src/org/eclipse/wst/common/componentcore/ui/propertypage/ModuleAssemblyRootPage.java
deleted file mode 100644
index a9360c5..0000000
--- a/plugins/org.eclipse.wst.common.modulecore.ui/src/org/eclipse/wst/common/componentcore/ui/propertypage/ModuleAssemblyRootPage.java
+++ /dev/null
@@ -1,412 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2010 Red Hat and Others
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Rob Stryker - initial implementation and ongoing maintenance
- * Konstantin Komissarchik - misc. UI cleanup
- *
- * API in these packages is provisional in this release
- ******************************************************************************/
-package org.eclipse.wst.common.componentcore.ui.propertypage;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-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.swt.SWT;
-import org.eclipse.swt.custom.SashForm;
-import org.eclipse.swt.custom.ScrolledComposite;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.graphics.Rectangle;
-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.Display;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.ISharedImages;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.dialogs.PropertyPage;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.ui.Messages;
-import org.eclipse.wst.common.componentcore.ui.internal.propertypage.DependencyPageExtensionManager;
-import org.eclipse.wst.common.project.facet.core.IFacetedProject;
-import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
-
-/**
- * Primary project property page for Module assembly;
- */
-public class ModuleAssemblyRootPage extends PropertyPage {
-
- private IProject project;
- private IModuleDependenciesControl[] controls = new IModuleDependenciesControl[0];
- private SashForm sform1;
- private Composite topComposite;
- private ScrolledComposite problemsViewComposite;
- private Composite subProblemsViewComposite;
-
- public ModuleAssemblyRootPage() {
- super();
- }
-
- private Composite getFacetErrorComposite(final Composite parent) {
- final String errorCheckingFacet = Messages.ErrorCheckingFacets;
- setErrorMessage(errorCheckingFacet);
- return getErrorComposite(parent, errorCheckingFacet);
- }
- private Composite getVirtCompErrorComposite(final Composite parent) {
- final String errorCheckingFacet = Messages.ErrorNotVirtualComponent;
- setErrorMessage(errorCheckingFacet);
- return getErrorComposite(parent, errorCheckingFacet);
- }
-
-
- private Composite getErrorComposite(final Composite parent, final String error) {
- final Composite composite = new Composite(parent, SWT.NONE);
- final GridLayout layout = new GridLayout();
- layout.marginWidth = 0;
- layout.marginWidth = 0;
- composite.setLayout(layout);
- composite.setLayoutData(new GridData(GridData.FILL_BOTH));
- final Label label= new Label(composite, SWT.NONE);
- label.setText(error);
- return composite;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.preference.IPreferencePage#performOk()
- */
- public boolean performOk() {
- for (int i = 0; i < controls.length; i++) {
- if (controls[i] != null) {
- if (!controls[i].performOk()) {
- return false;
- }
- }
- }
- return true;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.preference.PreferencePage#performDefaults()
- */
- public void performDefaults() {
- for (int i = 0; i < controls.length; i++) {
- if (controls[i] != null) {
- controls[i].performDefaults();
- }
- }
- }
-
- public void performApply() {
- for (int i = 0; i < controls.length; i++) {
- if (controls[i] != null) {
- controls[i].performApply();
- }
- }
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.preference.IPreferencePage#performCancel()
- */
- public boolean performCancel() {
- for (int i = 0; i < controls.length; i++) {
- if (controls[i] != null) {
- if (!controls[i].performCancel()) {
- return false;
- }
- }
- }
- return super.performCancel();
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.dialogs.IDialogPage#setVisible(boolean)
- */
- public void setVisible(boolean visible) {
- super.setVisible(visible);
- for (int i = 0; i < controls.length; i++) {
- if (controls[i] != null) {
- controls[i].setVisible(visible);
- }
- }
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.dialogs.IDialogPage#dispose()
- */
- public void dispose() {
- super.dispose();
- for (int i = 0; i < controls.length; i++) {
- if(controls[i] != null){
- controls[i].dispose();
- }
- }
- }
-
- protected static void createDescriptionComposite(final Composite parent, final String description) {
- Composite descriptionComp = new Composite(parent, SWT.NONE);
- GridLayout layout = new GridLayout();
- layout.numColumns = 1;
- layout.marginWidth = 0;
- layout.marginHeight = 0;
- descriptionComp.setLayout(layout);
- descriptionComp.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
- fillDescription(descriptionComp, description);
- }
-
- private static void fillDescription(Composite c, String s) {
- GridData data = new GridData(GridData.FILL_HORIZONTAL);
- data.widthHint = 250;
- final Text label = new Text( c, SWT.WRAP | SWT.READ_ONLY);
- label.setBackground(c.getBackground());
- label.setLayoutData(data);
- label.setText(s);
- }
-
- protected Control createContents(Composite parent) {
-
- // Need to find out what type of project we are handling
- project = (IProject) getElement().getAdapter(IResource.class);
- if( project != null ) {
- try {
- IFacetedProject facetedProject = ProjectFacetsManager.create(project);
- IDependencyPageProvider provider = null;
- if( facetedProject == null )
- return getFacetErrorComposite(parent);
-
- provider = DependencyPageExtensionManager.getManager().getProvider(facetedProject);
- if( provider != null ) {
- controls = provider.createPages(facetedProject, this);
- controls = controls == null ? new IModuleDependenciesControl[]{} : controls;
- if (provider.getPageTitle(project) != null)
- setTitle(provider.getPageTitle(project));
-
- this.sform1 = new SashForm( parent, SWT.VERTICAL | SWT.SMOOTH );
- GridData gd1 = new GridData(SWT.LEFT, SWT.FILL, false, false);
- this.sform1.setLayoutData(gd1);
-
- topComposite = provider.createRootControl(facetedProject, controls, sform1);
- } else {
- if( ComponentCore.createComponent(project) == null )
- return getVirtCompErrorComposite(parent);
-
- AddModuleDependenciesPropertiesPage page = new AddModuleDependenciesPropertiesPage(project, this);
- controls = new IModuleDependenciesControl[1];
- controls[0] = page;
- this.sform1 = new SashForm( parent, SWT.VERTICAL | SWT.SMOOTH );
- GridData gd1 = new GridData(SWT.LEFT, SWT.FILL, false, false);
- this.sform1.setLayoutData(gd1);
-
- topComposite = page.createContents(sform1);
- }
-
- problemsViewComposite = new ScrolledComposite(sform1, SWT.BORDER | SWT.V_SCROLL | SWT.H_SCROLL);
- GridData gd = new GridData();
- gd.heightHint = 100;
- gd.horizontalAlignment = SWT.FILL;
- gd.verticalAlignment = SWT.BOTTOM;
- problemsViewComposite.setLayoutData(gd);
- problemsViewComposite.setBackground( Display.getDefault().getSystemColor(SWT.COLOR_WHITE) );
- fillProblemsViewComposite();
- this.sform1.setWeights( new int[] { 80, 20 } );
- problemsViewComposite.addListener(SWT.Resize, new Listener() {
- public void handleEvent(Event e) {
- handleProblemsViewResize();
- }
- });
- return sform1;
- } catch( CoreException ce ) {
- }
- }
- return getFacetErrorComposite(parent);
- }
-
- private void handleProblemsViewResize() {
- if(subProblemsViewComposite != null && !subProblemsViewComposite.isDisposed() && topComposite != null) {
- int width = topComposite.getClientArea().width;
- if(width < 400) {
- width = 400;
- }
- int i = 1;
- for( Control child : subProblemsViewComposite.getChildren() )
- {
- if(i%2 == 0) {
- GridData gd = (GridData) child.getLayoutData();
- gd.widthHint = width - 50;
- }
- i++;
- }
- subProblemsViewComposite.setSize(subProblemsViewComposite.computeSize(SWT.DEFAULT, SWT.DEFAULT));
- subProblemsViewComposite.update();
- }
- }
-
- protected void fillProblemsViewComposite() {
- if(problemsViewComposite != null) {
- IStatus [] problems = getProblemElements();
- if(problems != null && problems.length > 0) {
- boolean resize = false;
- for( Control child : problemsViewComposite.getChildren() )
- {
- child.dispose();
- resize = true;
- }
-
- subProblemsViewComposite = new Composite( problemsViewComposite, SWT.NONE);
- subProblemsViewComposite.setLayoutData(new GridData( SWT.FILL, SWT.FILL, true, true));
- subProblemsViewComposite.setLayout(glmargins( new GridLayout(2, false ), 0, 0, 5, 5) );
- subProblemsViewComposite.setBackground( Display.getDefault().getSystemColor(SWT.COLOR_WHITE));
-
- int width = 400;
- if(topComposite != null && topComposite.getClientArea().width > 400) {
- width = topComposite.getClientArea().width;
- }
-
- Listener focusOnProblemListener = new Listener() {
- public void handleEvent(Event e) {
- Control problemLabel = (Control) e.widget;
- Rectangle problemLabelBounds = problemLabel.getBounds();
- Rectangle scrollableArea = problemsViewComposite.getClientArea();
- Point currentScrollPosition = problemsViewComposite.getOrigin();
- if (currentScrollPosition.y > problemLabelBounds.y)
- currentScrollPosition.y = Math.max(0, problemLabelBounds.y);
- if (currentScrollPosition.y + scrollableArea.height < problemLabelBounds.y + problemLabelBounds.height)
- currentScrollPosition.y = Math.max(0, problemLabelBounds.y + problemLabelBounds.height - scrollableArea.height);
- problemsViewComposite.setOrigin(currentScrollPosition);
- }
- };
-
- for (int i = 0; i < problems.length; i++) {
- IStatus singleStatus = problems[i];
- if (!singleStatus.isOK() && singleStatus.getMessage() != null) {
- final Label image = new Label( subProblemsViewComposite, SWT.NONE );
- GridData gdImage = new GridData();
- gdImage.verticalAlignment = SWT.BEGINNING;
- image.setBackground( Display.getDefault().getSystemColor(SWT.COLOR_WHITE) );
- image.setImage(getProblemImage(singleStatus));
- image.setLayoutData(gdImage);
-
- final Text text = new Text( subProblemsViewComposite, SWT.WRAP | SWT.READ_ONLY);
- GridData gdLabel = new GridData();
- gdLabel.widthHint = width - 50;
- text.setBackground( Display.getDefault().getSystemColor(SWT.COLOR_WHITE) );
- text.setText(singleStatus.getMessage());
- text.setLayoutData(gdLabel);
- text.addListener(SWT.Activate, focusOnProblemListener);
- }
- }
- problemsViewComposite.setContent(subProblemsViewComposite);
-
- if(resize)
- handleProblemsViewResize();
-
- if( this.sform1.getMaximizedControl() != null ) {
- this.sform1.setMaximizedControl( null );
- }
- } else {
- this.sform1.setMaximizedControl( this.topComposite );
- }
- }
- }
-
-
- private final static GridLayout glmargins( final GridLayout layout,
- final int marginWidth,
- final int marginHeight,
- final int marginTop,
- final int marginBottom)
- {
- layout.marginWidth = marginWidth;
- layout.marginHeight = marginHeight;
- layout.marginLeft = 0;
- layout.marginRight = 0;
- layout.marginTop = marginTop;
- layout.marginBottom = marginBottom;
-
- return layout;
- }
-
- public void createControl(Composite parent){
- super.createControl(parent);
- getDefaultsButton().setText(Messages.Revert);
- }
-
- public void refreshProblemsView(){
- setErrorMessage(null);
- setMessage(null);
- setValid(true);
- fillProblemsViewComposite();
- }
-
- private Image getProblemImage(IStatus element) {
- final ISharedImages sharedImages = PlatformUI.getWorkbench().getSharedImages();
- final String imageType;
-
- if(element.getSeverity() == IStatus.ERROR) {
- imageType = ISharedImages.IMG_OBJS_ERROR_TSK;
- }
- else {
- imageType = ISharedImages.IMG_OBJS_WARN_TSK;
- }
- return sharedImages.getImage( imageType );
- }
-
- protected IStatus[] getProblemElements() {
- final List<IStatus> errors = new ArrayList<IStatus>();
- final List<IStatus> warnings = new ArrayList<IStatus>();
-
- for (int i = 0; i < controls.length; i++) {
- if (controls[i] != null) {
- IStatus status = Status.OK_STATUS;
- if(controls[i] instanceof AbstractIModuleDependenciesControl)
- status = ((AbstractIModuleDependenciesControl) controls[i]).validate();
- if(status != null) {
- if (status.isMultiStatus()) {
- MultiStatus multi = (MultiStatus)status;
- if (!multi.isOK()) {
- for (int y = 0; y < multi.getChildren().length; y++) {
- IStatus singleStatus = multi.getChildren()[y];
- if(singleStatus.getMessage() != null && singleStatus.getMessage().trim().length() > 0) {
- if(multi.getChildren()[y].getSeverity() == IStatus.ERROR) {
- errors.add(multi.getChildren()[y]);
- } else {
- warnings.add(multi.getChildren()[y]);
- }
- }
- }
- }
- } else if (!status.isOK()) {
- if(status.getMessage() != null && status.getMessage().trim().length() > 0) {
- if(status.getSeverity() == IStatus.ERROR) {
- errors.add(status);
- } else {
- warnings.add(status);
- }
- }
- }
- }
- }
- }
- if(errors.size() > 0) {
- setValid(false);
- errors.addAll(warnings);
- // This returns all the errors followed by all the warnings
- return errors.toArray(new IStatus[errors.size()]);
- }
- return warnings.toArray(new IStatus[warnings.size()]);
- }
-}
diff --git a/plugins/org.eclipse.wst.validation.ui/.classpath b/plugins/org.eclipse.wst.validation.ui/.classpath
deleted file mode 100644
index 7acdda6..0000000
--- a/plugins/org.eclipse.wst.validation.ui/.classpath
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="validateui"/>
- <classpathentry kind="src" path="property_files"/>
- <classpathentry kind="src" path="vf2"/>
- <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/plugins/org.eclipse.wst.validation.ui/.cvsignore b/plugins/org.eclipse.wst.validation.ui/.cvsignore
deleted file mode 100644
index b39f8f4..0000000
--- a/plugins/org.eclipse.wst.validation.ui/.cvsignore
+++ /dev/null
@@ -1,7 +0,0 @@
-bin
-temp.folder
-build.xml
-runtime
-@dot
-src.zip
-javaCompiler...args
diff --git a/plugins/org.eclipse.wst.validation.ui/.project b/plugins/org.eclipse.wst.validation.ui/.project
deleted file mode 100644
index 32471f6..0000000
--- a/plugins/org.eclipse.wst.validation.ui/.project
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.wst.validation.ui</name>
- <comment></comment>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.jdt.core.javanature</nature>
- <nature>org.eclipse.pde.PluginNature</nature>
- </natures>
-</projectDescription>
diff --git a/plugins/org.eclipse.wst.validation.ui/.settings/org.eclipse.core.resources.prefs b/plugins/org.eclipse.wst.validation.ui/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index 9306ade..0000000
--- a/plugins/org.eclipse.wst.validation.ui/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Mon May 08 09:24:56 EDT 2006
-eclipse.preferences.version=1
-encoding/<project>=ISO-8859-1
diff --git a/plugins/org.eclipse.wst.validation.ui/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.wst.validation.ui/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 7f1fe24..0000000
--- a/plugins/org.eclipse.wst.validation.ui/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,71 +0,0 @@
-#Tue Feb 12 12:30:46 EST 2008
-eclipse.preferences.version=1
-org.eclipse.jdt.core.codeComplete.argumentPrefixes=
-org.eclipse.jdt.core.codeComplete.argumentSuffixes=
-org.eclipse.jdt.core.codeComplete.fieldPrefixes=_
-org.eclipse.jdt.core.codeComplete.fieldSuffixes=
-org.eclipse.jdt.core.codeComplete.localPrefixes=
-org.eclipse.jdt.core.codeComplete.localSuffixes=
-org.eclipse.jdt.core.codeComplete.staticFieldPrefixes=_
-org.eclipse.jdt.core.codeComplete.staticFieldSuffixes=
-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.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.deprecation=ignore
-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=disabled
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-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=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.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=warning
-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=ignore
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=ignore
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=error
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=error
-org.eclipse.jdt.core.compiler.problem.unusedLabel=error
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.5
diff --git a/plugins/org.eclipse.wst.validation.ui/.settings/org.eclipse.jdt.ui.prefs b/plugins/org.eclipse.wst.validation.ui/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index 4638d6c..0000000
--- a/plugins/org.eclipse.wst.validation.ui/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,6 +0,0 @@
-#Tue Feb 12 12:30:46 EST 2008
-eclipse.preferences.version=1
-org.eclipse.jdt.ui.exception.name=e
-org.eclipse.jdt.ui.gettersetter.use.is=true
-org.eclipse.jdt.ui.keywordthis=false
-org.eclipse.jdt.ui.overrideannotation=true
diff --git a/plugins/org.eclipse.wst.validation.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.wst.validation.ui/META-INF/MANIFEST.MF
deleted file mode 100644
index 36fa555..0000000
--- a/plugins/org.eclipse.wst.validation.ui/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.wst.validation.ui; singleton:=true
-Bundle-Version: 1.2.301.qualifier
-Bundle-Activator: org.eclipse.wst.validation.internal.ui.plugin.ValidationUIPlugin
-Bundle-Vendor: %Bundle-Vendor.0
-Bundle-Localization: plugin
-Export-Package: org.eclipse.wst.validation.internal.ui;x-internal:=true,
- org.eclipse.wst.validation.internal.ui.plugin;x-internal:=true
-Require-Bundle: org.eclipse.ui.ide;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.core.resources;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.ui;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.swt;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.wst.common.frameworks.ui;bundle-version="[1.1.200,2.0.0)",
- org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.wst.common.frameworks;bundle-version="[1.1.200,2.0.0)",
- org.eclipse.wst.validation;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.ui.forms;bundle-version="[3.3.100,4.0.0)",
- org.eclipse.wst.common.project.facet.core;bundle-version="[1.4.102,2.0.0)"
-Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/plugins/org.eclipse.wst.validation.ui/about.html b/plugins/org.eclipse.wst.validation.ui/about.html
deleted file mode 100644
index 2199df3..0000000
--- a/plugins/org.eclipse.wst.validation.ui/about.html
+++ /dev/null
@@ -1,34 +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">
-
-<H3>About This Content</H3>
-
-<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/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>.
-For purposes of the EPL, "Program" will mean the Content.</P>
-
-<P>If you did not receive this Content directly from the Eclipse Foundation, the
-Content is being redistributed by another party ("Redistributor") and different
-terms and conditions may apply to your use of any object code in the Content.
-Check the RedistributorÂ’s license that was provided with the Content. If no such
-license exists, contact the Redistributor. Unless otherwise indicated below, the
-terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at
-<A href="http://www.eclipse.org/">http://www.eclipse.org/</A>.</P>
-
-</BODY>
-</HTML>
diff --git a/plugins/org.eclipse.wst.validation.ui/build.properties b/plugins/org.eclipse.wst.validation.ui/build.properties
deleted file mode 100644
index 1749ccd..0000000
--- a/plugins/org.eclipse.wst.validation.ui/build.properties
+++ /dev/null
@@ -1,20 +0,0 @@
-###############################################################################
-# Copyright (c) 2001, 2007 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-bin.includes = .,\
- plugin.xml,\
- META-INF/,\
- about.html,\
- icons/,\
- plugin.properties
-source.. = validateui/,\
- property_files/,\
- vf2/
-output.. = bin/
diff --git a/plugins/org.eclipse.wst.validation.ui/icons/fail_tbl.gif b/plugins/org.eclipse.wst.validation.ui/icons/fail_tbl.gif
deleted file mode 100644
index 9bd9b0c..0000000
--- a/plugins/org.eclipse.wst.validation.ui/icons/fail_tbl.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.wst.validation.ui/icons/fail_tbl_disabled.gif b/plugins/org.eclipse.wst.validation.ui/icons/fail_tbl_disabled.gif
deleted file mode 100644
index 91333a1..0000000
--- a/plugins/org.eclipse.wst.validation.ui/icons/fail_tbl_disabled.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.wst.validation.ui/icons/ok_tbl.gif b/plugins/org.eclipse.wst.validation.ui/icons/ok_tbl.gif
deleted file mode 100644
index 9cacb96..0000000
--- a/plugins/org.eclipse.wst.validation.ui/icons/ok_tbl.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.wst.validation.ui/icons/ok_tbl_disabled.gif b/plugins/org.eclipse.wst.validation.ui/icons/ok_tbl_disabled.gif
deleted file mode 100644
index 1d8900b..0000000
--- a/plugins/org.eclipse.wst.validation.ui/icons/ok_tbl_disabled.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.wst.validation.ui/icons/settings.gif b/plugins/org.eclipse.wst.validation.ui/icons/settings.gif
deleted file mode 100644
index 9c99aad..0000000
--- a/plugins/org.eclipse.wst.validation.ui/icons/settings.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.wst.validation.ui/icons/settings_disabled.gif b/plugins/org.eclipse.wst.validation.ui/icons/settings_disabled.gif
deleted file mode 100644
index 09166da..0000000
--- a/plugins/org.eclipse.wst.validation.ui/icons/settings_disabled.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.wst.validation.ui/plugin.properties b/plugins/org.eclipse.wst.validation.ui/plugin.properties
deleted file mode 100644
index 887dfc0..0000000
--- a/plugins/org.eclipse.wst.validation.ui/plugin.properties
+++ /dev/null
@@ -1,19 +0,0 @@
-###############################################################################
-# Copyright (c) 2001, 2009 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-#
-# Version 1.3
-#
-VBF_TITLE_PROPERTIES=Validation
-VBF_UI_POPUP_RUNVALIDATION=&Validate
-VBF_TITLE_PREFERENCE=Validation
-
-Bundle-Name.0 = Validation Framework UI
-Bundle-Vendor.0 = Eclipse Web Tools Platform
diff --git a/plugins/org.eclipse.wst.validation.ui/plugin.xml b/plugins/org.eclipse.wst.validation.ui/plugin.xml
deleted file mode 100644
index 20502a4..0000000
--- a/plugins/org.eclipse.wst.validation.ui/plugin.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin>
-
-
-<!-- ============================================== -->
-<!-- Popup Contributions -->
-<!-- ============================================== -->
-<!-- By saying "adaptable=true", this item will appear on both IProject and IJavaProject -->
- <extension
- point="org.eclipse.ui.popupMenus">
- <objectContribution
- adaptable="true"
- objectClass="org.eclipse.core.resources.IResource"
- id="ValidationMenuAction">
- <action
- label="%VBF_UI_POPUP_RUNVALIDATION"
- class="org.eclipse.wst.validation.internal.ui.ValidationMenuAction"
- menubarPath="additions"
- enablesFor="+"
- id="ValidationAction">
- </action>
- </objectContribution>
- </extension>
-
-
-<!-- ====================================================== -->
-<!-- Validation preference page -->
-<!-- ====================================================== -->
- <extension
- point="org.eclipse.ui.preferencePages">
- <page
- name="%VBF_TITLE_PREFERENCE"
- class="org.eclipse.wst.validation.ui.internal.preferences.ValidationPreferencePage"
- id="ValidationPreferencePage">
- </page>
- </extension>
-
-<!-- ====================================================== -->
-<!-- Validation properties page -->
-<!-- ====================================================== -->
-<!-- By saying "adaptable=true", this item will appear on both IProject and IJavaProject -->
- <extension
- point="org.eclipse.ui.propertyPages">
- <page
- name="%VBF_TITLE_PROPERTIES"
- class="org.eclipse.wst.validation.ui.internal.preferences.ValidationPropertyPage"
- id="ValidationPropertiesPage">
- <enabledWhen>
- <adapt type="org.eclipse.core.resources.IProject"/>
- </enabledWhen>
- </page>
- </extension>
-
-</plugin>
diff --git a/plugins/org.eclipse.wst.validation.ui/property_files/org/eclipse/wst/validation/internal/ui/validationui.properties b/plugins/org.eclipse.wst.validation.ui/property_files/org/eclipse/wst/validation/internal/ui/validationui.properties
deleted file mode 100644
index 4db102d..0000000
--- a/plugins/org.eclipse.wst.validation.ui/property_files/org/eclipse/wst/validation/internal/ui/validationui.properties
+++ /dev/null
@@ -1,39 +0,0 @@
-###############################################################################
-# Copyright (c) 2008 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-
-SaveFilesDialog_saving=Saving Resources
-SaveFilesDialog_always_save=&Always save all modified resources automatically prior to validating
-SaveFilesDialog_save_all_resources=Save All Modified Resources
-SaveFilesDialog_must_save=All modified resources must be saved before this operation.
-
-PrefPage_always_save=&Save all modified resources automatically prior to validating
-
-RunValidationDialogTitle=Running Validation
-UnableToSave=Unable to set save automatically preference in save files for validation dialog:
-Validate=Validate
-
-ValResults=Validation Results
-
-ValError1Resource1=The validation completed, one error was discovered. One resource was validated in {0}.
-ValErrorsResource1=The validation completed, {0} errors were discovered. One resource was validated in {1}.
-ValWarn1Resource1=The validation completed with one warning. One resource was validated in {0}.
-ValWarnResource1=The validation completed with {0} warnings. One resource was validated in {1}.
-ValInfo1Resource1=The validation completed with one informational message. One resource was validated in {0}.
-ValInfoResource1=The validation completed with {0} informational messages. One resource was validated in {1}.
-
-ValError1Resources=The validation completed, one error was discovered. {0} resources were validated in {1}.
-ValErrorsResources=The validation completed, {0} errors were discovered. {1} resources were validated in {2}.
-ValWarn1Resources=The validation completed with one warning. {0} resources were validated in {1}.
-ValWarnResources=The validation completed with {0} warnings. {1} resources were validated in {2}.
-ValInfo1Resources=The validation completed with one informational message. {0} resources were validated in {1}.
-ValInfoResources=The validation completed with {0} informational messages. {1} resources were validated in {2}.
-
-ValSuccess=The validation completed with no errors or warnings.
diff --git a/plugins/org.eclipse.wst.validation.ui/property_files/org/eclipse/wst/validation/ui/internal/messages.properties b/plugins/org.eclipse.wst.validation.ui/property_files/org/eclipse/wst/validation/ui/internal/messages.properties
deleted file mode 100644
index dd25b6e..0000000
--- a/plugins/org.eclipse.wst.validation.ui/property_files/org/eclipse/wst/validation/ui/internal/messages.properties
+++ /dev/null
@@ -1,162 +0,0 @@
-###############################################################################
-# Copyright (c) 2001, 2009 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-# *************************************************************************
-# * Code oriented instructions:
-# *
-# * In the string, you may see the following special sequences:
-# * a) {n} where n is a number. These are replaceable parameters.
-# * b) '' In .properties files, in order to see one apostrophe (') in the final
-# * string, sometimes two apostrophes must be entered in the string. In the translated
-# * string, if there is at least one {n} in the string, then to show one apostrophe
-# * to the user, put two apostrophes in the string. If there are no {n} in the string,
-# * then put one apostrophe.
-# * For example, say that you want the user to read "George's file".
-# * GEORGE=George's file was on the desk.
-# * GEORGE2=George''s file and {0} were on the desk.
-# * GEORGE uses one apostrophe because there are no {n} and GEORGE2
-# * uses two apostrophes because there is a {n}.
-# * c) '' text '' where text can be any word(s). The text between the double
-# * apostrophes should not be translated.
-# * d) <text> where text can be any word(s). The text between the angle
-# * brackets should NOT be translated.
-# * e) "text" where text can be any word(s). The text between the quotation
-# * marks should NOT be translated.
-# *
-# *************************************************************************
-# * Other instructions
-# * a) Do not translate any text that is on a line which begins with a comment
-# * symbol (#).
-# * b) Do not translate these words:
-# * schema, EJB, RDB, JAR, RMI, BMP, CMP, OOSQL
-# * c) Please return the .properties files using the same directory structure.
-# * This is necessary because two of the files have the same name.
-# *
-# *************************************************************************
-# Any other comments to the translators are on lines which start like this: # 2TC:
-#
-# Version 1.12
-#
-#
-# ID:
-# VBF - Validation Builder Framework
-#
-
-#
-# Begin Validation Builder Framework UI Strings
-#
-# IDs:
-# VBF_EXC=Exception or error text
-# VBF_UI=UI label
-#
-PREF_BUTTON_OVERRIDE=Allow projects to &override these preference settings
-PREF_BUTTON_ENABLEALL=E&nable All
-PREF_BUTTON_DISABLEALL=D&isable All
-PREF_VALLIST_TITLE=The selected &validators will run when validation is performed:
-PREF_MNU_MANUAL=&Manual
-PREF_MNU_BUILD=&Build
-PREF_MNU_SETTINGS=&Settings...
-
-VBF_EXC_INTERNAL_TITLE=Internal error
-VBF_EXC_INTERNAL_PAGE=An unexpected error occurred; click Cancel to close the wizard.
-
-VBF_EXC_INVALID_REGISTER=Validators can run only on open resources.
-ProjectOverridesNotAllowed=The workspace validation preferences do not allow projects to override the workspace settings. In order to allow project settings you need to configure the workspace settings to allow project overrides.
-
-VBF_UI_NO_VALIDATORS_INSTALLED=No validators are installed.
-
-DISABLE_VALIDATION=S&uspend all validators
-
-DelegatesDialogTitle=Validator Preferences
-DelegatesComboLabel=Im&plementation:
-ADD_VALIDATION_BUILDER=Add Validation &Builder to project
-ConfigWsSettings=Configure Workspace Settings...
-VALIDATOR=Validator
-MANUAL=Manual
-BUILD=Build
-SETTINGS=Settings
-
-SaveFilesDialog_saving=Saving Resources
-SaveFilesDialog_always_save=&Always save all modified resources automatically prior to validating
-SaveFilesDialog_save_all_resources=Save All Modified Resources
-SaveFilesDialog_must_save=All modified resources must be saved before this operation.
-
-PrefPage_always_save=&Save all modified resources automatically prior to validating
-PrefPageConfirmDialog=Show a &confirmation dialog when performing manual validations
-
-RunValidationDialogTitle=Running Validation
-
-fdTitle=Validation Filters for {0}
-fdNoFilters=The validator does not have currently have any filters installed.
-ErrConfig=Extension configuration error. An internal error has happened, the validator {0} has incorrectly configured the validation extension point.
-
-FilterHelp=Filter rules are grouped into groups. Inside of any one group the rules are combined by using the logical OR operator. There are two types of groups Include and Exclude. If any of the rules in the Exclude group match, the resource is not validated. If there are Include groups, at least one rule from each group must match before the resource is validated.
-ButtonAddGroupInclude=Add &Include Group...
-ButtonAddGroupExclude=Add &Exclude Group...
-ButtonAddRule=Add R&ule...
-ButtonRemove=&Remove
-
-LabelEnableProjectSpecific=Enable pr&oject specific settings
-
-LabelExtension=File &extension
-LabelFile=F&older or file name
-LabelProjects=Project &nature
-LabelFacets=&Facet
-LabelContentType=&Content Type
-LabelTargetRuntime=&Target Runtime
-
-# Note to translators, keep the <A> and </A> tags exactly as they are
-DoNotShowResults=Do not show this dialog in the future.
-
-DescExtension=File extension, for example "html" for HTML files.
-DescFile=Either a folder, a relative file, or a fully qualified file name.
-DescProjects=A project nature.
-DescFacets=A facet.
-DescContentType=A content type, for example the XML content type.
-DescTargetRuntime=A target runtime.
-
-ErrorsWarnings=Errors/Warnings
-
-Validation=Validating
-ValidationStatus=Validation Status
-
-ErrSummary=Validation results. Errors={0}, Warnings={1}, Information={2}
-ValidationSuccessful=Validation was successful
-
-FrWizard=New Filter Rule Wizard
-FrSelectFilterType=Select Filter Type
-FrFileExtension=File Extension
-FrFileExtensionLabel=File &extension, for example html:
-FrCaseSensitive=Is the comparison case &sensitive?
-FrExactMatch=Check this if the content type needs to &match exactly. Do not check it, if sub types need to match as well.
-FrSimpleFileName=For file based &comparisons, use only the simple file name.
-FrFolderOrFile=Folder or File Name
-FrFolderOrFileLabel=Fil&e or folder:
-FrBrowseFile=Browse &File...
-FrFileFilter=Select the file that will serve as the filter
-FrBrowseFolder=Browse F&older...
-FrFolderFilter=Select the folder that will serve as the filter
-FrProjectNature=Project Nature
-FrProjectNatureLabel=Project &nature:
-FrFacit=Facet
-FrFacitLabel=&Facet id:
-FrNewFacitLabel=&Facet:
-FrContentType=Content Type
-FrContentTypeLabel=&Content Type:
-FrMsgSev=Select the severity level for the following problems
-FrTargetRuntimeLabel=Target Runtime
-
-RebuildTitle=Validation Settings Changed
-RebuildMsg=The validation settings have changed. A full rebuild is required for the changes to take effect. Do the full build now?
-
-#
-# End Validation Builder Framework UI Strings
-#
-
diff --git a/plugins/org.eclipse.wst.validation.ui/validateui/org/eclipse/wst/validation/internal/ui/ContextIds.java b/plugins/org.eclipse.wst.validation.ui/validateui/org/eclipse/wst/validation/internal/ui/ContextIds.java
deleted file mode 100644
index d8ce485..0000000
--- a/plugins/org.eclipse.wst.validation.ui/validateui/org/eclipse/wst/validation/internal/ui/ContextIds.java
+++ /dev/null
@@ -1,46 +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
- *******************************************************************************/
-package org.eclipse.wst.validation.internal.ui;
-
-import org.eclipse.wst.common.frameworks.internal.ui.WTPUIPlugin;
-
-public interface ContextIds {
- static final String PREFIX = WTPUIPlugin.PLUGIN_ID;
-
- // context ids for the Validation Properties Page
- public static final String VALIDATION_PROPERTIES_PAGE = PREFIX + ".jvpp0000"; //$NON-NLS-1$
- public static final String VALIDATION_PROPERTIES_PAGE_DISABLED_OVERRIDE = PREFIX + ".jvpp0001"; //$NON-NLS-1$
- public static final String VALIDATION_PROPERTIES_PAGE_DISABLED_BUILD_NOVALSELECTED = PREFIX + ".jvpp0003"; //$NON-NLS-1$
- public static final String VALIDATION_PROPERTIES_PAGE_DISABLED_AUTO_AUTOBUILD = PREFIX + ".jvpp0004"; //$NON-NLS-1$
- public static final String VALIDATION_PROPERTIES_PAGE_DISABLED_AUTO_NOINCVALSELECTED = PREFIX + ".jvpp0005"; //$NON-NLS-1$
- public static final String VALIDATION_PROPERTIES_PAGE_DISABLED_AUTO_NOINCVALCONFIG = PREFIX + ".jvpp0006"; //$NON-NLS-1$
- public static final String VALIDATION_PROPERTIES_PAGE_AUTO_ENABLED = PREFIX + ".jvpp0020"; //$NON-NLS-1$
- public static final String VALIDATION_PROPERTIES_PAGE_OVERRIDE_ENABLED = PREFIX + ".jvpp0030"; //$NON-NLS-1$
- public static final String VALIDATION_PROPERTIES_PAGE_OVERRIDE_ENABLED_CANNOT_HONOUR_BOTH = PREFIX + ".jvpp0031"; //$NON-NLS-1$
- public static final String VALIDATION_PROPERTIES_PAGE_OVERRIDE_ENABLED_CANNOT_HONOUR_AUTO = PREFIX + ".jvpp0032"; //$NON-NLS-1$
- public static final String VALIDATION_PROPERTIES_PAGE_OVERRIDE_ENABLED_CANNOT_HONOUR_MANUAL = PREFIX + ".jvpp0033"; //$NON-NLS-1$
- public static final String VALIDATION_PROPERTIES_PAGE_REBUILD_ENABLED = PREFIX + ".jvpp0040"; //$NON-NLS-1$
- public static final String VALIDATION_PROPERTIES_PAGE_MAX_MESSAGES = PREFIX + ".jvpp0050"; //$NON-NLS-1$
-
- public static final String VALIDATION_PREFERENCE_PAGE = PREFIX + ".jvgp0000"; //$NON-NLS-1$
- public static final String VALIDATION_PREFERENCE_PAGE_OVERRIDE = PREFIX + ".jvgp0005"; //$NON-NLS-1$
- public static final String VALIDATION_PREFERENCE_PAGE_DISABLE_ALL_ENABLED = PREFIX + ".jvgp0010"; //$NON-NLS-1$
- // public static final String VALIDATION_PREFERENCE_PAGE_REBUILD_DISABLED = PREFIX +
- // ".jvgp0011"; //$NON-NLS-1$
- public static final String VALIDATION_PREFERENCE_PAGE_AUTO_ENABLED = PREFIX + ".jvgp0020"; //$NON-NLS-1$
- // public static final String VALIDATION_PREFERENCE_PAGE_AUTO_DISABLED_AUTOBUILD = PREFIX +
- // ".jvgp0021"; //$NON-NLS-1$
- // public static final String VALIDATION_PREFERENCE_PAGE_AUTO_DISABLED_NOINCVALSELECTED = PREFIX
- // + ".jvgp0022"; //$NON-NLS-1$
- // public static final String VALIDATION_PREFERENCE_PAGE_AUTO_DISABLED_NOINCVALCONFIG = PREFIX +
- // ".jvgp0023"; //$NON-NLS-1$
- public static final String VALIDATION_PREFERENCE_PAGE_MAX_MESSAGES = PREFIX + ".jvgp0030"; //$NON-NLS-1$
-}
diff --git a/plugins/org.eclipse.wst.validation.ui/validateui/org/eclipse/wst/validation/internal/ui/DelegatingValidatorPreferencesDialog.java b/plugins/org.eclipse.wst.validation.ui/validateui/org/eclipse/wst/validation/internal/ui/DelegatingValidatorPreferencesDialog.java
deleted file mode 100644
index e00900a..0000000
--- a/plugins/org.eclipse.wst.validation.ui/validateui/org/eclipse/wst/validation/internal/ui/DelegatingValidatorPreferencesDialog.java
+++ /dev/null
@@ -1,270 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- * David Schneider, david.schneider@unisys.com - [142500] WTP properties pages fonts don't follow Eclipse preferences
- *******************************************************************************/
-
-package org.eclipse.wst.validation.internal.ui;
-
-import java.util.Map;
-
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.resource.JFaceResources;
-import org.eclipse.jface.viewers.ComboViewer;
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.jface.viewers.ILabelProviderListener;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.viewers.Viewer;
-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.Combo;
-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.wst.validation.internal.ValidatorMetaData;
-import org.eclipse.wst.validation.internal.delegates.ValidatorDelegateDescriptor;
-import org.eclipse.wst.validation.internal.delegates.ValidatorDelegatesRegistry;
-import org.eclipse.wst.validation.ui.internal.ValUIMessages;
-
-/**
- * Dialog used to allow the user to select a validator delegate from the list of
- * registered delegates for a given delegating validator.
- */
-public class DelegatingValidatorPreferencesDialog extends Dialog
-{
- /**
- * The delegating validator's descriptor.
- */
- private ValidatorMetaData delegatingValidatorDescriptor;
-
- /**
- * The selected validator delegate ID.
- */
- private String delegateID;
-
- /**
- * Constructs the dialog on the given shell.
- *
- * @param parentShell
- * the dialog's parent. Must not be null.
- * @param targetID
- * the delegating validator's id
- *
- * @param delegateID
- * the ID of the currently selected validator delegate.
- */
- public DelegatingValidatorPreferencesDialog(Shell parentShell, ValidatorMetaData vmd, String delegateID)
- {
- super(parentShell);
-
- delegatingValidatorDescriptor = vmd;
- this.delegateID = delegateID;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.dialogs.Dialog#createDialogArea(org.eclipse.swt.widgets.Composite)
- */
- protected Control createDialogArea(Composite parent)
- {
- super.createDialogArea(parent);
-
- getShell().setText(ValUIMessages.DelegatesDialogTitle);
-
- GridLayout layout = new GridLayout();
- parent.setLayout(layout);
-
- Label label = new Label(parent, SWT.NONE);
- GridData labelData = new GridData(SWT.FILL, SWT.CENTER, true, false);
- labelData.widthHint = 250;
- label.setLayoutData(labelData);
- label.setFont(JFaceResources.getFontRegistry().getBold(JFaceResources.DIALOG_FONT));
- String delegatingValidatorName = delegatingValidatorDescriptor.getValidatorDisplayName();
- label.setText(delegatingValidatorName);
-
- Label separator = new Label(parent, SWT.SEPARATOR | SWT.HORIZONTAL);
- GridData separatorData = new GridData(SWT.FILL, SWT.CENTER, true, false);
- separator.setLayoutData(separatorData);
-
- Composite group = new Composite(parent, SWT.NONE);
- GridData groupGridData = new GridData(SWT.FILL, SWT.CENTER, true, false);
- group.setLayoutData(groupGridData);
- GridLayout groupLayout = new GridLayout(2, false);
- group.setLayout(groupLayout);
-
- Label comboLabel = new Label(group, SWT.NONE);
- comboLabel.setLayoutData(new GridData());
- comboLabel.setText(ValUIMessages.DelegatesComboLabel);
-
- Combo combo = new Combo(group, SWT.READ_ONLY);
- GridData comboGridData = new GridData(SWT.FILL, SWT.CENTER, true, false);
- combo.setLayoutData(comboGridData);
-
- final ComboViewer comboViewer = new ComboViewer(combo);
- comboViewer.setContentProvider(new DelegatesContentProvider());
- comboViewer.setLabelProvider(new DelegatesLabelProvider());
- String targetID = delegatingValidatorDescriptor.getValidatorUniqueName();
-
- comboViewer.addSelectionChangedListener(new ISelectionChangedListener()
- {
-
- public void selectionChanged(org.eclipse.jface.viewers.SelectionChangedEvent event)
- {
- IStructuredSelection selection = (IStructuredSelection) comboViewer.getSelection();
- setDelegateID(((ValidatorDelegateDescriptor) selection.getFirstElement()).getId());
- }
- });
-
- comboViewer.setInput(targetID);
-
- ValidatorDelegateDescriptor selected = ValidatorDelegatesRegistry.getInstance().getDescriptor(targetID, delegateID);
-
- if (selected != null)
- {
- comboViewer.setSelection(new StructuredSelection(new Object[] { selected }));
- }
-
- Label endSeparator = new Label(parent, SWT.SEPARATOR | SWT.HORIZONTAL);
- GridData endSeparatorData = new GridData(SWT.FILL, SWT.CENTER, true, false);
- endSeparator.setLayoutData(endSeparatorData);
- Dialog.applyDialogFont(parent);
-
- return parent;
- }
-
- /**
- * Provides contents for the delegate validators combo box.
- */
- private final class DelegatesContentProvider implements IStructuredContentProvider
- {
- public void dispose()
- {
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.IStructuredContentProvider#getElements(java.lang.Object)
- */
- public Object[] getElements(Object inputElement)
- {
- String targetID = (String) inputElement;
- Map delegatesByID = ValidatorDelegatesRegistry.getInstance().getDelegateDescriptors(targetID);
-
- if (delegatesByID == null)
- {
- return new Object[] {};
- }
-
- return delegatesByID.values().toArray();
- }
-
- /*
- * (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)
- {
- }
- }
-
- /**
- * Provides the labels/images for the delegate validator combo box
- *
- * @author vbaciul
- *
- */
- private final class DelegatesLabelProvider implements ILabelProvider
- {
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.IBaseLabelProvider#addListener(org.eclipse.jface.viewers.ILabelProviderListener)
- */
- public void addListener(ILabelProviderListener listener)
- {
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.IBaseLabelProvider#dispose()
- */
- public void dispose()
- {
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.ILabelProvider#getImage(java.lang.Object)
- */
- public Image getImage(Object element)
- {
- return null;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.ILabelProvider#getText(java.lang.Object)
- */
- public String getText(Object element)
- {
- return ((ValidatorDelegateDescriptor) element).getName();
- }
-
- /*
- * (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)
- {
- }
- }
-
- /*
- * Provides the ID of the currently selected validator delegate ID.
- */
- public String getDelegateID()
- {
- return delegateID;
- }
-
- /**
- * Sets the currently selected validator delegate ID.
- *
- * @param delegateID
- */
- private void setDelegateID(String delegateID)
- {
- this.delegateID = delegateID;
- }
-}
diff --git a/plugins/org.eclipse.wst.validation.ui/validateui/org/eclipse/wst/validation/internal/ui/ListContentProvider.java b/plugins/org.eclipse.wst.validation.ui/validateui/org/eclipse/wst/validation/internal/ui/ListContentProvider.java
deleted file mode 100644
index 90b6d02..0000000
--- a/plugins/org.eclipse.wst.validation.ui/validateui/org/eclipse/wst/validation/internal/ui/ListContentProvider.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.validation.internal.ui;
-
-import java.util.List;
-
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.jface.viewers.Viewer;
-
-/**
- * A specialized content provider to show a list of editor parts.
- * This class has been copied from org.eclipse.jdt.internal.ui.viewsupport.ListContentProvider
- * This class should be removed once a generic solution is made available.
- */
-public class ListContentProvider implements IStructuredContentProvider {
- List fContents;
-
- public ListContentProvider() {
- }
-
- public Object[] getElements(Object input) {
- if (fContents != null && fContents == input)
- return fContents.toArray();
- return new Object[0];
- }
-
- public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
- if (newInput instanceof List)
- fContents= (List)newInput;
- else
- fContents= null;
- // we use a fixed set.
- }
-
- public void dispose() {
- }
-
- public boolean isDeleted(Object o) {
- return fContents != null && !fContents.contains(o);
- }
-}
diff --git a/plugins/org.eclipse.wst.validation.ui/validateui/org/eclipse/wst/validation/internal/ui/SaveFilesDialog.java b/plugins/org.eclipse.wst.validation.ui/validateui/org/eclipse/wst/validation/internal/ui/SaveFilesDialog.java
deleted file mode 100644
index 2deb872..0000000
--- a/plugins/org.eclipse.wst.validation.ui/validateui/org/eclipse/wst/validation/internal/ui/SaveFilesDialog.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM - Initial API and implementation
- * /
- *******************************************************************************/
-package org.eclipse.wst.validation.internal.ui;
-
-import java.lang.reflect.InvocationTargetException;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.jface.viewers.LabelProvider;
-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.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.dialogs.ListDialog;
-import org.eclipse.wst.validation.internal.ConfigurationManager;
-import org.eclipse.wst.validation.internal.GlobalConfiguration;
-import org.eclipse.wst.validation.internal.ui.plugin.ValidationUIPlugin;
-
-/**
- * A generic save files dialog. The bulk of the code
- * for this dialog was taken from the JDT refactoring
- * support in org.eclipse.jdt.internal.ui.refactoring.RefactoringSaveHelper.
- * This class is a good candidate for reuse amoung components.
- */
-public class SaveFilesDialog extends ListDialog {
-
- public SaveFilesDialog(Shell parent)
- {
- super(parent);
- setTitle(ValidationUIMessages.SaveFilesDialog_save_all_resources);
- setAddCancelButton(true);
- setLabelProvider(createDialogLabelProvider());
- setMessage(ValidationUIMessages.SaveFilesDialog_must_save);
- setContentProvider(new ListContentProvider());
- }
-
- protected Control createDialogArea(Composite container)
- {
- Composite result= (Composite) super.createDialogArea(container);
- boolean fAllowSaveAlways = true;
- if (fAllowSaveAlways) {
- final Button check= new Button(result, SWT.CHECK);
- check.setText(ValidationUIMessages.SaveFilesDialog_always_save);
- //check.setSelection(RefactoringSavePreferences.getSaveAllEditors());
- check.addSelectionListener(new SelectionAdapter() {
- public void widgetSelected(SelectionEvent e) {
- try
- {
- GlobalConfiguration config = ConfigurationManager.getManager().getGlobalConfiguration();
- config.setSaveAutomatically(check.getSelection());
- config.store();
- }
- catch(InvocationTargetException exc)
- {
- Logger.getLogger(ValidationUIPlugin.getBundleName()).log(Level.WARNING,
- ValidationUIMessages.UnableToSave + exc);
- }
-
- }
- });
- applyDialogFont(result);
- }
- return result;
- }
-
- private ILabelProvider createDialogLabelProvider() {
- return new LabelProvider() {
- public Image getImage(Object element) {
- return ((IEditorPart) element).getTitleImage();
- }
- public String getText(Object element) {
- return ((IEditorPart) element).getTitle();
- }
- };
- }
-}
diff --git a/plugins/org.eclipse.wst.validation.ui/validateui/org/eclipse/wst/validation/internal/ui/SaveFilesHelper.java b/plugins/org.eclipse.wst.validation.ui/validateui/org/eclipse/wst/validation/internal/ui/SaveFilesHelper.java
deleted file mode 100644
index f323332..0000000
--- a/plugins/org.eclipse.wst.validation.ui/validateui/org/eclipse/wst/validation/internal/ui/SaveFilesHelper.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM - Initial API and implementation
- * /
- *******************************************************************************/
-package org.eclipse.wst.validation.internal.ui;
-
-import java.util.HashSet;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Set;
-
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IFileEditorInput;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.PlatformUI;
-
-/**
- * A helper class for the save dirty files dialog.
- */
-public class SaveFilesHelper {
-
- /**
- * Retreive an array of IEditorParts representing all the dirty
- * editors open for the files provided in the list.
- *
- * @param files
- * A list of IFiles.
- * @return
- * An array of IEditorParts containing all the dirty editors for the files in the list.
- */
- public static IEditorPart[] getDirtyEditors(List files) {
- Set<IEditorInput> inputs = new HashSet<IEditorInput>();
- List<IEditorPart> result = new LinkedList<IEditorPart>();
- IWorkbench workbench = PlatformUI.getWorkbench();
- IWorkbenchWindow[] windows = workbench.getWorkbenchWindows();
- for (int i = 0; i < windows.length; i++) {
- IWorkbenchPage[] pages = windows[i].getPages();
- for (int x = 0; x < pages.length; x++) {
- IEditorPart[] editors = pages[x].getDirtyEditors();
- for (int z = 0; z < editors.length; z++) {
- IEditorPart ep = editors[z];
- IEditorInput input = ep.getEditorInput();
- if (input instanceof IFileEditorInput) {
- IFileEditorInput fileInput = (IFileEditorInput) input;
- if (files.contains(fileInput.getFile())) {
- if (!inputs.contains(input)) {
- inputs.add(input);
- result.add(ep);
- }
- }
- }
- }
- }
- }
- return result.toArray(new IEditorPart[result.size()]);
- }
-}
diff --git a/plugins/org.eclipse.wst.validation.ui/validateui/org/eclipse/wst/validation/internal/ui/ValidateAction.java b/plugins/org.eclipse.wst.validation.ui/validateui/org/eclipse/wst/validation/internal/ui/ValidateAction.java
deleted file mode 100644
index a04c829..0000000
--- a/plugins/org.eclipse.wst.validation.ui/validateui/org/eclipse/wst/validation/internal/ui/ValidateAction.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.validation.internal.ui;
-
-
-import org.eclipse.core.resources.IResource;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.ui.actions.SelectionListenerAction;
-
-
-public class ValidateAction extends SelectionListenerAction {
- protected ValidationMenuAction delegate;
-
- public ValidateAction() {
- super(ValidationUIMessages.Validate);
- delegate = new ValidationMenuAction();
- }
-
- /**
- * Implementation of method defined on <code>IAction</code>.
- */
- public void run() {
- delegate.run(this);
- }
-
- /**
- * Updates this action in response to the given selection.
- * <p>
- * The <code>SelectionListenerAction</code> implementation of this method returns
- * <code>true</code>. Subclasses may extend to react to selection changes; however, if the
- * super method returns <code>false</code>, the overriding method must also return
- * <code>false</code>.
- * </p>
- *
- * @param selection
- * the new selection
- * @return <code>true</code> if the action should be enabled for this selection, and
- * <code>false</code> otherwise
- */
- protected boolean updateSelection(IStructuredSelection selection) {
- if (!super.updateSelection(selection))
- return false;
-
- delegate.selectionChanged(this, selection);
-
- return isEnabled(); // "Enabled" is set by the delegate.
- }
-
- /**
- * If a subclass of ValidateAction enables this menu action on a type that is not an IResource,
- * this method returns the IResource[] that represent that object. If null is returned, the
- * object will be ignored and the user will not be notified that the object was not validated.
- * This method will be called when updateSelection and run are called. (The result of this
- * method is used to determine which resources will be validated)
- */
- protected IResource[] getResource(Object selected) {
- return null;
- }
-}
diff --git a/plugins/org.eclipse.wst.validation.ui/validateui/org/eclipse/wst/validation/internal/ui/ValidationJob.java b/plugins/org.eclipse.wst.validation.ui/validateui/org/eclipse/wst/validation/internal/ui/ValidationJob.java
deleted file mode 100644
index aa37f64..0000000
--- a/plugins/org.eclipse.wst.validation.ui/validateui/org/eclipse/wst/validation/internal/ui/ValidationJob.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.validation.internal.ui;
-
-import java.util.Map;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.jobs.Job;
-
-public class ValidationJob extends Job {
-
-
- private Map projects;
- public ValidationJob(String name) {
- super(name);
- }
-
-
- public void setProjectsMap(Map projects){
- this.projects = projects;
- }
-
-
- protected IStatus run(IProgressMonitor monitor) {
-
- return null;
- }
-
- protected Map getProjects() {
- return projects;
- }
-}
diff --git a/plugins/org.eclipse.wst.validation.ui/validateui/org/eclipse/wst/validation/internal/ui/ValidationMenuAction.java b/plugins/org.eclipse.wst.validation.ui/validateui/org/eclipse/wst/validation/internal/ui/ValidationMenuAction.java
deleted file mode 100644
index 126c407..0000000
--- a/plugins/org.eclipse.wst.validation.ui/validateui/org/eclipse/wst/validation/internal/ui/ValidationMenuAction.java
+++ /dev/null
@@ -1,393 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.validation.internal.ui;
-
-import java.lang.reflect.InvocationTargetException;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-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.IResourceVisitor;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.SubProgressMonitor;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.dialogs.ProgressMonitorDialog;
-import org.eclipse.jface.operation.IRunnableWithProgress;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.window.Window;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IViewActionDelegate;
-import org.eclipse.ui.IViewPart;
-import org.eclipse.wst.validation.ValidationFramework;
-import org.eclipse.wst.validation.internal.ConfigurationManager;
-import org.eclipse.wst.validation.internal.DisabledResourceManager;
-import org.eclipse.wst.validation.internal.ValType;
-import org.eclipse.wst.validation.internal.ValidationRegistryReader;
-import org.eclipse.wst.validation.internal.ValidationSelectionHandlerRegistryReader;
-import org.eclipse.wst.validation.internal.plugin.ValidationPlugin;
-import org.eclipse.wst.validation.internal.ui.plugin.ValidationUIPlugin;
-import org.eclipse.wst.validation.ui.internal.ManualValidationRunner;
-
-/**
- * This class implements the pop-up menu item "Run Validation" When the item is selected, this
- * action triggers a validation of the project, using all configured, enabled validators.
- */
-public class ValidationMenuAction implements IViewActionDelegate {
- private ISelection _currentSelection;
- protected static final String SEP = "/"; //$NON-NLS-1$
- private Display _currentDisplay;
- private IResourceVisitor _folderVisitor;
- private IResourceVisitor _projectVisitor;
- private Map<IProject, Set<IResource>> _selectedResources;
-
- public ValidationMenuAction() {
- // cache the display before this action is forked. After the action is forked,
- // Display.getCurrent() returns null.
- _currentDisplay = Display.getCurrent();
- _selectedResources = new HashMap<IProject, Set<IResource>>();
- }
-
- private Display getDisplay() {
- return (_currentDisplay == null) ? Display.getCurrent() : _currentDisplay;
- }
-
- /**
- * Return the wizard's shell.
- */
- Shell getShell() {
- Display display = getDisplay();
- Shell shell = (display == null) ? null : display.getActiveShell();
- if (shell == null && display != null) {
- Shell[] shells = display.getShells();
- if (shells.length > 0)
- shell = shells[0];
- }
- return shell;
- }
-
- /**
- * Return a map of the selected elements. Each key of the map is an IProject, and the value is a
- * Set of the selected resources in that project. If a project is selected, and nothing else in
- * the project is selected, a full validation (null value) will be done on the project. If a
- * project is selected, and some files/folders in the project are also selected, only the
- * files/folders will be validated. If a folder is selected, all of its contents are also
- * validated.
- *
- * @return null if there is no selection.
- */
- private Map<IProject, Set<IResource>> loadSelected(ValidateAction action) {
- // GRK previously this did not do a clear, but I couldn't understand why that would be so I am forcing a clear
- // GRK In my testing, not doing a clear caused duplicate validations
- _selectedResources.clear();
- if ((_currentSelection == null) || _currentSelection.isEmpty() ||
- !(_currentSelection instanceof IStructuredSelection))return null;
-
- Object[] elements = ((IStructuredSelection) _currentSelection).toArray();
- for (Object element : elements) {
- if (element != null)addSelected(action, element);
- }
- return _selectedResources;
- }
-
- private void addSelected(ValidateAction action, Object selected) {
- if (selected instanceof IProject) {
- addVisitor((IProject) selected);
- } else if (selected instanceof IFile) {
- addSelected((IFile) selected);
- } else if (selected instanceof IFolder) {
- addVisitor((IFolder) selected);
- } else if (isValidType(getExtendedType(selected))) {
- addSelected(action,getExtendedType(selected));
- } else {
- // Not a valid input type. Must be IProject, IJavaProject, or IResource.
- // If this ValidationMenuAction is a delegate of ValidateAction, is
- // the input type recognized by the ValidateAction?
- boolean valid = false;
- if (action != null) {
- IResource[] resources = action.getResource(selected);
- if (resources != null) {
- valid = true;
- for (int i = 0; i < resources.length; i++) {
- addSelected(action, resources[i]);
- }
- }
- }
- if (!valid) {
- // Stop processing. This allows the "Run Validation" menu item
- // to gray out once an element that can not be validated is selected.
- _selectedResources.clear();
- }
- }
- }
-
- private Object getExtendedType(Object selected) {
- Object result = ValidationSelectionHandlerRegistryReader.getInstance().getExtendedType(selected);
- return result == null ? selected : result;
- }
-
- private boolean isValidType(Object object) {
- return object instanceof IProject || object instanceof IFile || object instanceof IFolder;
- }
-
-
- void addSelected(IResource selected) {
- IProject project = selected.getProject();
- boolean added = _selectedResources.containsKey(project);
- Set<IResource> changedRes = null;
- if (added) {
- // If the value is null, the entire project needs to be validated anyway.
- changedRes = _selectedResources.get(project);
- if (changedRes == null)return;
-
- } else {
- changedRes = new HashSet<IResource>();
- }
- if (changedRes.add(selected)) {
- _selectedResources.put(project, changedRes);
- }
- }
-
- private void addVisitor(IFolder selected) {
- // add the folder and its children
- try {
- selected.accept(getFolderVisitor());
- } catch (CoreException exc) {
- ValidationUIPlugin.getPlugin().handleException(exc);
- return;
- }
- }
-
- private IResourceVisitor getFolderVisitor() {
- if (_folderVisitor == null) {
- _folderVisitor = new IResourceVisitor() {
- public boolean visit(IResource res) {
- if (res instanceof IFile) {
- addSelected(res);
- } else if (res instanceof IFolder) {
- addSelected(res);
- }
- return true; // visit the resource's children
- }
- };
- }
- return _folderVisitor;
- }
-
- private void addVisitor(IProject selected) {
- // add the folder and its children
- if(!selected.isAccessible())return;
- try {
- selected.accept(getProjectVisitor());
- } catch (CoreException exc) {
- ValidationUIPlugin.getPlugin().handleException(exc);
- return;
- }
- }
-
- private IResourceVisitor getProjectVisitor() {
- if (_projectVisitor == null) {
- _projectVisitor = new IResourceVisitor() {
- public boolean visit(IResource res) {
- if (DisabledResourceManager.getDefault().isDisabled(res))return false;
- if (res instanceof IFile)addSelected(res);
- else if (res instanceof IFolder)addSelected(res);
- else if (res instanceof IProject)addSelected(res);
-
- return true;
- }
- };
- }
- return _projectVisitor;
- }
-
- /**
- * The delegating action has been invoked. This method does the actual work.
- *
- * @param action
- * Action proxy that handles the presentation portion of the plug-in action.
- */
- public void run(IAction action) {
- ValidateAction vaction = null;
- if (action instanceof ValidateAction) {
- vaction = (ValidateAction) action;
- }
- final Map<IProject, Set<IResource>> projects = loadSelected(vaction);
- if ((projects == null) || (projects.size() == 0)) {
- return;
- }
-
- // If the files aren't saved do not run validation.
- if(!handleFilesToSave(projects))return;
-
- boolean confirm = org.eclipse.wst.validation.internal.ValManager.getDefault().getGlobalPreferences()
- .getConfirmDialog();
- ManualValidationRunner.validate(projects, ValType.Manual, confirm);
- }
-
- /**
- * Selection in the desktop has changed. Plug-in provider can use it to change the availability
- * of the action or to modify other presentation properties.
- *
- * <p>
- * Action delegate cannot be notified about selection changes before it is loaded. For that
- * reason, control of action's enable state should also be performed through simple XML rules
- * defined for the extension point. These rules allow enable state control before the delegate
- * has been loaded.
- * </p>
- *
- * @param action
- * action proxy that handles presentation portion of the plug-in action
- * @param selection
- * current selection in the desktop
- */
- public void selectionChanged(IAction action, ISelection selection) {
- _currentSelection = selection;
- boolean enabled = quickCheck(selection);
-
- // Don't force the plug-in to be activated just to check this setting.
- if (enabled && ValidationPlugin.isActivated() && ValidationRegistryReader.isActivated()){
- enabled = hasManualValidators(selection);
- }
- action.setEnabled(enabled);
- }
-
- /**
- * Do a quick check on the selection, so see if we know that we don't want to validate the selection.
- *
- * @param selection
- * @return false if we are sure that we don't want to validate it. Return true if we are still not sure.
- */
- private boolean quickCheck(ISelection selection){
- if (selection == null || selection.isEmpty())return false;
- if (selection instanceof IStructuredSelection){
- IStructuredSelection ss = (IStructuredSelection)selection;
- Object sel = ss.getFirstElement();
- if (sel != null){
- if (sel instanceof IProject){
- IProject project = (IProject)sel;
- if (!project.isOpen())return false;
- }
- }
- }
-
- return true;
- }
-
- /**
- * Answer true if any of the selected items have manual validators enabled.
- * @param selection
- */
- private boolean hasManualValidators(ISelection selection){
-
- if (selection instanceof IStructuredSelection){
- IStructuredSelection ss = (IStructuredSelection)selection;
- for (Iterator it = ss.iterator(); it.hasNext();){
- Object sel = it.next();
- if (sel instanceof IResource){
- IResource resource = (IResource)sel;
- if (ValidationFramework.getDefault().hasValidators(resource, true, false))return true;
- }
- }
- }
-
- return false;
-
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.ui.IViewActionDelegate#init(org.eclipse.ui.IViewPart)
- */
- public void init(IViewPart view) {
- }
-
- /**
- * Handle any files that must be saved prior to running
- * validation.
- *
- * @param projects
- * The list of projects that will be validated.
- * @return
- * True if all files have been saved, false otherwise.
- */
- protected boolean handleFilesToSave(Map<IProject, Set<IResource>> projects)
- {
- List fileList = getIFiles(projects);
- final IEditorPart[] dirtyEditors = SaveFilesHelper.getDirtyEditors(fileList);
- if(dirtyEditors == null || dirtyEditors.length == 0)return true;
- boolean saveAutomatically = false;
- try
- {
- saveAutomatically = ConfigurationManager.getManager().getGlobalConfiguration().getSaveAutomatically();
- }
- catch(InvocationTargetException e)
- {
- // In this case simply default to false.
- }
- SaveFilesDialog sfDialog = null;
- if(!saveAutomatically)
- {
- sfDialog = new SaveFilesDialog(ValidationUIPlugin.getPlugin().getWorkbench().getActiveWorkbenchWindow().getShell());
- sfDialog.setInput(Arrays.asList(dirtyEditors));
- }
-
- if(saveAutomatically || sfDialog.open() == Window.OK){
- ProgressMonitorDialog ctx = new ProgressMonitorDialog(getShell());
-
- IRunnableWithProgress runnable = new IRunnableWithProgress(){
- public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException{
- try {
- monitor.beginTask(ValidationUIMessages.SaveFilesDialog_saving, dirtyEditors.length);
- int numDirtyEditors = dirtyEditors.length;
- for(int i = 0; i < numDirtyEditors; i++){
- dirtyEditors[i].doSave(new SubProgressMonitor(monitor, 1));
- }
- } finally {
- monitor.done();
- }
- }
- };
-
- try {
- ctx.run(false, true, runnable);
- return true;
- } catch (InvocationTargetException e) {
- ValidationUIPlugin.getPlugin().handleException(e);
- } catch (InterruptedException e) {
- ValidationUIPlugin.getPlugin().handleException(e);
- }
- }
- return false;
- }
-
- protected List<IFile> getIFiles(Map<IProject, Set<IResource>> projects) {
- List<IFile> fileList = new LinkedList<IFile>();
- for(IProject project : projects.keySet()) {
- for(IResource resource : projects.get(project)) {
- if(resource instanceof IFile)fileList.add((IFile)resource);
- }
- }
- return fileList;
- }
-
-}
diff --git a/plugins/org.eclipse.wst.validation.ui/validateui/org/eclipse/wst/validation/internal/ui/ValidationUIMessages.java b/plugins/org.eclipse.wst.validation.ui/validateui/org/eclipse/wst/validation/internal/ui/ValidationUIMessages.java
deleted file mode 100644
index d6963b3..0000000
--- a/plugins/org.eclipse.wst.validation.ui/validateui/org/eclipse/wst/validation/internal/ui/ValidationUIMessages.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM - Initial API and implementation
- * /
- *******************************************************************************/
-package org.eclipse.wst.validation.internal.ui;
-
-import org.eclipse.osgi.util.NLS;
-
-/**
- * Strings used by Validation UI.
- */
-public class ValidationUIMessages extends NLS {
- private static final String BUNDLE_NAME = "org.eclipse.wst.validation.internal.ui.validationui";//$NON-NLS-1$
-
- public static String SaveFilesDialog_saving;
- public static String SaveFilesDialog_always_save;
- public static String SaveFilesDialog_save_all_resources;
- public static String SaveFilesDialog_must_save;
- public static String PrefPage_always_save;
- public static String RunValidationDialogTitle;
- public static String UnableToSave;
-
- public static String Validate;
-
- public static String ValResults;
-
- // results validating one resource
- public static String ValError1Resource1;
- public static String ValErrorsResource1;
- public static String ValWarn1Resource1;
- public static String ValWarnResource1;
- public static String ValInfo1Resource1;
- public static String ValInfoResource1;
-
- // results validating multiple resources
- public static String ValError1Resources;
- public static String ValErrorsResources;
- public static String ValWarn1Resources;
- public static String ValWarnResources;
- public static String ValInfo1Resources;
- public static String ValInfoResources;
-
- public static String ValSuccess;
-
-
- static {
- // load message values from bundle file
- NLS.initializeMessages(BUNDLE_NAME, ValidationUIMessages.class);
- }
-
- private ValidationUIMessages() {
- // cannot create new instance
- }
-}
diff --git a/plugins/org.eclipse.wst.validation.ui/validateui/org/eclipse/wst/validation/internal/ui/plugin/RunnableWithProgressWrapper.java b/plugins/org.eclipse.wst.validation.ui/validateui/org/eclipse/wst/validation/internal/ui/plugin/RunnableWithProgressWrapper.java
deleted file mode 100644
index 4a8acb8..0000000
--- a/plugins/org.eclipse.wst.validation.ui/validateui/org/eclipse/wst/validation/internal/ui/plugin/RunnableWithProgressWrapper.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.validation.internal.ui.plugin;
-
-import java.lang.reflect.InvocationTargetException;
-
-import org.eclipse.core.resources.IWorkspaceRunnable;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.jface.operation.IRunnableWithProgress;
-import org.eclipse.wst.common.frameworks.internal.operations.IHeadlessRunnableWithProgress;
-import org.eclipse.wst.validation.internal.operations.ValidationOperation;
-
-
-/**
- * This is a wrapper for an IWorkspaceRunnable to the IRunnableWithProgress. This class needs to be
- * used when running the operation from a IRunnableContext.
- *
- * @see IRunnableContext
- * @see ValidationUIPlugin#getRunnableWithProgress Creation date: (5/8/2001 1:28:45 PM)
- * @author: Administrator
- */
-public class RunnableWithProgressWrapper implements IRunnableWithProgress {
- private IHeadlessRunnableWithProgress headlessRunnable = null;
- private IWorkspaceRunnable workspaceRunnable = null;
- private ValidationOperation validationOperation = null;
-
- /**
- * @deprecated Will be removed in Milestone 3. Use
- * RunnableWithProgressWrapper(IWorkspaceRunnable)
- */
- public RunnableWithProgressWrapper(IHeadlessRunnableWithProgress aHeadlessRunnableWithProgress) {
- setHeadlessRunnable(aHeadlessRunnableWithProgress);
- }
-
- public RunnableWithProgressWrapper(IWorkspaceRunnable aHeadlessRunnableWithProgress) {
- setWorkspaceRunnable(aHeadlessRunnableWithProgress);
- }
-
- public RunnableWithProgressWrapper(ValidationOperation op) {
- setValidationOperation(op);
- }
-
- /**
- * @deprecated Will be removed in Milestone 3. Use getWorkspaceRunnable()
- */
- protected IHeadlessRunnableWithProgress getHeadlessRunnable() {
- return headlessRunnable;
- }
-
- protected IWorkspaceRunnable getWorkspaceRunnable() {
- return workspaceRunnable;
- }
-
- /**
- * @see IRunnableWithProgress
- */
- public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {
- try {
- if (getHeadlessRunnable() != null) {
- getHeadlessRunnable().run(monitor);
- } else {
- IWorkspaceRunnable runnable = (getWorkspaceRunnable() == null) ? validationOperation : getWorkspaceRunnable();
- if (runnable == null) {
- return;
- }
- ResourcesPlugin.getWorkspace().run(runnable, monitor);
- }
- } catch (CoreException exc) {
- throw new InvocationTargetException(exc);
- }
- }
-
- /**
- * @deprecated Will be removed in Milestone 3. Use setWorkspaceRunnable(IWorkspaceRunnable)
- */
- protected void setHeadlessRunnable(IHeadlessRunnableWithProgress newHeadlessRunnable) {
- headlessRunnable = newHeadlessRunnable;
- }
-
- protected void setWorkspaceRunnable(IWorkspaceRunnable newWorkspaceRunnable) {
- workspaceRunnable = newWorkspaceRunnable;
- }
-
- protected void setValidationOperation(ValidationOperation op) {
- validationOperation = op;
- }
-}
diff --git a/plugins/org.eclipse.wst.validation.ui/validateui/org/eclipse/wst/validation/internal/ui/plugin/ValidationUIPlugin.java b/plugins/org.eclipse.wst.validation.ui/validateui/org/eclipse/wst/validation/internal/ui/plugin/ValidationUIPlugin.java
deleted file mode 100644
index 3f0496b..0000000
--- a/plugins/org.eclipse.wst.validation.ui/validateui/org/eclipse/wst/validation/internal/ui/plugin/ValidationUIPlugin.java
+++ /dev/null
@@ -1,171 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.validation.internal.ui.plugin;
-
-import java.net.MalformedURLException;
-import java.net.URL;
-
-import org.eclipse.core.resources.IWorkspaceRunnable;
-import org.eclipse.core.runtime.IPath;
-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.jface.operation.IRunnableWithProgress;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.resource.ImageRegistry;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.wst.common.frameworks.internal.ui.WTPUIPlugin;
-import org.eclipse.wst.validation.internal.operations.ValidationOperation;
-import org.osgi.framework.Bundle;
-import org.osgi.framework.BundleContext;
-
-
-
-public class ValidationUIPlugin extends WTPUIPlugin {
- private static ValidationUIPlugin _plugin = null;
-
- public final static String VALIDATION_PROP_FILE_NAME = "validate_ui"; //$NON-NLS-1$
- public static final String VALIDATION_PLUGIN_ID = "org.eclipse.wst.validation.ui"; //$NON-NLS-1$
- public static final String[] ICON_DIRS = new String[]{"icons"}; //$NON-NLS-1$
-
- public ValidationUIPlugin() {
- super();
- if (_plugin == null) {
- _plugin = this;
- }
- }
-
- public static String getBundleName() {
- return VALIDATION_PROP_FILE_NAME;
- }
-
- public static ValidationUIPlugin getPlugin() {
- return _plugin;
- }
-
- /**
- * Returns the translated String found with the given key.
- *
- * @param key
- * java.lang.String
- * @return java.lang.String
- */
- public static String getResourceString(String key) {
- try {
- return Platform.getResourceString(Platform.getBundle(VALIDATION_PLUGIN_ID), key);
- } catch (Exception e) {
- ValidationUIPlugin.getPlugin().handleException(e);
- return key;
- }
- }
-
- /**
- * This method should be called whenever you need to run one of our headless operations in the
- * UI.
- */
- public static IRunnableWithProgress getRunnableWithProgress(IWorkspaceRunnable aWorkspaceRunnable) {
- return new RunnableWithProgressWrapper(aWorkspaceRunnable);
- }
-
-// public static IRunnableWithProgress getRunnableWithProgress(IHeadlessRunnableWithProgress aHeadlessRunnableWithProgress) {
-// return new RunnableWithProgressWrapper(aHeadlessRunnableWithProgress);
-// }
-
- // Need a third, ValidationOperation version of this method, because ValidationOperation
- // is both an IWorkspaceRunnable and an IHeadlessRunnableWithProgress. This method will
- // exist only while IHeadlessRunnableWithProgress exists.
- public static IRunnableWithProgress getRunnableWithProgress(ValidationOperation op) {
- return new RunnableWithProgressWrapper(op);
- }
-
- public void start(BundleContext context) throws Exception {
- super.start(context);
- // org.eclipse.wst.validation.internal.operations.ValidatorManager.setResourceUtilClass(org.eclipse.wst.validation.internal.operations.ui.UIResourceUtil.class);
- }
-
- /**
- * Get a .gif from the image registry.
- */
- public Image getImage(String key) {
- ImageRegistry imageRegistry = getImageRegistry();
- Image image = imageRegistry.get(key);
- if (image == null || image.isDisposed()) {
- ImageDescriptor descriptor = getImageDescriptor(key);
- if (descriptor != null) {
- image = descriptor.createImage();
- imageRegistry.put(key, image);
- }
- }
- return image;
- }
-
- /**
- * This gets a .gif from the icons folder.
- */
- public ImageDescriptor getImageDescriptor(String key) {
- ImageDescriptor imageDescriptor = null;
- URL gifImageURL = getImageURL(key);
- if (gifImageURL != null)
- imageDescriptor = ImageDescriptor.createFromURL(gifImageURL);
- return imageDescriptor;
- }
-
- /**
- * @param key
- * @return
- */
- private URL getImageURL(String key) {
- return ValidationUIPlugin.getImageURL(key, getBundle());
- }
-
- /**
- * This gets a .gif from the icons folder.
- */
- public static URL getImageURL(String key, Bundle bundle) {
- String gif = "/" + key + ".gif"; //$NON-NLS-1$ //$NON-NLS-2$
- IPath path = null;
- for (int i = 0; i < ICON_DIRS.length; i++) {
- path = new Path(ICON_DIRS[i]).append(gif);
- if (Platform.find(bundle,path) == null)
- continue;
- try {
- return new URL( bundle.getEntry("/"), path.toString()); //$NON-NLS-1$
- } catch (MalformedURLException exception) {
- exception.printStackTrace();
- continue;
- }
- }
- return null;
- }
-
-
- public void handleException(Throwable e){
- Status status = new Status(IStatus.ERROR, PLUGIN_ID, e.getLocalizedMessage(), e);
- getLog().log(status);
- }
-
- /**
- * Write a message into the log.
- *
- * We are in the transition of moving to a new approach for localized messages. This is the new
- * approach for exceptions.
- *
- * @param severity message severity, see IStaus
- * @param message a localized message
- */
- public void logMessage(int severity, String message){
- Status status = new Status(severity, PLUGIN_ID, message);
- getLog().log(status);
-
- }
-
-}
diff --git a/plugins/org.eclipse.wst.validation.ui/vf2/org/eclipse/wst/validation/ui/internal/AdapterFactory.java b/plugins/org.eclipse.wst.validation.ui/vf2/org/eclipse/wst/validation/ui/internal/AdapterFactory.java
deleted file mode 100644
index 750c6fd..0000000
--- a/plugins/org.eclipse.wst.validation.ui/vf2/org/eclipse/wst/validation/ui/internal/AdapterFactory.java
+++ /dev/null
@@ -1,116 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.validation.ui.internal;
-
-import org.eclipse.core.runtime.IAdapterFactory;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.ui.model.IWorkbenchAdapter;
-import org.eclipse.wst.validation.Validator;
-import org.eclipse.wst.validation.internal.ValidatorMutable;
-import org.eclipse.wst.validation.internal.model.FilterGroup;
-import org.eclipse.wst.validation.internal.model.FilterRule;
-
-public class AdapterFactory implements IAdapterFactory {
-
- public Object getAdapter(Object adaptableObject, Class adapterType) {
- if (adapterType == IWorkbenchAdapter.class && adaptableObject instanceof Validator.V2)return _valAdaptor;
- if (adapterType == IWorkbenchAdapter.class && adaptableObject instanceof FilterGroup)return _fgAdaptor;
- if (adapterType == IWorkbenchAdapter.class && adaptableObject instanceof FilterRule)return _ruleAdaptor;
- if (adapterType == IWorkbenchAdapter.class && adaptableObject instanceof ValidatorMutable)return _valMutableAdaptor;
-
- return null;
- }
-
- public Class[] getAdapterList() {
- return new Class[] { IWorkbenchAdapter.class };
- }
-
- private IWorkbenchAdapter _valAdaptor = new IWorkbenchAdapter() {
-
- public Object[] getChildren(Object o) {
- return ((Validator.V2) o).getGroups();
- }
-
- public ImageDescriptor getImageDescriptor(Object o) {
- return null;
- }
-
- public String getLabel(Object o) {
- return ((Validator.V2) o).getName();
- }
-
- public Object getParent(Object o) {
- return null;
- }
-
- };
- private IWorkbenchAdapter _valMutableAdaptor = new IWorkbenchAdapter() {
-
- public Object[] getChildren(Object o) {
- return ((ValidatorMutable) o).getGroups();
- }
-
- public ImageDescriptor getImageDescriptor(Object o) {
- return null;
- }
-
- public String getLabel(Object o) {
- return ((ValidatorMutable) o).getName();
- }
-
- public Object getParent(Object o) {
- return null;
- }
-
- };
-
- private IWorkbenchAdapter _fgAdaptor = new IWorkbenchAdapter() {
-
- public Object[] getChildren(Object o) {
- return ((FilterGroup) o).getRules();
- }
-
- public ImageDescriptor getImageDescriptor(Object o) {
- return null;
- }
-
- public String getLabel(Object o) {
- FilterGroup fg = (FilterGroup) o;
- return fg.getDisplayableType();
- }
-
- public Object getParent(Object o) {
- return null;
- }
- };
-
- private IWorkbenchAdapter _ruleAdaptor = new IWorkbenchAdapter() {
-
- public Object[] getChildren(Object o) {
- return new Object[0];
- }
-
- public ImageDescriptor getImageDescriptor(Object o) {
- return null;
- }
-
- public String getLabel(Object o) {
- FilterRule rule = (FilterRule) o;
- return rule.getName();
- }
-
- public Object getParent(Object o) {
- return null;
- }
-
- };
-
-}
diff --git a/plugins/org.eclipse.wst.validation.ui/vf2/org/eclipse/wst/validation/ui/internal/HelpContextIds.java b/plugins/org.eclipse.wst.validation.ui/vf2/org/eclipse/wst/validation/ui/internal/HelpContextIds.java
deleted file mode 100644
index 1af7aeb..0000000
--- a/plugins/org.eclipse.wst.validation.ui/vf2/org/eclipse/wst/validation/ui/internal/HelpContextIds.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package org.eclipse.wst.validation.ui.internal;
-
-import org.eclipse.wst.validation.internal.ui.plugin.ValidationUIPlugin;
-
-public interface HelpContextIds {
- String PreferencePage = ValidationUIPlugin.VALIDATION_PLUGIN_ID + ".jvgp0000"; //$NON-NLS-1$
-
- String FilterRule = ValidationUIPlugin.VALIDATION_PLUGIN_ID + ".jvgp0100"; //$NON-NLS-1$
- String FRFileExt = ValidationUIPlugin.VALIDATION_PLUGIN_ID + ".jvgp0101"; //$NON-NLS-1$
- String FRName = ValidationUIPlugin.VALIDATION_PLUGIN_ID + ".jvgp0102"; //$NON-NLS-1$
- String FRProjectNature = ValidationUIPlugin.VALIDATION_PLUGIN_ID + ".jvgp0103"; //$NON-NLS-1$
- String FRFacet = ValidationUIPlugin.VALIDATION_PLUGIN_ID + ".jvgp0104"; //$NON-NLS-1$
- String FRContentType = ValidationUIPlugin.VALIDATION_PLUGIN_ID + ".jvgp0105"; //$NON-NLS-1$
-
- String ProjectPage = ValidationUIPlugin.VALIDATION_PLUGIN_ID + ".jvpp0000"; //$NON-NLS-1$
- String ProjectFilterRule = ValidationUIPlugin.VALIDATION_PLUGIN_ID + ".jvpp0100"; //$NON-NLS-1$
-
-}
diff --git a/plugins/org.eclipse.wst.validation.ui/vf2/org/eclipse/wst/validation/ui/internal/ImageNames.java b/plugins/org.eclipse.wst.validation.ui/vf2/org/eclipse/wst/validation/ui/internal/ImageNames.java
deleted file mode 100644
index 5873170..0000000
--- a/plugins/org.eclipse.wst.validation.ui/vf2/org/eclipse/wst/validation/ui/internal/ImageNames.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.validation.ui.internal;
-
-/**
- * Names of the images.
- * @author karasiuk
- *
- */
-public interface ImageNames {
-
- String okTable = "ok_tbl"; //$NON-NLS-1$
- String failTable = "fail_tbl"; //$NON-NLS-1$
- String settings = "settings"; //$NON-NLS-1$
- String disabled = "_disabled"; //$NON-NLS-1$
-}
diff --git a/plugins/org.eclipse.wst.validation.ui/vf2/org/eclipse/wst/validation/ui/internal/ManualValidationRunner.java b/plugins/org.eclipse.wst.validation.ui/vf2/org/eclipse/wst/validation/ui/internal/ManualValidationRunner.java
deleted file mode 100644
index f70bcce..0000000
--- a/plugins/org.eclipse.wst.validation.ui/vf2/org/eclipse/wst/validation/ui/internal/ManualValidationRunner.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.validation.ui.internal;
-
-import java.util.Map;
-import java.util.Set;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-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;
-import org.eclipse.core.runtime.jobs.MultiRule;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.wst.validation.internal.ValOperation;
-import org.eclipse.wst.validation.internal.ValType;
-import org.eclipse.wst.validation.internal.ValidationResultSummary;
-import org.eclipse.wst.validation.internal.ValidationRunner;
-import org.eclipse.wst.validation.ui.internal.dialog.ResultsDialog;
-
-/**
- * Run a manual validation.
- * @author karasiuk
- *
- */
-public class ManualValidationRunner extends WorkspaceJob {
-
- private Map<IProject, Set<IResource>> _projects;
- private ValType _valType;
- private boolean _showResults;
-
- /**
- * Validate the selected projects and/or resources.
- *
- * @param projects
- * The selected projects. The key is an IProject and the value is
- * the Set of IResources that were selected. Often this will be
- * every resource in the project.
- *
- * @param isManual
- * Is this a manual validation?
- *
- * @param isBuild
- * Is this a build based validation?
- *
- * @param showResults
- * When the validation is finished, show the results in a dialog box.
- */
- public static void validate(Map<IProject, Set<IResource>> projects, ValType valType, boolean showResults){
- ManualValidationRunner me = new ManualValidationRunner(projects, valType, showResults);
-
- //TODO optimize this, I don't like the idea of validators having to lock the entire project
- Set<IProject> keys = projects.keySet();
- IProject[] projectArray = new IProject[keys.size()];
- keys.toArray(projectArray);
- if (projectArray.length == 1)me.setRule(projectArray[0]);
- else {
- me.setRule(MultiRule.combine(projectArray));
- }
- me.schedule();
- }
-
- private ManualValidationRunner(Map<IProject, Set<IResource>> projects, ValType valType, boolean showResults){
- super(ValUIMessages.Validation);
- _projects = projects;
- _valType = valType;
- _showResults = showResults;
- }
-
- public IStatus runInWorkspace(IProgressMonitor monitor) throws CoreException {
-
- long start = System.currentTimeMillis();
- final ValOperation vo = ValidationRunner.validate(_projects, _valType, monitor, false);
- final long time = System.currentTimeMillis() - start;
- int resourceCount = 0;
- for (Set s : _projects.values())resourceCount += s.size();
- final int finalResourceCount = resourceCount;
- if (vo.isCanceled())return Status.CANCEL_STATUS;
-
- if (_showResults){
- Display display = Display.getDefault();
- Runnable run = new Runnable(){
-
- public void run() {
- ValidationResultSummary vr = vo.getResult();
- ResultsDialog rd = new ResultsDialog(null, vr, time, finalResourceCount);
- rd.open();
- }
-
- };
- display.asyncExec(run);
- }
- return Status.OK_STATUS;
- }
-}
diff --git a/plugins/org.eclipse.wst.validation.ui/vf2/org/eclipse/wst/validation/ui/internal/ValUIMessages.java b/plugins/org.eclipse.wst.validation.ui/vf2/org/eclipse/wst/validation/ui/internal/ValUIMessages.java
deleted file mode 100644
index 5001d84..0000000
--- a/plugins/org.eclipse.wst.validation.ui/vf2/org/eclipse/wst/validation/ui/internal/ValUIMessages.java
+++ /dev/null
@@ -1,122 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.validation.ui.internal;
-
-import org.eclipse.osgi.util.NLS;
-
-public class ValUIMessages extends NLS {
-
- private static final String BUNDLE_NAME = "org.eclipse.wst.validation.ui.internal.messages"; //$NON-NLS-1$
-
- public static String ADD_VALIDATION_BUILDER;
-
- public static String PREF_BUTTON_OVERRIDE;
- public static String PREF_VALLIST_TITLE;
- public static String PREF_BUTTON_ENABLEALL;
- public static String PREF_BUTTON_DISABLEALL;
- public static String PREF_MNU_MANUAL;
- public static String PREF_MNU_BUILD;
- public static String PREF_MNU_SETTINGS;
-
- public static String ConfigWsSettings;
- public static String DoNotShowResults;
- public static String DelegatesDialogTitle;
- public static String DelegatesComboLabel;
-
- public static String ErrorsWarnings;
-
- public static String VBF_EXC_INTERNAL_TITLE;
- public static String VBF_EXC_INTERNAL_PAGE;
- public static String VBF_EXC_INVALID_REGISTER;
- public static String DISABLE_VALIDATION;
-
- public static String MANUAL;
- public static String BUILD;
- public static String SETTINGS;
- public static String VALIDATOR;
- public static String VBF_UI_NO_VALIDATORS_INSTALLED;
-
- public static String SaveFilesDialog_saving;
- public static String SaveFilesDialog_always_save;
- public static String SaveFilesDialog_save_all_resources;
- public static String SaveFilesDialog_must_save;
- public static String PrefPage_always_save;
- public static String PrefPageConfirmDialog;
- public static String ProjectOverridesNotAllowed;
- public static String RunValidationDialogTitle;
-
- /* Validator Filters */
- public static String fdTitle;
- public static String fdNoFilters;
-
- public static String ErrConfig;
-
- public static String FilterHelp;
-
- public static String ButtonAddGroupInclude;
- public static String ButtonAddGroupExclude;
- public static String ButtonAddRule;
- public static String ButtonRemove;
-
- public static String LabelExtension;
- public static String LabelFile;
- public static String LabelProjects;
- public static String LabelFacets;
- public static String LabelContentType;
- public static String LabelEnableProjectSpecific;
- public static String LabelTargetRuntime;
-
- public static String DescExtension;
- public static String DescFile;
- public static String DescProjects;
- public static String DescFacets;
- public static String DescContentType;
- public static String DescTargetRuntime;
-
- public static String Validation;
- public static String ValidationStatus;
-
- public static String ErrSummary;
- public static String ValidationSuccessful;
-
- public static String FrWizard;
- public static String FrSelectFilterType;
- public static String FrFileExtension;
- public static String FrFileExtensionLabel;
- public static String FrCaseSensitive;
- public static String FrExactMatch;
- public static String FrFolderOrFile;
- public static String FrFolderOrFileLabel;
- public static String FrBrowseFile;
- public static String FrFileFilter;
- public static String FrBrowseFolder;
- public static String FrFolderFilter;
- public static String FrProjectNature;
- public static String FrProjectNatureLabel;
- public static String FrSimpleFileName;
- public static String FrFacit;
- public static String FrFacitLabel;
- public static String FrContentType;
- public static String FrNewFacitLabel;
- public static String FrContentTypeLabel;
- public static String FrMsgSev;
- public static String FrTargetRuntimeLabel;
-
- public static String RebuildTitle;
- public static String RebuildMsg;
-
-
- static {
- NLS.initializeMessages(BUNDLE_NAME, ValUIMessages.class);
- }
-
-}
diff --git a/plugins/org.eclipse.wst.validation.ui/vf2/org/eclipse/wst/validation/ui/internal/dialog/FilterDialog.java b/plugins/org.eclipse.wst.validation.ui/vf2/org/eclipse/wst/validation/ui/internal/dialog/FilterDialog.java
deleted file mode 100644
index 186eaae..0000000
--- a/plugins/org.eclipse.wst.validation.ui/vf2/org/eclipse/wst/validation/ui/internal/dialog/FilterDialog.java
+++ /dev/null
@@ -1,469 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.validation.ui.internal.dialog;
-
-import java.lang.reflect.InvocationTargetException;
-import java.util.Iterator;
-import java.util.Map;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IAdapterFactory;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.resource.JFaceResources;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.TreeViewer;
-import org.eclipse.jface.wizard.WizardDialog;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.layout.RowLayout;
-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.Shell;
-import org.eclipse.ui.model.BaseWorkbenchContentProvider;
-import org.eclipse.ui.model.WorkbenchLabelProvider;
-import org.eclipse.wst.validation.MessageSeveritySetting;
-import org.eclipse.wst.validation.Validator;
-import org.eclipse.wst.validation.internal.ValManager;
-import org.eclipse.wst.validation.internal.ValMessages;
-import org.eclipse.wst.validation.internal.ValidatorMutable;
-import org.eclipse.wst.validation.internal.delegates.ValidatorDelegateDescriptor;
-import org.eclipse.wst.validation.internal.delegates.ValidatorDelegatesRegistry;
-import org.eclipse.wst.validation.internal.model.FilterGroup;
-import org.eclipse.wst.validation.internal.model.FilterRule;
-import org.eclipse.wst.validation.internal.model.ValidatorHelper;
-import org.eclipse.wst.validation.ui.internal.AdapterFactory;
-import org.eclipse.wst.validation.ui.internal.ValUIMessages;
-
-/**
- * Display a filter dialog for a particular Validator, that is a list of all the filters that are active for
- * the validator.
- *
- * @author karasiuk
- *
- */
-public final class FilterDialog extends Dialog {
-
- /**
- * If we are doing project level filters this will point to the project. This is null if we are doing
- * workspace level filters.
- */
- private IProject _project;
-
- private ValidatorMutable _validator;
-
- private TreeViewer _tree;
- private Combo _delegating;
- private IAdapterFactory _adaptorFactory = new AdapterFactory();
-
- private Button _addGroupInclude;
- private Button _addGroupExclude;
- private Button _addRule;
- private Button _remove;
- private ISelectionChangedListener _nodeChangedListener;
-
- /** The currently selected group. If a rule is selected instead, then this will be null. */
- private FilterGroup _selectedGroup;
-
- /** The currently selected rule. If a group is selected instead, then this will be null. */
- private FilterRule _selectedRule;
-
- private Combo[] _messageSev;
-
- private static String[] _messages = new String[]{
- ValMessages.SevError, ValMessages.SevWarning, ValMessages.SevIgnore};
-
- private Shell _shell;
-
- /**
- * Create a dialog that knows how to change a validator's filters.
- *
- * @param shell
- *
- * @param validator the validator that is being updated.
- *
- * @param project the project that the filters are being added to. If these are workspace
- * level filters, then this must be null.
- */
- public FilterDialog(Shell shell, ValidatorMutable validator, IProject project){
- super(shell);
- _shell = shell;
- setShellStyle(getShellStyle() | SWT.CLOSE|SWT.MIN|SWT.MAX|SWT.RESIZE);
- _validator = validator;
- _project = project;
- }
-
- protected void configureShell(Shell newShell) {
- super.configureShell(newShell);
- newShell.setText(NLS.bind(ValUIMessages.fdTitle, _validator.getName()));
- }
-
- protected Control createDialogArea(Composite parent) {
- Composite c = (Composite)super.createDialogArea(parent);
- c.setLayout(new GridLayout(2, false));
- if (!_validator.isV2Validator()){
- new Label(c, SWT.NONE).setText(ValUIMessages.fdNoFilters);
- }
- else {
- Label blurb = new Label(c, SWT.LEFT | SWT.WRAP);
- blurb.setLayoutData(new GridData(SWT.FILL, SWT.TOP, true, false, 2, 1));
- blurb.setText(ValUIMessages.FilterHelp);
-
- _tree = new TreeViewer(c, SWT.SINGLE | SWT.H_SCROLL | SWT.V_SCROLL | SWT.BORDER);
- _tree.getControl().setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
- Platform.getAdapterManager().registerAdapters(_adaptorFactory, ValidatorMutable.class);
- Platform.getAdapterManager().registerAdapters(_adaptorFactory, FilterGroup.class);
- Platform.getAdapterManager().registerAdapters(_adaptorFactory, FilterRule.class);
- _tree.setContentProvider(new BaseWorkbenchContentProvider());
- _tree.setLabelProvider(new WorkbenchLabelProvider());
- _tree.setInput(_validator);
- _tree.expandAll();
-
- addButtons(c);
-
- String delegatingId = _validator.getDelegatingId();
- if (delegatingId != null){
- addDelegatorSelection(c);
- }
-
- _nodeChangedListener = new ISelectionChangedListener(){
-
- public void selectionChanged(SelectionChangedEvent event) {
- _selectedGroup = null;
- _selectedRule = null;
- if (event.getSelection() instanceof IStructuredSelection){
- IStructuredSelection sel = (IStructuredSelection)event.getSelection();
- if (sel.getFirstElement() instanceof FilterGroup){
- _selectedGroup = (FilterGroup)sel.getFirstElement();
- }
- else if (sel.getFirstElement() instanceof FilterRule){
- _selectedRule = (FilterRule)sel.getFirstElement();
- }
- }
- updateButtons();
- }
-
- };
-
- _tree.addSelectionChangedListener(_nodeChangedListener);
-
- addMessageMappings(c);
- }
- return c;
- }
-
- private void addButtons(Composite c) {
- Composite buttons = new Composite(c, SWT.TOP);
- GridData gd = new GridData(SWT.LEFT, SWT.TOP, false, false, 1, 1);
- buttons.setLayoutData(gd);
- buttons.setLayout(new GridLayout(1, true));
- _addGroupInclude = new Button(buttons, SWT.PUSH | SWT.FILL | SWT.CENTER);
- _addGroupInclude.setText(ValUIMessages.ButtonAddGroupInclude);
- _addGroupInclude.setLayoutData(new GridData(SWT.FILL, SWT.TOP, true, false, 1, 1));
-
- _addGroupInclude.addSelectionListener(new SelectionListener(){
-
- public void widgetDefaultSelected(SelectionEvent e) {
- addGroup(false);
- }
-
- public void widgetSelected(SelectionEvent e) {
- addGroup(false);
- }
-
- });
-
- _addGroupExclude = new Button(buttons, SWT.PUSH | SWT.FILL | SWT.CENTER);
- _addGroupExclude.setText(ValUIMessages.ButtonAddGroupExclude);
- _addGroupExclude.setLayoutData(new GridData(SWT.FILL, SWT.TOP, true, false, 1, 1));
-
- _addGroupExclude.addSelectionListener(new SelectionListener(){
-
- public void widgetDefaultSelected(SelectionEvent e) {
- addGroup(true);
- }
-
- public void widgetSelected(SelectionEvent e) {
- addGroup(true);
- }
-
- });
-
- _addRule = new Button(buttons, SWT.PUSH | SWT.FILL | SWT.CENTER);
- _addRule.setText(ValUIMessages.ButtonAddRule);
- _addRule.setLayoutData(new GridData(SWT.FILL, SWT.TOP, true, false, 1, 1));
- _addRule.addSelectionListener(new SelectionListener(){
-
- public void widgetDefaultSelected(SelectionEvent e) {
- doIt();
- }
-
- public void widgetSelected(SelectionEvent e) {
- doIt();
- }
-
- private void doIt(){
- NewFilterRule nfr = new NewFilterRule(_project);
- WizardDialog wd = new WizardDialog(_shell, nfr);
- wd.setBlockOnOpen(true);
- int rc = wd.open();
- if (rc == WizardDialog.CANCEL)return;
-
- FilterRule rule = nfr.getRule();
- if (rule != null){
- FilterGroup newGroup = FilterGroup.addRule(_selectedGroup, rule);
- _validator.replaceFilterGroup(_selectedGroup, newGroup);
- _selectedGroup = newGroup;
- refresh();
- }
- }
-
- });
-
- _remove = new Button(buttons, SWT.PUSH | SWT.FILL | SWT.CENTER);
- _remove.setLayoutData(new GridData(SWT.FILL, SWT.TOP, true, false, 1, 1));
- _remove.setText(ValUIMessages.ButtonRemove);
- _remove.addSelectionListener(new SelectionListener(){
-
- public void widgetDefaultSelected(SelectionEvent e) {
- remove();
- }
-
- public void widgetSelected(SelectionEvent e) {
- remove();
- }
- });
-
- Button restore = new Button(buttons, SWT.PUSH | SWT.FILL | SWT.CENTER);
- restore.setLayoutData(new GridData(SWT.FILL, SWT.TOP, true, false, 1, 1));
- String defaults = JFaceResources.getString("defaults"); //$NON-NLS-1$
- restore.setText(defaults);
- restore.addSelectionListener(new SelectionListener(){
-
- public void widgetDefaultSelected(SelectionEvent e) {
- restoreDefaults();
- }
-
- public void widgetSelected(SelectionEvent e) {
- restoreDefaults();
- }
- });
- }
-
- private void restoreDefaults() {
- if (_validator.isV2Validator()){
- try {
- String id = _validator.getId();
- Validator[] vals = ValManager.getDefaultValidators();
- for (Validator v : vals){
- if (v.getId().equals(id)){
- _validator = new ValidatorMutable(v);
- _tree.setInput(_validator);
- _tree.expandAll();
- refresh();
- return;
- }
- }
- }
- catch (InvocationTargetException e){
-
- }
- }
-
- }
-
-
- private void addMessageMappings(Composite c) {
- if (!_validator.isV2Validator())return;
- Map<String,MessageSeveritySetting> mappings = _validator.getMessageSettings();
- if (mappings == null || mappings.size() == 0)return;
-
- Group group = new Group(c, SWT.NONE);
- group.setText(ValUIMessages.FrMsgSev);
- group.setLayoutData(new GridData(SWT.FILL, SWT.TOP, true, false, 2, 1));
- group.setLayout(new GridLayout(2, false));
-
-// Label heading = new Label(c, SWT.LEFT);
-// heading.setText(ValUIMessages.ErrorsWarnings);
-// heading.setFont(JFaceResources.getHeaderFont());
-// heading.setLayoutData(new GridData(SWT.FILL, SWT.TOP, true, false, 2, 1));
-
- _messageSev = new Combo[mappings.size()];
- int i= 0;
- for (MessageSeveritySetting ms : mappings.values()){
- Label label = new Label(group, SWT.LEFT);
- label.setText(" " + ms.getLabel() + ":"); //$NON-NLS-1$ //$NON-NLS-2$
-
- Combo sev = new Combo(group, SWT.RIGHT);
- _messageSev[i++] = sev;
- sev.setItems(_messages);
- sev.select(ms.getCurrent().ordinal());
- sev.setData(ms);
- sev.addSelectionListener(new SelectionListener(){
-
- public void widgetDefaultSelected(SelectionEvent e) {
- select(e);
- }
-
- public void widgetSelected(SelectionEvent e) {
- select(e);
- }
-
- private void select(SelectionEvent e){
- Combo w = (Combo)e.widget;
- MessageSeveritySetting ms = (MessageSeveritySetting)w.getData();
- int i = w.getSelectionIndex();
- if (ms.setCurrent(MessageSeveritySetting.Severity.values()[i]))
- _validator.bumpChangeCountMessages();
- }
-
- });
- }
- }
-
- /**
- * Add a combo box so that the user can change which delegating validator to call.
- */
- private void addDelegatorSelection(Composite c) {
- Map map = ValidatorDelegatesRegistry.getInstance().getDelegateDescriptors(_validator.getValidatorClassname());
- if (map == null)return;
-
- Composite line = new Composite(c, SWT.NONE);
- line.setLayout(new RowLayout(SWT.HORIZONTAL));
- line.setLayoutData(new GridData(SWT.FILL, SWT.TOP, true, false, 2, 1));
-
- Label label = new Label(line, SWT.CENTER);
- label.setText(ValUIMessages.DelegatesComboLabel);
-
-
- _delegating = new Combo(line, SWT.READ_ONLY);
- String[] items = new String[map.size()];
- final String ids[] = new String[map.size()];
- String selected = null;
- Iterator it = map.values().iterator();
- for (int i=0; i<items.length;i++){
- ValidatorDelegateDescriptor vd = (ValidatorDelegateDescriptor)it.next();
- items[i] = vd.getName();
- ids[i] = vd.getId();
- if (vd.getId().equals(_validator.getDelegatingId())){
- selected = vd.getName();
- }
- }
- _delegating.setItems(items);
- _delegating.setText(selected);
- _delegating.addSelectionListener(new SelectionListener(){
-
- public void widgetDefaultSelected(SelectionEvent e) {
- }
-
- public void widgetSelected(SelectionEvent e) {
- int sel = _delegating.getSelectionIndex();
- _validator.setDelegatingId(ids[sel]);
- }
-
- });
- }
-
- /**
- * Add a new filter group to the validator.
- * @param exclude
- */
- private void addGroup(boolean exclude){
- if (!_validator.isV2Validator())return;
- FilterRule[] rules = new FilterRule[0];
- _validator.add(FilterGroup.create(exclude, rules));
- refresh();
-
- }
-
- private void refresh(){
- _tree.refresh();
- _tree.expandAll();
- updateButtons();
- }
-
- /**
- * Remove the current selection from the validator.
- */
- private void remove(){
- if (_selectedRule != null){
- FilterGroup group = findGroup(_selectedRule);
- if (group != null){
- FilterGroup newGroup = FilterGroup.removeRule(group, _selectedRule);
- _validator.replaceFilterGroup(group, newGroup);
- refresh();
- }
- }
-
- if (_selectedGroup != null){
- _validator.remove(_selectedGroup);
- refresh();
- return;
- }
- }
-
- /**
- * Find the group in the current validator that has this rule.
- * @param rule The rule that we are searching for.
- * @return null if we can not find the group.
- */
- private FilterGroup findGroup(FilterRule rule) {
- for (FilterGroup group : _validator.getGroups()){
- for (FilterRule fr : group.getRules()){
- if (fr.equals(rule))return group;
- }
- }
- return null;
- }
-
- private void updateButtons() {
- if (_validator.isV2Validator()){
- _addGroupExclude.setEnabled(!ValidatorHelper.hasExcludeGroup(_validator));
- }
- _addRule.setEnabled(_selectedGroup != null);
- _remove.setEnabled(_selectedGroup != null || _selectedRule != null);
- if (_messageSev != null){
- Map<String,MessageSeveritySetting> msgs = _validator.getMessageSettings();
- if (msgs != null && _messageSev.length == msgs.size()){
- int i = 0;
- for (MessageSeveritySetting ms : msgs.values()){
- _messageSev[i++].select(ms.getCurrent().ordinal());
- }
- }
- }
- }
-
-
- public boolean close() {
- Platform.getAdapterManager().unregisterAdapters(_adaptorFactory);
- if (_tree != null)_tree.removeSelectionChangedListener(_nodeChangedListener);
- return super.close();
- }
-
- protected Point getInitialSize() {
- return new Point(600, 475);
- }
-
- public ValidatorMutable getValidator() {
- return _validator;
- }
-}
diff --git a/plugins/org.eclipse.wst.validation.ui/vf2/org/eclipse/wst/validation/ui/internal/dialog/NewFilterRule.java b/plugins/org.eclipse.wst.validation.ui/vf2/org/eclipse/wst/validation/ui/internal/dialog/NewFilterRule.java
deleted file mode 100644
index 5c7e53b..0000000
--- a/plugins/org.eclipse.wst.validation.ui/vf2/org/eclipse/wst/validation/ui/internal/dialog/NewFilterRule.java
+++ /dev/null
@@ -1,663 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2011 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.validation.ui.internal.dialog;
-
-import java.util.Map;
-import java.util.Set;
-import java.util.TreeMap;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IProjectNatureDescriptor;
-import org.eclipse.core.resources.ResourcesPlugin;
-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.jface.wizard.IWizardPage;
-import org.eclipse.jface.wizard.Wizard;
-import org.eclipse.jface.wizard.WizardPage;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.DirectoryDialog;
-import org.eclipse.swt.widgets.FileDialog;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.common.project.facet.core.IProjectFacet;
-import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
-import org.eclipse.wst.common.project.facet.core.internal.ProjectFacet;
-import org.eclipse.wst.validation.internal.model.FilterRule;
-import org.eclipse.wst.validation.internal.model.ValidatorHelper;
-import org.eclipse.wst.validation.ui.internal.HelpContextIds;
-import org.eclipse.wst.validation.ui.internal.ValUIMessages;
-
-/**
- * A wizard that adds new rules to validators.
- * @author karasiuk
- *
- */
-public class NewFilterRule extends Wizard {
-
- private Page1 _page1;
- private IWizardPage _page2;
-
- private IProject _project;
-
- private FilterRule _rule;
-
- public NewFilterRule(IProject project){
- _project = project;
- setWindowTitle(ValUIMessages.FrWizard);
- _page1 = new Page1(project);
- addPage(_page1);
- setForcePreviousAndNextButtons(true);
- }
-
- public boolean canFinish() {
- if (_page2 != null)return _page2.isPageComplete();
- return false;
- }
-
- public FilterRule getRule(){
- return _rule;
- }
-
- public boolean performFinish() {
- if (_page2 == null)return false;
- FilterWizardPage page = (FilterWizardPage)_page2;
- _rule = page.getFilterRule();
- return _rule != null;
- }
-
- public IWizardPage getNextPage(IWizardPage page) {
- if (page == _page1){
- setForcePreviousAndNextButtons(false);
- _page2 = returnOrBuildPage(_page1.getSelectedFilter());
- return _page2;
- }
- return null;
- }
-
- private IWizardPage returnOrBuildPage(int selectedFilter) {
- IWizardPage page = null;
- if (_project != null){
- if(selectedFilter == 2) selectedFilter = 4;
- else if(selectedFilter == 3) selectedFilter = 5;
- }
-
- switch (selectedFilter){
- case 0:
- page = new FileExtPage();
- break;
- case 1:
- page = new FilePage(_project);
- break;
- case 2:
- page = new ProjectPage();
- break;
- case 3:
- page = new FacetPage();
- break;
- case 4:
- page = new ContentTypePage();
- break;
- case 5:
- page = new TargetRuntimePage();
- break;
- }
- addPage(page);
- return page;
- }
-
- public static class Page1 extends WizardPage {
-
- private int _selectedFilter;
- private IProject _project;
-
-
- public Page1(IProject project){
- super("page1", ValUIMessages.FrSelectFilterType, null); //$NON-NLS-1$
- setPageComplete(true);
- _project = project;
- }
-
- public void createControl(Composite parent) {
- String helpId = _project == null ? HelpContextIds.FilterRule : HelpContextIds.ProjectFilterRule;
- PlatformUI.getWorkbench().getHelpSystem().setHelp(parent, helpId);
- String[] labels = null;
- String[] desc = null;
- if (_project != null){
- labels = new String[]{ValUIMessages.LabelExtension, ValUIMessages.LabelFile,
- ValUIMessages.LabelContentType, ValUIMessages.LabelTargetRuntime};
-
- desc = new String[]{ValUIMessages.DescExtension, ValUIMessages.DescFile,
- ValUIMessages.DescContentType, ValUIMessages.DescTargetRuntime};
- }
- else {
- labels = new String[]{ValUIMessages.LabelExtension, ValUIMessages.LabelFile,
- ValUIMessages.LabelProjects, ValUIMessages.LabelFacets,
- ValUIMessages.LabelContentType, ValUIMessages.LabelTargetRuntime};
-
- desc = new String[]{ValUIMessages.DescExtension, ValUIMessages.DescFile,
- ValUIMessages.DescProjects, ValUIMessages.DescFacets,
- ValUIMessages.DescContentType, ValUIMessages.DescTargetRuntime};
- }
-
- Composite control = new Composite(parent, SWT.NONE);
- control.setLayout(new GridLayout(2, false));
-
- SelectionListener listener = new SelectionListener(){
-
- public void widgetDefaultSelected(SelectionEvent e) {
- doIt(e);
- }
-
- public void widgetSelected(SelectionEvent e) {
- doIt(e);
- }
-
- private void doIt(SelectionEvent e){
- if (e.getSource() instanceof Button){
- Button b = (Button)e.getSource();
- if (b.getData() instanceof Integer) {
- Integer index = (Integer) b.getData();
- setSelectedFilter(index.intValue());
- }
- }
- }
-
- };
- for (int i=0; i<labels.length; i++){
- Button button = new Button(control, SWT.RADIO);
- button.setText(labels[i]);
- button.setData(new Integer(i));
- button.addSelectionListener(listener);
- (new Text(control, SWT.WRAP|SWT.READ_ONLY)).setText(desc[i]);
- if (i == 0)button.setSelection(true);
- }
- setControl(control);
- }
-
- public int getSelectedFilter() {
- return _selectedFilter;
- }
-
- public void setSelectedFilter(int selectedFilter) {
- _selectedFilter = selectedFilter;
- getContainer().updateButtons();
- }
-
- }
-
- public static class FileExtPage extends WizardPage implements FilterWizardPage {
-
- private Text _pattern;
- private Button _case;
-
- public FileExtPage(){
- super("fileext", ValUIMessages.FrFileExtension, null); //$NON-NLS-1$
- }
-
- public void createControl(Composite parent) {
- PlatformUI.getWorkbench().getHelpSystem().setHelp(parent, HelpContextIds.FRFileExt);
- Composite control = new Composite(parent, SWT.NONE);
- setControl(control);
- control.setLayout(new GridLayout(2, false));
- (new Label(control, SWT.NONE)).setText(ValUIMessages.FrFileExtensionLabel);
- _pattern = new Text(control, SWT.BORDER);
- _pattern.setFocus();
- _pattern.addModifyListener(new ModifyListener(){
-
- public void modifyText(ModifyEvent e) {
- getContainer().updateButtons();
- }
-
- });
-
- _case = new Button(control, SWT.CHECK);
- _case.setText(ValUIMessages.FrCaseSensitive);
- _case.setSelection(false);
- _case.setLayoutData(new GridData(SWT.BEGINNING, SWT.BEGINNING,false, false, 2, 1));
-
- }
-
- public FilterRule getFilterRule() {
- if (!isPageComplete())return null;
- return FilterRule.FileExt.createFileExt(_pattern.getText(), _case.getSelection());
- }
-
- public boolean isPageComplete() {
- return _pattern != null && _pattern.getText().trim().length() > 0;
- }
-
-
- }
-
- public static class FilePage extends WizardPage implements FilterWizardPage {
-
- private Text _pattern;
- private Button _browseFile;
- private Button _browseFolder;
- private Button _case;
- private Button _simpleFileName;
-
- private IProject _project;
- private int _type = FilterRule.File.FileTypeFile;
- private IPath _fullFileName;
- private String _root;
-
- public FilePage(IProject project){
- super("file", ValUIMessages.FrFolderOrFile, null); //$NON-NLS-1$
- _project = project;
- }
-
- public void createControl(Composite parent) {
- PlatformUI.getWorkbench().getHelpSystem().setHelp(parent, HelpContextIds.FRName);
- final Composite control = new Composite(parent, SWT.NONE);
- setControl(control);
- control.setLayout(new GridLayout(4, false));
- (new Label(control, SWT.NONE)).setText(ValUIMessages.FrFolderOrFileLabel);
- _pattern = new Text(control, SWT.BORDER);
- _pattern.setFocus();
- _pattern.setLayoutData(new GridData(300, SWT.DEFAULT));
- _pattern.addModifyListener(new ModifyListener(){
-
- public void modifyText(ModifyEvent e) {
- getContainer().updateButtons();
- }
-
- });
-
- _root = null;
- IPath base = _project == null ? ResourcesPlugin.getWorkspace().getRoot().getLocation() :
- _project.getLocation();
- if (base != null)_root = base.toOSString();
-
- _browseFile = new Button(control, SWT.PUSH);
- _browseFile.setText(ValUIMessages.FrBrowseFile);
- _browseFile.setEnabled(_root != null);
- _browseFile.addSelectionListener(new SelectionListener(){
-
- public void widgetDefaultSelected(SelectionEvent e) {
- browse();
- }
-
- public void widgetSelected(SelectionEvent e) {
- browse();
- }
-
- private void browse(){
- FileDialog fd = new FileDialog(control.getShell(), SWT.OPEN);
- fd.setText(ValUIMessages.FrFileFilter);
- fd.setFilterPath(_root);
-
- String file = fd.open();
- if (file != null){
- if (file.startsWith(_root))file = file.substring(_root.length()+1);
- else file = null;
- }
- if (file != null){
- _fullFileName = new Path(file);
- if (_project == null)_fullFileName = _fullFileName.removeFirstSegments(1);
-
- if (_simpleFileName.getSelection()){
- _type = FilterRule.File.FileTypeFile;
- _pattern.setText(_fullFileName.lastSegment());
- }
- else {
- _type = FilterRule.File.FileTypeFull;
- _pattern.setText(_fullFileName.toPortableString());
- }
- }
- else {
- _fullFileName = null;
- _pattern.setText(""); //$NON-NLS-1$
- }
- }
- });
-
- _browseFolder = new Button(control, SWT.PUSH);
- _browseFolder.setText(ValUIMessages.FrBrowseFolder);
- _browseFolder.setEnabled(_root != null);
- _browseFolder.addSelectionListener(new SelectionListener(){
-
- public void widgetDefaultSelected(SelectionEvent e) {
- browse();
- }
-
- public void widgetSelected(SelectionEvent e) {
- browse();
- }
-
- private void browse(){
- DirectoryDialog fd = new DirectoryDialog(control.getShell());
- fd.setMessage(ValUIMessages.FrFolderFilter);
- fd.setFilterPath(_root);
- String dir = fd.open();
- if (dir != null){
- _fullFileName = null;
- _type = FilterRule.File.FileTypeFolder;
- if (dir.startsWith(_root) && dir.length() > _root.length()){
- dir = dir.substring(_root.length()+1);
- IPath path = new Path(dir);
- if (_project == null)path = path.removeFirstSegments(1);
- _pattern.setText(path.toPortableString());
- }
- else {
- _pattern.setText(""); //$NON-NLS-1$
- }
- }
- }
-
- });
-
- _case = new Button(control, SWT.CHECK);
- _case.setText(ValUIMessages.FrCaseSensitive);
- _case.setSelection(false);
- _case.setLayoutData(new GridData(SWT.BEGINNING, SWT.BEGINNING,false, false, 4, 1));
-
- addSimpleFileNameButton(control);
- }
-
- private void addSimpleFileNameButton(final Composite control) {
- _simpleFileName = new Button(control, SWT.CHECK);
- _simpleFileName.setText(ValUIMessages.FrSimpleFileName);
- _simpleFileName.setSelection(_type == FilterRule.File.FileTypeFile);
- _simpleFileName.setLayoutData(new GridData(SWT.BEGINNING, SWT.BEGINNING,false, false, 4, 1));
-
- _simpleFileName.addSelectionListener(new SelectionListener(){
-
- public void widgetDefaultSelected(SelectionEvent e) {
- }
-
- public void widgetSelected(SelectionEvent e) {
- if (_type == FilterRule.File.FileTypeFolder)return;
- if (_simpleFileName.getSelection()){
- if (_fullFileName != null)_pattern.setText(_fullFileName.lastSegment());
- _type = FilterRule.File.FileTypeFile;
- }
- else {
- if (_fullFileName != null)_pattern.setText(_fullFileName.toPortableString());
- _type = FilterRule.File.FileTypeFull; }
- }
- });
- }
-
- public FilterRule getFilterRule() {
- if (!isPageComplete())return null;
- return FilterRule.createFile(_pattern.getText(), _case.getSelection(), _type);
- }
-
- public boolean isPageComplete() {
- if (_pattern == null)return false;
- if (_pattern.getText() == null)return false;
- return _pattern.getText().trim().length() > 0;
- }
-
- }
-
- public static class ProjectPage extends WizardPage implements FilterWizardPage{
-
- private Combo _natures;
- private String[] _ids;
-
- public ProjectPage(){
- super("project", ValUIMessages.FrProjectNature, null); //$NON-NLS-1$
- }
-
- public void createControl(Composite parent) {
- PlatformUI.getWorkbench().getHelpSystem().setHelp(parent, HelpContextIds.FRProjectNature);
- Composite control = new Composite(parent, SWT.NONE);
- setControl(control);
- control.setLayout(new GridLayout(2, false));
- (new Label(control, SWT.NONE)).setText(ValUIMessages.FrProjectNatureLabel);
-
- IProjectNatureDescriptor[] pn = ResourcesPlugin.getWorkspace().getNatureDescriptors();
- String items[] = new String[pn.length];
- _ids = new String[pn.length];
- String natureLabel = null;
- for (int i=0; i<pn.length; i++){
- natureLabel = pn[i].getLabel();
- _ids[i] = pn[i].getNatureId();
- items[i] = natureLabel.length() == 0 ? _ids[i] : natureLabel + " - " + _ids[i]; //$NON-NLS-1$
- }
- _natures = new Combo(control, SWT.DROP_DOWN);
- _natures.setItems(items);
- _natures.addModifyListener(new ModifyListener(){
-
- public void modifyText(ModifyEvent e) {
- getContainer().updateButtons();
- }
-
- });
-
- }
-
- public FilterRule getFilterRule() {
- if (!isPageComplete())return null;
- int i = _natures.getSelectionIndex();
- if (i == -1)return null;
-
- return FilterRule.createProject(_ids[i]);
- }
-
- public boolean isPageComplete() {
- if (_natures == null)return false;
- if (_natures.getText() == null)return false;
- return _natures.getText().trim().length() > 0;
- }
-
- }
-
- public static class FacetPage extends WizardPage implements FilterWizardPage {
-
- private Combo facets;
- private String [] ids;
-
- public FacetPage(){
- super("facet", ValUIMessages.FrFacit, null); //$NON-NLS-1$
- }
-
- public void createControl(Composite parent) {
- PlatformUI.getWorkbench().getHelpSystem().setHelp(parent, HelpContextIds.FRFacet);
- Composite control = new Composite(parent, SWT.NONE);
- setControl(control);
- control.setLayout(new GridLayout(2, false));
- (new Label(control, SWT.NONE)).setText(ValUIMessages.FrNewFacitLabel);
-
- Set<IProjectFacet> projectFacets = ProjectFacetsManager.getProjectFacets();
-
- Object[] projectFacetsArray = projectFacets.toArray();
- String items[] = new String[projectFacetsArray.length];
- ids = new String[projectFacetsArray.length];
-
- for(int i = 0; i < projectFacetsArray.length; i++)
- {
- ProjectFacet facet = (ProjectFacet)projectFacetsArray[i];
- ids[i] = facet.getId();
- items[i] = facet.getLabel() + " - " + ids[i]; //$NON-NLS-1$
- }
-
- facets = new Combo(control, SWT.DROP_DOWN);
- facets.setItems(items);
- facets.addModifyListener(new ModifyListener(){
-
- public void modifyText(ModifyEvent e) {
- getContainer().updateButtons();
- }
-
- });
- }
-
- public FilterRule getFilterRule() {
- if (!isPageComplete())return null;
-
- int i = facets.getSelectionIndex();
- if (i == -1) return null;
-
- FilterRule rule = FilterRule.createFacet(ids[i]);
- return rule;
- }
-
- public boolean isPageComplete() {
- if (facets == null)return false;
- if (facets.getText() == null)return false;
- return facets.getText().trim().length() > 0;
- }
-
- }
-
- public static class ContentTypePage extends WizardPage implements FilterWizardPage {
- private Combo _pattern;
- private Button _exactMatch;
- private Map<String, IContentType> _map;
-
- public ContentTypePage(){
- super("contentType", ValUIMessages.FrContentType, null); //$NON-NLS-1$
- }
-
- public void createControl(Composite parent) {
- PlatformUI.getWorkbench().getHelpSystem().setHelp(parent, HelpContextIds.FRContentType);
- Composite control = new Composite(parent, SWT.NONE);
- setControl(control);
- control.setLayout(new GridLayout(2, false));
- (new Label(control, SWT.NONE)).setText(ValUIMessages.FrContentTypeLabel);
-
- IContentType[] types = Platform.getContentTypeManager().getAllContentTypes();
- _map = new TreeMap<String, IContentType>();
- for (IContentType type : types){
- String name = type.getName();
- if (name == null)name = type.getId();
- else
- name = name + " - " + type.getId(); //$NON-NLS-1$
- _map.put(name, type);
- }
- String items[] = new String[_map.size()];
- int i = 0;
- for (String label : _map.keySet()){
- items[i++] = label;
- }
- _pattern = new Combo(control, SWT.DROP_DOWN | SWT.READ_ONLY);
- _pattern.setFocus();
- _pattern.setLayoutData(new GridData(300, SWT.DEFAULT));
- _pattern.setVisibleItemCount(20);
- _pattern.setItems(items);
- _pattern.addModifyListener(new ModifyListener(){
-
- public void modifyText(ModifyEvent e) {
- getContainer().updateButtons();
- }
-
- });
-
- _exactMatch = new Button(control, SWT.CHECK);
- _exactMatch.setText(ValUIMessages.FrExactMatch);
- _exactMatch.setSelection(false);
- _exactMatch.setLayoutData(new GridData(SWT.BEGINNING, SWT.BEGINNING,false, false, 2, 1));
-
- }
-
- public FilterRule getFilterRule() {
- if (!isPageComplete())return null;
- IContentType type = _map.get(_pattern.getText());
- if (type == null)return null;
- FilterRule rule = FilterRule.createContentType(type.getId(), _exactMatch.getSelection());
- return rule;
- }
-
- public boolean isPageComplete() {
- if (_pattern == null)return false;
- if (_pattern.getText() == null)return false;
- return _pattern.getText().trim().length() > 0;
- }
-
- }
-
- public static class TargetRuntimePage extends WizardPage implements FilterWizardPage {
-
- private Combo _pattern;
- private String [] ids;
-
- public TargetRuntimePage(){
- super("targetRuntime", ValUIMessages.FrTargetRuntimeLabel, null); //$NON-NLS-1$
- }
-
- public void createControl(Composite parent) {
- PlatformUI.getWorkbench().getHelpSystem().setHelp(parent, HelpContextIds.FRContentType);
- Composite control = new Composite(parent, SWT.NONE);
- setControl(control);
- control.setLayout(new GridLayout(2, false));
- (new Label(control, SWT.NONE)).setText("Target Runtime"); //$NON-NLS-1$
-
- Object[] targetRuntimes = ValidatorHelper.getRuntimes();
-
- String items[] = new String[targetRuntimes.length];
- ids = new String[targetRuntimes.length];
-
- for(int i = 0; i < targetRuntimes.length; i++)
- {
-
- ids[i] = ValidatorHelper.getRuntimeID(targetRuntimes[i]);
- items[i] = ValidatorHelper.getRuntimeName(targetRuntimes[i]);
- }
-
- _pattern = new Combo(control, SWT.DROP_DOWN | SWT.READ_ONLY);
- _pattern.setFocus();
- _pattern.setLayoutData(new GridData(300, SWT.DEFAULT));
- _pattern.setVisibleItemCount(20);
- _pattern.setItems(items);
- _pattern.addModifyListener(new ModifyListener(){
-
- public void modifyText(ModifyEvent e) {
- getContainer().updateButtons();
- }
-
- });
- }
-
- public FilterRule getFilterRule() {
- if (!isPageComplete())return null;
-
- int i = _pattern.getSelectionIndex();
- if (i == -1) return null;
-
- FilterRule rule = FilterRule.createTargetRuntime(ids[i]);
- return rule;
- }
-
-
- public boolean isPageComplete() {
- if (_pattern == null)return false;
- if (_pattern.getText() == null)return false;
- return _pattern.getText().trim().length() > 0;
- }
-
- }
-
- interface FilterWizardPage {
- /**
- * Answer the rule that was created.
- *
- * @return null if the user didn't create a new rule.
- */
- FilterRule getFilterRule();
- }
-
-
-}
diff --git a/plugins/org.eclipse.wst.validation.ui/vf2/org/eclipse/wst/validation/ui/internal/dialog/ResultsDialog.java b/plugins/org.eclipse.wst.validation.ui/vf2/org/eclipse/wst/validation/ui/internal/dialog/ResultsDialog.java
deleted file mode 100644
index 3534eb7..0000000
--- a/plugins/org.eclipse.wst.validation.ui/vf2/org/eclipse/wst/validation/ui/internal/dialog/ResultsDialog.java
+++ /dev/null
@@ -1,162 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.validation.ui.internal.dialog;
-
-
-import org.eclipse.jface.dialogs.ErrorDialog;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.jface.dialogs.IconAndMessageDialog;
-import org.eclipse.jface.layout.GridDataFactory;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.wst.validation.internal.Misc;
-import org.eclipse.wst.validation.internal.ValManager;
-import org.eclipse.wst.validation.internal.ValPrefManagerGlobal;
-import org.eclipse.wst.validation.internal.ValidationResultSummary;
-import org.eclipse.wst.validation.internal.model.GlobalPreferences;
-import org.eclipse.wst.validation.internal.model.GlobalPreferencesValues;
-import org.eclipse.wst.validation.internal.ui.ValidationUIMessages;
-import org.eclipse.wst.validation.ui.internal.ValUIMessages;
-
-/**
- * A dialog for displaying the results of a manual validation.
- * @author karasiuk
- *
- */
-public class ResultsDialog extends IconAndMessageDialog {
-
- private ValidationResultSummary _result;
- private long _time;
- private int _resourceCount;
- private Button _hideButton;
-
- /**
- * Create a dialog for displaying validation results.
- *
- * @param parentShell this can be null
- * @param results the results of the validation
- * @param time the time that the validation took in milliseconds
- * @param resourceCount the number of resources that were validated
- */
- public ResultsDialog(Shell parentShell, ValidationResultSummary results, long time, int resourceCount) {
- super(parentShell);
- _result = results;
- _time = time;
- _resourceCount = resourceCount;
- }
-
- @Override
- protected void okPressed() {
- if(_hideButton!=null) {
- ValManager vm = ValManager.getDefault();
- GlobalPreferences gp = vm.getGlobalPreferences();
- GlobalPreferencesValues gpv = gp.asValues();
- gpv.confirmDialog = !_hideButton.getSelection();
- int changes = vm.replace(gpv);
- if (changes != 0)ValPrefManagerGlobal.getDefault().savePreferences();
- }
- super.okPressed();
- }
-
- @Override
- public int open() {
- if (!ErrorDialog.AUTOMATED_MODE) {
- return super.open();
- }
- setReturnCode(OK);
- return OK;
- }
-
- @Override
- protected Image getImage() {
- if (_result.getSeverityError() > 0)return getErrorImage();
- if (_result.getSeverityWarning() > 0)return getWarningImage();
- return getInfoImage();
- }
-
- @Override
- protected Control createDialogArea(Composite parent) {
- message = getMessage();
- createMessageArea(parent);
-
- new Label(parent, SWT.NONE).setLayoutData(GridDataFactory.swtDefaults().span(2, 1).create());
- addHideCheckbox(parent);
-
- Control c = super.createDialogArea(parent);
- return c;
- }
-
- private void addHideCheckbox(Composite parent) {
- _hideButton = new Button(parent, SWT.CHECK);
- GridDataFactory.swtDefaults().align(SWT.BEGINNING, SWT.BEGINNING).span(2, 1).applyTo(_hideButton);
- _hideButton.setText(ValUIMessages.DoNotShowResults);
- if (ValManager.getDefault().getGlobalPreferences().getConfirmDialog() && _hideButton.getSelection()) {
- // tell the user where to re-enable it?
- }
- _hideButton.setSelection(!ValManager.getDefault().getGlobalPreferences().getConfirmDialog());
- }
-
-
- @Override
- protected void configureShell(Shell newShell) {
- super.configureShell(newShell);
- newShell.setText(ValidationUIMessages.ValResults);
- }
-
- @Override
- protected void createButtonsForButtonBar(Composite parent) {
- Button ok = createButton(parent, IDialogConstants.OK_ID, IDialogConstants.OK_LABEL, false);
- ok.setFocus();
- }
-
- private String getMessage(){
- if (_resourceCount > 1) {
- if (_result.getSeverityError() > 1)
- return NLS.bind(ValidationUIMessages.ValErrorsResources, new Object[]{_result.getSeverityError(), _resourceCount, Misc.getTimeMS(_time)});
- if (_result.getSeverityError() == 1)
- return NLS.bind(ValidationUIMessages.ValError1Resources, _resourceCount, Misc.getTimeMS(_time));
-
- if (_result.getSeverityWarning() > 1)
- return NLS.bind(ValidationUIMessages.ValWarnResources, new Object[]{_result.getSeverityWarning(), _resourceCount, Misc.getTimeMS(_time)});
- if (_result.getSeverityWarning() == 1)
- return NLS.bind(ValidationUIMessages.ValWarn1Resources, _resourceCount, Misc.getTimeMS(_time));
-
- if (_result.getSeverityInfo() > 1)
- return NLS.bind(ValidationUIMessages.ValInfoResources, new Object[]{_result.getSeverityInfo(), _resourceCount, Misc.getTimeMS(_time)});
- if (_result.getSeverityInfo() == 1)
- return NLS.bind(ValidationUIMessages.ValInfo1Resources, _resourceCount, Misc.getTimeMS(_time));
- }
- else if (_resourceCount == 1) {
- if (_result.getSeverityError() > 1)
- return NLS.bind(ValidationUIMessages.ValErrorsResource1, _result.getSeverityError(), Misc.getTimeMS(_time));
- if (_result.getSeverityError() == 1)
- return NLS.bind(ValidationUIMessages.ValError1Resource1, Misc.getTimeMS(_time));
-
- if (_result.getSeverityWarning() > 1)
- return NLS.bind(ValidationUIMessages.ValWarnResource1, _result.getSeverityWarning(), Misc.getTimeMS(_time));
- if (_result.getSeverityWarning() == 1)
- return NLS.bind(ValidationUIMessages.ValWarn1Resource1, Misc.getTimeMS(_time));
-
- if (_result.getSeverityInfo() > 1)
- return NLS.bind(ValidationUIMessages.ValInfoResource1, _result.getSeverityInfo(), Misc.getTimeMS(_time));
- if (_result.getSeverityInfo() == 1)
- return NLS.bind(ValidationUIMessages.ValInfo1Resource1, Misc.getTimeMS(_time));
- }
- return ValidationUIMessages.ValSuccess;
- }
-}
diff --git a/plugins/org.eclipse.wst.validation.ui/vf2/org/eclipse/wst/validation/ui/internal/preferences/ValidationPreferencePage.java b/plugins/org.eclipse.wst.validation.ui/vf2/org/eclipse/wst/validation/ui/internal/preferences/ValidationPreferencePage.java
deleted file mode 100644
index 2f1da24..0000000
--- a/plugins/org.eclipse.wst.validation.ui/vf2/org/eclipse/wst/validation/ui/internal/preferences/ValidationPreferencePage.java
+++ /dev/null
@@ -1,838 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.validation.ui.internal.preferences;
-
-import java.lang.reflect.InvocationTargetException;
-import java.util.LinkedList;
-import java.util.List;
-
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.layout.GridDataFactory;
-import org.eclipse.jface.preference.PreferencePage;
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.ITableLabelProvider;
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerSorter;
-import org.eclipse.jface.window.Window;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.ScrolledComposite;
-import org.eclipse.swt.events.FocusAdapter;
-import org.eclipse.swt.events.FocusEvent;
-import org.eclipse.swt.events.MenuAdapter;
-import org.eclipse.swt.events.MenuEvent;
-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.Image;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.graphics.Rectangle;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Menu;
-import org.eclipse.swt.widgets.MenuItem;
-import org.eclipse.swt.widgets.MessageBox;
-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.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchPreferencePage;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.validation.Validator;
-import org.eclipse.wst.validation.internal.ConfigurationManager;
-import org.eclipse.wst.validation.internal.FullBuildJob;
-import org.eclipse.wst.validation.internal.GlobalConfiguration;
-import org.eclipse.wst.validation.internal.ValManager;
-import org.eclipse.wst.validation.internal.ValPrefManagerGlobal;
-import org.eclipse.wst.validation.internal.ValidatorMetaData;
-import org.eclipse.wst.validation.internal.ValidatorMutable;
-import org.eclipse.wst.validation.internal.model.GlobalPreferences;
-import org.eclipse.wst.validation.internal.model.GlobalPreferencesValues;
-import org.eclipse.wst.validation.internal.ui.DelegatingValidatorPreferencesDialog;
-import org.eclipse.wst.validation.internal.ui.plugin.ValidationUIPlugin;
-import org.eclipse.wst.validation.ui.internal.HelpContextIds;
-import org.eclipse.wst.validation.ui.internal.ImageNames;
-import org.eclipse.wst.validation.ui.internal.ValUIMessages;
-import org.eclipse.wst.validation.ui.internal.dialog.FilterDialog;
-
-/**
- * From this page the user can configure individual validators.
- * <p>
- * This class and its inner classes are not intended to be subclassed outside of
- * the validation framework.
- * </p>
- */
-public class ValidationPreferencePage extends PreferencePage implements IWorkbenchPreferencePage {
-
- private IValidationPage _pageImpl = null;
- private Shell _shell;
-
- public interface IValidationPage {
-
- Composite createPage(Composite parent) throws InvocationTargetException;
- boolean performOk() throws InvocationTargetException;
- boolean performDefaults() throws InvocationTargetException;
- Composite getControl();
- void dispose();
- void loseFocus();
- void gainFocus();
- }
-
- public final class InvalidPage implements IValidationPage {
- private Composite page = null;
-
- private Composite composite = null;
- private GridLayout layout = null;
- private Label messageLabel = null;
-
- public InvalidPage(Composite parent) {
- page = createPage(parent);
- }
-
- /**
- * This page is added to the Properties guide if some internal problem
- * occurred; for example, the highlighted item in the workbench is not
- * an IProject (according to this page's plugin.xml, this page is only
- * valid when an IProject is selected).
- */
- public Composite createPage(Composite parent) {
- // Don't create the default and apply buttons.
- noDefaultAndApplyButton();
-
- final ScrolledComposite sc1 = new ScrolledComposite(parent, SWT.H_SCROLL | SWT.V_SCROLL);
- sc1.setLayoutData(new GridData(GridData.FILL_BOTH));
- composite = new Composite(sc1, SWT.NONE);
- sc1.setContent(composite);
- layout = new GridLayout();
- composite.setLayout(layout);
-
- messageLabel = new Label(composite, SWT.NONE);
- messageLabel.setText(ValUIMessages.VBF_EXC_INVALID_REGISTER);
-
- composite.setSize(composite.computeSize(SWT.DEFAULT, SWT.DEFAULT));
-
- return composite;
- }
-
- public boolean performDefaults() {
- return true;
- }
-
- /**
- * Since this page occurs under invalid circumstances, there is nothing
- * to save.
- */
- public boolean performOk() {
- return true;
- }
-
- public Composite getControl() {
- return page;
- }
-
- public void dispose() {
- messageLabel.dispose();
- // layout.dispose();
- composite.dispose();
- }
-
- public void loseFocus() {
- // This page does not depend on the contents of any other page in
- // the wizard, so do nothing.
- }
-
- public void gainFocus() {
- // This page does not depend on the contents of any other page in
- // the wizard, so do nothing.
- }
- }
-
- private final class ValidatorListPage implements IValidationPage {
- private Composite _page;
- private TableViewer _validatorList;
- private Button _enableAllButton;
- private Button _disableAllButton;
- private Button _override;
- private Button _suspend;
- private Button _autoSave;
- private Button _confirmButton;
- private Label _listLabel;
- private Table _validatorsTable;
- private GlobalPreferencesValues _globalPreferences = ValManager.getDefault().getGlobalPreferences().asValues();
- private GlobalConfiguration _globalConfig;
- private ValidatorMutable[] _validators;
-
- private int _changeCount;
-
- /**
- * This class is provided for the CheckboxTableViewer in the
- * ValidationPropertiesPage$ValidatorListPage class.
- */
- public class ValidationContentProvider implements IStructuredContentProvider {
- public void dispose() {
- }
-
- public Object[] getElements(Object inputElement) {
- if (inputElement instanceof ValidatorMutable[]) {
- return (ValidatorMutable[]) inputElement;
- }
- return new Object[0];
- }
-
- public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
- }
- }
-
- /**
- * This class is provided for
- * ValidationPropertiesPage$ValidatorListPage's checkboxTableViewer element.
- */
- public class ValidationLabelProvider extends LabelProvider implements ITableLabelProvider {
- public String getText(Object element) {
- if (element == null)return ""; //$NON-NLS-1$
- else if (element instanceof ValidatorMutable)
- return ((ValidatorMutable) element).getName();
- else
- return super.getText(element);
- }
-
- private Image getImage(String imageName) {
- boolean isDisabled = !_validatorsTable.isEnabled();
- if (isDisabled)imageName = imageName + ImageNames.disabled;
-
- return ValidationUIPlugin.getPlugin().getImage(imageName);
- }
-
- public Image getColumnImage(Object element, int columnIndex) {
- ValidatorMutable v = (ValidatorMutable) element;
- if (columnIndex == 1) {
- return getImage(v.isManualValidation() ? ImageNames.okTable : ImageNames.failTable);
- } else if (columnIndex == 2) {
- return getImage(v.isBuildValidation() ? ImageNames.okTable : ImageNames.failTable);
- } else if (columnIndex == 3) {
- if (hasSettings(v))return getImage(ImageNames.settings);
- return null;
-
- }
- return null;
- }
-
- public String getColumnText(Object element, int columnIndex) {
- if (columnIndex == 0)return ((ValidatorMutable) element).getName();
- return null;
- }
- }
-
- /**
- * This class is used to sort the CheckboxTableViewer elements.
- */
- public class ValidationViewerSorter extends ViewerSorter {
- public int compare(Viewer viewer, Object e1, Object e2) {
- // Can't instantiate ViewerSorter because it's abstract, so use this
- // inner class to represent it.
- return super.compare(viewer, e1, e2);
- }
- }
-
- public ValidatorListPage(Composite parent) throws InvocationTargetException {
- _page = createPage(parent);
- }
-
- private void setupTableColumns(Table table) {
- TableColumn validatorColumn = new TableColumn(table, SWT.NONE);
- validatorColumn.setText(ValUIMessages.VALIDATOR);
- validatorColumn.setWidth(245);
- TableColumn manualColumn = new TableColumn(table, SWT.CENTER);
- manualColumn.setText(ValUIMessages.MANUAL);
- manualColumn.pack();
- TableColumn buildColumn = new TableColumn(table, SWT.CENTER);
- buildColumn.setText(ValUIMessages.BUILD);
- buildColumn.pack();
- TableColumn settingsColumn = new TableColumn(table, SWT.CENTER);
- settingsColumn.setText(ValUIMessages.SETTINGS);
- settingsColumn.pack();
- }
-
- private ValidatorMutable[] getDefaultValidators(){
- Validator[] vals = ValManager.getDefault().getValidators();
- ValidatorMutable[] vms = new ValidatorMutable[vals.length];
- for (int i=0; i<vals.length; i++)vms[i] = new ValidatorMutable(vals[i]);
- return vms;
- }
-
- public Composite createPage(Composite parent) throws InvocationTargetException {
- _globalConfig = new GlobalConfiguration(ConfigurationManager.getManager().getGlobalConfiguration());
- _validators = getDefaultValidators();
-
- Composite validatorGroup = new Composite(parent, SWT.NONE);
-
- GridLayout validatorGroupLayout = new GridLayout();
- validatorGroupLayout.numColumns = 2;
- validatorGroup.setLayout(validatorGroupLayout);
- GridDataFactory.fillDefaults().grab(true, true).applyTo(validatorGroup);
-
- new Label(validatorGroup, SWT.NONE).setLayoutData(new GridData());
-
- addOverride(validatorGroup);
- addSuspend(validatorGroup);
- addAutoSave(validatorGroup);
- addConfirm(validatorGroup);
-
- _listLabel = new Label(validatorGroup, SWT.NONE);
- GridData listLabelData = new GridData(GridData.FILL_HORIZONTAL);
- listLabelData.horizontalSpan = 2;
- _listLabel.setLayoutData(listLabelData);
- _listLabel.setText(ValUIMessages.PREF_VALLIST_TITLE);
-
- _validatorsTable = new Table(validatorGroup, SWT.SINGLE | SWT.BORDER | SWT.FULL_SELECTION);
- Point preferredSize = _validatorsTable.computeSize(SWT.DEFAULT, SWT.DEFAULT);
- GridDataFactory.fillDefaults().grab(true, true).hint(preferredSize)
- .span(2,1).applyTo(_validatorsTable);
-
-
- _validatorsTable.setHeaderVisible(true);
- _validatorsTable.setLinesVisible(true);
-
- _validatorList = new TableViewer(_validatorsTable);
-// _validatorsTable.setLayoutData(validatorListData);
-// _validatorList.getTable().setLayoutData(validatorListData);
- _validatorList.setLabelProvider(new ValidationLabelProvider());
- _validatorList.setContentProvider(new ValidationContentProvider());
- _validatorList.setSorter(new ValidationViewerSorter());
- setupTableColumns(_validatorsTable);
-
- _validatorList.setInput(_validators);
- _validatorsTable.addMouseListener(new MouseAdapter() {
-
- public void mouseDown(MouseEvent e) {
- if (e.button != 1)return;
-
- TableItem tableItem = _validatorsTable.getItem(new Point(e.x, e.y));
- if (tableItem == null || tableItem.isDisposed())return;
- int columnNumber;
- int columnsCount = _validatorsTable.getColumnCount();
- if (columnsCount == 0) {
- // If no TableColumn, Table acts as if it has a single
- // column which takes the whole width.
- columnNumber = 0;
- } else {
- columnNumber = -1;
- for (int i = 0; i < columnsCount; i++) {
- Rectangle bounds = tableItem.getBounds(i);
- if (bounds.contains(e.x, e.y)) {
- columnNumber = i;
- break;
- }
- }
- if (columnNumber == -1)return;
- }
-
- columnClicked(columnNumber);
- }
- });
-
- _validatorsTable.setMenu(createContextMenu());
- _validatorsTable.addFocusListener(new FocusAdapter() {
-
- public void focusGained(FocusEvent e) {
- super.focusGained(e);
- if (_validatorsTable.getSelectionCount() == 0) {
- _validatorsTable.select(0);
- }
- }
- });
-
- addEnableDisable(validatorGroup);
-
- updateWidgets();
-
- applyDialogFont(validatorGroup);
- validatorGroup.setSize(validatorGroup.computeSize(SWT.DEFAULT, SWT.DEFAULT));
- return validatorGroup;
- }
-
- private void addEnableDisable(Composite validatorGroup) {
- _enableAllButton = new Button(validatorGroup, SWT.PUSH);
- _enableAllButton.setLayoutData(new GridData());
- _enableAllButton.setText(ValUIMessages.PREF_BUTTON_ENABLEALL);
- _enableAllButton.addSelectionListener(new SelectionAdapter() {
- public void widgetSelected(SelectionEvent e) {
- try {
- performEnableAll();
- } catch (InvocationTargetException exc) {
- displayAndLogError(ValUIMessages.VBF_EXC_INTERNAL_TITLE,
- ValUIMessages.VBF_EXC_INTERNAL_PAGE, exc);
- }
- }
- });
-
- _disableAllButton = new Button(validatorGroup, SWT.PUSH);
- _disableAllButton.setLayoutData(new GridData());
- _disableAllButton.setText(ValUIMessages.PREF_BUTTON_DISABLEALL);
- _disableAllButton.addSelectionListener(new SelectionAdapter() {
- public void widgetSelected(SelectionEvent e) {
- try {
- performDisableAll();
- } catch (InvocationTargetException exc) {
- displayAndLogError(ValUIMessages.VBF_EXC_INTERNAL_TITLE,
- ValUIMessages.VBF_EXC_INTERNAL_PAGE, exc);
- }
- }
- });
- }
-
- private void addConfirm(Composite validatorGroup) {
- GridData gd;
- gd = new GridData(GridData.FILL_HORIZONTAL);
- gd.horizontalSpan = 2;
- _confirmButton = new Button(validatorGroup, SWT.CHECK);
- _confirmButton.setLayoutData(gd);
- _confirmButton.setText(ValUIMessages.PrefPageConfirmDialog);
- _confirmButton.setSelection(_globalPreferences.confirmDialog);
- _confirmButton.addSelectionListener(new SelectionAdapter() {
- public void widgetSelected(SelectionEvent e) {
- // do not increment the _changeCount as this by itself should not trigger a build prompt
- _globalPreferences.confirmDialog = _confirmButton.getSelection();
- _confirmButton.setFocus();
- }
- });
- }
-
- private void addAutoSave(Composite validatorGroup) {
- GridData gd;
- gd = new GridData(GridData.FILL_HORIZONTAL);
- gd.horizontalSpan = 2;
- _autoSave = new Button(validatorGroup, SWT.CHECK);
- _autoSave.setLayoutData(gd);
- _autoSave.setText(ValUIMessages.PrefPage_always_save);
- _autoSave.setSelection(_globalPreferences.saveAutomatically);
- _autoSave.addSelectionListener(new SelectionAdapter() {
- public void widgetSelected(SelectionEvent e) {
- // do not increment the _changeCount as this by itself should not trigger a build prompt
- _globalPreferences.saveAutomatically = _autoSave.getSelection();
- _autoSave.setFocus();
- }
- });
- }
-
- private void addSuspend(Composite validatorGroup) {
- GridData gd;
- gd = new GridData(GridData.FILL_HORIZONTAL);
- gd.horizontalSpan = 2;
-
- _suspend = new Button(validatorGroup, SWT.CHECK);
- _suspend.setLayoutData(gd);
- _suspend.setText(ValUIMessages.DISABLE_VALIDATION);
- _suspend.setSelection(_globalPreferences.disableAllValidation);
- _suspend.addSelectionListener(new SelectionAdapter() {
- public void widgetSelected(SelectionEvent e) {
- _suspend.setFocus();
- _validatorsTable.setEnabled(!_suspend.getSelection());
- _enableAllButton.setEnabled(!_suspend.getSelection());
- _disableAllButton.setEnabled(!_suspend.getSelection());
- _validatorList.refresh();
- }
- });
- }
-
- private void addOverride(Composite validatorGroup) {
- GridData gd = new GridData(GridData.FILL_HORIZONTAL);
- gd.horizontalSpan = 2;
-
- _override = new Button(validatorGroup, SWT.CHECK);
- _override.setLayoutData(gd);
- _override.setText(ValUIMessages.PREF_BUTTON_OVERRIDE);
- _override.setEnabled(true);
- _override.setSelection(_globalPreferences.override);
- _override.addSelectionListener(new SelectionAdapter() {
- public void widgetSelected(SelectionEvent e) {
- _globalPreferences.override = _override.getSelection();
- _override.setFocus();
-
- }
- });
- }
-
- protected Menu createContextMenu() {
- final Menu menu = new Menu(_validatorsTable.getShell(), SWT.POP_UP);
- final MenuItem manualItem = new MenuItem(menu, SWT.CHECK);
- manualItem.setText(ValUIMessages.PREF_MNU_MANUAL);
- final MenuItem buildItem = new MenuItem(menu, SWT.CHECK);
- buildItem.setText(ValUIMessages.PREF_MNU_BUILD);
- final MenuItem settingsItem = new MenuItem(menu, SWT.PUSH);
- settingsItem.setText(ValUIMessages.PREF_MNU_SETTINGS);
-
- class MenuItemListener extends SelectionAdapter {
- public void widgetSelected(SelectionEvent e) {
- MenuItem menuItem = (MenuItem) e.getSource();
- int index = menu.indexOf(menuItem) + 1;
- columnClicked(index);
- }
- }
- MenuItemListener listener = new MenuItemListener();
- manualItem.addSelectionListener(listener);
- buildItem.addSelectionListener(listener);
- settingsItem.addSelectionListener(listener);
-
- menu.addMenuListener(new MenuAdapter() {
- public void menuShown(MenuEvent e) {
- IStructuredSelection selection = (IStructuredSelection) _validatorList.getSelection();
- ValidatorMutable vw = (ValidatorMutable) selection.getFirstElement();
- manualItem.setSelection(vw.isManualValidation());
- buildItem.setSelection(vw.isBuildValidation());
- settingsItem.setEnabled(hasSettings(vw));
- }
- });
-
- return menu;
- }
-
- protected void columnClicked(int columnToEdit) {
- IStructuredSelection selection = (IStructuredSelection) _validatorList.getSelection();
- ValidatorMutable val = (ValidatorMutable) selection.getFirstElement();
-
- switch (columnToEdit) {
- case 1:
- _changeCount++;
- val.setManualValidation(!val.isManualValidation());
- break;
- case 2:
- _changeCount++;
- val.setBuildValidation(!val.isBuildValidation());
- break;
- case 3:
- if (val.isV2Validator()){
- ValidatorMutable newVal = new ValidatorMutable(val);
- FilterDialog fd = new FilterDialog(_shell, newVal, null);
- if (Window.OK == fd.open()){
- _changeCount++;
- newVal = fd.getValidator();
- int i = findit(val);
- if (i != -1)_validators[i] = newVal;
- }
- }
- else {
- handleOldDelegate(val);
- }
-
- break;
- default:
- break;
- }
- _validatorList.refresh();
- }
-
- private int findit(ValidatorMutable val) {
- for (int i=0; i<_validators.length; i++)if (_validators[i] == val)return i;
- return -1;
- }
-
- private void handleOldDelegate(ValidatorMutable val) {
- if (!val.isV1Validator())return;
-
- ValidatorMetaData vmd = val.getVmd();
- if (!vmd.isDelegating())return;
-
- String delegateID = _globalConfig.getDelegateUniqueName(vmd);
- Shell shell = Display.getCurrent().getActiveShell();
- DelegatingValidatorPreferencesDialog dialog =
- new DelegatingValidatorPreferencesDialog(shell, vmd, delegateID);
-
- dialog.setBlockOnOpen(true);
- dialog.create();
-
- int result = dialog.open();
- if (result == Window.OK){
- _changeCount++;
- _globalConfig.setDelegateUniqueName(vmd, dialog.getDelegateID());
- }
- }
-
- /**
- * Does this validator have extra settings that can be configured?
- * @param v
- * @return true if it does
- */
- boolean hasSettings(ValidatorMutable v){
- if (v.isV2Validator())return true;
- if (v.getDelegatingId() != null)return true;
- return false;
- }
-
- protected void updateWidgets() throws InvocationTargetException {
- // Need to update even the widgets that do not change based on another
- // widgets because of performDefaults(). If performDefaults() is
- // selected, then the pagePreferences values are reset, and these widgets
- // might also need to be updated.
- updateAllWidgets();
- updateHelp();
- }
-
- private void updateAllWidgets() throws InvocationTargetException {
- _suspend.setSelection(_globalPreferences.disableAllValidation);
- _autoSave.setSelection(_globalPreferences.saveAutomatically);
- _confirmButton.setSelection(_globalPreferences.confirmDialog);
- _override.setSelection(_globalPreferences.override);
- _validatorsTable.setEnabled(!_suspend.getSelection());
- _enableAllButton.setEnabled(!_suspend.getSelection());
- _disableAllButton.setEnabled(!_suspend.getSelection());
- _validatorList.setInput(_validators);
- _validatorList.refresh();
- }
-
- public boolean performOk() throws InvocationTargetException {
- _globalPreferences.disableAllValidation = _suspend.getSelection();
- _globalPreferences.saveAutomatically = _autoSave.getSelection();
- ValManager vm = ValManager.getDefault();
- int changes = vm.replace(_globalPreferences);
- if ((changes & GlobalPreferences.BuildChangeMask) != 0)_changeCount++;
-
- ValPrefManagerGlobal vpm = ValPrefManagerGlobal.getDefault();
- vpm.savePreferences(vm.getGlobalPreferences(), _validators, null);
- saveV1Preferences();
-
- if (_changeCount > 0 &&
- MessageDialog.openQuestion(_shell, ValUIMessages.RebuildTitle, ValUIMessages.RebuildMsg)){
-
- FullBuildJob fbj = new FullBuildJob();
- fbj.schedule();
- }
- return true;
- }
-
- /**
- * Save the V1 preferences, so that the old validators continue to work.
- */
- private void saveV1Preferences(){
- try {
- GlobalConfiguration gc = ConfigurationManager.getManager().getGlobalConfiguration();
- gc.setDisableAllValidation(_globalPreferences.disableAllValidation);
- gc.setEnabledManualValidators(getEnabledManualValidators());
- gc.setEnabledBuildValidators(getEnabledBuildValidators());
-
- gc.passivate();
- gc.store();
- }
- catch (InvocationTargetException e){
- ValidationUIPlugin.getPlugin().handleException(e);
- }
- }
-
- /**
- * Answer all the V1 validators that are manually enabled.
- * @return
- */
- private ValidatorMetaData[] getEnabledManualValidators() {
- List<ValidatorMetaData> list = new LinkedList<ValidatorMetaData>();
- for (ValidatorMutable v : _validators){
- if (v.isManualValidation() && v.isV1Validator())list.add(v.getVmd());
- }
- ValidatorMetaData[] result = new ValidatorMetaData[list.size()];
- list.toArray(result);
- return result;
- }
-
- /**
- * Answer all the V1 validators that are enabled for build.
- * @return
- */
- private ValidatorMetaData[] getEnabledBuildValidators() {
- List<ValidatorMetaData> list = new LinkedList<ValidatorMetaData>();
- for (ValidatorMutable v : _validators){
- if (v.isBuildValidation() && v.isV1Validator())list.add(v.getVmd());
- }
- ValidatorMetaData[] result = new ValidatorMetaData[list.size()];
- list.toArray(result);
- return result;
- }
-
- public boolean performDefaults() throws InvocationTargetException {
- _changeCount++;
- Validator[] vals = ValManager.getDefaultValidators();
- _validators = new ValidatorMutable[vals.length];
- for (int i=0; i<vals.length; i++)_validators[i] = new ValidatorMutable(vals[i]);
- updateWidgets();
- getDefaultsButton().setFocus();
- return true;
- }
-
- public boolean performEnableAll() throws InvocationTargetException {
- setAllValidators(true);
- _enableAllButton.setFocus();
- _validatorList.refresh();
- return true;
- }
-
- public boolean performDisableAll() throws InvocationTargetException {
- setAllValidators(false);
- _disableAllButton.setFocus();
- _validatorList.refresh();
- return true;
- }
-
- private void setAllValidators(boolean bool){
- _changeCount++;
- for (ValidatorMutable v : _validators){
- v.setBuildValidation(bool);
- v.setManualValidation(bool);
- }
- }
-
- protected void updateHelp() {
-// PlatformUI.getWorkbench().getHelpSystem().setHelp(_suspend, ContextIds.VALIDATION_PREFERENCE_PAGE_DISABLE_ALL_ENABLED);
- }
-
- /*
- * Store the current values of the controls into the preference store.
- */
-
- public Composite getControl() {
- return _page;
- }
-
- public void dispose() {
- _autoSave.dispose();
- _suspend.dispose();
- _disableAllButton.dispose();
- _enableAllButton.dispose();
- _listLabel.dispose();
- _suspend.dispose();
- _validatorList.getTable().dispose();
- }
-
- public void loseFocus() {
- }
-
- public void gainFocus() {
- }
- }
-
- /*
- * @see PreferencePage#createContents(Composite)
- */
- protected Control createContents(Composite parent) {
- PlatformUI.getWorkbench().getHelpSystem().setHelp(parent, HelpContextIds.PreferencePage);
- try {
- _shell = parent.getShell();
- _pageImpl = new ValidatorListPage(parent);
- } catch (Exception exc) {
- _pageImpl = new InvalidPage(parent);
- displayAndLogError(ValUIMessages.VBF_EXC_INTERNAL_TITLE, ValUIMessages.VBF_EXC_INTERNAL_PAGE, exc);
- }
-
- return _pageImpl.getControl();
- }
-
- public void init(IWorkbench workbench) {
- }
-
- /**
- * Performs special processing when this page's Defaults button has been
- * pressed.
- * <p>
- * This is a framework hook method for subclasses to do special things when
- * the Defaults button has been pressed. Subclasses may override, but should
- * call <code>super.performDefaults</code>.
- * </p>
- */
- protected void performDefaults() {
- super.performDefaults();
-
- try {
- _pageImpl.performDefaults();
- } catch (Exception exc) {
- displayAndLogError(ValUIMessages.VBF_EXC_INTERNAL_TITLE, ValUIMessages.VBF_EXC_INTERNAL_PAGE, exc);
- }
- }
-
- /**
- * When the user presses the "OK" or "Apply" button on the Properties
- * Guide/Properties Page, respectively, some processing is performed by this
- * PropertyPage. If the page is found, and completes successfully, true is
- * returned. Otherwise, false is returned, and the guide doesn't finish.
- */
- public boolean performOk() {
- try {
- return _pageImpl.performOk();
- }
- catch (Exception exc) {
- displayAndLogError(ValUIMessages.VBF_EXC_INTERNAL_TITLE, ValUIMessages.VBF_EXC_INTERNAL_PAGE, exc);
- return false;
- }
- }
-
- /**
- * Since the pages are inner classes of a child PreferencePage, not a
- * PreferencePage itself, DialogPage's automatic disposal of its children's
- * widgets cannot be used. Instead, dispose of each inner class' widgets
- * explicitly.
- */
- public void dispose() {
- super.dispose();
- try {
- if (_pageImpl != null) {
- _pageImpl.dispose();
- _pageImpl = null;
- }
-
- // TODO figure out what this thing did
- // ExtensionManger.instance().getDelegate().disposePreferencePage();
- } catch (Exception exc) {
- displayAndLogError(ValUIMessages.VBF_EXC_INTERNAL_TITLE, ValUIMessages.VBF_EXC_INTERNAL_PAGE, exc);
- }
- }
-
- private void logError(Throwable exc) {
- ValidationUIPlugin.getPlugin().handleException(exc);
- }
-
- /*
- * package visibility because if this method is private, then the compiler
- * needs to create a synthetic accessor method for the internal classes, and
- * that can have performance implications.
- */
- void displayAndLogError(String title, String message, Throwable exc) {
- logError(exc);
- displayMessage(title, message, org.eclipse.swt.SWT.ICON_ERROR);
- }
-
- private void displayMessage(String title, String message, int iIconType) {
- MessageBox messageBox = new MessageBox(getShell(),
- org.eclipse.swt.SWT.OK | iIconType | org.eclipse.swt.SWT.APPLICATION_MODAL);
- messageBox.setMessage(message);
- messageBox.setText(title);
- messageBox.open();
- }
-
- /**
- * @see org.eclipse.jface.dialogs.IDialogPage#setVisible(boolean)
- */
- public void setVisible(boolean visible) {
- super.setVisible(visible);
-
- if (_pageImpl == null)return;
- if (visible)_pageImpl.gainFocus();
- else _pageImpl.loseFocus();
- }
-
- protected Button getDefaultsButton() {
- return super.getDefaultsButton();
- }
-}
diff --git a/plugins/org.eclipse.wst.validation.ui/vf2/org/eclipse/wst/validation/ui/internal/preferences/ValidationPropertyPage.java b/plugins/org.eclipse.wst.validation.ui/vf2/org/eclipse/wst/validation/ui/internal/preferences/ValidationPropertyPage.java
deleted file mode 100644
index 53c574a..0000000
--- a/plugins/org.eclipse.wst.validation.ui/vf2/org/eclipse/wst/validation/ui/internal/preferences/ValidationPropertyPage.java
+++ /dev/null
@@ -1,879 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.validation.ui.internal.preferences;
-
-import java.lang.reflect.InvocationTargetException;
-import org.eclipse.core.resources.ICommand;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IProjectDescription;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.layout.GridDataFactory;
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.ITableLabelProvider;
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerSorter;
-import org.eclipse.jface.window.Window;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.ScrolledComposite;
-import org.eclipse.swt.events.FocusAdapter;
-import org.eclipse.swt.events.FocusEvent;
-import org.eclipse.swt.events.MenuAdapter;
-import org.eclipse.swt.events.MenuEvent;
-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.graphics.Image;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.graphics.Rectangle;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-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.swt.widgets.Display;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Link;
-import org.eclipse.swt.widgets.Menu;
-import org.eclipse.swt.widgets.MenuItem;
-import org.eclipse.swt.widgets.MessageBox;
-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.ui.PlatformUI;
-import org.eclipse.ui.dialogs.PreferencesUtil;
-import org.eclipse.ui.dialogs.PropertyPage;
-import org.eclipse.wst.validation.Validator;
-import org.eclipse.wst.validation.internal.ConfigurationManager;
-import org.eclipse.wst.validation.internal.GlobalConfiguration;
-import org.eclipse.wst.validation.internal.ProjectConfiguration;
-import org.eclipse.wst.validation.internal.ValManager;
-import org.eclipse.wst.validation.internal.ValPrefManagerProject;
-import org.eclipse.wst.validation.internal.ValidatorMetaData;
-import org.eclipse.wst.validation.internal.ValidatorMutable;
-import org.eclipse.wst.validation.internal.ValManager.UseProjectPreferences;
-import org.eclipse.wst.validation.internal.model.ProjectPreferences;
-import org.eclipse.wst.validation.internal.operations.ValidatorManager;
-import org.eclipse.wst.validation.internal.plugin.ValidationPlugin;
-import org.eclipse.wst.validation.internal.ui.DelegatingValidatorPreferencesDialog;
-import org.eclipse.wst.validation.internal.ui.plugin.ValidationUIPlugin;
-import org.eclipse.wst.validation.ui.internal.HelpContextIds;
-import org.eclipse.wst.validation.ui.internal.ImageNames;
-import org.eclipse.wst.validation.ui.internal.ValUIMessages;
-import org.eclipse.wst.validation.ui.internal.dialog.FilterDialog;
-
-/**
- * From this page the user can configure individual validators on individual projects.
- *
- * @author karasiuk
- */
-public class ValidationPropertyPage extends PropertyPage {
-
- private IValidationPage _pageImpl;
- private Shell _shell;
-
- public interface IValidationPage {
-
- Composite createPage(Composite parent) throws InvocationTargetException;
- boolean performOk() throws InvocationTargetException;
- boolean performDefaults() throws InvocationTargetException;
- Composite getControl();
- void dispose();
- void loseFocus();
- void gainFocus();
- }
-
- public class InvalidPage implements IValidationPage {
-
- private Composite page = null;
- private Composite composite = null;
- private GridLayout layout = null;
- private Label messageLabel = null;
-
- public InvalidPage(Composite parent) {
- page = createPage(parent);
- }
-
- /**
- * This page is added to the Properties guide if some internal problem
- * occurred; for example, the highlighted item in the workbench is not
- * an IProject (according to this page's plugin.xml, this page is only
- * valid when an IProject is selected).
- */
- public Composite createPage(Composite parent) {
- noDefaultAndApplyButton();
-
- final ScrolledComposite sc1 = new ScrolledComposite(parent, SWT.H_SCROLL | SWT.V_SCROLL);
- sc1.setLayoutData(new GridData(GridData.FILL_BOTH));
- composite = new Composite(sc1, SWT.NONE);
- sc1.setContent(composite);
- layout = new GridLayout();
- composite.setLayout(layout);
-
- messageLabel = new Label(composite, SWT.NONE);
- messageLabel.setText(ValUIMessages.VBF_EXC_INVALID_REGISTER);
-
- composite.setSize(composite.computeSize(SWT.DEFAULT, SWT.DEFAULT));
-
- return composite;
- }
-
- public boolean performDefaults() {
- return true;
- }
-
- /**
- * Since this page occurs under invalid circumstances, there is nothing
- * to save.
- */
- public boolean performOk() {
- return true;
- }
-
- public Composite getControl() {
- return page;
- }
-
- public void dispose() {
- messageLabel.dispose();
- // layout.dispose();
- composite.dispose();
- }
-
- public void loseFocus() {
- }
-
- public void gainFocus() {
- }
- }
-
- private final class ValidatorListPage implements IValidationPage {
- private Composite _page;
-
- private TableViewer _validatorList;
- private Button _enableAllButton;
- private Button _disableAllButton;
- private Button _override;
- private Button _suspend;
- private Link _configLink;
- private Button _addValidationBuilder;
- private Table _validatorsTable;
- private ValidatorMutable[] _validators;
-
- /** Number of things that may have changed. */
- private int _changes;
-
- /**
- * This class is provided for the CheckboxTableViewer in the
- * ValidationPropertiesPage$ValidatorListPage class.
- */
- public class ValidationContentProvider implements IStructuredContentProvider {
- public void dispose() {
- }
-
- public Object[] getElements(Object inputElement) {
- if (inputElement instanceof ValidatorMutable[]) {
- return (ValidatorMutable[]) inputElement;
- }
- return new Object[0];
- }
-
- public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
- }
- }
-
- /**
- * This class is provided for
- * ValidationPropertiesPage$ValidatorListPage's checkboxTableViewer
- * element.
- */
- public class ValidationLabelProvider extends LabelProvider implements ITableLabelProvider {
- public String getText(Object element) {
- if (element == null)return ""; //$NON-NLS-1$
- else if (element instanceof Validator)
- return ((ValidatorMutable) element).getName();
- else
- return super.getText(element);
- }
-
- private Image getImage(String imageName) {
- boolean isDisabled = !_validatorsTable.isEnabled();
- if (isDisabled)
- imageName = imageName + ImageNames.disabled;
-
- return ValidationUIPlugin.getPlugin().getImage(imageName);
- }
-
- public Image getColumnImage(Object element, int columnIndex) {
- ValidatorMutable v = (ValidatorMutable) element;
- if (columnIndex == 1) {
- return getImage(v.isManualValidation() ? ImageNames.okTable
- : ImageNames.failTable);
- } else if (columnIndex == 2) {
- return getImage(v.isBuildValidation() ? ImageNames.okTable
- : ImageNames.failTable);
- } else if (columnIndex == 3) {
- if (hasSettings(v))return getImage(ImageNames.settings);
- return null;
- }
- return null;
- }
-
- public String getColumnText(Object element, int columnIndex) {
- if (columnIndex == 0)return ((ValidatorMutable) element).getName();
- return null;
- }
- }
-
- public ValidatorListPage(Composite parent) throws InvocationTargetException {
- _page = createPage(parent);
- }
-
- private void setupTableColumns(Table table) {
- TableColumn validatorColumn = new TableColumn(table, SWT.NONE);
- validatorColumn.setText(ValUIMessages.VALIDATOR);
- validatorColumn.setWidth(245);
- TableColumn manualColumn = new TableColumn(table, SWT.CENTER);
- manualColumn.setText(ValUIMessages.MANUAL);
- manualColumn.pack();
- TableColumn buildColumn = new TableColumn(table, SWT.CENTER);
- buildColumn.setText(ValUIMessages.BUILD);
- buildColumn.pack();
- TableColumn settingsColumn = new TableColumn(table, SWT.CENTER);
- settingsColumn.setText(ValUIMessages.SETTINGS);
- settingsColumn.pack();
- }
-
- public Composite createPage(Composite parent) throws InvocationTargetException {
- Validator[] vals = ValManager.getDefault()
- .getValidatorsConfiguredForProject(getProject(), UseProjectPreferences.MustUse);
- _validators = new ValidatorMutable[vals.length];
- for (int i=0; i<vals.length; i++)_validators[i] = new ValidatorMutable(vals[i]);
-
- Composite validatorGroup = new Composite(parent, SWT.NONE);
-
- GridLayout validatorGroupLayout = new GridLayout();
- validatorGroupLayout.numColumns = 2;
- validatorGroup.setLayout(validatorGroupLayout);
- GridDataFactory.fillDefaults().grab(true, true).applyTo(validatorGroup);
-
- addOverride(validatorGroup);
- addConfigLink(validatorGroup);
- //
- addLine(validatorGroup);
- addSuspend(validatorGroup);
- addValidationBuilder(validatorGroup);
- new Label(validatorGroup, SWT.NONE).setLayoutData(new GridData());
-
- Label listLabel = new Label(validatorGroup, SWT.NONE);
- GridData listLabelData = new GridData(GridData.FILL_HORIZONTAL);
- listLabelData.horizontalSpan = 2;
- listLabel.setLayoutData(listLabelData);
- listLabel.setText(ValUIMessages.PREF_VALLIST_TITLE);
-
- _validatorsTable = new Table(validatorGroup, SWT.BORDER | SWT.FULL_SELECTION);
- Point preferredSize = _validatorsTable.computeSize(SWT.DEFAULT, SWT.DEFAULT);
- GridDataFactory.fillDefaults().grab(true, true).hint(preferredSize)
- .span(2,1).applyTo(_validatorsTable);
-
- _validatorsTable.setHeaderVisible(true);
- _validatorsTable.setLinesVisible(true);
-
- _validatorList = new TableViewer(_validatorsTable);
- _validatorList.setLabelProvider(new ValidationLabelProvider());
- _validatorList.setContentProvider(new ValidationContentProvider());
- _validatorList.setSorter(new ViewerSorter());
- setupTableColumns(_validatorsTable);
-
- _validatorList.setInput(_validators);
- _validatorsTable.addMouseListener(new MouseAdapter() {
-
- public void mouseDown(MouseEvent e) {
- if (e.button != 1)return;
-
- TableItem tableItem = _validatorsTable.getItem(new Point(e.x, e.y));
- if (tableItem == null || tableItem.isDisposed()) {
- // item no longer exists
- return;
- }
- int columnNumber;
- int columnsCount = _validatorsTable.getColumnCount();
- if (columnsCount == 0) {
- // If no TableColumn, Table acts as if it has a single column
- // which takes the whole width.
- columnNumber = 0;
- } else {
- columnNumber = -1;
- for (int i = 0; i < columnsCount; i++) {
- Rectangle bounds = tableItem.getBounds(i);
- if (bounds.contains(e.x, e.y)) {
- columnNumber = i;
- break;
- }
- }
- if (columnNumber == -1)return;
- }
-
- columnClicked(columnNumber);
- }
- });
-
- _validatorsTable.setMenu(createContextMenu());
- _validatorsTable.addFocusListener(new FocusAdapter() {
-
- public void focusGained(FocusEvent e) {
- super.focusGained(e);
- if (_validatorsTable.getSelectionCount() == 0) {
- _validatorsTable.select(0);
- }
- }
- });
-
- addButtons(validatorGroup);
-
- updateWidgets();
-
- applyDialogFont(validatorGroup);
- validatorGroup.setSize(validatorGroup.computeSize(SWT.DEFAULT, SWT.DEFAULT));
-
- return validatorGroup;
- }
-
- private void addButtons(Composite validatorGroup) {
-
- Composite buttons = new Composite(validatorGroup, SWT.NONE);
- GridData gd = new GridData(GridData.FILL_HORIZONTAL);
- gd.horizontalSpan = 2;
- buttons.setLayout(new RowLayout());
-
- _enableAllButton = new Button(buttons, SWT.PUSH);
- _enableAllButton.setText(ValUIMessages.PREF_BUTTON_ENABLEALL);
- _enableAllButton.addSelectionListener(new SelectionAdapter() {
- public void widgetSelected(SelectionEvent e) {
- try {
- performEnableAll();
- } catch (InvocationTargetException exc) {
- displayAndLogError(ValUIMessages.VBF_EXC_INTERNAL_TITLE,ValUIMessages.VBF_EXC_INTERNAL_PAGE, exc);
- }
- }
- });
-
- _disableAllButton = new Button(buttons, SWT.PUSH);
- _disableAllButton.setText(ValUIMessages.PREF_BUTTON_DISABLEALL);
- _disableAllButton.addSelectionListener(new SelectionAdapter() {
- public void widgetSelected(SelectionEvent e) {
- try {
- performDisableAll();
- } catch (InvocationTargetException exc) {
- displayAndLogError(ValUIMessages.VBF_EXC_INTERNAL_TITLE, ValUIMessages.VBF_EXC_INTERNAL_PAGE, exc);
- }
- }
- });
- }
-
- private void addSuspend(Composite validatorGroup) {
- GridData gd = new GridData(GridData.FILL_HORIZONTAL);
- gd.horizontalSpan = 2;
- _suspend = new Button(validatorGroup, SWT.CHECK);
- _suspend.setLayoutData(gd);
- _suspend.setText(ValUIMessages.DISABLE_VALIDATION);
- _suspend.setSelection(getProjectPreferences().getSuspend());
- _suspend.addSelectionListener(new SelectionAdapter() {
- public void widgetSelected(SelectionEvent e) {
- _suspend.setFocus();
- _changes++;
- enableDisableWidgets();
- _validatorList.refresh();
- }
- });
- }
-
- //Add a line separator
- private void addLine(Composite validatorGroup) {
- GridData gd = new GridData(GridData.FILL_HORIZONTAL);
- gd.horizontalSpan = 2;
- Label line = new Label(validatorGroup,SWT.SEPARATOR | SWT.SHADOW_OUT | SWT.HORIZONTAL);
- line.setLayoutData(gd);
-
-
- }
-
- private void addConfigLink(Composite validatorGroup){
- _configLink = new Link(validatorGroup,SWT.None);
- GridData layout = new GridData(GridData.HORIZONTAL_ALIGN_END);
- _configLink.setLayoutData(layout);
- _configLink.setText("<A>"+ //$NON-NLS-1$
- ValUIMessages.ConfigWsSettings+"</A>"); //$NON-NLS-1$
- _configLink.addSelectionListener(new SelectionListener() {
- public static final String DATA_NO_LINK = "PropertyAndPreferencePage.nolink"; //$NON-NLS-1$
-
- public void doLinkActivated(Link e) {
- String id = getPreferencePageID();
- PreferencesUtil.createPreferenceDialogOn(getShell(), id, new String[]{id}, DATA_NO_LINK).open();
- try {
- updateWidgets();
- } catch (InvocationTargetException ie) {
-
- }
- }
-
- private String getPreferencePageID() {
- return "ValidationPreferencePage"; //$NON-NLS-1$
- }
-
- public void widgetDefaultSelected(SelectionEvent e) {
- doLinkActivated((Link) e.widget);
- }
-
- public void widgetSelected(SelectionEvent e) {
- doLinkActivated((Link) e.widget);
- }
- });
-
- }
-
- /**
- * If the current project doesn't have the validation builder configured on it,
- * and the user has asked us to add a builder, add the builder.
- * Otherwise return without doing anything.
- */
- private void addBuilder() {
- if (_addValidationBuilder != null && _addValidationBuilder.getSelection())
- ValidatorManager.addProjectBuildValidationSupport(getProject());
- }
-
-
- private void addValidationBuilder(Composite validatorGroup) {
- if (hasValidationBuilder())return;
-
- GridData gd = new GridData(GridData.FILL_HORIZONTAL);
- gd.horizontalSpan = 2;
- _addValidationBuilder = new Button(validatorGroup, SWT.CHECK);
- _addValidationBuilder.setLayoutData(gd);
- _addValidationBuilder.setText(ValUIMessages.ADD_VALIDATION_BUILDER);
- _addValidationBuilder.setSelection(false);
- }
-
- /**
- * Does this validator have extra settings that can be configured?
- * @param v
- * @return true if it does
- */
- boolean hasSettings(ValidatorMutable v){
- if (v.isV2Validator())return true;
- if (v.getDelegatingId() != null)return true;
- return false;
- }
-
- /**
- * Answer if this project has a validator builder assigned to it.
- */
- private boolean hasValidationBuilder(){
- try {
- IProjectDescription description = getProject().getDescription();
- ICommand[] commands = description.getBuildSpec();
- for (int i = 0; i < commands.length; i++) {
- if (commands[i].getBuilderName().equals(ValidationPlugin.VALIDATION_BUILDER_ID))
- return true;
- }
- return false;
- }
- catch (CoreException e){
- ValidationPlugin.getPlugin().handleException(e);
- }
- return false;
- }
-
-
- private void addOverride(Composite validatorGroup) {
- GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-// gd.horizontalSpan = 2;
- _override = new Button(validatorGroup, SWT.CHECK);
- _override.setLayoutData(gd);
- _override.setText(ValUIMessages.LabelEnableProjectSpecific);
- _override.setSelection(getProjectPreferences().getOverride());
- _override.addSelectionListener(new SelectionAdapter() {
- public void widgetSelected(SelectionEvent e) {
- _override.setFocus();
- _changes++;
- ValManager vm = ValManager.getDefault();
- if (vm.getGlobalPreferences().getOverride()){
-// IProject project = getProject();
-// UseProjectPreferences useProject = UseProjectPreferences.Normal;
-// if (_override.getSelection())useProject = UseProjectPreferences.MustUse;
-// _validators = copyValidators(vm.getValidatorsConfiguredForProject(project, useProject));
-// _validatorList.setInput(_validators);
- enableDisableWidgets();
- _validatorList.refresh();
- }
- else {
- MessageDialog.openWarning(_shell, ValUIMessages.Validation,
- ValUIMessages.ProjectOverridesNotAllowed);
- }
- }
-
- });
- }
-
- protected Menu createContextMenu() {
- final Menu menu = new Menu(_validatorsTable.getShell(), SWT.POP_UP);
- final MenuItem manualItem = new MenuItem(menu, SWT.CHECK);
- manualItem.setText(ValUIMessages.PREF_MNU_MANUAL);
- final MenuItem buildItem = new MenuItem(menu, SWT.CHECK);
- buildItem.setText(ValUIMessages.PREF_MNU_BUILD);
- final MenuItem settingsItem = new MenuItem(menu, SWT.PUSH);
- settingsItem.setText(ValUIMessages.PREF_MNU_SETTINGS);
-
- class MenuItemListener extends SelectionAdapter {
- public void widgetSelected(SelectionEvent e) {
- MenuItem menuItem = (MenuItem) e.getSource();
- int index = menu.indexOf(menuItem) + 1;
- columnClicked(index);
- }
- }
- MenuItemListener listener = new MenuItemListener();
- manualItem.addSelectionListener(listener);
- buildItem.addSelectionListener(listener);
- settingsItem.addSelectionListener(listener);
-
- menu.addMenuListener(new MenuAdapter() {
- public void menuShown(MenuEvent e) {
- IStructuredSelection selection = (IStructuredSelection) _validatorList.getSelection();
- ValidatorMutable val = (ValidatorMutable) selection.getFirstElement();
- manualItem.setSelection(val.isManualValidation());
- buildItem.setSelection(val.isBuildValidation());
- settingsItem.setEnabled(hasSettings(val));
- }
- });
-
- return menu;
- }
-
- protected void columnClicked(int columnToEdit) {
- IStructuredSelection selection = (IStructuredSelection) _validatorList.getSelection();
- ValidatorMutable val = (ValidatorMutable) selection.getFirstElement();
-
- switch (columnToEdit) {
- case 1:
- val.setManualValidation(!val.isManualValidation());
- break;
- case 2:
- val.setBuildValidation(!val.isBuildValidation());
- break;
- case 3:
- if (val.isV2Validator()){
- ValidatorMutable newVal = new ValidatorMutable(val);
- FilterDialog fd = new FilterDialog(_shell, newVal, getProject());
- if (Window.OK == fd.open()){
- _changes++;
- newVal = fd.getValidator();
- int i = findit(val);
- if (i != -1)_validators[i] = newVal;
- }
- }
- else {
- handleOldDelegate(val);
- }
-
- break;
- default:
- break;
- }
- _validatorList.refresh();
- }
-
- private int findit(ValidatorMutable val) {
- for (int i=0; i<_validators.length; i++)if (_validators[i] == val)return i;
- return -1;
- }
-
- private void handleOldDelegate(ValidatorMutable val) {
- try {
- if (!val.isV1Validator())return;
-
- ValidatorMetaData vmd = val.getVmd();
- if (!vmd.isDelegating())return;
-
- GlobalConfiguration gc = ConfigurationManager.getManager().getGlobalConfiguration();
- String delegateID = gc.getDelegateUniqueName(vmd);
- Shell shell = Display.getCurrent().getActiveShell();
- DelegatingValidatorPreferencesDialog dialog =
- new DelegatingValidatorPreferencesDialog(shell, vmd, delegateID);
-
- dialog.setBlockOnOpen(true);
- dialog.create();
-
- int result = dialog.open();
- if (result == Window.OK){
- _changes++;
- gc.setDelegateUniqueName(vmd, dialog.getDelegateID());
- }
- }
- catch (InvocationTargetException e){
-
- }
- }
-
- protected void updateWidgets() throws InvocationTargetException {
- // Need to update even the widgets that do not change based on another
- // widgets because of performDefaults(). If performDefaults() is selected,
- // then the pagePreferences values are reset, and these widgets
- // might also need to be updated.
- updateAllWidgets();
- updateHelp();
- }
-
- protected void updateWidgetsForDefaults() throws InvocationTargetException {
- _suspend.setSelection(false);
- _override.setSelection(false);
- enableDisableWidgets();
- _validatorList.setInput(_validators);
- _validatorList.refresh();
- }
-
- private void updateAllWidgets() throws InvocationTargetException {
- _suspend.setSelection(getProjectPreferences().getSuspend());
- _override.setSelection(getProjectPreferences().getOverride());
- enableDisableWidgets();
- _validatorList.setInput(_validators);
- _validatorList.refresh();
- }
-
- public boolean performOk() throws InvocationTargetException {
-
- addBuilder();
- for (ValidatorMutable vm : _validators)if (vm.isChanged())_changes++;
- if (_changes == 0)return true;
- // [213631] this warning should only be shown if the user actually tried to override
- // the validators
- if (!ValManager.getDefault().getGlobalPreferences().getOverride() && _override.getSelection()){
- MessageDialog.openWarning(_shell, ValUIMessages.Validation, ValUIMessages.ProjectOverridesNotAllowed);
- return false;
- }
- updateV1ProjectSettings();
- IProject project = getProject();
- ProjectPreferences pp = new ProjectPreferences(project, _override.getSelection(), _suspend.getSelection(), null);
- ValPrefManagerProject vpm = new ValPrefManagerProject(project);
- vpm.savePreferences(pp, _validators);
- return true;
- }
-
- /**
- * Update the version 1 project settings.
- */
- private void updateV1ProjectSettings() {
- try {
- ProjectConfiguration pc = ConfigurationManager.getManager().getProjectConfiguration(getProject());
- pc.setDoesProjectOverride(_override.getSelection());
- pc.setDisableAllValidation(_suspend.getSelection());
- }
- catch (InvocationTargetException e){
- ValidationPlugin.getPlugin().handleException(e);
- }
- }
-
- /**
- * Answer the specific project preferences. If the project didn't have any specific project
- * preferences, then create a default set.
- * @return
- */
- private ProjectPreferences getProjectPreferences(){
- return ValManager.getDefault().getProjectPreferences(getProject());
- }
-
- public boolean performDefaults() throws InvocationTargetException {
- Validator[] vals = ValManager.getDefault()
- .getValidatorsConfiguredForProject(getProject(), UseProjectPreferences.MustNotUse);
- _validators = new ValidatorMutable[vals.length];
- for (int i=0; i<vals.length; i++)_validators[i] = new ValidatorMutable(vals[i]);
-
- _changes++;
- updateWidgetsForDefaults();
- getDefaultsButton().setFocus();
- return true;
- }
-
- public boolean performEnableAll() throws InvocationTargetException {
- setAllValidators(true);
- _enableAllButton.setFocus();
- _validatorList.refresh();
- return true;
- }
-
- private void setAllValidators(boolean bool) {
- for (TableItem item : _validatorsTable.getItems()) {
- ValidatorMutable val = (ValidatorMutable) item.getData();
- val.setManualValidation(bool);
- val.setBuildValidation(bool);
- }
- }
-
- public boolean performDisableAll() throws InvocationTargetException {
- setAllValidators(false);
- _disableAllButton.setFocus();
- _validatorList.refresh();
- return true;
- }
-
- protected void updateHelp() {
-// PlatformUI.getWorkbench().getHelpSystem().setHelp(_suspend, ContextIds.VALIDATION_PREFERENCE_PAGE_DISABLE_ALL_ENABLED);
- }
-
- /*
- * Store the current values of the controls into the preference store.
- */
-
- public Composite getControl() {
- return _page;
- }
-
- public void dispose() {
- _override.dispose();
- _suspend.dispose();
- _configLink.dispose();
- _disableAllButton.dispose();
- _enableAllButton.dispose();
- _validatorList.getTable().dispose();
- }
-
- /**
- * Enable or disable the widgets based on some top level preferences.
- */
- private void enableDisableWidgets() {
- boolean globalOverride = ValManager.getDefault().getGlobalPreferences().getOverride();
- boolean enable = !_suspend.getSelection() & _override.getSelection() & globalOverride;
- _suspend.setEnabled(_override.getSelection() & globalOverride);
- _validatorsTable.setEnabled(enable);
- _enableAllButton.setEnabled(enable);
- _disableAllButton.setEnabled(enable);
- _configLink.setEnabled(!globalOverride || !_override.getSelection());
- }
-
- public void loseFocus() {
- // This page does not need to cache anything before it loses focus.
- }
-
- public void gainFocus() {
- }
- }
-
- protected Control createContents(Composite parent) {
- try {
- PlatformUI.getWorkbench().getHelpSystem().setHelp(parent, HelpContextIds.ProjectPage);
- _shell = parent.getShell();
- _pageImpl = new ValidatorListPage(parent);
- } catch (Exception exc) {
- _pageImpl = new InvalidPage(parent);
- displayAndLogError(ValUIMessages.VBF_EXC_INTERNAL_TITLE, ValUIMessages.VBF_EXC_INTERNAL_PAGE, exc);
- }
-
- return _pageImpl.getControl();
- }
-
- protected void performDefaults() {
- super.performDefaults();
-
- try {
- _pageImpl.performDefaults();
- } catch (Exception exc) {
- displayAndLogError(ValUIMessages.VBF_EXC_INTERNAL_TITLE, ValUIMessages.VBF_EXC_INTERNAL_PAGE, exc);
- }
- }
-
- public boolean performOk() {
- try {
- return _pageImpl.performOk();
- } catch (Exception exc) {
- displayAndLogError(ValUIMessages.VBF_EXC_INTERNAL_TITLE, ValUIMessages.VBF_EXC_INTERNAL_PAGE, exc);
- return false;
- }
- }
-
- /**
- * Since the pages are inner classes of a child PreferencePage, not a
- * PreferencePage itself, DialogPage's automatic disposal of its children's
- * widgets cannot be used. Instead, dispose of each inner class' widgets
- * explicitly.
- */
- public void dispose() {
- super.dispose();
- try {
- if (_pageImpl != null) {
- _pageImpl.dispose();
- _pageImpl = null;
- }
- } catch (Exception exc) {
- displayAndLogError(ValUIMessages.VBF_EXC_INTERNAL_TITLE, ValUIMessages.VBF_EXC_INTERNAL_PAGE, exc);
- }
- }
-
- private void logError(Throwable exc) {
- ValidationUIPlugin.getPlugin().handleException(exc);
- }
-
- /*
- * package visibility because if this method is private, then the compiler
- * needs to create a synthetic accessor method for the internal classes, and
- * that can have performance implications.
- */
- void displayAndLogError(String title, String message, Throwable exc) {
- logError(exc);
- displayMessage(title, message, org.eclipse.swt.SWT.ICON_ERROR);
- }
-
- private void displayMessage(String title, String message, int iIconType) {
- MessageBox messageBox = new MessageBox(getShell(),
- org.eclipse.swt.SWT.OK | iIconType | org.eclipse.swt.SWT.APPLICATION_MODAL);
- messageBox.setMessage(message);
- messageBox.setText(title);
- messageBox.open();
- }
-
- /**
- * @see org.eclipse.jface.dialogs.IDialogPage#setVisible(boolean)
- */
- public void setVisible(boolean visible) {
- super.setVisible(visible);
-
- if (_pageImpl == null)return;
- if (visible)_pageImpl.gainFocus();
- else _pageImpl.loseFocus();
- }
-
- /**
- * @see org.eclipse.jface.preference.PreferencePage#getDefaultsButton()
- */
- protected Button getDefaultsButton() {
- return super.getDefaultsButton();
- }
-
- /**
- * Returns the selected project.
- */
- public IProject getProject() {
- IAdaptable selectedElement = getElement();
- if (selectedElement == null)return null;
- if (selectedElement instanceof IProject)return (IProject) selectedElement;
-
- Object adaptedObject = selectedElement.getAdapter(IProject.class);
- if (adaptedObject instanceof IProject)return (IProject) adaptedObject;
- return null;
-
- }
-}
